Changeset 4349

Timestamp:

Apr 25, 2014, 3:26:50 PM (10 years ago)

Author:

ldelgass

Message:

Improvements to coordinate display, scale bar

Location:

trunk/packages/vizservers/geovis

Files:

• Makefile.in (modified) (2 diffs)
• MouseCoordsTool.h (added)
• RenderServer.cpp (modified) (4 diffs)
• RenderServer.h (modified) (5 diffs)
• Renderer.cpp (modified) (16 diffs)
• Renderer.h (modified) (10 diffs)
• RendererCmd.cpp (modified) (8 diffs)
• ScaleBar.cpp (added)
• ScaleBar.h (added)
• Stats.cpp (added)
• Stats.h (added)

trunk/packages/vizservers/geovis/Makefile.in

@@ -107 +107 @@
                 RenderServer.cpp \
                 TGAWriter.cpp \
-                Trace.cpp
+                Trace.cpp \
+                ScaleBar.cpp \
+                Stats.cpp
 
 ifdef USE_THREADS
@@ -156 +158 @@
 PPMWriter.o: PPMWriter.h ResponseQueue.h Trace.h
 ReadBuffer.o: ReadBuffer.h Trace.h
-Renderer.o: Renderer.h Trace.h
+Renderer.o: Renderer.h Trace.h MouseCoordsTool.h ScaleBar.h
 RendererCmd.o: Renderer.h ReadBuffer.h ResponseQueue.h Trace.h CmdProc.h PPMWriter.h TGAWriter.h
-RenderServer.o: RenderServer.h RendererCmd.h Renderer.h ReadBuffer.h ResponseQueue.h Trace.h PPMWriter.h TGAWriter.h
+RenderServer.o: RenderServer.h RendererCmd.h Renderer.h ReadBuffer.h ResponseQueue.h Trace.h PPMWriter.h TGAWriter.h Stats.h
 ResponseQueue.o: ResponseQueue.h Trace.h
+ScaleBar.o: ScaleBar.h Trace.h
+Stats.o: Stats.h RenderServer.h Trace.h md5.h
 Trace.o: Trace.h

trunk/packages/vizservers/geovis/RenderServer.cpp

@@ -28 +28 @@
 #include "RendererCmd.h"
 #include "Renderer.h"
+#include "Stats.h"
 #include "PPMWriter.h"
 #include "TGAWriter.h"
@@ -37 +38 @@
 #endif
 #endif 
-#include <md5.h>
 
 using namespace GeoVis;
@@ -184 +184 @@
 }
 
