Changeset 9644 in orxonox.OLD for branches

Timestamp:

Jul 31, 2006, 11:09:20 AM (18 years ago)

Author:

bensch

Message:

display widgets correctly

Location:

branches/proxy/src/lib/network

Files:

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

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

@@ -45 +45 @@
 {
   this->init();
+  if (peerInfo == NULL)
+  {
+    this->setName("INVALID");
+    return;
+  }
   this->setName(peerInfo->getNodeTypeString() + "ID: " + MultiType(peerInfo->userId).getString());
   this->setIP(peerInfo->ip);
@@ -213 +218 @@
   this->pack(&this->_thisHost);
 
+  this->pack(&this->_serverBox);
+
   this->pack(&this->_upstreamText);
   this->pack(&this->_downstreamText);
 
-
-  this->pack(&this->_serverBox);
-
-
-  this->_refreshButton.setLabel("refresh");
-  this->_refreshButton.released.connect(this, &NetworkStatsWidget::rebuild);
-  this->pack(&this->_refreshButton);
 
   this->rebuild();
@@ -238 +238 @@
 {
   this->_proxies.push_back(new NodeWidget(node));
-  this->pack(this->_proxies.back(), &this->_refreshButton);
+  this->pack(this->_proxies.back());
   this->_proxies.back()->show();
 }
@@ -292 +292 @@
 
 void NetworkStatsWidget::clearProxies()
-{
-}
+{}
 
 
@@ -304 +303 @@
   }
 
-
-  std::list<NetworkNode*>::const_iterator it = this->_monitor->getNodeList().begin();
-  for(; it != this->_monitor->getNodeList().end(); it++)
-  {
+  const NetworkNode* node = this->_monitor->getLocalNode();
+  if (node == NULL)
+  {
+    printf("NO NODE\n");
+    return;
+  }
+  std::list<NetworkNode*>::const_iterator it;
+
+  std::list<NetworkNode*> list = node->getMasterServers();
+  for(it = list.begin(); it != list.end(); it++)
     this->addNode(*it);
-  }
-
-
+
+  list = node->getActiveProxyServers();
+  for(it = list.begin(); it != list.end(); it++)
+    this->addNode(*it);
+
+  list = node->getPassiveProxyServers();
+  for(it = list.begin(); it != list.end(); it++)
+    this->addNode(*it);
+
+  list = node->getClients();
+  for(it = list.begin(); it != list.end(); it++)
+    this->addNode(*it);
 
 }

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

@@ -126 +126 @@
 
 
-    OrxGui::GLGuiPushButton _refreshButton;
-
     static NetworkStatsWidget*    _statsWidget;
 

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

@@ -69 +69 @@
 const std::string PeerInfo::nodeNames[] =
 {
-
   "master server",
   "proxy server active",