Limit canvas redraws when working with vector layer undo stack

dakcarto · dakcarto · commit 2de2f2327e3c · 2013-02-10T22:48:03.000-07:00
- Fix unreported bug where clicking on group in legend would clear previously selected vector layer's undo stack
- Ensure empty view is created on project load (cosmetic)
diff --git a/src/app/qgsundowidget.cpp b/src/app/qgsundowidget.cpp
@@ -61,13 +61,15 @@ void QgsUndoWidget::destroyStack()
 {
   if ( mUndoStack != NULL )
   {
-    mUndoStack->clear();
+    // do not clear undo stack here, just null pointer
     mUndoStack = NULL;
   }
   if ( mUndoView != NULL )
   {
     mUndoView->close();
-    mUndoView = NULL;
+    delete mUndoView;
+    mUndoView = new QUndoView( dockWidgetContents );
+    gridLayout->addWidget( mUndoView, 0, 0, 1, 2 );
   }
 }
 
@@ -99,23 +101,24 @@ void QgsUndoWidget::indexChanged( int curIndx )
   // when individually redoing, differentiate between last redo and a new command added to stack
   bool lastRedo = ( mPreviousIndex == ( mPreviousCount - 1 ) && mPreviousCount == curCount && !canRedo );
 
-  bool debugThis = false;
-  if ( debugThis && offset != 0 )
+  if ( offset != 0 )
   {
-    // '= Rendering =' text is for filtering log results to also only show canvas rendering event
-    QgsDebugMsg( QString( "= Rendering = curIndx : %1" ).arg( curIndx ) );
-    QgsDebugMsg( QString( "= Rendering = offset  : %1" ).arg( offset ) );
-    QgsDebugMsg( QString( "= Rendering = curCount: %1" ).arg( curCount ) );
+    QgsDebugMsg( QString( "curIndx : %1" ).arg( curIndx ) );
+    QgsDebugMsg( QString( "offset  : %1" ).arg( offset ) );
+    QgsDebugMsg( QString( "curCount: %1" ).arg( curCount ) );
     if ( lastRedo )
-      QgsDebugMsg( QString( "= Rendering = lastRedo: true" ) );
+      QgsDebugMsg( QString( "lastRedo: true" ) );
   }
 
-  // avoid canvas refresh when only a command was added to stack (i.e. no user undo/redo action)
-  // or when user has clicked back in view history then added a new command to the stack
+  // avoid canvas redraws when only new command was added to stack (i.e. no user undo/redo action)
+  // or when user has clicked back in QUndoView history then added a new command to the stack
   if ( offset > 1 || ( offset == 1 && ( canRedo || lastRedo ) ) )
   {
     if ( mMapCanvas )
+    {
+      QgsDebugMsg( QString( "trigger redraw" ) );
       mMapCanvas->refresh();
+    }
   }
 
   mPreviousIndex = curIndx;
diff --git a/src/core/qgsvectorlayer.cpp b/src/core/qgsvectorlayer.cpp
@@ -2228,7 +2228,7 @@ bool QgsVectorLayer::startEditing()
   mEditBuffer = new QgsVectorLayerEditBuffer( this );
   // forward signals
   connect( mEditBuffer, SIGNAL( layerModified() ), this, SIGNAL( layerModified() ) ); // TODO[MD]: necessary?
-  connect( mEditBuffer, SIGNAL( layerModified() ), this, SLOT( triggerRepaint() ) ); // TODO[MD]: works well?
+  //connect( mEditBuffer, SIGNAL( layerModified() ), this, SLOT( triggerRepaint() ) ); // TODO[MD]: works well?
   connect( mEditBuffer, SIGNAL( featureAdded( QgsFeatureId ) ), this, SIGNAL( featureAdded( QgsFeatureId ) ) );
   connect( mEditBuffer, SIGNAL( featureDeleted( QgsFeatureId ) ), this, SIGNAL( featureDeleted( QgsFeatureId ) ) );
   connect( mEditBuffer, SIGNAL( geometryChanged( QgsFeatureId, QgsGeometry& ) ), this, SIGNAL( geometryChanged( QgsFeatureId, QgsGeometry& ) ) );
