Skip to content

Commit 8fb37aa

Browse files
jef-njef-n
committed
indentation fixes
1 parent e5a4426 commit 8fb37aa

File tree

15 files changed

+551
-546
lines changed

15 files changed

+551
-546
lines changed

‎python/plugins/processing/algs/qgis/IdwInterpolation.py‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -33,15 +33,15 @@
3333
from qgis.analysis import (QgsInterpolator,
3434
QgsIDWInterpolator,
3535
QgsGridFileWriter
36-
)
36+
)
3737

3838
from processing.core.GeoAlgorithm import GeoAlgorithm
3939
from processing.core.GeoAlgorithmExecutionException import GeoAlgorithmExecutionException
4040
from processing.core.parameters import (Parameter,
4141
ParameterNumber,
4242
ParameterExtent,
4343
_splitParameterOptions
44-
)
44+
)
4545
from processing.core.outputs import OutputRaster
4646
from processing.tools import dataobjects
4747

@@ -82,8 +82,8 @@ def setValue(self, value):
8282
return True
8383

8484
if value == '':
85-
if not self.optional:
86-
return False
85+
if not self.optional:
86+
return False
8787

8888
if isinstance(value, str):
8989
self.value = value if value != '' else None
@@ -103,7 +103,7 @@ def getAsScriptCode(self):
103103
def fromScriptCode(self, line):
104104
isOptional, name, definition = _splitParameterOptions(line)
105105
descName = _createDescriptiveName(name)
106-
parent = definition.lower().strip()[len('interpolation data') + 1:]
106+
parent = definition.lower().strip()[len('interpolation data') + 1:]
107107
return ParameterInterpolationData(name, description, parent)
108108

109109
@staticmethod

‎python/plugins/processing/algs/qgis/TinInterpolation.py‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@
3333
from qgis.analysis import (QgsInterpolator,
3434
QgsTINInterpolator,
3535
QgsGridFileWriter
36-
)
36+
)
3737

3838
from processing.core.GeoAlgorithm import GeoAlgorithm
3939
from processing.core.GeoAlgorithmExecutionException import GeoAlgorithmExecutionException
@@ -42,10 +42,10 @@
4242
ParameterExtent,
4343
ParameterSelection,
4444
_splitParameterOptions
45-
)
45+
)
4646
from processing.core.outputs import (OutputRaster,
4747
OutputVector
48-
)
48+
)
4949
from processing.tools import dataobjects
5050

5151
pluginPath = os.path.split(os.path.split(os.path.dirname(__file__))[0])[0]
@@ -90,8 +90,8 @@ def setValue(self, value):
9090
return True
9191

9292
if value == '':
93-
if not self.optional:
94-
return False
93+
if not self.optional:
94+
return False
9595

9696
if isinstance(value, str):
9797
self.value = value if value != '' else None
@@ -111,7 +111,7 @@ def getAsScriptCode(self):
111111
def fromScriptCode(self, line):
112112
isOptional, name, definition = _splitParameterOptions(line)
113113
descName = _createDescriptiveName(name)
114-
parent = definition.lower().strip()[len('interpolation data') + 1:]
114+
parent = definition.lower().strip()[len('interpolation data') + 1:]
115115
return ParameterInterpolationData(name, description, parent)
116116

117117
@staticmethod

‎python/plugins/processing/algs/qgis/ui/InterpolationDataWidget.py‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -34,12 +34,12 @@
3434
QColor)
3535
from qgis.PyQt.QtWidgets import (QTreeWidgetItem,
3636
QComboBox
37-
)
37+
)
3838
from qgis.core import (QgsApplication,
3939
QgsMapLayer,
4040
QgsMapLayerProxyModel,
4141
QgsWkbTypes
42-
)
42+
)
4343
from qgis.gui import QgsFieldProxyModel
4444
from qgis.analysis import QgsInterpolator
4545

@@ -103,15 +103,15 @@ def on_cmbLayers_layerChanged(self, layer):
103103