-int
-GeoVis::getStatsFile(Tcl_Interp *interp, Tcl_Obj *objPtr)
-{
-    Tcl_DString ds;
-    Tcl_Obj **objv;
-    int objc;
-    int i;
-    char fileName[33];
-    const char *path;
-    md5_state_t state;
-    md5_byte_t digest[16];
-    char *string;
-    int length;
-
-    if ((objPtr == NULL) || (g_statsFile >= 0)) {
-        return g_statsFile;
-    }
-    if (Tcl_ListObjGetElements(interp, objPtr, &objc, &objv) != TCL_OK) {
-        return -1;
-    }
-    Tcl_ListObjAppendElement(interp, objPtr, Tcl_NewStringObj("pid", 3));
-    Tcl_ListObjAppendElement(interp, objPtr, Tcl_NewIntObj(getpid()));
-    string = Tcl_GetStringFromObj(objPtr, &length);
-
-    md5_init(&state);
-    md5_append(&state, (const md5_byte_t *)string, length);
-    md5_finish(&state, digest);
-    for (i = 0; i < 16; i++) {
-        sprintf(fileName + i * 2, "%02x", digest[i]);
-    }
-    Tcl_DStringInit(&ds);
-    Tcl_DStringAppend(&ds, STATSDIR, -1);
-    Tcl_DStringAppend(&ds, "/", 1);
-    Tcl_DStringAppend(&ds, fileName, 32);
-    path = Tcl_DStringValue(&ds);
-
-    g_statsFile = open(path, O_EXCL | O_CREAT | O_WRONLY, 0600);
-    Tcl_DStringFree(&ds);
-    if (g_statsFile < 0) {
-        ERROR("can't open \"%s\": %s", fileName, strerror(errno));
-        return -1;
-    }
-    return g_statsFile;
-}
-
-int
-GeoVis::writeToStatsFile(int f, const char *s, size_t length)
-{
-    if (f >= 0) {
-        ssize_t numWritten;
-
-        numWritten = write(f, s, length);
-        if (numWritten == (ssize_t)length) {
-            close(dup(f));
-        }
-    }
-    return 0;
-}
-
-static int
-serverStats(int code) 
-{
-    double start, finish;
-    char buf[BUFSIZ];
-    Tcl_DString ds;
-    int result;
-    int f;
-
-    {
-        struct timeval tv;
-
-        /* Get ending time.  */
-        gettimeofday(&tv, NULL);
-        finish = CVT2SECS(tv);
-        tv = g_stats.start;
-        start = CVT2SECS(tv);
-    }
-    /* 
-     * Session information:
-     *   - Name of render server
-     *   - Process ID
-     *   - Hostname where server is running
-     *   - Start date of session
-     *   - Start date of session in seconds
-     *   - Number of data sets loaded from client
-     *   - Number of data bytes total loaded from client
-     *   - Number of frames returned
-     *   - Number of bytes total returned (in frames)
-     *   - Number of commands received
-     *   - Total elapsed time of all commands
-     *   - Total elapsed time of session
-     *   - Exit code of vizserver
-     *   - User time 
-     *   - System time
-     *   - User time of children 
-     *   - System time of children 
-     */
-
-    Tcl_DStringInit(&ds);
-    
-    Tcl_DStringAppendElement(&ds, "render_stop");
-    /* renderer */
-    Tcl_DStringAppendElement(&ds, "renderer");
-    Tcl_DStringAppendElement(&ds, "geovis");
-    /* pid */
-    Tcl_DStringAppendElement(&ds, "pid");
-    sprintf(buf, "%d", getpid());
-    Tcl_DStringAppendElement(&ds, buf);
-    /* host */
-    Tcl_DStringAppendElement(&ds, "host");
-    gethostname(buf, BUFSIZ-1);
-    buf[BUFSIZ-1] = '\0';
-    Tcl_DStringAppendElement(&ds, buf);
-    /* date */
-    Tcl_DStringAppendElement(&ds, "date");
-    strcpy(buf, ctime(&g_stats.start.tv_sec));
-    buf[strlen(buf) - 1] = '\0';
-    Tcl_DStringAppendElement(&ds, buf);
-    /* date_secs */
-    Tcl_DStringAppendElement(&ds, "date_secs");
-    sprintf(buf, "%ld", g_stats.start.tv_sec);
-    Tcl_DStringAppendElement(&ds, buf);
-    /* num_data_sets */
-    Tcl_DStringAppendElement(&ds, "num_data_sets");
-    sprintf(buf, "%lu", (unsigned long int)g_stats.nDataSets);
-    Tcl_DStringAppendElement(&ds, buf);
-    /* data_set_bytes */
-    Tcl_DStringAppendElement(&ds, "data_set_bytes");
-    sprintf(buf, "%lu", (unsigned long int)g_stats.nDataBytes);
-    Tcl_DStringAppendElement(&ds, buf);
-    /* num_frames */
-    Tcl_DStringAppendElement(&ds, "num_frames");
-    sprintf(buf, "%lu", (unsigned long int)g_stats.nFrames);
-    Tcl_DStringAppendElement(&ds, buf);
-    /* frame_bytes */
-    Tcl_DStringAppendElement(&ds, "frame_bytes");
-    sprintf(buf, "%lu", (unsigned long int)g_stats.nFrameBytes);
-    Tcl_DStringAppendElement(&ds, buf);
-    /* num_commands */
-    Tcl_DStringAppendElement(&ds, "num_commands");
-    sprintf(buf, "%lu", (unsigned long int)g_stats.nCommands);
-    Tcl_DStringAppendElement(&ds, buf);
-    /* cmd_time */
-    Tcl_DStringAppendElement(&ds, "cmd_time");
-    sprintf(buf, "%g", g_stats.cmdTime);
-    Tcl_DStringAppendElement(&ds, buf);
-    /* session_time */
-    Tcl_DStringAppendElement(&ds, "session_time");
-    sprintf(buf, "%g", finish - start);
-    Tcl_DStringAppendElement(&ds, buf);
-    /* status */
-    Tcl_DStringAppendElement(&ds, "status");
-    sprintf(buf, "%d", code);
-    Tcl_DStringAppendElement(&ds, buf);
-    {
-        long clocksPerSec = sysconf(_SC_CLK_TCK);
-        double clockRes = 1.0 / clocksPerSec;
-        struct tms tms;
-
-        memset(&tms, 0, sizeof(tms));
-        times(&tms);
-        /* utime */
-        Tcl_DStringAppendElement(&ds, "utime");
-        sprintf(buf, "%g", tms.tms_utime * clockRes);
-        Tcl_DStringAppendElement(&ds, buf);
-        /* stime */
-        Tcl_DStringAppendElement(&ds, "stime");
-        sprintf(buf, "%g", tms.tms_stime * clockRes);
-        Tcl_DStringAppendElement(&ds, buf);
-        /* cutime */
-        Tcl_DStringAppendElement(&ds, "cutime");
-        sprintf(buf, "%g", tms.tms_cutime * clockRes);
-        Tcl_DStringAppendElement(&ds, buf);
-        /* cstime */
-        Tcl_DStringAppendElement(&ds, "cstime");
-        sprintf(buf, "%g", tms.tms_cstime * clockRes);
-        Tcl_DStringAppendElement(&ds, buf);
-    }
-    Tcl_DStringAppend(&ds, "\n", -1);
-    f = getStatsFile(NULL, NULL);
-    result = writeToStatsFile(f, Tcl_DStringValue(&ds), 
-                              Tcl_DStringLength(&ds));
-    close(f);
-    Tcl_DStringFree(&ds);
-    return result;
-}
-
 static void
 initService()
