merge fct

GUI/View/Scene/MaskGraphicsScene.cpp

@@ -447,13 +447,17 @@ void MaskGraphicsScene::processLineItem(QGraphicsSceneMouseEvent* event)
     QPointF pos = event->buttonDownScenePos(Qt::LeftButton);
 
     if (Canvas2DMode::isVerticalLine(m_mode))
-        addLine(new VerticalLineItem(m_plot->xAxis->pixelToCoord(pos.x())));
+        m_active_mask = new VerticalLineItem(m_plot->xAxis->pixelToCoord(pos.x()));
     else if (Canvas2DMode::isHorizontalLine(m_mode))
-        addLine(new HorizontalLineItem(m_plot->yAxis->pixelToCoord(pos.y())));
+        m_active_mask = new HorizontalLineItem(m_plot->yAxis->pixelToCoord(pos.y()));
     else
         ASSERT_NEVER;
 
-    ASSERT(m_active_mask);
+    if (Canvas2DMode::isPrjn(m_mode))
+        m_prjns->add_item(m_active_mask );
+    else
+        m_masks->add_item(m_active_mask );
+
     emit m_active_mask->maskGeometryChanged();
 
     m_active_mask->setMaskValue(m_mask_value);
@@ -463,15 +467,6 @@ void MaskGraphicsScene::processLineItem(QGraphicsSceneMouseEvent* event)
     setDrawingInProgress(false);
 }
 
-void MaskGraphicsScene::addLine(LineItem* item)
-{
-    if (Canvas2DMode::isPrjn(m_mode))
-        m_prjns->add_item(item);
-    else
-        m_masks->add_item(item);
-    m_active_mask = item;
-}
-
 // TODO: check FullframeItem
 void MaskGraphicsScene::processFullframeItem(QGraphicsSceneMouseEvent* event)
 {

GUI/View/Scene/MaskGraphicsScene.h

@@ -63,7 +63,6 @@ private:
     void updateOverlays();
     IOverlay* registerOverlay(OverlayItem* item);
     void removeOverlay(OverlayItem* item);
-    void addLine(LineItem*);
 
     void setDrawingInProgress(bool value);