Changeset 11261 for code/branches/Dialog_HS16/src/modules

Timestamp:

Oct 31, 2016, 4:11:28 PM (8 years ago)

Author:

dmoritz

Message:

Updated Dialogue Class

Location:

code/branches/Dialog_HS16/src/modules/notifications

Files:

• NotificationDispatcher.h (modified) (1 diff)
• NotificationManager.h (modified) (1 diff)
• dispatchers/Dialogue.cc (modified) (2 diffs)
• dispatchers/Dialogue.h (modified) (2 diffs)

code/branches/Dialog_HS16/src/modules/notifications/NotificationDispatcher.h

@@ -126 +126 @@
             virtual const std::string& createNotificationMessage(void)
                 { return BLANKSTRING; }
+            virtual const std::string& createNotificationSpeaker(void)
+                { return BLANKSTRING; }
 
     };

code/branches/Dialog_HS16/src/modules/notifications/NotificationManager.h

@@ -94 +94 @@
         private:
             std::string message_; //!< The Notification message.
-            std::string sender_; //!< The sender of the notification.
+            std::string sender_; //!< The sender of the notifications.
             NotificationMessageType type_; //!< The type of the notification.
 

code/branches/Dialog_HS16/src/modules/notifications/dispatchers/Dialogue.cc

@@ -10 +10 @@
         RegisterClass(Dialogue);
 
-        Dialogue::Dialogue(Context* context):BaseObject(context){
+        Dialogue::Dialogue(Context* context):NotificationDispatcher(context){
                 RegisterObject(Dialogue);
+
+                this->setSender("dialogue");
+
+        this->setSyncMode(ObjectDirection::None);
+
 
         }
@@ -24 +29 @@
 
         XMLPortParam(Dialogue, "message", setMessage, getMessage, xmlelement, mode);
-        orxout()<<"blablab";
+        //XMLPortParam(Dialogue, "speaker", setSpeaker, getSpeaker, xmlelement, mode);
+        
     }
 }

code/branches/Dialog_HS16/src/modules/notifications/dispatchers/Dialogue.h

@@ -3 +3 @@
 #define _Dialogue_H__
 #include <string>       
-#include "core/BaseObject.h"
+//#include "core/BaseObject.h"
+
+#include "notifications/NotificationsPrereqs.h"
+
+#include "notifications/NotificationDispatcher.h"
 
 namespace orxonox{
 
-class Dialogue: public BaseObject{
+class _NotificationsExport Dialogue: public NotificationDispatcher{
 
         public:
@@ -17 +21 @@
             const std::string& getMessage(void)
                 { return this->message_; }
-
-            void setMessage(const std::string& message)
-                { this->message_ = message; }
+         //   const std::string& getSpeaker(void)
+            //  {return this->speaker_;}
 
     protected:
         virtual const std::string& createNotificationMessage(void)
                 { return this->message_; }
+       // virtual const std::string& createNotificationSpeaker(void)
+        //              { return this->speaker_; }
     private:
                 std::string message_;
+        //      std::string speaker_;
+
+                void setMessage(const std::string& message)
+                { this->message_ = message; }
+           // void setSpeaker(const std::string& speaker)
+            //  { this->speaker_ = speaker;}
         } ;