Changeset 11480

Timestamp:

05/28/10 18:04:19 (2 years ago)

Author:

robert

Message:

Converted osg::notify to OSG_INFO etc.

Location:

OpenSceneGraph/trunk/src/osgVolume

Files:

• FixedFunctionTechnique.cpp (modified) (8 diffs)
• Layer.cpp (modified) (10 diffs)
• Locator.cpp (modified) (1 diff)
• Property.cpp (modified) (4 diffs)
• RayTracedTechnique.cpp (modified) (10 diffs)
• Volume.cpp (modified) (2 diffs)
• VolumeTechnique.cpp (modified) (3 diffs)
• VolumeTile.cpp (modified) (1 diff)

OpenSceneGraph/trunk/src/osgVolume/FixedFunctionTechnique.cpp

@@ -99 +99 @@
 void FixedFunctionTechnique::init()
 {
-    osg::notify(osg::INFO)<<"FixedFunctionTechnique::init()"<<std::endl;
+    OSG_INFO<<"FixedFunctionTechnique::init()"<<std::endl;
 
     if (!_volumeTile)
     {
-        osg::notify(osg::NOTICE)<<"FixedFunctionTechnique::init(), error no volume tile assigned."<<std::endl;
+        OSG_NOTICE<<"FixedFunctionTechnique::init(), error no volume tile assigned."<<std::endl;
         return;
     }
@@ -109 +109 @@
     if (_volumeTile->getLayer()==0)
     {
-        osg::notify(osg::NOTICE)<<"FixedFunctionTechnique::init(), error no layer assigend to volume tile."<<std::endl;
+        OSG_NOTICE<<"FixedFunctionTechnique::init(), error no layer assigend to volume tile."<<std::endl;
         return;
     }
@@ -115 +115 @@
     if (_volumeTile->getLayer()->getImage()==0)
     {
-        osg::notify(osg::NOTICE)<<"FixedFunctionTechnique::init(), error no image assigned to layer."<<std::endl;
+        OSG_NOTICE<<"FixedFunctionTechnique::init(), error no image assigned to layer."<<std::endl;
         return;
     }
@@ -153 +153 @@
     {
         masterLocator = _volumeTile->getLayer()->getLocator();
-        osg::notify(osg::NOTICE)<<"assigning locator = "<<masterLocator<<std::endl;
+        OSG_NOTICE<<"assigning locator = "<<masterLocator<<std::endl;
     }
 
@@ -162 +162 @@
     }
     
-    osg::notify(osg::NOTICE)<<"Matrix = "<<matrix<<std::endl;
+    OSG_NOTICE<<"Matrix = "<<matrix<<std::endl;
 
     osg::Texture::FilterMode minFilter = osg::Texture::NEAREST;
