Changeset 4636 for geovis/trunk/RendererCmd.cpp

Timestamp:

Sep 19, 2014 12:04:45 PM (9 years ago)

Author:

ldelgass

Message:

screen coords command now takes a list of coordinates

File:

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

geovis/trunk/RendererCmd.cpp

@@ -767 +767 @@
     return (*proc) (clientData, interp, objc, objv);
 }
-#if 1
+
 static int
 MapCoordsOp(ClientData clientData, Tcl_Interp *interp, int objc, 
@@ -815 +815 @@
             // altmode absolute
             coordVec.push_back(osg::Vec3d(mapPoint.x(), mapPoint.y(), mapPoint.z()));
-#if 0
-            if (outSRS != NULL) {
-                mapPoint = mapPoint.transform(outSRS);
-                if (!mapPoint.isValid()) {
-                    Tcl_DecrRefCount(listObjPtr);
-                    Tcl_AppendResult(interp, "Could not transform map point to requested SRS", (char*)NULL);
-                    return TCL_ERROR;
-                }
-            }
-            Tcl_Obj *objPtr = Tcl_NewDoubleObj(mapPoint.x());
-            Tcl_ListObjAppendElement(interp, listObjPtr, objPtr);
-            objPtr = Tcl_NewDoubleObj(mapPoint.y());
-            Tcl_ListObjAppendElement(interp, listObjPtr, objPtr);
-            objPtr = Tcl_NewDoubleObj(mapPoint.z());
-            Tcl_ListObjAppendElement(interp, listObjPtr, objPtr);
-#endif
         } else {
             coordVec.push_back(osg::Vec3d(std::numeric_limits<double>::quiet_NaN(),
                                           std::numeric_limits<double>::quiet_NaN(),
                                           std::numeric_limits<double>::quiet_NaN()));
-#if 0
-            Tcl_Obj *objPtr = Tcl_NewStringObj("NaN", 3);
-            Tcl_ListObjAppendElement(interp, listObjPtr, objPtr);
-            Tcl_ListObjAppendElement(interp, listObjPtr, objPtr);
-            Tcl_ListObjAppendElement(interp, listObjPtr, objPtr);
-#endif
         }
     }
@@ -873 +851 @@
     return TCL_OK;
 }
-#else
-static int
-MapCoordsOp(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;
-    }
-
-    osgEarth::GeoPoint mapPoint;
-    size_t length;
-    char mesg[512];
-    if (g_renderer->mapMouseCoords(x, y, mapPoint)) {
-        std::string srsInit;
-        std::string verticalDatum;
-        if (objc > 5) {
-            srsInit = Tcl_GetString(objv[5]);
-            if (objc > 6) {
-                verticalDatum = Tcl_GetString(objv[6]);
-            }
-            osgEarth::SpatialReference *outSRS =
-                osgEarth::SpatialReference::get(srsInit, verticalDatum);
-            if (outSRS == NULL) {
-                Tcl_AppendResult(interp, "bad SRS \"", srsInit.c_str(), "\"", (char*)NULL);
-                return TCL_ERROR;
-            }
-            mapPoint = mapPoint.transform(outSRS);
-            if (!mapPoint.isValid()) {
-                Tcl_AppendResult(interp, "Could not transform map point to requested SRS", (char*)NULL);
-                return TCL_ERROR;
-            }
-        }
-        // send coords to client
-        length = snprintf(mesg, sizeof(mesg),
-                          "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,
-                          mapPoint.getSRS()->getHorizInitString().c_str(),
-                          mapPoint.getSRS()->getVertInitString().c_str());
-
-        queueResponse(mesg, length, Response::VOLATILE);
-    } else {
-        // Out of range
-        length = snprintf(mesg, sizeof(mesg),
-                          "nv>map coords %s invalid %d %d\n",
-                          Tcl_GetString(objv[2]), //g_stats.nCommands,
-                          x, y);
-
-        queueResponse(mesg, length, Response::VOLATILE);
-    }
-    return TCL_OK;
-}
-#endif
+
 static int
 MapGraticuleOp(ClientData clientData, Tcl_Interp *interp, int objc, 
@@ -1946 +1869 @@
                Tcl_Obj *const *objv)
 {
-    double x, y, z;
-    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;
-    }
+    int tokenLength;
+    const char *token = Tcl_GetStringFromObj(objv[2], &tokenLength);
+    int numCoords;
+    Tcl_Obj **coords;
+    if (Tcl_ListObjGetElements(interp, objv[3], &numCoords, &coords) != TCL_OK) {
+        return TCL_ERROR;
+    }
+    if (numCoords == 0) {
+        Tcl_AppendResult(interp, "no x,y,z coordinates in list", (char *)NULL);
+        return TCL_ERROR;
+    }
+    if (numCoords % 3 != 0) {
+        Tcl_AppendResult(interp, "invalid number of coordinates in list",
+                         (char *)NULL);
+        return TCL_ERROR;
+    }
+
     const osgEarth::SpatialReference *srs = NULL;
