icon added,fixed issue with no selection on

qgis · Jan 12, 2013 · eef2efc · eef2efc
1 parent f210b84
commit eef2efc
Show file tree

Hide file tree

Showing 6 changed files with 19 additions and 13 deletions.
diff --git a/images/images.qrc b/images/images.qrc
@@ -142,6 +142,7 @@
         <file>themes/default/mActionReshape.png</file>
         <file>themes/default/mActionRollbackAllEdits.svg</file>
         <file>themes/default/mActionRollbackEdits.svg</file>
+        <file>themes/default/mActionRotateFeature.png</file>
         <file>themes/default/mActionRotateLabel.png</file>
         <file>themes/default/mActionRotateLabel.svg</file>
         <file>themes/default/mActionRotatePointSymbols.png</file>

diff --git a/images/themes/default/mActionRotateFeature.png b/images/themes/default/mActionRotateFeature.png
diff --git a/src/app/qgisapp.cpp b/src/app/qgisapp.cpp
@@ -1701,7 +1701,7 @@ void QgisApp::setTheme( QString theThemeName )
   mActionPasteFeatures->setIcon( QgsApplication::getThemeIcon( "/mActionEditPaste.png" ) );
   mActionAddFeature->setIcon( QgsApplication::getThemeIcon( "/mActionCapturePoint.png" ) );
   mActionMoveFeature->setIcon( QgsApplication::getThemeIcon( "/mActionMoveFeature.png" ) );
-  //mActionRotateFeature->setIcon( QgsApplication::getThemeIcon( "/mActionRotateFeature.png" ) );
+  mActionRotateFeature->setIcon( QgsApplication::getThemeIcon( "/mActionRotateFeature.png" ) );
   mActionReshapeFeatures->setIcon( QgsApplication::getThemeIcon( "/mActionReshape.png" ) );
   mActionSplitFeatures->setIcon( QgsApplication::getThemeIcon( "/mActionSplitFeatures.svg" ) );
   mActionDeleteSelected->setIcon( QgsApplication::getThemeIcon( "/mActionDeleteSelected.png" ) );

diff --git a/src/app/qgsmaptoolrotatefeature.cpp b/src/app/qgsmaptoolrotatefeature.cpp
@@ -33,6 +33,7 @@
 QgsMapToolRotateFeature::QgsMapToolRotateFeature( QgsMapCanvas* canvas ): QgsMapToolEdit( canvas ), mRubberBand( 0 )
 {
   mRotation = 0;
+  mAnchorPoint = 0;
 }
 
 QgsMapToolRotateFeature::~QgsMapToolRotateFeature()
@@ -92,7 +93,7 @@ void QgsMapToolRotateFeature::canvasPressEvent( QMouseEvent * e )
   }
   else
   {
-    mMovedFeatures = vlayer->selectedFeaturesIds();
+    mRotatedFeatures = vlayer->selectedFeaturesIds();
 
     mRubberBand = createRubberBand();
     for ( int i = 0; i < vlayer->selectedFeatureCount(); i++ )
@@ -143,7 +144,7 @@ void QgsMapToolRotateFeature::canvasReleaseEvent( QMouseEvent * e )
   }
 
   int i = 0;
-  foreach ( QgsFeatureId id, mMovedFeatures )
+  foreach ( QgsFeatureId id, mRotatedFeatures )
   {
     QgsFeature feat;
     vlayer->featureAtId( id, feat );

diff --git a/src/app/qgsmaptoolrotatefeature.h b/src/app/qgsmaptoolrotatefeature.h
@@ -61,7 +61,7 @@ class QgsMapToolRotateFeature: public QgsMapToolEdit
     QgsRubberBand* mRubberBand;
 
     /**Id of moved feature*/
-    QgsFeatureIds mMovedFeatures;
+    QgsFeatureIds mRotatedFeatures;
     double mRotation;
 
     QPoint mStPoint;

diff --git a/src/ui/qgisapp.ui b/src/ui/qgisapp.ui
@@ -1970,15 +1970,19 @@ Acts on currently active editable layer</string>
    </property>
   </action>
   <action name="mActionRotateFeature">
-   <property name="checkable">
-    <bool>true</bool>
-   </property>
-   <property name="text">
-    <string>Rotate Feature(s)</string>
-   </property>
-   <property name="toolTip">
-    <string>Rotate Feature(s)</string>
-   </property>
+  <property name="checkable">
+      <bool>true</bool>
+     </property>
+     <property name="icon">
+      <iconset resource="../../images/images.qrc">
+       <normaloff>:/images/themes/default/mActionRotateFeature.png</normaloff>:/images/themes/default/mActionRotateFeature.png</iconset>
+     </property>
+     <property name="text">
+      <string>Rotate Feature(s)</string>
+     </property>
+     <property name="toolTip">
+      <string>Rotate Feature(s)</string>
+     </property>
   </action>
  </widget>
  <resources>