Changeset 9565 for OpenSceneGraph/trunk/src/osgViewer/StatsHandler.cpp

Timestamp:

01/28/09 10:31:43 (4 years ago)

Author:

robert

Message:

From Paul Melis, "Here is an updated osgViewer::StatsHandler?. It has the following changes:
- The text and dark background rectangles are now correctly placed, and
slightly resized here and there.
- All counters (vertices, etc) now use a fixed formatting with 0 digits
precision, to prevent the text from being shown in scientific notation
when the number get large (e.g. 6.34344e+6). I tested with a scene
containing roughly 4 million vertices, to make sure its stats would
display correctly.

I also made slight changes to osgcompositeviewer (attached) to aid in
testing the stats display, specifically displaying of camera and view
names."

Files:

• OpenSceneGraph/trunk/src/osgViewer/StatsHandler.cpp (modified) (15 diffs)

OpenSceneGraph/trunk/src/osgViewer/StatsHandler.cpp

@@ -367 +367 @@
                 viewStr.setf(std::ios::left, std::ios::adjustfield);
                 viewStr.width(14);
-
-                viewStr << std::setw(1) << _cameraNumber  << ": ";
+                // Used fixed formatting, as scientific will switch to "...e+.." notation for
+                // large numbers of vertices/drawables/etc.
+                viewStr.setf(std::ios::fixed);
+                viewStr.precision(0);
+
+                viewStr << std::setw(1) << "#" << _cameraNumber << std::endl;
 
                 // Camera name
-                if (_camera->getName().empty())
-                    viewStr << std::endl;
-                else
-                    viewStr << _camera->getName() << std::endl;
-                    
+                if (!_camera->getName().empty())
+                    viewStr << _camera->getName();
+                viewStr << std::endl;
+
                 int frameNumber = renderInfo.getState()->getFrameStamp()->getFrameNumber();
                 if (!(renderer->getGraphicsThreadDoesCull()))
@@ -381 +384 @@
                     --frameNumber;
                 }
-                
+
                 #define STATS_ATTRIBUTE(str) \
                     if (stats->getAttribute(frameNumber, str, value)) \
-                        viewStr << std::setw(7) << value << std::endl; \
+                        viewStr << std::setw(8) << value << std::endl; \
                     else \
-                        viewStr << std::setw(7) << "." << std::endl; \
+                        viewStr << std::setw(8) << "." << std::endl; \
 
                 double value = 0.0;
@@ -448 +451 @@
                 std::ostringstream viewStr;
                 viewStr.clear();
-                viewStr.setf(std::ios::left,std::ios::adjustfield);
+                viewStr.setf(std::ios::left, std::ios::adjustfield);
                 viewStr.width(20);
-                
-                viewStr << std::setw(1) << _viewNumber  << ": ";
+                viewStr.setf(std::ios::fixed);
+                viewStr.precision(0);
+
+                viewStr << std::setw(1) << "#" << _viewNumber;
+
                 // View name
-                if (_view->getName().empty())
-                    viewStr << std::endl;
-                else
-                    viewStr << _view->getName() << std::endl;
-
+                if (!_view->getName().empty())
+                    viewStr << ": " << _view->getName();
                 viewStr << std::endl;
 
@@ -477 +480 @@
 
                 double value = 0.0;
+
+                // header
+                viewStr << std::setw(10) << "Unique" << std::setw(10) << "Instanced" << std::endl;
 
                 STATS_ATTRIBUTE_PAIR("Number of unique StateSet","Number of instanced Stateset")
@@ -1088 +1094 @@
         float topOfViewerStats = pos.y() + characterSize;
 
