Changeset 11270 for code/branches/Dialog_HS16/src/modules
- Timestamp:
- Nov 7, 2016, 3:59:00 PM (8 years ago)
- Location:
- code/branches/Dialog_HS16/src/modules/notifications
- Files:
-
- 4 edited
Legend:
- Unmodified
- Added
- Removed
-
code/branches/Dialog_HS16/src/modules/notifications/NotificationDispatcher.h
r11261 r11270 126 126 virtual const std::string& createNotificationMessage(void) 127 127 { return BLANKSTRING; } 128 virtual const std::string& createNotificationSpeaker(void) 129 { return BLANKSTRING; } 128 130 129 131 130 }; -
code/branches/Dialog_HS16/src/modules/notifications/NotificationManager.h
r11261 r11270 77 77 inline const std::string & getMessage(void) const 78 78 { return this->message_; } 79 80 79 /** 81 80 @brief Get the sender of the Notification. … … 94 93 private: 95 94 std::string message_; //!< The Notification message. 96 std::string sender_; 95 std::string sender_;//!< The sender of the notifications. 97 96 NotificationMessageType type_; //!< The type of the notification. 98 97 -
code/branches/Dialog_HS16/src/modules/notifications/dispatchers/Dialogue.cc
r11261 r11270 16 16 17 17 this->setSyncMode(ObjectDirection::None); 18 19 20 18 } 21 19 … … 28 26 SUPER(Dialogue, XMLPort, xmlelement, mode); 29 27 28 XMLPortParam(Dialogue, "speaker", setSpeaker, getSpeaker, xmlelement, mode); 30 29 XMLPortParam(Dialogue, "message", setMessage, getMessage, xmlelement, mode); 31 //XMLPortParam(Dialogue, "speaker", setSpeaker, getSpeaker, xmlelement, mode);32 30 33 31 } 32 const std::string& Dialogue::createNotificationMessage(void) 33 { 34 dialogue_ = speaker_ + message_; 35 return this->dialogue_ ; 36 } 34 37 } -
code/branches/Dialog_HS16/src/modules/notifications/dispatchers/Dialogue.h
r11261 r11270 21 21 const std::string& getMessage(void) 22 22 { return this->message_; } 23 //const std::string& getSpeaker(void)24 //{return this->speaker_;}23 const std::string& getSpeaker(void) 24 {return this->speaker_;} 25 25 26 26 protected: 27 virtual const std::string& createNotificationMessage(void) 28 { return this->message_; } 29 // virtual const std::string& createNotificationSpeaker(void) 30 // { return this->speaker_; } 27 virtual const std::string& createNotificationMessage(void); 28 29 31 30 private: 32 31 std::string message_; 33 // std::string speaker_; 32 std::string speaker_; 33 std::string dialogue_; 34 34 35 void setSpeaker(const std::string& speaker) 36 { this->speaker_ = speaker;} 35 37 void setMessage(const std::string& message) 36 38 { this->message_ = message; } 37 // void setSpeaker(const std::string& speaker) 38 // { this->speaker_ = speaker;} 39 39 40 } ; 40 41
Note: See TracChangeset
for help on using the changeset viewer.