104104
def addLayerData(self, layerName, attribute):
105105
item = QTreeWidgetItem()
106-
item.setText(0, layerName);
106+
item.setText(0, layerName)
107107
item.setText(1, attribute)
108108
self.layersTree.addTopLevelItem(item)
109109

110110
comboBox = QComboBox()
111111
comboBox.addItem(self.tr('Points'))
112112
comboBox.addItem(self.tr('Structure lines'))
113113
comboBox.addItem(self.tr('Break lines'))
114-
comboBox.setCurrentIndex( 0 )
114+
comboBox.setCurrentIndex(0)
115115
self.layersTree.setItemWidget(item, 2, comboBox)
116116

117117
def setValue(self, value):
@@ -156,9 +156,9 @@ def value(self):
156156
inputType = QgsInterpolator.BREAK_LINES
157157

158158
layers += '{},{},{:d},{:d};'.format(layer.source(),
159-
zCoord,
160-
fieldIndex,
161-
inputType)
159+
zCoord,
160+
fieldIndex,
161+
inputType)
162162
return layers[:-1]
163163

164164

‎python/plugins/processing/algs/qgis/ui/ReliefColorsWidget.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@
3838
QMessageBox,
3939
QInputDialog,
4040
QColorDialog
41-
)
41+
)
4242
from qgis.PyQt.QtXml import QDomDocument
4343

4444
from qgis.core import QgsApplication, QgsMapLayer

‎src/app/dwg/libdxfrw/drw_base.h‎

Lines changed: 58 additions & 58 deletions
Original file line numberDiff line numberDiff line change
@@ -68,33 +68,33 @@ namespace DRW
6868
//! Version numbers for the DXF Format.
6969
enum Version
7070
{
71-
UNKNOWNV, /*!< UNKNOWN VERSION. */
72-
AC1006, /*!< R10. */
73-
AC1009, /*!< R11 & R12. */
74-
AC1012, /*!< R13. */
75-
AC1014, /*!< R14. */
76-
AC1015, /*!< ACAD 2000. */
77-
AC1018, /*!< ACAD 2004. */
78-
AC1021, /*!< ACAD 2007. */
79-
AC1024, /*!< ACAD 2010. */
80-
AC1027 /*!< ACAD 2013. */
71+
UNKNOWNV, //!< UNKNOWN VERSION.
72+
AC1006, //!< R10.
73+
AC1009, //!< R11 & R12.
74+
AC1012, //!< R13.
75+
AC1014, //!< R14.
76+
AC1015, //!< ACAD 2000.
77+
AC1018, //!< ACAD 2004.
78+
AC1021, //!< ACAD 2007.
79+
AC1024, //!< ACAD 2010.
80+
AC1027 //!< ACAD 2013.
8181
};
8282

8383
enum error
8484
{
85-
BAD_NONE, /*!< No error. */
86-
BAD_UNKNOWN, /*!< UNKNOWN. */
87-
BAD_OPEN, /*!< error opening file. */
88-
BAD_VERSION, /*!< unsupported version. */
89-
BAD_READ_METADATA, /*!< error reading matadata. */
90-
BAD_READ_FILE_HEADER, /*!< error in file header read process. */
91-
BAD_READ_HEADER, /*!< error in header vars read process. */
92-
BAD_READ_HANDLES, /*!< error in object map read process. */
93-
BAD_READ_CLASSES, /*!< error in classes read process. */
94-
BAD_READ_TABLES, /*!< error in tables read process. */
95-
BAD_READ_BLOCKS, /*!< error in block read process. */
96-
BAD_READ_ENTITIES, /*!< error in entities read process. */
97-
BAD_READ_OBJECTS /*!< error in objects read process. */
85+
BAD_NONE, //!< No error.
86+
BAD_UNKNOWN, //!< UNKNOWN.
87+
BAD_OPEN, //!< Error opening file.
88+
BAD_VERSION, //!< Unsupported version.
89+
BAD_READ_METADATA, //!< Error reading matadata.
90+
BAD_READ_FILE_HEADER, //!< Error in file header read process.
91+
BAD_READ_HEADER, //!< Error in header vars read process.
92+
BAD_READ_HANDLES, //!< Error in object map read process.
93+
BAD_READ_CLASSES, //!< Error in classes read process.
94+
BAD_READ_TABLES, //!< Error in tables read process.
95+
BAD_READ_BLOCKS, //!< Error in block read process.
96+
BAD_READ_ENTITIES, //!< Error in entities read process.
97+
BAD_READ_OBJECTS //!< Error in objects read process.
9898
};
9999

