Skip to content
Permalink
Browse files

Indentation

  • Loading branch information
nyalldawson committed Jun 1, 2016
1 parent cb88269 commit 062aa9aee424fbd9a60d5b68ff41c8179ca344c7
@@ -742,7 +742,6 @@ def okPressed(self):
if self.alg is not None:
self.close()


def cancelPressed(self):
self.alg = None
self.close()
@@ -69,6 +69,7 @@ def unload(self):
Processing.removeScripts(os.path.join(os.path.dirname(__file__), "scripts"))
'''


class CreateScriptCollectionPluginAction(ToolboxAction):

def __init__(self):
@@ -99,4 +100,3 @@ def execute(self):
scriptFile = os.path.join(scriptsFolder, os.path.basename(script.descriptionFile))
with open(scriptFile, "w") as f:
f.write(script.script)

@@ -50,7 +50,7 @@ def __init__(self):
CreateNewScriptAction.SCRIPT_PYTHON),
AddScriptFromFileAction(),
GetScriptsAction(),
CreateScriptCollectionPluginAction(),])
CreateScriptCollectionPluginAction(), ])
self.contextMenuActions = \
[EditScriptAction(EditScriptAction.SCRIPT_PYTHON),
DeleteScriptAction(DeleteScriptAction.SCRIPT_PYTHON)]
@@ -28,17 +28,17 @@ namespace osgEarth

class QgsGlobeFrustumHighlightCallback : public osg::NodeCallback
{
public:
QgsGlobeFrustumHighlightCallback( osg::View* view, osgEarth::Terrain* terrain, QgsMapCanvas* mapCanvas, QColor color );
~QgsGlobeFrustumHighlightCallback();
public:
QgsGlobeFrustumHighlightCallback( osg::View* view, osgEarth::Terrain* terrain, QgsMapCanvas* mapCanvas, QColor color );
~QgsGlobeFrustumHighlightCallback();

void operator()( osg::Node*, osg::NodeVisitor* ) override;
void operator()( osg::Node*, osg::NodeVisitor* ) override;

private:
osg::View* mView;
osgEarth::Terrain* mTerrain;
QgsRubberBand* mRubberBand;
osgEarth::SpatialReference* mSrs;
private:
osg::View* mView;
osgEarth::Terrain* mTerrain;
QgsRubberBand* mRubberBand;
osgEarth::SpatialReference* mSrs;
};

#endif // QGSGLOBEFRUSTUMHIGHLIGHT_H
@@ -28,54 +28,54 @@ class QListWidgetItem;

class QgsGlobeVectorLayerConfig : public QObject
{
public:
enum RenderingMode
{
RenderingModeRasterized,
RenderingModeModelSimple,
RenderingModeModelAdvanced
};

QgsGlobeVectorLayerConfig( QObject* parent = 0 )
: QObject( parent )
, renderingMode( RenderingModeRasterized )
, altitudeClamping( osgEarth::Symbology::AltitudeSymbol::CLAMP_TO_TERRAIN )
, altitudeTechnique( osgEarth::Symbology::AltitudeSymbol::TECHNIQUE_DRAPE )
, altitudeBinding( osgEarth::Symbology::AltitudeSymbol::BINDING_VERTEX )
, verticalOffset( 0.0 )
, verticalScale( 0.0 )
, clampingResolution( 0.0 )
, extrusionEnabled( false )
, extrusionHeight( "10" )
, extrusionFlatten( false )
, extrusionWallGradient( 0.5 )
, labelingEnabled( false )
, labelingDeclutter( false )
, lightingEnabled( true )
{
}

RenderingMode renderingMode;
osgEarth::Symbology::AltitudeSymbol::Clamping altitudeClamping;
osgEarth::Symbology::AltitudeSymbol::Technique altitudeTechnique;
osgEarth::Symbology::AltitudeSymbol::Binding altitudeBinding;

float verticalOffset;
float verticalScale;
float clampingResolution;

bool extrusionEnabled;
QString extrusionHeight;
bool extrusionFlatten;
float extrusionWallGradient;

bool labelingEnabled;
QString labelingField;
bool labelingDeclutter;

bool lightingEnabled;

static QgsGlobeVectorLayerConfig* getConfig( QgsVectorLayer* layer );
public:
enum RenderingMode
{
RenderingModeRasterized,
RenderingModeModelSimple,
RenderingModeModelAdvanced
};

QgsGlobeVectorLayerConfig( QObject* parent = 0 )
: QObject( parent )
, renderingMode( RenderingModeRasterized )
, altitudeClamping( osgEarth::Symbology::AltitudeSymbol::CLAMP_TO_TERRAIN )
, altitudeTechnique( osgEarth::Symbology::AltitudeSymbol::TECHNIQUE_DRAPE )
, altitudeBinding( osgEarth::Symbology::AltitudeSymbol::BINDING_VERTEX )
, verticalOffset( 0.0 )
, verticalScale( 0.0 )
, clampingResolution( 0.0 )
, extrusionEnabled( false )
, extrusionHeight( "10" )
, extrusionFlatten( false )
, extrusionWallGradient( 0.5 )
, labelingEnabled( false )
, labelingDeclutter( false )
, lightingEnabled( true )
{
}

RenderingMode renderingMode;
osgEarth::Symbology::AltitudeSymbol::Clamping altitudeClamping;
osgEarth::Symbology::AltitudeSymbol::Technique altitudeTechnique;
osgEarth::Symbology::AltitudeSymbol::Binding altitudeBinding;

float verticalOffset;
float verticalScale;
float clampingResolution;

bool extrusionEnabled;
QString extrusionHeight;
bool extrusionFlatten;
float extrusionWallGradient;

bool labelingEnabled;
QString labelingField;
bool labelingDeclutter;

bool lightingEnabled;

static QgsGlobeVectorLayerConfig* getConfig( QgsVectorLayer* layer );
};


0 comments on commit 062aa9a

Please sign in to comment.
You can’t perform that action at this time.