wxGUI/vdigit: fix select features by cat (layer>1)

	      (merge from devbr6, https://trac.osgeo.org/grass/changeset/34851)


git-svn-id: https://svn.osgeo.org/grass/grass/trunk@34853 15284696-431f-4ddb-bdfa-cd5b030d7da7

gui/wxpython/gui_modules/dbm.py

@@ -1094,7 +1094,7 @@ class AttributeManager(wx.Frame):
         if digitToolbar and digitToolbar.GetLayer() and \
                 digitToolbar.GetLayer().GetName() == self.vectmap:
 
-            self.mapdisplay.digit.driver.SetSelected(cats, cats=True)
+            self.mapdisplay.digit.driver.SetSelected(cats, field=self.layer)
             if zoom:
                 n, s, w, e = self.mapdisplay.digit.driver.GetRegionSelected()
                 self.mapdisplay.Map.GetRegion(n=n, s=s, w=w, e=e,
@@ -1904,7 +1904,7 @@ class AttributeManager(wx.Frame):
             digitToolbar = self.mapdisplay.toolbars['vdigit']
             if digitToolbar and digitToolbar.GetLayer() and \
                     digitToolbar.GetLayer().GetName() == self.vectmap:
-                self.mapdisplay.digit.driver.SetSelected(map(int, cats), cats=True)
+                self.mapdisplay.digit.driver.SetSelected(map(int, cats), field=self.layer)
                 self.mapdisplay.digit.DeleteSelectedLines()
             else:
                 gcmd.Command(['v.edit',

gui/wxpython/gui_modules/vdigit.py

@@ -913,16 +913,16 @@ class CDisplayDriver(AbstractDisplayDriver):
 
         return id 
 
-    def SetSelected(self, id, cats=False):
+    def SetSelected(self, id, field=-1):
         """Set selected vector features
 
-        @param id line id to be selected
-        @param cats if True expect categories instead of feature ids
+        @param id list of feature ids/categories to be selected
+        @param field field(layer) number, -1 for ids instead of cats
         """
         Debug.msg(4, "CDisplayDriver.SetSelected(): id=%s" % \
                       id)
 
-        self.__display.SetSelected(id, cats)
+        self.__display.SetSelected(id, field)
 
     def UnSelect(self, id):
         """Unselect vector features

gui/wxpython/vdigit/driver.cpp

@@ -42,7 +42,8 @@ DisplayDriver::DisplayDriver(void *device, void *deviceTmp)
     points = Vect_new_line_struct();
     pointsScreen = new wxList();
     cats = Vect_new_cats_struct();
-    
+
+    selected.field = -1;
     selected.cats = Vect_new_list();
     selected.ids = Vect_new_list();
     selected.idsDupl = Vect_new_list();

gui/wxpython/vdigit/driver.h

@@ -48,9 +48,10 @@ private:
      */
     
     struct _selected {
-	struct ilist *cats;
-	struct ilist *ids;
-	struct ilist *idsDupl;
+	int field;              // field number
+	struct ilist *cats;     // list of cats
+	struct ilist *ids;      // list of ids
+	struct ilist *idsDupl;  // list of duplicated features
     } selected;
     
     bool drawSelected;
@@ -191,7 +192,7 @@ public:
     std::map<int, std::vector<double> > GetSelectedCoord();
     std::map<int, std::vector <int> > GetDuplicates();
     std::vector<double> GetRegionSelected();
-    int SetSelected(std::vector<int>, bool);
+    int SetSelected(std::vector<int>, int);
     int UnSelect(std::vector<int>);
     std::vector<int> GetSelectedVertex(double, double, double);
     void DrawSelected(bool);

gui/wxpython/vdigit/driver_draw.cpp

@@ -173,6 +173,7 @@ int DisplayDriver::DrawMap(bool force)
     /* reset list of selected features by cat 
        -> list of ids - see IsSelected()
     */
+    selected.field = -1;
     Vect_reset_list(selected.cats);
 	
     Vect_destroy_list(listLines);

gui/wxpython/vdigit/driver_select.cpp

@@ -196,7 +196,7 @@ bool DisplayDriver::IsSelected(int line, bool force)
     }
     else { /* select by cat */
 	for (int i = 0; i < cats->n_cats; i++) {
-	    if (cats->field[i] == 1 && /* TODO: field */
+	    if (cats->field[i] == selected.field &&
 		Vect_val_in_list(selected.cats, cats->cat[i])) {
 		/* remember id
 		   -> after drawing all features selected.cats is reseted */
@@ -337,19 +337,23 @@ bool DisplayDriver::IsDuplicated(int line)
 /**
    \brief Set selected vector objects
    
-   \param[in] list of GRASS ids to be set
-   \param[in] cat if True expect categories instead of feature ids
+   \param id list of feature ids to be set
+   \param field field number (-1 for ids instead of cats)
 
    \return 1
 */
-int DisplayDriver::SetSelected(std::vector<int> id, bool cat)
+int DisplayDriver::SetSelected(std::vector<int> id, int field)
 {
     drawSelected = true;
 
-    if (cat)
+    if (field > 0) {
+	selected.field = field;
 	VectorToList(selected.cats, id);
-    else
+    }
+    else {
+	field = -1;
 	VectorToList(selected.ids, id);
+    }
     
     if (id.size() < 1)
 	drawSegments = false;