-    if (objc < 7) {
+    if (objc < 5) {
         srs = g_renderer->getMapSRS();
         if (srs == NULL) {
@@ -1960 +1894 @@
         }
     } else {
-        std::string srsInit(Tcl_GetString(objv[6]));
+        std::string srsInit(Tcl_GetString(objv[4]));
         std::string verticalDatum;
-        if (objc > 7) {
-            verticalDatum = Tcl_GetString(objv[7]);
+        if (objc > 5) {
+            verticalDatum = Tcl_GetString(objv[5]);
         }
         srs = osgEarth::SpatialReference::get(srsInit, verticalDatum);
@@ -1971 +1905 @@
         }
     }
-    // ALTMODE_RELATIVE is height above terrain, ALTMODE_ABSOLUTE means
-    // relative to the vertical datum
-    osgEarth::GeoPoint mapPoint(srs, x, y, z, osgEarth::ALTMODE_ABSOLUTE);
-    size_t length;
-    char mesg[256];
-    osg::Vec3d world;
-    osg::Vec3d screen;
-    if (g_renderer->getWorldCoords(mapPoint, &world) &&
-        g_renderer->worldToScreen(world, &screen)) {
-        // send coords to client
-        length = snprintf(mesg, sizeof(mesg),
-                          "nv>screen coords %s %g %g %g %g %g %g\n",
-                          Tcl_GetString(objv[2]),
-                          screen.x(), screen.y(), screen.z(),
-                          x, y, z);
-
-        queueResponse(mesg, length, Response::VOLATILE);
-    } else {
-        // Out of range
-        length = snprintf(mesg, sizeof(mesg),
-                          "nv>screen coords %s invalid %g %g %g\n",
-                          Tcl_GetString(objv[2]),
-                          x, y, z);
-
-        queueResponse(mesg, length, Response::VOLATILE);
-    }
+    Tcl_Obj *listObjPtr = Tcl_NewListObj(0, (Tcl_Obj **)NULL);
+    std::vector<osg::Vec3d> coordVec;
+    for (int i = 0; i < numCoords; i += 3) {
+        double x, y, z;
+        if (Tcl_GetDoubleFromObj(interp, coords[i], &x) != TCL_OK ||
+            Tcl_GetDoubleFromObj(interp, coords[i+1], &y) != TCL_OK ||
+            Tcl_GetDoubleFromObj(interp, coords[i+2], &z) != TCL_OK) {
+            return TCL_ERROR;
+        }
+        // ALTMODE_RELATIVE is height above terrain, ALTMODE_ABSOLUTE means
+        // relative to the vertical datum
+        osgEarth::GeoPoint mapPoint(srs, x, y, z, osgEarth::ALTMODE_ABSOLUTE);
+        osg::Vec3d world;
+        if (g_renderer->getWorldCoords(mapPoint, &world)) {
+            coordVec.push_back(world);
+        } else {
+            coordVec.push_back(osg::Vec3d(std::numeric_limits<double>::quiet_NaN(),
+                                          std::numeric_limits<double>::quiet_NaN(),
+                                          std::numeric_limits<double>::quiet_NaN()));
+        }
+    }
+    g_renderer->worldToScreen(coordVec);
+    for (std::vector<osg::Vec3d>::iterator itr = coordVec.begin();
+         itr != coordVec.end(); ++itr) {
+        Tcl_Obj *objPtr = Tcl_NewDoubleObj(itr->x());
+        Tcl_ListObjAppendElement(interp, listObjPtr, objPtr);
+        objPtr = Tcl_NewDoubleObj(itr->y());
+        Tcl_ListObjAppendElement(interp, listObjPtr, objPtr);
+        objPtr = Tcl_NewDoubleObj(itr->z());
+        Tcl_ListObjAppendElement(interp, listObjPtr, objPtr);
+    }
+    // send coords to client
+    int listLength;
+    const char *string = Tcl_GetStringFromObj(listObjPtr, &listLength);
+    size_t length = listLength + tokenLength + 22;
+    char *mesg = new char[length];
+    length = snprintf(mesg, length, "nv>screen coords %s {%s}\n", token, string);
+    Tcl_DecrRefCount(listObjPtr);
+    queueResponse(mesg, length, Response::VOLATILE);
+    delete [] mesg;
     return TCL_OK;
 }
@@ -2017 +1965 @@
 static CmdSpec screenOps[] = {
     {"bgcolor", 1, ScreenBgColorOp, 5, 5, "r g b"},
-    {"coords",  1, ScreenCoordsOp, 6, 8, "token x y z ?srs? ?verticalDatum?"},
+    {"coords",  1, ScreenCoordsOp, 4, 6, "token coords ?srs? ?verticalDatum?"},
     {"size",    1, ScreenSizeOp, 4, 4, "width height"}
 };