diff --git a/GUI/Model/Data/Data2DItem.cpp b/GUI/Model/Data/Data2DItem.cpp index f6cefd2e0b6906d5b86e9874d5b391d9a982536e..20438633e2285a7ac3f192b8026b3d16edce9ba9 100644 --- a/GUI/Model/Data/Data2DItem.cpp +++ b/GUI/Model/Data/Data2DItem.cpp @@ -37,10 +37,8 @@ const QString ZAxis("ZAxis"); } // namespace Tag -const QCPColorGradient infernoGradient = GUI::QCP_Util::colorGradientInferno(); - // 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}, @@ -52,9 +50,8 @@ 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 = {{"Inferno", infernoGradient}}; + {"Hues", QCPColorGradient::gpHues}, + {"Inferno", GUI::QCP_Util::colorGradientInferno()}}; const QString startGradient = "Inferno"; @@ -64,7 +61,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>()) { } @@ -137,9 +134,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 @@ -152,6 +147,7 @@ void Data2DItem::setCurrentGradient(const QString& gradient) m_gradient->setCurrentValue(gradient); emit gradientChanged(); } + bool Data2DItem::isLog() const { return zAxisItem()->isLogScale(); @@ -161,6 +157,7 @@ void Data2DItem::setLog(bool islog) { zAxisItem()->setLogScale(islog); } + void Data2DItem::setInterpolated(bool interp) { m_is_interpolated = interp;