From 31710669118f2ac01fafa3b84e6c353835f3d7ec 2018-12-10 13:13:54
From: Alexis Jeandet <alexis.jeandet@member.fsf.org>
Date: 2018-12-10 13:13:54
Subject: [PATCH] Restored multi "Zone" selection

Signed-off-by: Alexis Jeandet <alexis.jeandet@member.fsf.org>

---

diff --git a/gui/src/Visualization/VisualizationGraphWidget.cpp b/gui/src/Visualization/VisualizationGraphWidget.cpp
index 865f636..b51a579 100644
--- a/gui/src/Visualization/VisualizationGraphWidget.cpp
+++ b/gui/src/Visualization/VisualizationGraphWidget.cpp
@@ -14,6 +14,7 @@
 #include <Actions/ActionsGuiController.h>
 #include <Actions/FilteringAction.h>
 #include <Common/MimeTypesDef.h>
+#include <Common/containers.h>
 #include <Data/ArrayData.h>
 #include <Data/IDataSeries.h>
 #include <Data/SpectrogramSeries.h>
@@ -940,7 +941,17 @@ void VisualizationGraphWidget::mousePressEvent(QMouseEvent *event)
             impl->setSelectionZonesEditionEnabled(true);
             if ((event->modifiers() == Qt::ControlModifier) && (selectedZone != nullptr))
             {
-                    selectedZone->setAssociatedEditedZones(parentVisualizationWidget()->selectionZoneManager().selectedItems());
+                    auto alreadySelectedZones = parentVisualizationWidget()->selectionZoneManager().selectedItems();
+                    selectedZone->setAssociatedEditedZones(alreadySelectedZones);
+                    if(SciQLop::containers::contains(alreadySelectedZones, selectedZone))
+                    {
+                        alreadySelectedZones.removeOne(selectedZone);
+                    }
+                    else
+                    {
+                        alreadySelectedZones.append(selectedZone);
+                    }
+                    parentVisualizationWidget()->selectionZoneManager().select(alreadySelectedZones);
             }
             else
             {