Changeset 9869 in orxonox.OLD for trunk/src/lib/network/monitor

Timestamp:

Oct 3, 2006, 12:19:30 AM (18 years ago)

Author:

bensch

Message:

orxonox/trunk: merged the new_class_id branche back to the trunk.
merged with command:
svn merge ​https://svn.orxonox.net/orxonox/branches/new_class_id trunk -r9683:HEAD
no conflicts… puh..

Location:

trunk/src/lib/network/monitor

Files:

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

trunk/src/lib/network/monitor/connection_monitor.cc

@@ -23 +23 @@
 /* using namespace std is default, this needs to be here */
 
-
+ObjectListDefinition(ConnectionMonitor);
 /**
  * constructor
@@ -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;

trunk/src/lib/network/monitor/connection_monitor.h

@@ -19 +19 @@
 class ConnectionMonitor : virtual public BaseObject
 {
+  ObjectListDeclaration(ConnectionMonitor);
   public:
     ConnectionMonitor( int userId );

trunk/src/lib/network/monitor/network_monitor.cc

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

trunk/src/lib/network/monitor/network_monitor.h

@@ -27 +27 @@
 class NetworkMonitor : public Synchronizeable
 {
-
+  ObjectListDeclaration(NetworkMonitor);
   public:
     NetworkMonitor(NetworkStream* networkStream);

trunk/src/lib/network/monitor/network_stats_widget.cc

@@ -20 +20 @@
 #include "peer_info.h"
 
+#include "loading/resource_manager.h"
+
 #include "multi_type.h"
 
 #include "shell_command.h"
-
-#include "loading/resource_manager.h"
 
 // this fcuk does not work!
@@ -30 +30 @@
 // ->setAlias("ProxyGui");
 
-
 HostWidget::HostWidget(const std::string& name, const IP& ip)
     : GLGuiBox(OrxGui::Horizontal)
@@ -57 +56 @@
 {
   if(_font == NULL)
-    _font = new Font(ResourceManager::getInstance()->getDataDir() + "/fonts/arial.ttf", 20);
+    _font = new Font(Resources::ResourceManager::getInstance()->mainGlobalPath().name() + "/fonts/arial.ttf", 20);
 
   //this->_name.setFont(*_font);
@@ -211 +210 @@
 //======================================================//
 
+
+ObjectListDefinition(NetworkStatsWidget);
 /**
  * @brief standard constructor
@@ -273 +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();
   }

trunk/src/lib/network/monitor/network_stats_widget.h

@@ -81 +81 @@
 class NetworkStatsWidget : public OrxGui::GLGuiFixedpositionBox
 {
+  ObjectListDeclaration(NetworkStatsWidget);
   public:
     static void toggleGUI();