Changeset 8448 for code/branches/tutoriallevel2/src/orxonox

Timestamp:

May 11, 2011, 10:45:56 PM (14 years ago)

Author:

dafrick

Message:

Extending NotificationQueueCEGUI.

Location:

code/branches/tutoriallevel2/src/orxonox/interfaces

Files:

• NotificationListener.cc (modified) (4 diffs)
• NotificationListener.h (modified) (3 diffs)

code/branches/tutoriallevel2/src/orxonox/interfaces/NotificationListener.cc

@@ -47 +47 @@
     // Commands
     /*static*/ const std::string NotificationListener::COMMAND_CLEAR("clear");
+    /*static*/ const std::string NotificationListener::COMMAND_NONE("none");
     
     registerStaticNetworkFunction(NotificationListener::sendHelper);
@@ -108 +109 @@
         {
             // If the notification is a message.
-            if(!isCommand && it->registerNotification(message, sender, notificationMessageType::Value(messageType)))
-                COUT(3) << "Notification \"" << message << "\" sent." << std::endl;
+            if(!isCommand)
+                it->registerNotification(message, sender, notificationMessageType::Value(messageType));
 
             // If the notification is a command.
@@ -115 +116 @@
             {
                 notificationCommand::Value command = str2Command(message);
-                if(command != notificationCommand::none && it->executeCommand(command, sender))
-                    COUT(3) << "Command \"" << message << "\" executed." << std::endl;
+                if(command != notificationCommand::none)
+                    it->executeCommand(command, sender);
             }
         }
@@ -138 +139 @@
         return command;
     }
+
+    /**
+    @brief
+        Helper method. Converts a command enum into its corresponding string.
+    @param command
+        The command to be converted.
+    @return
+        Returns the corresponding string.
+    */
+    /*static*/ const std::string& NotificationListener::command2Str(notificationCommand::Value command)
+    {
+        switch(command)
+        {
+            case notificationCommand::clear:
+                return NotificationListener::COMMAND_CLEAR;
+            default:
+                return NotificationListener::COMMAND_NONE;
+        }
+    }
     
 }

code/branches/tutoriallevel2/src/orxonox/interfaces/NotificationListener.h

@@ -108 +108 @@
             /**
             @brief Sends a specified command to the specified client from the specified sender.
-            @param message The command that should be sent (and later executed).
+            @param command The command that should be sent (and later executed).
             @param sender The sender that sent the notification. Default is 'none'.
             @param sendMode The mode in which the command is sent, can be 'local' to send the command to the client where this function is executed, 'network' if the command is to be sent to the client with the specified clientID, or 'broadcast' if the command should be sent to all hosts. Default is notificationSendMode::local.
@@ -138 +138 @@
             */
             virtual bool executeCommand(notificationCommand::Value command, const std::string& sender) { return false; }
+
+        public:
             
             static const std::string ALL; //!< Static string to indicate a sender that sends to all NotificationQueues.
@@ -144 +146 @@
             //! Commands
             static const std::string COMMAND_CLEAR;
+            static const std::string COMMAND_NONE;
             
         protected:
             static void sendNetworkHelper(const std::string& message, const std::string& sender, notificationSendMode::Value sendMode, unsigned int clientId, bool isCommand = false, notificationMessageType::Value messageType = notificationMessageType::info); // Helper method to send both notifications and commands over the network.
-            
+
             static notificationCommand::Value str2Command(const std::string& string); // Helper method. Converts a string into the enum for a command.
+            static const std::string& command2Str(notificationCommand::Value command); // Helper method. Converts a command enum into its corresponding string.
     };
 }