Changeset 5895

Timestamp:

Oct 1, 2015, 2:54:12 PM (9 years ago)

Author:

ldelgass

Message:

Initial support for parsing protocols in url strings: "local://" for files
transferred from client to cache dir, "​file://" for server paths (default for
when no protocol is present), and "idata://" for idata collection/doi.

Location:

geovis/trunk

Files:

• FileUtil.cpp (modified) (1 diff)
• FileUtil.h (modified) (2 diffs)
• RenderServer.cpp (modified) (1 diff)
• Renderer.cpp (modified) (4 diffs)
• Renderer.h (modified) (2 diffs)
• RendererCmd.cpp (modified) (4 diffs)
• idatatest.cpp (modified) (1 diff)

geovis/trunk/FileUtil.cpp

@@ -58 +58 @@
     }
 }
+
+/**
+ * \brief Get the file path part of a local:// URL
+ * 
+ * This implementation assumes a relative path if there is no leading slash,
+ * rather than assuming there is a server name.
+ */
+std::string GeoVis::getLocalFilePath(const std::string& url)
+{
+    std::string::size_type pos(url.find("://"));
+
+    if (pos != std::string::npos) {
+        return url.substr(pos+3, std::string::npos);
+    }
+    return url;
+}

geovis/trunk/FileUtil.h

@@ -7 +7 @@
 #ifndef GEOVIS_FILEUTIL_H
 #define GEOVIS_FILEUTIL_H
+
+#include <string>
 
 #include <osgEarth/FileUtils>
@@ -45 +47 @@
 
 extern void removeDirectory(const char *path);
+std::string getLocalFilePath(const std::string& url);
 
 }

geovis/trunk/RenderServer.cpp

@@ -476 +476 @@
     g_renderer = NULL;
     // Clean up cache directory after renderer's threads have finished
-    removeDirectory(cacheDir.c_str());
+    if (!cacheDir.empty()) {
+        removeDirectory(cacheDir.c_str());
+    }
 
     TRACE("Exiting GeoVis Server");

geovis/trunk/Renderer.cpp

@@ -15 +15 @@
 #include <limits>
 #include <set>
+#include <fstream>
+#include <sstream>
 
 #include <sys/types.h>
@@ -172 +174 @@
 }
 
-std::string Renderer::getBaseImage()
+std::string Renderer::getBaseImage() const
 {
     std::ostringstream oss;
@@ -179 +181 @@
 }
 
-std::string Renderer::getPinIcon()
+std::string Renderer::getPinIcon() const
 {
     std::ostringstream oss;
@@ -2719 +2721 @@
             retStr = "";
         }
-    } else {
+    } else if (proto == "local") {
+        INFO("Local protocol: '%s'", getLocalFilePath(url).c_str());
+        std::ostringstream oss;
+        oss << getCacheDirectory() << "/" << getLocalFilePath(url);
+        retStr = oss.str();
+    } else if (proto == "file") {
+        INFO("File: '/%s'", osgDB::getServerFileName(url).c_str());
+        std::ostringstream oss;
+        oss << "/" <<  osgDB::getServerFileName(url);
+        retStr = oss.str();
+    } else if (proto == "idata") {
+        std::string fileName = osgDB::getServerFileName(url);
+        INFO("IData protocol: coll: '%s', '%s'", osgDB::getServerAddress(url).c_str(), fileName.c_str());
+        int collection = atoi(osgDB::getServerAddress(url).c_str());
+        {
+            std::ostringstream oss;
+            oss << getCacheDirectory() << "/" << fileName;
+            retStr = oss.str();
+            std::string dirPath = osgDB::getFilePath(retStr);
+            osgDB::makeDirectory(dirPath);
+        }
+        if (!osgDB::fileExists(retStr)) {
+            std::ostringstream oss;
+            oss << "//" << fileName;
+            IData::Buffer buf;
+            IData::getFile(collection, oss.str().c_str(), &buf);
+            std::ofstream file(retStr.c_str());
+            file.write((char *)buf.data, buf.size);
+            file.close();
+        }
+    } else {
+        INFO("Protocol: '%s' url: '%s'", proto.c_str(), url.c_str());
         retStr = url;
     }

geovis/trunk/Renderer.h

@@ -151 +151 @@
     }
 
-    std::string getCacheDirectory()
+    std::string getCacheDirectory() const
     {
         return _cacheDir;
     }
 
