Changeset 9330 in orxonox.OLD for branches

Timestamp:

Jul 18, 2006, 8:02:10 PM (18 years ago)

Author:

bensch

Message:

orxonox/proxy added network_stats_widget to display the network statistics on the fly

Location:

branches/proxy/src/util

Files:

• Makefile.am (modified) (3 diffs)
• network_stats_widget.cc (copied) (copied from branches/proxy/src/world_entities/elements/glgui_energywidget.cc) (5 diffs)
• network_stats_widget.h (copied) (copied from branches/proxy/src/world_entities/elements/glgui_energywidget.h) (3 diffs)

branches/proxy/src/util/Makefile.am

@@ -14 +14 @@
                         singleplayer_shootemup.cc \
                         \
+                        \
+                        \
                         mission_goal.cc\
                         kill_target.cc\
@@ -24 +26 @@
                         animation/animation_player.cc \
                         \
-                        track/pilot_node.cc
+                        track/pilot_node.cc \
+                        \
+                        network_stats_widget.cc
 
 #                       track/track_manager.cc \
@@ -50 +54 @@
                         animation/t_animation.h \
                         \
-                        track/pilot_node.h
+                        track/pilot_node.h \
+                        \
+                        network_stats_widget.h
+
 
 #                       track/track_manager.h \

branches/proxy/src/util/network_stats_widget.cc

@@ -16 +16 @@
 //#define DEBUG_SPECIAL_MODULE DEBUG_MODULE_
 
-#include "glgui_energywidget.h"
+#include "network_stats_widget.h"
 
 namespace OrxGui
@@ -23 +23 @@
    * @brief standard constructor
    */
-  GLGuiEnergyWidget::GLGuiEnergyWidget ()
+  NetworkStatsWidget::NetworkStatsWidget ()
   {
-    //   this->setClassID(CL_PROTO_ID, "GLGuiEnergyWidget");
+    //   this->setClassID(CL_PROTO_ID, "NetworkStatsWidget");
 
     this->_bar.setSize2D(100, 30);
-    this->pack(&this->_name);
     this->pack(&this->_valueText);
     this->_bar.setParent2D(&this->_valueText);
 
-    this->_name.setForegroundColor(Color(1,1,1,.8));
     this->_valueText.setChangedTextColor(Color::white);
 
@@ -51 +49 @@
    * @brief standard deconstructor
    */
-  GLGuiEnergyWidget::~GLGuiEnergyWidget ()
+  NetworkStatsWidget::~NetworkStatsWidget ()
   {
   }
 
 
-  void GLGuiEnergyWidget::setDisplayedName(const std::string& name)
-  {
-    this->_name.setText(name);
-    this->_bar.setWidgetSize(this->_name.getSize2D());
-  }
-
-  void GLGuiEnergyWidget::setMaximum(float max)
+  void NetworkStatsWidget::setMaximum(float max)
   {
     this->_bar.setMaximum(max);
   }
 
-  void GLGuiEnergyWidget::setValue(float value)
+  void NetworkStatsWidget::setValue(float value)
   {
     MultiType val(value);
@@ -79 +71 @@
   }
 
-  void GLGuiEnergyWidget::resize()
+  void NetworkStatsWidget::resize()
   {
     GLGuiBox::resize();
@@ -85 +77 @@
 
 
-  void GLGuiEnergyWidget::showing()
+  void NetworkStatsWidget::showing()
   {
-    this->_name.show();
     this->_valueText.show();
     this->_bar.show();
   }
 
-  void GLGuiEnergyWidget::hiding()
+  void NetworkStatsWidget::hiding()
   {
-    this->_name.hide();
     this->_valueText.hide();
     this->_bar.hide();

branches/proxy/src/util/network_stats_widget.h

@@ -1 +1 @@
 /*!
- * @file glgui_energywidget.h
+ * @file network_stats_widget.h
  * @brief Definition of an EnergyWidget, that displays a bar and a Text
 */
 
-#ifndef _GLGUI_ENERGY_WIDGET_H
-#define _GLGUI_ENERGY_WIDGET_H
+#ifndef _NETWORK_STATS_WIDGET_H
+#define _NETWORK_STATS_WIDGET_H
 
 #include "glgui_box.h"
@@ -11 +11 @@
 #include "glgui_text.h"
 
+#include "network/ip.h"
+
+
 namespace OrxGui
 {
 
-  //! A class for ...
-  class GLGuiEnergyWidget : public GLGuiBox
+  //! A class to display network Statistics.
+  class NetworkStatsWidget : public GLGuiBox
   {
 
   public:
-    GLGuiEnergyWidget();
-    virtual ~GLGuiEnergyWidget();
+    NetworkStatsWidget();
+    virtual ~NetworkStatsWidget();
 
-    void setDisplayedName(const std::string& name);
+    void setUpstream(unsigned int upstream);
+    void setDownstream(unsigned int upstream);
+
     void setMaximum(float max);
     void setValue(float value);
+
+
+    //void rebuildConnectedHosts(std::vector<hosts> hosts);
 
   protected:
@@ -32 +40 @@
 
   private:
-    GLGuiText               _name;
-    GLGuiText               _valueText;
-    GLGuiBar                _bar;
+    IP                     _ip;
+    GLGuiText              _ipText;
 
+    GLGuiText              _upstreamText;
+    GLGuiText              _downstreamText;
+
+    std::vector<GLGuiText> _connectedHosts;
+
+    GLGuiText              _serverIP;
+
+
+    GLGuiText              _valueText;
+    GLGuiBar               _bar;
   };
 }
-#endif /* _GLGUI_ENERGY_WIDGET_H */
+#endif /* _NETWORK_STATS_WIDGET_H */