From 8f9bae01502790e9985281fe7a9ed9f9ab37fa9c Mon Sep 17 00:00:00 2001
From: mathildemerle <mathilde.merle@ihu-liryc.fr>
Date: Thu, 16 Jan 2025 13:25:37 +0100
Subject: [PATCH] [4.0.7] polygonroi shift-click + remove contour (#872)

* [4.0.7] polygonroi shift-click + remove contour

* [4.0.7] release notes + voicutter pipeline metadata
---
 CMakeLists.txt                                   |  2 +-
 RELEASE_NOTES.txt                                |  7 +++++++
 packaging/apple/settings.json                    |  2 +-
 .../polygonRoi/toolboxes/polygonRoiToolBox.cpp   |  2 +-
 .../polygonRoi/viewevent/baseViewEvent.cpp       | 16 +++++++++++++++-
 .../polygonRoi/viewevent/defaultViewEvent.cpp    |  4 +++-
 .../legacy/voiCutter/voiCutterToolBox.cpp        |  1 -
 7 files changed, 28 insertions(+), 6 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index db2ccb3cce..e861d4e0c3 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -20,7 +20,7 @@ endif()
 cmake_policy(SET CMP0074 NEW)
 
 if(NOT DEFINED ${MEDINRIA_SUPERBUILD_VERSION})
-    set(MEDINRIA_SUPERBUILD_VERSION 4.0.6)
+    set(MEDINRIA_SUPERBUILD_VERSION 4.0.7)
 endif()
 
 SET(CMAKE_CXX_STANDARD 17)
diff --git a/RELEASE_NOTES.txt b/RELEASE_NOTES.txt
index 96a507fbda..1441272690 100644
--- a/RELEASE_NOTES.txt
+++ b/RELEASE_NOTES.txt
@@ -1,3 +1,10 @@
+MUSICardio 4.0.7:
+- PolygonROI:
+    * fix drawing a contour with shift-click to be able to change zoom/contrast with click.
+    * fix removing a last contour/node which reset the label tool and allow to draw again.
+- Registration step in pipelines allows to use Mouse Interaction Toolbox.
+- VOICutterToolBox fix a crash with metadata in pipelines sometimes if a cut has been made.
+
 MUSICardio 4.0.6:
 - Debug import of Carto .zip archives and .mesh files.
 - PolygonROI: remove shift-click to draw, fix contrast after deactivation of repulsor and hide deactivated widgets.
diff --git a/packaging/apple/settings.json b/packaging/apple/settings.json
index 9f5bea1fcd..4d5203c3a8 100644
--- a/packaging/apple/settings.json
+++ b/packaging/apple/settings.json
@@ -7,7 +7,7 @@
     "window": { "position": { "x": 100, "y": 100 },
                 "size": { "width": 640, "height": 300 } },
     "contents": [
-        { "x": 140, "y": 165, "type": "file", "path": "/Volumes/MUSICardio 4.0.6/MUSICardio.app" },
+        { "x": 140, "y": 165, "type": "file", "path": "/Volumes/MUSICardio 4.0.7/MUSICardio.app" },
         { "x": 480, "y": 165, "type": "link", "path": "/Applications" }
     ]
 }
diff --git a/src/plugins/legacy/polygonRoi/toolboxes/polygonRoiToolBox.cpp b/src/plugins/legacy/polygonRoi/toolboxes/polygonRoiToolBox.cpp
index 3ee5b22713..dccbed3fe4 100644
--- a/src/plugins/legacy/polygonRoi/toolboxes/polygonRoiToolBox.cpp
+++ b/src/plugins/legacy/polygonRoi/toolboxes/polygonRoiToolBox.cpp
@@ -608,7 +608,7 @@ void polygonRoiToolBox::showHelp() const
     
     QString main = QString("<h3>Main features</h3>")
         + QString("<ul>")
