Changeset 6549 for geovis

Timestamp:

Sep 22, 2016 1:33:36 PM (8 years ago)

Author:

ldelgass

Message:

Add geovis support for WMS-T animated sequence

Location:

geovis/trunk

Files:

• Renderer.cpp (modified) (2 diffs)
• Renderer.h (modified) (1 diff)
• RendererCmd.cpp (modified) (3 diffs)
• geovis_protocol.txt (modified) (2 diffs)

geovis/trunk/Renderer.cpp

@@ -51 +51 @@
 #include <osgEarth/ModelLayer>
 #include <osgEarth/DateTime>
+#include <osgEarth/TimeControl>
 #ifdef USE_RTT_PICKER
 #include <osgEarthUtil/RTTPicker>
@@ -1483 +1484 @@
         TRACE("Image layer not found: %s", name);
     }
+}
+
+bool Renderer::layerHasSequence(const char *name)
+{
+    if (!_map.valid()) {
+        ERROR("No map");
+        return false;
+    }
+    osgEarth::ImageLayer *layer = _map->getImageLayerByName(name);
+    if (layer != NULL) {
+        osgEarth::SequenceControl *seq = layer->getSequenceControl();
+        if (seq == NULL) {
+            TRACE("Image layer has no SequenceControl: %s", name);
+            return false;
+        }
+        return seq->supportsSequenceControl();
+    }
+    TRACE("Image layer not found: %s", name);
+    return false;
+}
+
+bool Renderer::sequencePause(const char *name)
+{
+    if (!_map.valid()) {
+        ERROR("No map");
+        return false;
+    }
+    osgEarth::ImageLayer *layer = _map->getImageLayerByName(name);
+    if (layer != NULL) {
+        osgEarth::SequenceControl *seq = layer->getSequenceControl();
+        if (seq == NULL || !seq->supportsSequenceControl()) {
+            TRACE("Image layer has no SequenceControl: %s", name);
+            return false;
+        }
+        seq->pauseSequence();
+        _needsRedraw = true;
+        return true;
+    }
+    TRACE("Image layer not found: %s", name);
+    return false;
+}
+
+bool Renderer::sequencePlay(const char *name)
+{
+    if (!_map.valid()) {
+        ERROR("No map");
+        return false;
+    }
+    osgEarth::ImageLayer *layer = _map->getImageLayerByName(name);
+    if (layer != NULL) {
+        osgEarth::SequenceControl *seq = layer->getSequenceControl();
+        if (seq == NULL || !seq->supportsSequenceControl()) {
+            TRACE("Image layer has no SequenceControl: %s", name);
+            return false;
+        }
+        seq->playSequence();
+        _needsRedraw = true;
+        return true;
+    }
+    TRACE("Image layer not found: %s", name);
+    return false;
+}
+
+bool Renderer::sequenceSeek(const char *name, unsigned int frame)
+{
+    if (!_map.valid()) {
+        ERROR("No map");
+        return false;
+    }
+    osgEarth::ImageLayer *layer = _map->getImageLayerByName(name);
+    if (layer != NULL) {
+        osgEarth::SequenceControl *seq = layer->getSequenceControl();
+        if (seq == NULL || !seq->supportsSequenceControl()) {
+            TRACE("Image layer has no SequenceControl: %s", name);
+            return false;
+        }
+        seq->seekToSequenceFrame(frame);
+        _needsRedraw = true;
+        return true;
+    }
+    TRACE("Image layer not found: %s", name);
+    return false;
 }
 

geovis/trunk/Renderer.h

@@ -291 +291 @@
 
     void removeColorFilter(const char *name, int idx = -1);
+
+    // Sequence control
+
+    bool layerHasSequence(const char *name);
+
+    bool sequencePause(const char *name);
+
+    bool sequencePlay(const char *name);
+
+    bool sequenceSeek(const char *name, unsigned int frame);
 
     // Elevation raster layers

geovis/trunk/RendererCmd.cpp

@@ -1666 +1666 @@
             opts.format() = format;
             opts.transparent() = transparent;
+            if (objc > 12) {
+                char *times = Tcl_GetString(objv[12]);
+                opts.times() = times;
+            }
+            if (objc > 13) {
+                double frameSeconds;
+                if (Tcl_GetDoubleFromObj(interp, objv[13], &frameSeconds) != TCL_OK) {
+                    return TCL_ERROR;
+                }
+                opts.secondsPerFrame() = frameSeconds;
+            }
 
             ret = g_renderer->addImageLayer(name, opts, pos, cache, coverage, shared, visible, minLOD, maxLOD);