diff --git a/src/core/qgsvectorlayereditbuffer.cpp b/src/core/qgsvectorlayereditbuffer.cpp
@@ -445,10 +445,9 @@ void QgsVectorLayerEditBuffer::rollBack()
   if ( !isModified() )
     return;
 
-  while ( L->undoStack()->canUndo() )
-  {
-    L->undoStack()->undo();
-  }
+  // limit canvas redraws to one by jumping to beginning of stack
+  // see QgsUndoWidget::indexChanged
+  L->undoStack()->setIndex( 0 );
 
   Q_ASSERT( mAddedAttributes.isEmpty() );
   Q_ASSERT( mDeletedAttributeIds.isEmpty() );

Original file line number	Diff line number	Diff line change
`@@ -61,13 +61,15 @@ void QgsUndoWidget::destroyStack()`
`61`	`61`	`{`
`62`	`62`	`if ( mUndoStack != NULL )`
`63`	`63`	`{`
`64`		`- mUndoStack->clear();`
	`64`	`+ // do not clear undo stack here, just null pointer`
`65`	`65`	`mUndoStack = NULL;`
`66`	`66`	`}`
`67`	`67`	`if ( mUndoView != NULL )`
`68`	`68`	`{`
`69`	`69`	`mUndoView->close();`
`70`		`- mUndoView = NULL;`
	`70`	`+ delete mUndoView;`
	`71`	`+ mUndoView = new QUndoView( dockWidgetContents );`
	`72`	`+ gridLayout->addWidget( mUndoView, 0, 0, 1, 2 );`
`71`	`73`	`}`
`72`	`74`	`}`
`73`	`75`
`@@ -99,23 +101,24 @@ void QgsUndoWidget::indexChanged( int curIndx )`
`99`	`101`	`// when individually redoing, differentiate between last redo and a new command added to stack`
`100`	`102`	`bool lastRedo = ( mPreviousIndex == ( mPreviousCount - 1 ) && mPreviousCount == curCount && !canRedo );`
`101`	`103`
`102`		`- bool debugThis = false;`
`103`		`- if ( debugThis && offset != 0 )`
	`104`	`+ if ( offset != 0 )`
`104`	`105`	`{`
`105`		`- // '= Rendering =' text is for filtering log results to also only show canvas rendering event`
`106`		`- QgsDebugMsg( QString( "= Rendering = curIndx : %1" ).arg( curIndx ) );`
`107`		`- QgsDebugMsg( QString( "= Rendering = offset : %1" ).arg( offset ) );`
`108`		`- QgsDebugMsg( QString( "= Rendering = curCount: %1" ).arg( curCount ) );`
	`106`	`+ QgsDebugMsg( QString( "curIndx : %1" ).arg( curIndx ) );`
	`107`	`+ QgsDebugMsg( QString( "offset : %1" ).arg( offset ) );`
	`108`	`+ QgsDebugMsg( QString( "curCount: %1" ).arg( curCount ) );`
`109`	`109`	`if ( lastRedo )`
`110`		`- QgsDebugMsg( QString( "= Rendering = lastRedo: true" ) );`
	`110`	`+ QgsDebugMsg( QString( "lastRedo: true" ) );`
`111`	`111`	`}`
`112`	`112`
`113`		`- // avoid canvas refresh when only a command was added to stack (i.e. no user undo/redo action)`
`114`		`- // or when user has clicked back in view history then added a new command to the stack`
	`113`	`+ // avoid canvas redraws when only new command was added to stack (i.e. no user undo/redo action)`
	`114`	`+ // or when user has clicked back in QUndoView history then added a new command to the stack`
`115`	`115`	`if ( offset > 1 \|\| ( offset == 1 && ( canRedo \|\| lastRedo ) ) )`
`116`	`116`	`{`
`117`	`117`	`if ( mMapCanvas )`
	`118`	`+ {`
	`119`	`+ QgsDebugMsg( QString( "trigger redraw" ) );`
`118`	`120`	`mMapCanvas->refresh();`
	`121`	`+ }`
`119`	`122`	`}`
`120`	`123`
`121`	`124`	`mPreviousIndex = curIndx;`