Changeset 6954 for source/ariba

Timestamp:

Nov 18, 2009, 3:36:32 PM (14 years ago)

Author:

Christoph Mayer

Message:

-small visualization enhancements

Location:

source/ariba/utility/visual

Files:

• DddVis.cpp (modified) (3 diffs)
• DddVis.h (modified) (2 diffs)
• ServerVis.cpp (modified) (2 diffs)
• ServerVis.h (modified) (2 diffs)

source/ariba/utility/visual/DddVis.cpp

@@ -159 +159 @@
 
         sendMessage( out.str(), network );
+
+        //
+        // set node color, if any given
+        //
+
+        if(this->nodecolor != 0){
+                this->visChangeNodeColor(network, node,
+                                (nodecolor & 0xFF0000) >> 16, (nodecolor & 0x00FF00) >> 8, nodecolor & 0x0000FF );
+        }
 }
 
@@ -233 +242 @@
                 unsigned char b
 ){
-        NodeSet::iterator i = colorSet.find(node);
-        unsigned int color = makeColor(r,g,b);
-
-        if( i == colorSet.end() ){
-                colorSet.insert(make_pair( node, color )); // color not set for node, set
-        }else{
-                if( i->second == color ) return; // color already set, ignore
-                else i->second = color;                  // new color, set
-        }
-
         ostringstream out;
         out     << SET_NODE_COLOR_TYPE          << del
-                        << getCommandID()                       << del
-                        << getTimestamp()                       << del
-                        << getNetworkName(network)      << del
-                        << getNodeNumber(node)          << del
-                        << makeColor(r, g, b)           << del;
+                << getCommandID()                       << del
+                << getTimestamp()                       << del
+                << getNetworkName(network)      << del
+                << getNodeNumber(node)          << del
+                << makeColor(r, g, b)           << del;
 
         sendMessage( out.str(), network );
@@ -316 +315 @@
 }
 
+void DddVis::visShowNodeLabel (
+                        NETWORK_ID network,
+                        NodeID& node,
+                        string label
+){
+        ostringstream out;
+        out     << SET_NODE_INFO_TYPE           << del
+                << getCommandID()                       << del
+                << getTimestamp()                       << del
+                << getNetworkName(network)      << del
+                << getNodeNumber(node)          << del
+                << label << del;
+
+        sendMessage( out.str(), network );
+}
+
 }} // namespace ariba, common

source/ariba/utility/visual/DddVis.h

@@ -161 +161 @@
                         NodeID& destnode,
                         NODE_COLORS color
+        );
+
+        /**
+         * Show the label of the node
+         */
+        void visShowNodeLabel (
+                        NETWORK_ID network,
+                        NodeID& node,
+                        string label
         );
 
@@ -216 +225 @@
         typedef KeyMapping<NodePair> NetworkLinks;
         NetworkLinks networkLinks;
-
-        NodeSet colorSet;
-
 };
 

source/ariba/utility/visual/ServerVis.cpp

@@ -43 +43 @@
 
 use_logging_cpp(ServerVis);
+unsigned int ServerVis::nodecolor = 0;
 
 typedef enum _NETWORK_ID {
@@ -69 +70 @@
 }
 
-void ServerVis::configure(string ip, unsigned int port){
+void ServerVis::configure(string ip, unsigned int port, unsigned int _color){
+        nodecolor = _color;
         if( ip.length() == 0 ) return;
 

source/ariba/utility/visual/ServerVis.h

@@ -58 +58 @@
         use_logging_h(ServerVis);
 public:
-        void configure(string ip, unsigned int port);
+        void configure(string ip, unsigned int port, unsigned int _color = 0);
+        static unsigned int nodecolor;
 
         typedef enum _NETWORK_ID {
@@ -105 +106 @@
         virtual void visChangeLinkColor (NETWORK_ID network, NodeID& srcnode, NodeID& destnode, NODE_COLORS color) = 0;
 
+        /// Show the label of the node.
+        virtual void visShowNodeLabel (NETWORK_ID network, NodeID& node, string label) = 0;
+
 protected:
         ServerVis();