From 1119f29f67af9c5d1079958676af2d1bc9805495 Mon Sep 17 00:00:00 2001
From: Robert Osfield <robert@openscenegraph.com>
Date: Fri, 28 May 2010 16:03:38 +0000
Subject: [PATCH] Conversion of osg::notify to OSG_INFO etc.

---
 src/osgTerrain/Layer.cpp            | 26 +++++++++++++-------------
 src/osgTerrain/TerrainTechnique.cpp |  8 ++++----
 src/osgTerrain/TerrainTile.cpp      |  2 +-
 3 files changed, 18 insertions(+), 18 deletions(-)

diff --git a/src/osgTerrain/Layer.cpp b/src/osgTerrain/Layer.cpp
index fc3809ee6..41de0e524 100644
--- a/src/osgTerrain/Layer.cpp
+++ b/src/osgTerrain/Layer.cpp
@@ -212,7 +212,7 @@ bool ImageLayer::transform(float offset, float scale)
 {
     if (!_image.valid()) return false;
 
-    OSG_NOTIFY(osg::INFO)<<"ImageLayer::transform("<<offset<<","<<scale<<")"<<std::endl;;
+    OSG_INFO<<"ImageLayer::transform("<<offset<<","<<scale<<")"<<std::endl;;
 
     processImage(_image.get(), TransformOperator(offset,scale));
     
@@ -228,30 +228,30 @@ bool ImageLayer::getValue(unsigned int i, unsigned int j, float& value) const
     {
         case(GL_BYTE): 
             value = *((const char*)data); 
-            // OSG_NOTIFY(osg::NOTICE)<<"byte "<<value<<std::endl;
+            // OSG_NOTICE<<"byte "<<value<<std::endl;
             break;
         case(GL_UNSIGNED_BYTE): 
             value = *data;
-            // OSG_NOTIFY(osg::NOTICE)<<"Unsigned byte "<<value<<std::endl;
+            // OSG_NOTICE<<"Unsigned byte "<<value<<std::endl;
             break;
         case(GL_SHORT):
             value = *((const short*)data);
-            // OSG_NOTIFY(osg::NOTICE)<<"Short "<<value<<std::endl;
+            // OSG_NOTICE<<"Short "<<value<<std::endl;
             break;
         case(GL_UNSIGNED_SHORT):
             value = *((const unsigned short*)data);
-            // OSG_NOTIFY(osg::NOTICE)<<"Unsigned Short "<<value<<std::endl;
+            // OSG_NOTICE<<"Unsigned Short "<<value<<std::endl;
             break;
         case(GL_INT):
             value = *((const int*)data);
-            // OSG_NOTIFY(osg::NOTICE)<<"Int "<<value<<std::endl;
+            // OSG_NOTICE<<"Int "<<value<<std::endl;
             break;
         case(GL_UNSIGNED_INT):
-            // OSG_NOTIFY(osg::NOTICE)<<"Unsigned Int "<<value<<std::endl;
+            // OSG_NOTICE<<"Unsigned Int "<<value<<std::endl;
             value = *((const unsigned int*)data);
             break;
         case(GL_FLOAT):
-            // OSG_NOTIFY(osg::NOTICE)<<"Float "<<value<<std::endl;
+            // OSG_NOTICE<<"Float "<<value<<std::endl;
             value = *((const float*)data);
             break;
         default: 
@@ -264,19 +264,19 @@ bool ImageLayer::getValue(unsigned int i, unsigned int j, float& value) const
 
 bool ImageLayer::getValue(unsigned int i, unsigned int j, osg::Vec2& value) const
 {
-    OSG_NOTIFY(osg::NOTICE)<<"Not implemented yet"<<std::endl;
+    OSG_NOTICE<<"Not implemented yet"<<std::endl;
     return false;
 }
 
 bool ImageLayer::getValue(unsigned int i, unsigned int j, osg::Vec3& value) const
 {
-    OSG_NOTIFY(osg::NOTICE)<<"Not implemented yet"<<std::endl;
+    OSG_NOTICE<<"Not implemented yet"<<std::endl;
     return false;
 }
 
 bool ImageLayer::getValue(unsigned int i, unsigned int j, osg::Vec4& value) const
 {
-    OSG_NOTIFY(osg::NOTICE)<<"Not implemented yet"<<std::endl;
+    OSG_NOTICE<<"Not implemented yet"<<std::endl;
     return false;
 }
 
@@ -324,7 +324,7 @@ bool ContourLayer::transform(float offset, float scale)
 {
     if (!_tf) return false;
 
-    OSG_NOTIFY(osg::INFO)<<"ContourLayer::transform("<<offset<<","<<scale<<")"<<std::endl;;
+    OSG_INFO<<"ContourLayer::transform("<<offset<<","<<scale<<")"<<std::endl;;
 
     osg::TransferFunction1D::ColorMap newColorMap = _tf->getColorMap();
     for(osg::TransferFunction1D::ColorMap::iterator itr = newColorMap.begin();
@@ -438,7 +438,7 @@ bool HeightFieldLayer::transform(float offset, float scale)
     osg::FloatArray* heights = _heightField->getFloatArray();
     if (!heights) return false;
     
-    OSG_NOTIFY(osg::INFO)<<"HeightFieldLayer::transform("<<offset<<","<<scale<<")"<<std::endl;;
+    OSG_INFO<<"HeightFieldLayer::transform("<<offset<<","<<scale<<")"<<std::endl;;
 
     for(osg::FloatArray::iterator itr = heights->begin();
         itr != heights->end();
diff --git a/src/osgTerrain/TerrainTechnique.cpp b/src/osgTerrain/TerrainTechnique.cpp
index e1a63903d..b91be930b 100644
--- a/src/osgTerrain/TerrainTechnique.cpp
+++ b/src/osgTerrain/TerrainTechnique.cpp
@@ -85,24 +85,24 @@ void TerrainTechnique::setTerrainTile(TerrainTile* tile)
 
 void TerrainTechnique::init(int dirtyMask, bool assumeMultiThreaded)
 {
-    OSG_NOTIFY(osg::NOTICE)<<className()<<"::init(..) not implementated yet"<<std::endl;
+    OSG_NOTICE<<className()<<"::init(..) not implementated yet"<<std::endl;
 }
 
 void TerrainTechnique::update(osgUtil::UpdateVisitor* uv)
 {
-    OSG_NOTIFY(osg::NOTICE)<<className()<<"::update(..) not implementated yet"<<std::endl;
+    OSG_NOTICE<<className()<<"::update(..) not implementated yet"<<std::endl;
     if (_terrainTile) _terrainTile->osg::Group::traverse(*uv);
 }
 
 void TerrainTechnique::cull(osgUtil::CullVisitor* cv)
 {
-    OSG_NOTIFY(osg::NOTICE)<<className()<<"::cull(..) not implementated yet"<<std::endl;
+    OSG_NOTICE<<className()<<"::cull(..) not implementated yet"<<std::endl;
     if (_terrainTile) _terrainTile->osg::Group::traverse(*cv);
 }
 
 void TerrainTechnique::cleanSceneGraph()
 {
-    OSG_NOTIFY(osg::NOTICE)<<className()<<"::cleanSceneGraph(..) not implementated yet"<<std::endl;
+    OSG_NOTICE<<className()<<"::cleanSceneGraph(..) not implementated yet"<<std::endl;
 }
 
 void TerrainTechnique::traverse(osg::NodeVisitor& nv)
diff --git a/src/osgTerrain/TerrainTile.cpp b/src/osgTerrain/TerrainTile.cpp
index 7cf8af21b..4754925bf 100644
--- a/src/osgTerrain/TerrainTile.cpp
+++ b/src/osgTerrain/TerrainTile.cpp
@@ -133,7 +133,7 @@ void TerrainTile::traverse(osg::NodeVisitor& nv)
                     osgTerrain::Terrain* ts = dynamic_cast<Terrain*>(*itr);
                     if (ts) 
                     {
-                        OSG_NOTIFY(osg::INFO)<<"Assigning terrain system "<<ts<<std::endl;
+                        OSG_INFO<<"Assigning terrain system "<<ts<<std::endl;
                         setTerrain(ts);
                     }
                 }