From b3225bf9915c36f8e79d9a328b525cde6eed9247 Mon Sep 17 00:00:00 2001 From: Eduardo Davila Date: Sun, 7 Mar 2010 13:18:27 +0000 Subject: [PATCH] no message --- doc/bouml/EditorGraphicBBS/2.session | 2 +- kernel/cmake/BBTKConfigurePackage_src.cmake | 2 ++ kernel/cmake/BBTKFindLibraries.cmake | 1 - kernel/src/CMakeLists.txt | 1 + packages/demo/src/CMakeLists.txt | 3 +++ packages/gdcmvtk/src/CMakeLists.txt | 2 ++ packages/itk/src/CMakeLists.txt | 2 ++ packages/itkvtk/src/CMakeLists.txt | 2 ++ packages/kw/src/CMakeLists.txt | 3 +++ packages/qt/src/CMakeLists.txt | 2 ++ packages/std/src/CMakeLists.txt | 2 ++ packages/toolsbbtk/src/CMakeLists.txt | 2 ++ packages/vtk/Configure.cmake | 3 ++- packages/vtk/src/CMakeLists.txt | 2 ++ packages/vtk/src/bbvtkImagePlanes.cxx | 10 +++++----- packages/wx/src/CMakeLists.txt | 2 ++ packages/wxvtk/src/CMakeLists.txt | 2 ++ packages/wxvtk/src/bbwxvtkViewer3D.cxx | 5 +++-- 18 files changed, 38 insertions(+), 10 deletions(-) diff --git a/doc/bouml/EditorGraphicBBS/2.session b/doc/bouml/EditorGraphicBBS/2.session index 3f77b9b..e26c54e 100644 --- a/doc/bouml/EditorGraphicBBS/2.session +++ b/doc/bouml/EditorGraphicBBS/2.session @@ -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 diff --git a/kernel/cmake/BBTKConfigurePackage_src.cmake b/kernel/cmake/BBTKConfigurePackage_src.cmake index 95553de..45c5fd8 100644 --- a/kernel/cmake/BBTKConfigurePackage_src.cmake +++ b/kernel/cmake/BBTKConfigurePackage_src.cmake @@ -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} diff --git a/kernel/cmake/BBTKFindLibraries.cmake b/kernel/cmake/BBTKFindLibraries.cmake index 03db758..afd65ed 100644 --- a/kernel/cmake/BBTKFindLibraries.cmake +++ b/kernel/cmake/BBTKFindLibraries.cmake @@ -47,7 +47,6 @@ ENDIF(BBTK_KERNEL OR BBTK_CORE_PACKAGE) - #----------------------------------------------------------------------------- CREA_FIND_AND_USE_LIBRARIES() #----------------------------------------------------------------------------- diff --git a/kernel/src/CMakeLists.txt b/kernel/src/CMakeLists.txt index 96ce672..8cd4249 100644 --- a/kernel/src/CMakeLists.txt +++ b/kernel/src/CMakeLists.txt @@ -255,6 +255,7 @@ SET(${LIBRARY_NAME}_ADDITIONAL_USE_FILE #----------------------------------------------------------------------------- CREA_ADVANCED_INSTALL_LIBRARY_FOR_CMAKE(${LIBRARY_NAME}) + #----------------------------------------------------------------------------- #----------------------------------------------------------------------------- diff --git a/packages/demo/src/CMakeLists.txt b/packages/demo/src/CMakeLists.txt index e2d2a11..72c378b 100644 --- a/packages/demo/src/CMakeLists.txt +++ b/packages/demo/src/CMakeLists.txt @@ -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) + #--------------------------------------------------------------------------- diff --git a/packages/gdcmvtk/src/CMakeLists.txt b/packages/gdcmvtk/src/CMakeLists.txt index e2d2a11..4cd51a9 100644 --- a/packages/gdcmvtk/src/CMakeLists.txt +++ b/packages/gdcmvtk/src/CMakeLists.txt @@ -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) #--------------------------------------------------------------------------- diff --git a/packages/itk/src/CMakeLists.txt b/packages/itk/src/CMakeLists.txt index e2d2a11..4cd51a9 100644 --- a/packages/itk/src/CMakeLists.txt +++ b/packages/itk/src/CMakeLists.txt @@ -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) #--------------------------------------------------------------------------- diff --git a/packages/itkvtk/src/CMakeLists.txt b/packages/itkvtk/src/CMakeLists.txt index e2d2a11..4cd51a9 100644 --- a/packages/itkvtk/src/CMakeLists.txt +++ b/packages/itkvtk/src/CMakeLists.txt @@ -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) #--------------------------------------------------------------------------- diff --git a/packages/kw/src/CMakeLists.txt b/packages/kw/src/CMakeLists.txt index 97061d0..9763ac0 100644 --- a/packages/kw/src/CMakeLists.txt +++ b/packages/kw/src/CMakeLists.txt @@ -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" "") #--------------------------------------------------------------------------- diff --git a/packages/qt/src/CMakeLists.txt b/packages/qt/src/CMakeLists.txt index 70d9e2c..17d3993 100644 --- a/packages/qt/src/CMakeLists.txt +++ b/packages/qt/src/CMakeLists.txt @@ -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) #--------------------------------------------------------------------------- diff --git a/packages/std/src/CMakeLists.txt b/packages/std/src/CMakeLists.txt index e2d2a11..4cd51a9 100644 --- a/packages/std/src/CMakeLists.txt +++ b/packages/std/src/CMakeLists.txt @@ -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) #--------------------------------------------------------------------------- diff --git a/packages/toolsbbtk/src/CMakeLists.txt b/packages/toolsbbtk/src/CMakeLists.txt index e2d2a11..4cd51a9 100644 --- a/packages/toolsbbtk/src/CMakeLists.txt +++ b/packages/toolsbbtk/src/CMakeLists.txt @@ -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) #--------------------------------------------------------------------------- diff --git a/packages/vtk/Configure.cmake b/packages/vtk/Configure.cmake index dc44b3b..3113c1e 100644 --- a/packages/vtk/Configure.cmake +++ b/packages/vtk/Configure.cmake @@ -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}) diff --git a/packages/vtk/src/CMakeLists.txt b/packages/vtk/src/CMakeLists.txt index e2d2a11..4cd51a9 100644 --- a/packages/vtk/src/CMakeLists.txt +++ b/packages/vtk/src/CMakeLists.txt @@ -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) #--------------------------------------------------------------------------- diff --git a/packages/vtk/src/bbvtkImagePlanes.cxx b/packages/vtk/src/bbvtkImagePlanes.cxx index b62cd07..92daa65 100644 --- a/packages/vtk/src/bbvtkImagePlanes.cxx +++ b/packages/vtk/src/bbvtkImagePlanes.cxx @@ -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; diff --git a/packages/wx/src/CMakeLists.txt b/packages/wx/src/CMakeLists.txt index e2d2a11..4cd51a9 100644 --- a/packages/wx/src/CMakeLists.txt +++ b/packages/wx/src/CMakeLists.txt @@ -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) #--------------------------------------------------------------------------- diff --git a/packages/wxvtk/src/CMakeLists.txt b/packages/wxvtk/src/CMakeLists.txt index e2d2a11..4cd51a9 100644 --- a/packages/wxvtk/src/CMakeLists.txt +++ b/packages/wxvtk/src/CMakeLists.txt @@ -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) #--------------------------------------------------------------------------- diff --git a/packages/wxvtk/src/bbwxvtkViewer3D.cxx b/packages/wxvtk/src/bbwxvtkViewer3D.cxx index e697b6f..de2257f 100644 --- a/packages/wxvtk/src/bbwxvtkViewer3D.cxx +++ b/packages/wxvtk/src/bbwxvtkViewer3D.cxx @@ -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(); -- 2.45.1