]> Creatis software - bbtk.git/commitdiff
*** empty log message ***
authorguigues <guigues>
Fri, 12 Dec 2008 10:20:40 +0000 (10:20 +0000)
committerguigues <guigues>
Fri, 12 Dec 2008 10:20:40 +0000 (10:20 +0000)
27 files changed:
INSTALL.txt
kernel/cmake/BBTKAddDefinitions.cmake
kernel/cmake/BBTKConfigurePackage.cmake
kernel/data/icons/wxart_delete.xpm
kernel/data/icons/wxart_down.xpm
kernel/data/icons/wxart_eldel.xpm
kernel/data/icons/wxart_eldown.xpm
kernel/data/icons/wxart_exefile.xpm
kernel/data/icons/wxart_fileopen.xpm
kernel/data/icons/wxart_filesave.xpm
kernel/data/icons/wxart_filesaveas.xpm
kernel/data/icons/wxart_new.xpm
kernel/src/CMakeLists.txt
kernel/src/bbtkConfigurationFile.cxx
kernel/src/bbtkUtilities.cxx
kernel/src/icons/cc_exit.xpm
kernel/src/icons/cc_new.xpm
kernel/src/icons/cc_open.xpm
kernel/src/icons/cc_run.xpm
kernel/src/icons/cc_save.xpm
kernel/src/icons/cc_save_as.xpm
kernel/src/icons/cc_stop.xpm
packages/vtk/CMakeLists.txt
packages/vtk/src/bbvtkTransform.cxx
packages/vtk/src/bbvtkTransform.h
packages/vtk/src/bbvtkVecImageGaussianSmooth.cxx
packages/wxvtk/CMakeLists.txt

index 3fe4e09aada4deaf6db2eeba8a20192e3e3c30b1..e366bec1295b1a54fc824f20d2e8cbf4d7397f5c 100644 (file)
@@ -1,3 +1,8 @@
+Basic instructions here. 
+Read http://www.creatis.insa-lyon.fr/creatools 
+or ./kernel/doc/bbtkWebSite/install.html
+for details
+
 ***********
 ** LINUX **
 ***********
 - press 'g'
 - type :
 > make
-> sudo make install (if you are a sudoer)
-OR 
-> su 
-type root password
+> su (NOTE: installing as a sudoer usually fails...)
+type root password 
 > make install
 > exit
 
@@ -27,9 +30,7 @@ First, be sure to be logged *WITH YOUR USER NAME, NOT ROOT*
 
 ==== UNINSTALL ====
 To uninstall bbtk, type :
-> sudo bbtk-uninstall (if you are a sudoer)
-OR 
-> su
+> su (NOTE: uninstalling as a sudoer usually fails...)
 type root password
 > bbtk-uninstall
 
@@ -39,30 +40,4 @@ type root password
 ** WINDOWS **
 *************
 
-1)
-INSTALL SOFA
-   (See environment variables  VTK ITK GDCM WXWIN ..)
-
-2)
-Install from 
-  http://www.creatis.insa-lyon.fr/~davila/bbtk/Software/
-       -basic-miktex-2.6.2742.exe
-         (You have to make update) 
-       -tth_exe.zip     (c:\Creatis\tth_exe)
-    -nsis-2.34-setup.exe
-  http://www.creatis.insa-lyon.fr/~davila/bbtk/Software/new/
-       -graphviz-2.2.1.exe
-       -doxygen-1.5.3-setup.exe
-
-
-3) 
-Set the global variables of windows
- Start
-  -> Control Panel
-    -> System
-     -> Advance
-      -> Environment Variables
-Ex.
-
-CREATIS        = c:\Creatis\
-
+Visit the web site !
index 30014dae9468a557363db11ac5bb7f61ab9dee8d..68b1506d212dccb5029f9e81ddcd0459c08a9a54 100644 (file)
@@ -2,10 +2,10 @@ MESSAGE(STATUS "")
 MESSAGE(STATUS "=======================================")
 MESSAGE(STATUS "Adding definitions:")
 # Set C preprocessor definitions
