[FEATURE] Add clear guides action to composer view menu

qgis · Oct 29, 2013 · 46009c6 · 46009c6
1 parent 616588e
commit 46009c6
Show file tree

Hide file tree

Showing 6 changed files with 39 additions and 1 deletion.
diff --git a/python/core/composer/qgscomposition.sip b/python/core/composer/qgscomposition.sip
@@ -52,6 +52,9 @@ class QgsComposition : QGraphicsScene
 
     void setGridVisible( bool b );
     bool gridVisible() const;
+
+    /**Removes all snap lines*/
+    void clearSnapLines();    
 
     void setSnapGridResolution( double r );
     double snapGridResolution() const;

diff --git a/src/app/composer/qgscomposer.cpp b/src/app/composer/qgscomposer.cpp
@@ -265,6 +265,7 @@ QgsComposer::QgsComposer( QgisApp *qgis, const QString& title )
   viewMenu->addAction( mActionShowGuides );
   viewMenu->addAction( mActionSnapGuides );
   viewMenu->addAction( mActionSmartGuides );
+  viewMenu->addAction( mActionClearGuides );
 
   // Panel and toolbar submenus
   mPanelMenu = new QMenu( tr( "Panels" ), this );
@@ -727,6 +728,15 @@ void QgsComposer::on_mActionSmartGuides_triggered( bool checked )
   }
 }
 
+void QgsComposer::on_mActionClearGuides_triggered()
+{
+  //clear guide lines
+  if ( mComposition )
+  {
+    mComposition->clearSnapLines();
+  }
+}
+
 void QgsComposer::on_mActionExportAsPDF_triggered()
 {
   if ( !mComposition || !mView )

diff --git a/src/app/composer/qgscomposer.h b/src/app/composer/qgscomposer.h
@@ -300,6 +300,9 @@ class QgsComposer: public QMainWindow, private Ui::QgsComposerBase
     //!Enable or disable smart guides
     void on_mActionSmartGuides_triggered( bool checked );
 
+    //!Clear guides
+    void on_mActionClearGuides_triggered();
+
     //! Save window state
     void saveWindowState();
 

diff --git a/src/core/composer/qgscomposition.cpp b/src/core/composer/qgscomposition.cpp
@@ -1428,6 +1428,17 @@ void QgsComposition::removeSnapLine( QGraphicsLineItem* line )
   delete line;
 }
 
+void QgsComposition::clearSnapLines()
+{
+  QList< QGraphicsLineItem* >::iterator it = mSnapLines.begin();
+  for ( ; it != mSnapLines.end(); ++it )
+  {
+    removeItem(( *it ) );
+    delete( *it );
+  }
+  mSnapLines.clear();
+}
+
 void QgsComposition::setSnapLinesVisible( bool visible )
 {
   mGuidesVisible = visible;

diff --git a/src/core/composer/qgscomposition.h b/src/core/composer/qgscomposition.h
@@ -124,6 +124,9 @@ class CORE_EXPORT QgsComposition : public QGraphicsScene
     void setSmartGuidesEnabled( bool b ) { mSmartGuides = b; };
     bool smartGuidesEnabled() const {return mSmartGuides;}
 
+    /**Removes all snap lines*/
+    void clearSnapLines();
+
     void setSnapGridResolution( double r );
     double snapGridResolution() const {return mSnapGridResolution;}
 

diff --git a/src/ui/qgscomposerbase.ui b/src/ui/qgscomposerbase.ui
@@ -339,7 +339,15 @@
    <property name="shortcut">
     <string>Ctrl+Alt+;</string>
    </property>
-  </action>     
+  </action>
+  <action name="mActionClearGuides">
+   <property name="text">
+    <string>Clear Guides</string>
+   </property>
+   <property name="toolTip">
+    <string>Clear guides</string>
+   </property>
+  </action>       
   <action name="mActionAddImage">
    <property name="icon">
     <iconset resource="../../images/images.qrc">