@@ -418 +231 @@
     TRACE("Enter");
 
-    serverStats(0);
+    serverStats(g_stats, 0);
 
     // close log file

trunk/packages/vizservers/geovis/RenderServer.h

@@ -1 +1 @@
 /* -*- mode: c++; c-basic-offset: 4; indent-tabs-mode: nil -*- */
 /*
- * Copyright (C) 2013  HUBzero Foundation, LLC
+ * Copyright (C) 2013-2014  HUBzero Foundation, LLC
  *
  * Author: Leif Delgass <ldelgass@purdue.edu>
@@ -9 +9 @@
 #define GEOVIS_RENDERSERVER_H
 
+#include <stdio.h>
 #include <sys/types.h>
 #include <sys/time.h>
@@ -18 +19 @@
 class CommandQueue;
 class ResponseQueue;
+class Stats;
 
 #define GEOVIS_VERSION_STRING "0.4"
@@ -26 +28 @@
 
 #define CVT2SECS(x)  ((double)(x).tv_sec) + ((double)(x).tv_usec * 1.0e-6)
-
-#ifndef STATSDIR
-#define STATSDIR        "/var/tmp/visservers"
-#endif
-
-typedef struct {
-    pid_t pid;
-    size_t nDataSets;       /**< # of data sets received */
-    size_t nDataBytes;      /**< # of bytes received as data sets */
-    size_t nFrames;         /**< # of frames sent to client. */
-    size_t nFrameBytes;     /**< # of bytes for all frames. */
-    size_t nCommands;       /**< # of commands executed */
-    double cmdTime;         /**< Elasped time spend executing commands. */
-    struct timeval start;   /**< Start of elapsed time. */
-} Stats;
 
 extern Stats g_stats;
@@ -58 +45 @@
 extern int g_statsFile;
 extern int writeToStatsFile(int f, const char *s, size_t length);
-extern int getStatsFile(Tcl_Interp * interp, Tcl_Obj *objPtr);
+extern int getStatsFile(const char *key = NULL);
 
 }

trunk/packages/vizservers/geovis/Renderer.cpp

@@ -43 +43 @@
 #include <osgEarthUtil/GeodeticGraticule>
 #include <osgEarthUtil/LatLongFormatter>
+#include <osgEarthUtil/MGRSFormatter>
 #include <osgEarthUtil/GLSLColorFilter>
 #include <osgEarthUtil/VerticalScale>
@@ -49 +50 @@
 
 #include "Renderer.h"
+#include "ScaleBar.h"
 #include "Trace.h"
 
@@ -62 +64 @@
     _needsRedraw(false),
     _windowWidth(500),
-    _windowHeight(500)
+    _windowHeight(500),
+    _scaleBarUnits(UNITS_METERS)
 {
     _bgColor[0] = 0;
@@ -100 +103 @@
 
     initEarthManipulator();
-    initMouseCoordsTool();
     initControls();
 
@@ -169 +171 @@
 {
     _colorMaps[id] = xfer;
-#if 0
-    osgEarth::Drivers::GDALOptions opts;
-    char *url =  Tcl_GetString(objv[4]);
-    std::ostringstream oss;
-    oss << "_cmap_" << id;
-
-    opts.url() = url;
-
-    addImageLayer(oss.str().c_str(), opts);
-#endif
 }
 
@@ -312 +304 @@
         _viewer->realize();
         initColorMaps();
+        // HACK: This seems to initialize something required for properly
+        // mapping mouse coords
+        assert(getEventQueue() != NULL);
+        getEventQueue()->mouseMotion(_windowWidth/2, _windowHeight/2);
     }
 }
@@ -343 +339 @@
     _hbox->addControl(_scaleBar.get());
     osgEarth::Util::Controls::ControlCanvas::get(_viewer.get(), true)->addControl(_hbox.get());
+    // Install an event callback to handle scale bar updates
+    // Can't use an update callback since that will trigger
+    // constant rendering
+    _mapNode->setEventCallback(new MapNodeCallback(this));
 }
 
@@ -383 +383 @@
 }
 
