Changeset 9691 in orxonox.OLD for branches/new_class_id/src/lib/network/monitor

Timestamp:

Aug 22, 2006, 11:45:21 PM (18 years ago)

Author:

bensch

Message:

new_class_id: adapted Network

Location:

branches/new_class_id/src/lib/network/monitor

Files:

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

branches/new_class_id/src/lib/network/monitor/connection_monitor.cc

@@ -31 +31 @@
 {
   /* set the class id for the base object and add ist to class list*/
-  this->setClassID(CL_CONNECTION_MONITOR, "ConnectionMonitor");
+  this->registerObject(this, ConnectionMonitor::_objectList);
 
   this->userId = userId;

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

@@ -46 +46 @@
   : Synchronizeable()
 {
-  this->setClassID(CL_NETWORK_MONITOR, "NetworkMonitor");
+  this->registerObject(this, NetworkMonitor::_objectList);
 
   this->networkStream = networkStream;

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

@@ -274 +274 @@
 NetworkStatsWidget* NetworkStatsWidget::_statsWidget = NULL;
 
-#include "class_list.h"
-
 void NetworkStatsWidget::toggleGUI()
 {
-  BaseObject* bo = NULL;
-  const std::list<BaseObject*>* ls = ClassList::getList(CL_NETWORK_MONITOR);
-  if (ls != NULL && !ls->empty())
-    bo = ls->front();
-
-  if (bo != NULL && NetworkStatsWidget::_statsWidget == NULL)
-  {
-    NetworkStatsWidget::_statsWidget = new NetworkStatsWidget(dynamic_cast<NetworkMonitor*> (bo));
+  NetworkMonitor* monitor;
+  if (!NetworkMonitor::objectList().empty())
+    monitor = NetworkMonitor::objectList().front();
+
+  if (monitor != NULL && NetworkStatsWidget::_statsWidget == NULL)
+  {
+    NetworkStatsWidget::_statsWidget = new NetworkStatsWidget(monitor);
     NetworkStatsWidget::_statsWidget->showAll();
   }

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

@@ -20 +20 @@
 class HostWidget : public OrxGui::GLGuiBox
 {
-  NewObjectListDeclaration(HostWidget);
   public:
     HostWidget(const std::string& name, const IP& ip);
@@ -82 +81 @@
 class NetworkStatsWidget : public OrxGui::GLGuiFixedpositionBox
 {
+  NewObjectListDeclaration(NetworkStatsWidget);
   public:
     static void toggleGUI();