From 0effa2fd2b8b10df86d1e7444bb28ddcfa6f6a40 Mon Sep 17 00:00:00 2001 From: "eduardo.davila@creatis.insa-lyon.fr" Date: Wed, 6 Nov 2024 09:01:08 +0100 Subject: [PATCH] #3566 Bug conflict between key control and rotation for WindowLevel interaction ViewerNV --- bbtk/bbs/boxes/HelpViewerNV.bbg | 8 +++---- bbtk/bbs/boxes/HelpViewerNV.bbs | 8 +++---- .../widgets/manualInteractorWindowLevel.cxx | 22 ++++++++++++------- .../widgets/vtkInteractorStyleBaseView2D.cxx | 5 ++++- 4 files changed, 26 insertions(+), 17 deletions(-) diff --git a/bbtk/bbs/boxes/HelpViewerNV.bbg b/bbtk/bbs/boxes/HelpViewerNV.bbg index 59f1482..91f7ceb 100644 --- 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 95edde0..4353de4 100644 --- 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 8868df4..146e294 100644 --- 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 36b64db..256aec6 100644 --- 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(); } } -- 2.49.0