Fix undo/redo for rule-based renderer/labeling in styling dock

wonder-sk · wonder-sk · commit d37518d301e7 · 2016-07-06T23:25:41.000+02:00
diff --git a/src/app/qgsrulebasedlabelingwidget.cpp b/src/app/qgsrulebasedlabelingwidget.cpp
@@ -69,6 +69,10 @@ QgsRuleBasedLabelingWidget::QgsRuleBasedLabelingWidget( QgsVectorLayer* layer, Q
 
   mModel = new QgsRuleBasedLabelingModel( mRootRule );
   viewRules->setModel( mModel );
+
+  connect( mModel, SIGNAL( dataChanged( QModelIndex, QModelIndex ) ), this, SIGNAL( widgetChanged() ) );
+  connect( mModel, SIGNAL( rowsInserted( QModelIndex, int, int ) ), this, SIGNAL( widgetChanged() ) );
+  connect( mModel, SIGNAL( rowsRemoved( QModelIndex, int, int ) ), this, SIGNAL( widgetChanged() ) );
 }
 
 QgsRuleBasedLabelingWidget::~QgsRuleBasedLabelingWidget()
@@ -116,8 +120,6 @@ void QgsRuleBasedLabelingWidget::ruleWidgetPanelAccepted( QgsPanelWidget* panel
 
   QModelIndex index = viewRules->selectionModel()->currentIndex();
   mModel->updateRule( index.parent(), index.row() );
-
-  emit widgetChanged();
 }
 
 void QgsRuleBasedLabelingWidget::liveUpdateRuleFromPanel()
@@ -158,7 +160,6 @@ void QgsRuleBasedLabelingWidget::removeRule()
   }
   // make sure that the selection is gone
   viewRules->selectionModel()->clear();
-  emit widgetChanged();
 }
 
 void QgsRuleBasedLabelingWidget::copy()
@@ -171,7 +172,6 @@ void QgsRuleBasedLabelingWidget::copy()
 
   QMimeData* mime = mModel->mimeData( indexlist );
   QApplication::clipboard()->setMimeData( mime );
-  emit widgetChanged();
 }
 
 void QgsRuleBasedLabelingWidget::paste()
@@ -184,7 +184,6 @@ void QgsRuleBasedLabelingWidget::paste()
   else
     index = indexlist.first();
   mModel->dropMimeData( mime, Qt::CopyAction, index.row(), index.column(), index.parent() );
-  emit widgetChanged();
 }
 
 QgsRuleBasedLabeling::Rule* QgsRuleBasedLabelingWidget::currentRule()
diff --git a/src/gui/symbology-ng/qgsrulebasedrendererv2widget.cpp b/src/gui/symbology-ng/qgsrulebasedrendererv2widget.cpp
@@ -107,6 +107,8 @@ QgsRuleBasedRendererV2Widget::QgsRuleBasedRendererV2Widget( QgsVectorLayer* laye
   connect( btnRenderingOrder, SIGNAL( clicked() ), this, SLOT( setRenderingOrder() ) );
 
   connect( mModel, SIGNAL( dataChanged( QModelIndex, QModelIndex ) ), this, SIGNAL( widgetChanged() ) );
+  connect( mModel, SIGNAL( rowsInserted( QModelIndex, int, int ) ), this, SIGNAL( widgetChanged() ) );
+  connect( mModel, SIGNAL( rowsRemoved( QModelIndex, int, int ) ), this, SIGNAL( widgetChanged() ) );
 
   currentRuleChanged();
   selectedRulesChanged();
@@ -462,7 +464,6 @@ void QgsRuleBasedRendererV2Widget::refineRuleCategoriesAccepted( QgsPanelWidget
     QgsRuleBasedRendererV2::refineRuleCategories( initialRule, r );
   }
   mModel->finishedAddingRules();
-  emit widgetChanged();
 }
 
 void QgsRuleBasedRendererV2Widget::refineRuleRangesAccepted( QgsPanelWidget *panel )
@@ -478,7 +479,6 @@ void QgsRuleBasedRendererV2Widget::refineRuleRangesAccepted( QgsPanelWidget *pan
     QgsRuleBasedRendererV2::refineRuleRanges( initialRule, r );
   }
   mModel->finishedAddingRules();
-  emit widgetChanged();
 }
 
 void QgsRuleBasedRendererV2Widget::ruleWidgetPanelAccepted( QgsPanelWidget *panel )
@@ -490,7 +490,6 @@ void QgsRuleBasedRendererV2Widget::ruleWidgetPanelAccepted( QgsPanelWidget *pane
   QModelIndex index = viewRules->selectionModel()->currentIndex();
   mModel->updateRule( index.parent(), index.row() );
   mModel->clearFeatureCounts();
-  emit widgetChanged();
 }
 
 void QgsRuleBasedRendererV2Widget::liveUpdateRuleFromPanel()

Original file line number	Diff line number	Diff line change
`@@ -69,6 +69,10 @@ QgsRuleBasedLabelingWidget::QgsRuleBasedLabelingWidget( QgsVectorLayer* layer, Q`
`69`	`69`
`70`	`70`	`mModel = new QgsRuleBasedLabelingModel( mRootRule );`
`71`	`71`	`viewRules->setModel( mModel );`
	`72`	`+`
	`73`	`+ connect( mModel, SIGNAL( dataChanged( QModelIndex, QModelIndex ) ), this, SIGNAL( widgetChanged() ) );`
	`74`	`+ connect( mModel, SIGNAL( rowsInserted( QModelIndex, int, int ) ), this, SIGNAL( widgetChanged() ) );`
	`75`	`+ connect( mModel, SIGNAL( rowsRemoved( QModelIndex, int, int ) ), this, SIGNAL( widgetChanged() ) );`
