From: jean-pierre roux Date: Tue, 16 Jun 2009 13:38:29 +0000 (+0000) Subject: No newline at end of file X-Git-Tag: EED.02Oct2009~28 X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=commitdiff_plain;h=719f6d5eb59df04d0034dc10638b180f4c5a995f;p=creaMaracasVisu.git No newline at end of file --- diff --git a/CMakeLists.txt b/CMakeLists.txt index 6ca8396..8259fa4 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -52,7 +52,6 @@ INCLUDE_DIRECTORIES( ${PROJECT_SOURCE_DIR}/data/Icons ) - SET(INPUT_DATA_DIR ${PROJECT_SOURCE_DIR}/data) FILE(GLOB CONFIGURE_DATA_FILES *.*) IF(WIN32) @@ -65,4 +64,4 @@ IF(WIN32) ELSE(WIN32) SET(OUTPUT_DATA_DIR ${PROJECT_BINARY_DIR}/data) CREA_CPDIR(${INPUT_DATA_DIR} ${OUTPUT_DATA_DIR}) -ENDIF(WIN32) \ No newline at end of file +ENDIF(WIN32) diff --git a/lib/maracasVisuLib/src/interface/wxWindows/CMakeLists.txt b/lib/maracasVisuLib/src/interface/wxWindows/CMakeLists.txt index 9a5382c..1e4081f 100644 --- a/lib/maracasVisuLib/src/interface/wxWindows/CMakeLists.txt +++ b/lib/maracasVisuLib/src/interface/wxWindows/CMakeLists.txt @@ -7,7 +7,6 @@ INCLUDE_DIRECTORIES( "C:/Creatis/MaracasTools/OSGi/src" "C:/Creatis/MaracasTools/Include" -"/home/jpr/Creatis/Maracas/src/interface/wxWindows" ) #----------------------------------------------------------------------------- @@ -333,7 +332,9 @@ IF(WIN32) CONFIGURE_FILE( ${WXWIDGETS_ROOT_DIR}/lib/vc_dll/wxmsw28d_qa_vc_custom.dll ${LIBRARY_OUTPUT_PATH}/debug/wxmsw28d_qa_vc_custom.dll COPYONLY ) CONFIGURE_FILE( ${WXWIDGETS_ROOT_DIR}/lib/vc_dll/wxmsw28d_richtext_vc_custom.dll ${LIBRARY_OUTPUT_PATH}/debug/wxmsw28d_richtext_vc_custom.dll COPYONLY ) CONFIGURE_FILE( ${WXWIDGETS_ROOT_DIR}/lib/vc_dll/wxmsw28d_xrc_vc_custom.dll ${LIBRARY_OUTPUT_PATH}/debug/wxmsw28d_xrc_vc_custom.dll COPYONLY ) - CONFIGURE_FILE( ${WXWIDGETS_ROOT_DIR}/lib/vc_dll/wxmsw28_aui_vc_custom.dll ${LIBRARY_OUTPUT_PATH}/debug/wxmsw28_aui_vc_custom.dll COPYONLY ) + CONFIGURE_FILE( +${WXWIDGETS_ROOT_DIR}/lib/vc_dll/wxmsw28_aui_vc_custom.dll +${LIBRARY_OUTPUT_PATH}/debug/wxmsw28_aui_vc_custom.dll COPYONLY ) ELSE ( EXISTS ${WXWIDGETS_ROOT_DIR}/lib/vc_dll/wxbase28d_net_vc_custom.dll ) MESSAGE (FATAL_ERROR, " wxWidgets dlls not found (Debug copy dlls)") ENDIF( EXISTS ${WXWIDGETS_ROOT_DIR}/lib/vc_dll/wxbase28d_net_vc_custom.dll ) @@ -377,7 +378,7 @@ IF(WIN32) -##----Copy Release cofiguration and DLLs--- +##----Copy Release configuration and DLLs--- FILE(MAKE_DIRECTORY ${LIBRARY_OUTPUT_PATH}/Release ) FILE(MAKE_DIRECTORY ${LIBRARY_OUTPUT_PATH}/Release/MySql/data ) @@ -404,7 +405,7 @@ IF(WIN32) CONFIGURE_FILE( ${WXWIDGETS_ROOT_DIR}/lib/vc_dll/wxmsw28_richtext_vc_custom.dll ${LIBRARY_OUTPUT_PATH}/release/wxmsw28_richtext_vc_custom.dll COPYONLY ) CONFIGURE_FILE( ${WXWIDGETS_ROOT_DIR}/lib/vc_dll/wxmsw28_qa_vc_custom.dll ${LIBRARY_OUTPUT_PATH}/release/wxmsw28_qa_vc_custom.dll COPYONLY ) CONFIGURE_FILE( ${WXWIDGETS_ROOT_DIR}/lib/vc_dll/wxmsw28_xrc_vc_custom.dll ${LIBRARY_OUTPUT_PATH}/release/wxmsw28_xrc_vc_custom.dll COPYONLY ) - CONFIGURE_FILE( ${WXWIDGETS_ROOT_DIR}/lib/vc_dll/wxmsw28_aui_vc_custom.dll ${LIBRARY_OUTPUT_PATH}/debug/wxmsw28_aui_vc_custom.dll COPYONLY ) + CONFIGURE_FILE( ${WXWIDGETS_ROOT_DIR}/lib/vc_dll/wxmsw28_aui_vc_custom.dll ${LIBRARY_OUTPUT_PATH}/debug/wxmsw28_aui_vc_custom.dll COPYONLY ) ELSE ( EXISTS ${WXWIDGETS_ROOT_DIR}/lib/vc_dll/wxbase28_net_vc_custom.dll ) MESSAGE (FATAL_ERROR, " wxWidgets dlls not found (Release copy dlls)") ENDIF( EXISTS ${WXWIDGETS_ROOT_DIR}/lib/vc_dll/wxbase28_net_vc_custom.dll ) diff --git a/lib/maracasVisuLib/src/interface/wxWindows/widgets/manualViewPerpPlaneContour.cxx b/lib/maracasVisuLib/src/interface/wxWindows/widgets/manualViewPerpPlaneContour.cxx index edc09ca..0fd5c3f 100644 --- a/lib/maracasVisuLib/src/interface/wxWindows/widgets/manualViewPerpPlaneContour.cxx +++ b/lib/maracasVisuLib/src/interface/wxWindows/widgets/manualViewPerpPlaneContour.cxx @@ -201,4 +201,5 @@ bool manualViewPerpPlaneContour::ifTouchContour( int x, int y, int z) ok = true; } return ok; -} \ No newline at end of file +} + diff --git a/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxVtk2DBaseView.cxx b/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxVtk2DBaseView.cxx index 53bf047..45a387a 100644 --- a/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxVtk2DBaseView.cxx +++ b/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxVtk2DBaseView.cxx @@ -8,8 +8,8 @@ wxVtk2DBaseView::wxVtk2DBaseView(wxWindow *parent) :wxVtkBaseView(parent) { - _imageViewer2XYZ = NULL; - _vtkIinfoTextImage = NULL; + _imageViewer2XYZ = NULL; + _vtkIinfoTextImage = NULL; } //EED 5mai2009 @@ -18,12 +18,12 @@ wxVtk2DBaseView::~wxVtk2DBaseView() { if (_vtkIinfoTextImage!=NULL) { - delete _vtkIinfoTextImage; + delete _vtkIinfoTextImage; } if (_imageViewer2XYZ!=NULL) { - delete _imageViewer2XYZ; + delete _imageViewer2XYZ; } } @@ -88,13 +88,13 @@ void wxVtk2DBaseView::Configure(bool okimage) wxVtkBaseView::Configure(); // EED 17 Oct 2007 - if (_imageViewer2XYZ==NULL) - { - _imageViewer2XYZ = new vtkImageViewer2_XYZ(); - wxVTKRenderWindowInteractor *iren = GetWxVTKRenderWindowInteractor(); - _imageViewer2XYZ -> GetVtkImageViewer2()->SetupInteractor ( iren ); - SetInteractorStyleImage( vtkInteractorStyleBaseView2D::New() ); - } + if (_imageViewer2XYZ==NULL) + { + _imageViewer2XYZ = new vtkImageViewer2_XYZ(); + wxVTKRenderWindowInteractor *iren = GetWxVTKRenderWindowInteractor(); + _imageViewer2XYZ -> GetVtkImageViewer2()->SetupInteractor ( iren ); + SetInteractorStyleImage( vtkInteractorStyleBaseView2D::New() ); + } vtkImageData *imageData = GetVtkBaseData()->GetMarImageData()->GetImageData(); @@ -154,7 +154,7 @@ void wxVtk2DBaseView::Configure(bool okimage) camera->SetParallelScale( spx*(x2-x1)/3.0 ); // text information over the graphic window - _vtkIinfoTextImage = new vtkInfoTextImage(); + _vtkIinfoTextImage = new vtkInfoTextImage(); _vtkIinfoTextImageInteractor = new vtkInfoTextImageInteractor(); _vtkIinfoTextImage->SetWxVtk2DBaseView(this); _vtkIinfoTextImage->SetMarImageData( GetVtkBaseData()->GetMarImageData() ); @@ -170,37 +170,37 @@ void wxVtk2DBaseView::Configure(bool okimage) int wxVtk2DBaseView::GetActualSlice() // virtual { - return (int)(_vtkbasedata->GetZ()); + return (int)(_vtkbasedata->GetZ()); } //------------------------------------------------------------------- void wxVtk2DBaseView::SetActualSlice(int slice) // Virtual { - _vtkbasedata->SetZ(slice); + _vtkbasedata->SetZ(slice); } //------------------------------------------------------------------- vtkBaseData *wxVtk2DBaseView::GetVtkBaseData() { - return _vtkbasedata; + return _vtkbasedata; } //------------------------------------------------------------------- void wxVtk2DBaseView::SetVtkBaseData(vtkBaseData *vtkbasedata) { - _vtkbasedata=vtkbasedata; + _vtkbasedata=vtkbasedata; } //------------------------------------------------------------------- void wxVtk2DBaseView::Refresh() { - int z = (int)(GetVtkBaseData()->GetZ()); - _imageViewer2XYZ->SetZSlice( z ); + int z = (int)(GetVtkBaseData()->GetZ()); + _imageViewer2XYZ->SetZSlice( z ); - wxVtkBaseView::Refresh(); + wxVtkBaseView::Refresh(); } //------------------------------------------------------------------- @@ -225,18 +225,19 @@ void wxVtk2DBaseView::SetInteractorStyleImage(vtkInteractorStyleBaseView *intera //--------------------------------------------------------------------------- vtkRenderer* wxVtk2DBaseView::GetRenderer() // virtual { - return _imageViewer2XYZ->GetVtkImageViewer2()->GetRenderer(); + return _imageViewer2XYZ->GetVtkImageViewer2()->GetRenderer(); } //--------------------------------------------------------------------------- vtkRenderWindow* wxVtk2DBaseView::GetRenWin() // virtual { - return _imageViewer2XYZ->GetVtkImageViewer2()->GetRenderWindow(); + return _imageViewer2XYZ->GetVtkImageViewer2()->GetRenderWindow(); } //------------------------------------------------------------------- void wxVtk2DBaseView::GetSpacing(double spc[3]) // virtual { - vtkImageData *imageData = GetVtkBaseData()->GetImageData(); - imageData->GetSpacing(spc); -} \ No newline at end of file + vtkImageData *imageData = GetVtkBaseData()->GetImageData(); + imageData->GetSpacing(spc); +} + diff --git a/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxVtk3DBaseView.cxx b/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxVtk3DBaseView.cxx index ffb634b..4af3bfd 100644 --- a/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxVtk3DBaseView.cxx +++ b/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxVtk3DBaseView.cxx @@ -14,9 +14,9 @@ wxVtk3DBaseView::wxVtk3DBaseView(wxWindow *parent) //------------------------------------------------------------------- wxVtk3DBaseView::~wxVtk3DBaseView() { - if (_aCamera!=NULL) { _aCamera -> Delete(); } + if (_aCamera!=NULL) { _aCamera -> Delete(); } if (_aRenderer!=NULL) { _aRenderer -> Delete(); } - if (_renWin!=NULL) { _renWin -> Delete(); } + if (_renWin!=NULL) { _renWin -> Delete(); } } //------------------------------------------------------------------- vtkCamera* wxVtk3DBaseView::GetCamera() @@ -101,4 +101,5 @@ void wxVtk3DBaseView::GetSpacing(double spc[3]) spc[0]=1; spc[1]=1; spc[2]=1; -} \ No newline at end of file +} +