Changeset 9890

Timestamp:

03/10/09 18:27:39 (4 years ago)

Author:

robert

Message:

Completed support for automatic detection of plugin features.

Cleaned up debug out of various plugins to ensure a clean osgconv --formats.

Location:

OpenSceneGraph/trunk

Files:

• include/osgDB/ReaderWriter (modified) (5 diffs)
• src/osgDB/ReaderWriter.cpp (modified) (1 diff)
• src/osgPlugins/OpenFlight/ReaderWriterFLT.cpp (modified) (1 diff)
• src/osgPlugins/gdal/ReaderWriterGDAL.cpp (modified) (3 diffs)
• src/osgPlugins/gecko/ReaderWriterUBrowser.cpp (modified) (2 diffs)
• src/osgPlugins/gecko/UBrowser.cpp (modified) (1 diff)
• src/osgPlugins/ogr/ReaderWriterOGR.cpp (modified) (1 diff)
• src/osgPlugins/stl/ReaderWriterSTL.cpp (modified) (2 diffs)
• src/osgWidget/Browser.cpp (modified) (2 diffs)

OpenSceneGraph/trunk/include/osgDB/ReaderWriter

@@ -236 +236 @@
                 enum ReadStatus
                 {
+                    NOT_IMPLEMENTED, //!< raad*() method not implemented in concreate ReaderWriter.
                     FILE_NOT_HANDLED, //!< File is not appropriate for this file reader, due to some incompatibility, but *not* a read error.
                     FILE_NOT_FOUND, //!< File could not be found or could not be read.
@@ -279 +280 @@
                 bool loadedFromCache() const { return _status==FILE_LOADED_FROM_CACHE; }
                 bool error() const { return _status==ERROR_IN_READING_FILE; }
-                bool notHandled() const { return _status==FILE_NOT_HANDLED; }
+                bool notHandled() const { return _status==FILE_NOT_HANDLED || _status==NOT_IMPLEMENTED; }
                 bool notFound() const { return _status==FILE_NOT_FOUND; }
 
@@ -296 +297 @@
                 enum WriteStatus
                 {
+                    NOT_IMPLEMENTED, //!< write*() method not implemented in concreate ReaderWriter.
                     FILE_NOT_HANDLED,
                     FILE_SAVED,
@@ -313 +315 @@
                 bool success() const { return _status==FILE_SAVED; }
                 bool error() const { return _status==ERROR_IN_WRITING_FILE; }
-                bool notHandled() const { return _status==FILE_NOT_HANDLED; }
+                bool notHandled() const { return _status==FILE_NOT_HANDLED || _status==NOT_IMPLEMENTED; }
 
             protected:
@@ -329 +331 @@
 
         /** open an archive for reading, writing, or to create an empty archive for writing to.*/ 
-        virtual ReadResult openArchive(const std::string& /*fileName*/,ArchiveStatus, unsigned int =4096, const Options* =NULL) const { return ReadResult(ReadResult::FILE_NOT_HANDLED); }
+        virtual ReadResult openArchive(const std::string& /*fileName*/,ArchiveStatus, unsigned int =4096, const Options* =NULL) const { return ReadResult(ReadResult::NOT_IMPLEMENTED); }
 
         /** open an archive for reading.*/ 
-        virtual ReadResult openArchive(std::istream& /*fin*/,const Options* =NULL) const { return ReadResult(ReadResult::FILE_NOT_HANDLED); }
-
-        virtual ReadResult readObject(const std::string& /*fileName*/,const Options* =NULL) const { return ReadResult(ReadResult::FILE_NOT_HANDLED); }
-        virtual ReadResult readImage(const std::string& /*fileName*/,const Options* =NULL) const { return ReadResult(ReadResult::FILE_NOT_HANDLED); }
-        virtual ReadResult readHeightField(const std::string& /*fileName*/,const Options* =NULL) const { return ReadResult(ReadResult::FILE_NOT_HANDLED); }
-        virtual ReadResult readNode(const std::string& /*fileName*/,const Options* =NULL) const { return ReadResult(ReadResult::FILE_NOT_HANDLED); }
-        virtual ReadResult readShader(const std::string& /*fileName*/,const Options* =NULL) const { return ReadResult(ReadResult::FILE_NOT_HANDLED); }
-
-        virtual WriteResult writeObject(const osg::Object& /*obj*/,const std::string& /*fileName*/,const Options* =NULL) const {return WriteResult(WriteResult::FILE_NOT_HANDLED); }
-        virtual WriteResult writeImage(const osg::Image& /*image*/,const std::string& /*fileName*/,const Options* =NULL) const {return WriteResult(WriteResult::FILE_NOT_HANDLED); }
-        virtual WriteResult writeHeightField(const osg::HeightField& /*heightField*/,const std::string& /*fileName*/,const Options* =NULL) const {return WriteResult(WriteResult::FILE_NOT_HANDLED); }
-        virtual WriteResult writeNode(const osg::Node& /*node*/,const std::string& /*fileName*/,const Options* =NULL) const { return WriteResult(WriteResult::FILE_NOT_HANDLED); }
-        virtual WriteResult writeShader(const osg::Shader& /*shader*/,const std::string& /*fileName*/,const Options* =NULL) const {return WriteResult(WriteResult::FILE_NOT_HANDLED); }
-
-        virtual ReadResult readObject(std::istream& /*fin*/,const Options* =NULL) const { return ReadResult(ReadResult::FILE_NOT_HANDLED); }
-        virtual ReadResult readImage(std::istream& /*fin*/,const Options* =NULL) const { return ReadResult(ReadResult::FILE_NOT_HANDLED); }
-        virtual ReadResult readHeightField(std::istream& /*fin*/,const Options* =NULL) const { return ReadResult(ReadResult::FILE_NOT_HANDLED); }
-        virtual ReadResult readNode(std::istream& /*fin*/,const Options* =NULL) const { return ReadResult(ReadResult::FILE_NOT_HANDLED); }
-        virtual ReadResult readShader(std::istream& /*fin*/,const Options* =NULL) const { return ReadResult(ReadResult::FILE_NOT_HANDLED); }
-
-        virtual WriteResult writeObject(const osg::Object& /*obj*/,std::ostream& /*fout*/,const Options* =NULL) const { return WriteResult(WriteResult::FILE_NOT_HANDLED); }
-        virtual WriteResult writeImage(const osg::Image& /*image*/,std::ostream& /*fout*/,const Options* =NULL) const { return WriteResult(WriteResult::FILE_NOT_HANDLED); }
-        virtual WriteResult writeHeightField(const osg::HeightField& /*heightField*/,std::ostream& /*fout*/,const Options* =NULL) const { return WriteResult(WriteResult::FILE_NOT_HANDLED); }
-        virtual WriteResult writeNode(const osg::Node& /*node*/,std::ostream& /*fout*/,const Options* =NULL) const { return WriteResult(WriteResult::FILE_NOT_HANDLED); }
-        virtual WriteResult writeShader(const osg::Shader& /*shader*/,std::ostream& /*fout*/,const Options* =NULL) const { return WriteResult(WriteResult::FILE_NOT_HANDLED); }
+        virtual ReadResult openArchive(std::istream& /*fin*/,const Options* =NULL) const { return ReadResult(ReadResult::NOT_IMPLEMENTED); }
+
+        virtual ReadResult readObject(const std::string& /*fileName*/,const Options* =NULL) const { return ReadResult(ReadResult::NOT_IMPLEMENTED); }
+        virtual ReadResult readImage(const std::string& /*fileName*/,const Options* =NULL) const { return ReadResult(ReadResult::NOT_IMPLEMENTED); }
+        virtual ReadResult readHeightField(const std::string& /*fileName*/,const Options* =NULL) const { return ReadResult(ReadResult::NOT_IMPLEMENTED); }
+        virtual ReadResult readNode(const std::string& /*fileName*/,const Options* =NULL) const { return ReadResult(ReadResult::NOT_IMPLEMENTED); }
+        virtual ReadResult readShader(const std::string& /*fileName*/,const Options* =NULL) const { return ReadResult(ReadResult::NOT_IMPLEMENTED); }
+
+        virtual WriteResult writeObject(const osg::Object& /*obj*/,const std::string& /*fileName*/,const Options* =NULL) const {return WriteResult(WriteResult::NOT_IMPLEMENTED); }
+        virtual WriteResult writeImage(const osg::Image& /*image*/,const std::string& /*fileName*/,const Options* =NULL) const {return WriteResult(WriteResult::NOT_IMPLEMENTED); }
+        virtual WriteResult writeHeightField(const osg::HeightField& /*heightField*/,const std::string& /*fileName*/,const Options* =NULL) const {return WriteResult(WriteResult::NOT_IMPLEMENTED); }
+        virtual WriteResult writeNode(const osg::Node& /*node*/,const std::string& /*fileName*/,const Options* =NULL) const { return WriteResult(WriteResult::NOT_IMPLEMENTED); }
+        virtual WriteResult writeShader(const osg::Shader& /*shader*/,const std::string& /*fileName*/,const Options* =NULL) const {return WriteResult(WriteResult::NOT_IMPLEMENTED); }
+
+        virtual ReadResult readObject(std::istream& /*fin*/,const Options* =NULL) const { return ReadResult(ReadResult::NOT_IMPLEMENTED); }
+        virtual ReadResult readImage(std::istream& /*fin*/,const Options* =NULL) const { return ReadResult(ReadResult::NOT_IMPLEMENTED); }
+        virtual ReadResult readHeightField(std::istream& /*fin*/,const Options* =NULL) const { return ReadResult(ReadResult::NOT_IMPLEMENTED); }
+        virtual ReadResult readNode(std::istream& /*fin*/,const Options* =NULL) const { return ReadResult(ReadResult::NOT_IMPLEMENTED); }
+        virtual ReadResult readShader(std::istream& /*fin*/,const Options* =NULL) const { return ReadResult(ReadResult::NOT_IMPLEMENTED); }
+
+        virtual WriteResult writeObject(const osg::Object& /*obj*/,std::ostream& /*fout*/,const Options* =NULL) const { return WriteResult(WriteResult::NOT_IMPLEMENTED); }
+        virtual WriteResult writeImage(const osg::Image& /*image*/,std::ostream& /*fout*/,const Options* =NULL) const { return WriteResult(WriteResult::NOT_IMPLEMENTED); }
+        virtual WriteResult writeHeightField(const osg::HeightField& /*heightField*/,std::ostream& /*fout*/,const Options* =NULL) const { return WriteResult(WriteResult::NOT_IMPLEMENTED); }
+        virtual WriteResult writeNode(const osg::Node& /*node*/,std::ostream& /*fout*/,const Options* =NULL) const { return WriteResult(WriteResult::NOT_IMPLEMENTED); }
+        virtual WriteResult writeShader(const osg::Shader& /*shader*/,std::ostream& /*fout*/,const Options* =NULL) const { return WriteResult(WriteResult::NOT_IMPLEMENTED); }
 
     protected:

OpenSceneGraph/trunk/src/osgDB/ReaderWriter.cpp

@@ -64 +64 @@
 ReaderWriter::Features ReaderWriter::supportedFeatures() const
 {
-    Features features = FEATURE_ALL;
-    return features;
+    int features = FEATURE_NONE;
+    std::string dummyFilename;
+
+    if (readObject(dummyFilename,0).status()!=ReadResult::NOT_IMPLEMENTED) features |= FEATURE_READ_OBJECT;
+    if (readImage(dummyFilename,0).status()!=ReadResult::NOT_IMPLEMENTED) features |= FEATURE_READ_IMAGE;
+    if (readHeightField(dummyFilename,0).status()!=ReadResult::NOT_IMPLEMENTED) features |= FEATURE_READ_HEIGHT_FIELD;
+    if (readShader(dummyFilename,0).status()!=ReadResult::NOT_IMPLEMENTED) features |= FEATURE_READ_SHADER;
+    if (readNode(dummyFilename,0).status()!=ReadResult::NOT_IMPLEMENTED) features |= FEATURE_READ_NODE;
+
+    osg::ref_ptr<osg::Image> image = new osg::Image;
+    osg::ref_ptr<osg::HeightField> hf = new osg::HeightField;
+    osg::ref_ptr<osg::Shader> shader = new osg::Shader;
+    osg::ref_ptr<osg::Node> node = new osg::Node;
+
+    if (writeObject(*image, dummyFilename,0).status()!=WriteResult::NOT_IMPLEMENTED) features |= FEATURE_WRITE_OBJECT;
+    if (writeImage(*image,dummyFilename,0).status()!=WriteResult::NOT_IMPLEMENTED) features |= FEATURE_WRITE_IMAGE;
+    if (writeHeightField(*hf,dummyFilename,0).status()!=WriteResult::NOT_IMPLEMENTED) features |= FEATURE_WRITE_HEIGHT_FIELD;
+    if (writeShader(*shader,dummyFilename,0).status()!=WriteResult::NOT_IMPLEMENTED) features |= FEATURE_WRITE_SHADER;
+    if (writeNode(*node, dummyFilename,0).status()!=WriteResult::NOT_IMPLEMENTED) features |= FEATURE_WRITE_NODE;
+
+    return Features(features);
 }
 

OpenSceneGraph/trunk/src/osgPlugins/OpenFlight/ReaderWriterFLT.cpp

@@ -430 +430 @@
             if ( fileName.empty() )
             {
-                osg::notify( osg::FATAL ) << "fltexp: writeNode: empty file name" << std::endl;
                 return WriteResult::FILE_NOT_HANDLED;
             }
+
             std::string ext = osgDB::getLowerCaseFileExtension( fileName );
             if ( !acceptsExtension(ext) )

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

@@ -59 +59 @@
         virtual ReadResult readObject(const std::string& file, const osgDB::ReaderWriter::Options* options) const
         {
+            if (file.empty()) return ReadResult::FILE_NOT_FOUND;
+        
             if (osgDB::equalCaseInsensitive(osgDB::getFileExtension(file),"gdal"))
             {
@@ -82 +84 @@
         virtual ReadResult readImage(const std::string& fileName, const osgDB::ReaderWriter::Options* options) const
         {
+            if (fileName.empty()) return ReadResult::FILE_NOT_FOUND;
+        
             if (osgDB::equalCaseInsensitive(osgDB::getFileExtension(fileName),"gdal"))
             {
@@ -93 +97 @@
         virtual ReadResult readHeightField(const std::string& fileName, const osgDB::ReaderWriter::Options* options) const
         {
+            if (fileName.empty()) return ReadResult::FILE_NOT_FOUND;
+        
             if (osgDB::equalCaseInsensitive(osgDB::getFileExtension(fileName),"gdal"))
             {

OpenSceneGraph/trunk/src/osgPlugins/gecko/ReaderWriterUBrowser.cpp

@@ -26 +26 @@
         ReaderWriterUBrowser()
         {        
-             osg::notify(osg::NOTICE)<<"ReaderWriterUBrowser::ReaderWriterUBrowser()"<<std::endl;
+             osg::notify(osg::INFO)<<"ReaderWriterUBrowser::ReaderWriterUBrowser()"<<std::endl;
 
              supportsExtension("gecko","browser image");
@@ -42 +42 @@
              }
              
-             osg::notify(osg::NOTICE)<<"ReaderWriterUBrowser::ReaderWriterUBrowser() done"<<std::endl;
+             osg::notify(osg::INFO)<<"ReaderWriterUBrowser::ReaderWriterUBrowser() done"<<std::endl;
         }
     

OpenSceneGraph/trunk/src/osgPlugins/gecko/UBrowser.cpp

@@ -47 +47 @@
     _previousButtonMask(0)
 {
-    osg::notify(osg::NOTICE)<<"UBrowserManager::UBrowserManager()"<<std::endl;
+    osg::notify(osg::INFO)<<"UBrowserManager::UBrowserManager()"<<std::endl;
 }
 
 UBrowserManager::~UBrowserManager()
 {
-    _thread->setDone(true);
-    
-    while(_thread->isRunning()) 
+    if (_thread.valid())
     {
-        OpenThreads::Thread::YieldCurrentThread();
-    }
-
-    _thread = 0;
+        _thread->setDone(true);
+
+        while(_thread->isRunning()) 
+        {
+            OpenThreads::Thread::YieldCurrentThread();
+        }
+
+        _thread = 0;
+    }
 }
 

OpenSceneGraph/trunk/src/osgPlugins/ogr/ReaderWriterOGR.cpp

@@ -110 +110 @@
     virtual ReadResult readNode(const std::string& file, const osgDB::ReaderWriter::Options* options) const
     {
-        osg::notify(osg::NOTICE)<<"OGR::readNode("<<file<<")"<<std::endl;
+        osg::notify(osg::INFO)<<"OGR::readNode("<<file<<")"<<std::endl;
+        
+        if (file.empty()) return ReadResult::FILE_NOT_FOUND;
     
         if (osgDB::equalCaseInsensitive(osgDB::getFileExtension(file),"ogr"))

OpenSceneGraph/trunk/src/osgPlugins/stl/ReaderWriterSTL.cpp

@@ -85 +85 @@
   public:
 
-    CreateStlVisitor( std::string const & fout, const osgDB::ReaderWriter::Options* options = 0): osg::NodeVisitor( osg::NodeVisitor::TRAVERSE_ACTIVE_CHILDREN ), counter(0), m_fout(fout), m_options(options) {
-      if (options && (options->getOptionString() == "separateFiles")) {
-    osg::notify(osg::INFO) << "ReaderWriterSTL::writeNode: Files are seperated written" << std::endl;                
+    CreateStlVisitor( std::string const & fout, const osgDB::ReaderWriter::Options* options = 0): osg::NodeVisitor( osg::NodeVisitor::TRAVERSE_ACTIVE_CHILDREN ), counter(0), m_fout(fout), m_options(options)
+    {
+      if (options && (options->getOptionString() == "separateFiles"))
+      {
+        osg::notify(osg::INFO) << "ReaderWriterSTL::writeNode: Files are seperated written" << std::endl;
       } else {
-    m_f = new std::ofstream(m_fout.c_str());        
-    *m_f << "solid " << counter << std::endl;
+        m_f = new std::ofstream(m_fout.c_str());        
+        *m_f << "solid " << counter << std::endl;
       }
     };
@@ -449 +451 @@
 }
 
-osgDB::ReaderWriter::WriteResult ReaderWriterSTL::writeNode(const osg::Node& node,const std::string& fout, const Options* opts) const {
-  std::string ext = osgDB::getLowerCaseFileExtension(fout);
-  if (ext != "stl" ){
+osgDB::ReaderWriter::WriteResult ReaderWriterSTL::writeNode(const osg::Node& node,const std::string& fileName, const Options* opts) const
+{
+  if (fileName.empty()) return WriteResult::FILE_NOT_HANDLED;
+
+  std::string ext = osgDB::getLowerCaseFileExtension(fileName);
+  if (ext != "stl" )
+  {
     // sta - extension implies STL-Binary...
-    osg::notify(osg::FATAL) << "ReaderWriterSTL::writeNode: Only STL-ASCII-files supported'" << std::endl;
+    osg::notify(osg::INFO) << "ReaderWriterSTL::writeNode: Only STL-ASCII-files supported'" << std::endl;
     return WriteResult::FILE_NOT_HANDLED;
   }
   
   try {
-    CreateStlVisitor createStlVisitor( fout, opts );
+    CreateStlVisitor createStlVisitor( fileName, opts );
     const_cast<osg::Node&>(node).accept( createStlVisitor );
   } catch(...) {

OpenSceneGraph/trunk/src/osgWidget/Browser.cpp

@@ -31 +31 @@
 BrowserManager::BrowserManager()
 {
-    osg::notify(osg::NOTICE)<<"Constructing base BrowserManager"<<std::endl;
+    osg::notify(osg::INFO)<<"Constructing base BrowserManager"<<std::endl;
 }
 
 BrowserManager::~BrowserManager()
 {
-    osg::notify(osg::NOTICE)<<"Destructing base BrowserManager"<<std::endl;
+    osg::notify(osg::INFO)<<"Destructing base BrowserManager"<<std::endl;
 }
 
@@ -46 +46 @@
 BrowserImage* BrowserManager::createBrowserImage(const std::string& url, int width, int height)
 {
-    osg::notify(osg::NOTICE)<<"Cannot created browser"<<std::endl;
+    osg::notify(osg::NOTICE)<<"Cannot create browser"<<std::endl;
     return 0;
 }