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

Timestamp:

Dec 6, 2008, 9:46:11 PM (16 years ago)

Author:

dafrick

Message:

• Completed the message clipping method for Notifications.
• Some other minor changes…

Location:

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

Files:

• NotificationManager.cc (modified) (4 diffs)
• NotificationManager.h (modified) (1 diff)

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

@@ -104 +104 @@
                 continue;
             
-            text = text + "\n\n\n------------\n\n" + container->notification->getTitle() + "\n\n" + container->notification->getMessage();
+            text = text + "\n\n\n------------\n\n" + clipMessage(container->notification->getTitle()) + "\n\n" + clipMessage(container->notification->getMessage());
         }
         
@@ -110 +110 @@
     }
     
-    const std::string & NotificationManager::clipMessage(const std::string & message)
+    const std::string NotificationManager::clipMessage(const std::string & str)
     {
-        std::string* clippedMessageP = new std::string();
-        std::string clippedMessage = *clippedMessageP;
-        clippedMessage = "";
-        std::string tempWord = "";
+    
+        std::string message = str;
+        unsigned int i = 0;
+        
+        unsigned int found = message.find("\\n", i);
+        while(found != std::string::npos)
+        {
+            message.replace(found, 2, "\n");
+            i = found+2;
+            found = message.find("\\n", i);
+        }
+    
+        std::string clippedMessage = "";
         int wordLength = 0;
-        signed int i = 0;
+        i = 0;
         int widthLeft = NotificationQueue::queue_s->getWidth();
         while(i < message.length())
@@ -123 +132 @@
             while(i < message.length() && message[i] != ' ' && message[i] != '\n')
             {
-                tempWord = tempWord + message[i];
                 i++;
                 wordLength++;
@@ -130 +138 @@
             if(wordLength <= widthLeft)
             {
-                clippedMessage = clippedMessage + tempWord + message[i];
+                clippedMessage = clippedMessage + message.substr(i-wordLength, wordLength);
+                if(i < message.length())
+                {
+                    clippedMessage = clippedMessage + message.substr(i,1);
+                }
                 widthLeft -= (wordLength+1);
+                if(message[i] == '\n')
+                {
+                    widthLeft = NotificationQueue::queue_s->getWidth() - (wordLength+1);
+                }
                 wordLength = 0;
-                tempWord = "";
                 i++;
             }
             else
             {
-                clippedMessage = clippedMessage + '\n' + tempWord + message[i];
+                clippedMessage.push_back('\n');
+                clippedMessage = clippedMessage + message.substr(i-wordLength, wordLength);
+                if(i < message.length())
+                {
+                    clippedMessage = clippedMessage + message.substr(i,1);
+                }
                 widthLeft = NotificationQueue::queue_s->getWidth() - (wordLength+1);
                 i++;
                 wordLength = 0;
-                tempWord = "";
             }
         }

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

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