-void Renderer::initMouseCoordsTool()
-{
+void Renderer::setReadout(int x, int y)
+{
+    if (!_coordsCallback.valid() || !_mapNode.valid() || !_viewer.valid())
+        return;
+
+    osgEarth::GeoPoint mapCoord;
+    if (mapMouseCoords(x, y, mapCoord)) {
+        _coordsCallback->set(mapCoord, _viewer->asView(), _mapNode);
+    } else {
+        _coordsCallback->reset(_viewer->asView(), _mapNode);
+    }
+    _needsRedraw = true;
+}
+
+void Renderer::clearReadout()
+{
+    if (_coordsCallback.valid()) {
+        _coordsCallback->reset(_viewer->asView(), _mapNode);
+    }
+    _needsRedraw = true;
+}
+
+void Renderer::setCoordinateReadout(bool state, CoordinateDisplayType type,
+                                    int precision)
+{
+    if (!state) {
+        if (_mouseCoordsTool.valid() && _viewer.valid()) {
+            _viewer->removeEventHandler(_mouseCoordsTool.get());
+            _mouseCoordsTool = NULL;
+        }
+        if (_coordsCallback.valid() && _viewer.valid()) {
+            osgEarth::Util::Controls::LabelControl *readout =
+                _coordsCallback->getLabel();
+            osgEarth::Util::Controls::ControlCanvas::get(_viewer.get(), true)->removeControl(readout);
+            _coordsCallback = NULL;
+        }
+    } else {
+        initMouseCoordsTool(type, precision);
+    }
+    _needsRedraw = true;
+}
+
+osgEarth::Util::MGRSFormatter::Precision
+Renderer::getMGRSPrecision(int precisionInMeters)
+{
+    switch (precisionInMeters) {
+    case 1:
+        return osgEarth::Util::MGRSFormatter::PRECISION_1M;
+    case 10:
+        return osgEarth::Util::MGRSFormatter::PRECISION_10M;
+    case 100:
+        return osgEarth::Util::MGRSFormatter::PRECISION_100M;
+    case 1000:
+        return osgEarth::Util::MGRSFormatter::PRECISION_1000M;
+    case 10000:
+        return osgEarth::Util::MGRSFormatter::PRECISION_10000M;
+    case 100000:
+        return osgEarth::Util::MGRSFormatter::PRECISION_100000M;
+    default:
+        ERROR("Invalid precision: %d", precisionInMeters);
+        return osgEarth::Util::MGRSFormatter::PRECISION_1M;
+    }
+}
+
+void Renderer::initMouseCoordsTool(CoordinateDisplayType type, int precision)
+{
+    if (!_viewer.valid())
+        return;
     if (_mouseCoordsTool.valid()) {
         _viewer->removeEventHandler(_mouseCoordsTool.get());
     }
-    _mouseCoordsTool = new osgEarth::Util::MouseCoordsTool(_mapNode.get());
-
-    if (!_coordsCallback.valid()) {
-        osgEarth::Util::Controls::LabelControl *readout =
-            new osgEarth::Util::Controls::LabelControl("", 12.0f);
+    _mouseCoordsTool = new MouseCoordsTool(_mapNode.get());
+    osgEarth::Util::Controls::LabelControl *readout;
+    if (_coordsCallback.valid()) {
+        readout = _coordsCallback->getLabel();
+        _coordsCallback = NULL;
+    } else {
+        readout = new osgEarth::Util::Controls::LabelControl("", 12.0f);
+        osgEarth::Util::Controls::ControlCanvas::get(_viewer.get(), true)->addControl(readout);
         readout->setForeColor(osg::Vec4f(1, 1, 1, 1));
         readout->setHaloColor(osg::Vec4f(0, 0, 0, 1));
-        osgEarth::Util::Controls::ControlCanvas::get(_viewer.get(), true)->addControl(readout);
-        osgEarth::Util::LatLongFormatter *formatter =
-            new osgEarth::Util::LatLongFormatter();
-        formatter->setPrecision(5);
-        _coordsCallback = new MouseCoordsCallback(readout, formatter);
-    }
+    }
+
+    osgEarth::Util::Formatter *formatter = NULL;
+    if (type == COORDS_MGRS) {
+        osgEarth::Util::MGRSFormatter::Precision prec =
+            osgEarth::Util::MGRSFormatter::PRECISION_1M;
+        if (precision > 0) {
+            prec = getMGRSPrecision(precision);
+        }
+        unsigned int opts = 0u;
+        formatter = new osgEarth::Util::MGRSFormatter(prec, NULL, opts);
+    } else {
+        osgEarth::Util::LatLongFormatter::AngularFormat af;
+        unsigned int opts =  osgEarth::Util::LatLongFormatter::USE_SYMBOLS;
+        switch (type) {
+        case COORDS_LATLONG_DEGREES_DECIMAL_MINUTES:
+            af = osgEarth::Util::LatLongFormatter::FORMAT_DEGREES_DECIMAL_MINUTES;
+            break;
+        case COORDS_LATLONG_DEGREES_MINUTES_SECONDS:
+            af = osgEarth::Util::LatLongFormatter::FORMAT_DEGREES_MINUTES_SECONDS;
+            break;
+        default:
+            af = osgEarth::Util::LatLongFormatter::FORMAT_DECIMAL_DEGREES;
+        }
+        osgEarth::Util::LatLongFormatter *latlong = new osgEarth::Util::LatLongFormatter(af, opts);
+        if (precision > 0) {
+            latlong->setPrecision(precision);
+        }
+        formatter = latlong;
+    }
+    _coordsCallback = new MouseCoordsCallback(readout, formatter);
+
     _mouseCoordsTool->addCallback(_coordsCallback.get());
     _viewer->addEventHandler(_mouseCoordsTool.get());
@@ -457 +552 @@
     _viewer->setSceneData(_sceneRoot.get());
 
-    initMouseCoordsTool();
+    if (_mouseCoordsTool.valid()) {
+        initMouseCoordsTool();
+    }
     initControls();
     initEarthManipulator();
@@ -548 +645 @@
     }
     _viewer->setSceneData(_sceneRoot.get());
-    initMouseCoordsTool();
+    if (_mouseCoordsTool.valid()) {
+        initMouseCoordsTool();
+    }
     initControls();
     //_viewer->setSceneData(_sceneRoot.get());
@@ -1076 +1175 @@
         }
 #endif
