From 07623a7a63de849c2b44e64cd80106da8567bbd5 Mon Sep 17 00:00:00 2001 From: jean-pierre roux Date: Thu, 15 Apr 2010 17:54:04 +0000 Subject: [PATCH] re-indent --- .../widgets/include/wxEmptyPanelWidget_2.cxx | 13 +- .../wxMaracasRenderImageTransformation.cpp | 18 +- .../widgets/wxMaracas_ViewerWidget.cxx | 208 ++++++++---------- .../widgets/wxVtkMPR3DViewCntrlPanel.cxx | 78 +++---- 4 files changed, 144 insertions(+), 173 deletions(-) diff --git a/lib/maracasVisuLib/src/interface/wxWindows/widgets/include/wxEmptyPanelWidget_2.cxx b/lib/maracasVisuLib/src/interface/wxWindows/widgets/include/wxEmptyPanelWidget_2.cxx index 2ac2d4e..59e1e17 100644 --- a/lib/maracasVisuLib/src/interface/wxWindows/widgets/include/wxEmptyPanelWidget_2.cxx +++ b/lib/maracasVisuLib/src/interface/wxWindows/widgets/include/wxEmptyPanelWidget_2.cxx @@ -892,11 +892,11 @@ void wxEmptyPanelWidget_2::PaintVascularVolume_MH_JFC(vtkImageData * image) //------------------------------------------------------------------------ void wxEmptyPanelWidget_2::WriteSignals(marExperiment *newExperiment){ - int i = 0; - int j = 0; - bool ok = true; - int value = 0; - int maxAxis = newExperiment->getNumberOfAxes(); + int i = 0; + int j = 0; + bool ok = true; + int value = 0; + int maxAxis = newExperiment->getNumberOfAxes(); FILE *ff; ff=fopen("c:/Temp/MaracasTEMP.TXT", "w"); @@ -909,7 +909,7 @@ void wxEmptyPanelWidget_2::WriteSignals(marExperiment *newExperiment){ if (maraxis!=NULL) { if ( j < maraxis->getNumberOfControlPoints() ){ ok=true; - value= (int) (maraxis->getSignal((uint)j) ); + value= (int)(maraxis->getSignal((uint32_t)j) ); fprintf(ff,"%d\t", value ); } else { fprintf(ff,"\t"); @@ -920,7 +920,6 @@ void wxEmptyPanelWidget_2::WriteSignals(marExperiment *newExperiment){ j++; } fclose(ff); - } diff --git a/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxMaracasRenderImageTransformation.cpp b/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxMaracasRenderImageTransformation.cpp index 157d997..d14ce35 100644 --- a/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxMaracasRenderImageTransformation.cpp +++ b/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxMaracasRenderImageTransformation.cpp @@ -5,7 +5,7 @@ ** Class constructor **/ wxMaracasRenderImageTransformation::wxMaracasRenderImageTransformation(wxMaracasMultipleVolumeRendererManager* _vol, wxMaracasSurfaceRenderingManager* _surface1, - wxMaracasSurfaceRenderingManager* _surface2, wxMaracasSurfaceRenderingManager* _surface3, int id) + wxMaracasSurfaceRenderingManager* _surface2, wxMaracasSurfaceRenderingManager* _surface3, int id) { vol = _vol; surface1 = _surface1; @@ -49,15 +49,15 @@ void wxMaracasRenderImageTransformation::Translate(int tx, int ty, int tz, int r int ext[6]; vol->getImageData()->GetExtent(ext); - transformV ->Identity(); - transformS1 ->Identity(); - transformS2 ->Identity(); - transformS3 ->Identity(); + transformV->Identity(); + transformS1->Identity(); + transformS2->Identity(); + transformS3->Identity(); - transformV ->PostMultiply(); - transformS1 ->PostMultiply(); - transformS2 ->PostMultiply(); - transformS3 ->PostMultiply(); + transformV->PostMultiply(); + transformS1->PostMultiply(); + transformS2->PostMultiply(); + transformS3->PostMultiply(); printf("CPR: wxMaracasRenderImageTransformation::Translate-> %f\n", -(ext[1]-ext[0])*volspX ); printf("CPR: wxMaracasRenderImageTransformation::Translate-> %f\n", -(ext[3]-ext[2])*surfspY); diff --git a/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxMaracas_ViewerWidget.cxx b/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxMaracas_ViewerWidget.cxx index 66d647e..ec78d43 100644 --- a/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxMaracas_ViewerWidget.cxx +++ b/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxMaracas_ViewerWidget.cxx @@ -3,8 +3,8 @@ Program: wxMaracas Module: $RCSfile: wxMaracas_ViewerWidget.cxx,v $ Language: C++ - Date: $Date: 2010/03/17 16:52:51 $ - Version: $Revision: 1.24 $ + Date: $Date: 2010/04/15 17:54:04 $ + Version: $Revision: 1.25 $ Copyright: (c) 2002, 2003 License: @@ -29,95 +29,90 @@ // Constructors & Destructors //------------------------------------------------------------------------------------------------------------ - wxMaracas_ViewerWidget::wxMaracas_ViewerWidget(wxWindow *parent, vtkImageData* imagedata, int type, vtkMPRBaseData *vtkmprbasedata) : wxPanel( parent, -1, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL) { wxPanel *panel = this; wxWindow *wxwindow = NULL, *window3D = 0; - wxSplitterWindow *panelClipping3D = 0; -// wxPanel *panelControl = 0; -// wxFlexGridSizer *sizerCtrol = 0; - wxPanel *controlPanelMPR3D = 0; - wxPanel *controlPanelClippingSurf3D = 0; + wxSplitterWindow *panelClipping3D= 0; +// wxPanel *panelControl = 0; +// wxFlexGridSizer *sizerCtrol = 0; + wxPanel *controlPanelMPR3D = 0; + wxPanel *controlPanelClippingSurf3D = 0; //RaC 03-2010 Adding a tab - wxPanel *controlPanelClippingVol3D = 0; - - wxBoxSizer *sizer = 0; + wxPanel *controlPanelClippingVol3D = 0; + wxBoxSizer *sizer = 0; mType = type; - if (vtkmprbasedata==NULL) { - minternalVtkmprbasedata = true; - mvtkmprbasedata = new vtkMPRBaseData(); + minternalVtkmprbasedata = true; + mvtkmprbasedata = new vtkMPRBaseData(); marImageData *marimagedata = new marImageData( imagedata ); mvtkmprbasedata->SetMarImageData(marimagedata); } else { - minternalVtkmprbasedata = false; - mvtkmprbasedata = vtkmprbasedata; + minternalVtkmprbasedata = false; + mvtkmprbasedata = vtkmprbasedata; } - - mvtk2Dbaseview = NULL; - mvtkmpr2Dview_X = NULL; - mvtkmpr2Dview_Y = NULL; - mvtkmpr2Dview_Z = NULL; - mvtkplane2Dview = NULL; - mwidgetMesure = NULL; - mwxsphereview = NULL; + mvtk2Dbaseview = NULL; + mvtkmpr2Dview_X = NULL; + mvtkmpr2Dview_Y = NULL; + mvtkmpr2Dview_Z = NULL; + mvtkplane2Dview = NULL; + mwidgetMesure = NULL; + mwxsphereview = NULL; mwxvtkclipping3Dview = NULL; mwxvtk3Dbaseview_Clipping3D = NULL; - mwxvtkmpr3Dview = NULL; - vtkmpr3Ddataviewer = NULL; - + mwxvtkmpr3Dview = NULL; + vtkmpr3Ddataviewer = NULL; if (type==-1) { mvtk2Dbaseview = new wxVtk2DBaseView(panel); mvtk2Dbaseview->SetVtkBaseData(mvtkmprbasedata); - wxwindow = mvtk2Dbaseview->GetWxVTKRenderWindowInteractor(); + wxwindow = mvtk2Dbaseview->GetWxVTKRenderWindowInteractor(); }else if (type==0) { mvtkmpr2Dview_Z = new wxVtkMPR2DView(panel,2); mvtkmpr2Dview_Z->SetVtkBaseData(mvtkmprbasedata); - wxwindow = mvtkmpr2Dview_Z->GetWxVTKRenderWindowInteractor(); + wxwindow = mvtkmpr2Dview_Z->GetWxVTKRenderWindowInteractor(); }else if (type==1) { mvtkmpr2Dview_X = new wxVtkMPR2DView(panel,0); mvtkmpr2Dview_X->SetVtkBaseData(mvtkmprbasedata); - wxwindow = mvtkmpr2Dview_X->GetWxVTKRenderWindowInteractor(); + wxwindow = mvtkmpr2Dview_X->GetWxVTKRenderWindowInteractor(); }else if (type==2) { mvtkmpr2Dview_Y = new wxVtkMPR2DView(panel,1); mvtkmpr2Dview_Y->SetVtkBaseData(mvtkmprbasedata); - wxwindow = mvtkmpr2Dview_Y->GetWxVTKRenderWindowInteractor(); + wxwindow = mvtkmpr2Dview_Y->GetWxVTKRenderWindowInteractor(); }else if (type==3) { - mwidgetMesure = new wxWidgetMesure2D_Plane_in_MPR(panel); - mvtkplane2Dview = new vtkPlane2DView( mwidgetMesure->GetWindow2()); + mwidgetMesure = new wxWidgetMesure2D_Plane_in_MPR(panel); + mvtkplane2Dview = new vtkPlane2DView( mwidgetMesure->GetWindow2()); mwidgetMesure -> SetVtkPlane2DView( mvtkplane2Dview ); mvtkplane2Dview -> SetImgSize( 200 ); mvtkplane2Dview -> SetVtkBaseData(mvtkmprbasedata); - wxwindow = mwidgetMesure; + wxwindow = mwidgetMesure; }else if (type==4) { - mwxsphereview = new wxSphereView( panel , mvtkmprbasedata, mvtkmprbasedata->GetImageData() ); + mwxsphereview = new wxSphereView( panel , mvtkmprbasedata, mvtkmprbasedata->GetImageData() ); wxwindow=mwxsphereview->GetWxVTKRenderWindowInteractor(); }else if (type==5) { panelClipping3D = new wxSplitterWindow( panel , -1); - mwxvtk3Dbaseview_Clipping3D = new wxVtk3DBaseView( panelClipping3D ); + mwxvtk3Dbaseview_Clipping3D = new wxVtk3DBaseView( panelClipping3D ); - mwxvtkclipping3Dview = new wxVtkClipping3DView(mwxvtk3Dbaseview_Clipping3D); + mwxvtkclipping3Dview = new wxVtkClipping3DView(mwxvtk3Dbaseview_Clipping3D); vtkClipping3DDataViewer *vtkclipping3Ddataviewer = new vtkClipping3DDataViewer(); vtkclipping3Ddataviewer->SetVtkMPRBaseData(mvtkmprbasedata); vtkclipping3Ddataviewer->Configure(); mwxvtkclipping3Dview->SetVtkClipping3DDataViewer(vtkclipping3Ddataviewer); - mwxvtkmpr3Dview = new wxVtkMPR3DView( mwxvtk3Dbaseview_Clipping3D ); + mwxvtkmpr3Dview = new wxVtkMPR3DView( mwxvtk3Dbaseview_Clipping3D ); vtkMPR3DDataViewer *vtkmpr3Ddataviewer = new vtkMPR3DDataViewer(); vtkmpr3Ddataviewer->SetVtkMPRBaseData(mvtkmprbasedata); vtkmpr3Ddataviewer->Configure(); @@ -125,7 +120,6 @@ window3D = mwxvtk3Dbaseview_Clipping3D->GetWxVTKRenderWindowInteractor(); - //-- wxNotebook *notebook = new wxNotebook(panelClipping3D, -1); @@ -142,9 +136,9 @@ controlPanelClippingVol3D = mwxvtkclipping3Dview->CreateVolControlPanel(notebook); notebook->AddPage(controlPanelClippingVol3D, _T("Volume") ); - - panelClipping3D -> SplitHorizontally( notebook , window3D , 10 ); - panelClipping3D -> SetMinimumPaneSize( 15 ); + panelClipping3D->SplitHorizontally( notebook , window3D , 10 ); + //panelClipping3D->SetMinimumPaneSize( 15 ); + panelClipping3D->SetMinimumPaneSize( 35 ); // JPR /* EED 04 / Febrary / 2010 panelControl = new wxPanel(panelClipping3D,-1); @@ -153,9 +147,9 @@ // mbtnCutImageData = new wxCheckBox(panelControl,-1,_T("Cut Module")); // Connect(_btnCutImageData->GetId() , wxEVT_COMMAND_CHECKBOX_CLICKED , (wxObjectEventFunction) &wxMPRWidget::OnCutImagaData ); sizerCtrol = new wxFlexGridSizer(1); - sizerCtrol->Add(controlPanelMPR3D , 1, wxALL|wxEXPAND, 2); + sizerCtrol->Add(controlPanelMPR3D , 1, wxALL|wxEXPAND, 2); sizerCtrol->Add(controlPanelClipping3D , 1, wxALL|wxEXPAND, 2); - // sizerCtrol->Add( mbtnCutImageData , 1, wxALL, 2); + // sizerCtrol->Add( mbtnCutImageData , 1, wxALL, 2); panelControl->SetAutoLayout(true); panelControl->SetSizer(sizerCtrol); panelControl->SetSize(400,350); @@ -167,26 +161,27 @@ } else if (type==6) { panelClipping3D = new wxSplitterWindow( panel , -1); - mwxvtk3Dbaseview_Clipping3D = new wxVtk3DBaseView( panelClipping3D ); + mwxvtk3Dbaseview_Clipping3D = new wxVtk3DBaseView( panelClipping3D ); - mwxvtkmpr3Dview = new wxVtkMPR3DView( mwxvtk3Dbaseview_Clipping3D ); + mwxvtkmpr3Dview = new wxVtkMPR3DView( mwxvtk3Dbaseview_Clipping3D ); vtkmpr3Ddataviewer = new vtkMPR3DDataViewer(); - wxWindow *window3D = mwxvtk3Dbaseview_Clipping3D->GetWxVTKRenderWindowInteractor(); + wxWindow *window3D = mwxvtk3Dbaseview_Clipping3D->GetWxVTKRenderWindowInteractor(); - wxPanel *panelControl = new wxPanel(panelClipping3D,-1); - wxPanel *controlPanelMPR3D = mwxvtkmpr3Dview->CreateControlPanel(panelControl, false); + wxPanel *panelControl = new wxPanel(panelClipping3D,-1); + wxPanel *controlPanelMPR3D = mwxvtkmpr3Dview->CreateControlPanel(panelControl, false); - wxFlexGridSizer *sizerCtrol = new wxFlexGridSizer(1); + wxFlexGridSizer *sizerCtrol = new wxFlexGridSizer(1); sizerCtrol->Add(controlPanelMPR3D , 1, wxALL|wxEXPAND, 2); panelControl->SetAutoLayout(true); panelControl->SetSizer(sizerCtrol); panelControl->SetSize(400,350); panelControl->Layout(); - panelClipping3D -> SetMinimumPaneSize( 5 ); - panelClipping3D -> SplitHorizontally( panelControl , window3D , 10 ); + //panelClipping3D -> SetMinimumPaneSize( 5 ); + panelClipping3D->SetMinimumPaneSize( 35 ); // JPR + panelClipping3D->SplitHorizontally( panelControl , window3D , 10 ); wxwindow=panelClipping3D; @@ -196,17 +191,13 @@ mwxvtkmpr3Dview->SetVtkMPR3DDataViewer(vtkmpr3Ddataviewer); }else if (type==7) - { - - mwxvtk3Dbaseview_Clipping3D = new wxVtk3DBaseView( panel ); + { + mwxvtk3Dbaseview_Clipping3D = new wxVtk3DBaseView( panel ); wxwindow = (wxWindow*) mwxvtk3Dbaseview_Clipping3D->GetWxVTKRenderWindowInteractor(); - - } - sizer = new wxBoxSizer(wxVERTICAL); - sizer->Add( wxwindow , 1, wxGROW); + sizer->Add( wxwindow, 1, wxGROW); panel->SetSizer(sizer); panel->SetAutoLayout(true); sizer->Layout(); @@ -219,21 +210,20 @@ wxMaracas_ViewerWidget::~wxMaracas_ViewerWidget() { - if (minternalVtkmprbasedata==true) { - if (mvtkmprbasedata) { delete mvtkmprbasedata; } + if (mvtkmprbasedata) { delete mvtkmprbasedata;} } - if (mvtk2Dbaseview) { delete mvtk2Dbaseview; } - if (mvtkmpr2Dview_X) { delete mvtkmpr2Dview_X; } - if (mvtkmpr2Dview_Y) { delete mvtkmpr2Dview_Y; } - if (mvtkmpr2Dview_Z) { delete mvtkmpr2Dview_Z; } - if (mwidgetMesure) { delete mwidgetMesure; } - if (mvtkplane2Dview) { delete mvtkplane2Dview; } - if (mwxsphereview) { delete mwxsphereview; } - if (mwxvtkmpr3Dview) { delete mwxvtkmpr3Dview; } - if (mwxvtkclipping3Dview) { delete mwxvtkclipping3Dview; } + if (mvtk2Dbaseview) { delete mvtk2Dbaseview; } + if (mvtkmpr2Dview_X) { delete mvtkmpr2Dview_X;} + if (mvtkmpr2Dview_Y) { delete mvtkmpr2Dview_Y;} + if (mvtkmpr2Dview_Z) { delete mvtkmpr2Dview_Z;} + if (mwidgetMesure) { delete mwidgetMesure; } + if (mvtkplane2Dview) { delete mvtkplane2Dview;} + if (mwxsphereview) { delete mwxsphereview; } + if (mwxvtkmpr3Dview) { delete mwxvtkmpr3Dview;} + if (mwxvtkclipping3Dview) { delete mwxvtkclipping3Dview;} if (mwxvtk3Dbaseview_Clipping3D){ delete mwxvtk3Dbaseview_Clipping3D; mwxvtk3Dbaseview_Clipping3D=NULL;} } //------------------------------------------------------------------------------------------------------------ @@ -242,7 +232,6 @@ //------------------------------------------------------------------------- - void wxMaracas_ViewerWidget::ConfigureVTK() { int x=0,y=0,z=0; @@ -261,14 +250,14 @@ spc[1]=0; spc[2]=0; - - if (mvtkmprbasedata!=NULL) { mvtkmprbasedata->Configure(); - /*x = mvtkmprbasedata -> GetMaxPositionX()/2; + /* + x = mvtkmprbasedata -> GetMaxPositionX()/2; y = mvtkmprbasedata -> GetMaxPositionY()/2; - z = mvtkmprbasedata -> GetMaxPositionZ()/2; */ + z = mvtkmprbasedata -> GetMaxPositionZ()/2; + */ if(mvtkmprbasedata->GetImageData() != NULL) { @@ -292,20 +281,19 @@ } } - - if ( mvtk2Dbaseview !=NULL ) { mvtk2Dbaseview -> Configure(); } - if ( mvtkmpr2Dview_X !=NULL ) { mvtkmpr2Dview_X -> Configure(); } - if ( mvtkmpr2Dview_Y !=NULL ) { mvtkmpr2Dview_Y -> Configure(); } - if ( mvtkmpr2Dview_Z !=NULL ) { mvtkmpr2Dview_Z -> Configure(); } - if ( mvtkplane2Dview !=NULL ) { mvtkplane2Dview -> Configure(); } - if ( mwidgetMesure !=NULL ) { mwidgetMesure -> ConfigureA(mvtkplane2Dview);} - if ( mwidgetMesure !=NULL ) { mwidgetMesure -> ConfigureA(mvtkplane2Dview);} - if ( mwidgetMesure !=NULL ) { mwidgetMesure -> SetActiveLink(true); } - if ( mwidgetMesure !=NULL ) { mwidgetMesure -> SetMesureScale( 1 ); } - if ( mwxsphereview !=NULL ) { mwxsphereview -> Configure(); } + if ( mvtk2Dbaseview !=NULL ) { mvtk2Dbaseview->Configure(); } + if ( mvtkmpr2Dview_X !=NULL ) { mvtkmpr2Dview_X->Configure(); } + if ( mvtkmpr2Dview_Y !=NULL ) { mvtkmpr2Dview_Y->Configure(); } + if ( mvtkmpr2Dview_Z !=NULL ) { mvtkmpr2Dview_Z->Configure(); } + if ( mvtkplane2Dview !=NULL ) { mvtkplane2Dview->Configure(); } + if ( mwidgetMesure !=NULL ) { mwidgetMesure->ConfigureA(mvtkplane2Dview); } + if ( mwidgetMesure !=NULL ) { mwidgetMesure->ConfigureA(mvtkplane2Dview); } + if ( mwidgetMesure !=NULL ) { mwidgetMesure->SetActiveLink(true); } + if ( mwidgetMesure !=NULL ) { mwidgetMesure->SetMesureScale( 1 ); } + if ( mwxsphereview !=NULL ) { mwxsphereview->Configure(); } if (mwxvtk3Dbaseview_Clipping3D !=NULL) { - mwxvtk3Dbaseview_Clipping3D -> Configure(); + mwxvtk3Dbaseview_Clipping3D->Configure(); } @@ -313,22 +301,15 @@ vtkmpr3Ddataviewer->Configure(); } - if (mwxvtkmpr3Dview !=NULL) { + if (mwxvtkmpr3Dview !=NULL) { - mwxvtkmpr3Dview -> Configure(); - mwxvtkmpr3Dview ->ResetCamera(ext,org,spc); + mwxvtkmpr3Dview->Configure(); + mwxvtkmpr3Dview->ResetCamera(ext,org,spc); } - if (mwxvtkclipping3Dview !=NULL) { mwxvtkclipping3Dview -> Configure(); } - - - - - - - + if (mwxvtkclipping3Dview !=NULL) { mwxvtkclipping3Dview->Configure(); } //if(vtkmpr3Ddataviewer!=NULL){vtkmpr3Ddataviewer->Configure();} // RefreshView(); @@ -350,16 +331,16 @@ void wxMaracas_ViewerWidget::RefreshView() { - if (mvtk2Dbaseview !=NULL ){ mvtk2Dbaseview -> Refresh(); } - if (mvtkmpr2Dview_X !=NULL ){ mvtkmpr2Dview_X -> Refresh(); } - if (mvtkmpr2Dview_Y !=NULL ){ mvtkmpr2Dview_Y -> Refresh(); } - if (mvtkmpr2Dview_Z !=NULL ){ mvtkmpr2Dview_Z -> Refresh(); } - if (mvtkplane2Dview !=NULL ){ mvtkplane2Dview -> Refresh(); } - if (mwxsphereview !=NULL ){ mwxsphereview -> Refresh(); } + if (mvtk2Dbaseview !=NULL ){ mvtk2Dbaseview->Refresh(); } + if (mvtkmpr2Dview_X !=NULL ){ mvtkmpr2Dview_X->Refresh(); } + if (mvtkmpr2Dview_Y !=NULL ){ mvtkmpr2Dview_Y->Refresh(); } + if (mvtkmpr2Dview_Z !=NULL ){ mvtkmpr2Dview_Z->Refresh(); } + if (mvtkplane2Dview !=NULL ){ mvtkplane2Dview->Refresh(); } + if (mwxsphereview !=NULL ){ mwxsphereview ->Refresh(); } - if (mwxvtkmpr3Dview !=NULL ){ mwxvtkmpr3Dview -> RefreshView(); } - if (mwxvtkclipping3Dview !=NULL ){ mwxvtkclipping3Dview -> Refresh(); } - if (mwxvtk3Dbaseview_Clipping3D !=NULL ){ mwxvtk3Dbaseview_Clipping3D -> Refresh(); } + if (mwxvtkmpr3Dview !=NULL ){ mwxvtkmpr3Dview->RefreshView(); } + if (mwxvtkclipping3Dview !=NULL ){ mwxvtkclipping3Dview->Refresh(); } + if (mwxvtk3Dbaseview_Clipping3D !=NULL ){ mwxvtk3Dbaseview_Clipping3D->Refresh();} } @@ -368,7 +349,7 @@ wxVtkBaseView *wxMaracas_ViewerWidget::GetwxVtkBaseView() { wxVtkBaseView *wxvtkbaseview=NULL; - if (mvtk2Dbaseview!=NULL) { + if (mvtk2Dbaseview!=NULL){ wxvtkbaseview = mvtk2Dbaseview; } if (mvtkmpr2Dview_X!=NULL){ @@ -386,13 +367,13 @@ if (mwxsphereview!=NULL){ wxvtkbaseview = mwxsphereview; } - if (mwxvtk3Dbaseview_Clipping3D!=NULL) { + if (mwxvtk3Dbaseview_Clipping3D!=NULL){ wxvtkbaseview = mwxvtk3Dbaseview_Clipping3D; } return wxvtkbaseview ; } - void wxMaracas_ViewerWidget::SetImage( vtkImageData *image ) + void wxMaracas_ViewerWidget::SetImage( vtkImageData *image ) { if(mvtkmprbasedata !=NULL) { @@ -416,7 +397,7 @@ return value; } - double wxMaracas_ViewerWidget :: GetY() + double wxMaracas_ViewerWidget::GetY() { double value = -1; if(mvtkmprbasedata !=NULL) @@ -426,7 +407,7 @@ return value; } - double wxMaracas_ViewerWidget :: GetZ() + double wxMaracas_ViewerWidget::GetZ() { double value = -1; if(mvtkmprbasedata !=NULL) @@ -481,6 +462,3 @@ mwxvtkmpr3Dview->setColorLevel(level); }*/ } - - - diff --git a/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxVtkMPR3DViewCntrlPanel.cxx b/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxVtkMPR3DViewCntrlPanel.cxx index 68c7ee1..cae5f74 100644 --- a/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxVtkMPR3DViewCntrlPanel.cxx +++ b/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxVtkMPR3DViewCntrlPanel.cxx @@ -5,7 +5,6 @@ wxVtkMPR3DViewCntrlPanel::wxVtkMPR3DViewCntrlPanel(wxWindow *parent, wxVtkMPR3DView *wxvtkmpr3Dview, bool align ) : wxPanel(parent, -1) { - wxPanel *panel = this; _wxvtkmpr3Dview = wxvtkmpr3Dview; @@ -44,14 +43,12 @@ wxVtkMPR3DViewCntrlPanel::wxVtkMPR3DViewCntrlPanel(wxWindow *parent, wxVtkMPR3DV _ckFreePlaneZ= new wxCheckBox(panel,-1,_T("free Z"));; _ckFreePlaneInteraction= new wxCheckBox(panel,-1,_T("Interaction "));; - //EED: If-else statements added 30 Nov 2009 - _ckFreePlaneX->SetValue(false); + _ckFreePlaneX->SetValue(true); _ckFreePlaneY->SetValue(false); _ckFreePlaneZ->SetValue(false); _ckFreePlaneInteraction->SetValue(true); - ckBoxX->SetValue(false); ckBoxY->SetValue(false); ckBoxZ->SetValue(false); @@ -73,10 +70,10 @@ wxVtkMPR3DViewCntrlPanel::wxVtkMPR3DViewCntrlPanel(wxWindow *parent, wxVtkMPR3DV Connect(_ckBoxXYZ->GetId(), wxEVT_COMMAND_CHECKBOX_CLICKED, (wxObjectEventFunction) &wxVtkMPR3DViewCntrlPanel::OnVisibleAxisXYZ ); Connect(_ckBoxPlane->GetId(), wxEVT_COMMAND_CHECKBOX_CLICKED, (wxObjectEventFunction) &wxVtkMPR3DViewCntrlPanel::OnVisiblePlane ); - Connect(_ckFreePlaneX->GetId() , wxEVT_COMMAND_CHECKBOX_CLICKED , (wxObjectEventFunction) &wxVtkMPR3DViewCntrlPanel::OnVisibleFreePlaneX ); - Connect(_ckFreePlaneY->GetId() , wxEVT_COMMAND_CHECKBOX_CLICKED , (wxObjectEventFunction) &wxVtkMPR3DViewCntrlPanel::OnVisibleFreePlaneY ); - Connect(_ckFreePlaneZ->GetId() , wxEVT_COMMAND_CHECKBOX_CLICKED , (wxObjectEventFunction) &wxVtkMPR3DViewCntrlPanel::OnVisibleFreePlaneZ ); - Connect(_ckFreePlaneInteraction->GetId(), wxEVT_COMMAND_CHECKBOX_CLICKED , (wxObjectEventFunction) &wxVtkMPR3DViewCntrlPanel::OnVisibleFreePlaneInteraction ); + Connect(_ckFreePlaneX->GetId() , wxEVT_COMMAND_CHECKBOX_CLICKED, (wxObjectEventFunction) &wxVtkMPR3DViewCntrlPanel::OnVisibleFreePlaneX ); + Connect(_ckFreePlaneY->GetId() , wxEVT_COMMAND_CHECKBOX_CLICKED, (wxObjectEventFunction) &wxVtkMPR3DViewCntrlPanel::OnVisibleFreePlaneY ); + Connect(_ckFreePlaneZ->GetId() , wxEVT_COMMAND_CHECKBOX_CLICKED, (wxObjectEventFunction) &wxVtkMPR3DViewCntrlPanel::OnVisibleFreePlaneZ ); + Connect(_ckFreePlaneInteraction->GetId(), wxEVT_COMMAND_CHECKBOX_CLICKED, (wxObjectEventFunction) &wxVtkMPR3DViewCntrlPanel::OnVisibleFreePlaneInteraction ); wxFlexGridSizer *sizer; @@ -92,27 +89,27 @@ wxVtkMPR3DViewCntrlPanel::wxVtkMPR3DViewCntrlPanel(wxWindow *parent, wxVtkMPR3DV sizer = new wxFlexGridSizer(3); sizerH4 = new wxFlexGridSizer(2); - sizerH4->Add( _positionX ,1,wxGROW , 0 ); - sizerH4->Add( ckBoxX ,0,wxALIGN_CENTER_VERTICAL|wxSHAPED , 0 ); - sizerH4->Add( _positionY ,1,wxGROW , 0 ); - sizerH4->Add( ckBoxY ,0,wxALIGN_CENTER_VERTICAL|wxSHAPED , 0 ); - sizerH4->Add( _positionZ ,1,wxGROW , 0 ); - sizerH4->Add( ckBoxZ ,0,wxALIGN_CENTER_VERTICAL|wxSHAPED , 0 ); + sizerH4->Add( _positionX ,1,wxGROW , 0 ); + sizerH4->Add( ckBoxX ,0,wxALIGN_CENTER_VERTICAL|wxSHAPED, 0 ); + sizerH4->Add( _positionY ,1,wxGROW, 0 ); + sizerH4->Add( ckBoxY ,0,wxALIGN_CENTER_VERTICAL|wxSHAPED, 0 ); + sizerH4->Add( _positionZ ,1,wxGROW, 0 ); + sizerH4->Add( ckBoxZ ,0,wxALIGN_CENTER_VERTICAL|wxSHAPED, 0 ); sizerH5 = new wxFlexGridSizer(1); - sizerH5->Add( new wxStaticText(panel, -1,_T(" ")) , 1, wxALL|wxEXPAND , 0); - sizerH5->Add( _ckBoxXYZ , 1, wxALL|wxEXPAND , 0); - sizerH5->Add( new wxStaticText(panel, -1,_T(" ")) , 1, wxALL|wxEXPAND , 0); - sizerH5->Add( _ckBoxPlane , 1, wxALL|wxEXPAND , 0); - sizerH5->Add( new wxStaticText(panel, -1,_T(" ")) , 1, wxALL|wxEXPAND , 0); - sizerH5->Add( btnColorTable , 0,wxALIGN_CENTER_VERTICAL|wxSHAPED, 0 ); - //sizerH5->Add( new wxStaticText(panel, -1,_T(" ")) , 1, wxALL|wxEXPAND, 0); + sizerH5->Add( new wxStaticText(panel, -1,_T(" ")) , 1, wxALL|wxEXPAND, 0); + sizerH5->Add( _ckBoxXYZ , 1, wxALL|wxEXPAND, 0); + sizerH5->Add( new wxStaticText(panel, -1,_T(" ")) , 1, wxALL|wxEXPAND, 0); + sizerH5->Add( _ckBoxPlane , 1, wxALL|wxEXPAND, 0); + sizerH5->Add( new wxStaticText(panel, -1,_T(" ")) , 1, wxALL|wxEXPAND, 0); + sizerH5->Add( btnColorTable , 0, wxALIGN_CENTER_VERTICAL|wxSHAPED, 0 ); + //sizerH5->Add( new wxStaticText(panel, -1,_T(" ")), 1, wxALL|wxEXPAND, 0); sizerH6 = new wxFlexGridSizer(1); - sizerH6->Add( _ckFreePlaneX , 1, wxALL|wxEXPAND , 0); - sizerH6->Add( _ckFreePlaneY , 1, wxALL|wxEXPAND , 0); - sizerH6->Add( _ckFreePlaneZ , 1, wxALL|wxEXPAND , 0); - sizerH6->Add( _ckFreePlaneInteraction , 1, wxALL|wxEXPAND , 0); + sizerH6->Add( _ckFreePlaneX, 1, wxALL|wxEXPAND, 0); + sizerH6->Add( _ckFreePlaneY, 1, wxALL|wxEXPAND, 0); + sizerH6->Add( _ckFreePlaneZ, 1, wxALL|wxEXPAND, 0); + sizerH6->Add( _ckFreePlaneInteraction , 1, wxALL|wxEXPAND, 0); } else { sizer = new wxFlexGridSizer(1); @@ -121,31 +118,29 @@ wxVtkMPR3DViewCntrlPanel::wxVtkMPR3DViewCntrlPanel(wxWindow *parent, wxVtkMPR3DV sizerH5 = new wxFlexGridSizer(10); sizerH6 = new wxFlexGridSizer(10); - sizerH4->Add( _positionX , 1, wxGROW , 0 ); + sizerH4->Add( _positionX , 1, wxGROW , 0 ); sizerH4->Add( ckBoxX , 0, wxALIGN_CENTER_VERTICAL|wxSHAPED, 0 ); - sizerH4->Add( _positionY , 1, wxGROW , 0 ); + sizerH4->Add( _positionY , 1, wxGROW , 0 ); sizerH4->Add( ckBoxY , 0, wxALIGN_CENTER_VERTICAL|wxSHAPED, 0 ); - sizerH4->Add( _positionZ , 1, wxGROW , 0 ); + sizerH4->Add( _positionZ , 1, wxGROW , 0 ); sizerH4->Add( ckBoxZ , 0, wxALIGN_CENTER_VERTICAL|wxSHAPED, 0 ); sizerH4->Add( btnColorTable , 0, wxALIGN_CENTER_VERTICAL|wxSHAPED, 0 ); - sizerH5->Add( _ckBoxXYZ , 1, wxALL|wxEXPAND, 0); - sizerH5->Add( _ckBoxPlane , 1, wxALL|wxEXPAND, 0); - sizerH5->Add( new wxStaticText(panel, -1,_T(" ")) , 1, wxALL|wxEXPAND, 0); + sizerH5->Add( _ckBoxXYZ , 1, wxALL|wxEXPAND, 0); + sizerH5->Add( _ckBoxPlane , 1, wxALL|wxEXPAND, 0); + sizerH5->Add( new wxStaticText(panel, -1,_T(" ")) , 1, wxALL|wxEXPAND, 0); sizerH6 = new wxFlexGridSizer(10); - sizerH6->Add( _ckFreePlaneX , 1, wxALL|wxEXPAND , 0); - sizerH6->Add( new wxStaticText(panel, -1,_T(" ")) , 1, wxALL|wxEXPAND , 0); - sizerH6->Add( _ckFreePlaneY , 1, wxALL|wxEXPAND , 0); - sizerH6->Add( new wxStaticText(panel, -1,_T(" ")) , 1, wxALL|wxEXPAND , 0); - sizerH6->Add( _ckFreePlaneZ , 1, wxALL|wxEXPAND , 0); - sizerH6->Add( new wxStaticText(panel, -1,_T(" ")) , 1, wxALL|wxEXPAND , 0); - sizerH6->Add( _ckFreePlaneInteraction , 1, wxALL|wxEXPAND , 0); + sizerH6->Add( _ckFreePlaneX , 1, wxALL|wxEXPAND, 0); + sizerH6->Add( new wxStaticText(panel, -1,_T(" ")) , 1, wxALL|wxEXPAND, 0); + sizerH6->Add( _ckFreePlaneY , 1, wxALL|wxEXPAND, 0); + sizerH6->Add( new wxStaticText(panel, -1,_T(" ")) , 1, wxALL|wxEXPAND, 0); + sizerH6->Add( _ckFreePlaneZ , 1, wxALL|wxEXPAND, 0); + sizerH6->Add( new wxStaticText(panel, -1,_T(" ")) , 1, wxALL|wxEXPAND, 0); + sizerH6->Add( _ckFreePlaneInteraction , 1, wxALL|wxEXPAND, 0); } - - - + //EED 28 sep 2006 // wxFlexGridSizer *sizerH6 = new wxFlexGridSizer(10); // wxFlexGridSizer *sizerH7 = new wxFlexGridSizer(10); @@ -190,7 +185,6 @@ wxVtkMPR3DViewCntrlPanel::wxVtkMPR3DViewCntrlPanel(wxWindow *parent, wxVtkMPR3DV } void wxVtkMPR3DViewCntrlPanel::UpdateControlPanel() { - vtkMPRBaseData* basedata = _wxvtkmpr3Dview->GetVtkMPR3DDataViewer()->GetVtkMPRBaseData(); if(basedata != NULL){ -- 2.45.1