sharpetronics/QGIS
1
0
Fork 0
mirror of https://github.com/qgis/QGIS.git synced 2025-02-25 00:58:06 -05:00
Code Issues Packages Projects Releases Wiki Activity

indentation update

Browse Source
This commit is contained in:
Juergen E. Fischer 2015-06-26 13:59:53 +02:00
parent ae7f180c09
commit 65797222f8
2 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/gui/symbology-ng/qgssymbolv2selectordialog.cpp
View File

@ -47,10 +47,10 @@
static const int SymbolLayerItemType = QStandardItem::UserType + 1;
DataDefinedRestorer::DataDefinedRestorer( QgsSymbolV2* symbol, const QgsSymbolLayerV2* symbolLayer )
: mMarker( NULL )
, mMarkerSymbolLayer( NULL )
, mLine( NULL )
, mLineSymbolLayer( NULL )
: mMarker( NULL )
, mMarkerSymbolLayer( NULL )
, mLine( NULL )
, mLineSymbolLayer( NULL )
{
if ( symbolLayer->type() == QgsSymbolV2::Marker && symbol->type() == QgsSymbolV2::Marker )
{
@ -61,16 +61,16 @@ DataDefinedRestorer::DataDefinedRestorer( QgsSymbolV2* symbol, const QgsSymbolLa
mDDAngle = mMarker->dataDefinedAngle();
// check if restore is actually needed
if ( mDDSize == QgsDataDefined() && mDDAngle == QgsDataDefined() )
mMarker = NULL;
mMarker = NULL;
}
else if( symbolLayer->type() == QgsSymbolV2::Line && symbol->type() == QgsSymbolV2::Line )
else if ( symbolLayer->type() == QgsSymbolV2::Line && symbol->type() == QgsSymbolV2::Line )
{
mLine = static_cast<QgsLineSymbolV2*>( symbol );
mLineSymbolLayer = static_cast<const QgsLineSymbolLayerV2*>( symbolLayer );
mDDWidth = mLine->dataDefinedWidth();
// check if restore is actually needed
if ( mDDWidth == QgsDataDefined() )
mLine = NULL;
mLine = NULL;
}
save();
}
@ -95,16 +95,16 @@ void DataDefinedRestorer::restore()
if ( mMarker )
{
if ( mDDSize != QgsDataDefined() &&
(mSize != mMarkerSymbolLayer->size() || mMarkerOffset != mMarkerSymbolLayer->offset()) )
( mSize != mMarkerSymbolLayer->size() || mMarkerOffset != mMarkerSymbolLayer->offset() ) )
mMarker->setDataDefinedSize( mDDSize );
if ( mDDAngle != QgsDataDefined() &&
mAngle != mMarkerSymbolLayer->angle() )
mAngle != mMarkerSymbolLayer->angle() )
mMarker->setDataDefinedAngle( mDDAngle );
}
else if ( mLine )
{
if ( mDDWidth != QgsDataDefined() &&
(mWidth != mLineSymbolLayer->width() || mLineOffset != mLineSymbolLayer->offset()) )
( mWidth != mLineSymbolLayer->width() || mLineOffset != mLineSymbolLayer->offset() ) )
mLine->setDataDefinedWidth( mDDWidth );
}
save();

6
src/gui/symbology-ng/qgssymbolv2selectordialog.h
View File

@ -41,9 +41,9 @@ class QgsLineSymbolLayerV2;
class DataDefinedRestorer: public QObject
{
Q_OBJECT
Q_OBJECT
public:
DataDefinedRestorer( QgsSymbolV2* symbol, const QgsSymbolLayerV2* symbolLayer);
DataDefinedRestorer( QgsSymbolV2* symbol, const QgsSymbolLayerV2* symbolLayer );
public slots:
void restore();
@ -59,7 +59,7 @@ class DataDefinedRestorer: public QObject
QgsLineSymbolV2* mLine;
const QgsLineSymbolLayerV2* mLineSymbolLayer;
double mWidth;
double mWidth;
double mLineOffset;
QgsDataDefined mDDWidth;