*** empty log message ***

diff --git a/lib/maracasVisuLib/CMakeLists.txt b/lib/maracasVisuLib/CMakeLists.txt
index a86c6ccb9e926602057be938b6935f8b090ffc4a..417f8b6c919acad5dbf956eab2347fd32b3f8569 100644 (file)
--- a/lib/maracasVisuLib/CMakeLists.txt
+++ b/lib/maracasVisuLib/CMakeLists.txt
@@ -29,6 +29,7 @@ IF ( BUILD_${LIBRARY_NAME} )
     src/kernel
        #${MARACAS_SOURCE_DIR}/src/SnakeIsoContour+Deriche
     src/interface/wxWindows
+    src/interface/wxWindows/Contour
     src/interface/wxWindows/widgets
     src/interface/wxWindows/widgets/pPlotter
        ../../../
@@ -46,6 +47,7 @@ IF ( BUILD_${LIBRARY_NAME} )
   SET ( ${LIBRARY_NAME}_HEADERS
        src/interface/wxWindows/manualContour.h
        src/interface/wxWindows/Contour/ContourCrownWidget.h
+       src/interface/wxWindows/Contour/ContourExtractData.h
        src/interface/wxWindows/Contour/ContourVOIWidget.h  
     src/interface/wxWindows/Contour/Propagation.h
     src/interface/wxWindows/Contour/ExtractControlPoints2D.h
@@ -55,7 +57,7 @@ IF ( BUILD_${LIBRARY_NAME} )
     src/interface/wxWindows/Contour/vectorFunctions.h
 ##    src/interface/wxWindows/wxMaracasImageBrowser02.h
 ##    src/interface/wxWindows/widgets/wxReadingPriorityPanel.h
-    src/interface/wxWindows/widgets/wxVTKRenderWindowInteractor.h
+    src/interface/wxWindows/widgets/wxVTKRenderWindowInteractor.h     src/interface/wxWindows/widgets/wxVTKRenderWindowInteractorEditContour.h
     src/interface/wxWindows/widgets/InterfaceVtkPanelWidgets.h
     src/interface/wxWindows/widgets/vtkClosePolyData.h
     src/interface/wxWindows/wxMaracasMPR.h
@@ -120,6 +122,7 @@ IF ( BUILD_${LIBRARY_NAME} )
 #    src/interface/wxWindows/wxMaracasImageBrowser02.cxx
 #    src/interface/wxWindows/widgets/wxReadingPriorityPanel.cpp
     src/interface/wxWindows/widgets/wxVTKRenderWindowInteractor.cxx
+    src/interface/wxWindows/widgets/wxVTKRenderWindowInteractorEditContour.cxx
     src/interface/wxWindows/widgets/InterfaceVtkPanelWidgets.cxx
     src/interface/wxWindows/widgets/vtkClosePolyData.cxx
     src/interface/wxWindows/wxMaracasMPR.cxx
@@ -271,7 +274,7 @@ INSTALL(
   ) 
 INSTALL(
   TARGETS ${LIBRARY_NAME}
-  DESTINATION lib )
+  DESTINATION bin )
 
   
   

diff --git a/lib/maracasVisuLib/src/interface/wxWindows/Contour/Propagation.h b/lib/maracasVisuLib/src/interface/wxWindows/Contour/Propagation.h
index 9fb0bfeae55c41f5efba84751705236d7af39553..f6b5c3d2e1ea9482808e17efaa31c7d972faa9cb 100644 (file)
--- a/lib/maracasVisuLib/src/interface/wxWindows/Contour/Propagation.h
+++ b/lib/maracasVisuLib/src/interface/wxWindows/Contour/Propagation.h
@@ -8,7 +8,7 @@
 */
 
 #include "marTypes.h"
-#include "../manualContour.h"
+#include "manualContour.h"
 #include "time.h"
 #include <wx/wx.h>
 

diff --git a/lib/maracasVisuLib/src/interface/wxWindows/manualContour.h b/lib/maracasVisuLib/src/interface/wxWindows/manualContour.h
index aad7c52bbae2dcc41782a3b383aedba74d23bbba..e2aa630e221fa966beccc82a3b970dfa9932a2fd 100644 (file)
--- a/lib/maracasVisuLib/src/interface/wxWindows/manualContour.h
+++ b/lib/maracasVisuLib/src/interface/wxWindows/manualContour.h
@@ -32,7 +32,7 @@
 #include <vtkDataSetMapper.h>
 #include <vtkUnstructuredGrid.h>
 
-#include "widgets/wxVTKRenderWindowInteractor.h"
+#include "wxVTKRenderWindowInteractor.h"
 
 
 //--
@@ -40,7 +40,7 @@
 #include <vector>
 
 
-#include "widgets/wxVtkBaseView.h"
+#include "wxVtkBaseView.h"
 #include "marTypes.h"
 
 

diff --git a/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxMPRWidget.h b/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxMPRWidget.h
index 2993255f36509b101dd88f2423a9cd074720ab2f..23a3ae63ba612453bdf059569a91b93ef013d69a 100644 (file)
--- 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: 2008/11/12 16:25:06 $
-  Version:   $Revision: 1.4 $
+  Date:      $Date: 2008/12/06 15:15:34 $
+  Version:   $Revision: 1.5 $
 
   Copyright: (c) 2002, 2003
   License:
@@ -46,7 +46,7 @@
 
 
 //#include "kernel/marInterface.h"
-#include "../manualContour.h"
+#include "manualContour.h"
 
 #include "wxMPRBaseData.h"
 #include "wxVtkBaseView.h"

diff --git a/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxVtkBaseView.cxx b/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxVtkBaseView.cxx
index ccabe8d3e3d83dd5a3bb51bd7ffbdfae063e27d6..748c88cf267196d0b7607dac16e18b6f7331bbc2 100644 (file)
--- a/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxVtkBaseView.cxx
+++ b/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxVtkBaseView.cxx
@@ -13,6 +13,7 @@
 
 #include "wxVtkBaseView.h"
 
+
 vtkStandardNewMacro(vtkInteractorStyleBaseView);
 vtkStandardNewMacro(vtkInteractorStyleBaseView2D);
 vtkStandardNewMacro(vtkInteractorStyleBaseView3D);