Changeset 2783

Timestamp:

Mar 13, 2009, 3:39:54 PM (15 years ago)

Author:

dafrick

Message:

Erradicated an infinite loop, and some wannabe-memory leaks. Also started the positioning of the notifications. I'd actually call it usable at this point.

Location:

code/branches/questsystem5/src/orxonox/overlays/notifications

Files:

• NotificationManager.cc (modified) (5 diffs)
• NotificationOverlay.cc (modified) (1 diff)
• NotificationQueue.cc (modified) (13 diffs)
• NotificationQueue.h (modified) (3 diffs)

code/branches/questsystem5/src/orxonox/overlays/notifications/NotificationManager.cc

@@ -97 +97 @@
         
         //!< Insert the notification in all queues that have its sender as target.
-        for(std::map<NotificationQueue*,int>::iterator it = queueList_s.begin(); it != queueList_s.end(); it++)
+        for(std::map<NotificationQueue*,int>::iterator it = queueList_s.begin(); it != queueList_s.end(); it++) //!< Iterate through all queues.
         {
             std::set<std::string> set = it->first->getTargetsSet();
@@ -107 +107 @@
         }
         
-        COUT(3) << "NotificationQueue registered with the NotificationManager." << std::endl;
+        COUT(3) << "Notification registered with the NotificationManager." << std::endl;
         
         return true;
@@ -133 +133 @@
         {
             notificationLists_s[index] = &allNotificationsList_s;
+            COUT(3) << "NotificationQueue registered with the NotificationManager." << std::endl;
             return true;
         }
@@ -148 +149 @@
         }
         
-        COUT(3) << "Notification registered with the NotificationManager." << std::endl;
-        
         queue->update(); //!< Update the queue.
+
+        COUT(3) << "NotificationQueue registered with the NotificationManager." << std::endl;
         
         return true;
@@ -171 +172 @@
     /*static*/ std::multimap<std::time_t,Notification*>* NotificationManager::getNotifications(NotificationQueue* queue, const std::time_t & timeFrameStart, const std::time_t & timeFrameEnd)
     {
-        COUT(1) << "Queue: " << queue << ", timeFrameStart: " << timeFrameStart << ", timeFrameEnd: " << timeFrameEnd << std::endl;
-    
         std::multimap<std::time_t,Notification*>* notifications = NotificationManager::notificationLists_s[NotificationManager::queueList_s[queue]];
         

code/branches/questsystem5/src/orxonox/overlays/notifications/NotificationOverlay.cc

@@ -87 +87 @@
     }
 
-    const std::string NotificationOverlay::clipMessage(const std::string & str)
+    const std::string NotificationOverlay::clipMessage(const std::string & message)
     {
-        if(str.length() <= (unsigned int)this->queue_->getNotificationLength())
-            return str;
-        return str.substr(0, this->queue_->getNotificationLength());
+        if(message.length() <= (unsigned int)this->queue_->getNotificationLength())
+            return message;
+        return message.substr(0, this->queue_->getNotificationLength());
     }
 

code/branches/questsystem5/src/orxonox/overlays/notifications/NotificationQueue.cc

@@ -59 +59 @@
     @brief
         Destructor.
-    @todo
-        I'm pretty sure that there are some thing that have to be distroyed.
     */
     NotificationQueue::~NotificationQueue()
     {
-        
+        this->targets_.clear();
+        this->clear();
     }
     
@@ -76 +75 @@
         RegisterObject(NotificationQueue);
         
-        this->setDefaults();
         this->size_ = 0;
         this->tickTime_ = 0.0;
@@ -107 +105 @@
         SUPER(NotificationQueue, XMLPort, xmlElement, mode);
         
+        this->setDefaults();
+
         XMLPortParam(NotificationQueue, "maxSize", setMaxSize, getMaxSize, xmlElement, mode);
         XMLPortParam(NotificationQueue, "notificationLength", setNotificationLength, getNotificationLength, xmlElement, mode);
