Changeset 7317

Timestamp:

08/29/07 18:29:05

Author:

robert

Message:

Further work on new ProxyLayer?

Files:

• OpenSceneGraph/trunk/include/osgTerrain/Layer (modified) (1 diff)
• OpenSceneGraph/trunk/include/osgTerrain/TileSystem (added)
• OpenSceneGraph/trunk/src/osgPlugins/gdal/DataSetLayer.cpp (modified) (3 diffs)
• OpenSceneGraph/trunk/src/osgPlugins/gdal/DataSetLayer.h (modified) (1 diff)
• OpenSceneGraph/trunk/src/osgPlugins/gdal/ReaderWriterGDAL.cpp (modified) (1 diff)
• OpenSceneGraph/trunk/src/osgTerrain/CMakeLists.txt (modified) (2 diffs)
• OpenSceneGraph/trunk/src/osgTerrain/TileSystem.cpp (added)
• OpenSceneGraph/trunk/src/osgWrappers/osgTerrain/Layer.cpp (modified) (1 diff)
• OpenSceneGraph/trunk/src/osgWrappers/osgTerrain/TileSystem.cpp (added)

OpenSceneGraph/trunk/include/osgTerrain/Layer

@@ -298 +298 @@
-        META_Object(osgTerrain, ProxyLayer);
-
+        /** Return if this ProxyLayer is attached to valid file handle.*/
+        virtual bool isOpen() const { return false; }
+
+        /** Open a file.*/
+        void openFile(const std::string& fileName)
+        {
+            if (_filename!=fileName)
+            {
+                if (isOpen()) close();
+                
+                _filename = fileName;
+            }
+
+            if (!isOpen()) open();
+        }
+
+        /** Open the any associated file handle.*/
+        virtual void open() {}
+
+        /** Open the any associated file handle.*/
+        virtual void close() {}
+
+        /** Extract an ImageLayer from the ProxyLayer.*/
+        virtual ImageLayer* extractImageLayer(unsigned int /*minX*/, unsigned int /*minY*/, unsigned int /*maxX*/, unsigned int /*maxY*/) { return 0; }
-
-    protected:

OpenSceneGraph/trunk/src/osgPlugins/gdal/DataSetLayer.cpp

@@ -14 +14 @@
-#include "DataSetLayer.h"
-
+#include <osg/Notify>
+
-using namespace GDALPlugin;
-
-
+
+
-{
-    _dataset = 0;
-}
-
-
+
+
-{
-
-
+
-}
-
@@ -30 +32 @@
-    ProxyLayer(dataSetLayer)
-{
-_dataset = (GDALDataset*)GDALOpen(getFileName().c_str(),GA_ReadOnly
+if (dataSetLayer._dataset) open(
-}
-
-DataSetLayer::~DataSetLayer()
-{
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-}
-
@@ -48 +71 @@
-}
-
+osgTerrain::ImageLayer* DataSetLayer::extractImageLayer(unsigned int minX, unsigned int minY, unsigned int maxX, unsigned int maxY)
+{
+    if (!_dataset || maxX<minX || maxY<minY) return 0;
+
+    osg::notify(osg::NOTICE)<<"DataSetLayer::extractImageLayer("<<minX<<", "<<minY<<", "<<maxX<<", "<<maxY<<") not yet implemented"<<std::endl;
+
+    return 0;
+}
+
+void DataSetLayer::setUpLocator()
+{
+    osg::notify(osg::NOTICE)<<"DataSetLayer::setUpLocator()"<<std::endl;
+}

OpenSceneGraph/trunk/src/osgPlugins/gdal/DataSetLayer.h

@@ -34 +34 @@
-        META_Object(GDALPlugin, DataSetLayer);
-        
-
-
+
+
+
+
+
+
-        virtual unsigned int getNumColumns() const;
+
-        virtual unsigned int getNumRows() const;
+
+        virtual osgTerrain::ImageLayer* extractImageLayer(unsigned int minX, unsigned int minY, unsigned int maxX, unsigned int maxY);
-
-    protected:
-    
-        virtual ~DataSetLayer();
+    
+        void setUpLocator();
-    
-        GDALDataset* _dataset;

OpenSceneGraph/trunk/src/osgPlugins/gdal/ReaderWriterGDAL.cpp

@@ -55 +55 @@
-            osg::ref_ptr<GDALPlugin::DataSetLayer> dataset = new GDALPlugin::DataSetLayer(fileName);
-            
-valid
+isOpen
-            
-            return ReadResult::FILE_NOT_HANDLED;

OpenSceneGraph/trunk/src/osgTerrain/CMakeLists.txt

@@ -13 +13 @@
-        ${HEADER_PATH}/Terrain
-        ${HEADER_PATH}/TerrainTechnique
+        ${HEADER_PATH}/TileSystem
-        ${HEADER_PATH}/GeometryTechnique
-        ${HEADER_PATH}/ValidDataOperator
@@ -26 +27 @@
-        Terrain.cpp
-        TerrainTechnique.cpp
+        TileSystem.cpp
-        GeometryTechnique.cpp
-        Version.cpp

OpenSceneGraph/trunk/src/osgWrappers/osgTerrain/Layer.cpp

@@ -593 +593 @@
-                  "return the name of the object's class type. ",
-                  "Must be defined by derived classes. ");
+        I_Method0(bool, isOpen,
+                  Properties::VIRTUAL,
+                  __bool__isOpen,
+                  "Return if this ProxyLayer is attached to valid file handle. ",
+                  "");
+        I_Method1(void, openFile, IN, const std::string &, fileName,
+                  Properties::NON_VIRTUAL,
+                  __void__openFile__C5_std_string_R1,
+                  "Open a file. ",
+                  "");
+        I_Method0(void, open,
+                  Properties::VIRTUAL,
+                  __void__open,
+                  "Open the any associated file handle. ",
+                  "");
+        I_Method0(void, close,
+                  Properties::VIRTUAL,
+                  __void__close,
+                  "Open the any associated file handle. ",
+                  "");
+        I_Method4(osgTerrain::ImageLayer *, extractImageLayer, IN, unsigned, int, IN, unsigned, int, IN, unsigned, int, IN, unsigned, int,
+                  Properties::VIRTUAL,
+                  __ImageLayer_P1__extractImageLayer__unsigned__unsigned__unsigned__unsigned,
+                  "Extract an ImageLayer from the ProxyLayer. ",
+                  "");
-END_REFLECTOR
-