]> Creatis software - bbtk.git/commitdiff
no message
authorEduardo Davila <Eduardo.Davila@creatis.insa-lyon.fr>
Sun, 7 Mar 2010 13:18:27 +0000 (13:18 +0000)
committerEduardo Davila <Eduardo.Davila@creatis.insa-lyon.fr>
Sun, 7 Mar 2010 13:18:27 +0000 (13:18 +0000)
18 files changed:
doc/bouml/EditorGraphicBBS/2.session
kernel/cmake/BBTKConfigurePackage_src.cmake
kernel/cmake/BBTKFindLibraries.cmake
kernel/src/CMakeLists.txt
packages/demo/src/CMakeLists.txt
packages/gdcmvtk/src/CMakeLists.txt
packages/itk/src/CMakeLists.txt
packages/itkvtk/src/CMakeLists.txt
packages/kw/src/CMakeLists.txt
packages/qt/src/CMakeLists.txt
packages/std/src/CMakeLists.txt
packages/toolsbbtk/src/CMakeLists.txt
packages/vtk/Configure.cmake
packages/vtk/src/CMakeLists.txt
packages/vtk/src/bbvtkImagePlanes.cxx
packages/wx/src/CMakeLists.txt
packages/wxvtk/src/CMakeLists.txt
packages/wxvtk/src/bbwxvtkViewer3D.cxx

index 3f77b9b62c91903a5c98cb2096dbe9529146724f..e26c54ea9d147ad7cb6d7a4df6bf0d60263e48cf 100644 (file)
@@ -1,7 +1,7 @@
 window_sizes 1392 854 125 1261 707 90
 diagrams
   active  classdiagram_ref 128002 // EditorGraphicBBS_class_Diagram
-    1257 687 105 4 591 0
+    1257 687 105 4 484 0
 end
 show_stereotypes
 selected classdiagram_ref 128002 // EditorGraphicBBS_class_Diagram
index 95553de32dc8defbe52d8425b7fe85660a8413c9..45c5fd8bbd8d890885b8bc82fb31ea1ffebbc186 100644 (file)
@@ -146,6 +146,8 @@ ENDIF(BBTK_USE_KWWIDGETS)
 ADD_LIBRARY(bb${BBTK_PACKAGE_NAME} SHARED 
   ${${BBTK_PACKAGE_NAME}_CXX_SOURCES} ${${BBTK_PACKAGE_NAME}_H_SOURCES}
   )
