apply #3770: allow adding parts to line and point features and some r…

…efactoring
qgis · May 5, 2011 · b8642a9 · b8642a9
1 parent a9aafd0
commit b8642a9
Show file tree

Hide file tree

Showing 24 changed files with 442 additions and 609 deletions.
diff --git a/images/images.qrc b/images/images.qrc
@@ -21,7 +21,7 @@
         <file>themes/default/mActionAddArrow.png</file>
         <file>themes/default/mActionAddBasicShape.png</file>
         <file>themes/default/mActionAddImage.png</file>
-        <file>themes/default/mActionAddIsland.png</file>
+        <file>themes/default/mActionAddPart.png</file>
         <file>themes/default/mActionAddLayer.png</file>
         <file>themes/default/mActionAddLegend.png</file>
         <file>themes/default/mActionAddMap.png</file>
@@ -219,7 +219,7 @@
         <file>themes/gis/mActionAddBasicShape.png</file>
         <file>themes/gis/mActionAddGPSLayer.png</file>
         <file>themes/gis/mActionAddImage.png</file>
-        <file>themes/gis/mActionAddIsland.png</file>
+        <file>themes/gis/mActionAddPart.png</file>
         <file>themes/gis/mActionAddLayer.png</file>
         <file>themes/gis/mActionAddLegend.png</file>
         <file>themes/gis/mActionAddMap.png</file>

diff --git a/images/themes/default/mActionAddIsland.png → images/themes/default/mActionAddPart.png b/images/themes/default/mActionAddIsland.png → images/themes/default/mActionAddPart.png
diff --git a/images/themes/gis/mActionAddIsland.png → images/themes/gis/mActionAddPart.png b/images/themes/gis/mActionAddIsland.png → images/themes/gis/mActionAddPart.png
diff --git a/python/core/qgsvectorlayer.sip b/python/core/qgsvectorlayer.sip
@@ -295,16 +295,18 @@ public:
      5 no feature found where ring can be inserted*/
   int addRing(const QList<QgsPoint>& ring);
 
-  /**Adds a new island polygon to a multipolygon feature
+  /**Adds a new part to a multipart feature
    @return
      0 in case of success,
-     1 if selected feature is not multipolygon,
+     1 if selected feature is not multipart,
      2 if ring is not a valid geometry,
      3 if new polygon ring not disjoint with existing rings,
      4 if no feature was selected,
      5 if several features are selected,
      6 if selected geometry not found*/
-  int addIsland(const QList<QgsPoint>& ring);
+  int addPart( const QList<QgsPoint>& ring );
+  int addIsland( const QList<QgsPoint>& ring ) /Deprecated/;
+
 
   /**Translates feature by dx, dy
      @param featureId id of the feature to translate

diff --git a/python/gui/qgisinterface.sip b/python/gui/qgisinterface.sip
@@ -201,17 +201,19 @@ class QgisInterface : QObject
     virtual QAction *actionCopyFeatures() = 0;
     virtual QAction *actionPasteFeatures() = 0;
     virtual QAction *actionEditSeparator1() = 0 /Deprecated/;
-    virtual QAction *actionCapturePoint() = 0;
-    virtual QAction *actionCaptureLine() = 0;
-    virtual QAction *actionCapturePolygon() = 0;
+    virtual QAction *actionAddFeature() = 0;
+    virtual QAction *actionCapturePoint() = 0 /Deprecated/;
+    virtual QAction *actionCaptureLine() = 0 /Deprecated/;
+    virtual QAction *actionCapturePolygon() = 0 /Deprecated/;
     virtual QAction *actionDeleteSelected() = 0;
     virtual QAction *actionMoveFeature() = 0;
     virtual QAction *actionSplitFeatures() = 0;
     virtual QAction *actionAddVertex() = 0 /Deprecated/;
     virtual QAction *actionDeleteVertex() = 0 /Deprecated/;
     virtual QAction *actionMoveVertex() = 0 /Deprecated/;
     virtual QAction *actionAddRing() = 0;
-    virtual QAction *actionAddIsland() = 0;
+    virtual QAction *actionAddPart() = 0;
+    virtual QAction *actionAddIsland() = 0 /Deprecated/;
     virtual QAction *actionSimplifyFeature() = 0;
     virtual QAction *actionDeleteRing() = 0;
     virtual QAction *actionDeletePart() = 0;

diff --git a/src/app/CMakeLists.txt b/src/app/CMakeLists.txt
@@ -34,7 +34,7 @@ SET(QGIS_APP_SRCS
   qgslabelpreview.cpp
   qgsmaptooladdfeature.cpp
   qgsmaptooladdvertex.cpp
-  qgsmaptooladdisland.cpp
+  qgsmaptooladdpart.cpp
   qgsmaptooladdring.cpp
   qgsmaptoolannotation.cpp
   qgsmaptoolcapture.cpp
@@ -172,7 +172,8 @@ SET (QGIS_APP_MOC_HDRS
   qgslabelpropertydialog.h
   qgsmanageconnectionsdialog.h
   qgsmaptooladdfeature.h
-  qgsmaptooladdisland.h
+  qgsmaptoolcapture.h
+  qgsmaptooladdpart.h
   qgsmaptooladdring.h
   qgsmaptooladdvertex.h
   qgsmaptoolchangelabelproperties.h