now making constraint params retrievable via gui. refs #11880, #36

eclipse-sumo · Oct 27, 2022 · 71c5c66 · 71c5c66
1 parent 878c070
commit 71c5c66
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 2 deletions.
diff --git a/src/microsim/traffic_lights/MSRailSignalConstraint.cpp b/src/microsim/traffic_lights/MSRailSignalConstraint.cpp
@@ -195,8 +195,12 @@ MSRailSignalConstraint_Predecessor::getDescription() const {
     if (passedIDs.size() > 0) {
         passedIDs2 = " (" + toString(passedIDs) + ")";
     }
+    std::string params = "";
+    for (auto item : getParametersMap()) {
+        params += ("\n  key=" + item.first + " value=" + item.second);
+    }
     return (toString(getTag()) + "  " + myTripId + vehID + " at signal " + myTrackers.front()->getLane()->getEdge().getFromJunction()->getID()
-            + " passed=" + StringUtils::prune(toString(myTrackers.front()->myPassed)) + passedIDs2);
+            + " passed=" + StringUtils::prune(toString(myTrackers.front()->myPassed)) + passedIDs2 + params);
 }
 
 // ===========================================================================

diff --git a/src/utils/gui/div/GUIParameterTableItem.h b/src/utils/gui/div/GUIParameterTableItem.h
@@ -155,6 +155,10 @@ class GUIParameterTableItem : public GUIParameterTableItemInterface {
         } else {
             myTable->setItemIcon(myTablePosition, 2, GUIIconSubSys::getIcon(GUIIcon::NO));
         }
+        int lineBreaks = std::count(value.begin(), value.end(), '\n');
+        if (lineBreaks > 0) {
+            myTable->setRowHeight(myTablePosition, myTable->getRowHeight(myTablePosition) * (lineBreaks + 1));
+        }
         myTable->setItemJustify(myTablePosition, 2, FXTableItem::CENTER_X | FXTableItem::CENTER_Y);
     }
 

diff --git a/src/utils/gui/div/GUIParameterTableWindow.cpp b/src/utils/gui/div/GUIParameterTableWindow.cpp
@@ -257,7 +257,12 @@ GUIParameterTableWindow::closeBuilding(const Parameterised* p) {
         }
     }
     const int rows = (int)myItems.size() + 1;
-    setHeight(rows * 20 + 40);
+    int height = rows * 20 + 40;
+    // adjust size in case there are higher (multi-line) rows
+    for (int i = 0; i < (int)myItems.size(); i++) {
+        height += MAX2(0, myTable->getRowHeight(i) - 20);
+    }
+    setHeight(height);
     myTable->fitColumnsToContents(1);
     setWidth(myTable->getContentWidth() + 40);
     myTable->setVisibleRows(rows);