Skip to content

Commit 062aa9a

Browse files
committed
Indentation
1 parent cb88269 commit 062aa9a

File tree

6 files changed

+208
-209
lines changed

6 files changed

+208
-209
lines changed

python/plugins/processing/modeler/ModelerParametersDialog.py

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -742,7 +742,6 @@ def okPressed(self):
742742
if self.alg is not None:
743743
self.close()
744744

745-
746745
def cancelPressed(self):
747746
self.alg = None
748747
self.close()

python/plugins/processing/script/CreateScriptCollectionPluginAction.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -69,6 +69,7 @@ def unload(self):
6969
Processing.removeScripts(os.path.join(os.path.dirname(__file__), "scripts"))
7070
'''
7171

72+
7273
class CreateScriptCollectionPluginAction(ToolboxAction):
7374

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

python/plugins/processing/script/ScriptAlgorithmProvider.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ def __init__(self):
5050
CreateNewScriptAction.SCRIPT_PYTHON),
5151
AddScriptFromFileAction(),
5252
GetScriptsAction(),
53-
CreateScriptCollectionPluginAction(),])
53+
CreateScriptCollectionPluginAction(), ])
5454
self.contextMenuActions = \
5555
[EditScriptAction(EditScriptAction.SCRIPT_PYTHON),
5656
DeleteScriptAction(DeleteScriptAction.SCRIPT_PYTHON)]

src/plugins/globe/qgsglobefrustumhighlight.h

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -28,17 +28,17 @@ namespace osgEarth
2828

2929
class QgsGlobeFrustumHighlightCallback : public osg::NodeCallback
3030
{
31-
public:
32-
QgsGlobeFrustumHighlightCallback( osg::View* view, osgEarth::Terrain* terrain, QgsMapCanvas* mapCanvas, QColor color );
33-
~QgsGlobeFrustumHighlightCallback();
31+
public:
32+
QgsGlobeFrustumHighlightCallback( osg::View* view, osgEarth::Terrain* terrain, QgsMapCanvas* mapCanvas, QColor color );
33+
~QgsGlobeFrustumHighlightCallback();
3434

35-
void operator()( osg::Node*, osg::NodeVisitor* ) override;
35+
void operator()( osg::Node*, osg::NodeVisitor* ) override;
3636

37-
private:
38-
osg::View* mView;
39-
osgEarth::Terrain* mTerrain;
40-
QgsRubberBand* mRubberBand;
41-
osgEarth::SpatialReference* mSrs;
37+
private:
38+
osg::View* mView;
39+
osgEarth::Terrain* mTerrain;
40+
QgsRubberBand* mRubberBand;
41+
osgEarth::SpatialReference* mSrs;
4242
};
4343

4444
#endif // QGSGLOBEFRUSTUMHIGHLIGHT_H

src/plugins/globe/qgsglobevectorlayerproperties.h

Lines changed: 48 additions & 48 deletions
Original file line numberDiff line numberDiff line change
@@ -28,54 +28,54 @@ class QListWidgetItem;
2828

2929
class QgsGlobeVectorLayerConfig : public QObject
3030
{
31-
public:
32-
enum RenderingMode
33-
{
34-
RenderingModeRasterized,
35-
RenderingModeModelSimple,
36-
RenderingModeModelAdvanced
37-
};
38-
39-
QgsGlobeVectorLayerConfig( QObject* parent = 0 )
40-
: QObject( parent )
41-
, renderingMode( RenderingModeRasterized )
42-
, altitudeClamping( osgEarth::Symbology::AltitudeSymbol::CLAMP_TO_TERRAIN )
43-
, altitudeTechnique( osgEarth::Symbology::AltitudeSymbol::TECHNIQUE_DRAPE )
44-
, altitudeBinding( osgEarth::Symbology::AltitudeSymbol::BINDING_VERTEX )
45-
, verticalOffset( 0.0 )
46-
, verticalScale( 0.0 )
47-
, clampingResolution( 0.0 )
48-
, extrusionEnabled( false )
49-
, extrusionHeight( "10" )
50-
, extrusionFlatten( false )
51-
, extrusionWallGradient( 0.5 )
52-
, labelingEnabled( false )
53-
, labelingDeclutter( false )
54-
, lightingEnabled( true )
55-
{
56-
}
57-
58-
RenderingMode renderingMode;
59-
osgEarth::Symbology::AltitudeSymbol::Clamping altitudeClamping;
60-
osgEarth::Symbology::AltitudeSymbol::Technique altitudeTechnique;
61-
osgEarth::Symbology::AltitudeSymbol::Binding altitudeBinding;
62-
63-
float verticalOffset;
64-
float verticalScale;
65-
float clampingResolution;
66-
67-
bool extrusionEnabled;
68-
QString extrusionHeight;
69-
bool extrusionFlatten;
70-
float extrusionWallGradient;
71-
72-
bool labelingEnabled;
73-
QString labelingField;
74-
bool labelingDeclutter;
75-
76-
bool lightingEnabled;
77-
78-
static QgsGlobeVectorLayerConfig* getConfig( QgsVectorLayer* layer );
31+
public:
32+
enum RenderingMode
33+
{
34+
RenderingModeRasterized,
35+
RenderingModeModelSimple,
36+
RenderingModeModelAdvanced
37+
};
38+
39+
QgsGlobeVectorLayerConfig( QObject* parent = 0 )
40+
: QObject( parent )
41+
, renderingMode( RenderingModeRasterized )
42+
, altitudeClamping( osgEarth::Symbology::AltitudeSymbol::CLAMP_TO_TERRAIN )
43+
, altitudeTechnique( osgEarth::Symbology::AltitudeSymbol::TECHNIQUE_DRAPE )
44+
, altitudeBinding( osgEarth::Symbology::AltitudeSymbol::BINDING_VERTEX )
45+
, verticalOffset( 0.0 )
46+
, verticalScale( 0.0 )
47+
, clampingResolution( 0.0 )
48+
, extrusionEnabled( false )
49+
, extrusionHeight( "10" )
50+
, extrusionFlatten( false )
51+
, extrusionWallGradient( 0.5 )
52+
, labelingEnabled( false )
53+
, labelingDeclutter( false )
54+
, lightingEnabled( true )
55+
{
56+
}
57+
58+
RenderingMode renderingMode;
59+
osgEarth::Symbology::AltitudeSymbol::Clamping altitudeClamping;
60+
osgEarth::Symbology::AltitudeSymbol::Technique altitudeTechnique;
61+
osgEarth::Symbology::AltitudeSymbol::Binding altitudeBinding;
62+
63+
float verticalOffset;
64+
float verticalScale;
65+
float clampingResolution;
66+
67+
bool extrusionEnabled;
68+
QString extrusionHeight;
69+
bool extrusionFlatten;
70+
float extrusionWallGradient;
71+
72+
bool labelingEnabled;
73+
QString labelingField;
74+
bool labelingDeclutter;
75+
76+
bool lightingEnabled;
77+
78+
static QgsGlobeVectorLayerConfig* getConfig( QgsVectorLayer* layer );
7979
};
8080

8181

0 commit comments

Comments
 (0)