Changeset 6822 for source/ariba/utility/visual

Timestamp:

Nov 4, 2009, 11:20:00 AM (14 years ago)

Author:

Christoph Mayer

Message:

-ovlvis verschoben und 3dvis hinzu

Location:

source/ariba/utility/visual

Files:

• DddVis.cpp (added)
• DddVis.h (added)
• OvlVis.cpp (modified) (3 diffs)
• OvlVis.h (modified) (5 diffs)
• ServerVis.cpp (added)
• ServerVis.h (added)

source/ariba/utility/visual/OvlVis.cpp

@@ -42 +42 @@
 namespace utility {
 
-//*****************************************************
-//*****************************************************
-//*****************************************************
-
 use_logging_cpp(OvlVis);
 
-OvlVis::OvlVis() : socket(io_service), socketOpened(false) {
-
-        if( ! Configuration::haveConfig() ) return;
-        if( ! Configuration::instance().exists("DEMO_OvlVisIP") )   return;
-        if( ! Configuration::instance().exists("DEMO_OvlVisPort") ) return;
-
-        string serverIP = Configuration::instance().read<string>("DEMO_OvlVisIP");
-        string serverPort = Configuration::instance().read<string>("DEMO_OvlVisPort");
-        if( serverIP.length() == 0 || serverPort.length() == 0) return;
-
-        logging_debug( "connecting to ovlvis " + serverIP + " on " + serverPort );
-
-        tcp::resolver resolver(io_service);
-        tcp::resolver::query query(
-                serverIP,
-                serverPort,
-                tcp::resolver::query::passive |
-                tcp::resolver::query::address_configured |
-                tcp::resolver::query::numeric_service);
-
-        tcp::resolver::iterator endpoint_iterator = resolver.resolve(query);
-        tcp::resolver::iterator end;
-
-        boost::system::error_code error = boost::asio::error::host_not_found;
-        while (error && endpoint_iterator != end){
-                socket.close();
-                socket.connect(*endpoint_iterator++, error);
-        }
-
-        if (error){
-                logging_warn( "OvlVis could not connect to GUI" );
-        } else {
-                socketOpened = true;
-        }
+OvlVis::OvlVis() {
 }
 
 OvlVis::~OvlVis(){
-
-        socket.close();
-
 }
 
@@ -115 +75 @@
 //      }
 
-}
-
-void OvlVis::sendSocket(const string msg){
-        if( socket.is_open() && socketOpened )
-                socket.send( boost::asio::buffer(msg) );
 }
 
@@ -665 +620 @@
 }
 
-//*****************************************************
-//*****************************************************
-//*****************************************************
-
 }} // namespace ariba, common

source/ariba/utility/visual/OvlVis.h

@@ -45 +45 @@
 #include <map>
 #include <boost/utility.hpp>
-#include <boost/asio.hpp>
-#include "ariba/utility/types/NodeID.h"
-#include "ariba/utility/logging/Logging.h"
 #include "ariba/utility/system/Timer.h"
 #include "ariba/utility/misc/Helper.h"
 #include "ariba/utility/misc/KeyMapping.hpp"
-#include "ariba/utility/configuration/Configuration.h"
+#include "ariba/utility/visual/ServerVis.h"
 
 using std::string;
@@ -59 +56 @@
 using std::cout;
 using std::ostringstream;
-using boost::asio::ip::tcp;
-using ariba::utility::NodeID;
-using ariba::utility::Configuration;
 using ariba::utility::KeyMapping;
 using ariba::utility::Timer;
@@ -68 +62 @@
 namespace utility {
 
-class OvlVis : private boost::noncopyable {
+class OvlVis : public ServerVis, private boost::noncopyable {
         use_logging_h(OvlVis);
 public:
         static OvlVis& instance() { static OvlVis the_inst; return the_inst; }
 
-        typedef enum _NETWORK_ID {
-                NETWORK_ID_BASE_COMMUNICATION   = 1,
-                                NETWORK_ID_BASE_OVERLAY = 2,
-                                NETWORK_ID_EONSON               = 3,
-                                NETWORK_ID_MCPO                 = 4,
-                                NETWORK_ID_CLIO                 = 5,
-                                NETWORK_ID_VIDEOSTREAM  = 6,
-                                NETWORK_ID_GAME                 = 7,
-                                NETWORK_ID_SECURITY     = 8,
-        } NETWORK_ID;
-
         //****************************************************************
         // Node creation, node connections, status, node deletion, ...
@@ -162 +145 @@
                         unsigned char b
         );
-
-        typedef enum _NODE_COLORS {
-                NODE_COLORS_GREY,
-                NODE_COLORS_GREEN,
-                NODE_COLORS_RED,
-        } NODE_COLORS;
 
         /**
@@ -385 +362 @@
 protected:
         OvlVis();
-        ~OvlVis();
+        virtual ~OvlVis();
 
 private:
         void sendMessage( const string msg, NETWORK_ID nid );
-        void sendSocket( const string msg );
-
-        /**
-         * boost asio stuff for connecting to ovlvis
-         */
-        boost::asio::io_service io_service;
-        tcp::socket socket;
-        volatile bool socketOpened;
 
         typedef pair<NodeID, NodeID> NodePair;