From af7e47a79b7c562004ecb9d23018b31aa5fa9f16 Mon Sep 17 00:00:00 2001
From: Robert Osfield <robert@openscenegraph.com>
Date: Thu, 14 May 2009 13:10:18 +0000
Subject: [PATCH] Changed debug message to INFO notication level

---
 src/osgPlugins/p3d/ReaderWriterP3D.cpp      | 10 +++++-----
 src/osgPlugins/p3d/ReaderWriterPaths.cpp    | 10 ++++------
 src/osgPlugins/p3d/SlideShowConstructor.cpp | 18 ++++++++----------
 3 files changed, 17 insertions(+), 21 deletions(-)

diff --git a/src/osgPlugins/p3d/ReaderWriterP3D.cpp b/src/osgPlugins/p3d/ReaderWriterP3D.cpp
index 3fb1529ec..20b4cdf68 100644
--- a/src/osgPlugins/p3d/ReaderWriterP3D.cpp
+++ b/src/osgPlugins/p3d/ReaderWriterP3D.cpp
@@ -94,7 +94,7 @@ public:
         _stringKeyMap["F12"]=osgGA::GUIEventAdapter::KEY_F12;
 
 
-        _notifyLevel = osg::NOTICE;
+        _notifyLevel = osg::INFO;
     }
     
     virtual const char* className() const