@@ -3186 +3197 @@
 
 static int
+MapSequencePauseOp(ClientData clientData, Tcl_Interp *interp, int objc,
+                   Tcl_Obj *const *objv)
+{
+    const char *layer = Tcl_GetString(objv[3]);
+    bool ret = g_renderer->sequencePause(layer);
+    if (!ret) {
+        Tcl_AppendResult(interp, "Layer \"", layer,
+                         "\" doesn't exist or has no sequence", (char *)NULL);
+        return TCL_ERROR;
+    }
+
+    return TCL_OK;
+}
+
+static int
+MapSequencePlayOp(ClientData clientData, Tcl_Interp *interp, int objc,
+                  Tcl_Obj *const *objv)
+{
+    const char *layer = Tcl_GetString(objv[3]);
+    bool ret = g_renderer->sequencePause(layer);
+    if (!ret) {
+        Tcl_AppendResult(interp, "Layer \"", layer,
+                         "\" doesn't exist or has no sequence", (char *)NULL);
+        return TCL_ERROR;
+    }
+
+    return TCL_OK;
+}
+
+static int
+MapSequenceSeekOp(ClientData clientData, Tcl_Interp *interp, int objc,
+                  Tcl_Obj *const *objv)
+{
+    const char *layer = Tcl_GetString(objv[4]);
+    int frame;
+    if (Tcl_GetIntFromObj(interp, objv[3], &frame) != TCL_OK) {
+        return TCL_ERROR;
+    }
+    bool ret = g_renderer->sequenceSeek(layer, (unsigned int)frame);
+    if (!ret) {
+        Tcl_AppendResult(interp, "Layer \"", layer,
+                         "\" doesn't exist or has no sequence", (char *)NULL);
+        return TCL_ERROR;
+    }
+
+    return TCL_OK;
+}
+
+static CmdSpec mapSequenceOps[] = {
+    {"pause", 2, MapSequencePauseOp, 4, 4, "layerName"},
+    {"play",  2, MapSequencePlayOp,  4, 4, "layerName"},
+    {"seek",  1, MapSequenceSeekOp,  5, 5, "frame layerName"},
+};
+static int nMapSequenceOps = NumCmdSpecs(mapSequenceOps);
+
+static int
+MapSequenceOp(ClientData clientData, Tcl_Interp *interp, int objc,
+           Tcl_Obj *const *objv)
+{
+    Tcl_ObjCmdProc *proc;
+
+    proc = GetOpFromObj(interp, nMapSequenceOps, mapSequenceOps,
+                        CMDSPEC_ARG2, objc, objv, 0);
+    if (proc == NULL) {
+        return TCL_ERROR;
+    }
+    return (*proc) (clientData, interp, objc, objv);
+}
+
+static int
 MapSetPositionOp(ClientData clientData, Tcl_Interp *interp, int objc, 
             Tcl_Obj *const *objv)
@@ -3378 +3459 @@
     {"reset",    1, MapResetOp,           6, 11, "type r g b ?profile xmin ymin xmax ymax?"},
     {"scalebar", 1, MapScaleBarOp,        3, 4, "bool ?units?"},
-    {"setpos",   1, MapSetPositionOp,     2, 4, "x y"},
+    {"sequence", 3, MapSequenceOp,        3, 0, "op ?params...?"},
+    {"setpos",   3, MapSetPositionOp,     2, 4, "x y"},
     {"terrain",  1, MapTerrainOp,         3, 0, "op ?params...?"},
     {"time",     1, MapTimeOp,            2, 6, "?hours? ?day? ?month? ?year?"},

geovis/trunk/geovis_protocol.txt

@@ -226 +226 @@
     <coverage> = bool indicating if data should not be interpolated (true means
     no interpolation)
-map layer add <layerName> image wms <url> <cache> <coverage> <layers> <format> <transparent>
+map layer add <layerName> image wms <url> <cache> <coverage> <layers> <format> <transparent> <?times?> <?frameSeconds?>
     Add a WMS image layer from a URL + layer string
     <url> = URL of WMS service
@@ -235 +235 @@
     <format> = Image format to return (e.g. 'png')
     <transparent> = bool
+    <times> = optional comma separated list of timestamps for WMS-T
+    <frameSeconds> = time in seconds to display each animated frame for WMS-T
 map layer add <layerName> image tms <url> <cache> <coverage>
     Add a TMS image layer from a URL