fix #16080

Author: namdre

src/utils/gui/settings/GUISettingsHandler.cpp

@@ -503,7 +503,8 @@ GUISettingsHandler::parseRainbowSettings(
                StringUtils::toDouble(attrs.getStringSecure(prefix + "HideThreshold2", toString(defaults.maxThreshold))),
                StringUtils::toBool(attrs.getStringSecure(prefix + "SetNeutral", toString(defaults.hideMax))),
                StringUtils::toDouble(attrs.getStringSecure(prefix + "NeutralThreshold", toString(defaults.neutralThreshold))),
-               StringUtils::toBool(attrs.getStringSecure(prefix + "FixRange", toString(defaults.fixRange))));
+               StringUtils::toBool(attrs.getStringSecure(prefix + "FixRange", toString(defaults.fixRange))),
+               StringUtils::toInt(attrs.getStringSecure(prefix + "RainbowScheme", toString(defaults.rainbowScheme))));
 }
 
 const std::vector<std::string>&

src/utils/gui/settings/GUIVisualizationSettings.cpp

@@ -286,14 +286,16 @@ GUIVisualizationTextSettings::show(const GUIGlObject* o) const {
 // GUIVisualizationRainbowSettings - methods
 // ---------------------------------------------------------------------------
 
-GUIVisualizationRainbowSettings::GUIVisualizationRainbowSettings(bool _hideMin, double _minThreshold, bool _hideMax, double _maxThreshold, bool _setNeutral, double _neutralThreshold, bool _fixRange) :
+GUIVisualizationRainbowSettings::GUIVisualizationRainbowSettings(bool _hideMin, double _minThreshold, bool _hideMax, double _maxThreshold, bool _setNeutral,
+        double _neutralThreshold, bool _fixRange, int _rainbowScheme) :
     hideMin(_hideMin),
     minThreshold(_minThreshold),
     hideMax(_hideMax),
     maxThreshold(_maxThreshold),
     setNeutral(_setNeutral),
     neutralThreshold(_neutralThreshold),
     fixRange(_fixRange),
+    rainbowScheme(_rainbowScheme),
     colors(GUIVisualizationSettings::RAINBOW_SCHEMES["classic"])
 { }
 
@@ -306,7 +308,8 @@ GUIVisualizationRainbowSettings::operator==(const GUIVisualizationRainbowSetting
            (maxThreshold == other.maxThreshold) &&
            (setNeutral == other.setNeutral) &&
            (neutralThreshold == other.neutralThreshold) &&
-           (fixRange == other.fixRange);
+           (fixRange == other.fixRange) &&
+           (rainbowScheme == other.rainbowScheme);
 }
 
 
@@ -325,6 +328,7 @@ GUIVisualizationRainbowSettings::print(OutputDevice& dev, const std::string& nam
     dev.writeAttr(name + "SetNeutral", setNeutral);
     dev.writeAttr(name + "NeutralThreshold", neutralThreshold);
     dev.writeAttr(name + "FixRange", fixRange);
+    dev.writeAttr(name + "RainbowScheme", rainbowScheme);
 }
 
 
@@ -586,7 +590,7 @@ GUIVisualizationSettings::GUIVisualizationSettings(const std::string& _name, boo
     edgeData("speed"),
     edgeDataID(""),
     edgeDataScaling(""),
-    edgeValueRainBow(false, 0, false, 200, false, 0, false),
+    edgeValueRainBow(false, 0, false, 200, false, 0, false, 1),
     vehicleQuality(0), showBlinker(true),
     drawLaneChangePreference(false),
     drawMinGap(false),
@@ -622,7 +626,7 @@ GUIVisualizationSettings::GUIVisualizationSettings(const std::string& _name, boo
     drawJunctionShape(true),
     drawCrossingsAndWalkingareas(true),
     junctionSize(1),
-    junctionValueRainBow(false, 0, false, 100, false, 0, false),
+    junctionValueRainBow(false, 0, false, 100, false, 0, false, 1),
     addMode(0),
     addSize(1),
     addName(false, 60, RGBColor(255, 0, 128, 255)),
@@ -643,7 +647,7 @@ GUIVisualizationSettings::GUIVisualizationSettings(const std::string& _name, boo
     tazRelWidthExaggeration(1),
     edgeRelWidthExaggeration(1),
     relDataAttr("count"),
-    dataValueRainBow(false, -100, false, 100, false, 0, false),
+    dataValueRainBow(false, -100, false, 100, false, 0, false, 1),
     show3DTLSLinkMarkers(true),
     show3DTLSDomes(true),
     generate3DTLSModels(false),

src/utils/gui/settings/GUIVisualizationSettings.h

@@ -89,7 +89,8 @@ struct GUIVisualizationTextSettings {
 struct GUIVisualizationRainbowSettings {
 
     /// @brief constructor
-    GUIVisualizationRainbowSettings(bool _hideMin, double _minThreshold, bool _hideMax, double _maxThreshold, bool _setNeutral, double _neutralThreshold, bool _fixRange);
+    GUIVisualizationRainbowSettings(bool _hideMin, double _minThreshold, bool _hideMax, double _maxThreshold, bool _setNeutral,
+            double _neutralThreshold, bool _fixRange, int _rainboScheme);
 
     /// @brief equality comparator
     bool operator==(const GUIVisualizationRainbowSettings& other);
@@ -114,6 +115,8 @@ struct GUIVisualizationRainbowSettings {
     double neutralThreshold;
     /// @brief whether the color scale should be fixed to the given min/max values
     bool fixRange;
+    /// @brief index in the list of color schemes
+    int rainbowScheme;
     /// @brief color steps for the rainbow;
     std::vector<RGBColor> colors;
 };

src/utils/gui/windows/GUIDialog_ViewSettings.cpp

@@ -1691,10 +1691,11 @@ GUIDialog_ViewSettings::RainbowPanel::RainbowPanel(
     FXMatrix* matrixRainbow = new FXMatrix(parent, 9, GUIDesignViewSettingsMatrix3);
     myColorRainbow = GUIDesigns::buildFXButton(matrixRainbow, TL("Recalibrate Rainbow"), "", "", nullptr, target, MID_SIMPLE_VIEW_COLORCHANGE,
                      (BUTTON_DEFAULT | FRAME_RAISED | FRAME_THICK | LAYOUT_TOP | LAYOUT_LEFT), 0, 0, 0, 0, 20, 20, 4, 4);
-    myRainbowStyle = new MFXComboBoxIcon(matrixRainbow, 5, false, 10, target, MID_SIMPLE_VIEW_RAINBOW_CHANGE, GUIDesignViewSettingsComboBox1);
+    myRainbowStyle = new MFXComboBoxIcon(matrixRainbow, 5, false, 10, target, MID_SIMPLE_VIEW_COLORCHANGE, GUIDesignViewSettingsComboBox1);
     for (auto item : GUIVisualizationSettings::RAINBOW_SCHEMES) {
         myRainbowStyle->appendIconItem(item.first.c_str());
     }
+    myRainbowStyle->setCurrentItem(settings.rainbowScheme);
     myHideMinCheck = new FXCheckButton(matrixRainbow, TL("min"), target, MID_SIMPLE_VIEW_COLORCHANGE, GUIDesignCheckButtonViewSettings);
     myHideMinCheck->setCheck(settings.hideMin);
     myMinThreshold = new FXRealSpinner(matrixRainbow, 6, target, MID_SIMPLE_VIEW_COLORCHANGE, REALSPIN_NOMIN | GUIDesignViewSettingsSpinDial2);
@@ -1723,7 +1724,8 @@ GUIDialog_ViewSettings::RainbowPanel::getSettings() {
                                         myMaxThreshold->getValue(),
                                         mySetNeutral->getCheck() != FALSE,
                                         myNeutralThreshold->getValue(),
-                                        myFixRange->getCheck() != FALSE);
+                                        myFixRange->getCheck() != FALSE,
+                                        myRainbowStyle->getCurrentItem());
     std::string sName = myRainbowStyle->getItemText(myRainbowStyle->getCurrentItem());
     res.colors = GUIVisualizationSettings::RAINBOW_SCHEMES[sName];
     return res;
@@ -1739,6 +1741,7 @@ GUIDialog_ViewSettings::RainbowPanel::update(const GUIVisualizationRainbowSettin
     mySetNeutral->setCheck(settings.setNeutral);
     myNeutralThreshold->setValue(settings.neutralThreshold);
     myFixRange->setCheck(settings.fixRange);
+    myRainbowStyle->setCurrentItem(settings.rainbowScheme);
 }
 
 void