@@ -258 +258 @@
 void FixedFunctionTechnique::update(osgUtil::UpdateVisitor* uv)
 {
-//    osg::notify(osg::NOTICE)<<"FixedFunctionTechnique:update(osgUtil::UpdateVisitor* nv):"<<std::endl;
+//    OSG_NOTICE<<"FixedFunctionTechnique:update(osgUtil::UpdateVisitor* nv):"<<std::endl;
 }
 
 void FixedFunctionTechnique::cull(osgUtil::CullVisitor* cv)
 {
-    //osg::notify(osg::NOTICE)<<"FixedFunctionTechnique::cull(osgUtil::CullVisitor* nv)"<<std::endl;    
+    //OSG_NOTICE<<"FixedFunctionTechnique::cull(osgUtil::CullVisitor* nv)"<<std::endl;    
     if (_node.valid())
     {
@@ -272 +272 @@
 void FixedFunctionTechnique::cleanSceneGraph()
 {
-    osg::notify(osg::NOTICE)<<"FixedFunctionTechnique::cleanSceneGraph()"<<std::endl;
+    OSG_NOTICE<<"FixedFunctionTechnique::cleanSceneGraph()"<<std::endl;
 }
 
 void FixedFunctionTechnique::traverse(osg::NodeVisitor& nv)
 {
-    // osg::notify(osg::NOTICE)<<"FixedFunctionTechnique::traverse(osg::NodeVisitor& nv)"<<std::endl;
+    // OSG_NOTICE<<"FixedFunctionTechnique::traverse(osg::NodeVisitor& nv)"<<std::endl;
     if (!_volumeTile) return;
 
@@ -306 +306 @@
     if (_volumeTile->getDirty()) 
     {
-        osg::notify(osg::INFO)<<"******* Doing init ***********"<<std::endl;
+        OSG_INFO<<"******* Doing init ***********"<<std::endl;
         _volumeTile->init();
     }

OpenSceneGraph/trunk/src/osgVolume/Layer.cpp

@@ -60 +60 @@
     getLocator()->computeLocalBounds(left, right);
 
-    //osg::notify(osg::NOTICE)<<"left = "<<left<<std::endl;
-    //osg::notify(osg::NOTICE)<<"right = "<<right<<std::endl;
+    //OSG_NOTICE<<"left = "<<left<<std::endl;
+    //OSG_NOTICE<<"right = "<<right<<std::endl;
 
     return osg::BoundingSphere((left+right)*0.5, (right-left).length()*0.5);
@@ -146 +146 @@
     if (computeMinMax(minValue, maxValue))
     {
-        osg::notify(osg::NOTICE)<<"ImageLayer::offsetAndScaleImage("<<offset<<" and "<<scale<<")"<<std::endl;
-        osg::notify(osg::NOTICE)<<"     before    _texelOffset "<<_texelOffset<<std::endl;
-        osg::notify(osg::NOTICE)<<"     before    _texelScale "<<_texelScale<<std::endl;
-        osg::notify(osg::NOTICE)<<"     before    minValue "<<minValue<<std::endl;
-        osg::notify(osg::NOTICE)<<"     before    maxValue "<<maxValue<<std::endl;
-        osg::notify(osg::NOTICE)<<"     before    minValue transformed "<<minValue[0]*_texelScale[0]+_texelOffset[0]<<std::endl;
-        osg::notify(osg::NOTICE)<<"     before    maxValue transformed "<<maxValue[0]*_texelScale[0]+_texelOffset[0]<<std::endl;
+        OSG_NOTICE<<"ImageLayer::offsetAndScaleImage("<<offset<<" and "<<scale<<")"<<std::endl;
+        OSG_NOTICE<<"     before    _texelOffset "<<_texelOffset<<std::endl;
+        OSG_NOTICE<<"     before    _texelScale "<<_texelScale<<std::endl;
+        OSG_NOTICE<<"     before    minValue "<<minValue<<std::endl;
+        OSG_NOTICE<<"     before    maxValue "<<maxValue<<std::endl;
+        OSG_NOTICE<<"     before    minValue transformed "<<minValue[0]*_texelScale[0]+_texelOffset[0]<<std::endl;
+        OSG_NOTICE<<"     before    maxValue transformed "<<maxValue[0]*_texelScale[0]+_texelOffset[0]<<std::endl;
     }
 #endif
@@ -178 +178 @@
     if (computeMinMax(minValue, maxValue))
     {
-        osg::notify(osg::NOTICE)<<"     after     _texelOffset "<<_texelOffset<<std::endl;
-        osg::notify(osg::NOTICE)<<"     after     _texelScale "<<_texelScale<<std::endl;
-        osg::notify(osg::NOTICE)<<"     after     minValue "<<minValue<<std::endl;
-        osg::notify(osg::NOTICE)<<"     after     maxValue "<<maxValue<<std::endl;
-        osg::notify(osg::NOTICE)<<"     after     minValue transformed "<<minValue[0]*_texelScale[0]+_texelOffset[0]<<std::endl;
-        osg::notify(osg::NOTICE)<<"     after     maxValue transformed "<<maxValue[0]*_texelScale[0]+_texelOffset[0]<<std::endl;
+        OSG_NOTICE<<"     after     _texelOffset "<<_texelOffset<<std::endl;
+        OSG_NOTICE<<"     after     _texelScale "<<_texelScale<<std::endl;
+        OSG_NOTICE<<"     after     minValue "<<minValue<<std::endl;
+        OSG_NOTICE<<"     after     maxValue "<<maxValue<<std::endl;
+        OSG_NOTICE<<"     after     minValue transformed "<<minValue[0]*_texelScale[0]+_texelOffset[0]<<std::endl;
+        OSG_NOTICE<<"     after     maxValue transformed "<<maxValue[0]*_texelScale[0]+_texelOffset[0]<<std::endl;
     }
 #endif
@@ -190 +190 @@
 void ImageLayer::rescaleToZeroToOneRange()
 {
-    osg::notify(osg::INFO)<<"ImageLayer::rescaleToZeroToOneRange()"<<std::endl;
+    OSG_INFO<<"ImageLayer::rescaleToZeroToOneRange()"<<std::endl;
 
     osg::Vec4 minValue, maxValue;
@@ -208 +208 @@
         float offset = -minComponent * scale;
 
-        osg::notify(osg::INFO)<<"         scale "<<scale<<std::endl;
-        osg::notify(osg::INFO)<<"         offset "<<offset<<std::endl;
+        OSG_INFO<<"         scale "<<scale<<std::endl;
+        OSG_INFO<<"         offset "<<offset<<std::endl;
 
         offsetAndScaleImage(osg::Vec4(offset, offset, offset, offset),
@@ -292 +292 @@
 osg::Image* osgVolume::createNormalMapTexture(osg::Image* image_3d)
 {
-    osg::notify(osg::INFO)<<"Computing NormalMapTexture"<<std::endl;
+    OSG_INFO<<"Computing NormalMapTexture"<<std::endl;
 
     GLenum dataType = image_3d->getDataType();
@@ -318 +318 @@
         break;
     default:
-        osg::notify(osg::NOTICE)<<"Source pixel format not support for normal map generation."<<std::endl;
+        OSG_NOTICE<<"Source pixel format not support for normal map generation."<<std::endl;
         return 0;
     }
@@ -402 +402 @@
                     grad.normalize();
 
-                    //osg::notify(osg::NOTICE)<<"normal "<<grad<<std::endl;
+                    //OSG_NOTICE<<"normal "<<grad<<std::endl;
 
                     if (grad.x()==0.0f && grad.y()==0.0f && grad.z()==0.0f)
@@ -482 +482 @@
 
 
-    osg::notify(osg::INFO)<<"Created NormalMapTexture"<<std::endl;
+    OSG_INFO<<"Created NormalMapTexture"<<std::endl;
 
     return normalmap_3d.release();
@@ -533 +533 @@
 osg::Image* osgVolume::applyTransferFunction(osg::Image* image, osg::TransferFunction1D* transferFunction)
 {
-    osg::notify(osg::INFO)<<"Applying transfer function"<<std::endl;
+    OSG_INFO<<"Applying transfer function"<<std::endl;
 
     osg::Image* output_image = new osg::Image;

OpenSceneGraph/trunk/src/osgVolume/Locator.cpp

@@ -110 +110 @@
 bool Locator::computeLocalBounds(osg::Vec3d& bottomLeft, osg::Vec3d& topRight) const
 {
-    osg::notify(osg::NOTICE)<<"Locator::computeLocalBounds"<<std::endl;
+    OSG_NOTICE<<"Locator::computeLocalBounds"<<std::endl;
 
     typedef std::list<osg::Vec3d> Corners;

OpenSceneGraph/trunk/src/osgVolume/Property.cpp

@@ -338 +338 @@
             if (_updateAlphaCutOff && cpv._isoProperty.valid())
             {
-                osg::notify(osg::INFO)<<"Setting isoProperty to "<<v<<std::endl;
+                OSG_INFO<<"Setting isoProperty to "<<v<<std::endl;
                 cpv._isoProperty->setValue(v);
             }
@@ -344 +344 @@
             if (_updateAlphaCutOff && cpv._afProperty.valid())
             {
-                osg::notify(osg::INFO)<<"Setting afProperty to "<<v2<<std::endl;
+                OSG_INFO<<"Setting afProperty to "<<v2<<std::endl;
                 cpv._afProperty->setValue(v2);
             }
@@ -350 +350 @@
             if (_updateTransparency && cpv._transparencyProperty.valid())
             {
-                osg::notify(osg::INFO)<<"Setting transparency to "<<v2<<std::endl;
+                OSG_INFO<<"Setting transparency to "<<v2<<std::endl;
                 cpv._transparencyProperty->setValue(v2);
             }
@@ -356 +356 @@
             if (_updateSampleDensity && cpv._sampleDensityProperty.valid())
             {
-                osg::notify(osg::INFO)<<"Setting sample density to "<<v4<<std::endl;
+                OSG_INFO<<"Setting sample density to "<<v4<<std::endl;
                 cpv._sampleDensityProperty->setValue(v4);
             }

OpenSceneGraph/trunk/src/osgVolume/RayTracedTechnique.cpp

@@ -97 +97 @@
 void RayTracedTechnique::init()
 {
-    osg::notify(osg::INFO)<<"RayTracedTechnique::init()"<<std::endl;
+    OSG_INFO<<"RayTracedTechnique::init()"<<std::endl;
 
     if (!_volumeTile)
     {
-        osg::notify(osg::NOTICE)<<"RayTracedTechnique::init(), error no volume tile assigned."<<std::endl;
+        OSG_NOTICE<<"RayTracedTechnique::init(), error no volume tile assigned."<<std::endl;
         return;
     }
@@ -107 +107 @@
     if (_volumeTile->getLayer()==0)
     {
-        osg::notify(osg::NOTICE)<<"RayTracedTechnique::init(), error no layer assigend to volume tile."<<std::endl;
+        OSG_NOTICE<<"RayTracedTechnique::init(), error no layer assigend to volume tile."<<std::endl;
         return;
     }
@@ -113 +113 @@
     if (_volumeTile->getLayer()->getImage()==0)
     {
-        osg::notify(osg::NOTICE)<<"RayTracedTechnique::init(), error no image assigned to layer."<<std::endl;
+        OSG_NOTICE<<"RayTracedTechnique::init(), error no image assigned to layer."<<std::endl;
         return;
     }
@@ -187 +187 @@
     }
 
-    osg::notify(osg::INFO)<<"RayTracedTechnique::init() : geometryMatrix = "<<geometryMatrix<<std::endl;
-    osg::notify(osg::INFO)<<"RayTracedTechnique::init() : imageMatrix = "<<imageMatrix<<std::endl;
+    OSG_INFO<<"RayTracedTechnique::init() : geometryMatrix = "<<geometryMatrix<<std::endl;
+    OSG_INFO<<"RayTracedTechnique::init() : imageMatrix = "<<imageMatrix<<std::endl;
 
     osg::Texture::InternalFormatMode internalFormatMode = osg::Texture::USE_IMAGE_DATA_FORMAT;
@@ -272 +272 @@
 #if 1
             osgDB::writeImageFile(*(tf->getImage()),"tf.png");
-            osg::notify(osg::NOTICE)<<"imageLayer->getTexelOffset()[3]="<<imageLayer->getTexelOffset()[3]<<std::endl;
-            osg::notify(osg::NOTICE)<<"imageLayer->getTexelScale()[3]="<<imageLayer->getTexelScale()[3]<<std::endl;
-            osg::notify(osg::NOTICE)<<"tfOffset="<<tfOffset<<std::endl;
-            osg::notify(osg::NOTICE)<<"tfScale="<<tfScale<<std::endl;
-            osg::notify(osg::NOTICE)<<"tf->getMinimum()="<<tf->getMinimum()<<std::endl;
-            osg::notify(osg::NOTICE)<<"tf->getMaximum()="<<tf->getMaximum()<<std::endl;
+            OSG_NOTICE<<"imageLayer->getTexelOffset()[3]="<<imageLayer->getTexelOffset()[3]<<std::endl;
+            OSG_NOTICE<<"imageLayer->getTexelScale()[3]="<<imageLayer->getTexelScale()[3]<<std::endl;
+            OSG_NOTICE<<"tfOffset="<<tfOffset<<std::endl;
+            OSG_NOTICE<<"tfScale="<<tfScale<<std::endl;
+            OSG_NOTICE<<"tf->getMinimum()="<<tf->getMinimum()<<std::endl;
+            OSG_NOTICE<<"tf->getMaximum()="<<tf->getMaximum()<<std::endl;
 #endif
 
@@ -350 +350 @@
                 if (fragmentShader)
                 {
-                    osg::notify(osg::INFO)<<"Shader found"<<std::endl;
+                    OSG_INFO<<"Shader found"<<std::endl;
                 
                     program->addShader(fragmentShader);
@@ -356 +356 @@
                 else
                 {
-                    osg::notify(osg::INFO)<<"No Shader found"<<std::endl;
+                    OSG_INFO<<"No Shader found"<<std::endl;
 
                     #include "Shaders/volume_iso_frag.cpp"
@@ -539 +539 @@
 void RayTracedTechnique::update(osgUtil::UpdateVisitor* uv)
 {
-//    osg::notify(osg::NOTICE)<<"RayTracedTechnique:update(osgUtil::UpdateVisitor* nv):"<<std::endl;
+//    OSG_NOTICE<<"RayTracedTechnique:update(osgUtil::UpdateVisitor* nv):"<<std::endl;
 }
 
 void RayTracedTechnique::cull(osgUtil::CullVisitor* cv)
 {
-    //osg::notify(osg::NOTICE)<<"RayTracedTechnique::cull(osgUtil::CullVisitor* nv)"<<std::endl;    
+    //OSG_NOTICE<<"RayTracedTechnique::cull(osgUtil::CullVisitor* nv)"<<std::endl;    
     if (_transform.valid())
     {
@@ -553 +553 @@
 void RayTracedTechnique::cleanSceneGraph()
 {
-    osg::notify(osg::NOTICE)<<"RayTracedTechnique::cleanSceneGraph()"<<std::endl;
+    OSG_NOTICE<<"RayTracedTechnique::cleanSceneGraph()"<<std::endl;
 }
 
 void RayTracedTechnique::traverse(osg::NodeVisitor& nv)
 {
-    // osg::notify(osg::NOTICE)<<"RayTracedTechnique::traverse(osg::NodeVisitor& nv)"<<std::endl;
+    // OSG_NOTICE<<"RayTracedTechnique::traverse(osg::NodeVisitor& nv)"<<std::endl;
     if (!_volumeTile) return;
 
@@ -587 +587 @@
     if (_volumeTile->getDirty()) 
     {
-        osg::notify(osg::INFO)<<"******* Doing init ***********"<<std::endl;
+        OSG_INFO<<"******* Doing init ***********"<<std::endl;
         _volumeTile->init();
     }

OpenSceneGraph/trunk/src/osgVolume/Volume.cpp

@@ -95 +95 @@
     if (_volumeTileSet.size() > s_maxNumVolumeTiles) s_maxNumVolumeTiles = _volumeTileSet.size();
 
-    // osg::notify(osg::NOTICE)<<"Volume::registerVolumeTile "<<volumeTile<<" total number of VolumeTile "<<_volumeTileSet.size()<<" max = "<<s_maxNumVolumeTiles<<std::endl;
+    // OSG_NOTICE<<"Volume::registerVolumeTile "<<volumeTile<<" total number of VolumeTile "<<_volumeTileSet.size()<<" max = "<<s_maxNumVolumeTiles<<std::endl;
 }
 
@@ -111 +111 @@
     _volumeTileSet.erase(volumeTile);
 
-    // osg::notify(osg::NOTICE)<<"Volume::unregisterVolumeTile "<<volumeTile<<" total number of VolumeTile "<<_volumeTileSet.size()<<" max = "<<s_maxNumVolumeTiles<<std::endl;
+    // OSG_NOTICE<<"Volume::unregisterVolumeTile "<<volumeTile<<" total number of VolumeTile "<<_volumeTileSet.size()<<" max = "<<s_maxNumVolumeTiles<<std::endl;
 }

OpenSceneGraph/trunk/src/osgVolume/VolumeTechnique.cpp

@@ -35 +35 @@
 void VolumeTechnique::init()
 {
-    osg::notify(osg::NOTICE)<<className()<<"::initialize(..) not implementated yet"<<std::endl;
+    OSG_NOTICE<<className()<<"::initialize(..) not implementated yet"<<std::endl;
 }
 
 void VolumeTechnique::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 (_volumeTile) _volumeTile->osg::Group::traverse(*uv);
 }
@@ -46 +46 @@
 void VolumeTechnique::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 (_volumeTile) _volumeTile->osg::Group::traverse(*cv);
 }
@@ -52 +52 @@
 void VolumeTechnique::cleanSceneGraph()
 {
-    osg::notify(osg::NOTICE)<<className()<<"::cleanSceneGraph(..) not implementated yet"<<std::endl;
+    OSG_NOTICE<<className()<<"::cleanSceneGraph(..) not implementated yet"<<std::endl;
 }
 

OpenSceneGraph/trunk/src/osgVolume/VolumeTile.cpp

@@ -113 +113 @@
                     if (volume) 
                     {
-                        osg::notify(osg::INFO)<<"Assigning volume system "<<volume<<std::endl;                        
+                        OSG_INFO<<"Assigning volume system "<<volume<<std::endl;                        
                         setVolume(volume);
                     }