100100
enum DBG_LEVEL
@@ -171,7 +171,7 @@ class DRW_Coord
171171
z = data.z;
172172
return *this;
173173
}
174-
/** < convert to unitary vector */
174+
//! < convert to unitary vector
175175
void unitize()
176176
{
177177
double dist;
@@ -204,11 +204,11 @@ class DRW_Vertex2D
204204
DRW_Vertex2D( double sx, double sy, double b ): x( sx ), y( sy ), stawidth( 0 ), endwidth( 0 ), bulge( b ) {}
205205

206206
public:
207-
double x; /*!< x coordinate, code 10 */
208-
double y; /*!< y coordinate, code 20 */
209-
double stawidth; /*!< Start width, code 40 */
210-
double endwidth; /*!< End width, code 41 */
211-
double bulge; /*!< bulge, code 42 */
207+
double x; //!< X coordinate, code 10
208+
double y; //!< Y coordinate, code 20
209+
double stawidth; //!< Start width, code 40
210+
double endwidth; //!< End width, code 41
211+
double bulge; //!< Bulge, code 42
212212
};
213213

214214

@@ -261,7 +261,7 @@ class DRW_Variant
261261
void setCoordY( double d ) { if ( vType == COORD ) vdata.y = d;}
262262
void setCoordZ( double d ) { if ( vType == COORD ) vdata.z = d;}
263263
enum TYPE type() { return vType;}
264-
int code() { return vCode;} /*!< returns dxf code of this value*/
264+
int code() { return vCode;} //!< Returns dxf code of this value
265265

266266
private:
267267
std::string sdata;
@@ -285,7 +285,7 @@ class DRW_Variant
285285
DRW_VarContent content;
286286
private:
287287
enum TYPE vType;
288-
int vCode; /*!< dxf code of this value*/
288+
int vCode; //!< Dxf code of this value
289289

290290
};
291291

