Changeset 9642 in orxonox.OLD for branches/proxy

Timestamp:

Jul 31, 2006, 10:32:46 AM (18 years ago)

Author:

bensch

Message:

node-widget

Location:

branches/proxy/src/lib/network

Files:

• monitor/network_stats_widget.cc (modified) (7 diffs)
• monitor/network_stats_widget.h (modified) (4 diffs)
• peer_info.cc (modified) (1 diff)

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

@@ -18 +18 @@
 #include "network_stats_widget.h"
 #include "network_monitor.h"
+#include "peer_info.h"
 
 #include "multi_type.h"
@@ -33 +34 @@
     : GLGuiBox(OrxGui::Horizontal)
 {
+  this->init();
+
   this->setName(name);
   this->setIP(ip);
 
+}
+
+HostWidget::HostWidget(const PeerInfo* peerInfo)
+    : GLGuiBox(OrxGui::Horizontal)
+{
+  this->init();
+  this->setName(peerInfo->getNodeTypeString() + "ID: " + MultiType(peerInfo->userId).getString());
+  this->setIP(peerInfo->ip);
+}
+
+void HostWidget::init()
+{
   if(_font == NULL)
     _font = new Font(ResourceManager::getInstance()->getDataDir() + "/fonts/arial.ttf", 20);
 
-  this->_name.setFont(*_font);
+  //this->_name.setFont(*_font);
   this->_name.setTextSize(15);
-  this->_ip.setFont(*_font);
+  //this->_ip.setFont(*_font);
   this->_ip.setTextSize(15);
 
@@ -62 +77 @@
 Font* HostWidget::_font = NULL;
 
+
+
+
 //======================================================//
 
@@ -73 +91 @@
 
 NodeWidget::NodeWidget(const NetworkNode* node)
-    : _proxyWidget("node", node->getPeerInfo()->ip)
+    : _proxyWidget(node->getPeerInfo())// "node", node->getPeerInfo()->ip)
 {
   this->_clientNameWidth = 100.0f;
@@ -169 +187 @@
 {
   this->_monitor = monitor;
+  this->_passedTime = 0.0f;
 
   /*
@@ -272 +291 @@
 {}
 
-void clearProxies();
+void NetworkStatsWidget::clearProxies()
+{
+}
 
 
@@ -298 +319 @@
 void NetworkStatsWidget::tick(float dt)
 {
+
+  if ((_passedTime+= dt) > 1.0f)
+  {
+    this->_passedTime = 0.0f;
+    this->rebuild();
+  }
+
   assert (this->_monitor->getLocalNode() != NULL);
   assert(this->_monitor->getLocalNode()->getPeerInfo() != NULL);

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

@@ -16 +16 @@
 class NetworkMonitor;
 class NetworkNode;
-
+class PeerInfo;
 
 class HostWidget : public OrxGui::GLGuiBox
@@ -22 +22 @@
   public:
     HostWidget(const std::string& name, const IP& ip);
+    HostWidget(const PeerInfo* peerInfo);
 
     void setName(const std::string& name) { this->_name.setText(name); };
-    void setIP(const IP& ip) { this->_ip.setText(ip.ipString()); this->_storedIP = ip; };
+    void setIP(const IP& ip) { this->_ip.setText(std::string("at ") + ip.ipString()); this->_storedIP = ip; };
 
     void setNameWidth(float width) { this->_name.setLineWidth(width); };
@@ -35 +36 @@
     virtual void hiding();
 
+  private:
+    void init();
   private:
     OrxGui::GLGuiText _name;           //!< The Name of the Proxy server to be displayed.
@@ -127 +130 @@
     static NetworkStatsWidget*    _statsWidget;
 
+
+    float                   _passedTime;
     //OrxGui::GLGuiText       _valueText;
     //OrxGui::GLGuiBar        _bar;

branches/proxy/src/lib/network/peer_info.cc

@@ -70 +70 @@
 {
 
-  "maser server",
+  "master server",
   "proxy server active",
   "proxy server passive",