+
+
 TARGET_LINK_LIBRARIES(bb${BBTK_PACKAGE_NAME} 
   bbtk
   ${${BBTK_PACKAGE_NAME}_LIBS}
index 03db758f7780d669a85ba7c4e7ae1518f123ceca..afd65ed40d965aecee059695924ed37dd8f2ec49 100644 (file)
@@ -47,7 +47,6 @@ ENDIF(BBTK_KERNEL OR BBTK_CORE_PACKAGE)
 
 
 
-
 #-----------------------------------------------------------------------------
 CREA_FIND_AND_USE_LIBRARIES()
 #-----------------------------------------------------------------------------
index 96ce672fd0cc035c1883cdcb6ae31cfe181e2145..8cd424943a3e4f0a892d8c3491f8280fbfe8ee71 100644 (file)
@@ -255,6 +255,7 @@ SET(${LIBRARY_NAME}_ADDITIONAL_USE_FILE
 
 #-----------------------------------------------------------------------------
 CREA_ADVANCED_INSTALL_LIBRARY_FOR_CMAKE(${LIBRARY_NAME})
+
 #-----------------------------------------------------------------------------
 
 #-----------------------------------------------------------------------------
index e2d2a1158aa171224a8d35f3eed22a0869a32910..72c378b699ba3a04056d6533668aa01633b92519 100644 (file)
@@ -1,5 +1,8 @@
 #---------------------------------------------------------------------------
 # Include src configuration cmake script
 INCLUDE(${BBTK_CMAKE_DIR}/BBTKConfigurePackage_src.cmake)
+#EED 6Mars2010
+add_dependencies(bb${BBTK_PACKAGE_NAME} bbfy)
+
 #---------------------------------------------------------------------------
 
index e2d2a1158aa171224a8d35f3eed22a0869a32910..4cd51a99e7669af6e3e5eb3c2c9911a5d3955f5f 100644 (file)
@@ -1,5 +1,7 @@
 #---------------------------------------------------------------------------
 # Include src configuration cmake script
 INCLUDE(${BBTK_CMAKE_DIR}/BBTKConfigurePackage_src.cmake)
+#EED 6Mars2010
+add_dependencies(bb${BBTK_PACKAGE_NAME} bbfy)
 #---------------------------------------------------------------------------
 
index e2d2a1158aa171224a8d35f3eed22a0869a32910..4cd51a99e7669af6e3e5eb3c2c9911a5d3955f5f 100644 (file)
@@ -1,5 +1,7 @@
 #---------------------------------------------------------------------------
 # Include src configuration cmake script
 INCLUDE(${BBTK_CMAKE_DIR}/BBTKConfigurePackage_src.cmake)
+#EED 6Mars2010
+add_dependencies(bb${BBTK_PACKAGE_NAME} bbfy)
 #---------------------------------------------------------------------------
 
index e2d2a1158aa171224a8d35f3eed22a0869a32910..4cd51a99e7669af6e3e5eb3c2c9911a5d3955f5f 100644 (file)
@@ -1,5 +1,7 @@
 #---------------------------------------------------------------------------
 # Include src configuration cmake script
 INCLUDE(${BBTK_CMAKE_DIR}/BBTKConfigurePackage_src.cmake)
+#EED 6Mars2010
+add_dependencies(bb${BBTK_PACKAGE_NAME} bbfy)
 #---------------------------------------------------------------------------
 
index 97061d04de519e8206c956b00595cb822a185bc5..9763ac09015d9ef24457f5f658e01b12c4f89d07 100644 (file)
@@ -3,6 +3,9 @@ SET( ${BBTK_PACKAGE_NAME}_CXX_SOURCES_WRAP_TCL vtkKWSlicer.cxx )
 #---------------------------------------------------------------------------
 # Include src configuration cmake script
 INCLUDE(${BBTK_CMAKE_DIR}/BBTKConfigurePackage_src.cmake)
+#EED 6Mars2010
+add_dependencies(bb${BBTK_PACKAGE_NAME} bbfy)
+
 #include("${KWWidgets_CMAKE_DIR}/KWWidgetsWrappingMacros.cmake")
 #kwwidgets_wrap_tcl(bbkw LIB_TCL_SRCS "vtkKWSlicer.cxx" "")
 #---------------------------------------------------------------------------
index 70d9e2c0b693a22ba8b3ee727d822df2f194aeec..17d3993ae06526143db470313e25474ee03e0b44 100644 (file)
@@ -19,5 +19,7 @@ MESSAGE(STATUS "Sources : ${${BBTK_PACKAGE_NAME}_SOURCES}")
 #---------------------------------------------------------------------------
 # Include src configuration cmake script
 INCLUDE(${BBTK_CMAKE_DIR}/BBTKConfigurePackage_src.cmake)
+#EED 6Mars2010
+add_dependencies(bb${BBTK_PACKAGE_NAME} bbfy)
 #---------------------------------------------------------------------------
 
index e2d2a1158aa171224a8d35f3eed22a0869a32910..4cd51a99e7669af6e3e5eb3c2c9911a5d3955f5f 100644 (file)
@@ -1,5 +1,7 @@
 #---------------------------------------------------------------------------
 # Include src configuration cmake script
 INCLUDE(${BBTK_CMAKE_DIR}/BBTKConfigurePackage_src.cmake)
+#EED 6Mars2010
+add_dependencies(bb${BBTK_PACKAGE_NAME} bbfy)
 #---------------------------------------------------------------------------
 
index e2d2a1158aa171224a8d35f3eed22a0869a32910..4cd51a99e7669af6e3e5eb3c2c9911a5d3955f5f 100644 (file)
@@ -1,5 +1,7 @@
 #---------------------------------------------------------------------------
 # Include src configuration cmake script
 INCLUDE(${BBTK_CMAKE_DIR}/BBTKConfigurePackage_src.cmake)
+#EED 6Mars2010
+add_dependencies(bb${BBTK_PACKAGE_NAME} bbfy)
 #---------------------------------------------------------------------------
 
index dc44b3be3d7cbec2ad11d8a9c6875d941b735e7e..3113c1edfe436dcc626894dc915a989e263c47fa 100644 (file)
@@ -21,7 +21,8 @@ IF(BUILD_BBTK_PACKAGE_${BBTK_PACKAGE_NAME})
   #===========================================================================
   # Include package configuration cmake script from bbtk cmake dir
   INCLUDE(${BBTK_CMAKE_DIR}/BBTKConfigurePackage.cmake)
-  #=========================================================================== 
+
+#=========================================================================== 
   
 ELSE(BUILD_BBTK_PACKAGE_${BBTK_PACKAGE_NAME})
 
index e2d2a1158aa171224a8d35f3eed22a0869a32910..4cd51a99e7669af6e3e5eb3c2c9911a5d3955f5f 100644 (file)
@@ -1,5 +1,7 @@
 #---------------------------------------------------------------------------
 # Include src configuration cmake script
 INCLUDE(${BBTK_CMAKE_DIR}/BBTKConfigurePackage_src.cmake)
+#EED 6Mars2010
+add_dependencies(bb${BBTK_PACKAGE_NAME} bbfy)
 #---------------------------------------------------------------------------
 
index b62cd077c4d8223d1deb2509503f0a4024e31532..92daa652fad7dca3429fe42ab4b561694f1e2eb4 100644 (file)
@@ -2,8 +2,8 @@
   Program:   bbtk
   Module:    $RCSfile: bbvtkImagePlanes.cxx,v $
   Language:  C++
-  Date:      $Date: 2010/01/21 16:03:19 $
-  Version:   $Revision: 1.31 $
+  Date:      $Date: 2010/03/07 13:18:41 $
+  Version:   $Revision: 1.32 $
 =========================================================================*/
 
 /* ---------------------------------------------------------------------
@@ -137,7 +137,7 @@ namespace bbvtk
  };
   //================================================================
 
-  //vtkCxxRevisionMacro(ImagePlanes::VtkCallbackType, "$Revision: 1.31 $");
+  //vtkCxxRevisionMacro(ImagePlanes::VtkCallbackType, "$Revision: 1.32 $");
 
   //================================================================
 
@@ -433,8 +433,8 @@ void ImagePlanes::updateInteractor(){
        {
        }
        
-       vtkImagePlaneWidget* ImagePlanes::GetPlaneWidget(unsigned char activationkey, double r, double g, double b, vtkCellPicker* picker){
-
+       vtkImagePlaneWidget* ImagePlanes::GetPlaneWidget(unsigned char activationkey, double r, double g, double b, vtkCellPicker* picker)
+       {
                vtkProperty* prop1 = 0;         
                vtkImagePlaneWidget* planeWidget = 0;
 
index e2d2a1158aa171224a8d35f3eed22a0869a32910..4cd51a99e7669af6e3e5eb3c2c9911a5d3955f5f 100644 (file)
@@ -1,5 +1,7 @@
 #---------------------------------------------------------------------------
 # Include src configuration cmake script
 INCLUDE(${BBTK_CMAKE_DIR}/BBTKConfigurePackage_src.cmake)
+#EED 6Mars2010
+add_dependencies(bb${BBTK_PACKAGE_NAME} bbfy)
 #---------------------------------------------------------------------------
 
index e2d2a1158aa171224a8d35f3eed22a0869a32910..4cd51a99e7669af6e3e5eb3c2c9911a5d3955f5f 100644 (file)
@@ -1,5 +1,7 @@
 #---------------------------------------------------------------------------
 # Include src configuration cmake script
 INCLUDE(${BBTK_CMAKE_DIR}/BBTKConfigurePackage_src.cmake)
+#EED 6Mars2010
+add_dependencies(bb${BBTK_PACKAGE_NAME} bbfy)
 #---------------------------------------------------------------------------
 
index e697b6fe7dc20647aeaed2d2daa63152c5ccd9b8..de2257f9cc2afb05ddb9c4dd81725ea4c55d337d 100644 (file)
@@ -3,8 +3,8 @@
   Program:   bbtk
   Module:    $RCSfile: bbwxvtkViewer3D.cxx,v $
   Language:  C++
-  Date:      $Date: 2009/08/07 15:06:27 $
-  Version:   $Revision: 1.19 $
+  Date:      $Date: 2010/03/07 13:18:43 $
+  Version:   $Revision: 1.20 $
                                                                                 
   Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
   l'Image). All rights reserved. See Doc/License.txt or
@@ -210,6 +210,7 @@ void Viewer3DWidget::Refresh(bool eraseBackground , const wxRect* rect )
        //--------------------------------------------------------------------------
   void Viewer3D::Process() 
   { 
+         
     if (!bbIsShown()) return;
 //EED    
 //       Viewer3DWidget* w = (Viewer3DWidget*)bbGetOutputWidget();