From: jean-pierre roux Date: Mon, 8 Feb 2010 15:17:54 +0000 (+0000) Subject: \ No newline at end of file X-Git-Tag: CREATOOLS.2-0-3~66 X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=commitdiff_plain;h=2a69bae264c4dc43a7189f16b53a66dcd3a774dc;p=creaMaracasVisu.git \ No newline at end of file --- diff --git a/lib/maracasVisuLib/src/CutModule/kernel/CutModelManager.cxx b/lib/maracasVisuLib/src/CutModule/kernel/CutModelManager.cxx index af04535..9cec5c6 100644 --- a/lib/maracasVisuLib/src/CutModule/kernel/CutModelManager.cxx +++ b/lib/maracasVisuLib/src/CutModule/kernel/CutModelManager.cxx @@ -3,8 +3,8 @@ Program: wxMaracas Module: $RCSfile: CutModelManager.cxx,v $ Language: C++ - Date: $Date: 2009/12/08 13:42:39 $ - Version: $Revision: 1.5 $ + Date: $Date: 2010/02/08 15:20:22 $ + Version: $Revision: 1.6 $ Copyright: (c) 2002, 2003 License: @@ -286,7 +286,6 @@ int CutModelManager::Undo() throw( CutModelException){ int CutModelManager::Redo() throw( CutModelException){ if(_currentaction >= 0 && _currentaction < _undoredo.size()){ - CutModelSaveBinInfo* currentundo = _undoredo[_currentaction]; CutModelData* currentmodel; @@ -305,4 +304,4 @@ int CutModelManager::Redo() throw( CutModelException){ return 0; } return -1; -} \ No newline at end of file +} diff --git a/lib/maracasVisuLib/src/interface/wxWindows/widgets/OpenImageDialog.h b/lib/maracasVisuLib/src/interface/wxWindows/widgets/OpenImageDialog.h index 1b70106..a720dfe 100644 --- a/lib/maracasVisuLib/src/interface/wxWindows/widgets/OpenImageDialog.h +++ b/lib/maracasVisuLib/src/interface/wxWindows/widgets/OpenImageDialog.h @@ -12,14 +12,12 @@ class creaMaracasVisu_EXPORT OpenImageDialog { public: OpenImageDialog(); ~OpenImageDialog(); - vtkImageData* getImageData(); protected: private: vtkImageData* img; - }; } diff --git a/lib/maracasVisuLib/src/interface/wxWindows/widgets/vtkMPR3DDataViewer.cxx b/lib/maracasVisuLib/src/interface/wxWindows/widgets/vtkMPR3DDataViewer.cxx index 3e3642d..8c369ff 100644 --- a/lib/maracasVisuLib/src/interface/wxWindows/widgets/vtkMPR3DDataViewer.cxx +++ b/lib/maracasVisuLib/src/interface/wxWindows/widgets/vtkMPR3DDataViewer.cxx @@ -337,4 +337,5 @@ void vtkMPR3DDataViewer::setColorTransferFunction(vtkColorTransferFunction* colo _saggitalColors->SetLookupTable(colortable); _coronalColors->SetLookupTable(colortable); _axialColors->SetLookupTable(colortable); -} \ No newline at end of file +} + diff --git a/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxMaracasDialog_NViewers.cpp b/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxMaracasDialog_NViewers.cpp index 3317506..d509c61 100644 --- a/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxMaracasDialog_NViewers.cpp +++ b/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxMaracasDialog_NViewers.cpp @@ -66,4 +66,4 @@ void wxMaracasDialog_NViewers::OnDClickLeft(wxCommandEvent & event) wxMaracas_N_ViewersWidget* wxMaracasDialog_NViewers::getViewer() { return viewer; -} \ No newline at end of file +} diff --git a/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxMaracasDialog_NViewers.h b/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxMaracasDialog_NViewers.h index 442fc1a..7654264 100644 --- a/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxMaracasDialog_NViewers.h +++ b/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxMaracasDialog_NViewers.h @@ -17,11 +17,11 @@ class wxMaracasDialog_NViewers : public wxFrame{ wxMaracas_N_ViewersWidget* getViewer(); private: - wxMaracas_N_ViewersWidget* viewer; - CutModelMainPanel* cutter; + wxMaracas_N_ViewersWidget* viewer; + CutModelMainPanel* cutter; - std::vector point; + std::vector point; DECLARE_EVENT_TABLE( ); -}; \ No newline at end of file +}; diff --git a/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxMaracasRenderTabbedPanel.h b/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxMaracasRenderTabbedPanel.h index cad417a..3dd2a33 100644 --- a/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxMaracasRenderTabbedPanel.h +++ b/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxMaracasRenderTabbedPanel.h @@ -94,4 +94,5 @@ private: DECLARE_EVENT_TABLE( ); }; -#endif /*wxMaracasMultipleVolumeRendererPanel_H_*/ \ No newline at end of file +#endif /*wxMaracasMultipleVolumeRendererPanel_H_*/ +