+        // HACK: Without this, the mouse coordinate mapping uses the old size
+        // for 1 frame.
+        assert(_viewer->getEventQueue() != NULL);
+        //TRACE("Window EventQueue: %p", getEventQueue());
+        //TRACE("Viewer EventQueue: %p", _viewer->getEventQueue());
+        _viewer->getEventQueue()->windowResize(0, 0, _windowWidth, _windowHeight);
         _needsRedraw = true;
     }
@@ -1344 +1449 @@
 
 /**
+ * \brief MapNode event phase
+ *
+ * This is called by the MapNode's event callback during the event
+ * traversal of the viewer
+ */
+void Renderer::mapNodeUpdate()
+{
+    computeMapScale();
+}
+
+/**
  * \brief Cause the rendering to render a new image if needed
  *
@@ -1353 +1469 @@
     if (_viewer.valid() && checkNeedToDoFrame()) {
         TRACE("Enter needsRedraw=%d",  _needsRedraw ? 1 : 0);
-        computeMapScale();
         osg::Timer_t startFrameTick = osg::Timer::instance()->tick();
         TRACE("Before frame()");
@@ -1387 +1502 @@
     else
         return NULL;
+}
+
+void Renderer::setScaleBar(bool state)
+{
+    if (_scaleLabel.valid()) {
+        _scaleLabel->setVisible(state);
+    }
+    if (_scaleBar.valid()) {
+        _scaleBar->setVisible(state);
+    }
+    _needsRedraw = true;
+}
+
+void Renderer::setScaleBarUnits(ScaleBarUnits units)
+{
+    _scaleBarUnits = units;
+    _needsRedraw = true;
 }
 
@@ -1403 +1535 @@
 double Renderer::computeMapScale()
 {
+    if (!_scaleLabel.valid() || !_scaleLabel->visible()) {
+        return -1.0;
+    }
     if (!_mapNode.valid() || _mapNode->getTerrain() == NULL) {
         ERROR("No map");
@@ -1479 +1614 @@
 
     double scale = meters / pixelWidth;
+    // 1mi = 5280 feet
+    //double scaleMiles = scale / 1609.344; // International mile = 1609.344m
+    //double scaleNauticalMiles = scale / 1852.0; // nautical mile = 1852m
+    //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
     TRACE("m: %g px: %g m/px: %g", meters, pixelWidth, scale);
-    if (meters <= 3) {
-        meters = 1;
-    } else if (meters <= 7.5) {
-        meters = 5;
-    } else if (meters <= 15) {
-        meters = 10;
-    } else if (meters <= 35) {
-        meters = 20;
-    } else if (meters <= 75) {
-        meters = 50;
-    } else if (meters <= 150) {
-        meters = 100;
-    } else if (meters <= 350) {
-        meters = 200;
-    } else if (meters <= 750) {
-        meters = 500;
-    } else if (meters <= 1500) {
-        meters = 1000;
-    } else if (meters <= 3500) {
-        meters = 2000;
-    } else if (meters <= 7500) {
-        meters = 5000;
-    } else if (meters <= 15000) {
-        meters = 10000;
-    } else if (meters <= 35000) {
-        meters = 20000;
-    } else if (meters <= 55000) {
-        meters = 50000;
-    } else if (meters <= 150000) {
-        meters = 100000;
-    } else if (meters <= 350000) {
-        meters = 200000;
-    } else if (meters <= 750000) {
-        meters = 500000;
-    } else if (meters <= 1500000) {
-        meters = 1000000;
-    } else {
-        meters = 2000000;
-    }
-    pixelWidth = meters / scale;
-    if (_scaleLabel.valid()) {
-        if (meters >= 1000) {
+    switch (_scaleBarUnits) {
+    case UNITS_NAUTICAL_MILES: {
+        double nmi = meters / 1852.0;
+        scale = nmi / pixelWidth;
+        nmi = normalizeScaleNauticalMiles(nmi);
+        pixelWidth = nmi / scale;
+        if (_scaleLabel.valid()) {
             _scaleLabel->setText(osgEarth::Stringify()
-                                 << meters / 1000.0
-                                 << " km");
+                                 << nmi
+                                 << " nmi");
+        }
+    }
+        break;
+    case UNITS_US_SURVEY_FEET:
+    case UNITS_INTL_FEET: {
+        double feet;
+        if (_scaleBarUnits == UNITS_US_SURVEY_FEET) {
+            feet = meters * 3937.0/1200.0;
         } else {
-            _scaleLabel->setText(osgEarth::Stringify()
-                                 << meters
-                                 << " m");
-        }
+            feet = 5280.0 * meters / 1609.344;
+        }
+        scale = feet / pixelWidth;
+        feet = normalizeScaleFeet(feet);
+        pixelWidth = feet / scale;
+        if (_scaleLabel.valid()) {
+            if (feet >= 5280) {
+                _scaleLabel->setText(osgEarth::Stringify()
+                                     << feet / 5280.0
+                                     << " mi");
+            } else {
+                _scaleLabel->setText(osgEarth::Stringify()
+                                     << feet
+                                     << " ft");
+            }
+        }
+    }
+        break;
+    case UNITS_METERS:
+    default: {
+        meters = normalizeScaleMeters(meters);
+        pixelWidth = meters / scale;
+        if (_scaleLabel.valid()) {
+            if (meters >= 1000) {
+                _scaleLabel->setText(osgEarth::Stringify()
+                                     << meters / 1000.0
+                                     << " km");
+            } else {
+                _scaleLabel->setText(osgEarth::Stringify()
+                                     << meters
+                                     << " m");
+            }
+        }
+    }
+        break;
     }
     if (_scaleBar.valid()) {

trunk/packages/vizservers/geovis/Renderer.h

@@ -34 +34 @@
 #include <osgEarthUtil/Controls>
 #include <osgEarthUtil/Formatter>
+#include <osgEarthUtil/MGRSFormatter>
 #include <osgEarthUtil/AutoClipPlaneHandler>
 #include <osgEarthUtil/VerticalScale>
@@ -39 +40 @@
 #include "Types.h"
 #include "Trace.h"
+#include "MouseCoordsTool.h"
+#include "ScaleBar.h"
 
 // Controls if TGA format is sent to client
@@ -99 +102 @@
 };
 
-class MouseCoordsCallback : public osgEarth::Util::MouseCoordsTool::Callback
-{
-public:
-    MouseCoordsCallback(osgEarth::Util::Controls::LabelControl *label,
-                        osgEarth::Util::Formatter *formatter) :
-        osgEarth::Util::MouseCoordsTool::Callback(),
-        _label(label),
-        _formatter(formatter),
-        _havePoint(false)
-    {
-    }
-
-    void set(const osgEarth::GeoPoint& mapCoords, osg::View *view, osgEarth::MapNode *mapNode)
-    {
-        TRACE("%g %g %g", mapCoords.x(), mapCoords.y(), mapCoords.z());
-        if (_label.valid()) {
-            _label->setText(osgEarth::Stringify()
-                            << "Lat/Long: "
-                            <<  _formatter->format(mapCoords));
-                            //<< ", " << mapCoords.z());
-        }
-        _pt = mapCoords;
-        _havePoint = true;
-    }
-
-    void reset(osg::View *view, osgEarth::MapNode *mapNode)
-    {
-        TRACE("Out of range");
-        // Out of range of map extents
-        if (_label.valid()) {
-            _label->setText("");
-        }
-        _havePoint = false;
-    }
-
-    bool report(double *x, double *y, double *z)
-    {
-        if (_havePoint) {
-            *x = _pt.x();
-            *y = _pt.y();
-            *z = _pt.z();
-            _havePoint = false;
-            return true;
-        }
-        return false;
-    }
-
-private:
-    osg::observer_ptr<osgEarth::Util::Controls::LabelControl> _label;
-    osg::ref_ptr<osgEarth::Util::Formatter> _formatter;
-    bool _havePoint;
-    osgEarth::GeoPoint _pt;
-};
-
 /**
  * \brief GIS Renderer
@@ -168 +117 @@
     };
 
+    enum CoordinateDisplayType {
+        COORDS_LATLONG_DECIMAL_DEGREES,
+        COORDS_LATLONG_DEGREES_DECIMAL_MINUTES,
+        COORDS_LATLONG_DEGREES_MINUTES_SECONDS,
+        COORDS_MGRS
+    };
+
     Renderer();
     virtual ~Renderer();
@@ -190 +146 @@
 
     // Map options
+
+    void setCoordinateReadout(bool state,
+                              CoordinateDisplayType type = COORDS_LATLONG_DECIMAL_DEGREES,
+                              int precision = -1);
+
+    void setReadout(int mouseX, int mouseY);
+
+    void clearReadout();
+
+    void setScaleBar(bool state);
+
+    void setScaleBarUnits(ScaleBarUnits units);
 
     void setGraticule(bool enable, GraticuleType type = GRATICULE_GEODETIC);
@@ -378 +346 @@
     long getTimeout();
 
+    void mapNodeUpdate();
+
 private:
     typedef std::tr1::unordered_map<ColorMapId, osg::ref_ptr<osg::TransferFunction1D> > ColorMapHashmap;
@@ -390 +360 @@
     void initEarthManipulator();
 
-    void initMouseCoordsTool();
+    void initMouseCoordsTool(CoordinateDisplayType type = COORDS_LATLONG_DECIMAL_DEGREES,
+                             int precision = -1);
+
+    osgEarth::Util::MGRSFormatter::Precision getMGRSPrecision(int precisionInMeters);
 
     void initColorMaps();
@@ -420 +393 @@
     osg::ref_ptr<ScreenCaptureCallback> _captureCallback;
     osg::ref_ptr<osgEarth::Util::AutoClipPlaneCullCallback> _clipPlaneCullCallback;
-    osg::ref_ptr<osgEarth::Util::MouseCoordsTool> _mouseCoordsTool;
+    osg::ref_ptr<MouseCoordsTool> _mouseCoordsTool;
     osg::ref_ptr<MouseCoordsCallback> _coordsCallback;
     osg::ref_ptr<osgEarth::Util::Controls::HBox> _hbox;
@@ -426 +399 @@
     osg::ref_ptr<osgEarth::Util::Controls::LabelControl> _scaleLabel;
     osg::ref_ptr<osgEarth::Util::Controls::Frame> _scaleBar;
+    ScaleBarUnits _scaleBarUnits;
     osg::ref_ptr<osgEarth::Util::EarthManipulator> _manipulator;
     osg::ref_ptr<osgGA::StateSetManipulator> _stateManip;
@@ -432 +406 @@
 };
 
+class MapNodeCallback : public osg::NodeCallback
+{
+public:
+    MapNodeCallback(Renderer *renderer) :
+        _renderer(renderer)
+    {}
+
+    virtual void operator()(osg::Node* node, osg::NodeVisitor* nv)
+    {
+        _renderer->mapNodeUpdate();
+        traverse(node, nv);
+    }
+private:
+    Renderer *_renderer;
+};
+
 }
 

trunk/packages/vizservers/geovis/RendererCmd.cpp

@@ -41 +41 @@
 #include "RenderServer.h"
 #include "Renderer.h"
+#include "Stats.h"
 #include "PPMWriter.h"
 #include "TGAWriter.h"
@@ -447 +448 @@
     static bool first = true;
 
-    /* Use the initial client key value pairs as the parts for a generating
-     * a unique file name. */
-    int fd = GeoVis::getStatsFile(interp, objv[1]);
+    /* Client arguments. */
+    if (Tcl_ListObjGetElements(interp, objv[1], &numItems, &items) != TCL_OK) {
+        return TCL_ERROR;
+    }
+
+    /* First try to see if we already have an open descriptor */
+    int fd = getStatsFile();
     if (fd < 0) {
-        Tcl_AppendResult(interp, "can't open stats file: ", 
-                         Tcl_PosixError(interp), (char *)NULL);
-        return TCL_ERROR;
+        /* Use the initial client key value pairs as the parts for generating
+         * a unique file name. */
+        fd = GeoVis::getStatsFile(Tcl_GetString(objv[1]));
+        if (fd < 0) {
+            Tcl_AppendResult(interp, "can't open stats file: ", 
+                             Tcl_PosixError(interp), (char *)NULL);
+            return TCL_ERROR;
+        }
     }
     listObjPtr = Tcl_NewListObj(0, (Tcl_Obj **)NULL);
