Changeset 8801 for code/branches/output/src/libraries/util

Timestamp:

Jul 30, 2011, 9:31:05 PM (13 years ago)

Author:

landauf

Message:

fixed bug with multiple lines in shell.
adjusted colors in IOConsole and InGameConsole a bit

Location:

code/branches/output/src/libraries/util

Files:

• StringUtils.cc (modified) (2 diffs)
• StringUtils.h (modified) (3 diffs)
• output/OutputManager.cc (modified) (2 diffs)

code/branches/output/src/libraries/util/StringUtils.cc

@@ -79 +79 @@
         for (; pos2 > 0         && (str[pos2] == ' ' || str[pos2] == '\t' || str[pos2] == '\n'); pos2--);
         return str.substr(pos1, pos2 - pos1 + 1);
+    }
+
+    /// Splits a given string by a delimiter and stores it in an output vector
+    void vectorize(const std::string& str, char delimiter, std::vector<std::string>* output)
+    {
+        for (size_t start = 0, end = 0; end != std::string::npos; start = end + 1)
+        {
+            end = str.find_first_of(delimiter, start);
+            output->push_back(str.substr(start, end - start));
+        }
     }
 
@@ -517 +527 @@
         return matrix[(rows-1)*cols + cols-1];
     }
-    
+
     /**
     @brief

code/branches/output/src/libraries/util/StringUtils.h

@@ -43 +43 @@
 #include "UtilPrereqs.h"
 #include <string>
+#include <vector>
 
 namespace orxonox
@@ -54 +55 @@
 
     _UtilExport std::string  removeTrailingWhitespaces(const std::string& str);
+
+    _UtilExport void         vectorize(const std::string& str, char delimiter, std::vector<std::string>* output);
 
     _UtilExport size_t       getNextQuote(const std::string& str, size_t start);
@@ -88 +91 @@
 
     _UtilExport unsigned int getLevenshteinDistance(const std::string& str1, const std::string& str2);
-    
+
     _UtilExport std::string  getTimestamp(void);
 }

code/branches/output/src/libraries/util/output/OutputManager.cc

@@ -32 +32 @@
 #include "ConsoleWriter.h"
 #include "LogWriter.h"
+#include "util/StringUtils.h"
 
 namespace orxonox
@@ -65 +66 @@
     {
         std::vector<std::string> lines;
-        for (size_t start = 0, end = 0; end != std::string::npos; start = end + 1)
-        {
-            end = message.find_first_of('\n', start);
-            lines.push_back(message.substr(start, end));
-        }
+        vectorize(message, '\n', &lines);
 
         for (size_t i = 0; i < this->listeners_.size(); ++i)