@@ -1444,7 +1444,7 @@ class OSGDB_EXPORT MyReadFileCallback : public virtual osgDB::ReadFileCallback
 
         osgDB::ReaderWriter::ReadResult readLocal(ObjectType type, const std::string& filename, const osgDB::Options* options)
         {
-            osg::notify(osg::NOTICE)<<"Trying local file "<<filename<<std::endl;
+            osg::notify(osg::INFO)<<"Trying local file "<<filename<<std::endl;
 
             switch(type)
             {
@@ -1465,7 +1465,7 @@ class OSGDB_EXPORT MyReadFileCallback : public virtual osgDB::ReadFileCallback
             if (!fileCache) fileCache = osgDB::Registry::instance()->getFileCache();
             if (!fileCache) return osgDB::ReaderWriter::ReadResult::FILE_NOT_FOUND;
 
-            osg::notify(osg::NOTICE)<<"Trying fileCache "<<filename<<std::endl;
+            osg::notify(osg::INFO)<<"Trying fileCache "<<filename<<std::endl;
 
             osgDB::ReaderWriter::ReadResult result;
             if (fileCache && fileCache->isFileAppropriateForFileCache(filename))
@@ -1511,7 +1511,7 @@ class OSGDB_EXPORT MyReadFileCallback : public virtual osgDB::ReadFileCallback
 
         osgDB::ReaderWriter::ReadResult readServer(ObjectType type, const std::string& filename, const osgDB::Options* options)
         {
-            osg::notify(osg::NOTICE)<<"Trying server file "<<filename<<std::endl;
+            osg::notify(osg::INFO)<<"Trying server file "<<filename<<std::endl;
 
             osgDB::ReaderWriter::ReadResult result;
             osgDB::ReaderWriter* rw = osgDB::Registry::instance()->getReaderWriterForExtension("curl");
@@ -1608,7 +1608,7 @@ class OSGDB_EXPORT MyReadFileCallback : public virtual osgDB::ReadFileCallback
             if (!fileCache) fileCache = osgDB::Registry::instance()->getFileCache();
             if (fileCache && !fileCache->isFileAppropriateForFileCache(filename)) fileCache = 0;
 
-            osg::notify(osg::NOTICE)<<"reading file "<<filename<<std::endl;
+            osg::notify(osg::INFO)<<"reading file "<<filename<<std::endl;
             ObjectCache::iterator itr = _objectCache.find(filename);
             if (itr != _objectCache.end())
             {
diff --git a/src/osgPlugins/p3d/ReaderWriterPaths.cpp b/src/osgPlugins/p3d/ReaderWriterPaths.cpp
index f7f0ed60e..48ad786d3 100644
--- a/src/osgPlugins/p3d/ReaderWriterPaths.cpp
+++ b/src/osgPlugins/p3d/ReaderWriterPaths.cpp
@@ -80,12 +80,12 @@ osgDB::ReaderWriter::ReadResult ReaderWriterPaths::readObject(const std::string&
     std::string ext = osgDB::getLowerCaseFileExtension(file);
     if (!acceptsExtension(ext)) return ReadResult::FILE_NOT_HANDLED;
 
-    osg::notify(osg::NOTICE)<<"ReaderWriterPaths::readObject("<<file<<")"<<std::endl;
+    osg::notify(osg::INFO)<<"ReaderWriterPaths::readObject("<<file<<")"<<std::endl;
 
     std::string fileName = osgDB::findDataFile( file, options );
     if (fileName.empty()) return ReadResult::FILE_NOT_FOUND;
 
-    osg::notify(osg::NOTICE)<<"  Found path file :"<<fileName<<std::endl;
+    osg::notify(osg::INFO)<<"  Found path file :"<<fileName<<std::endl;
 
     // code for setting up the database path so that internally referenced file are searched for on relative paths.
     osg::ref_ptr<osgDB::ReaderWriter::Options> local_opt = options ? static_cast<osgDB::ReaderWriter::Options*>(options->clone(osg::CopyOp::SHALLOW_COPY)) : new Options;
@@ -98,7 +98,7 @@ osgDB::ReaderWriter::ReadResult ReaderWriterPaths::readObject(const std::string&
 
 osgDB::ReaderWriter::ReadResult ReaderWriterPaths::readObject(std::istream& fin, const osgDB::Options* options) const
 {
-    osg::notify(osg::NOTICE)<<"ReaderWriterPaths::readObject(std::istream& fin"<<std::endl;
+    osg::notify(osg::INFO)<<"ReaderWriterPaths::readObject(std::istream& fin"<<std::endl;
 
     if (!options) return ReadResult::FILE_NOT_HANDLED;
     if (!fin) return ReadResult::ERROR_IN_READING_FILE;
@@ -108,7 +108,7 @@ osgDB::ReaderWriter::ReadResult ReaderWriterPaths::readObject(std::istream& fin,
 
     std::string ext = osgDB::getLowerCaseFileExtension(filename);
 
-    osg::notify(osg::NOTICE)<<"   filename found in options: "<<filename<<"  extension="<<ext<<std::endl;
+    osg::notify(osg::INFO)<<"   filename found in options: "<<filename<<"  extension="<<ext<<std::endl;
 
 
     if (!acceptsExtension(ext)) return ReadResult::FILE_NOT_HANDLED;
@@ -213,8 +213,6 @@ osgDB::ReaderWriter::ReadResult ReaderWriterPaths::read_rotation_path(std::istre
         RotationPathData currValue;
         fin >> currValue.time >> currValue.pivot.x() >> currValue.pivot.y() >> currValue.pivot.z() >> currValue.position.x() >> currValue.position.y() >> currValue.position.z() >> currValue.azim >> currValue.elevation >> currValue.scale;
 
-        osg::notify(osg::NOTICE)<<"rotation_path "<<currValue.time <<", "<< currValue.pivot.x() <<", "<< currValue.pivot.y() <<", "<< currValue.pivot.z() <<", "<< currValue.position.x() <<", "<< currValue.position.y() <<", "<< currValue.position.z() <<", "<< currValue.azim <<", "<< currValue.elevation <<", "<< currValue.scale<<std::endl;
-
         if(!fin.eof())
         {
 
diff --git a/src/osgPlugins/p3d/SlideShowConstructor.cpp b/src/osgPlugins/p3d/SlideShowConstructor.cpp
index 26b35b5cb..ddd6d672b 100644
--- a/src/osgPlugins/p3d/SlideShowConstructor.cpp
+++ b/src/osgPlugins/p3d/SlideShowConstructor.cpp
@@ -1229,7 +1229,7 @@ std::string SlideShowConstructor::findFileAndRecordPath(const std::string& filen
 
 void SlideShowConstructor::addModel(const std::string& filename, const PositionData& positionData, const ModelData& modelData)
 {
-    osg::notify(osg::NOTICE)<<"SlideShowConstructor::addModel("<<filename<<")"<<std::endl;
+    osg::notify(osg::INFO)<<"SlideShowConstructor::addModel("<<filename<<")"<<std::endl;
 
     osg::Node* subgraph = 0;
 
@@ -1258,7 +1258,7 @@ void SlideShowConstructor::addModel(const std::string& filename, const PositionD
         addModel(subgraph, positionData, modelData);
     }
 
-    osg::notify(osg::NOTICE)<<"end of SlideShowConstructor::addModel("<<filename<<")"<<std::endl<<std::endl;
+    osg::notify(osg::INFO)<<"end of SlideShowConstructor::addModel("<<filename<<")"<<std::endl<<std::endl;
 
 }
 
@@ -1323,8 +1323,6 @@ void SlideShowConstructor::addModel(osg::Node* subgraph, const PositionData& pos
     if (positionData.requiresMaterialAnimation())
         subgraph = attachMaterialAnimation(subgraph,positionData);
 
-    osg::notify(osg::NOTICE)<<"positionData.rotation "<<positionData.rotation<<std::endl;
-
     // attached any rotation
     if (positionData.rotation[0]!=0.0)
     {
@@ -1334,10 +1332,10 @@ void SlideShowConstructor::addModel(osg::Node* subgraph, const PositionData& pos
             new osgUtil::TransformCallback(subgraph->getBound().center(),
                                            osg::Vec3(positionData.rotation[1],positionData.rotation[2],positionData.rotation[3]),
                                            osg::DegreesToRadians(positionData.rotation[0])));
-                                           
+
         animation_transform->addChild(subgraph);
-        
-        osg::notify(osg::NOTICE)<<"Rotation Matrix "<<animation_transform->getMatrix()<<std::endl;
+
+        osg::notify(osg::INFO)<<"Rotation Matrix "<<animation_transform->getMatrix()<<std::endl;
 
         subgraph = animation_transform;
     }
@@ -1347,10 +1345,10 @@ void SlideShowConstructor::addModel(osg::Node* subgraph, const PositionData& pos
     osg::AnimationPathCallback* animation = getAnimationPathCallback(positionData);
     if (animation)
     {
-        osg::notify(osg::NOTICE)<<"Have animation path for model"<<std::endl;
-        
+        osg::notify(osg::INFO)<<"Have animation path for model"<<std::endl;
+
         osg::Vec3 pivot = positionData.absolute_path ? osg::Vec3(0.0f,0.0f,0.0f) : subgraph->getBound().center();
-                
+
         osg::AnimationPath* path = animation->getAnimationPath();
         if (positionData.animation_name=="wheel" && (path->getTimeControlPointMap()).size()>=2)
         {