@@ -461 +471 @@
         objPtr = Tcl_NewStringObj("render_start", 12);
         Tcl_ListObjAppendElement(interp, listObjPtr, objPtr);
-        /* server */
-        objPtr = Tcl_NewStringObj("server", 6);
+        /* renderer */
+        objPtr = Tcl_NewStringObj("renderer", 8);
         Tcl_ListObjAppendElement(interp, listObjPtr, objPtr);
         objPtr = Tcl_NewStringObj("geovis", 6);
@@ -470 +480 @@
         Tcl_ListObjAppendElement(interp, listObjPtr, objPtr);
         Tcl_ListObjAppendElement(interp, listObjPtr, Tcl_NewIntObj(getpid()));
-        /* machine */
-        objPtr = Tcl_NewStringObj("machine", 7);
+        /* host */
+        objPtr = Tcl_NewStringObj("host", 4);
         Tcl_ListObjAppendElement(interp, listObjPtr, objPtr);
         gethostname(buf, BUFSIZ-1);
@@ -491 +501 @@
     Tcl_ListObjAppendElement(interp, listObjPtr, 
                              Tcl_NewLongObj(GeoVis::g_stats.start.tv_sec));
-    /* Client arguments. */
-    if (Tcl_ListObjGetElements(interp, objv[1], &numItems, &items) != TCL_OK) {
-        return TCL_ERROR;
-    }
+    /* client items */
     for (int i = 0; i < numItems; i++) {
         Tcl_ListObjAppendElement(interp, listObjPtr, items[i]);
@@ -1143 +1150 @@
         return TCL_ERROR;
     }
