Changeset 4632 for geovis/trunk/RendererCmd.cpp

Timestamp:

Sep 10, 2014, 1:49:20 PM (10 years ago)

Author:

ldelgass

Message:

Add pin annotations for testing

File:

• geovis/trunk/RendererCmd.cpp (modified) (3 diffs)

geovis/trunk/RendererCmd.cpp

@@ -1277 +1277 @@
     }
     return TCL_OK;
+}
+
+static int
+MapPinAddOp(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;
+    }
+    char *label = NULL;
+    if (objc > 5) {
+        label = Tcl_GetString(objv[5]);
+    }
+
+    if (g_renderer->getMapSRS() == NULL) {
+        Tcl_AppendResult(interp, "Could not get map SRS", (char*)NULL);
+        return TCL_ERROR;
+    }
+
+    // Get lat/long
+    double latitude, longitude;
+    const osgEarth::SpatialReference *outSRS = 
+        g_renderer->getMapSRS()->getGeographicSRS();
+    osgEarth::GeoPoint mapPoint;
+    if (g_renderer->mapMouseCoords(x, y, mapPoint)) {
+        mapPoint = mapPoint.transform(outSRS);
+        longitude = mapPoint.x();
+        latitude = mapPoint.y();
+    } else {
+        USER_ERROR("Can't add pin here");
+        return TCL_OK;
+    }
+
+    g_renderer->addPlaceNode(latitude, longitude, label);
+    return TCL_OK;
+}
+
+static int
+MapPinDeleteOp(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->deletePlaceNode(x, y);
+    return TCL_OK;
+}
+
+static int
+MapPinHoverOp(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->hoverPlaceNode(x, y);
+    return TCL_OK;
+}
+
+static CmdSpec mapPinOps[] = {
+    {"add",     1, MapPinAddOp,     5, 6, "x y ?label?"},
+    {"delete",  1, MapPinDeleteOp,  5, 5, "x y"},
+    {"hover",   1, MapPinHoverOp,   5, 5, "x y"},
+};
+static int nMapPinOps = NumCmdSpecs(mapPinOps);
+
+static int
+MapPinOp(ClientData clientData, Tcl_Interp *interp, int objc, 
+           Tcl_Obj *const *objv)
+{
+    Tcl_ObjCmdProc *proc;
+
+    proc = GetOpFromObj(interp, nMapPinOps, mapPinOps,
+                        CMDSPEC_ARG2, objc, objv, 0);
+    if (proc == NULL) {
+        return TCL_ERROR;
+    }
+    return (*proc) (clientData, interp, objc, objv);
 }
 
@@ -1554 +1640 @@
     {"layer",    2, MapLayerOp,           3, 0, "op ?params...?"},
     {"load",     2, MapLoadOp,            4, 5, "options"},
-    {"posdisp",  1, MapPositionDisplayOp, 3, 5, "bool ?format? ?precision?"},
+    {"pin",      2, MapPinOp,             3, 0, "op ?params...?"},
+    {"posdisp",  2, MapPositionDisplayOp, 3, 5, "bool ?format? ?precision?"},
     {"reset",    1, MapResetOp,           3, 8, "type ?profile xmin ymin xmax ymax?"},
     {"scalebar", 1, MapScaleBarOp,        3, 4, "bool ?units?"},
@@ -1951 +2038 @@
             struct timeval start, finish;
             gettimeofday(&start, NULL);
+            g_stats.nCommands++;
             status = ExecuteCommand(interp, &command);
             gettimeofday(&finish, NULL);
             g_stats.cmdTime += (MSECS_ELAPSED(start, finish) / 1.0e+3);
-            g_stats.nCommands++;
             if (status == TCL_BREAK) {
                 return 2;               /* This was caused by a "imgflush"