Changeset 11486 for OpenSceneGraph/trunk/src/osgPresentation/PickEventHandler.cpp

Timestamp:

05/28/10 18:08:15 (3 years ago)

Author:

robert

Message:

Converted osg::notify to OSG_INFO etc.

Files:

• OpenSceneGraph/trunk/src/osgPresentation/PickEventHandler.cpp (modified) (9 diffs)

OpenSceneGraph/trunk/src/osgPresentation/PickEventHandler.cpp

@@ -67 +67 @@
                     if (ea.getEventType()==osgGA::GUIEventAdapter::MOVE)
                     {
-                        osg::notify(osg::INFO)<<"Tooltip..."<<std::endl;
+                        OSG_INFO<<"Tooltip..."<<std::endl;
                     }
                     else if (ea.getEventType()==osgGA::GUIEventAdapter::RELEASE)
@@ -80 +80 @@
         case(osgGA::GUIEventAdapter::KEYDOWN):
         {
-            //osg::notify(osg::NOTICE)<<"PickEventHandler KEYDOWN "<<(char)ea.getKey()<<std::endl;
-            //if (object) osg::notify(osg::NOTICE)<<"    "<<object->className()<<std::endl;
+            //OSG_NOTICE<<"PickEventHandler KEYDOWN "<<(char)ea.getKey()<<std::endl;
+            //if (object) OSG_NOTICE<<"    "<<object->className()<<std::endl;
             break;
         }
@@ -121 +121 @@
         case(osgPresentation::RUN):
         {
-            osg::notify(osg::NOTICE)<<"Run "<<_command<<std::endl;
+            OSG_NOTICE<<"Run "<<_command<<std::endl;
 
 #if 0
@@ -164 +164 @@
             int result = system(_command.c_str());
 
-            osg::notify(osg::INFO)<<"system("<<_command<<") result "<<result<<std::endl;
+            OSG_INFO<<"system("<<_command<<") result "<<result<<std::endl;
 
             break;
@@ -170 +170 @@
         case(osgPresentation::LOAD):
         {
-            osg::notify(osg::NOTICE)<<"Load "<<_command<<std::endl;
+            OSG_NOTICE<<"Load "<<_command<<std::endl;
             break;
         }
         case(osgPresentation::EVENT):
         {
-            osg::notify(osg::INFO)<<"Event "<<_keyPos._key<<" "<<_keyPos._x<<" "<<_keyPos._y<<std::endl;
+            OSG_INFO<<"Event "<<_keyPos._key<<" "<<_keyPos._x<<" "<<_keyPos._y<<std::endl;
             if (SlideEventHandler::instance()) SlideEventHandler::instance()->dispatchEvent(_keyPos);
             break;
@@ -181 +181 @@
         case(osgPresentation::JUMP):
         {
-            osg::notify(osg::NOTICE)<<"Requires jump "<<std::endl;
+            OSG_NOTICE<<"Requires jump "<<std::endl;
             break;
         }
@@ -188 +188 @@
     if (requiresJump())
     {
-        osg::notify(osg::NOTICE)<<"Requires jump "<<_relativeJump<<", "<<_slideNum<<", "<<_layerNum<<std::endl;
+        OSG_NOTICE<<"Requires jump "<<_relativeJump<<", "<<_slideNum<<", "<<_layerNum<<std::endl;
 
         if (_relativeJump)
@@ -201 +201 @@
             }
 
-            osg::notify(osg::NOTICE)<<"   jump to "<<newSlide<<", "<<newLayer<<std::endl;
+            OSG_NOTICE<<"   jump to "<<newSlide<<", "<<newLayer<<std::endl;
 
             SlideEventHandler::instance()->selectSlide(newSlide, newLayer);
@@ -212 +212 @@
     else
     {
-        osg::notify(osg::NOTICE)<<"No jump required."<<std::endl;
-    }
-}
-
+        OSG_NOTICE<<"No jump required."<<std::endl;
+    }
+}
+