Improvements to dot visitors

src/osgPlugins/dot/BaseDotVisitor.cpp

@@ -24,8 +24,11 @@ using namespace osg;
 
 namespace osgDot {
 
-  BaseDotVisitor::BaseDotVisitor()
+BaseDotVisitor::BaseDotVisitor():
-  {
+    osg::NodeVisitor(osg::NodeVisitor::TRAVERSE_ALL_CHILDREN)
+{
+    // setNodeMaskOverride(0xffffff);
+
     _rankdir = "rankdir = LR;";
     // Set the locale used by the _nodes and _edges streams to the
     //   classic or "C" locale. This is needed because most of the
@@ -33,13 +36,14 @@ namespace osgDot {
     //   by id numbers containing commas or periods.
     _nodes.imbue(std::locale("C"));
     _edges.imbue(std::locale("C"));
-  }
+}
 
-  BaseDotVisitor::~BaseDotVisitor() {
+BaseDotVisitor::~BaseDotVisitor()
-  }
+{
+}
 
-    void BaseDotVisitor::setOptions(const osgDB::Options* options)
+void BaseDotVisitor::setOptions(const osgDB::Options* options)
-    {
+{
     _options = const_cast<osgDB::Options*>(options);
     OSG_INFO<<"BaseDotVisitor::setOptions("<<options<<")"<<std::endl;
     if (_options.valid() && !(_options->getOptionString().empty()))
@@ -61,15 +65,19 @@ namespace osgDot {
         }
     }
 
-    }
+}
 
-    bool BaseDotVisitor::run( osg::Node& root, std::ostream* fout ) {
+bool BaseDotVisitor::run( osg::Node& root, std::ostream* fout )
-    setTraversalMode( TRAVERSE_ALL_CHILDREN );
+{
-    if ( fout && *fout ) {
+
+    if ( fout && *fout )
+    {
         root.accept( *this );
 
         *fout << "digraph osg_scenegraph { "<<_rankdir<< std::endl;
 
+        *fout << "bgcolor=transparent;"<<std::endl;
+
         *fout << _nodes.str() << _edges.str();
 
         *fout << "}" << std::endl;
@@ -82,100 +90,84 @@ namespace osgDot {
     }
 
     return false;
-  }
+}
 
-  void BaseDotVisitor::apply(Node& node) {
+void BaseDotVisitor::apply(Node& node)
+{
     int id;
-    if ( getOrCreateId( &node, id ) ) {
+    if ( getOrCreateId( &node, id ) )
+    {
         handle( node, id );
         handleNodeAndTraverse( node, id );
     }
-  }
+}
 
-  void BaseDotVisitor::apply(Geode& node) {
+void BaseDotVisitor::apply(Drawable& drawable)
+{
     int id;
-    if ( getOrCreateId( &node, id ) ) {
+    if ( getOrCreateId( &drawable, id ) )
+    {
+        handle( drawable, id );
+        handleNodeAndTraverse( drawable, id );
+    }
+}
+
+void BaseDotVisitor::apply(Group& node)
+{
+    int id;
+
+    if ( getOrCreateId( &node, id ) )
+    {
         handle( node, id );
         handleNodeAndTraverse( node, id );
 
         unsigned int i;
-      for ( i = 0; i < node.getNumDrawables(); i++ ) {
+        for ( i = 0; i < node.getNumChildren(); i++ )
-        osg::Drawable* drawable = node.getDrawable( i );
+        {
-        int id2;
-        if ( getOrCreateId( drawable, id2 ) ) {
-          handle( *drawable, id2 );
-          osg::StateSet* s = drawable->getStateSet();
-          if ( s ) {
-            int id3;
-            if ( getOrCreateId( s, id3 ) ) {
-              handle( *s, id3 );
-            }
-            handle( *drawable, *s, id2, id3 );
-          }
-        }
-        handle( node, *drawable, id, id2 );
-      }
-
-    }
-
-  }
-
-  void BaseDotVisitor::apply(Group& node) {
-    int id;
-
-    if ( getOrCreateId( &node, id ) ) {
-      handle( node, id );
-      handleNodeAndTraverse( node, id );
-
-      unsigned int i;
-      for ( i = 0; i < node.getNumChildren(); i++ ) {
             osg::Node* child = node.getChild( i );
             //handleNodeAndTraverse( *child );
             int id2;
-        if (getOrCreateId( child, id2 ))
+            getOrCreateId( child, id2 );
-        {
             handle( node, *child, id, id2 );
         }
-      }
 
     }
+}
 
-  }
+void BaseDotVisitor::handle(osg::Node&, int) {}
 
-  void BaseDotVisitor::handle(osg::Node&, int) {}
+void BaseDotVisitor::handle(osg::Group&, int) {}
 
-  void BaseDotVisitor::handle(osg::Geode&, int) {}
+void BaseDotVisitor::handle(osg::Group&, osg::Node&, int, int) {}
 
-  void BaseDotVisitor::handle(osg::Group&, int) {}
+void BaseDotVisitor::handleNodeAndTraverse(osg::Node& node, int id)
-
+{
-  void BaseDotVisitor::handle(osg::Group&, osg::Node&, int, int) {}
-
-  void BaseDotVisitor::handleNodeAndTraverse(osg::Node& node, int id) {
     osg::StateSet* ss = node.getStateSet();
-    if ( ss ) {
+    if ( ss )
+    {
         int id2;
-      if ( getOrCreateId( ss, id2 ) ) {
+        if ( getOrCreateId( ss, id2 ) )
+        {
             handle( *ss, id2 );
         }
         handle( node, *ss, id, id2 );
     }
     traverse(node);
-  }
+}
 
-  void BaseDotVisitor::handle(osg::StateSet&, int) {}
+void BaseDotVisitor::handle(osg::StateSet&, int) {}
 
-  void BaseDotVisitor::handle(osg::Node&, osg::StateSet&, int, int) {}
+void BaseDotVisitor::handle(osg::Node&, osg::StateSet&, int, int) {}
 
-  void BaseDotVisitor::handle(osg::Drawable&, int) {}
+void BaseDotVisitor::handle(osg::Drawable&, int) {}
 
-  void BaseDotVisitor::handle(osg::Drawable&, osg::StateSet&, int, int) {}
+void BaseDotVisitor::handle(osg::Drawable&, osg::StateSet&, int, int) {}
 
-  void BaseDotVisitor::handle(osg::Geode&, osg::Drawable&, int, int) {}
+bool BaseDotVisitor::getOrCreateId( osg::Object* object, int &id )
-
+{
-  bool BaseDotVisitor::getOrCreateId( osg::Object* object, int &id ) {
-    assert( object );
     ObjectMap::iterator it = _objectMap.find( object );
-    if ( it != _objectMap.end() ) {
+    if ( it != _objectMap.end() )
+    {
         id = it->second;
         return false;
     }
@@ -183,6 +175,6 @@ namespace osgDot {
     id = _objectMap.size();
     _objectMap[ object ] = id;
     return true;
-  }
+}
 
 } // namespace osgDot

src/osgPlugins/dot/BaseDotVisitor.h

@@ -30,7 +30,8 @@
 
 namespace osgDot {
 
-  class BaseDotVisitor : public osg::NodeVisitor {
+class BaseDotVisitor : public osg::NodeVisitor
+{
     public:
         typedef std::map< osg::Object*, int > ObjectMap;
 
@@ -45,25 +46,22 @@ namespace osgDot {
 
         virtual void apply(osg::Node& node);
 
-    virtual void apply(osg::Geode& node);
+        virtual void apply(osg::Drawable& node);
 
         virtual void apply(osg::Group& node);
 
-
     protected:
 
         void handleNodeAndTraverse(osg::Node& node, int id);
 
-    virtual void handle(osg::Node& node, int id);
-    virtual void handle(osg::Geode& node, int id);
-    virtual void handle(osg::Group& node, int id);
         virtual void handle(osg::StateSet& stateset, int id);
         virtual void handle(osg::Drawable& drawable, int id);
+        virtual void handle(osg::Node& node, int id);
+        virtual void handle(osg::Group& node, int id);
 
         virtual void handle(osg::Node& node, osg::StateSet& stateset, int parentID, int childID);
-    virtual void handle(osg::Group& parent, osg::Node& child, int parentID, int childID);
-    virtual void handle(osg::Geode& geode, osg::Drawable& drawable, int parentID, int childID);
         virtual void handle(osg::Drawable& drawable, osg::StateSet& stateset, int parentID, int childID );
+        virtual void handle(osg::Group& parent, osg::Node& child, int parentID, int childID);
 
         osg::ref_ptr<osgDB::Options> _options;
 
@@ -77,7 +75,7 @@ namespace osgDot {
 
         ObjectMap _objectMap;
 
-  };
+};
 
 } // namespace osgDot
 

src/osgPlugins/dot/SimpleDotVisitor.cpp

@@ -15,64 +15,64 @@
 
 namespace osgDot {
 
-  SimpleDotVisitor::SimpleDotVisitor() {
+SimpleDotVisitor::SimpleDotVisitor()
-  }
+{
+}
 
-  SimpleDotVisitor::~SimpleDotVisitor() {
+SimpleDotVisitor::~SimpleDotVisitor()
-  }
+{
+}
 
-  void SimpleDotVisitor::handle(osg::Node& node, int id) {
-    std::stringstream label;
-    label << "<top> Node";
-    if ( !node.getName().empty() ) { label << "| " << node.getName(); }
-    drawNode( id, "record", "solid", label.str(), "black", "white" );
-  }
 
-  void SimpleDotVisitor::handle(osg::Geode& node, int id) {
+void SimpleDotVisitor::handle(osg::StateSet& stateset, int id)
-    std::stringstream label;
+{
-    label << "<top> " << node.className();
-    if ( !node.getName().empty() ) { label << "| " << node.getName(); }
-    drawNode( id, "record", "solid", label.str(), "brown", "white" );
-  }
-
-  void SimpleDotVisitor::handle(osg::Group& node, int id) {
-    std::stringstream label;
-    label << "<top> " << node.className();
-    if ( !node.getName().empty() ) { label << "| " << node.getName(); }
-    drawNode( id, "record", "solid", label.str(), "black", "white" );
-  }
-
-  void SimpleDotVisitor::handle(osg::Group&, osg::Node&, int parentID, int childID ) {
-    drawEdge( parentID, childID, "setlinewidth(2)" );
-  }
-
-  void SimpleDotVisitor::handle(osg::StateSet& stateset, int id) {
     std::stringstream label;
     label << "<top> " << stateset.className();
-    if ( !stateset.getName().empty() ) { label << "| " << stateset.getName(); }
+    if ( !stateset.getName().empty() ) { label << " | " << stateset.getName(); }
-    drawNode( id, "Mrecord", "solid", label.str(), "green", "white" );
+    drawNode( id, "Mrecord", "solid, filled", label.str(), "green", "black" );
-  }
+}
 
-  void SimpleDotVisitor::handle(osg::Node&, osg::StateSet&, int parentID, int childID ) {
+void SimpleDotVisitor::handle(osg::Drawable& drawable, int id)
-    drawEdge( parentID, childID, "dashed" );
+{
-  }
-
-  void SimpleDotVisitor::handle(osg::Drawable& drawable, int id) {
     std::stringstream label;
     label << "<top> " << drawable.className();
-    if ( !drawable.getName().empty() ) { label << "| " << drawable.getName(); }
+    if ( !drawable.getName().empty() ) { label << " | " << drawable.getName(); }
-    drawNode( id, "record", "solid", label.str(), "blue", "white" );
+    drawNode( id, "record", "solid, filled", label.str(), "lightblue", "black" );
-  }
+}
 
-  void SimpleDotVisitor::handle(osg::Geode&, osg::Drawable&, int parentID, int childID ) {
+void SimpleDotVisitor::handle(osg::Node& node, int id)
-    drawEdge( parentID, childID, "dashed" );
+{
-  }
+    std::stringstream label;
+    label << "<top> "<<node.className();
+    if ( !node.getName().empty() ) { label << " | " << node.getName(); }
+    drawNode( id, "record", "solid", label.str(), "black", "white" );
+}
 
-  void SimpleDotVisitor::handle(osg::Drawable&, osg::StateSet&, int parentID, int childID ) {
+void SimpleDotVisitor::handle(osg::Group& node, int id)
-    drawEdge( parentID, childID, "dashed" );
+{
-  }
+    std::stringstream label;
+    label << "<top> " << node.className();
+    if ( !node.getName().empty() ) { label << " | " << node.getName(); }
+    drawNode( id, "record", "solid, filled", label.str(), "yellow", "black" );
+}
 
-  void SimpleDotVisitor::drawNode( int id, const std::string& shape, const std::string& style, const std::string& label, const std::string& color, const std::string& fillColor ) {
+void SimpleDotVisitor::handle(osg::Node&, osg::StateSet&, int parentID, int childID )
+{
+    drawEdge( parentID, childID, "" );
+}
+
+void SimpleDotVisitor::handle(osg::Drawable&, osg::StateSet&, int parentID, int childID )
+{
+    drawEdge( parentID, childID, "" );
+}
+
+void SimpleDotVisitor::handle(osg::Group&, osg::Node&, int parentID, int childID )
+{
+    drawEdge( parentID, childID, "" );
+}
+
+void SimpleDotVisitor::drawNode( int id, const std::string& shape, const std::string& style, const std::string& label, const std::string& color, const std::string& fillColor )
+{
     _nodes << id <<
         "[shape=\"" << shape <<
         "\" ,label=\"" << label <<
@@ -80,14 +80,15 @@ namespace osgDot {
         "\" ,color=\"" << color <<
         "\" ,fillColor=\"" << fillColor <<
         "\"]" << std::endl;
-  }
+}
 
-  void SimpleDotVisitor::drawEdge( int sourceId, int sinkId, const std::string& style ) {
+void SimpleDotVisitor::drawEdge( int sourceId, int sinkId, const std::string& style )
+{
     _edges
         << sourceId << ":top -> "
         << sinkId   << ":top [style=\""
         << style    << "\"];"
         << std::endl;
-  }
+}
 
 } // namespace osgDot

src/osgPlugins/dot/SimpleDotVisitor.h

@@ -23,30 +23,29 @@
 
 namespace osgDot {
 
-  class SimpleDotVisitor : public BaseDotVisitor {
+class SimpleDotVisitor : public BaseDotVisitor
+{
     public:
         SimpleDotVisitor();
 
         virtual ~SimpleDotVisitor();
 
     protected:
-    virtual void handle(osg::Node& node, int id);
-    virtual void handle(osg::Geode& geode, int id);
-    virtual void handle(osg::Group& node, int id);
 
         virtual void handle(osg::StateSet& stateset, int id);
         virtual void handle(osg::Drawable& drawable, int id);
+        virtual void handle(osg::Node& node, int id);
+        virtual void handle(osg::Group& node, int id);
 
         virtual void handle(osg::Node& node, osg::StateSet& stateset, int parentID, int childID );
-    virtual void handle(osg::Geode& geometry, osg::Drawable& drawable, int parentID, int childID );
-    virtual void handle(osg::Group& parent, osg::Node& child, int parentID, int childID );
         virtual void handle(osg::Drawable& drawable, osg::StateSet& stateset, int parentID, int childID );
+        virtual void handle(osg::Group& parent, osg::Node& child, int parentID, int childID );
 
         virtual void drawNode( int id, const std::string& shape, const std::string& style, const std::string& label, const std::string& color, const std::string& fillColor );
 
         virtual void drawEdge( int sourceId, int sinkId, const std::string& style );
 
-  };
+};
 
 } // namespace osgDot