@@ -135 +135 @@
             {
                 this->removeContainer(*it);
+                this->scroll(Vector2(0.0,-(1.1*this->getFontSize())));
                 it = this->containers_.begin(); //TDO: Needed?
             }
@@ -176 +177 @@
         this->addNotification(notification, time);
         
-        //TDO: Position!
-        
         std::multiset<NotificationOverlayContainer*, NotificationOverlayContainerCompare>::iterator it;
         while(this->getSize() > this->getMaxSize())
@@ -183 +182 @@
             it = this->containers_.begin();
             this->removeContainer(*it);
+            this->scroll(Vector2(0.0,-(1.1*this->getFontSize())));
         }
         
@@ -241 +241 @@
     /**
     @brief
-        Returns all targets concatinated as string, with kommas (',') as seperators.
-    @return
-        Returns all targets concatinated as string, with kommas (',') as seperators.
-    @todo
-        Where is the string deleted?
-    */
-    const std::string & NotificationQueue::getTargets() const
-    {
-        std::string* pTemp = new std::string("");
+        Produces all targets concatinated as string, with kommas (',') as seperators.
+    @param string
+        Pointer to a string which will be used by the method to fill with the concatination of the targets.
+    @return
+        Returns true if successful.
+    */
+    bool NotificationQueue::getTargets(std::string* string) const
+    {
+        if(string == NULL)
+        {
+            COUT(4) << "Input string must have memory allocated." << std::endl;
+            return false;
+        }
+        string->clear();
         bool first = true;
         for(std::set<std::string>::iterator it = this->targets_.begin(); it != this->targets_.end(); it++) //!< Iterate through the set of targets.
@@ -255 +260 @@
             if(!first)
             {
-                *pTemp += ",";
+                *string += ",";
             }
             else
@@ -261 +266 @@
                 first = false;
             }
-            *pTemp += *it;
-        }
-        
-        return *pTemp;
+            *string += *it;
+        }
+        
+        return true;
     }
     
@@ -278 +283 @@
     bool NotificationQueue::setTargets(const std::string & targets)
     {
+        this->targets_.clear();
+
         std::string* pTemp;
         unsigned int index = 0;
@@ -283 +290 @@
         {
             pTemp = new std::string("");
-            while(targets[index] != ',' && targets[index] != ' ' && index < targets.size())
+            while(index < targets.size() && targets[index] != ',' && targets[index] != ' ')
             {
                 *pTemp += targets[index];
                 index++;
             }
+            index++;
             this->targets_.insert(*pTemp);
         }
@@ -331 +339 @@
         return true;
     }
-    
+
+    void NotificationQueue::scroll(const Vector2 pos)
+    {
+        for (std::map<Notification*, NotificationOverlayContainer*>::iterator it = this->overlays_.begin(); it != this->overlays_.end(); ++it) //!< Scroll each overlay.
+        {
+            it->second->overlay->scroll(pos);
+        }
+    }
+
     /**
     @brief
@@ -358 +374 @@
         this->insertElement(container->overlay, container->name);
         this->size_= this->size_+1;
+
+        container->overlay->scroll(Vector2(0.0,(1.1*this->getFontSize())*(this->getSize()-1)));
     }
     

code/branches/questsystem5/src/orxonox/overlays/notifications/NotificationQueue.h

@@ -44 +44 @@
 #include <map>
 #include <ctime>
+#include "util/Math.h"
 
 #include "orxonox/overlays/OverlayGroup.h"
@@ -120 +121 @@
             inline const std::set<std::string> & getTargetsSet()
                 { return this->targets_; }
-            const std::string & getTargets() const; //!< Returns a string consisting of teh concatination of the targets.
+            bool getTargets(std::string* string) const; //!< Returns a string consisting of the concatination of the targets.
             
             /**
@@ -134 +135 @@
             inline const std::string & getFont() const
                 { return this->font_; }
+
+            void scroll(const Vector2 pos);
             
         private: