Changeset 4028

Timestamp:

Nov 4, 2013, 2:11:09 AM (11 years ago)

Author:

ldelgass

Message:

Add map layer commands

Location:

trunk/packages/vizservers/geovis

Files:

• Makefile.in (modified) (5 diffs)
• RenderServer.cpp (modified) (11 diffs)
• RenderServer.h (modified) (2 diffs)
• Renderer.cpp (modified) (13 diffs)
• Renderer.h (modified) (7 diffs)
• RendererCmd.cpp (modified) (15 diffs)
• RendererCmd.h (modified) (1 diff)
• TGAWriter.cpp (modified) (1 diff)

trunk/packages/vizservers/geovis/Makefile.in

@@ -4 +4 @@
 USE_OFFSCREEN_RENDERING = #yes
 USE_THREADS             = yes
+USE_READ_THREAD         = #yes
 
 bindir          = @bindir@
@@ -50 +51 @@
 OSGEARTH_LIB_SPEC = -L${OSG_LIB_DIR} \
                   -losgEarthFeatures \
+                  -losgEarthAnnotation \
                   -losgEarthSymbology \
                   -losgEarthUtil \
                   -losgEarth
 
-LD_RUN_PATH     = $(libdir)
+LD_RUN_PATH     = $(OSG_LIB_DIR):$(libdir)
 
 LIBS            = \
@@ -90 +92 @@
 DEFINES         += -DUSE_THREADS
 endif
+ifdef USE_READ_THREAD
+DEFINES         += -DUSE_READ_THREAD
+endif
 
 CXX_SWITCHES    = $(CXXFLAGS) $(EXTRA_CXXFLAGS) $(DEFINES) $(INCLUDES)
@@ -105 +110 @@
 
 ifdef USE_THREADS
-SERVER_SRCS+=ResponseQueue.cpp
+SERVER_SRCS+= \
+        ResponseQueue.cpp
+ifdef USE_READ_THREAD
+SERVER_SRCS+= \
+        CommandQueue.cpp
+endif
 endif
 
@@ -142 +152 @@
 
 CmdProc.o: CmdProc.h
+CommandQueue.o: CommandQueue.h Trace.h
 md5.o: md5.h
 PPMWriter.o: PPMWriter.h ResponseQueue.h Trace.h

trunk/packages/vizservers/geovis/RenderServer.cpp

@@ -33 +33 @@
 #include <pthread.h>
 #include "ResponseQueue.h"
+#ifdef USE_READ_THREAD
+#include "CommandQueue.h"
+#endif
 #endif 
 #include <md5.h>
@@ -47 +50 @@
 Renderer *GeoVis::g_renderer = NULL; ///< Main render worker
 ReadBuffer *GeoVis::g_inBufPtr = NULL; ///< Socket read buffer
-ResponseQueue *GeoVis::g_queue = NULL;
+#ifdef USE_THREADS
+ResponseQueue *GeoVis::g_outQueue = NULL;
+#ifdef USE_READER_THREAD
+CommandQueue *GeoVis::g_inQueue = NULL;
+#endif
+#endif
 
 #ifdef USE_THREADS
@@ -66 +74 @@
                  g_renderer->getWindowWidth(),
                  g_renderer->getWindowHeight(),
-                 TARGA_BYTES_PER_PIXEL);
+                 TARGA_BYTES_PER_PIXEL,
+                 true);
 #endif  /*RENDER_TARGA*/
 
@@ -83 +92 @@
              g_renderer->getWindowHeight());
 #endif  /*RENDER_TARGA*/
-#endif  /*DEBUG*/
+#endif  /*DEBUG_WRITE_FRAME_FILE*/
 }
 
@@ -91 +100 @@
 writeFrame(int fd, const unsigned char *imgData)
 {
-#ifdef DEBUG
-    if (g_renderer->getCameraMode() == Renderer::IMAGE) {
-        double xywh[4];
-        g_renderer->getScreenWorldCoords(xywh);
-        TRACE("Image bbox: %g %g %g %g", 
-              xywh[0], 
-              (xywh[1] + xywh[3]), 
-              (xywh[0] + xywh[2]), 
-              xywh[1]);
-    }
+#ifdef DEBUG_WRITE_FRAME_FILE
 
 #ifdef RENDER_TARGA
@@ -118 +118 @@
 
 #else
-    if (g_renderer->getCameraMode() == Renderer::IMAGE) {
-        double xywh[4];
-        g_renderer->getCameraZoomRegion(xywh);
-        std::ostringstream oss;
-        oss.precision(12);
-        // Send upper left and lower right corners as bbox
-        oss << "nv>image -type image -bbox {"
-            << std::scientific
-            << xywh[0] << " "
-            << xywh[1] << " "
-            << xywh[2] << " "
-            << xywh[3] << "} -bytes";
 
 #ifdef RENDER_TARGA
-        writeTGA(fd, oss.str().c_str(),
-                 imgData,
-                 g_renderer->getWindowWidth(),
-                 g_renderer->getWindowHeight(),
-                 TARGA_BYTES_PER_PIXEL);
-#else
-        writePPM(fd, oss.str().c_str(),
-                 imgData->GetPointer(0),
-                 g_renderer->getWindowWidth(),
-                 g_renderer->getWindowHeight());
+    writeTGA(fd, "nv>image -type image -bytes",
+             imgData,
+             g_renderer->getWindowWidth(),
+             g_renderer->getWindowHeight(),
+             TARGA_BYTES_PER_PIXEL);
+#else
+    writePPM(fd, "nv>image -type image -bytes",
+             imgData,
+             g_renderer->getWindowWidth(),
+             g_renderer->getWindowHeight());
 #endif  /*RENDER_TARGA*/
-    } else {
-#ifdef RENDER_TARGA
-        writeTGA(fd, "nv>image -type image -bytes",
-                 imgData,
-                 g_renderer->getWindowWidth(),
-                 g_renderer->getWindowHeight(),
-                 TARGA_BYTES_PER_PIXEL);
-#else
-        writePPM(fd, "nv>image -type image -bytes",
-                 imgData,
-                 g_renderer->getWindowWidth(),
-                 g_renderer->getWindowHeight());
-#endif  /*RENDER_TARGA*/
-    }
-#endif  /*DEBUG*/
+#endif  /*DEBUG_WRITE_FRAME_FILE*/
 }
 #endif /*USE_THREADS*/
@@ -419 +393 @@
 #ifdef USE_THREADS
 
+#ifdef USE_READ_THREAD
+static void *
+readerThread(void *clientData)
+{
+    Tcl_Interp *interp = (Tcl_Interp *)clientData;
+
+    TRACE("Starting reader thread");
+
+    queueCommands(interp, NULL, g_inBufPtr);
+
+    return NULL;
+}
+#endif
+
 static void *
 writerThread(void *clientData)
@@ -471 +459 @@
 
 #ifdef USE_THREADS
-    g_queue = new ResponseQueue();
+    g_outQueue = new ResponseQueue();
 
     pthread_t writerThreadId;
-    if (pthread_create(&writerThreadId, NULL, &writerThread, g_queue) < 0) {
+    if (pthread_create(&writerThreadId, NULL, &writerThread, g_outQueue) < 0) {
         ERROR("Can't create writer thread: %s", strerror(errno));
     }
@@ -485 +473 @@
     for (;;) {
         long timeout = g_renderer->getTimeout();
-        if (processCommands(interp, NULL, g_inBufPtr, g_fdOut, timeout) < 0)
+        int cmdStatus = processCommands(interp, NULL, g_inBufPtr, g_fdOut, timeout);
+        if (cmdStatus < 0)
             break;
 
@@ -496 +485 @@
                 TRACE("Image: %d x %d", imgData->s(), imgData->t());
             }
-#ifdef USE_THREADS
-            queueFrame(g_queue, imgData->data());
-#else
-            writeFrame(g_fdOut, imgData->data());
-#endif
+            if (imgData->s() == g_renderer->getWindowWidth() &&
+                imgData->t() == g_renderer->getWindowHeight()) {
+#ifdef USE_THREADS
+                queueFrame(g_outQueue, imgData->data());
+#else
+                writeFrame(g_fdOut, imgData->data());
+#endif
+            }
             g_stats.nFrames++;
-            g_stats.nFrameBytes += 0; // FIXME
+            g_stats.nFrameBytes += imgData->s() * imgData->t() * 3;
         } else {
-            TRACE("No render required");
-            sendAck();
+            //TRACE("No render required");
+            if (cmdStatus > 1) {
+                sendAck();
+            }
         }
 
@@ -533 +527 @@
 
     TRACE("Deleting ResponseQueue");
-    delete g_queue;
-    g_queue = NULL;
+    delete g_outQueue;
+    g_outQueue = NULL;
 #endif
 

trunk/packages/vizservers/geovis/RenderServer.h

@@ -16 +16 @@
 class Renderer;
 class ReadBuffer;
+class CommandQueue;
 class ResponseQueue;
 
@@ -49 +50 @@
 extern Renderer *g_renderer;
 extern ReadBuffer *g_inBufPtr;
-extern ResponseQueue *g_queue;
+#ifdef USE_THREADS
+#ifdef USE_READ_THREAD
+extern CommandQueue *g_inQueue;
+#endif
+extern ResponseQueue *g_outQueue;
+#endif
 extern int g_statsFile;
 extern int writeToStatsFile(int f, const char *s, size_t length);

trunk/packages/vizservers/geovis/Renderer.cpp

@@ -16 +16 @@
 #include <sys/time.h>
 #endif
+
+#include <osgGA/StateSetManipulator>
 
 #include <osgEarth/Version>
@@ -52 +54 @@
     _captureCallback = new ScreenCaptureCallback();
     _viewer->getCamera()->setPostDrawCallback(_captureCallback.get());
-    _sceneRoot = new osg::Node;
+    osgEarth::MapOptions mapOpts;
+    mapOpts.coordSysType() = osgEarth::MapOptions::CSTYPE_PROJECTED;
+    mapOpts.profile() = osgEarth::ProfileOptions("global-geodetic");
+    osgEarth::Map *map = new osgEarth::Map(mapOpts);
+    _map = map;
+    osgEarth::MapNodeOptions mapNodeOpts;
+    mapNodeOpts.enableLighting() = false;
+    osgEarth::MapNode *mapNode = new osgEarth::MapNode(map, mapNodeOpts);
+    _mapNode = mapNode;
+    _sceneRoot = mapNode;
     _viewer->setSceneData(_sceneRoot.get());
     _manipulator = new osgEarth::Util::EarthManipulator;
-    _viewer->setCameraManipulator(_manipulator);
+    _viewer->setCameraManipulator(_manipulator.get());
+    _viewer->addEventHandler(new osgGA::StateSetManipulator(_viewer->getCamera()->getOrCreateStateSet()));
     _coordsCallback = new MouseCoordsCallback();
+    _mouseCoordsTool = new osgEarth::Util::MouseCoordsTool(mapNode);
+    _mouseCoordsTool->addCallback(_coordsCallback);
+    _viewer->addEventHandler(_mouseCoordsTool);
     _viewer->getCamera()->setNearFarRatio(0.00002);
     _viewer->getCamera()->setSmallFeatureCullingPixelSize(-1.0f);
     _viewer->setUpViewInWindow(0, 0, _windowWidth, _windowHeight);
     _viewer->realize();
+#ifdef DEBUG
     if (_viewer->getViewerStats() != NULL) {
         TRACE("Enabling stats");
         _viewer->getViewerStats()->collectStats("scene", true);
     }
+#endif
+#if 0
+    osgViewer::ViewerBase::Windows windows;
+    _viewer->getWindows(windows);
+    if (windows.size() == 1) {
+        windows[0]->setSyncToVBlank(false);
+    } else {
+        ERROR("Num windows: %lu", windows.size());
+    }
+#endif
+}
+
+osgGA::EventQueue *Renderer::getEventQueue()
+{
+    osgViewer::ViewerBase::Windows windows;
+    _viewer->getWindows(windows);
+    return windows[0]->getEventQueue();
 }
 
@@ -77 +110 @@
 {
     TRACE("Loading %s", path);
-    _sceneRoot = osgDB::readNodeFile(path);
-    osgEarth::MapNode *mapNode = osgEarth::MapNode::findMapNode(_sceneRoot.get());
+    osg::Node *node = osgDB::readNodeFile(path);
+    if (node == NULL) {
+        ERROR("Couldn't load %s", path);
+        return;
+    }
+    osgEarth::MapNode *mapNode = osgEarth::MapNode::findMapNode(node);
     if (mapNode == NULL) {
         ERROR("Couldn't find MapNode");
+        return;
     } else {
+        _sceneRoot = node;
         _map = mapNode->getMap();
     }
+    _mapNode = mapNode;
     if (_mouseCoordsTool.valid())
-        _viewer->removeEventHandler(_mouseCoordsTool);
+        _viewer->removeEventHandler(_mouseCoordsTool.get());
     _mouseCoordsTool = new osgEarth::Util::MouseCoordsTool(mapNode);
-    _mouseCoordsTool->addCallback(_coordsCallback);
-    _viewer->addEventHandler(_mouseCoordsTool);
+    _mouseCoordsTool->addCallback(_coordsCallback.get());
+    _viewer->addEventHandler(_mouseCoordsTool.get());
     _viewer->setSceneData(_sceneRoot.get());
+    _manipulator = new osgEarth::Util::EarthManipulator;
+    _viewer->setCameraManipulator(_manipulator.get());
     _manipulator->setNode(NULL);
     _manipulator->setNode(_sceneRoot.get());
@@ -97 +139 @@
 }
 
+void Renderer::resetMap(osgEarth::MapOptions::CoordinateSystemType type, const char *profile)
+{
+    TRACE("Restting map with type %d, profile %s", type, profile);
+
+    osgEarth::MapOptions mapOpts;
+    mapOpts.coordSysType() = type;
+    if (profile != NULL) {
+        mapOpts.profile() = osgEarth::ProfileOptions(profile);
+    } else if (type == osgEarth::MapOptions::CSTYPE_PROJECTED) {
+        mapOpts.profile() = osgEarth::ProfileOptions("global-geodetic");
+    }
+    osgEarth::Map *map = new osgEarth::Map(mapOpts);
+    _map = map;
+    osgEarth::MapNodeOptions mapNodeOpts;
+    mapNodeOpts.enableLighting() = false;
+    osgEarth::MapNode *mapNode = new osgEarth::MapNode(map, mapNodeOpts);
+    _mapNode = mapNode;
+    _sceneRoot = mapNode;
+    if (_mouseCoordsTool.valid())
+        _viewer->removeEventHandler(_mouseCoordsTool.get());
+    _mouseCoordsTool = new osgEarth::Util::MouseCoordsTool(mapNode);
+    _mouseCoordsTool->addCallback(_coordsCallback.get());
+    _viewer->addEventHandler(_mouseCoordsTool.get());
+    _viewer->setSceneData(_sceneRoot.get());
+    _manipulator = new osgEarth::Util::EarthManipulator;
+    _viewer->setCameraManipulator(_manipulator.get());
+    _manipulator->setNode(NULL);
+    _manipulator->setNode(_sceneRoot.get());
+    _manipulator->computeHomePosition();
+    _viewer->home();
+    _needsRedraw = true;
+}
+
+bool Renderer::mapMouseCoords(float mouseX, float mouseY, osgEarth::GeoPoint& map)
+{
+    osg::Vec3d world;
+    if (_mapNode->getTerrain()->getWorldCoordsUnderMouse(_viewer.get(), mouseX, mouseY, world)) {
+        map.fromWorld(_mapNode->getMapSRS(), world);
+        return true;
+    }
+    return false;
+}
+
 void Renderer::addImageLayer(const char *name, const osgEarth::TileSourceOptions& opts)
 {
@@ -155 +240 @@
 void Renderer::removeModelLayer(const char *name)
 {
-#if 1
     osgEarth::ModelLayer *layer = _map->getModelLayerByName(name);
     _map->removeModelLayer(layer);
-#endif
 }
 
 void Renderer::moveModelLayer(const char *name, unsigned int pos)
 {
-#if 1
     osgEarth::ModelLayer *layer = _map->getModelLayerByName(name);
     _map->moveModelLayer(layer, pos);
-#endif
 }
 
@@ -267 +348 @@
 }
 
+void Renderer::setThrowingEnabled(bool state)
+{
+    _manipulator->getSettings()->setThrowingEnabled(state);
+}
+
 void Renderer::mouseDoubleClick(int button, double x, double y)
 {
-    _viewer->getEventQueue()->mouseDoubleButtonPress((float)x, (float)y, button);
+    getEventQueue()->mouseDoubleButtonPress((float)x, (float)y, button);
     _needsRedraw = true;
 }
@@ -275 +361 @@
 void Renderer::mouseClick(int button, double x, double y)
 {
-    _viewer->getEventQueue()->mouseButtonPress((float)x, (float)y, button);
+    getEventQueue()->mouseButtonPress((float)x, (float)y, button);
     _needsRedraw = true;
 }
@@ -281 +367 @@
 void Renderer::mouseDrag(int button, double x, double y)
 {
-    _viewer->getEventQueue()->mouseMotion((float)x, (float)y);
+    getEventQueue()->mouseMotion((float)x, (float)y);
     _needsRedraw = true;
 }
@@ -287 +373 @@
 void Renderer::mouseRelease(int button, double x, double y)
 {
-    _viewer->getEventQueue()->mouseButtonRelease((float)x, (float)y, button);
+    getEventQueue()->mouseButtonRelease((float)x, (float)y, button);
     _needsRedraw = true;
 }
@@ -293 +379 @@
 void Renderer::mouseMotion(double x, double y)
 {
-    _viewer->getEventQueue()->mouseMotion((float)x, (float)y);
-    _needsRedraw = true;
+    //getEventQueue()->mouseMotion((float)x, (float)y);
+    return;
+    osgEarth::GeoPoint map;
+    if (mapMouseCoords(x, y, map)) {
+        _coordsCallback->set(map, _viewer.get(), _mapNode);
+    } else {
+        _coordsCallback->reset(_viewer.get(), _mapNode);
+    }
 }
 
 void Renderer::mouseScroll(int direction)
 {
-    _viewer->getEventQueue()->mouseScroll((direction > 0 ? osgGA::GUIEventAdapter::SCROLL_UP : osgGA::GUIEventAdapter::SCROLL_DOWN));
+    getEventQueue()->mouseScroll((direction > 0 ? osgGA::GUIEventAdapter::SCROLL_UP : osgGA::GUIEventAdapter::SCROLL_DOWN));
     _needsRedraw = true;
 }
