Skip to content

Commit 062aa9a

Browse files
nyalldawsonnyalldawson
committedJun 1, 2016
Indentation
·
ltr-3_40archive/master_2
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

‎src/ui/raster/qghillshaderendererwidget.ui

Lines changed: 149 additions & 149 deletions
Original file line numberDiff line numberDiff line change
@@ -1,149 +1,149 @@
1-
<?xml version="1.0" encoding="UTF-8"?>
2-
<ui version="4.0">
3-
<class>QgsHillShadeWidget</class>
4-
<widget class="QWidget" name="QgsHillShadeWidget">
5-
<property name="geometry">
6-
<rect>
7-
<x>0</x>
8-
<y>0</y>
9-
<width>302</width>
10-
<height>541</height>
11-
</rect>
12-
</property>
13-
<property name="windowTitle">
14-
<string>Form</string>
15-
</property>
16-
<layout class="QGridLayout" name="gridLayout">
17-
<item row="2" column="1" colspan="2">
18-
<layout class="QVBoxLayout" name="verticalLayout">
19-
<item>
20-
<widget class="QDial" name="mLightAzimuthDial">
21-
<property name="sizePolicy">
22-
<sizepolicy hsizetype="Expanding" vsizetype="Preferred">
23-
<horstretch>0</horstretch>
24-
<verstretch>0</verstretch>
25-
</sizepolicy>
26-
</property>
27-
<property name="maximum">
28-
<number>360</number>
29-
</property>
30-
<property name="value">
31-
<number>0</number>
32-
</property>
33-
<property name="sliderPosition">
34-
<number>0</number>
35-
</property>
36-
<property name="invertedAppearance">
37-
<bool>false</bool>
38-
</property>
39-
<property name="invertedControls">
40-
<bool>false</bool>
41-
</property>
42-
<property name="wrapping">
43-
<bool>true</bool>
44-
</property>
45-
<property name="notchTarget">
46-
<double>10.000000000000000</double>
47-
</property>
48-
<property name="notchesVisible">
49-
<bool>true</bool>
50-
</property>
51-
</widget>
52-
</item>
53-
<item>
54-
<widget class="QgsDoubleSpinBox" name="mLightAzimuth">
55-
<property name="sizePolicy">
56-
<sizepolicy hsizetype="Expanding" vsizetype="Fixed">
57-
<horstretch>0</horstretch>
58-
<verstretch>0</verstretch>
59-
</sizepolicy>
60-
</property>
61-
</widget>
62-
</item>
63-
</layout>
64-
</item>
65-
<item row="1" column="0" colspan="2">
66-
<widget class="QLabel" name="label_2">
67-
<property name="text">
68-
<string>Altitude (degrees)</string>
69-
</property>
70-
</widget>
71-
</item>
72-
<item row="2" column="0">
73-
<widget class="QLabel" name="label">
74-
<property name="text">
75-
<string>Azimuth (degrees)</string>
76-
</property>
77-
</widget>
78-
</item>
79-
<item row="3" column="0" colspan="2">
80-
<widget class="QLabel" name="label_3">
81-
<property name="text">
82-
<string>Z Factor</string>
83-
</property>
84-
</widget>
85-
</item>
86-
<item row="1" column="2">
87-
<widget class="QgsDoubleSpinBox" name="mLightAngle">
88-
<property name="sizePolicy">
89-
<sizepolicy hsizetype="Expanding" vsizetype="Fixed">
90-
<horstretch>0</horstretch>
91-
<verstretch>0</verstretch>
92-
</sizepolicy>
93-
</property>
94-
<property name="singleStep">
95-
<double>5.000000000000000</double>
96-
</property>
97-
<property name="value">
98-
<double>45.000000000000000</double>
99-
</property>
100-
</widget>
101-
</item>
102-
<item row="4" column="0" colspan="3">
103-
<spacer name="verticalSpacer">
104-
<property name="orientation">
105-
<enum>Qt::Vertical</enum>
106-
</property>
107-
<property name="sizeHint" stdset="0">
108-
<size>
109-
<width>20</width>
110-
<height>40</height>
111-
</size>
112-
</property>
113-
</spacer>
114-
</item>
115-
<item row="0" column="0">
116-
<widget class="QLabel" name="label_4">
117-
<property name="text">
118-
<string>Band</string>
119-
</property>
120-
</widget>
121-
</item>
122-
<item row="0" column="2">
123-
<widget class="QComboBox" name="mBandsCombo"/>
124-
</item>
125-
<item row="3" column="2">
126-
<widget class="QgsDoubleSpinBox" name="mZFactor">
127-
<property name="sizePolicy">
128-
<sizepolicy hsizetype="Expanding" vsizetype="Fixed">
129-
<horstretch>0</horstretch>
130-
<verstretch>0</verstretch>
131-
</sizepolicy>
132-
</property>
133-
<property name="value">
134-
<double>1.000000000000000</double>
135-
</property>
136-
</widget>
137-
</item>
138-
</layout>
139-
</widget>
140-
<customwidgets>
141-
<customwidget>
142-
<class>QgsDoubleSpinBox</class>
143-
<extends>QDoubleSpinBox</extends>
144-
<header>qgsdoublespinbox.h</header>
145-
</customwidget>
146-
</customwidgets>
147-
<resources/>
148-
<connections/>
149-
</ui>
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<ui version="4.0">
3+
<class>QgsHillShadeWidget</class>
4+
<widget class="QWidget" name="QgsHillShadeWidget">
5+
<property name="geometry">
6+
<rect>
7+
<x>0</x>
8+
<y>0</y>
9+
<width>302</width>
10+
<height>541</height>
11+
</rect>
12+
</property>
13+
<property name="windowTitle">
14+
<string>Form</string>
15+
</property>
16+
<layout class="QGridLayout" name="gridLayout">
17+
<item row="2" column="1" colspan="2">
18+
<layout class="QVBoxLayout" name="verticalLayout">
19+
<item>
20+
<widget class="QDial" name="mLightAzimuthDial">
21+
<property name="sizePolicy">
22+
<sizepolicy hsizetype="Expanding" vsizetype="Preferred">
23+
<horstretch>0</horstretch>
24+
<verstretch>0</verstretch>
25+
</sizepolicy>
26+
</property>
27+
<property name="maximum">
28+
<number>360</number>
29+
</property>
30+
<property name="value">
31+
<number>0</number>
32+
</property>
33+
<property name="sliderPosition">
34+
<number>0</number>
35+
</property>
36+
<property name="invertedAppearance">
37+
<bool>false</bool>
38+
</property>
39+
<property name="invertedControls">
40+
<bool>false</bool>
41+
</property>
42+
<property name="wrapping">
43+
<bool>true</bool>
44+
</property>
45+
<property name="notchTarget">
46+
<double>10.000000000000000</double>
47+
</property>
48+
<property name="notchesVisible">
49+
<bool>true</bool>
50+
</property>
51+
</widget>
52+
</item>
53+
<item>
54+
<widget class="QgsDoubleSpinBox" name="mLightAzimuth">
55+
<property name="sizePolicy">
56+
<sizepolicy hsizetype="Expanding" vsizetype="Fixed">
57+
<horstretch>0</horstretch>
58+
<verstretch>0</verstretch>
59+
</sizepolicy>
60+
</property>
61+
</widget>
62+
</item>
63+
</layout>
64+
</item>
65+
<item row="1" column="0" colspan="2">
66+
<widget class="QLabel" name="label_2">
67+
<property name="text">
68+
<string>Altitude (degrees)</string>
69+
</property>
70+
</widget>
71+
</item>
72+
<item row="2" column="0">
73+
<widget class="QLabel" name="label">
74+
<property name="text">
75+
<string>Azimuth (degrees)</string>
76+
</property>
77+
</widget>
78+
</item>
79+
<item row="3" column="0" colspan="2">
80+
<widget class="QLabel" name="label_3">
81+
<property name="text">
82+
<string>Z Factor</string>
83+
</property>
84+
</widget>
85+
</item>
86+
<item row="1" column="2">
87+
<widget class="QgsDoubleSpinBox" name="mLightAngle">
88+
<property name="sizePolicy">
89+
<sizepolicy hsizetype="Expanding" vsizetype="Fixed">
90+
<horstretch>0</horstretch>
91+
<verstretch>0</verstretch>
92+
</sizepolicy>
93+
</property>
94+
<property name="singleStep">
95+
<double>5.000000000000000</double>
96+
</property>
97+
<property name="value">
98+
<double>45.000000000000000</double>
99+
</property>
100+
</widget>
101+
</item>
102+
<item row="4" column="0" colspan="3">
103+
<spacer name="verticalSpacer">
104+
<property name="orientation">
105+
<enum>Qt::Vertical</enum>
106+
</property>
107+
<property name="sizeHint" stdset="0">
108+
<size>
109+
<width>20</width>
110+
<height>40</height>
111+
</size>
112+
</property>
113+
</spacer>
114+
</item>
115+
<item row="0" column="0">
116+
<widget class="QLabel" name="label_4">
117+
<property name="text">
118+
<string>Band</string>
119+
</property>
120+
</widget>
121+
</item>
122+
<item row="0" column="2">
123+
<widget class="QComboBox" name="mBandsCombo"/>
124+
</item>
125+
<item row="3" column="2">
126+
<widget class="QgsDoubleSpinBox" name="mZFactor">
127+
<property name="sizePolicy">
128+
<sizepolicy hsizetype="Expanding" vsizetype="Fixed">
129+
<horstretch>0</horstretch>
130+
<verstretch>0</verstretch>
131+
</sizepolicy>
132+
</property>
133+
<property name="value">
134+
<double>1.000000000000000</double>
135+
</property>
136+
</widget>
137+
</item>
138+
</layout>
139+
</widget>
140+
<customwidgets>
141+
<customwidget>
142+
<class>QgsDoubleSpinBox</class>
143+
<extends>QDoubleSpinBox</extends>
144+
<header>qgsdoublespinbox.h</header>
145+
</customwidget>
146+
</customwidgets>
147+
<resources/>
148+
<connections/>
149+
</ui>

0 commit comments

Comments
 (0)
Please sign in to comment.