Changeset 6276 for geovis

Timestamp:

Apr 19, 2016 1:48:41 PM (8 years ago)

Author:

ldelgass

Message:

Add server response to notify clients of selection box region

Location:

geovis/trunk

Files:

• Renderer.cpp (modified) (1 diff)
• Renderer.h (modified) (1 diff)
• RendererCmd.cpp (modified) (4 diffs)
• geovis_protocol.txt (modified) (1 diff)

geovis/trunk/Renderer.cpp

@@ -1841 +1841 @@
     _sceneRoot->accept(spnv);
     _needsRedraw = true;
+}
+
+void Renderer::getBoxSelection(double *latMin, double *latMax, double *longMin, double *longMax)
+{
+    osgEarth::Annotation::FeatureNode *node = _selectionBox.get();
+    if (node == NULL)
+        return;
+    osgEarth::Symbology::Geometry *geom = node->getFeature()->getGeometry();
+    if (geom == NULL)
+        return;
+    *latMin = (*geom)[0].y();
+    *latMax = (*geom)[2].y();
+    *longMin = (*geom)[1].x();
+    *longMax = (*geom)[0].x();
 }
 

geovis/trunk/Renderer.h

@@ -549 +549 @@
     void initBoxSelection(int x, int y);
     void updateBoxSelection(int x, int y);
+    void getBoxSelection(double *latMin, double *latMax, double *longMin, double *longMax);
     void clearBoxSelection();
 

geovis/trunk/RendererCmd.cpp

@@ -1177 +1177 @@
 
 static int
-MapBoxInitOp(ClientData clientData, Tcl_Interp *interp, int objc, 
-             Tcl_Obj *const *objv)
+MapBoxEndOp(ClientData clientData, Tcl_Interp *interp, int objc, 
+            Tcl_Obj *const *objv)
 {
     int x, y;
@@ -1185 +1185 @@
         return TCL_ERROR;
     }
-    g_renderer->initBoxSelection(x, y);
-    return TCL_OK;
-}
-
-static int
-MapBoxUpdateOp(ClientData clientData, Tcl_Interp *interp, int objc, 
-               Tcl_Obj *const *objv)
+    g_renderer->updateBoxSelection(x, y);
+
+    // Notify client of selected region
+    double latMin, latMax, longMin, longMax;
+    latMin = latMax = longMin = longMax = 0;
+    g_renderer->getBoxSelection(&latMin, &latMax, &longMin, &longMax);
+
+    std::ostringstream oss;
+    oss << "nv>select region "
+        << longMin << " "
+        << latMin << " "
+        << longMax << " "
+        << latMax << "\n";
+    std::string ostr = oss.str();
+    size_t len = ostr.size();
+    queueResponse(ostr.c_str(), len, Response::VOLATILE);
+    return TCL_OK;
+}
+
+static int
+MapBoxInitOp(ClientData clientData, Tcl_Interp *interp, int objc, 
+             Tcl_Obj *const *objv)
 {
     int x, y;
@@ -1198 +1213 @@
         return TCL_ERROR;
     }
+    g_renderer->initBoxSelection(x, y);
+    return TCL_OK;
+}
+
+static int
+MapBoxUpdateOp(ClientData clientData, Tcl_Interp *interp, int objc, 
+               Tcl_Obj *const *objv)
+{
+    int x, y;
+    if (Tcl_GetIntFromObj(interp, objv[3], &x) != TCL_OK ||
+        Tcl_GetIntFromObj(interp, objv[4], &y) != TCL_OK) {
+        return TCL_ERROR;
+    }
     g_renderer->updateBoxSelection(x, y);
     return TCL_OK;
@@ -1204 +1232 @@
 static CmdSpec mapBoxOps[] = {
     {"clear",   1, MapBoxClearOp,   3, 3, ""},
+    {"end",     1, MapBoxEndOp,     5, 5, "x y"},
     {"init",    1, MapBoxInitOp,    5, 5, "x y"},
     {"update",  1, MapBoxUpdateOp,  5, 5, "x y"},

geovis/trunk/geovis_protocol.txt

@@ -355 +355 @@
 nv>select clear
 nv>select feature <guid> <featureIDList> <numFeatures> <layerName>
+nv>select region <xmin> <ymin> <xmax> <ymax>
 nv>ok -token <seqnum>
    Reply indicated commands through <seqnum> (numbered beginning at 0) have been