Changeset 2346 for code/branches/questsystem3/src/orxonox/overlays

Timestamp:

Dec 5, 2008, 7:38:53 AM (16 years ago)

Author:

dafrick

Message:

• QuestListener works now.
• Rearranged the places Notifications are sent from, and also created actually meaningfull Notification messages
• Done some changes to Notifications

Location:

code/branches/questsystem3/src/orxonox/overlays/notifications

Files:

• NotificationManager.cc (modified) (2 diffs)
• NotificationManager.h (modified) (1 diff)
• NotificationQueue.cc (modified) (3 diffs)
• NotificationQueue.h (modified) (1 diff)

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

@@ -87 +87 @@
         updateQueue();
         
-        COUT(3) << "Notification inserted, title: " << notification->getTitle() << ", message: " << notification->getMessage() << std::endl;
+        COUT(4) << "Notification inserted. Title: " << notification->getTitle() << std::endl;
         
         return true;
@@ -104 +104 @@
                 continue;
             
-            COUT(3) << "Update, title: " << container->notification->getTitle() << ", message: " << container->notification->getMessage() << std::endl;
-            
-            text = text + "\n\n\n------------" + container->notification->getTitle() + "\n\n" + container->notification->getMessage();
+            text = text + "\n\n\n------------\n\n" + container->notification->getTitle() + "\n\n" + container->notification->getMessage();
         }
-
-        COUT(3) << "Queue updated: " << text << std::endl;
         
         NotificationQueue::queue_s->setQueueText(text);
     }
+    
+    const std::string & NotificationManager::clipMessage(const std::string & message)
+    {
+        std::string* clippedMessageP = new std::string();
+        std::string clippedMessage = *clippedMessageP;
+        clippedMessage = "";
+        std::string tempWord = "";
+        int wordLength = 0;
+        signed int i = 0;
+        int widthLeft = NotificationQueue::queue_s->getWidth();
+        while(i < message.length())
+        {
+            while(i < message.length() && message[i] != ' ' && message[i] != '\n')
+            {
+                tempWord = tempWord + message[i];
+                i++;
+                wordLength++;
+            }
+            
+            if(wordLength <= widthLeft)
+            {
+                clippedMessage = clippedMessage + tempWord + message[i];
+                widthLeft -= (wordLength+1);
+                wordLength = 0;
+                tempWord = "";
+                i++;
+            }
+            else
+            {
+                clippedMessage = clippedMessage + '\n' + tempWord + message[i];
+                widthLeft = NotificationQueue::queue_s->getWidth() - (wordLength+1);
+                i++;
+                wordLength = 0;
+                tempWord = "";
+            }
+        }
+        
+        return clippedMessage;
+    }
 
 }

code/branches/questsystem3/src/orxonox/overlays/notifications/NotificationManager.h

@@ -66 +66 @@
             
             static void updateQueue(void);
+            static const std::string & clipMessage(const std::string & message);
 
     };

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

@@ -53 +53 @@
             queue_s = this;
         }
+        
+        this->length_ = 3;
+        this->width_ = 50;
     }
     
@@ -65 +68 @@
         
         XMLPortParam(NotificationQueue, "length", setLength, getLength, xmlElement, mode);
+        XMLPortParam(NotificationQueue, "width", setWidth, getWidth, xmlElement, mode);
     }
     
@@ -84 +88 @@
     }
     
+    bool NotificationQueue::setWidth(int width)
+    {
+        if(width > 0)
+        {
+            this->width_ = width;
+            return true;
+        }
+        return false;
+    }
+    
     void NotificationQueue::setQueueText(const std::string & text)
     {

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

@@ -62 +62 @@
             int getLength(void) const
                 { return this->length_; }
+            int getWidth(void) const
+                { return this->width_; }
             
             void setQueueText(const std::string & text);
             bool setLength(int length);
+            bool setWidth(int width);
             
         private:
             Ogre::UTFString queueText_;
             int length_;
+            int width_;
     
     };