Changeset 2910 for code/trunk/src/orxonox/overlays/notifications/Notification.cc

Timestamp:

Apr 8, 2009, 1:36:05 AM (15 years ago)

Author:

landauf

Message:

reverted r2909 because there were some unwanted files included

File:

• code/trunk/src/orxonox/overlays/notifications/Notification.cc (modified) (2 diffs)

code/trunk/src/orxonox/overlays/notifications/Notification.cc

@@ -27 +27 @@
  */
 
-/**
-    @file Notification.cc
-    @brief Implementation of the Notification class.
-*/
-
 #include "OrxonoxStableHeaders.h"
 #include "Notification.h"
 
 #include "core/CoreIncludes.h"
-#include "util/Exception.h"
 
 #include "NotificationManager.h"
@@ -42 +36 @@
 namespace orxonox
 {
-
-    /**
-    @brief
-        Default constructor. Initializes the object.
-    */
     Notification::Notification(BaseObject* creator) : BaseObject(creator)
     {
-        this->initialize();
+        RegisterObject(Notification);
     }
     
-    /**
-    @brief
-        Constructor. Creates a Notification with the input message.
-    @param message
-        The message of the Notification.
-    */
-    Notification::Notification(const std::string & message) : BaseObject(this)
+    Notification::Notification(BaseObject* creator, const std::string & message, const std::string & title, float time) : BaseObject(creator)
     {
+        this->title_ = title;
         this->message_ = message;
+        if(time > 0)
+            this->displayTime_ = time;
     }
     
-    /**
-    @brief
-        Destructor.
-    */
     Notification::~Notification()
     {
     }
     
-    /**
-    @brief
-        Registers the object and sets some default values.
-    */
     void Notification::initialize(void)
     {
         RegisterObject(Notification);
         
+        this->title_ = "";
         this->message_ = "";
-        this->sender_ = NotificationManager::NONE;
+        this->displayTime_ = NOTIFICATION_DISPLAY_TIME;
         this->sent_ = false;
     }
     
-    /**
-    @brief
-        Sends the Notification to the Notificationmanager, with sender NetificationManager::NONE.
-    @return
-        Returns true if successful.
-    */
     bool Notification::send(void)
     {
-        return this->send(NotificationManager::NONE);
+        bool successful = NotificationManager::insertNotification(this);
+        if(successful)
+            this->sent_ = true;
+        return successful;
     }
     
-    /**
-    @brief
-        Sends the Notification to the Notificationmanager, which then in turn distributes it to the different NotificationQueues.
-    @param sender
-        The sender the Notification was sent by. Used by the NotificationManager to distributes the notification to the correct NotificationQueues.
-    @return
-        Returns true if successful.
-    */
-    bool Notification::send(const std::string & sender)
+    bool Notification::setTitle(const std::string & title)
     {
-        this->sender_ = sender;
-        bool successful = NotificationManager::getInstance().registerNotification(this);
-        if(!successful)
+        if(this->isSent())
             return false;
-        this->sent_ = true;
-        
-        COUT(3) << "Notification \"" << this->getMessage() << "\" sent." << std::endl;
-        
+        this->title_ = title;
         return true;
     }
     
-    /**
-    @brief
-        Sets the message of the notification.
-    @param message
-        The message to be set.
-    @return
-        Returns true if successful.
-    */
     bool Notification::setMessage(const std::string & message)
     {
-        if(this->isSent()) //!< The message cannot be changed if the message has already been sent.
+        if(this->isSent())
             return false;
         this->message_ = message;
         return true;
     }
-
+    
+    bool Notification::setDisplayTime(float time)
+    {
+        if(this->isSent())
+        {
+            return false;
+        }
+        if(time > 0)
+        {
+            this->displayTime_ = time;
+            return true;
+        }
+        return false;
+    }
 }