merge gradient maps

GUI/Model/Data/Data2DItem.cpp

@@ -42,7 +42,7 @@ const QString ZAxis("ZAxis");
 } // namespace Tag
 
 // gradient map for colormaps
-const QMap<QString, QCPColorGradient::GradientPreset> gradient_map = {
+const QMap<QString, QCPColorGradient> gradient_map = {
     {"Grayscale", QCPColorGradient::gpGrayscale},
     {"Hot", QCPColorGradient::gpHot},
     {"Cold", QCPColorGradient::gpCold},
@@ -54,9 +54,7 @@ const QMap<QString, QCPColorGradient::GradientPreset> gradient_map = {
     {"Polar", QCPColorGradient::gpPolar},
     {"Spectrum", QCPColorGradient::gpSpectrum},
     {"Jet", QCPColorGradient::gpJet},
-    {"Hues", QCPColorGradient::gpHues}};
-
-const QMap<QString, QCPColorGradient> custom_gradient_map = {
+    {"Hues", QCPColorGradient::gpHues},
     {"Inferno", GUI::QCP_Util::colorGradientInferno()}};
 
 const QString startGradient = "Inferno";
@@ -67,7 +65,7 @@ Data2DItem::Data2DItem()
     : DataItem(M_TYPE)
     , m_is_interpolated(true)
     , m_gradient(std::make_unique<ComboProperty>(
-          ComboProperty::fromList(gradient_map.keys() + custom_gradient_map.keys(), startGradient)))
+          ComboProperty::fromList(::gradient_map.keys(), ::startGradient)))
     , m_z_axis(std::make_unique<AmplitudeAxisItem>())
 {
 }
@@ -140,9 +138,7 @@ bool Data2DItem::isZoomed() const
 
 QCPColorGradient Data2DItem::currentGradientQCP() const
 {
-    if (gradient_map.contains(currentGradient()))
-        return gradient_map.value(currentGradient());
-    return custom_gradient_map.value(currentGradient());
+    return ::gradient_map.value(currentGradient());
 }
 
 QString Data2DItem::currentGradient() const
@@ -155,6 +151,7 @@ void Data2DItem::setCurrentGradient(const QString& gradient)
     m_gradient->setCurrentValue(gradient);
     emit gradientChanged();
 }
+
 bool Data2DItem::isLog() const
 {
     return zAxisItem()->isLogScale();
@@ -164,6 +161,7 @@ void Data2DItem::setLog(bool islog)
 {
     zAxisItem()->setLogScale(islog);
 }
+
 void Data2DItem::setInterpolated(bool interp)
 {
     m_is_interpolated = interp;