+    return TCL_OK;
+}
+
+static int
+MapPositionDisplayOp(ClientData clientData, Tcl_Interp *interp, int objc, 
+                     Tcl_Obj *const *objv)
+{
+    bool state;
+    if (GetBooleanFromObj(interp, objv[2], &state) != TCL_OK) {
+        return TCL_ERROR;
+    }
+    Renderer::CoordinateDisplayType type = Renderer::COORDS_LATLONG_DECIMAL_DEGREES;
+    if (state && objc > 3) {
+        const char *str = Tcl_GetString(objv[3]);
+        if (str[0] == 'l' && strcmp(str, "latlong_decimal_degrees") == 0) {
+            type = Renderer::COORDS_LATLONG_DECIMAL_DEGREES;
+        } else if (str[0] == 'l' && strcmp(str, "latlong_degrees_decimal_minutes") == 0) {
+            type = Renderer::COORDS_LATLONG_DEGREES_DECIMAL_MINUTES;
+        } else if (str[0] == 'l' && strcmp(str, "latlong_degrees_minutes_seconds") == 0) {
+            type = Renderer::COORDS_LATLONG_DEGREES_MINUTES_SECONDS;
+        } else if (str[0] == 'm' && strcmp(str, "mgrs") == 0) {
+            type = Renderer::COORDS_MGRS;
+        } else {
+            Tcl_AppendResult(interp, "invalid type: \"", str,
+                             "\": should be 'latlong_decimal_degrees', 'latlong_degrees_decimal_minutes', 'latlong_degrees_minutes_seconds', or 'mgrs'",
+                             (char*)NULL);
+            return TCL_ERROR;
+        }
+    }
+    if (state && objc > 4) {
+        int precision;
+        if (Tcl_GetIntFromObj(interp, objv[4], &precision) != TCL_OK) {
+            return TCL_ERROR;
+        }
+        g_renderer->setCoordinateReadout(state, type, precision);
+    } else {
+        g_renderer->setCoordinateReadout(state, type);
+    }
+
     return TCL_OK;
 }
