#3566 Bug conflict between key control and rotation for WindowLevel interaction ViewerNV

diff --git a/bbtk/bbs/boxes/HelpViewerNV.bbg b/bbtk/bbs/boxes/HelpViewerNV.bbg
index 59f148221f5bfd819b517668dd2a98ffa18d2e40..91f7ceb8c6e34a45d6ab3ae973632714aa5cdc45 100644 (file)
--- a/bbtk/bbs/boxes/HelpViewerNV.bbg
+++ b/bbtk/bbs/boxes/HelpViewerNV.bbg
@@ -38,7 +38,7 @@ ISEXEC:FALSE
 -41.635588:20.595310:-900.000000
 -19.965588:18.095310:-900.000000
 PORT
-In:"-Zoom&&2P&& Drag ctrl-right click mouse"
+In:"-Zoom&&2P&& Drag ctrl + right click mouse"
 FIN_BOX
 BOX
 wx:OutputText:Box05
@@ -54,7 +54,7 @@ ISEXEC:FALSE
 -2.908660:11.662815:-900.000000
 18.761340:9.162815:-900.000000
 PORT
-In:"-Move image&&2P&& Drag shift-left click mouse"
+In:"-Move image&&2P&& Drag shift + left click mouse"
 FIN_BOX
 BOX
 wx:OutputText:Box07
@@ -62,7 +62,7 @@ ISEXEC:FALSE
 10.740541:5.951831:-900.000000
 32.410541:3.451831:-900.000000
 PORT
-In:"-Rotate image&&2P&& Drag ctrl-middle click mouse"
+In:"-Rotate image&&2P&& Drag ctrl + middle click mouse"
 FIN_BOX
 BOX
 wx:OutputText:Box08
@@ -94,7 +94,7 @@ ISEXEC:FALSE
 -72.242839:29.539474:-900.000000
 -50.572839:27.039474:-900.000000
 PORT
-In:"-Brightness / Contrast&&2P&& Drag middle click mouse (ctrl reset)"
+In:"-Brightness&&2P&& Drag middle click mouse ( +ctrl  reset values)"
 FIN_BOX
 BOX
 wx:StaticBox:Box12

diff --git a/bbtk/bbs/boxes/HelpViewerNV.bbs b/bbtk/bbs/boxes/HelpViewerNV.bbs
index 95edde025d07404fd418456c21ac18c1178d5579..4353de4eb0acfb78de981533414fe66a742a08df 100644 (file)
--- a/bbtk/bbs/boxes/HelpViewerNV.bbs
+++ b/bbtk/bbs/boxes/HelpViewerNV.bbs
@@ -20,16 +20,16 @@ new wx:OutputText Box03
   set Box03.In "-Change Z: Drag right click mouse"
 
 new wx:OutputText Box04
-  set Box04.In "-Zoom: Drag ctrl-right click mouse"
+  set Box04.In "-Zoom: Drag ctrl + right click mouse"
 
 new wx:OutputText Box05
   set Box05.In "-Zoom: Wheel mouse"
 
 new wx:OutputText Box06
-  set Box06.In "-Move image: Drag shift-left click mouse"
+  set Box06.In "-Move image: Drag shift + left click mouse"
 
 new wx:OutputText Box07
-  set Box07.In "-Rotate image: Drag ctrl-middle click mouse"
+  set Box07.In "-Rotate image: Drag ctrl + middle click mouse"
 
 new wx:OutputText Box08
   set Box08.In "-Picker (position, gray level): Mouse move"
@@ -41,7 +41,7 @@ new wx:OutputText Box10
   set Box10.In "-Choose a point: Double click "
 
 new wx:OutputText Box11
-  set Box11.In "-Brightness / Contrast: Drag middle click mouse (ctrl reset)"
+  set Box11.In "-Brightness: Drag middle click mouse ( +ctrl  reset values)"
 
 new wx:StaticBox Box12
   set Box12.BoxTitle "Viewer"

