From: Juan Prieto <Juan.Prieto@creatis.insa-lyon.fr>
Date: Mon, 4 May 2009 15:06:40 +0000 (+0000)
Subject: *** empty log message ***
X-Git-Tag: EED.02Oct2009~93
X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=commitdiff_plain;h=e708582890594ec3f3d94bd60fee2207882a8264;p=creaMaracasVisu.git

*** empty log message ***
---

diff --git a/.project b/.project
new file mode 100644
index 0000000..6e71a95
--- /dev/null
+++ b/.project
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>creaMaracasVisu</name>
+	<comment></comment>
+	<projects>
+	</projects>
+	<buildSpec>
+	</buildSpec>
+	<natures>
+	</natures>
+</projectDescription>
diff --git a/CMakeLists.txt b/CMakeLists.txt
index b901a23..7e13b12 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -46,7 +46,7 @@ SUBDIRS(lib)
 SUBDIRS(bbtk)
 SUBDIRS(install)
 
-INCLUDE_DIRECTORIES( ${PROJECT_SOURCE_DIR}/data/Icons )
+INCLUDE_DIRECTORIES( ${PROJECT_SOURCE_DIR}/Data/Icons )
 
 
 
diff --git a/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxMPRWidget.cxx b/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxMPRWidget.cxx
index 37ff5bd..f0a7040 100644
--- a/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxMPRWidget.cxx
+++ b/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxMPRWidget.cxx
@@ -3,8 +3,8 @@
   Program:   wxMaracas
   Module:    $RCSfile: wxMPRWidget.cxx,v $
   Language:  C++
-  Date:      $Date: 2009/05/04 07:35:42 $
-  Version:   $Revision: 1.11 $
+  Date:      $Date: 2009/05/04 15:06:42 $
+  Version:   $Revision: 1.12 $
 
   Copyright: (c) 2002, 2003
   License:
@@ -3782,7 +3782,7 @@ wxPanel* wxVtkMPR3DView::CreateControlPanel(wxWindow *parent)
 	return _wxvtkmpr3DviewCntrlPanel;
 }
 //-------------------------------------------------------------------
-vtkMPR3DDataViewer* wxVtkMPR3DView::GetVtkMPR3DDataViewer()
+vtkMPR3DDataViewer* wxVtkMPR3DView::GetVtkMPR3DDataViewer() 
 {
 	return _vtkmpr3Ddataviewer; 
 }
diff --git a/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxMPRWidget.h b/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxMPRWidget.h
index f682765..986270a 100644
--- a/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxMPRWidget.h
+++ b/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxMPRWidget.h
@@ -3,8 +3,8 @@
   Program:   wxMaracas
   Module:    $RCSfile: wxMPRWidget.h,v $
   Language:  C++
-  Date:      $Date: 2009/05/04 07:35:42 $
-  Version:   $Revision: 1.8 $
+  Date:      $Date: 2009/05/04 15:06:42 $
+  Version:   $Revision: 1.9 $
 
   Copyright: (c) 2002, 2003
   License:
@@ -544,8 +544,8 @@ public:
 	void				SetVtkMPR3DDataViewer( vtkMPR3DDataViewer *vtkmpr3Ddataviewer );
 	wxPanel*			CreateControlPanel(wxWindow *parent);
 
-	vtkMPR3DDataViewer* GetVtkMPR3DDataViewer()throw (char*);
-	wxVtk3DBaseView*	GetWxvtk3Dbaseview();
+	vtkMPR3DDataViewer* GetVtkMPR3DDataViewer();
+	wxVtk3DBaseView*	GetWxvtk3Dbaseview() throw (char*);
 
 	void				InitOrientationPointWidget(); 
 
diff --git a/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxMaracasIRMView.cxx b/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxMaracasIRMView.cxx
index 4610a7b..9225874 100644
--- a/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxMaracasIRMView.cxx
+++ b/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxMaracasIRMView.cxx
@@ -3,8 +3,8 @@
   Program:   wxMaracas
   Module:    $RCSfile: wxMaracasIRMView.cxx,v $
   Language:  C++
-  Date:      $Date: 2009/05/04 07:35:42 $
-  Version:   $Revision: 1.6 $
+  Date:      $Date: 2009/05/04 15:06:42 $
+  Version:   $Revision: 1.7 $
 
   Copyright: (c) 2002, 2003
   License:
@@ -24,8 +24,8 @@
 #include <wx/colordlg.h>
 #include <wx/bmpbuttn.h>
 
-#include "OpenImage.xpm"
-#include "Color.xpm"
+#include <OpenImage.xpm>
+#include <Color.xpm>
 
 wxMaracasIRMView* wxMaracasIRMView::instance=NULL;