Changeset 6281

Timestamp:

Apr 20, 2016, 3:20:44 PM (9 years ago)

Author:

ldelgass

Message:

Update select protocol response to use add|delete|set sub-command

Location:

geovis/trunk

Files:

• Picker.cpp (modified) (4 diffs)
• Picker.h (modified) (1 diff)
• RenderServer.h (modified) (1 diff)

geovis/trunk/Picker.cpp

@@ -179 +179 @@
 
 SelectCallback::SelectCallback(Renderer *renderer) :
-    _renderer(renderer)
+    _renderer(renderer),
+    _modifier(false)
 {
     installHighlighter(renderer->getMapNode()->getOrCreateStateSet(),
@@ -202 +203 @@
             }
         }
-        TRACE("Hit feature ID: %lu (of %d) layer: %s", feature->getFID(), index->size(), layerName.c_str());
+        TRACE("Hit FID: %lu (of %d) layer: %s", feature->getFID(), index->size(), layerName.c_str());
 
         std::vector<unsigned long> fids;
         fids.push_back(feature->getFID());
-        _renderer->selectFeatures(fids, layerName.c_str(), true);
+        _renderer->selectFeatures(fids, layerName.c_str(), !_modifier);
         _renderer->addPlacard(_pickPoint, feature, layerName.c_str());
 
         char mesg[256];
-        snprintf(mesg, sizeof(mesg), "nv>select feature %u %lu %d {%s}\n", id, feature->getFID(), index->size(), layerName.c_str());
+        if (_modifier) {
+            // Check if already selected
+            snprintf(mesg, sizeof(mesg), "nv>select feature add {%lu} {%s}\n", feature->getFID(), layerName.c_str());
+        } else {
+            snprintf(mesg, sizeof(mesg), "nv>select feature set {%lu} {%s}\n", feature->getFID(), layerName.c_str());
+        }
         size_t length = strlen(mesg);
         queueResponse(mesg, length, Response::VOLATILE, Response::DATA);
@@ -220 +226 @@
             TRACE("Hit AnnotationNode: %p, \"%s\"", anno, anno->getName().c_str());
             char mesg[256];
-            snprintf(mesg, sizeof(mesg), "nv>select annotation %u {%s}\n", id, anno->getName().c_str());
+            snprintf(mesg, sizeof(mesg), "nv>select annotation {%s}\n", anno->getName().c_str());
             size_t length = strlen(mesg);
             queueResponse(mesg, length, Response::VOLATILE, Response::DATA);
@@ -248 +254 @@
         _x = ea.getX();
         _y = ea.getY();
+        // Modifier-click?
+        _modifier = (ea.getModKeyMask() & osgGA::GUIEventAdapter::MODKEY_CTRL) != 0;
         return false;
     } else if (ea.getEventType() == ea.RELEASE) {

geovis/trunk/Picker.h

@@ -38 +38 @@
     Renderer *_renderer;
     float _x, _y;
+    bool _modifier;
     osgEarth::GeoPoint _pickPoint;
 };

geovis/trunk/RenderServer.h

@@ -21 +21 @@
 class Stats;
 
-#define GEOVIS_VERSION_STRING "0.7.1"
+#define GEOVIS_VERSION_STRING "0.7.2"
 
 #define MSECS_ELAPSED(t1, t2) \