Changeset 9438 in orxonox.OLD

Timestamp:

Jul 24, 2006, 5:07:55 PM (18 years ago)

Author:

bensch

Message:

more gui

Location:

branches/proxy/src/lib/network/monitor

Files:

• network_monitor.cc (modified) (4 diffs)
• network_monitor.h (modified) (1 diff)
• network_stats_widget.cc (modified) (8 diffs)
• network_stats_widget.h (modified) (2 diffs)

branches/proxy/src/lib/network/monitor/network_monitor.cc

@@ -31 +31 @@
 
 
-SHELL_COMMAND(showGUI, NetworkMonitor, showGUI);
-SHELL_COMMAND(hideGUI, NetworkMonitor, hideGUI);
+#include "network_stats_widget.h"
+
+SHELL_COMMAND(gui, NetworkMonitor, toggleGUI);
 SHELL_COMMAND(debug, NetworkMonitor, debug);
 
@@ -72 +73 @@
     }
   }
+  this->box = NULL;
 }
 
@@ -196 +198 @@
  * this displays the network monitor gui
  */
-void NetworkMonitor::showGUI()
+void NetworkMonitor::toggleGUI()
 {
   if (this->box == NULL)
@@ -202 +204 @@
     this->box = new OrxGui::GLGuiBox(OrxGui::Vertical);
     {
-      OrxGui::GLGuiBox* waterColorBox = new OrxGui::GLGuiBox(OrxGui::Horizontal);
-      {
-        OrxGui::GLGuiText* waterColorText = new OrxGui::GLGuiText();
-        waterColorText->setText("NetworkMonitor");
-        waterColorBox->pack(waterColorText);
-      }
-      this->box->pack(waterColorBox);
+      NetworkStatsWidget* netStats = new NetworkStatsWidget();
+      this->box->pack(netStats);
+
     }
 
     this->box->showAll();
     this->box->setAbsCoor2D(300, 40);
-    OrxGui::GLGuiHandler::getInstance()->activate();
-//     OrxGui::GLGuiHandler::getInstance()->activateCursor();
-  }
-}
-
-
-/**
- * hides the network monitor gui again
- */
-void NetworkMonitor::hideGUI()
-{
-  if( this->box == NULL)
-    return;
-
-  OrxGui::GLGuiHandler::getInstance()->deactivate();
-//   OrxGui::GLGuiHandler::getInstance()->deactivateCursor();
-
-  delete this->box;
-  this->box = NULL;
-}
-
+  }
+  else
+  {
+    delete this->box;
+    this->box = NULL;
+  }
+}
 
 /**

branches/proxy/src/lib/network/monitor/network_monitor.h

@@ -74 +74 @@
 
 
-    void showGUI();
-    void hideGUI();
+    void toggleGUI();
 
     void process();

branches/proxy/src/lib/network/monitor/network_stats_widget.cc

@@ -19 +19 @@
 
 #include "multi_type.h"
-
-#include "shell_command.h"
-//#include "network_monitor.h"
-
-SHELL_COMMAND(gui, NetworkStatsWidget, gui);
-
 
 HostWidget::HostWidget(const std::string& name, const IP& ip)
@@ -142 +136 @@
 //======================================================//
 
-
-void NetworkStatsWidget::gui()
-{
-  printf("YEAH\n");
-}
-
-
 /**
  * @brief standard constructor
@@ -157 +144 @@
   //   this->setClassID(CL_PROTO_ID, "NetworkStatsWidget");
 
+  /*
   this->_bar.setSize2D(100, 30);
   this->pack(&this->_valueText);
@@ -173 +161 @@
   this->_bar.setForegroundColor(Color(.5, .5, .5, 1));
   this->_bar.setChangedValueColor(Color::black);
+  */
+  this->pack(&this->_thisHost);
+
+  this->pack(&this->_upstreamText);
+  this->pack(&this->_downstreamText);
+
+  this->pack(&this->_serverIP);
 }
 
@@ -185 +180 @@
 void NetworkStatsWidget::setMaximum(float max)
 {
-  this->_bar.setMaximum(max);
+ // this->_bar.setMaximum(max);
 }
 
@@ -192 +187 @@
   MultiType val(value);
   val.setType(MT_INT);
-
+  /*
 
   this->_bar.setValue(value);
@@ -198 +193 @@
   this->_bar.setFrontColor(Color(1,1,1,1), true);
   this->_valueText.setText(val.getString());
+  */
 }
 
@@ -208 +204 @@
 void NetworkStatsWidget::showing()
 {
-  this->_valueText.show();
-  this->_bar.show();
 }
 
 void NetworkStatsWidget::hiding()
 {
-  this->_valueText.hide();
-  this->_bar.hide();
-}
+}

branches/proxy/src/lib/network/monitor/network_stats_widget.h

@@ -73 +73 @@
 {
   public:
-    void gui();
-
-  public:
     NetworkStatsWidget();
     virtual ~NetworkStatsWidget();
@@ -109 +106 @@
 
 
-    OrxGui::GLGuiText       _valueText;
-    OrxGui::GLGuiBar        _bar;
+    //OrxGui::GLGuiText       _valueText;
+    //OrxGui::GLGuiBar        _bar;
 };