-CREA_DEFINE_WITH_VAL(BBTK_SHARE_REL_PATH "${BBTK_SHARE_REL_PATH}")
-CREA_DEFINE_WITH_VAL(BBTK_DOC_REL_PATH "${BBTK_DOC_REL_PATH}")
-CREA_DEFINE_WITH_VAL(BBTK_BBS_REL_PATH "${BBTK_BBS_REL_PATH}")
-CREA_DEFINE_WITH_VAL(BBTK_DATA_REL_PATH "${BBTK_DATA_REL_PATH}")
+CREA_DEFINE_WITH_VAL(BBTK_SHARE_REL_PATH ${BBTK_SHARE_REL_PATH})
+CREA_DEFINE_WITH_VAL(BBTK_DOC_REL_PATH ${BBTK_DOC_REL_PATH})
+CREA_DEFINE_WITH_VAL(BBTK_BBS_REL_PATH ${BBTK_BBS_REL_PATH})
+CREA_DEFINE_WITH_VAL(BBTK_DATA_REL_PATH ${BBTK_DATA_REL_PATH})
 #-----------------------------------------------------------------------------
 # messages compilation options 
 IF (BBTK_COMPILE_MESSAGES) 
index bdace25040be3765620d378e76e40fff9a6a57a7..a4104a446834cc8e110386b5aa812d1f904a57cc 100644 (file)
@@ -95,7 +95,7 @@ IF(${BBTK_PACKAGE_NAME}_USE_VTK)
   SET(USE_VTK ON CACHE BOOL "Use VTK" FORCE)
   SET(${BBTK_PACKAGE_NAME}_LIBS
     ${${BBTK_PACKAGE_NAME}_LIBS}
-    ${BBTK_VTK_LIBRARIES}
+    ${VTK_LIBRARIES}
     )
 ENDIF(${BBTK_PACKAGE_NAME}_USE_VTK)
 
@@ -103,7 +103,7 @@ IF(${BBTK_PACKAGE_NAME}_USE_ITK)
   SET(USE_ITK ON CACHE BOOL "Use ITK" FORCE)
   SET(${BBTK_PACKAGE_NAME}_LIBS
     ${${BBTK_PACKAGE_NAME}_LIBS}
-    ${BBTK_ITK_LIBRARIES}
+    ${ITK_LIBRARIES}
     )
 ENDIF(${BBTK_PACKAGE_NAME}_USE_ITK)
 
@@ -111,7 +111,7 @@ IF(${BBTK_PACKAGE_NAME}_USE_GDCM)
   SET(USE_GDCM ON CACHE BOOL "Use GDCM" FORCE)
   SET(${BBTK_PACKAGE_NAME}_LIBS
     ${${BBTK_PACKAGE_NAME}_LIBS}
-    ${BBTK_GDCM_LIBRARIES}
+    ${GDCM_LIBRARIES}
     )
 ENDIF(${BBTK_PACKAGE_NAME}_USE_GDCM)
 
@@ -119,7 +119,7 @@ IF(${BBTK_PACKAGE_NAME}_USE_GSMIS)
   SET(USE_GSMIS ON CACHE BOOL "Use GSMIS" FORCE)
   SET(${BBTK_PACKAGE_NAME}_LIBS
     ${${BBTK_PACKAGE_NAME}_LIBS}
-    ${BBTK_GSMIS_LIBRARIES}
+    ${GSMIS_LIBRARIES}
     )
 ENDIF(${BBTK_PACKAGE_NAME}_USE_GSMIS)
 
@@ -131,7 +131,7 @@ IF(${BBTK_PACKAGE_NAME}_USE_WXWIDGETS)
     IF(WIN32)
       SET(${BBTK_PACKAGE_NAME}_LIBS
         ${${BBTK_PACKAGE_NAME}_LIBS}
-        ${BBTK_WXWIDGETS_LIBRARIES}
+        ${WXWIDGETS_LIBRARIES}
         )
     ENDIF(WIN32)
   ELSE(BBTK_CORE_PACKAGE)
@@ -144,7 +144,7 @@ IF(${BBTK_PACKAGE_NAME}_USE_WXWIDGETS)
       IF(WIN32)
         SET(${BBTK_PACKAGE_NAME}_LIBS
           ${${BBTK_PACKAGE_NAME}_LIBS}
-          ${BBTK_WXWIDGETS_LIBRARIES}
+          ${WXWIDGETS_LIBRARIES}
           )
       ENDIF(WIN32)
     ENDIF(NOT BBTK_BUILT_WITH_WX)
@@ -154,7 +154,12 @@ ENDIF(${BBTK_PACKAGE_NAME}_USE_WXWIDGETS)
 
 #---------------------------------------------------------------------------
 
