Fix multi-curve

base/plugins/curve_plugin/Automation/AutomationPresenter.cpp

@@ -89,11 +89,13 @@ void AutomationPresenter::setHeight(int height)
 
 void AutomationPresenter::putToFront()
 {
+    m_curve->enable();
     m_view->setFlag(QGraphicsItem::ItemStacksBehindParent, false);
 }
 
 void AutomationPresenter::putBehind()
 {
+    m_curve->disable();
     m_view->setFlag(QGraphicsItem::ItemStacksBehindParent, true);
 }
 

base/plugins/curve_plugin/QCustomPlotProcess/QCustomPlotCurve.cpp

@@ -1,7 +1,8 @@
 #include "QCustomPlotCurve.hpp"
 
-static const QColor outerColor{200, 30, 0};
+static const QColor outerColor{QColor{200, 30, 0}};
 static const QColor innerColor{255, 200, 200};
+static const QColor disabledColor{QColor{100, 100, 100, 200}};
 
 double clamp(double val, double min, double max)
 {
@@ -106,6 +107,18 @@ class PointsLayer : public QGraphicsItem
 {
         QRectF m_rect;
     public:
+        void enable()
+        {
+            setVisible(true);
+            update();
+        }
+
+        void disable()
+        {
+            setVisible(false);
+            update();
+        }
+
         PointsLayer(QCustomPlotCurve* parent):
             QGraphicsItem{parent}
         {
@@ -137,7 +150,7 @@ class PointsLayer : public QGraphicsItem
             painter->setBrush(outerColor);
 
             for(auto pt : m_points)
-                painter->drawEllipse(pt, 5, 5);
+                painter->drawEllipse(pt, 3, 3);
         }
 
     private:
@@ -175,6 +188,23 @@ QCustomPlotCurve::QCustomPlotCurve(QGraphicsItem* parent):
     m_points->setZValue(2);
 }
 
+void QCustomPlotCurve::enable()
+{
+    m_pen = QPen{outerColor, 3};
+    m_plot->graph()->setPen(m_pen);
+    m_plot->replot();
+    m_points->enable();
+}
+
+void QCustomPlotCurve::disable()
+{
+    m_pen = disabledColor;
+    m_plot->graph()->setPen(m_pen);
+    m_plot->replot();
+    m_points->disable();
+    this->update();
+}
+
 void QCustomPlotCurve::setPoints(const QList<QPointF>& list)
 {
     // QCustomPlot
@@ -184,7 +214,6 @@ void QCustomPlotCurve::setPoints(const QList<QPointF>& list)
     {
         x.push_back(pt.x());
         y.push_back(1. - pt.y());
-
     }
 
     m_plot->removeGraph(0);
@@ -254,6 +283,15 @@ QList<QPointF> QCustomPlotCurve::pointsToPixels(const QCPDataMap& data)
     return mappedPoints;
 }
 
+QRectF QCustomPlotCurve::boundingRect() const
+{
+    return {0, 0, m_size.width(), m_size.height()};
+}
+
+void QCustomPlotCurve::paint(QPainter* painter, const QStyleOptionGraphicsItem* option, QWidget* widget)
+{
+}
+
 QDebug& operator<<(QDebug& d, const QCPData& data)
 {
     return d << "(" << data.key << ", " << data.value << ")";

base/plugins/curve_plugin/QCustomPlotProcess/QCustomPlotCurve.hpp

@@ -13,19 +13,18 @@ class QCustomPlotCurve : public QGraphicsObject
     public:
         QCustomPlotCurve(QGraphicsItem* parent);
 
+        void enable();
+
+        void disable();
+
         void setPoints(const QList<QPointF>& list);
         void setSize(const QSizeF& size);
 
 
         QList<QPointF> pointsToPixels(const QCPDataMap& data);
-        QRectF boundingRect() const
-        {
-            return {0, 0, m_size.width(), m_size.height()};
-        }
+        QRectF boundingRect() const;
 
-        void paint(QPainter* painter, const QStyleOptionGraphicsItem* option, QWidget* widget)
-        {
-        }
+        void paint(QPainter* painter, const QStyleOptionGraphicsItem* option, QWidget* widget);
 
         void redraw();
 
@@ -52,4 +51,6 @@ class QCustomPlotCurve : public QGraphicsObject
 
         QSizeF m_size;
         QPointF m_backedUpPoint{-1, -1};
+
+        QPen m_pen;
 };

base/plugins/scenario/source/Document/Constraint/Box/Deck/DeckModel.cpp

@@ -42,8 +42,7 @@ void DeckModel::addProcessViewModel(ProcessViewModelInterface* viewmodel)
 
     emit processViewModelCreated(viewmodel->id());
 
-    if(m_processViewModels.size() == 1)
-        selectForEdition(viewmodel->id());
+    selectForEdition(viewmodel->id());
 }
 
 void DeckModel::deleteProcessViewModel(id_type<ProcessViewModelInterface> processViewId)

base/plugins/scenario/source/Document/Constraint/Box/Deck/DeckModel.hpp

@@ -56,6 +56,8 @@ class DeckModel : public IdentifiedObject<DeckModel>
          * the edited process when the interface is clicked.
          */
         void selectForEdition(id_type<ProcessViewModelInterface> processViewId);
+        id_type<ProcessViewModelInterface> editedProcessViewModel() const
+        { return m_editedProcessViewModelId; }
 
         const std::vector<ProcessViewModelInterface*>& processViewModels() const;
         ProcessViewModelInterface* processViewModel(id_type<ProcessViewModelInterface> processViewModelId) const;
@@ -67,10 +69,6 @@ class DeckModel : public IdentifiedObject<DeckModel>
         ConstraintModel* parentConstraint() const;
 
 
-        id_type<ProcessViewModelInterface> editedProcessViewModel() const
-        {
-            return m_editedProcessViewModelId;
-        }
 
         int height() const;
         bool focus() const;

base/plugins/scenario/source/Document/Constraint/Box/Deck/DeckPresenter.cpp

@@ -143,7 +143,7 @@ void DeckPresenter::on_processViewModelDeleted(id_type<ProcessViewModelInterface
 
 void DeckPresenter::on_processViewModelSelected(id_type<ProcessViewModelInterface> processId)
 {
-    // Put the selected one at z+1 and the others at z+2; set "disabled" graphics mode.
+    // Put the selected one at z+1 and the others at -z; set "disabled" graphics mode.
     for(auto& pair : m_processes)
     {
         if(pair.first->viewModelId() == processId)
@@ -197,6 +197,10 @@ void DeckPresenter::on_processViewModelCreated_impl(ProcessViewModelInterface* p
         m_view->disable();
 
     m_processes.push_back({proc_pres, proc_view});
+    if(m_model->editedProcessViewModel() == proc_vm->id())
+    {
+        on_processViewModelSelected(proc_vm->id());
+    }
     updateProcessesShape();
 }