From 9df64e6c645db3aa96fcdb1878f72a9b95e99aeb 2017-11-24 10:07:09
From: Alexandre Leroux <aleroux@itlink.fr>
Date: 2017-11-24 10:07:09
Subject: [PATCH] Adds the color scale in edting in color scale editor

---

diff --git a/gui/include/Visualization/ColorScaleEditor.h b/gui/include/Visualization/ColorScaleEditor.h
index f5cdd58..acc9ff4 100644
--- a/gui/include/Visualization/ColorScaleEditor.h
+++ b/gui/include/Visualization/ColorScaleEditor.h
@@ -8,6 +8,7 @@ namespace Ui {
 class ColorScaleEditor;
 } // Ui
 
+class SqpColorScale;
 class QCPColorScale;
 
 /**
@@ -17,13 +18,18 @@ class ColorScaleEditor : public QDialog {
     Q_OBJECT
 
 public:
-    explicit ColorScaleEditor(QWidget *parent = 0);
+    explicit ColorScaleEditor(SqpColorScale &scale, QWidget *parent = 0);
     virtual ~ColorScaleEditor() noexcept;
 
 private:
     Ui::ColorScaleEditor *ui;
     QButtonGroup *m_ThresholdGroup;
-    QCPColorScale *m_PreviewScale; ///< Scale shown as preview
+    /// Scale in editing
+    /// @remarks reference must remain valid throughout the existence of the ColorScaleEditor
+    /// instance
+    SqpColorScale &m_Scale;
+    /// Scale shown as preview
+    QCPColorScale *m_PreviewScale;
 
 private slots:
     /// Slot called when max threshold value changes
diff --git a/gui/src/Visualization/ColorScaleEditor.cpp b/gui/src/Visualization/ColorScaleEditor.cpp
index e63aff4..9ccda52 100644
--- a/gui/src/Visualization/ColorScaleEditor.cpp
+++ b/gui/src/Visualization/ColorScaleEditor.cpp
@@ -1,5 +1,5 @@
 #include "Visualization/ColorScaleEditor.h"
-#include "Visualization/qcustomplot.h"
+#include "Visualization/SqpColorScale.h"
 
 #include "ui_ColorScaleEditor.h"
 
@@ -20,8 +20,11 @@ const auto GRADIENTS = QVariantMap{{"Candy", QCPColorGradient::gpCandy},
 
 } // namespace
 
-ColorScaleEditor::ColorScaleEditor(QWidget *parent)
-        : QDialog{parent}, ui{new Ui::ColorScaleEditor}, m_ThresholdGroup{new QButtonGroup{this}}
+ColorScaleEditor::ColorScaleEditor(SqpColorScale &scale, QWidget *parent)
+        : QDialog{parent},
+          ui{new Ui::ColorScaleEditor},
+          m_Scale{scale},
+          m_ThresholdGroup{new QButtonGroup{this}}
 {
     ui->setupUi(this);