fix time links ending with a comma, some refactoring #12 fix #14931

eclipse-sumo · Jun 15, 2024 · f778750 · f778750
1 parent 239bd2e
commit f778750
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 5 deletions.
diff --git a/src/utils/gui/div/GUIMessageWindow.cpp b/src/utils/gui/div/GUIMessageWindow.cpp
@@ -110,8 +110,8 @@ GUIMessageWindow::getActiveStringObject(const FXString& text, const FXint pos, c
 }
 
 SUMOTime
-GUIMessageWindow::getTimeString(const FXString& text, const FXint pos, const FXint /*lineS*/, const FXint /*lineE*/) const {
-    const FXint end = text.find(" ", pos + 1);
+GUIMessageWindow::getTimeString(const FXString& text, const FXint pos) const {
+    const FXint end = text.find_first_of(" ,", pos + 1);
     std::string time;
     if (end >= 0) {
         time = text.mid(pos, end - pos).text();
@@ -173,7 +173,7 @@ GUIMessageWindow::setCursorPos(FXint pos, FXbool notify) {
                 timePos += (int)std::string(TL(" time")).size() + 1;
                 SUMOTime t = -1;
                 if (pos >= 0 && pos > start + timePos) {
-                    t = getTimeString(candidate, timePos, 0, (int)candidate.length());
+                    t = getTimeString(candidate, timePos);
                     if (t >= 0) {
                         t += myBreakPointOffset;
                         std::vector<SUMOTime> breakpoints = myMainWindow->retrieveBreakpoints();
@@ -244,7 +244,7 @@ GUIMessageWindow::appendMsg(GUIEventType eType, const std::string& msg) {
         const int timeTerm = (int)std::string(TL(" time")).size() + 1;
         SUMOTime t = -1;
         if (pos >= 0) {
-            t = getTimeString(text, pos + timeTerm, 0, text.length());
+            t = getTimeString(text, pos + timeTerm);
         }
         if (t >= 0) {
             FXString insText = text.left(pos + timeTerm);

diff --git a/src/utils/gui/div/GUIMessageWindow.h b/src/utils/gui/div/GUIMessageWindow.h
@@ -155,7 +155,7 @@ class GUIMessageWindow : public FXText {
     const GUIGlObject* getActiveStringObject(const FXString& text, const FXint pos, const FXint lineS, const FXint lineE) const;
 
     /// @brief get time string object
-    SUMOTime getTimeString(const FXString& text, const FXint pos, const FXint lineS, const FXint lineE) const;
+    SUMOTime getTimeString(const FXString& text, const FXint pos) const;
 
     /// @brief fill styles
     void fillStyles();