Changeset 5930 for geovis

Timestamp:

Nov 3, 2015, 5:17:48 AM (9 years ago)

Author:

ldelgass

Message:

Add stub for select features protocol command.

Location:

geovis/trunk

Files:

• Renderer.cpp (modified) (3 diffs)
• Renderer.h (modified) (1 diff)
• RendererCmd.cpp (modified) (3 diffs)
• ResponseQueue.cpp (modified) (1 diff)

geovis/trunk/Renderer.cpp

@@ -1527 +1527 @@
             _picker->addChild(_placeNodes.get());
         }
+    }
+}
+
+void Renderer::selectFeatures(std::vector<unsigned long>& featureIDs, const char *layerName)
+{
+    TRACE("Select layer '%s', num features: %u", layerName, featureIDs.size());
+    osgEarth::ModelLayer *layer = _map->getModelLayerByName(layerName);
+    if (layer == NULL) {
+        ERROR("Unknown layer '%s'", layerName);
+        return;
+    }
+    for (unsigned int i = 0; i < featureIDs.size(); i++) {
+        TRACE("feature ID: %u", featureIDs.at(i));
     }
 }
@@ -2849 +2862 @@
     }
 
+#if 0
     TRACE("w1: %g %g %g w2: %g %g %g",
           world1.x(), world1.y(), world1.z(),
           world2.x(), world2.y(), world2.z());
+#endif
 
     double meters;
@@ -2895 +2910 @@
     //double scaleUSSurveyMiles = scale / 1609.347218694; // US survey mile = 5280 US survey feet
     //double scaleUSSurveyFeet = scale * 3937.0/1200.0; // US survey foot = 1200/3937 m
+#if 0
     TRACE("m: %g px: %g m/px: %g", meters, pixelWidth, scale);
+#endif
     _mapScale = scale;
     switch (_scaleBarUnits) {

geovis/trunk/Renderer.h

@@ -514 +514 @@
 
     void writeScene(const std::string& file);
+
+    void selectFeatures(std::vector<unsigned long>& featureIDs, const char *layerName);
 
     void addRhumbBox(double latMin, double latMax, double longMin, double longMax);

geovis/trunk/RendererCmd.cpp

@@ -3221 +3221 @@
 }
 
+static int
+SelectFeatureOp(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);
+    return TCL_OK;
+}
+
+static CmdSpec selectOps[] = {
+    {"feature", 1, SelectFeatureOp, 4, 4, "idlist layerName"},
+};
+static int nSelectOps = NumCmdSpecs(selectOps);
+
+static int
+SelectCmd(ClientData clientData, Tcl_Interp *interp, int objc, 
+          Tcl_Obj *const *objv)
+{
+    Tcl_ObjCmdProc *proc;
+
+    proc = GetOpFromObj(interp, nSelectOps, selectOps,
+                        CMDSPEC_ARG1, objc, objv, 0);
+    if (proc == NULL) {
+        return TCL_ERROR;
+    }
+    return (*proc) (clientData, interp, objc, objv);
+}
+
 #ifdef USE_READ_THREAD
 int
@@ -3456 +3502 @@
     Tcl_CreateObjCommand(interp, "renderer",   RendererCmd,   clientData, NULL);
     Tcl_CreateObjCommand(interp, "screen",     ScreenCmd,     clientData, NULL);
+    Tcl_CreateObjCommand(interp, "select",     SelectCmd,     clientData, NULL);
 }
 
@@ -3474 +3521 @@
     Tcl_DeleteCommand(interp, "renderer");
     Tcl_DeleteCommand(interp, "screen");
+    Tcl_DeleteCommand(interp, "select");
 
     Tcl_DeleteInterp(interp);

geovis/trunk/ResponseQueue.cpp

@@ -66 +66 @@
             itr = _list.erase(itr);
         } else {
+#ifdef TRACE_RESPONSE_QUEUE
             TRACE("Found queued response of type %d", (*itr)->type());
+#endif
             ++itr;
         }