-
+MESSAGE(STATUS "")
+MESSAGE(STATUS "=======================================")
+MESSAGE(STATUS "${BBTK_PACKAGE_NAME} link libraries:")
+MESSAGE(STATUS "${${BBTK_PACKAGE_NAME}_LIBS}")
+MESSAGE(STATUS "=======================================")
+MESSAGE(STATUS "")
 
 #---------------------------------------------------------------------------
 # Recurse into subdirs
index b7ecf3aaaaf54384bd086faea8d5379f2d4e3d3d..c2e7ca385d779a709ce3c616c85d05e08a22c3f7 100644 (file)
@@ -1,5 +1,5 @@
 /* XPM */
-static char *delete_xpm[] = {
+static const char *delete_xpm[] = {
 /* columns rows colors chars-per-pixel */
 "16 15 21 1",
 "2 c #A5AEBD",
index f03819e4d3534e8dc561493e829348734cb391fd..1f9cf2937339c805c5dc67ef6be40f72e282ae8f 100644 (file)
@@ -1,5 +1,5 @@
 /* XPM */
-static char * down_xpm[] = {
+static const char * down_xpm[] = {
 "16 15 3 1",
 "      c None",
 ".     c Black",
index 9b83bb04415cc8005eab20a791068dc62dc518ac..0a1d6a20e766ce632ecfa92ce6cc4459223d1e90 100644 (file)
@@ -1,5 +1,5 @@
 /* XPM */
-static char * eldel_xpm[] = {
+static const char * eldel_xpm[] = {
 "16 16 3 1",
 "      c None",
 ".     c #7F0000",
index 656cb9c4f17b3ee552c0874527c3fa3197a21c83..b02d2b1718ab55b7e07f82b3849ea74fb88bea2d 100644 (file)
@@ -1,5 +1,5 @@
 /* XPM */
-static char * eldown_xpm[] = {
+static const char * eldown_xpm[] = {
 "16 16 2 1",
 "      c None",
 ".     c #000000",
index 4defb732e3cd5ebc35f867700729d73f28ed40f4..c231852d73da47f07e9e3b7a52dfd93fa985e5bf 100644 (file)
@@ -1,5 +1,5 @@
 /* XPM */
-static char *exefile_xpm[] = {
+static const char *exefile_xpm[] = {
 /* columns rows colors chars-per-pixel */
 "16 16 51 1",
 "% c #E8E8EC",
index 50724a857c6ba807a3f6e0c4d3890d7f640ed8c3..ba49ed5029ba1b0690702e4c05abc81b567975f4 100644 (file)
@@ -1,5 +1,5 @@
 /* XPM */
-static char *fileopen_xpm[] = {
+static const char *fileopen_xpm[] = {
 /* columns rows colors chars-per-pixel */
 "16 15 36 1",
 "6 c #9BACC2",
index 5c63fcfd5dab0538529e86e953812ac2c4ee6475..4c30738eacf9c948cf0c26687b0d7c365460701d 100644 (file)
@@ -1,5 +1,5 @@
 /* XPM */
-static char *filesave_xpm[] = {
+static const char *filesave_xpm[] = {
 /* columns rows colors chars-per-pixel */
 "16 15 21 1",
 "O c #FFFFFF",
index 9fb5fca7a5b6a3dcbfd0b363e15c3c770aabc355..a17c2644ac49b469f68496acb6a32002d4bed9c7 100644 (file)
@@ -1,5 +1,5 @@
 /* XPM */
-static char *filesaveas_xpm[] = {
+static const char *filesaveas_xpm[] = {
 /* columns rows colors chars-per-pixel */
 "16 15 23 1",
 "X c Black",
index 4c2641c663dae6a7f5991e09f59f73dcc588e364..d46e2708211f10854deecfa5656bbf83c93881dd 100644 (file)
@@ -1,5 +1,5 @@
 /* XPM */
-static char *new_xpm[] = {
+static const char *new_xpm[] = {
 /* columns rows colors chars-per-pixel */
 "16 15 29 1",
 "* c #97C4E7",
index ae04bd181c006c431d33eadbed3490b78fb50811..eeb1909d078ccbfa619c20e82d65aa98372db153 100644 (file)
@@ -129,11 +129,11 @@ FILE(GLOB SOURCES "." "*.cxx" "*.cpp")
 FILE(GLOB SOURCES_H "." "*.h" )
 
 IF(BBTK_USE_KWWIDGETS)
-  IF(KWWIDGETS_FOUND)
+  IF(KWWidgets_FOUND)
     include("${KWWidgets_CMAKE_DIR}/KWWidgetsWrappingMacros.cmake")
     kwwidgets_wrap_tcl(bbtk LIB_TCL_SRCS "vtkKWBlackBoxDialog.cxx" "")
     SET(SOURCES ${SOURCES} ${LIB_TCL_SRCS})
-  ENDIF(KWWIDGETS_FOUND)
+  ENDIF(KWWidgets_FOUND)
 ENDIF(BBTK_USE_KWWIDGETS)
 
 #-----------------------------------------------------------------------------
index dbcc49becd70040a299d5e330eb0423962004a46..4d59d575727d8b3379fa0522ba6af7575dd8033a 100644 (file)
@@ -2,8 +2,8 @@
   Program:   bbtk
   Module:    $RCSfile: bbtkConfigurationFile.cxx,v $
   Language:  C++
-  Date:      $Date: 2008/12/10 10:00:36 $
-  Version:   $Revision: 1.24 $
+  Date:      $Date: 2008/12/12 10:20:48 $
+  Version:   $Revision: 1.25 $
 =========================================================================*/
 
 /* ---------------------------------------------------------------------
@@ -69,39 +69,43 @@ namespace bbtk
     
     // ==> Set system paths 
     mBin_path = GetExecutablePath();
-//EED    mInstall_path = mBin_path + mFile_separator + "..";
+
 #ifdef MACOSX
-         mInstall_path = mBin_path + "/../../../..";
+    mInstall_path = mBin_path + "/../../../..";
 #else
-         mInstall_path = mBin_path + "/..";
+    mInstall_path = mBin_path + "/..";
 #endif
-         // The relative path to the doc folder (=BBTK_DOC_REL_PATH)
+
+    // The relative path to the doc folder (=BBTK_DOC_REL_PATH)
     mDoc_rel_path = BBTK_STRINGIFY_SYMBOL(BBTK_DOC_REL_PATH);
     // The path to the doc folder (=mInstall_path+"/"+mDoc_rel_path)
-//EED    mDoc_path = mInstall_path + mFile_separator + mDoc_rel_path;
     mDoc_path = mInstall_path + "/" + mDoc_rel_path;
     // The relative path to the doc folder (=BBTK_BBS_REL_PATH)
     mBbs_rel_path = BBTK_STRINGIFY_SYMBOL(BBTK_BBS_REL_PATH);
     // The path to the bbs folder (=mInstall_path+"/"+mBbs_rel_path)
-//EED    mBbs_path = mInstall_path + mFile_separator + mBbs_rel_path;
     mBbs_path = mInstall_path + "/" + mBbs_rel_path;
-    // The relative path to the rsc folder (=BBTK_RSC_REL_PATH)
-    //   mRsc_rel_path = BBTK_STRINGIFY_SYMBOL(BBTK_RSC_REL_PATH);
-    // The path to the rsc folder (=mInstall_path+"/"+mRsc_rel_path)
-    //   mRsc_path = mInstall_path + mFile_separator + mRsc_rel_path;
-    // The path to the bbtk data folder 
-    // Initialized to mInstall_path+"/"+BBTK_DATA_REL_PATH
-    // But can be overriden by value read from bbtk_config.xml
-//EED    mData_path = mInstall_path + mFile_separator + BBTK_STRINGIFY_SYMBOL(BBTK_DATA_REL_PATH);
+    
     mData_path = mInstall_path + "/" + BBTK_STRINGIFY_SYMBOL(BBTK_DATA_REL_PATH);
-
-       Utilities::replace( mBin_path           , INVALID_FILE_SEPARATOR , VALID_FILE_SEPARATOR);
-       Utilities::replace( mInstall_path       , INVALID_FILE_SEPARATOR , VALID_FILE_SEPARATOR);
-       Utilities::replace( mDoc_rel_path       , INVALID_FILE_SEPARATOR , VALID_FILE_SEPARATOR);
-       Utilities::replace( mDoc_path           , INVALID_FILE_SEPARATOR , VALID_FILE_SEPARATOR);
-       Utilities::replace( mBbs_path           , INVALID_FILE_SEPARATOR , VALID_FILE_SEPARATOR);
-       Utilities::replace( mData_path          , INVALID_FILE_SEPARATOR , VALID_FILE_SEPARATOR);
-
+    
+    Utilities::replace( mBin_path, 
+                       INVALID_FILE_SEPARATOR,
+                       VALID_FILE_SEPARATOR);
+    Utilities::replace( mInstall_path,
+                       INVALID_FILE_SEPARATOR,
+                       VALID_FILE_SEPARATOR);
+    Utilities::replace( mDoc_rel_path,
+                       INVALID_FILE_SEPARATOR,
+                       VALID_FILE_SEPARATOR);
+    Utilities::replace( mDoc_path,
+                       INVALID_FILE_SEPARATOR,
+                       VALID_FILE_SEPARATOR);
+    Utilities::replace( mBbs_path,
+                       INVALID_FILE_SEPARATOR,
+                       VALID_FILE_SEPARATOR);
+    Utilities::replace( mData_path,
+                       INVALID_FILE_SEPARATOR,
+                       VALID_FILE_SEPARATOR);
+    
     bbtkMessage("Config",1," ==> bin    : '"<<mBin_path<<"'"<<std::endl);
     bbtkMessage("Config",1," ==> prefix : '"<<mInstall_path<<"'"<<std::endl);
     bbtkMessage("Config",1," ==> doc    : '"<<mDoc_path<<"'"<<std::endl);
@@ -113,7 +117,7 @@ namespace bbtk
     
     // bbs_paths
     // always add "." (current working directory) at the begining
-       mBbs_paths.push_back( "." ); 
+    mBbs_paths.push_back( "." ); 
     // add system bbs path 
     mBbs_paths.push_back(mBbs_path);
     // add toolsbbtk/appli 
@@ -133,32 +137,32 @@ namespace bbtk
     for (iStrVec=0;iStrVec<sizeStrVec;iStrVec++){
       Utilities::replace( mBbs_paths[iStrVec] , INVALID_FILE_SEPARATOR , VALID_FILE_SEPARATOR);
     }
-
+    
     
     // always add "." (current working directory) at the begining
     mPackage_paths.push_back(".");   
     // add system bin path (for build tree / standalone folder install)
     mPackage_paths.push_back(mBin_path);
     // add system lib path (for install tree)
-//EED    mPackage_paths.push_back(mInstall_path + mFile_separator + "lib");
+    //EED    mPackage_paths.push_back(mInstall_path + mFile_separator + "lib");
     mPackage_paths.push_back(mInstall_path + "/lib");
 #ifdef WIN32
     // add bin/Debug bin/Release paths (for build/install tree)
-//EED    mPackage_paths.push_back(mBin_path + mFile_separator + "Debug");
+    //EED    mPackage_paths.push_back(mBin_path + mFile_separator + "Debug");
     mPackage_paths.push_back(mBin_path + "/Debug");
-//EED    mPackage_paths.push_back(mBin_path + mFile_separator + "Release");
+    //EED    mPackage_paths.push_back(mBin_path + mFile_separator + "Release");
     mPackage_paths.push_back(mBin_path + "/Release");
 #endif
-
-       sizeStrVec = mPackage_paths.size();
-       for (iStrVec=0;iStrVec<sizeStrVec;iStrVec++){
-               Utilities::replace( mPackage_paths[iStrVec] , INVALID_FILE_SEPARATOR , VALID_FILE_SEPARATOR);
-       }
-
-
-
+    
+    sizeStrVec = mPackage_paths.size();
+    for (iStrVec=0;iStrVec<sizeStrVec;iStrVec++){
+      Utilities::replace( mPackage_paths[iStrVec] , INVALID_FILE_SEPARATOR , VALID_FILE_SEPARATOR);
+    }
+    
+    
+    
     GetHelp(2);
-   
+    
     // ==> First we look for bbtk_config.xml in "."
     char buf[2048];
     const char *currentDir = getcwd(buf, 2048);
@@ -171,11 +175,11 @@ namespace bbtk
        // LG : throw an exception 
       }
     
-//    std::string configXmlFullPathName = currentDir + mFile_separator + "bbtk_config.xml";
+    //    std::string configXmlFullPathName = currentDir + mFile_separator + "bbtk_config.xml";
     std::string configXmlFullPathName = currentDir ;
-                configXmlFullPathName += "/bbtk_config.xml";
-       Utilities::replace( configXmlFullPathName , INVALID_FILE_SEPARATOR , VALID_FILE_SEPARATOR);
-
+    configXmlFullPathName += "/bbtk_config.xml";
+    Utilities::replace( configXmlFullPathName , INVALID_FILE_SEPARATOR , VALID_FILE_SEPARATOR);
+    
     if ( Utilities::FileExists( configXmlFullPathName ))
       {
        bbtkMessage("Config",1, "ConfigurationFile : [" << configXmlFullPathName << 
index dafd6ceb9f13f41c652aa526f19e32b78b0a7fa7..778b45e215e705a18e2926d9f7bfee6ed1e962e0 100644 (file)
@@ -2,8 +2,8 @@
   Program:   bbtk
   Module:    $RCSfile: bbtkUtilities.cxx,v $
   Language:  C++
-  Date:      $Date: 2008/11/26 12:49:57 $
-  Version:   $Revision: 1.9 $
+  Date:      $Date: 2008/12/12 10:20:48 $
+  Version:   $Revision: 1.10 $
 =========================================================================*/
 
 /* ---------------------------------------------------------------------
@@ -527,7 +527,7 @@ namespace bbtk
       std::string ss("\\n");
       std::string::size_type pos = 0;
       pos = s.find(ss,0);
-      char* cr = "\n";
+      const char* cr = "\n";
       while ( pos != std::string::npos )
        {
          s.replace(pos,2,cr,1);
index 1ea8981d119207f56d3e601d80b5c305ebdcf3e2..453d3fa3712697af1671275e1a85024dea85c986 100644 (file)
@@ -1,5 +1,5 @@
 /* XPM */
-static char * cc_exit_xpm[] = {
+static const char * cc_exit_xpm[] = {
 "32 32 703 2",
 "      c None",
 ".     c #C78D8D",
index 111d223f7936a811e483445b322ebedf0ca9af37..dd22a48c12201180986c9b6e9383d3375d190cfd 100644 (file)
@@ -1,5 +1,5 @@
 /* XPM */
-static char * cc_new_xpm[] = {
+static const char * cc_new_xpm[] = {
 "32 32 93 2",
 "      c None",
 ".     c #F5F5F5",
index 77ef4f53fcc7ebc09b697e49407b9502d53b7c6a..ed98879e2e2893b209d354dce205b8e6d5b6621d 100644 (file)
@@ -1,5 +1,5 @@
 /* XPM */
-static char * cc_open_xpm[] = {
+static const char * cc_open_xpm[] = {
 "32 32 149 2",
 "      c None",
 ".     c #858585",
index 63cf4152f667fa8a8057f2d02ef0d8492fdf38e2..eaeed15994754bdc0d09db4e6aa9cad8aa2801af 100644 (file)
@@ -1,5 +1,5 @@
 /* XPM */
-static char * cc_run_xpm[] = {
+static const char * cc_run_xpm[] = {
 "32 32 374 2",
 "      c None",
 ".     c #E9E9EB",
index ef0f2489e0b532266ea604a92ae39b22546e0ad8..df4021f88045e6e8df2c0fb3a8d183d219e9a5b1 100644 (file)
@@ -1,5 +1,5 @@
 /* XPM */
-static char * cc_save_xpm[] = {
+static const char * cc_save_xpm[] = {
 "32 32 196 2",
 "      c None",
 ".     c #020202",
index 3978476a717c3ffcf037d3ceb2572606f970595f..a40f877553eef4eebf6fa30e3542cc4cc71f1c9b 100644 (file)
@@ -1,5 +1,5 @@
 /* XPM */
-static char * cc_save_as_xpm[] = {
+static const char * cc_save_as_xpm[] = {
 "32 32 267 2",
 "      c None",
 ".     c #020202",
index aa8af9f8031e23725493e2a122b4bff55c44b0a6..398e5d2fb6397aa05e3917c2d712e262c2b108f4 100644 (file)
@@ -1,5 +1,5 @@
 /* XPM */
-static char * cc_stop_xpm[] = {
+static const char * cc_stop_xpm[] = {
 "32 32 399 2",
 "      c None",
 ".     c #D40505",
index bae5271c422b3f1fc66c4a77d47fa2606a89b94e..969c10c030e4069eb4b947380d48e71437f3e5c0 100644 (file)
@@ -111,6 +111,8 @@ SET(${BBTK_PACKAGE_NAME}_INCLUDE_DIRS
   #  - automatically handled libraries or packages : wx, vtk... (see above)
   #  - the dirs automatically set by other libraries found by FIND_PACKAGE
   ../std/src
+  # The path to the build tree folder is needed to find bbstd_EXPORT.h
+  ${PROJECT_BINARY_DIR}/packages/std/src
   )
 #===========================================================================
 
index 64735248c4e7d26bcd78c3d94f4e7275cc1ac838..0d53007254586192b8226b1043b27caaab6194d6 100644 (file)
@@ -5,86 +5,86 @@
 namespace bbvtk
 {
 
-BBTK_ADD_BLACK_BOX_TO_PACKAGE(vtk,Transform)
-BBTK_BLACK_BOX_IMPLEMENTATION(Transform,bbtk::AtomicBlackBox);
-void Transform::Process()
-{
+  BBTK_ADD_BLACK_BOX_TO_PACKAGE(vtk,Transform);
+  BBTK_BLACK_BOX_IMPLEMENTATION(Transform,bbtk::AtomicBlackBox);
+  void Transform::Process()
+  {
     if (result!=NULL)
-       {
-               result->Delete();
-       }
-       result = vtkTransform::New();
-
-
-       if (bbGetInputIn()!=NULL)
-       {
-               result->Concatenate( bbGetInputIn()->GetMatrix() );
-       }
-
-
-       if (bbGetInputScale().size()>=3)
-       {
-               result->Scale(bbGetInputScale()[0], bbGetInputScale()[1], bbGetInputScale()[2]);
-       }
-
-       if ((bbGetInputTranslate().size()>=3) && (bbGetInputSpacing().size()>=3))
-       {
-               double tx = bbGetInputTranslate()[0] * bbGetInputSpacing()[0];
-               double ty = bbGetInputTranslate()[1] * bbGetInputSpacing()[1];
-               double tz = bbGetInputTranslate()[2] * bbGetInputSpacing()[2];
-               result->Translate(tx,ty,tz);
-       }
-
-       if (bbGetInputRotateWXYZ().size()>=4)
-       {
-         result->RotateWXYZ(bbGetInputRotateWXYZ()[0],bbGetInputRotateWXYZ()[1], bbGetInputRotateWXYZ()[2], bbGetInputRotateWXYZ()[3]);
-       }
-
-       result->Update();
-
-       bbSetOutputOut(result);
-}
-
-
-void Transform::bbUserConstructor()
-{
+      {
+       result->Delete();
+      }
+    result = vtkTransform::New();
+    
+    
+    if (bbGetInputIn()!=NULL)
+      {
+       result->Concatenate( bbGetInputIn()->GetMatrix() );
+      }
+    
+    
+    if (bbGetInputScale().size()>=3)
+      {
+       result->Scale(bbGetInputScale()[0], bbGetInputScale()[1], bbGetInputScale()[2]);
+      }
+    
+    if ((bbGetInputTranslate().size()>=3) && (bbGetInputSpacing().size()>=3))
+      {
+       double tx = bbGetInputTranslate()[0] * bbGetInputSpacing()[0];
+       double ty = bbGetInputTranslate()[1] * bbGetInputSpacing()[1];
+       double tz = bbGetInputTranslate()[2] * bbGetInputSpacing()[2];
+       result->Translate(tx,ty,tz);
+      }
+    
+    if (bbGetInputRotateWXYZ().size()>=4)
+      {
+       result->RotateWXYZ(bbGetInputRotateWXYZ()[0],bbGetInputRotateWXYZ()[1], bbGetInputRotateWXYZ()[2], bbGetInputRotateWXYZ()[3]);
+      }
+    
+    result->Update();
+    
+    bbSetOutputOut(result);
+  }
+  
+  
+  void Transform::bbUserConstructor()
+  {
     bbSetInputIn(NULL);
-
-       vecScale.push_back(1);  // scale x
-       vecScale.push_back(1);  // scale y
-       vecScale.push_back(1);  // scale z
+    
+    vecScale.push_back(1);  // scale x
+    vecScale.push_back(1);  // scale y
+    vecScale.push_back(1);  // scale z
     bbSetInputScale(vecScale);
-
-       vecRotateWXYZ.push_back(0);  //angle 
-       vecRotateWXYZ.push_back(1);  //vx
-       vecRotateWXYZ.push_back(0);  //vy
-       vecRotateWXYZ.push_back(0);  //vz
+    
+    vecRotateWXYZ.push_back(0);  //angle 
+    vecRotateWXYZ.push_back(1);  //vx
+    vecRotateWXYZ.push_back(0);  //vy
+    vecRotateWXYZ.push_back(0);  //vz
     bbSetInputRotateWXYZ(vecRotateWXYZ);
-
-       vecTranslate.push_back(0);  //tx
-       vecTranslate.push_back(0);  //ty
-       vecTranslate.push_back(0);  //tz
+    
+    vecTranslate.push_back(0);  //tx
+    vecTranslate.push_back(0);  //ty
+    vecTranslate.push_back(0);  //tz
     bbSetInputTranslate(vecTranslate);
-
-       vecSpacing.push_back(1);  //spacing x
-       vecSpacing.push_back(1);  //spacing y
-       vecSpacing.push_back(1);  //spacing z
+    
+    vecSpacing.push_back(1);  //spacing x
+    vecSpacing.push_back(1);  //spacing y
+    vecSpacing.push_back(1);  //spacing z
     bbSetInputTranslate(vecSpacing);
-
-       result = NULL;  
-}
-/*
-void Transform::bbUserCopyConstructor()
-{
-  
-}
-*/
-void Transform::bbUserDestructor()
-{
-  
-}
+    
+    result = NULL;  
+  }
+  /*
+    void Transform::bbUserCopyConstructor()
+    {
+    
+    
+    }
+  */
+  void Transform::bbUserDestructor()
+  {
+    
+    
+  }
 }
 // EO namespace bbvtk
 
index 92b02200edd4d03f73bfb8b65ccfefcf5f2a1360..85b979b187841ba1fa83a8834974dfb1111061b8 100644 (file)
@@ -3,8 +3,8 @@
 #include "bbtkAtomicBlackBox.h"
 #include "iostream"
 
-#include <vtkTransform.h>
-#include <vtkLinearTransform.h>
+#include "vtkTransform.h"
+//#include <vtkLinearTransform.h>
 
 namespace bbvtk
 {
index 01b9019499783226c8d9f32c25cc346fbce099d0..dabc8681fafa6160741b552416d75bde2b695d21 100644 (file)
@@ -13,7 +13,7 @@ void VecImageGaussianSmooth::Process()
 {
 
        vtkImageGaussianSmooth *vtkimagegaussiansmooth;
-       int i,size = VecVtkimagegaussiansmooth.size();
+       int i,size = (int)VecVtkimagegaussiansmooth.size();
        for (i=0 ;  i<size ; i++)
        {               
                VecVtkimagegaussiansmooth[i]->Delete();
@@ -25,7 +25,7 @@ void VecImageGaussianSmooth::Process()
        double stdvY=bbGetInputStdDevY();
        double stdvZ=bbGetInputStdDevZ();
        
-       size=bbGetInputIn().size();
+       size=(int)bbGetInputIn().size();
        for (i=0 ;  i<size ; i++)
        {       
                vtkimagegaussiansmooth = vtkImageGaussianSmooth::New();
@@ -36,7 +36,7 @@ void VecImageGaussianSmooth::Process()
                VecVtkimagegaussiansmooth.push_back(vtkimagegaussiansmooth);
        } //for i
        bbSetOutputOut(VecResult);
-       if (bbGetInputiImage() < VecResult.size())
+       if (bbGetInputiImage() < (int)VecResult.size())
        {
                bbSetOutputOutImage(VecResult[bbGetInputiImage()]);
        } //if
index d13d2e417c8a332b14eca9d6a1e990234416a529..720ae18d8ccc320a39b8adfc5535d4370691cc89 100644 (file)
@@ -111,6 +111,8 @@ SET(${BBTK_PACKAGE_NAME}_INCLUDE_DIRS
   #  - automatically handled libraries or packages : wx, vtk... (see above)
   #  - the dirs automatically set by other libraries found by FIND_PACKAGE
   ../std/src
+  # The path to the build tree folder is needed to find bbstd_EXPORT.h
+  ${PROJECT_BINARY_DIR}/packages/std/src
   )
 #===========================================================================