@@ -1225 +1271 @@
 
 static int
+MapScaleBarOp(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->setScaleBar(state);
+    if (state && objc > 3) {
+        const char *unitStr = Tcl_GetString(objv[3]);
+        ScaleBarUnits units;
+        if (unitStr[0] == 'm' && strcmp(unitStr, "meters") == 0) {
+            units = UNITS_METERS;
+        } else if (unitStr[0] == 'f' && strcmp(unitStr, "feet") == 0) {
+            units = UNITS_INTL_FEET;
+        } else if (unitStr[0] == 'u' && strcmp(unitStr, "us_survey_feet") == 0) {
+            units = UNITS_US_SURVEY_FEET;
+        } else if (unitStr[0] == 'n' && strcmp(unitStr, "nautical_miles") == 0) {
+            units = UNITS_NAUTICAL_MILES;
+        } else {
+            Tcl_AppendResult(interp, "bad units \"", unitStr,
+                             "\": must be 'meters', 'feet', 'us_survey_feet' or 'nautical_miles'", (char*)NULL);
+            return TCL_ERROR;
+        }
+        g_renderer->setScaleBarUnits(units);
+    }
+    return TCL_OK;
+}
+
+static int
+MapSetPositionOp(ClientData clientData, Tcl_Interp *interp, int objc, 
+            Tcl_Obj *const *objv)
+{
+    if (objc < 3) {
+        g_renderer->clearReadout();
+    } else {
+        int x, y;
+        if (Tcl_GetIntFromObj(interp, objv[2], &x) != TCL_OK ||
+            Tcl_GetIntFromObj(interp, objv[3], &y) != TCL_OK) {
+            return TCL_ERROR;
+        }
+        g_renderer->setReadout(x, y);
+    }
+    return TCL_OK;
+}
+
+static int
 MapTerrainEdgesOp(ClientData clientData, Tcl_Interp *interp, int objc, 
                   Tcl_Obj *const *objv)
@@ -1315 +1408 @@
 
 static CmdSpec mapOps[] = {
-    {"coords",   1, MapCoordsOp,      4, 4, "x y"},
-    {"grid",     1, MapGraticuleOp,   3, 4, "bool ?type?"},
-    {"layer",    2, MapLayerOp,       3, 0, "op ?params...?"},
-    {"load",     2, MapLoadOp,        4, 5, "options"},
-    {"reset",    1, MapResetOp,       3, 8, "type ?profile xmin ymin xmax ymax?"},
-    {"terrain",  1, MapTerrainOp,     3, 0, "op ?params...?"},
+    {"coords",   1, MapCoordsOp,          4, 4, "x y"},
+    {"grid",     1, MapGraticuleOp,       3, 4, "bool ?type?"},
+    {"layer",    2, MapLayerOp,           3, 0, "op ?params...?"},
+    {"load",     2, MapLoadOp,            4, 5, "options"},
+    {"posdisp",  1, MapPositionDisplayOp, 3, 5, "bool ?format? ?precision?"},
+    {"reset",    1, MapResetOp,           3, 8, "type ?profile xmin ymin xmax ymax?"},
+    {"scalebar", 1, MapScaleBarOp,        3, 4, "bool ?units?"},
+    {"setpos",   1, MapSetPositionOp,     2, 4, "x y"},
+    {"terrain",  1, MapTerrainOp,         3, 0, "op ?params...?"},
 };
 static int nMapOps = NumCmdSpecs(mapOps);