Changeset 4629 for geovis/trunk/RendererCmd.cpp

Timestamp:

Sep 4, 2014 11:18:26 AM (10 years ago)

Author:

ldelgass

Message:

add token to map/screen coord commands

File:

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

geovis/trunk/RendererCmd.cpp

@@ -107 +107 @@
     std::string cmd(str);
     cmd.erase(cmd.find_last_not_of(" \n\r\t")+1);
-    TRACE("command %lu: '%s'", g_stats.nCommands+1, cmd.c_str());
+    TRACE("command %lu: '%s'", g_stats.nCommands, cmd.c_str());
 #endif
     lastCmdStatus = TCL_OK;
@@ -772 +772 @@
 {
     int x, y;
-    if (Tcl_GetIntFromObj(interp, objv[2], &x) != TCL_OK ||
-        Tcl_GetIntFromObj(interp, objv[3], &y) != TCL_OK) {
+    if (Tcl_GetIntFromObj(interp, objv[3], &x) != TCL_OK ||
+        Tcl_GetIntFromObj(interp, objv[4], &y) != TCL_OK) {
         return TCL_ERROR;
     }
@@ -779 +779 @@
     osgEarth::GeoPoint mapPoint;
     size_t length;
-    char mesg[256];
+    char mesg[512];
     if (g_renderer->mapMouseCoords(x, y, mapPoint)) {
         std::string srsInit;
         std::string verticalDatum;
-        if (objc > 4) {
-            srsInit = Tcl_GetString(objv[4]);
-            if (objc > 5) {
-                verticalDatum = Tcl_GetString(objv[5]);
+        if (objc > 5) {
+            srsInit = Tcl_GetString(objv[5]);
+            if (objc > 6) {
+                verticalDatum = Tcl_GetString(objv[6]);
             }
             osgEarth::SpatialReference *outSRS =
@@ -802 +802 @@
         // send coords to client
         length = snprintf(mesg, sizeof(mesg),
-                          "nv>map coords %g %g %g %d %d {%s} {%s}\n",
+                          "nv>map coords %s %g %g %g %d %d {%s} {%s}\n",
+                          Tcl_GetString(objv[2]), //g_stats.nCommands,
                           mapPoint.x(), mapPoint.y(), mapPoint.z(),
                           x, y,
@@ -812 +813 @@
         // Out of range
         length = snprintf(mesg, sizeof(mesg),
-                          "nv>map coords invalid %d %d\n", x, y);
+                          "nv>map coords %s invalid %d %d\n",
+                          Tcl_GetString(objv[2]), //g_stats.nCommands,
+                          x, y);
 
         queueResponse(mesg, length, Response::VOLATILE);
@@ -1547 +1550 @@
 
 static CmdSpec mapOps[] = {
-    {"coords",   1, MapCoordsOp,          4, 6, "x y ?srs? ?verticalDatum?"},
+    {"coords",   1, MapCoordsOp,          5, 7, "token x y ?srs? ?verticalDatum?"},
     {"grid",     1, MapGraticuleOp,       3, 4, "bool ?type?"},
     {"layer",    2, MapLayerOp,           3, 0, "op ?params...?"},
@@ -1750 +1753 @@
 {
     double x, y, z;
-    if (Tcl_GetDoubleFromObj(interp, objv[2], &x) != TCL_OK ||
-        Tcl_GetDoubleFromObj(interp, objv[3], &y) != TCL_OK ||
-        Tcl_GetDoubleFromObj(interp, objv[4], &z) != TCL_OK) {
+    if (Tcl_GetDoubleFromObj(interp, objv[3], &x) != TCL_OK ||
+        Tcl_GetDoubleFromObj(interp, objv[4], &y) != TCL_OK ||
+        Tcl_GetDoubleFromObj(interp, objv[5], &z) != TCL_OK) {
         return TCL_ERROR;
     }
     const osgEarth::SpatialReference *srs = NULL;
-    if (objc < 6) {
+    if (objc < 7) {
         srs = g_renderer->getMapSRS();
         if (srs == NULL) {
@@ -1763 +1766 @@
         }
     } else {
-        std::string srsInit(Tcl_GetString(objv[5]));
+        std::string srsInit(Tcl_GetString(objv[6]));
         std::string verticalDatum;
-        if (objc > 6) {
-            verticalDatum = Tcl_GetString(objv[6]);
+        if (objc > 7) {
+            verticalDatum = Tcl_GetString(objv[7]);
         }
         srs = osgEarth::SpatialReference::get(srsInit, verticalDatum);
@@ -1785 +1788 @@
         // send coords to client
         length = snprintf(mesg, sizeof(mesg),
-                          "nv>screen coords %g %g %g %g %g %g\n",
+                          "nv>screen coords %s %g %g %g %g %g %g\n",
+                          Tcl_GetString(objv[2]),
                           screen.x(), screen.y(), screen.z(),
                           x, y, z);
@@ -1793 +1797 @@
         // Out of range
         length = snprintf(mesg, sizeof(mesg),
-                          "nv>screen coords invalid %g %g %g\n", x, y, z);
+                          "nv>screen coords %s invalid %g %g %g\n",
+                          Tcl_GetString(objv[2]),
+                          x, y, z);
 
         queueResponse(mesg, length, Response::VOLATILE);
@@ -1817 +1823 @@
 static CmdSpec screenOps[] = {
     {"bgcolor", 1, ScreenBgColorOp, 5, 5, "r g b"},
-    {"coords",  1, ScreenCoordsOp, 5, 7, "x y z ?srs? ?verticalDatum?"},
+    {"coords",  1, ScreenCoordsOp, 6, 8, "token x y z ?srs? ?verticalDatum?"},
     {"size",    1, ScreenSizeOp, 4, 4, "width height"}
 };