Changeset 6049 for geovis

Timestamp:

Feb 24, 2016 1:36:04 PM (8 years ago)

Author:

ldelgass

Message:

Use new icons for icon layer type.

Location:

geovis/trunk

Files:

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

geovis/trunk/Makefile.in

@@ -219 +219 @@
 CommandQueue.o: CommandQueue.h Trace.h
 FileUtil.o: FileUtil.h
+Icons.o: Icons.h
 IData.o: IData.h
 idatatest.o: IData.h
@@ -226 +227 @@
 PPMWriter.o: PPMWriter.h ResponseQueue.h Trace.h
 ReadBuffer.o: ReadBuffer.h Trace.h
-Renderer.o: Renderer.h Trace.h Picker.h Placard.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 Icons.h
 RendererCmd.o: Renderer.h ReadBuffer.h ResponseQueue.h Trace.h CmdProc.h PPMWriter.h TGAWriter.h Placard.h
 RenderServer.o: RenderServer.h RendererCmd.h Renderer.h ReadBuffer.h ResponseQueue.h Trace.h PPMWriter.h TGAWriter.h Stats.h

geovis/trunk/Renderer.cpp

@@ -102 +102 @@
 #include "FileUtil.h"
 #include "Util.h"
+#include "Icons.h"
 #include "Trace.h"
 
@@ -125 +126 @@
     TRACE("Enter");
 
+    initIconMap();
     _bgColor[0] = 0;
     _bgColor[1] = 0;
@@ -170 +172 @@
 
     TRACE("Leave");
+}
+
+std::string Renderer::getIconFile(const char *name) const
+{
+    std::ostringstream oss;
+    oss << _resourcePath << "/" << GeoVis::getIconFile(name);
+    return oss.str();
 }
 

geovis/trunk/Renderer.h

@@ -157 +157 @@
 
     void setupCache();
+
+    std::string getIconFile(const char *name) const;
 
     std::string getBaseImage() const;

geovis/trunk/RendererCmd.cpp

@@ -1828 +1828 @@
         osgEarth::Symbology::IconSymbol *is = style.getOrCreateSymbol<osgEarth::Symbology::IconSymbol>();
         if (icon != NULL && strlen(icon) > 0) {
-            if (strcmp(icon, "pin") == 0) {
-                is->url()->setLiteral(g_renderer->getPinIcon());
+            std::string iconFile = g_renderer->getIconFile(icon);
+            if (!iconFile.empty()) {
+                is->url()->setLiteral(iconFile);
             } else {
                 is->url() = osgEarth::Symbology::StringExpression(icon);