`72`	`76`	`}`
`73`	`77`
`74`	`78`	`QgsRuleBasedLabelingWidget::~QgsRuleBasedLabelingWidget()`
`@@ -116,8 +120,6 @@ void QgsRuleBasedLabelingWidget::ruleWidgetPanelAccepted( QgsPanelWidget* panel`
`116`	`120`
`117`	`121`	`QModelIndex index = viewRules->selectionModel()->currentIndex();`
`118`	`122`	`mModel->updateRule( index.parent(), index.row() );`
`119`		`-`
`120`		`- emit widgetChanged();`
`121`	`123`	`}`
`122`	`124`
`123`	`125`	`void QgsRuleBasedLabelingWidget::liveUpdateRuleFromPanel()`
`@@ -158,7 +160,6 @@ void QgsRuleBasedLabelingWidget::removeRule()`
`158`	`160`	`}`
`159`	`161`	`// make sure that the selection is gone`
`160`	`162`	`viewRules->selectionModel()->clear();`
`161`		`- emit widgetChanged();`
`162`	`163`	`}`
`163`	`164`
`164`	`165`	`void QgsRuleBasedLabelingWidget::copy()`
`@@ -171,7 +172,6 @@ void QgsRuleBasedLabelingWidget::copy()`
`171`	`172`
`172`	`173`	`QMimeData* mime = mModel->mimeData( indexlist );`
`173`	`174`	`QApplication::clipboard()->setMimeData( mime );`
`174`		`- emit widgetChanged();`
`175`	`175`	`}`
`176`	`176`
`177`	`177`	`void QgsRuleBasedLabelingWidget::paste()`
`@@ -184,7 +184,6 @@ void QgsRuleBasedLabelingWidget::paste()`
`184`	`184`	`else`
`185`	`185`	`index = indexlist.first();`
`186`	`186`	`mModel->dropMimeData( mime, Qt::CopyAction, index.row(), index.column(), index.parent() );`
`187`		`- emit widgetChanged();`
`188`	`187`	`}`
`189`	`188`
`190`	`189`	`QgsRuleBasedLabeling::Rule* QgsRuleBasedLabelingWidget::currentRule()`
Original file line number	Diff line number	Diff line change
`@@ -107,6 +107,8 @@ QgsRuleBasedRendererV2Widget::QgsRuleBasedRendererV2Widget( QgsVectorLayer* laye`
`107`	`107`	`connect( btnRenderingOrder, SIGNAL( clicked() ), this, SLOT( setRenderingOrder() ) );`
`108`	`108`
`109`	`109`	`connect( mModel, SIGNAL( dataChanged( QModelIndex, QModelIndex ) ), this, SIGNAL( widgetChanged() ) );`
	`110`	`+ connect( mModel, SIGNAL( rowsInserted( QModelIndex, int, int ) ), this, SIGNAL( widgetChanged() ) );`
	`111`	`+ connect( mModel, SIGNAL( rowsRemoved( QModelIndex, int, int ) ), this, SIGNAL( widgetChanged() ) );`
`110`	`112`
`111`	`113`	`currentRuleChanged();`
`112`	`114`	`selectedRulesChanged();`
`@@ -462,7 +464,6 @@ void QgsRuleBasedRendererV2Widget::refineRuleCategoriesAccepted( QgsPanelWidget`
`462`	`464`	`QgsRuleBasedRendererV2::refineRuleCategories( initialRule, r );`
`463`	`465`	`}`
`464`	`466`	`mModel->finishedAddingRules();`
`465`		`- emit widgetChanged();`
`466`	`467`	`}`
`467`	`468`
`468`	`469`	`void QgsRuleBasedRendererV2Widget::refineRuleRangesAccepted( QgsPanelWidget *panel )`
`@@ -478,7 +479,6 @@ void QgsRuleBasedRendererV2Widget::refineRuleRangesAccepted( QgsPanelWidget *pan`
`478`	`479`	`QgsRuleBasedRendererV2::refineRuleRanges( initialRule, r );`
`479`	`480`	`}`
`480`	`481`	`mModel->finishedAddingRules();`
`481`		`- emit widgetChanged();`
`482`	`482`	`}`
`483`	`483`
`484`	`484`	`void QgsRuleBasedRendererV2Widget::ruleWidgetPanelAccepted( QgsPanelWidget *panel )`
`@@ -490,7 +490,6 @@ void QgsRuleBasedRendererV2Widget::ruleWidgetPanelAccepted( QgsPanelWidget *pane`
`490`	`490`	`QModelIndex index = viewRules->selectionModel()->currentIndex();`
`491`	`491`	`mModel->updateRule( index.parent(), index.row() );`
`492`	`492`	`mModel->clearFeatureCounts();`
`493`		`- emit widgetChanged();`
`494`	`493`	`}`
`495`	`494`
`496`	`495`	`void QgsRuleBasedRendererV2Widget::liveUpdateRuleFromPanel()`