*** empty log message ***

diff --git a/appli/BasicViewer/CMakeLists.txt b/appli/BasicViewer/CMakeLists.txt
index bc696e6d25a343e3fb14b409cca2fd13f3591313..5431e3dbd5ec1426c8b4bd929fd0532dd7d8eb45 100644 (file)
--- a/appli/BasicViewer/CMakeLists.txt
+++ b/appli/BasicViewer/CMakeLists.txt
@@ -26,10 +26,10 @@ IF (crea_FOUND)
   INCLUDE(${crea_USE_FILE})
 ENDIF(crea_FOUND)
 
-FIND_PACKAGE(creaMaracasVisu REQUIRED)
-IF (creaMaracasVisu_FOUND)
-  INCLUDE(${creaMaracasVisu_USE_FILE})
-ENDIF(creaMaracasVisu_FOUND)
+#FIND_PACKAGE(creaMaracasVisu REQUIRED)
+#IF (creaMaracasVisu_FOUND)
+#  INCLUDE(${creaMaracasVisu_USE_FILE})
+#ENDIF(creaMaracasVisu_FOUND)
 
 FIND_PACKAGE(BBTK REQUIRED)
 IF (BBTK_FOUND)
@@ -45,7 +45,7 @@ ENDIF(BBTK_FOUND)
 
 MESSAGE ("::::::::::::::::::::THIS IS THE PATH OF VTK = ${VTK_LIBRARIES}")
 MESSAGE ("::::::::::::::::::::THIS IS THE PATH OF CREA = ${crea_LIBRARIES}")
-MESSAGE ("::::::::::::::::::::THIS IS THE PATH OF CREA = ${creaMaracasVisu_LIBRARIES}")
+MESSAGE ("::::::::::::::::::::THIS IS THE PATH OF CREAMARACASVISU = ${creaMaracasVisu_LIBRARIES}")
 SET ( ${EXE_NAME}_LINK_LIBRARIES
       ${crea_LIBRARIES}
       ${WXWIDGETS_LIBRARIES}
@@ -54,8 +54,8 @@ SET ( ${EXE_NAME}_LINK_LIBRARIES
   #    ${ITK_LIBRARIES}
       ${GDCM_LIBRARIES}
       ${BOOST_LIBRARIES}
-#     BBTK
- #   creaMaracasVisu
+ #    BBTK
+     creaMaracasVisu
   
   # USER! : Add here those agmonst the various (?) PROJECT LIBRARIES
   # you need for the current executable

diff --git a/appli/BasicViewer/main.cxx b/appli/BasicViewer/main.cxx
index 48f9b3fc19728e3424fbce4a20aeb477a7ddd51d..7a3c84be70e61106c7fcee831834c56f721ac703 100644 (file)
--- a/appli/BasicViewer/main.cxx
+++ b/appli/BasicViewer/main.cxx
@@ -60,7 +60,6 @@ void MyFrame::OnOpen(wxCommandEvent& event)
 {
        //wxMessageBox(wxT("You clicked the open option"));
 
-#ifdef WIN32
                        creaMaracasVisuKernel::OpenImageDialog *diag = new creaMaracasVisuKernel::OpenImageDialog(true);
                         wxBoxSizer *sizer = new wxBoxSizer(wxVERTICAL);
 
@@ -73,14 +72,6 @@ void MyFrame::OnOpen(wxCommandEvent& event)
                        sizer->Add(viewer,1,wxGROW);
                          SetSizer(sizer);
                        }
-
-#else 
-                       creaMaracasVisuKernel::OpenImageDialog *diag = new creaMaracasVisuKernel::OpenImageDialog(false);
-                       if(diag->getImageData() != NULL){
-                               image = diag->getImageData();
-                               strfilename = diag->getFilename();
-                       }
-#endif
 }
 
 void MyFrame::OnAbout(wxCommandEvent& event)

diff --git a/appli/CMakeLists.txt b/appli/CMakeLists.txt
index d6c2deece0ef8d62a2fc9f9f5eb51aaf43ab3562..a33f94230c44ed8226770fe1d08a014c60723525 100644 (file)
--- a/appli/CMakeLists.txt
+++ b/appli/CMakeLists.txt
@@ -1,3 +1,3 @@
 
-ADD_SUBDIRECTORY(ManualPaint)
-ADD_SUBDIRECTORY(BasicViewer)
+#ADD_SUBDIRECTORY(ManualPaint)
+#ADD_SUBDIRECTORY(BasicViewer)