Changeset 6219

Timestamp:

Mar 29, 2016, 11:54:22 AM (8 years ago)

Author:

ldelgass

Message:

Stubs for editing feature selection set

Location:

geovis/trunk

Files:

• Renderer.cpp (modified) (2 diffs)
• Renderer.h (modified) (5 diffs)
• RendererCmd.cpp (modified) (2 diffs)

geovis/trunk/Renderer.cpp

@@ -1575 +1575 @@
 }
 
-void Renderer::selectFeatures(std::vector<unsigned long>& featureIDs, const char *layerName)
+void Renderer::deselectFeatures(std::vector<unsigned long>& featureIDs, const char *layerName)
+{
+    TRACE("Deselect features layer '%s', num features: %u", layerName, featureIDs.size());
+    for (unsigned int i = 0; i < featureIDs.size(); i++) {
+        _selectedFeatures[layerName].erase(featureIDs.at(i));
+    }
+    FeatureSelectionHashmap::iterator itr = _selectedFeatures.find(layerName);
+    if (itr != _selectedFeatures.end()) {
+        for (FeatureSelectionHashmap::mapped_type::iterator fitr = itr->second.begin();
+             fitr != itr->second.end(); ++fitr) {
+            TRACE("Selection: %lu", *fitr);
+        }
+    } else {
+        TRACE("No selection");
+    }
+}
+
+void Renderer::selectFeatures(std::vector<unsigned long>& featureIDs, const char *layerName, bool clear)
 {
     TRACE("Select layer '%s', num features: %u", layerName, featureIDs.size());
-    clearSelection();
+    if (clear) {
+        clearSelection();
+        _selectedFeatures.clear();
+    }
     if (featureIDs.size() == 0) {
         // clear selection
@@ -1588 +1608 @@
         return;
     }
-#ifdef WANT_TRACE
     for (unsigned int i = 0; i < featureIDs.size(); i++) {
         TRACE("feature ID: %u", featureIDs.at(i));
-    }
-#endif
+        _selectedFeatures[layerName].insert(featureIDs.at(i));
+    }
+    FeatureSelectionHashmap::iterator itr = _selectedFeatures.find(layerName);
+    if (itr != _selectedFeatures.end()) {
+        for (FeatureSelectionHashmap::mapped_type::iterator fitr = itr->second.begin();
+             fitr != itr->second.end(); ++fitr) {
+            TRACE("Selection: %lu", *fitr);
+        }
+    } else {
+        TRACE("No selection");
+    }
     unsigned long fid = featureIDs.at(0);
 

geovis/trunk/Renderer.h

@@ -469 +469 @@
     }
 
-    bool mouseToLatLong(int mouseX, int mouseY, double *latitude, double *longitude);
+    bool mouseToLatLong(int mouseX, int mouseY,
+                        double *latitude, double *longitude);
 
     bool getWorldCoords(const osgEarth::GeoPoint& mapPt, osg::Vec3d *world);
@@ -529 +530 @@
     void setSelectMode(SelectMode mode);
 
-    void selectFeatures(std::vector<unsigned long>& featureIDs, const char *layerName);
+    void selectFeatures(std::vector<unsigned long>& featureIDs,
+                        const char *layerName, bool clear = true);
+
+    void deselectFeatures(std::vector<unsigned long>& featureIDs,
+                          const char *layerName);
 
     void addPlacard(const osgEarth::GeoPoint& location,
@@ -537 +542 @@
     void clearSelection();
 
-    void addRhumbBox(double latMin, double latMax, double longMin, double longMax);
+    void addRhumbBox(double latMin, double latMax,
+                     double longMin, double longMax);
 
     void initBoxSelection(int x, int y);
@@ -585 +591 @@
     typedef std::tr1::unordered_map<ViewpointId, osgEarth::Viewpoint> ViewpointHashmap;
     typedef std::tr1::unordered_map<std::string, Placard> PlacardHashmap;
+    typedef std::tr1::unordered_map<std::string, std::set<unsigned long> > FeatureSelectionHashmap;
 
     void initAnnotations();
@@ -645 +652 @@
     bool _pickPending;
     osg::ref_ptr<osg::Group> _placeNodes;
+    FeatureSelectionHashmap _selectedFeatures;
     std::set<osgEarth::Annotation::AnnotationNode *> _hovered;
     std::set<osgEarth::Annotation::AnnotationNode *> _selected;

geovis/trunk/RendererCmd.cpp

@@ -3459 +3459 @@
 
 static int
+SelectAddOp(ClientData clientData, Tcl_Interp *interp, int objc,
+            Tcl_Obj *const *objv)
+{
+    int numIDs;
+    Tcl_Obj **ids;
+    if (Tcl_ListObjGetElements(interp, objv[2], &numIDs, &ids) != TCL_OK) {
+        return TCL_ERROR;
+    }
+    if (numIDs == 0) {
+        Tcl_AppendResult(interp, "no IDs in list", (char *)NULL);
+        return TCL_ERROR;
+    }
+    std::vector<unsigned long> featureIDs;
+    for (int i = 0; i < numIDs; i++) {
+        long id;
+        if (Tcl_GetLongFromObj(interp, ids[i], &id) != TCL_OK) {
+            return TCL_ERROR;
+        }
+        featureIDs.push_back((unsigned long)id);
+    }
+    const char *layerName = Tcl_GetString(objv[3]);
+
+    g_renderer->selectFeatures(featureIDs, layerName, false);
+    return TCL_OK;
+}
+
+static int
 SelectClearOp(ClientData clientData, Tcl_Interp *interp, int objc,
               Tcl_Obj *const *objv)
 {
     g_renderer->clearSelection();
+    return TCL_OK;
+}
+
+static int
+SelectDeleteOp(ClientData clientData, Tcl_Interp *interp, int objc,
+               Tcl_Obj *const *objv)
+{
+    int numIDs;
+    Tcl_Obj **ids;
+    if (Tcl_ListObjGetElements(interp, objv[2], &numIDs, &ids) != TCL_OK) {
+        return TCL_ERROR;
+    }
+    if (numIDs == 0) {
+        Tcl_AppendResult(interp, "no IDs in list", (char *)NULL);
+        return TCL_ERROR;
+    }
+    std::vector<unsigned long> featureIDs;
+    for (int i = 0; i < numIDs; i++) {
+        long id;
+        if (Tcl_GetLongFromObj(interp, ids[i], &id) != TCL_OK) {
+            return TCL_ERROR;
+        }
+        featureIDs.push_back((unsigned long)id);
+    }
+    const char *layerName = Tcl_GetString(objv[3]);
+
+    g_renderer->deselectFeatures(featureIDs, layerName);
     return TCL_OK;
 }
@@ -3515 +3569 @@
 static CmdSpec selectOps[] = {
     {"clear",   1, SelectClearOp,   2, 2, ""},
+    {"fadd",    2, SelectAddOp,     4, 4, "idlist layerName"},
+    {"fdelete", 2, SelectDeleteOp,  4, 4, "idlist layerName"},
     {"feature", 1, SelectFeatureOp, 4, 4, "idlist layerName"},
     {"mode",    1, SelectModeOp,    3, 3, "mode"},