-    std::string getBaseImage();
-
-    std::string getPinIcon();
+    void setupCache();
+
+    std::string getBaseImage() const;
+
+    std::string getPinIcon() const;
 
     void setAttribution(const std::string& attrib);
@@ -535 +537 @@
     typedef std::tr1::unordered_map<ColorMapId, osg::ref_ptr<osg::TransferFunction1D> > ColorMapHashmap;
     typedef std::tr1::unordered_map<ViewpointId, osgEarth::Viewpoint> ViewpointHashmap;
-
-    void setupCache();
 
     void initAnnotations();

geovis/trunk/RendererCmd.cpp

@@ -363 +363 @@
 
 static int
+CameraCenterOp(ClientData clientData, Tcl_Interp *interp, int objc,
+               Tcl_Obj *const *objv)
+{
+    double x, y;
+    if (Tcl_GetDoubleFromObj(interp, objv[2], &x) != TCL_OK ||
+        Tcl_GetDoubleFromObj(interp, objv[3], &y) != TCL_OK) {
+        return TCL_ERROR;
+    }
+    double zoom = 1.0;
+    if (objc > 4) {
+        if (Tcl_GetDoubleFromObj(interp, objv[4], &zoom) != TCL_OK) {
+            return TCL_ERROR;
+        }
+    }
+    double duration = 1.0;
+    if (objc > 5) {
+        if (Tcl_GetDoubleFromObj(interp, objv[5], &duration) != TCL_OK) {
+            return TCL_ERROR;
+        }
+    }
+
+    osgEarth::Viewpoint vpt = g_renderer->getViewpoint();
+#ifdef NEW_VIEWPOINT_API
+    vpt.focalPoint()->x() = x;
+    vpt.focalPoint()->y() = y;
+    //vpt.focalPoint()->z() = mapPoint.z();
+    vpt.range()->set(vpt.range()->getValue() * zoom, osgEarth::Units::METERS);
+#else
+    vpt.x() = x;
+    vpt.y() = y;
+    //vpt.z() = mapPoint.z();
+    vpt.setRange(vpt.getRange() * zoom);
+
+#endif
+    g_renderer->setViewpoint(vpt, duration);
+
+    return TCL_OK;
+}
+
+static int
 CameraGetViewpointOp(ClientData clientData, Tcl_Interp *interp, int objc, 
                      Tcl_Obj *const *objv)
@@ -633 +673 @@
 
 static CmdSpec cameraOps[] = {
+    {"center",  1, CameraCenterOp,           4, 6, "x y ?zoomFactor? ?duration?"},
     {"delete",  2, CameraDeleteViewpointOp,  3, 3, "name"},
     {"dist",    2, CameraSetDistanceOp,      3, 3, "distance"},
@@ -896 +937 @@
         return TCL_ERROR;
     }
+    if (g_renderer->getCacheDirectory().empty()) {
+        g_renderer->setupCache();
+    }
+    std::string dirPath = osgDB::getFilePath(path);
+    std::string fileName = osgDB::getSimpleFileName(path);
     std::ostringstream fullPath;
-    //fullPath << "/tmp/" << path;
-    fullPath << path;
+    fullPath << g_renderer->getCacheDirectory() << "/" << dirPath;
+    if (!dirPath.empty()) {
+        INFO("Make dir: %s", fullPath.str().c_str());
+        osgDB::makeDirectory(fullPath.str());
+        fullPath << "/";
+    }
+    fullPath << fileName;
     FILE *fp = fopen(fullPath.str().c_str(), "wb");
     if (fp == NULL) {
@@ -907 +958 @@
     fclose(fp);
     free(data);
+    INFO("Wrote %d bytes to %s", bytesWritten, fullPath.str().c_str());
     return (bytesWritten == size) ? TCL_OK : TCL_ERROR;
 }
 
 static CmdSpec fileOps[] = {
-    {"put",    1, FilePutOp, 5, 5, "name type size"}
+    {"put",    1, FilePutOp, 5, 5, "path type size"}
 };
 static int nFileOps = NumCmdSpecs(fileOps);

geovis/trunk/idatatest.cpp

@@ -3 +3 @@
 #include <iostream>
 #include <fstream>
+
+#include <osgDB/FileNameUtils>
 
 #include "IData.h"