Changeset 5944 for geovis

Timestamp:

Dec 11, 2015, 12:21:12 AM (9 years ago)

Author:

ldelgass

Message:

Add command to configure attributes to display in feature info placard.

Location:

geovis/trunk

Files:

• Makefile.in (modified) (2 diffs)
• Picker.cpp (modified) (3 diffs)
• Placard.cpp (added)
• Placard.h (added)
• Renderer.cpp (modified) (1 diff)
• Renderer.h (modified) (4 diffs)
• RendererCmd.cpp (modified) (4 diffs)

geovis/trunk/Makefile.in

@@ -127 +127 @@
                 IData.cpp \
                 Picker.cpp \
+                Placard.cpp \
                 PPMWriter.cpp \
                 ReadBuffer.cpp \
@@ -203 +204 @@
 idatatest.o: IData.h
 md5.o: md5.h
-Picker.o: Picker.h Renderer.h Trace.h
+Picker.o: Picker.h Renderer.h Trace.h Placard.h
+Placard.o: Placard.h Trace.h
 PPMWriter.o: PPMWriter.h ResponseQueue.h Trace.h
 ReadBuffer.o: ReadBuffer.h Trace.h
-Renderer.o: Renderer.h Trace.h Picker.h MouseCoordsTool.h ScaleBar.h FileUtil.h Util.h
+Renderer.o: Renderer.h Trace.h Picker.h Placard.h MouseCoordsTool.h ScaleBar.h FileUtil.h Util.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 Stats.h

geovis/trunk/Picker.cpp

@@ -22 +22 @@
 
 #include "Picker.h"
+#include "Placard.h"
 #include "Renderer.h"
 #include "RendererCmd.h"
@@ -188 +189 @@
     osgEarth::Features::FeatureIndex *index = osgEarth::Registry::objectIndex()->get<osgEarth::Features::FeatureIndex>(id);
     osgEarth::Features::Feature *feature = index ? index->getFeature(id) : 0L;
-    INFO("Select hit oid: %lu", id);
+    INFO("Select hit oid: %lu at %g,%g", id, _pickPoint.x(), _pickPoint.y());
     if (feature) {
-        INFO("Hit feature ID: %lu (of %d)", feature->getFID(), index->size());
-        const osgEarth::Features::AttributeTable &attrs = feature->getAttrs();
-        std::ostringstream oss;
-        for (osgEarth::Features::AttributeTable::const_iterator itr = attrs.begin(); itr != attrs.end(); ++itr) {
-            INFO(" attr: %s", itr->first.c_str());
-            oss << itr->first.c_str() << ": ";
-            switch (itr->second.first) {
-            case osgEarth::Features::ATTRTYPE_STRING:
-                INFO(" value: %s", itr->second.getString().c_str());
-                oss << itr->second.getString() << std::endl;
-                break;
-            case osgEarth::Features::ATTRTYPE_INT:
-                INFO(" value: %d", itr->second.getInt());
-                oss << itr->second.getInt() << std::endl;
-                break;
-            case osgEarth::Features::ATTRTYPE_DOUBLE:
-                INFO(" value: %g", itr->second.getDouble());
-                oss << itr->second.getDouble() << std::endl;
-                break;
-            case osgEarth::Features::ATTRTYPE_BOOL:
-                INFO(" value: %s", itr->second.getBool() ? "true" : "false");
-                oss << (itr->second.getBool() ? "true" : "false") << std::endl;
-                break;
-            default:
-                INFO(" value: unknown type");
+        osgEarth::Features::FeatureSourceIndex *fsi = dynamic_cast<osgEarth::Features::FeatureSourceIndex *>(index);
+        std::string layerName;
+        if (fsi) {
+            osgEarth::Features::FeatureSource *source = fsi->getFeatureSource();
+            if (source) {
+                layerName = source->getFeatureSourceOptions().name().get();
             }
         }
-        INFO("Point: %g %g", _pickPoint.x(), _pickPoint.y());
-        //INFO("Label: %s", oss.str().c_str());
+        INFO("Hit feature ID: %lu (of %d) layer: %s", feature->getFID(), index->size(), layerName.c_str());
+
         osgEarth::Symbology::Style style;
         osgEarth::Symbology::TextSymbol *ts = style.getOrCreateSymbol<osgEarth::Symbology::TextSymbol>();
@@ -229 +211 @@
         //ts->encoding() = osgEarth::Symbology::TextSymbol::ENCODING_UTF8;
         clearSelection();
-        osgEarth::Annotation::LabelNode *label = 
-            new osgEarth::Annotation::LabelNode(_renderer->getMapNode(), _pickPoint, oss.str(), style);
+
+        const osgEarth::Features::AttributeTable &attrs = feature->getAttrs();
+        Placard placard = _renderer->getPlacardConfig(layerName);
+        if (placard.getNumEntries() == 0) {
+            placard.addAllAttributes(attrs);
+        }
+        PlacardNode *label = 
+            new PlacardNode(_renderer->getMapNode(), _pickPoint, placard, attrs, style);
         label->getOrCreateStateSet()->setRenderBinDetails(INT_MAX, "RenderBin");
         _renderer->getAnnotations()->addChild(label);
+
         char mesg[256];
-        std::string layerName;
-        osgEarth::Features::FeatureSourceIndex *fsi = dynamic_cast<osgEarth::Features::FeatureSourceIndex *>(index);
-        if (fsi) {
-            osgEarth::Features::FeatureSource *source = fsi->getFeatureSource();
-            if (source) {
-                layerName = source->getFeatureSourceOptions().name().get();
-            }
-        }
         snprintf(mesg, sizeof(mesg), "nv>select feature %u %lu %d {%s}\n", id, feature->getFID(), index->size(), layerName.c_str());
         size_t length = strlen(mesg);

geovis/trunk/Renderer.cpp

@@ -1513 +1513 @@
         }
     }
+}
+
+void Renderer::setPlacardConfig(const Placard& placardConf, const char *layerName)
+{
+    osgEarth::ModelLayer *layer = _map->getModelLayerByName(layerName);
+    if (layer == NULL) {
+        ERROR("Unknown layer '%s'", layerName);
+        return;
+    }
+    //PlacardNode *node;
+    //node->setConfig(placardConf);
+    _placardConfigs[layerName] = placardConf;
 }
 

