sharpetronics/QGIS
1
0
Fork 0
mirror of https://github.com/qgis/QGIS.git synced 2025-03-01 00:46:20 -05:00
Code Issues Packages Projects Releases Wiki Activity

[style dock] code clean up

Browse Source
This commit is contained in:
Nathan 2016-06-13 19:31:06 +10:00
parent 659d91649c
commit 2ce4eb52c5
1 changed files with 13 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
src/app/qgsmapstylingwidget.cpp
View File

@ -40,6 +40,7 @@
#include "qgsrasterlayer.h"
#include "qgsmapstylepanel.h"
#include "qgsmaplayerstylemanagerwidget.h"
#include "qgsruntimeprofiler.h"
QgsMapStylingWidget::QgsMapStylingWidget( QgsMapCanvas* canvas, QList<QgsMapStylingPanelFactory*> pages, QWidget *parent )
: QWidget( parent )
@ -100,6 +101,7 @@ void QgsMapStylingWidget::setLayer( QgsMapLayer *layer )
{
mLayerCombo->setLayer( nullptr );
mStackedWidget->setCurrentIndex( mNotSupportedPage );
mLastStyleXml.clear();
return;
}
@ -135,7 +137,6 @@ void QgsMapStylingWidget::setLayer( QgsMapLayer *layer )
mOptionsListWidget->addItem( item );
int row = mOptionsListWidget->row( item );
mUserPages[row] = factory;
QgsDebugMsg( QString( "ROW IS %1" ).arg( row ) );
}
}
mOptionsListWidget->addItem( new QListWidgetItem( QgsApplication::getThemeIcon( "mActionHistory.svg" ), "" ) );
@ -150,15 +151,23 @@ void QgsMapStylingWidget::setLayer( QgsMapLayer *layer )
}
mStackedWidget->setCurrentIndex( 1 );
QString errorMsg;
QDomDocument doc( "style" );
mLastStyleXml = doc.createElement( "style" );
doc.appendChild( mLastStyleXml );
mCurrentLayer->writeStyle( mLastStyleXml, doc, errorMsg );
}
void QgsMapStylingWidget::apply()
{
disconnect( mCurrentLayer, SIGNAL( repaintRequested() ), this, SLOT( updateCurrentWidgetLayer() ) );
QString undoName = "Style Change";
if ( !mCurrentLayer )
return;
disconnect( mCurrentLayer, SIGNAL( repaintRequested() ), this, SLOT( updateCurrentWidgetLayer() ) );
QString undoName = "Style Change";
QWidget* current = mWidgetArea->widget();
bool styleWasChanged = false;
@ -191,6 +200,7 @@ void QgsMapStylingWidget::apply()
mRasterStyleWidget->apply();
styleWasChanged = true;
}
pushUndoItem( undoName );
if ( styleWasChanged )
@ -225,7 +235,6 @@ void QgsMapStylingWidget::redo()
void QgsMapStylingWidget::updateCurrentWidgetLayer()
{
QgsDebugMsgLevel( "UPDATE!!!", 4 );
mBlockAutoApply = true;
QgsMapLayer* layer = mCurrentLayer;
@ -349,12 +358,6 @@ void QgsMapStylingWidget::updateCurrentWidgetLayer()
mStackedWidget->setCurrentIndex( mNotSupportedPage );
}
QString errorMsg;
QDomDocument doc( "style" );
mLastStyleXml = doc.createElement( "style" );
doc.appendChild( mLastStyleXml );
mCurrentLayer->writeSymbology( mLastStyleXml, doc, errorMsg );
mBlockAutoApply = false;
}