@@ -336 +428 @@
 bool Renderer::isPagerIdle()
 {
-    return (!_viewer->getDatabasePager()->requiresUpdateSceneGraph() &&
-            !_viewer->getDatabasePager()->getRequestsInProgress());
+    //return (!_viewer->getDatabasePager()->requiresUpdateSceneGraph() &&
+    //        !_viewer->getDatabasePager()->getRequestsInProgress());
+    return !_viewer->getDatabasePager()->requiresUpdateSceneGraph();
 }
 
@@ -348 +441 @@
 bool Renderer::render()
 {
-    TRACE("Enter needsRedraw=%d",  _needsRedraw ? 1 : 0);
-
-    if (_needsRedraw || !isPagerIdle()) {
+    if (_needsRedraw ||
+        //!isPagerIdle()
+        _viewer->checkNeedToDoFrame()
+        ) {
+        TRACE("Enter needsRedraw=%d",  _needsRedraw ? 1 : 0);
+
         osg::Timer_t startFrameTick = osg::Timer::instance()->tick();
         TRACE("Before frame()");
@@ -364 +460 @@
         }
 #endif
+#ifdef WANT_TRACE
         if (_viewer->getViewerStats() != NULL) {
             _viewer->getViewerStats()->report(std::cerr, _viewer->getViewerStats()->getLatestFrameNumber());
         }
+#endif
         _needsRedraw = false;
         return true;

trunk/packages/vizservers/geovis/Renderer.h

@@ -33 +33 @@
 
 // Controls if TGA format is sent to client
-#define RENDER_TARGA
+//#define RENDER_TARGA
 #define TARGA_BYTES_PER_PIXEL 3
 
@@ -49 +49 @@
     virtual void operator()(osg::RenderInfo &renderInfo) const
     {
-        TRACE("Enter");
+        TRACE("Enter ScreenCaptureCallback");
         int width, height;
         if (renderInfo.getCurrentCamera() == NULL) {
@@ -88 +88 @@
     {}
 
-    void set(const osgEarth::GeoPoint& p, osg::View* view, osgEarth::MapNode* mapNode)
-    {
-        // p.y(), p.x()
+    void set(const osgEarth::GeoPoint& p, osg::View *view, osgEarth::MapNode *mapNode)
+    {
         _pt = p;
         _havePoint = true;
     }
 
-    void reset(osg::View* view, osgEarth::MapNode* mapNode)
+    void reset(osg::View *view, osgEarth::MapNode *mapNode)
     {
         // Out of range click
-        //_havePoint = false;
+        _havePoint = false;
     }
 
@@ -131 +130 @@
     void loadEarthFile(const char *path);
 
+    void resetMap(osgEarth::MapOptions::CoordinateSystemType type, const char *profile = NULL);
+
+    // Map options
+
+    void setLighting(bool state);
+
     // Image raster layers
 
@@ -185 +190 @@
     // Mouse events
 
+    void setThrowingEnabled(bool state);
+
     void mouseClick(int button, double x, double y);
 
@@ -206 +213 @@
 
     osg::Image *getRenderedFrame();
+
+    bool mapMouseCoords(float mouseX, float mouseY, osgEarth::GeoPoint &pt);
 
     bool getMousePoint(double *x, double *y, double *z)
@@ -218 +227 @@
 private:
     void initCamera();
+
+    osgGA::EventQueue *getEventQueue();
 
     bool _needsRedraw;

trunk/packages/vizservers/geovis/RendererCmd.cpp

@@ -19 +19 @@
 #include <tcl.h>
 
+#include <osgEarthDrivers/gdal/GDALOptions>
+
 #include "Trace.h"
 #include "CmdProc.h"
@@ -28 +30 @@
 #include "PPMWriter.h"
 #include "TGAWriter.h"
-#ifdef USE_THREADS
 #include "ResponseQueue.h"
+#ifdef USE_READ_THREAD
+#include "CommandQueue.h"
 #endif
 
@@ -36 +39 @@
 static int lastCmdStatus;
 
-ssize_t
-GeoVis::queueResponse(const void *bytes, size_t len, 
-                      Response::AllocationType allocType,
-                      Response::ResponseType type)
-{
-#ifdef USE_THREADS
-    Response *response = new Response(type);
-    response->setMessage((unsigned char *)bytes, len, allocType);
-    g_queue->enqueue(response);
-    return (ssize_t)len;
-#else
-    return SocketWrite(bytes, len);
-#endif
-}
-
+#ifndef USE_THREADS
 static ssize_t
 SocketWrite(const void *bytes, size_t len)
@@ -66 +55 @@
     return bytesWritten;
 }
+#endif
 
 static bool
@@ -74 +64 @@
     TRACE("followingData status: %d", status);
     return (status == ReadBuffer::OK);
+}
+
+ssize_t
+GeoVis::queueResponse(const void *bytes, size_t len, 
+                      Response::AllocationType allocType,
+                      Response::ResponseType type)
+{
+#ifdef USE_THREADS
+    Response *response = new Response(type);
+    response->setMessage((unsigned char *)bytes, len, allocType);
+    g_outQueue->enqueue(response);
+    return (ssize_t)len;
+#else
+    return SocketWrite(bytes, len);
+#endif
 }
 
@@ -192 +197 @@
 
 static int
+CameraThrowOp(ClientData clientData, Tcl_Interp *interp, int objc, 
+              Tcl_Obj *const *objv)
+{
+    bool state;
+
+    if (GetBooleanFromObj(interp, objv[2], &state) != TCL_OK) {
+        return TCL_ERROR;
+    }
+
+    g_renderer->setThrowingEnabled(state);
+    return TCL_OK;
+}
+
+static int
 CameraZoomOp(ClientData clientData, Tcl_Interp *interp, int objc, 
             Tcl_Obj *const *objv)
@@ -210 +229 @@
     {"reset",  2, CameraResetOp, 2, 3, "?all?"},
     {"rotate", 2, CameraRotateOp, 4, 4, "azimuth elevation"},
+    {"throw",  1, CameraThrowOp, 3, 3, "bool"},
     {"zoom",   1, CameraZoomOp, 3, 3, "zoomAmount"}
 };
@@ -312 +332 @@
 
 static int
+MapLayerAddOp(ClientData clientData, Tcl_Interp *interp, int objc, 
+              Tcl_Obj *const *objv)
+{
+    osgEarth::Drivers::GDALOptions opts;
+    char *url =  Tcl_GetString(objv[3]);
+    char *name = Tcl_GetString(objv[4]);
+
+    opts.url() = url;
+
+    g_renderer->addImageLayer(name, opts);
+
+    return TCL_OK;
+}
+
+static int
+MapLayerDeleteOp(ClientData clientData, Tcl_Interp *interp, int objc, 
+                 Tcl_Obj *const *objv)
+{
+    if (objc > 3) {
+        char *name = Tcl_GetString(objv[3]);
+        g_renderer->removeImageLayer(name);
+    } else {
+        g_renderer->removeImageLayer("all");
+    }
+
+    return TCL_OK;
+}
+
+static int
+MapLayerMoveOp(ClientData clientData, Tcl_Interp *interp, int objc, 
+               Tcl_Obj *const *objv)
+{
+    int pos;
+    if (Tcl_GetIntFromObj(interp, objv[3], &pos) != TCL_OK) {
+        return TCL_ERROR;
+    }
+    char *name = Tcl_GetString(objv[4]);
+    if (pos < 0) {
+        Tcl_AppendResult(interp, "bad layer pos ", pos,
+                         ": must be positive", (char*)NULL);
+        return TCL_ERROR;
+    }
+    g_renderer->moveImageLayer(name, (unsigned int)pos);
+
+    return TCL_OK;
+}
+
+static int
+MapLayerOpacityOp(ClientData clientData, Tcl_Interp *interp, int objc, 
+                  Tcl_Obj *const *objv)
+{
+    double opacity;
+    if (Tcl_GetDoubleFromObj(interp, objv[3], &opacity) != TCL_OK) {
+        return TCL_ERROR;
+    }
+    char *name = Tcl_GetString(objv[4]);
+    if (opacity < 0.0 || opacity > 1.0) {
+        Tcl_AppendResult(interp, "bad layer opacity ", opacity,
+                         ": must be [0,1]", (char*)NULL);
+        return TCL_ERROR;
+    }
+    g_renderer->setImageLayerOpacity(name, opacity);
+
+    return TCL_OK;
+}
+
+static int
+MapLayerVisibleOp(ClientData clientData, Tcl_Interp *interp, int objc, 
+                  Tcl_Obj *const *objv)
+{
+    bool visible;
+    if (GetBooleanFromObj(interp, objv[3], &visible) != TCL_OK) {
+        return TCL_ERROR;
+    }
+    char *name = Tcl_GetString(objv[4]);
+
+    g_renderer->setImageLayerVisibility(name, visible);
+
+    return TCL_OK;
+}
+
+static Rappture::CmdSpec mapLayerOps[] = {
+    {"add",     1, MapLayerAddOp,       5, 5, "type url name"},
+    {"delete",  1, MapLayerDeleteOp,    3, 4, "?name?"},
+    {"move",    1, MapLayerMoveOp,      5, 5, "pos name"},
+    {"opacity", 1, MapLayerOpacityOp,   5, 5, "opacity ?name?"},
+    {"visible", 1, MapLayerVisibleOp,   5, 5, "bool ?name?"},
+};
+static int nMapLayerOps = NumCmdSpecs(mapLayerOps);
+
+static int
+MapLayerOp(ClientData clientData, Tcl_Interp *interp, int objc, 
+           Tcl_Obj *const *objv)
+{
+    Tcl_ObjCmdProc *proc;
+
+    proc = Rappture::GetOpFromObj(interp, nMapLayerOps, mapLayerOps,
+                                  Rappture::CMDSPEC_ARG2, objc, objv, 0);
+    if (proc == NULL) {
+        return TCL_ERROR;
+    }
+    return (*proc) (clientData, interp, objc, objv);
+}
+
+static int
+MapLoadOp(ClientData clientData, Tcl_Interp *interp, int objc, 
+          Tcl_Obj *const *objv)
+{
+    char *opt = Tcl_GetString(objv[2]);
+    if (opt[0] == 'f' && strcmp(opt, "file") == 0) {
+        g_renderer->loadEarthFile(Tcl_GetString(objv[3]));
+    } else if (opt[0] == 'u' && strcmp(opt, "url") == 0) {
+        std::ostringstream path;
+        path << "server:" << Tcl_GetString(objv[3]);
+        g_renderer->loadEarthFile(path.str().c_str());
+    } else if (opt[0] == 'd' && strcmp(opt, "data") == 0) {
+        opt = Tcl_GetString(objv[3]);
+        if (opt[0] != 'f' || strcmp(opt, "follows") != 0) {
+            return TCL_ERROR;
+        }
+        int len;
+        if (Tcl_GetIntFromObj(interp, objv[4], &len) != TCL_OK) {
+            return TCL_ERROR;
+        }
+        // Read Earth file from socket
+        char *buf = (char *)malloc((size_t)len);
+        SocketRead(buf, (size_t)len);
+        std::ostringstream path;
+        path << "/tmp/tmp" << getpid() << ".earth";
+        FILE *tmpFile = fopen(path.str().c_str(), "w");
+        fwrite(buf, len, 1, tmpFile);
+        fclose(tmpFile);
+        g_renderer->loadEarthFile(path.str().c_str());
+        unlink(path.str().c_str());
+        free(buf);
+    } else {
+        return TCL_ERROR;
+    }
+    return TCL_OK;
+}
+
+static int
+MapResetOp(ClientData clientData, Tcl_Interp *interp, int objc, 
+           Tcl_Obj *const *objv)
+{
+    char *typeStr = Tcl_GetString(objv[2]);
+    osgEarth::MapOptions::CoordinateSystemType type;
+    if (typeStr[0] == 'g' && strcmp(typeStr, "geocentric") == 0) {
+        type = osgEarth::MapOptions::CSTYPE_GEOCENTRIC;
+    } else if (typeStr[0] == 'g' && strcmp(typeStr, "geocentric_cube") == 0) {
+        type = osgEarth::MapOptions::CSTYPE_GEOCENTRIC_CUBE;
+    } else if (typeStr[0] == 'p' && strcmp(typeStr, "projected") == 0) {
+        type = osgEarth::MapOptions::CSTYPE_PROJECTED;
+    } else {
+        Tcl_AppendResult(interp, "bad map type \"", typeStr,
+                         "\": must be geocentric, geocentric_cube or projected", (char*)NULL);
+        return TCL_ERROR;
+    }
+
+    char *profile = NULL;
+    if (objc > 3) {
+        profile = Tcl_GetString(objv[3]);
+    }
+
+    g_renderer->resetMap(type, profile);
+
+    return TCL_OK;
+}
+
+static Rappture::CmdSpec mapOps[] = {
+    {"layer",    2, MapLayerOp,       3, 5, "op ?params...?"},
+    {"load",     2, MapLoadOp,        4, 5, "options"},
+    {"reset",    1, MapResetOp,       3, 4, "type ?profile?"},
+};
+static int nMapOps = NumCmdSpecs(mapOps);
+
+static int
+MapCmd(ClientData clientData, Tcl_Interp *interp, int objc, 
+       Tcl_Obj *const *objv)
+{
+    Tcl_ObjCmdProc *proc;
+
+    proc = Rappture::GetOpFromObj(interp, nMapOps, mapOps,
+                                  Rappture::CMDSPEC_ARG1, objc, objv, 0);
+    if (proc == NULL) {
+        return TCL_ERROR;
+    }
+    return (*proc) (clientData, interp, objc, objv);
+}
+
+static int
 MouseClickOp(ClientData clientData, Tcl_Interp *interp, int objc, 
              Tcl_Obj *const *objv)
@@ -441 +652 @@
 
 static int
-RendererLoadOp(ClientData clientData, Tcl_Interp *interp, int objc, 
-               Tcl_Obj *const *objv)
-{
-    g_renderer->loadEarthFile(Tcl_GetString(objv[2]));
-    return TCL_OK;
-}
-
-static int
 RendererRenderOp(ClientData clientData, Tcl_Interp *interp, int objc, 
                  Tcl_Obj *const *objv)
@@ -457 +660 @@
 
 static Rappture::CmdSpec rendererOps[] = {
-    {"load",       1, RendererLoadOp, 3, 3, "path"},
     {"render",     1, RendererRenderOp, 2, 2, ""},
 };
@@ -526 +728 @@
     return (*proc) (clientData, interp, objc, objv);
 }
+
+#ifdef USE_READ_THREAD
+int
+GeoVis::queueCommands(Tcl_Interp *interp,
+                      ClientData clientData,
+                      ReadBuffer *inBufPtr)
+{
+    Tcl_DString commandString;
+    Tcl_DStringInit(&commandString);
+    fd_set readFds;
+
+    FD_ZERO(&readFds);
+    FD_SET(inBufPtr->file(), &readFds);
+    while (inBufPtr->isLineAvailable() || 
+           (select(1, &readFds, NULL, NULL, NULL) > 0)) {
+        size_t numBytes;
+        unsigned char *buffer;
+
+        /* A short read is treated as an error here because we assume that we
+         * will always get commands line by line. */
+        if (inBufPtr->getLine(&numBytes, &buffer) != ReadBuffer::OK) {
+            /* Terminate the server if we can't communicate with the client
+             * anymore. */
+            if (inBufPtr->status() == ReadBuffer::ENDFILE) {
+                TRACE("Exiting server on EOF from client");
+                return -1;
+            } else {
+                ERROR("Exiting server, failed to read from client: %s",
+                      strerror(errno));
+                return -1;
+            }
+        }
+        Tcl_DStringAppend(&commandString, (char *)buffer, numBytes);
+        if (Tcl_CommandComplete(Tcl_DStringValue(&commandString))) {
+            // Add to queue
+            Command *command = new Command(Command::COMMAND);
+            command->setMessage((unsigned char *)Tcl_DStringValue(&commandString),
+                                Tcl_DStringLength(&commandString), Command::VOLATILE);
+            g_inQueue->enqueue(command);
+            Tcl_DStringSetLength(&commandString, 0);
+        }
+        FD_SET(inBufPtr->file(), &readFds);
+    }
+
+    return 1;
+}
+#endif
 
 /**
@@ -592 +841 @@
             g_stats.nCommands++;
             if (status == TCL_BREAK) {
-                return 1;               /* This was caused by a "imgflush"
+                return 2;               /* This was caused by a "imgflush"
                                          * command. Break out of the read loop
                                          * and allow a new image to be
@@ -602 +851 @@
                 }
             }
+            if (status == TCL_OK) {
+                ret = 3;
+            }
         }
 
@@ -671 +923 @@
     Tcl_CreateObjCommand(interp, "clientinfo",     ClientInfoCmd,     clientData, NULL);
     Tcl_CreateObjCommand(interp, "imgflush",       ImageFlushCmd,     clientData, NULL);
+    Tcl_CreateObjCommand(interp, "map",            MapCmd,            clientData, NULL);
     Tcl_CreateObjCommand(interp, "mouse",          MouseCmd,          clientData, NULL);
     Tcl_CreateObjCommand(interp, "renderer",       RendererCmd,       clientData, NULL);
@@ -684 +937 @@
     Tcl_DeleteCommand(interp, "clientinfo");
     Tcl_DeleteCommand(interp, "imgflush");
+    Tcl_DeleteCommand(interp, "map");
     Tcl_DeleteCommand(interp, "mouse");
     Tcl_DeleteCommand(interp, "renderer");

trunk/packages/vizservers/geovis/RendererCmd.h

@@ -13 +13 @@
 
 #include "ReadBuffer.h"
-#ifdef USE_THREADS
 #include "ResponseQueue.h"
-#endif
 
 namespace GeoVis {
 
-#ifdef USE_THREADS
 extern ssize_t queueResponse(const void *bytes, size_t len, 
                              Response::AllocationType allocType,
                              Response::ResponseType type = Response::DATA);
+
+#ifdef USE_READ_THREAD
+extern int queueCommands(Tcl_Interp *interp,
+                         ClientData clientData,
+                         ReadBuffer *inBufPtr);
 #endif
 

trunk/packages/vizservers/geovis/TGAWriter.cpp

@@ -138 +138 @@
     iov[1].iov_len = headerLength;
     // Image data **must be BGR(A)!**
-    iov[2].iov_base = data;
+    iov[2].iov_base = const_cast<unsigned char *>(data);
     iov[2].iov_len = dataLength;