geovis/trunk/Renderer.h

@@ -52 +52 @@
 #include "MouseCoordsTool.h"
 #include "ScaleBar.h"
+#include "Placard.h"
 
 // Controls if TGA format is sent to client
@@ -514 +515 @@
     void writeScene(const std::string& file);
 
+    void setPlacardConfig(const Placard& placardConf, const char *layerName);
+
     void selectFeatures(std::vector<unsigned long>& featureIDs, const char *layerName);
 
@@ -550 +553 @@
         return _placeNodes.get();
     }
+    Placard getPlacardConfig(const std::string& layerName)
+    {
+        Placard ret;
+        PlacardHashmap::iterator itr = _placardConfigs.find(layerName);
+        if (itr != _placardConfigs.end()) {
+            ret = itr->second;
+        }
+        return ret;
+    }
 
 private:
     typedef std::tr1::unordered_map<ColorMapId, osg::ref_ptr<osg::TransferFunction1D> > ColorMapHashmap;
     typedef std::tr1::unordered_map<ViewpointId, osgEarth::Viewpoint> ViewpointHashmap;
+    typedef std::tr1::unordered_map<std::string, Placard> PlacardHashmap;
 
     void initAnnotations();
@@ -603 +616 @@
     osg::ref_ptr<osg::Group> _graticule;
     osg::ref_ptr<osg::Group> _annotations;
+    PlacardHashmap _placardConfigs;
     double _anchorLat, _anchorLong;
     osg::ref_ptr<osgEarth::Annotation::FeatureNode> _selectionBox;

geovis/trunk/RendererCmd.cpp

@@ -3038 +3038 @@
 
 static int
+PlacardConfigOp(ClientData clientData, Tcl_Interp *interp, int objc, 
+                Tcl_Obj *const *objv)
+{
+    int namec;
+    Tcl_Obj **namev = NULL;
+    const char *layerName = Tcl_GetString(objv[3]);
+
+    if (Tcl_ListObjGetElements(interp, objv[2], &namec, &namev) != TCL_OK) {
+        return TCL_ERROR;
+    }
+    if (namec % 2 != 0) {
+        Tcl_AppendResult(interp, "invalid attribute list",
+                         (char *)NULL);
+        return TCL_ERROR;
+    }
+    Placard placardConf;
+    for (int i = 0; i < namec; i+=2) {
+        std::string name(Tcl_GetString(namev[i]));
+        std::string label(Tcl_GetString(namev[i+1]));
+        placardConf.addEntry(name, label);
+    }
+    g_renderer->setPlacardConfig(placardConf, layerName);
+    return TCL_OK;
+}
+
+static CmdSpec placardOps[] = {
+    {"config", 1, PlacardConfigOp, 4, 4, "attrlist layerName"},
+};
+static int nPlacardOps = NumCmdSpecs(placardOps);
+
+static int
+PlacardCmd(ClientData clientData, Tcl_Interp *interp, int objc, 
+          Tcl_Obj *const *objv)
+{
+    Tcl_ObjCmdProc *proc;
+
+    proc = GetOpFromObj(interp, nPlacardOps, placardOps,
+                        CMDSPEC_ARG1, objc, objv, 0);
+    if (proc == NULL) {
+        return TCL_ERROR;
+    }
+    return (*proc) (clientData, interp, objc, objv);
+}
+
+static int
 RendererRenderOp(ClientData clientData, Tcl_Interp *interp, int objc, 
                  Tcl_Obj *const *objv)
@@ -3226 +3271 @@
 }
 
+static int
+SelectModeOp(ClientData clientData, Tcl_Interp *interp, int objc, 
+             Tcl_Obj *const *objv)
+{
+    //const char *modeStr = Tcl_GetString(objv[2]);
+    // Parse mode string
+    //Renderer::SelectMode mode;
+    //g_renderer->setSelectMode(mode);
+    return TCL_OK;
+}
+
 static CmdSpec selectOps[] = {
     {"feature", 1, SelectFeatureOp, 4, 4, "idlist layerName"},
+    {"mode",    1, SelectModeOp, 3, 3, "mode"},
 };
 static int nSelectOps = NumCmdSpecs(selectOps);
@@ -3478 +3535 @@
     Tcl_CreateObjCommand(interp, "map",        MapCmd,        clientData, NULL);
     Tcl_CreateObjCommand(interp, "mouse",      MouseCmd,      clientData, NULL);
+    Tcl_CreateObjCommand(interp, "placard",    PlacardCmd,    clientData, NULL);
     Tcl_CreateObjCommand(interp, "renderer",   RendererCmd,   clientData, NULL);
     Tcl_CreateObjCommand(interp, "screen",     ScreenCmd,     clientData, NULL);
@@ -3497 +3555 @@
     Tcl_DeleteCommand(interp, "map");
     Tcl_DeleteCommand(interp, "mouse");
+    Tcl_DeleteCommand(interp, "placard");
     Tcl_DeleteCommand(interp, "renderer");
     Tcl_DeleteCommand(interp, "screen");