From: eduardo.davila@creatis.insa-lyon.fr Date: Mon, 3 Feb 2025 15:06:56 +0000 (+0100) Subject: Clean code X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=commitdiff_plain;h=81416ef16ae33df2283e2d65bc7c6fcdd0df7e3d;p=creaMaracasVisu.git Clean code --- diff --git a/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxMaracas_ViewerWidget.cxx b/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxMaracas_ViewerWidget.cxx index 4448880..bf65355 100644 --- a/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxMaracas_ViewerWidget.cxx +++ b/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxMaracas_ViewerWidget.cxx @@ -168,7 +168,7 @@ controlPanelClippingVol3D = mwxvtkclipping3Dview->CreateVolControlPanel(notebook); notebook->AddPage(controlPanelClippingVol3D, _T("Volume") ); - panelClipping3D->SplitHorizontally( window3D ,notebook , 10 ); + panelClipping3D->SplitHorizontally( window3D ,notebook , -140 ); panelClipping3D->SetMinimumPaneSize( 20 ); //RaC Nov2012 Correctly resize internal panels with the window resize event panelClipping3D->SetSashGravity(0.5); @@ -215,7 +215,7 @@ panelClipping3D->SetMinimumPaneSize( 20 ); // panelClipping3D->SplitHorizontally( panelControl , window3D , 40 ); - panelClipping3D->SplitHorizontally( window3D, controlPanelMPR3D , -160 ); + panelClipping3D->SplitHorizontally( window3D, controlPanelMPR3D , -140 ); // panelClipping3D->SplitHorizontally( controlPanelMPR3D , window3D , 0 ); // int width,height; diff --git a/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxVtkMPR3DView.cxx b/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxVtkMPR3DView.cxx index ee951ba..3a909de 100644 --- a/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxVtkMPR3DView.cxx +++ b/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxVtkMPR3DView.cxx @@ -368,12 +368,8 @@ void wxVtkMPR3DView::SetImage() mchange->Modified(); //important mchange->Update(); //important } - */ - - - - + _planeWidgetX->SetInputData( imageData ); _planeWidgetY->SetInputData( imageData ); _planeWidgetZ->SetInputData( imageData ); @@ -384,12 +380,9 @@ void wxVtkMPR3DView::SetImage() _planeWidgetX->SetSlicePosition( x*spc[0] ); _planeWidgetY->SetSlicePosition( y*spc[1] ); _planeWidgetZ->SetSlicePosition( z*spc[2] ); - _planeWidgetX->GetTexture()->SetInterpolate( _vtkmpr3Ddataviewer->GetVtkMPRBaseData()->GetInterpolate() ); _planeWidgetY->GetTexture()->SetInterpolate( _vtkmpr3Ddataviewer->GetVtkMPRBaseData()->GetInterpolate() ); _planeWidgetZ->GetTexture()->SetInterpolate( _vtkmpr3Ddataviewer->GetVtkMPRBaseData()->GetInterpolate() ); - - // -- Plane widget _probe->SetSourceData( imageData ); #endif @@ -418,25 +411,21 @@ vtkImagePlaneWidget* wxVtkMPR3DView::GetPlaneWidget(unsigned char activationkey, image->GetExtent(xMin, xMax, yMin, yMax, zMin, zMax); image->GetSpacing(xSpacing, ySpacing, zSpacing); } - if (activationkey=='x') { planeWidget->SetPlaneOrientationToXAxes(); planeWidget->SetSlicePosition((xMax+xMin)/2.*xSpacing); } - if (activationkey=='y') { planeWidget->SetPlaneOrientationToYAxes(); planeWidget->SetSlicePosition((yMax+yMin)/2.*ySpacing); } - if (activationkey=='z') { planeWidget->SetPlaneOrientationToZAxes(); planeWidget->SetSlicePosition((zMax+zMin)/2.*zSpacing); } - planeWidget->DisplayTextOn(); planeWidget->SetPicker(picker); planeWidget->SetKeyPressActivationValue(activationkey);