-        + QString("<li><b>Draw a contour</b>: click on the data to create a contour</li>")
+        + QString("<li><b>Draw a contour</b>: shift+click on the data to create a contour</li>")
         + QString("<li><b>Add a new label</b>: click on '+' button in the label list</li>")
         + QString("<li><b>Remove a label</b>: click on '-' button in the label list</li>")
         + QString("<li><b>Use a new label</b>: select a label in the list, then click on the data</li>")
diff --git a/src/plugins/legacy/polygonRoi/viewevent/baseViewEvent.cpp b/src/plugins/legacy/polygonRoi/viewevent/baseViewEvent.cpp
index aa2726b613..9df003938d 100644
--- a/src/plugins/legacy/polygonRoi/viewevent/baseViewEvent.cpp
+++ b/src/plugins/legacy/polygonRoi/viewevent/baseViewEvent.cpp
@@ -224,7 +224,7 @@ bool baseViewEvent::mousePressEvent(medAbstractView * view, QMouseEvent *mouseEv
             globalVtkLeftButtonBehaviour = view2d->GetLeftButtonInteractionStyle();
             view2d->SetLeftButtonInteractionStyle(vtkInteractorStyleImageView2D::InteractionTypeNull);
         }
-        else if (mouseEvent->modifiers() == Qt::NoModifier)
+        else if (mouseEvent->modifiers() == Qt::ShiftModifier)
         {
             for (polygonLabel *label : labelList)
             {
@@ -237,6 +237,20 @@ bool baseViewEvent::mousePressEvent(medAbstractView * view, QMouseEvent *mouseEv
             }
             leftButtonBehaviour(view);
         }
+        else if (mouseEvent->modifiers()==Qt::NoModifier)
+        {
+            if (!isRepulsorActivated )
+            {
+                vtkImageView2D *view2d = static_cast<medVtkViewBackend*>(currentView->backend())->view2D;
+                int currentLeftButtonBehaviour = view2d->GetLeftButtonInteractionStyle();
+                if (currentLeftButtonBehaviour != globalVtkLeftButtonBehaviour &&
+                currentLeftButtonBehaviour != vtkInteractorStyleImageView2D::InteractionTypeNull)
+                {
+                    globalVtkLeftButtonBehaviour = currentLeftButtonBehaviour;
+                }
+                view2d->SetLeftButtonInteractionStyle(globalVtkLeftButtonBehaviour);
+            }
+        }
     }
     else if (mouseEvent->button()==Qt::RightButton)
     {
diff --git a/src/plugins/legacy/polygonRoi/viewevent/defaultViewEvent.cpp b/src/plugins/legacy/polygonRoi/viewevent/defaultViewEvent.cpp
index 9d72485260..c3601433cc 100644
--- a/src/plugins/legacy/polygonRoi/viewevent/defaultViewEvent.cpp
+++ b/src/plugins/legacy/polygonRoi/viewevent/defaultViewEvent.cpp
@@ -62,7 +62,9 @@ void defaultViewEvent::deleteLabel(polygonLabel *manager)
     int position = deleteLabelBase(manager);
     if (position==-1)
     {
-        dLabelToolBox->unselectAll();
+        // The last contour/node of the data has been removed, we need to reset
+        dLabelToolBox->selectRow(0);
+        dLabelToolBox->forceItemSelection();
     }
     else
     {
diff --git a/src/plugins/legacy/voiCutter/voiCutterToolBox.cpp b/src/plugins/legacy/voiCutter/voiCutterToolBox.cpp
index b8bcfed9cd..42712511df 100644
--- a/src/plugins/legacy/voiCutter/voiCutterToolBox.cpp
+++ b/src/plugins/legacy/voiCutter/voiCutterToolBox.cpp
@@ -289,7 +289,6 @@ medAbstractData *voiCutterToolBox::processOutput()
 {
     if (d->resultData)
     {
-        fillOutputMetaData();
         return d->resultData;
     }
     else if (d->currentView)