@@ -317,33 +317,33 @@ class DRW_LW_Conv
317317
public:
318318
enum lineWidth
319319
{
320-
width00 = 0, /*!< 0.00mm (dxf 0)*/
321-
width01 = 1, /*!< 0.05mm (dxf 5)*/
322-
width02 = 2, /*!< 0.09mm (dxf 9)*/
323-
width03 = 3, /*!< 0.13mm (dxf 13)*/
324-
width04 = 4, /*!< 0.15mm (dxf 15)*/
325-
width05 = 5, /*!< 0.18mm (dxf 18)*/
326-
width06 = 6, /*!< 0.20mm (dxf 20)*/
327-
width07 = 7, /*!< 0.25mm (dxf 25)*/
328-
width08 = 8, /*!< 0.30mm (dxf 30)*/
329-
width09 = 9, /*!< 0.35mm (dxf 35)*/
330-
width10 = 10, /*!< 0.40mm (dxf 40)*/
331-
width11 = 11, /*!< 0.50mm (dxf 50)*/
332-
width12 = 12, /*!< 0.53mm (dxf 53)*/
333-
width13 = 13, /*!< 0.60mm (dxf 60)*/
334-
width14 = 14, /*!< 0.70mm (dxf 70)*/
335-
width15 = 15, /*!< 0.80mm (dxf 80)*/
336-
width16 = 16, /*!< 0.90mm (dxf 90)*/
337-
width17 = 17, /*!< 1.00mm (dxf 100)*/
338-
width18 = 18, /*!< 1.06mm (dxf 106)*/
339-
width19 = 19, /*!< 1.20mm (dxf 120)*/
340-
width20 = 20, /*!< 1.40mm (dxf 140)*/
341-
width21 = 21, /*!< 1.58mm (dxf 158)*/
342-
width22 = 22, /*!< 2.00mm (dxf 200)*/
343-
width23 = 23, /*!< 2.11mm (dxf 211)*/
344-
widthByLayer = 29, /*!< by layer (dxf -1) */
345-
widthByBlock = 30, /*!< by block (dxf -2) */
346-
widthDefault = 31 /*!< by default (dxf -3) */
320+
width00 = 0, //!< 0.00mm (dxf 0)
321+
width01 = 1, //!< 0.05mm (dxf 5)
322+
width02 = 2, //!< 0.09mm (dxf 9)
323+
width03 = 3, //!< 0.13mm (dxf 13)
324+
width04 = 4, //!< 0.15mm (dxf 15)
325+
width05 = 5, //!< 0.18mm (dxf 18)
326+
width06 = 6, //!< 0.20mm (dxf 20)
327+
width07 = 7, //!< 0.25mm (dxf 25)
328+
width08 = 8, //!< 0.30mm (dxf 30)
329+
width09 = 9, //!< 0.35mm (dxf 35)
330+
width10 = 10, //!< 0.40mm (dxf 40)
331+
width11 = 11, //!< 0.50mm (dxf 50)
332+
width12 = 12, //!< 0.53mm (dxf 53)
333+
width13 = 13, //!< 0.60mm (dxf 60)
334+
width14 = 14, //!< 0.70mm (dxf 70)
335+
width15 = 15, //!< 0.80mm (dxf 80)
336+
width16 = 16, //!< 0.90mm (dxf 90)
337+
width17 = 17, //!< 1.00mm (dxf 100)
338+
width18 = 18, //!< 1.06mm (dxf 106)
339+
width19 = 19, //!< 1.20mm (dxf 120)
340+
width20 = 20, //!< 1.40mm (dxf 140)
341+
width21 = 21, //!< 1.58mm (dxf 158)
342+
width22 = 22, //!< 2.00mm (dxf 200)
343+
width23 = 23, //!< 2.11mm (dxf 211)
344+
widthByLayer = 29, //!< By layer (dxf -1)
345+
widthByBlock = 30, //!< By block (dxf -2)
346+
widthDefault = 31 //!< By default (dxf -3)
347347
};
348348

349349
static int lineWidth2dxfInt( enum lineWidth lw )

‎src/app/dwg/libdxfrw/drw_classes.h‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -48,13 +48,13 @@ class DRW_Class
4848
private:
4949
void toDwgType();
5050
public:
51-
UTF8STRING recName; /*!< record name, code 1 */
52-
UTF8STRING className; /*!< C++ class name, code 2 */
53-
UTF8STRING appName; /*!< app name, code 3 */
54-
int proxyFlag; /*!< Proxy capabilities flag, code 90 */
55-
int instanceCount; /*!< number of instances for a custom class, code 91*/
56-
int wasaProxyFlag; /*!< proxy flag (app loaded on save), code 280 */
57-
int entityFlag; /*!< entity flag, code 281 (0 object, 1 entity)*/
51+
UTF8STRING recName; //!< Record name, code 1
52+
UTF8STRING className; //!< C++ class name, code 2
53+
UTF8STRING appName; //!< App name, code 3
54+
int proxyFlag; //!< Proxy capabilities flag, code 90
55+
int instanceCount; //!< Number of instances for a custom class, code 91
56+
int wasaProxyFlag; //!< Proxy flag (app loaded on save), code 280
57+
int entityFlag; //!< Entity flag, code 281 (0 object, 1 entity)
5858
public: //only for read dwg
5959
duint16 classNum;
6060
int dwgType;

0 commit comments

Comments
 (0)