diff --git a/lib/maracasVisuLib/src/interface/wxWindows/widgets/manualInteractorWindowLevel.cxx b/lib/maracasVisuLib/src/interface/wxWindows/widgets/manualInteractorWindowLevel.cxx
index 8868df4ca180a9d8547321e56ce9cc221e5602b2..146e2944736076c7a9bbb42958fd02e800051bc6 100644 (file)
--- a/lib/maracasVisuLib/src/interface/wxWindows/widgets/manualInteractorWindowLevel.cxx
+++ b/lib/maracasVisuLib/src/interface/wxWindows/widgets/manualInteractorWindowLevel.cxx
@@ -60,7 +60,9 @@ bool manualInteractorWindowLevel::OnMouseMove()                       // virtual
         
 //        int keyCode    = (int)(wxVTKiren->GetKeyCode());
         int  ctrlkey    = wxVTKiren->GetControlKey();
-//        printf("EED manualInteractorWindowLevel::OnMouseMove  keyCode=%d  ctrlkey=%d\n", keyCode,ctrlkey);
+//        int  altkey     = wxVTKiren->GetAltKey();
+        int  shiftkey   = wxVTKiren->GetShiftKey();
+//        printf("EED manualInteractorWindowLevel::OnMouseMove  keyCode=%d  ctrlkey=%d   alt=%d   shift=%d \n", keyCode,ctrlkey, altkey, shiftkey);
 
                double colorWin;
                double colorLev;
@@ -68,7 +70,13 @@ bool manualInteractorWindowLevel::OnMouseMove()                      // virtual
                if(imgrange != NULL)
                {
             double* scalarrange = imgrange->GetScalarRange();
-            if (ctrlkey==0) {
+            if ( (ctrlkey==1) || (shiftkey==1) )
+            {
+                colorWin = scalarrange[1] - scalarrange[0];
+                colorLev = (scalarrange[1] + scalarrange[0])/2;
+                _backWindow = colorWin;
+                _backLevel  = colorLev;
+            } else {
                 double scalarr;
                 if (scalarrange[1] == scalarrange[0])
                 {
@@ -86,12 +94,10 @@ bool manualInteractorWindowLevel::OnMouseMove()                     // virtual
                 //colorWin=_backWindow - (scalarr)*( _backPx - tmpPx );
                 colorWin=_backWindow - dx;
                 colorLev=_backLevel  + dy;
-            } else { // ctrlkey == 1
-                colorWin = scalarrange[1] - scalarrange[0];
-                colorLev = (scalarrange[1] + scalarrange[0])/2;
-                _backWindow = colorWin;
-                _backLevel  = colorLev;
-            }
+            } // if ctrlkey || altkey
+//            if (ctrlkey==0) {
+//            } else { // ctrlkey == 1
+//            }
                } else {
                        colorWin=_backWindow - 2*( _backPx - tmpPx );
                        colorLev=_backLevel  + 2*( _backPy - tmpPy );

diff --git a/lib/maracasVisuLib/src/interface/wxWindows/widgets/vtkInteractorStyleBaseView2D.cxx b/lib/maracasVisuLib/src/interface/wxWindows/widgets/vtkInteractorStyleBaseView2D.cxx
index 36b64db0ea7aa49b276ad238c1ca77a11802236a..256aec6d321ddea7f89d6a807ddc14ca031976fd 100644 (file)
--- a/lib/maracasVisuLib/src/interface/wxWindows/widgets/vtkInteractorStyleBaseView2D.cxx
+++ b/lib/maracasVisuLib/src/interface/wxWindows/widgets/vtkInteractorStyleBaseView2D.cxx
@@ -131,7 +131,10 @@ void  vtkInteractorStyleBaseView2D::OnMiddleButtonDown () // virtual
 
        if ((GetInteractor()->GetControlKey()==1) || (GetInteractor()->GetShiftKey()==1) )
        {
-               this->vtkInteractorStyleImage::OnLeftButtonDown();
+//EED 2024-11-6  Avoid conflitct  between:
+//        - (creaMaracasVisu) Reset ColorWindowLevel
+//        - (VTK) Rotate/Move image
+//             this->vtkInteractorStyleImage::OnLeftButtonDown();
        }
 }