Fixed modification of rendering pass in symbol levels dialog, fixed crash when using apply in vector layer props dialog.

wonder · wonder · commit 92d7e2329d81 · 2009-07-24T12:26:35.000Z
git-svn-id: http://svn.osgeo.org/qgis/branches/symbology-ng-branch@11167 c8812cc2-4d05-0410-92ff-de0c093fc19c
diff --git a/src/gui/symbology-ng/qgsrendererv2propertiesdialog.cpp b/src/gui/symbology-ng/qgsrendererv2propertiesdialog.cpp
@@ -109,8 +109,8 @@ QgsRendererV2PropertiesDialog::~QgsRendererV2PropertiesDialog()
 
 void QgsRendererV2PropertiesDialog::apply()
 {
-  mLayer->setRendererV2(mRenderer);
-  mRenderer = NULL;
+  // use clone of our temporary renderer
+  mLayer->setRendererV2( mRenderer->clone() );
 }
 
 void QgsRendererV2PropertiesDialog::onOK()
diff --git a/src/gui/symbology-ng/qgssymbollevelsv2dialog.cpp b/src/gui/symbology-ng/qgssymbollevelsv2dialog.cpp
@@ -47,6 +47,8 @@ QgsSymbolLevelsV2Dialog::QgsSymbolLevelsV2Dialog(QgsSymbolV2List symbols, bool u
     setDefaultLevels();
 
   populateTable();
+
+  connect(tableLevels, SIGNAL(cellChanged(int,int)), this, SLOT(renderingPassChanged(int,int)));
 }
 
 void QgsSymbolLevelsV2Dialog::populateTable()
@@ -94,3 +96,13 @@ bool QgsSymbolLevelsV2Dialog::usingLevels() const
 {
   return chkEnable->isChecked();
 }
+
+void QgsSymbolLevelsV2Dialog::renderingPassChanged(int row, int column)
+{
+  if (row < 0 || row >= mSymbols.count())
+    return;
+  QgsSymbolV2* sym = mSymbols[row];
+  if (column < 0 || column >= sym->symbolLayerCount())
+    return;
+  sym->symbolLayer(column)->setRenderingPass( tableLevels->item(row, column)->text().toInt() );
+}
diff --git a/src/gui/symbology-ng/qgssymbollevelsv2dialog.h b/src/gui/symbology-ng/qgssymbollevelsv2dialog.h
@@ -20,6 +20,8 @@ class QgsSymbolLevelsV2Dialog : public QDialog, private Ui::QgsSymbolLevelsV2Dia
 public slots:
     void updateUi();
 
+    void renderingPassChanged( int row, int column );
+
 protected:
     void populateTable();
     void setDefaultLevels();

Original file line number	Diff line number	Diff line change
`@@ -109,8 +109,8 @@ QgsRendererV2PropertiesDialog::~QgsRendererV2PropertiesDialog()`
`109`	`109`
`110`	`110`	`void QgsRendererV2PropertiesDialog::apply()`
`111`	`111`	`{`
`112`		`- mLayer->setRendererV2(mRenderer);`
`113`		`- mRenderer = NULL;`
	`112`	`+ // use clone of our temporary renderer`
	`113`	`+ mLayer->setRendererV2( mRenderer->clone() );`
`114`	`114`	`}`
`115`	`115`
`116`	`116`	`void QgsRendererV2PropertiesDialog::onOK()`