Changeset 156

Timestamp:

Nov 12, 2010, 9:13:14 AM (14 years ago)

Author:

Torben Dannhauer

Message:

 

Location:

osgVisual

Files:

• bin/osgVisualConfig.xml (modified) (1 diff)
• include/vista2D/visual_vista2D.h (modified) (3 diffs)
• src/core/visual_core.cpp (modified) (1 diff)
• src/vista2D/visual_vista2D.cpp (modified) (6 diffs)

osgVisual/bin/osgVisualConfig.xml

@@ -18 +18 @@
   <module name="sky_silverlining" enabled="yes"></module>
   <module name="vista2d" enabled="yes">
-    <vista2d filename="D:\osgVisual\osgVisual\bin\hud.v" paintBackground="no" position_x="800" position_y="450" zoom="0.5"></vista2d>
+    <vista2d filename="D:\osgVisual\osgVisual\bin\altimeterSimple.v" paintBackground="no" position_x="1" position_y="1" zoom="1.0" playanimation="yes"></vista2d>
   </module>
   <module name="dataio" enabled="yes">

osgVisual/include/vista2D/visual_vista2D.h

@@ -82 +82 @@
          * @return : True if successful.
          */ 
-        static bool init( osg::CoordinateSystemNode *sceneGraphRoot_, std::string configFileName );
+        bool init( osg::CoordinateSystemNode *sceneGraphRoot_, std::string configFileName );
 
         /**
@@ -101 +101 @@
 private:
 
-        static bool processXMLConfiguration(std::string& configFileName, std::string& vistaProjectfile, bool& paintBackground, int& position_x, int& position_y, float& zoom);
+        bool processXMLConfiguration();
 
         /**
          * \brief This function initialized the visual_vista2D object after instantiation by createVistaOverlay()
          */ 
-        void startVista2D(std::string vistaProjectfile, bool paintBackground, int posX, int posY, float zoom);
+        void startVista2D();
 
         /**
          * \brief This function implements the pure OpenGL draw by calling Vista2D's draw funtion.
          * 
-         * Because Visrta2D manipulates OpenGLs stateset, this function saves the
+         * Because Vista2D manipulates OpenGLs stateset, this function saves the
          * OSG statset at the beginning and restores it after the drawing of Vista2D 
          * 
@@ -123 +123 @@
         Vista2D::VistaView* view;
 
-        ///**
-        // * XML config filename
-        // */ 
-        //std::string configFileName;
+        /**
+         * XML config filename
+         */ 
+        std::string configFileName;
 
-        ///**
-        // * Filename of the Vista2D project file.
-        // */
-        //std::string filename;
+        /**
+         * Filename of the Vista2D project file.
+         */
+        std::string vistaProjectfile;
 
-        ///**
-        // * Should the background of the Vista2D project be painted?
-        // */
-        //bool paintBackground;
+        /**
+         * Should the background of the Vista2D project be painted?
+         */
+        bool paintBackground;
 
-        ///**
-        // * X-Position to draw.
-        // */
-        //int position_x;
+        /**
+         * X-Position to draw.
+         */
+        int position_x;
 
-        ///**
-        // * Y-Position to draw.
-        // */
-        //int position_y;
+        /**
+         * Y-Position to draw.
+         */
+        int position_y;
 
-        ///**
-        // * Zoom factor to draw the project.
-        // */
-        //double zoom;
+        /**
+         * Zoom factor to draw the project.
+         */
+        double zoom;
+
+        /**
+         * Flag if Vista2D should animate the project according to it's data sources.
+         */ 
+        bool playanimation;
 }; 
 

osgVisual/src/core/visual_core.cpp

@@ -513 +513 @@
         visual_dataIO::getInstance()->setSlotData("TestSlot1", osgVisual::dataIO_slot::TO_OBJ, 0.12345);
 
-
-        // Vista2D Test: 
-        visual_vista2D::init(rootNode, configFilename );
-}
+}

osgVisual/src/vista2D/visual_vista2D.cpp

@@ -26 +26 @@
    // Create a Vista2D View
    view = new Vista2D::VistaView();
+
+        vistaProjectfile = "";
+        paintBackground = false;
+        playanimation = false;
+        position_x = 0;
+        position_y = 0;
+        zoom = 1;
 }
 
 visual_vista2D::~visual_vista2D(void)
 {
-}
-
-void visual_vista2D::startVista2D(std::string vistaProjectfile, bool paintBackground, int posX, int posY, float zoom)
+        view->stopView();
+}
+
+void visual_vista2D::startVista2D()
 {
     /***************
@@ -39 +47 @@
         view->load( vistaProjectfile );
     view->setBackgroundMode(paintBackground);   // don't paint background
-        view->setPosition( posX, posY);
+        view->setPosition( position_x, position_y);
         view->setZoom( zoom );
 
@@ -46 +54 @@
     self running datasource
     ***************/
-    view->startView (true);
-
-}
-
-bool visual_vista2D::processXMLConfiguration(std::string& configFileName, std::string& vistaProjectfile, bool& paintBackground, int& position_x, int& position_y, float& zoom)
+    view->startView (playanimation);
+}
+
+bool visual_vista2D::processXMLConfiguration()
 {
         // Init XML
@@ -109 +116 @@
                                                 std::stringstream sstr(attr_value);
                                                 sstr >> zoom;
+                                        }
+
+                                        if( attr_name == "playanimation" )
+                                        {
+                                                playanimation = (attr_value == "yes") ? true : false;
                                         }
 
@@ -133 +145 @@
         OSG_NOTIFY (osg::ALWAYS ) << "visual_vista2D initialize..";  // The sentence is finished by the init result...
 
-        std::string vistaProjectfile = "";
-        bool paintBackground = false;
-        int position_x = 0;
-        int position_y = 0;
-        float zoom = 1;
+        this->configFileName = configFileName;
 
         // Process XML configuration
-        if(!processXMLConfiguration(configFileName, vistaProjectfile, paintBackground, position_x, position_y, zoom))
+        if(!processXMLConfiguration())
                 return false;   // Abort vista2D initialization.
 
@@ -184 +192 @@
 
         // Add Payload: Vista2D                 
-        osg::ref_ptr<visual_vista2D> vista2D = new visual_vista2D();
-        vista2D->startVista2D(vistaProjectfile, paintBackground, position_x, position_y, zoom);
-
-        vista2D.get()->setUseDisplayList( false );
-        vista2Dgeode->addDrawable( vista2D.get() );
+        startVista2D();
+
+        // Add this class to the scene Graph
+        this->setUseDisplayList( false );
+        vista2Dgeode->addDrawable( this );
 
         sceneGraphRoot_->addChild( vista2DProjectionMatrix );