-        geode->addDrawable(createBackgroundRectangle(    pos + osg::Vec3(-backgroundMargin, characterSize + backgroundMargin, 0), 
-                                                        _camera->getViewport()->width() - 2 * backgroundMargin, 
+        geode->addDrawable(createBackgroundRectangle(    pos + osg::Vec3(-backgroundMargin, characterSize + backgroundMargin, 0),
+                                                        _camera->getViewport()->width() - 2 * backgroundMargin,
                                                         (3 + 4.5 * cameras.size()) * characterSize + 2 * backgroundMargin,
                                                       backgroundColor) );
@@ -1235 +1241 @@
                 pos.y() -= (characterSize + backgroundSpacing);
 
-                geode->addDrawable(createBackgroundRectangle(    pos + osg::Vec3(-backgroundMargin, characterSize + backgroundMargin, 0), 
-                                                                _camera->getViewport()->width() - 2 * backgroundMargin, 
+                geode->addDrawable(createBackgroundRectangle(    pos + osg::Vec3(-backgroundMargin, characterSize + backgroundMargin, 0),
+                                                                _camera->getViewport()->width() - 2 * backgroundMargin,
                                                                 characterSize + 2 * backgroundMargin,
                                                                 backgroundColor));
@@ -1369 +1375 @@
         geode->setCullingActive(false);
         group->addChild(geode);
-        geode->addDrawable(createBackgroundRectangle(    pos + osg::Vec3(-backgroundMargin, characterSize + backgroundMargin, 0), 
-                                                        7 * characterSize + 2 * backgroundMargin, 
-                                                        18 * characterSize + 2 * backgroundMargin,
+        geode->addDrawable(createBackgroundRectangle(pos + osg::Vec3(-backgroundMargin, characterSize + backgroundMargin, 0),
+                                                        7 * characterSize + 2 * backgroundMargin,
+                                                        19 * characterSize + 2 * backgroundMargin,
                                                         backgroundColor));
 
         // Camera scene & primitive stats static text
         osg::ref_ptr<osgText::Text> camStaticText = new osgText::Text;
-        geode->addDrawable( camStaticText.get() );  
+        geode->addDrawable( camStaticText.get() );
         camStaticText->setColor(staticTextColor);
         camStaticText->setFont(font);
@@ -1384 +1390 @@
         std::ostringstream viewStr;
         viewStr.clear();
-        viewStr.setf(std::ios::left,std::ios::adjustfield);
+        viewStr.setf(std::ios::left, std::ios::adjustfield);
         viewStr.width(14);
         viewStr << "Camera" << std::endl;
+        viewStr << "" << std::endl; // placeholder for Camera name
         viewStr << "Vertices" << std::endl;
         viewStr << "Drawables" << std::endl;
@@ -1408 +1415 @@
 
         // Move camera block to the right
-        pos.x() += 7 * characterSize + 2 * backgroundMargin + backgroundSpacing; 
-
-        // add camera scene stats
+        pos.x() += 7 * characterSize + 2 * backgroundMargin + backgroundSpacing;
+
+        // Add camera scene stats, one block per camera
         int cameraCounter = 0;
         for(ViewerBase::Cameras::iterator citr = cameras.begin(); citr != cameras.end(); ++citr)
         {
-            geode->addDrawable(createBackgroundRectangle(    pos + osg::Vec3(-backgroundMargin, characterSize + backgroundMargin, 0), 
-                                                            5 * characterSize + 2 * backgroundMargin, 
-                                                            18 * characterSize + 2 * backgroundMargin,
+            geode->addDrawable(createBackgroundRectangle(pos + osg::Vec3(-backgroundMargin, characterSize + backgroundMargin, 0),
+                                                            5 * characterSize + 2 * backgroundMargin,
+                                                            19 * characterSize + 2 * backgroundMargin,
                                                             backgroundColor));
 
@@ -1431 +1438 @@
 
             // Move camera block to the right
-            pos.x() +=  5 * characterSize + 2 * backgroundMargin + backgroundSpacing; 
+            pos.x() +=  5 * characterSize + 2 * backgroundMargin + backgroundSpacing;
             cameraCounter++;
         }
@@ -1446 +1453 @@
         group->addChild(geode);
 
-        geode->addDrawable(createBackgroundRectangle(    pos + osg::Vec3(-backgroundMargin, characterSize + backgroundMargin, 0), 
-                                                        5 * characterSize + 2 * backgroundMargin, 
+        geode->addDrawable(createBackgroundRectangle(pos + osg::Vec3(-backgroundMargin, characterSize + backgroundMargin, 0),
+                                                        6 * characterSize + 2 * backgroundMargin,
                                                         12 * characterSize + 2 * backgroundMargin,
                                                         backgroundColor));
@@ -1461 +1468 @@
         std::ostringstream viewStr;
         viewStr.clear();
-        viewStr.setf(std::ios::left,std::ios::adjustfield);
+        viewStr.setf(std::ios::left, std::ios::adjustfield);
         viewStr.width(14);
         viewStr << "View" << std::endl;
-        viewStr << std::endl;
+        viewStr << " " << std::endl;
         viewStr << "Stateset" << std::endl;
         viewStr << "Group" << std::endl;
@@ -1475 +1482 @@
         viewStr << "Vertices" << std::endl;
         viewStr << "Primitives" << std::endl;
-        viewStr.setf(std::ios::right,std::ios::adjustfield);
+        viewStr.setf(std::ios::right, std::ios::adjustfield);
         camStaticText->setText(viewStr.str());
 
-        // Move camera block to the right
-        pos.x() += 5 * characterSize + 2 * backgroundMargin + backgroundSpacing; 
+        // Move viewer block to the right
+        pos.x() += 6 * characterSize + 2 * backgroundMargin + backgroundSpacing;
 
         std::vector<osgViewer::View*> views;
@@ -1488 +1495 @@
         for (it = views.begin(); it != views.end(); ++it)
         {
-            geode->addDrawable(createBackgroundRectangle(    pos + osg::Vec3(-backgroundMargin, characterSize + backgroundMargin, 0), 
-                                                            6 * characterSize + 2 * backgroundMargin, 
+            geode->addDrawable(createBackgroundRectangle(pos + osg::Vec3(-backgroundMargin, characterSize + backgroundMargin, 0),
+                                                            11 * characterSize + 2 * backgroundMargin,
                                                             12 * characterSize + 2 * backgroundMargin,
                                                             backgroundColor));
@@ -1503 +1510 @@
             text->setDrawCallback(new ViewSceneStatsTextDrawCallback(*it, viewCounter));
 
-            pos.x() += 6 * characterSize + 2 * backgroundMargin + backgroundSpacing; 
+            pos.x() += 11 * characterSize + 2 * backgroundMargin + backgroundSpacing;
             viewCounter++;
         }