Normalize names

diff --git a/packages/CMakeLists.txt b/packages/CMakeLists.txt
index 94decf37f0f21fa26d975bc08d1866e08026743b..c4d750e6d6660bcff983abfe5373b628859fccdd 100644 (file)
--- a/packages/CMakeLists.txt
+++ b/packages/CMakeLists.txt
@@ -7,13 +7,16 @@ SUBDIRS(vtk)
 SUBDIRS(toolsbbtk)
 SUBDIRS(wxvtk)
 SUBDIRS(itkvtk)
-SUBDIRS(gdcmvtk)
 SUBDIRS(demo)
 SUBDIRS(appli)
 
+SUBDIRS(gdcmvtk)
+
+
 IF(BBTK_USE_KWWIDGETS)
   SUBDIRS(kw)
 ENDIF(BBTK_USE_KWWIDGETS)
+
 #-----------------------------------------------------------------------------
 
 

diff --git a/packages/gdcmvtk/CMakeLists.txt b/packages/gdcmvtk/CMakeLists.txt
index ce1eb62924fbe192d10e58c86da53527ae539bad..9d253a77a7aa19769de7302ad824a1b7c8984e17 100644 (file)
--- a/packages/gdcmvtk/CMakeLists.txt
+++ b/packages/gdcmvtk/CMakeLists.txt
@@ -115,7 +115,6 @@ 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
-  #/usr/local/include/gdcm/
   # The path to the build tree folder is needed to find bbstd_EXPORT.h
   ${PROJECT_BINARY_DIR}/packages/std/src
   )
@@ -125,7 +124,6 @@ SET(${BBTK_PACKAGE_NAME}_INCLUDE_DIRS
 SET(${BBTK_PACKAGE_NAME}_LIBS 
   # LIST HERE THE ADDITIONAL LIBS TO LINK AGAINST
   # EXCEPT : the same libs than for INCLUDE_DIRS
-  #/usr/local/lib/gdcm/libvtkgdcm.so   
   )
 #===========================================================================
 

diff --git a/packages/gdcmvtk/bbs/appli/exGetInfoGdcmReader.bbs b/packages/gdcmvtk/bbs/appli/ExampleGetInfoGdcmReader.bbs
similarity index 100%
rename from packages/gdcmvtk/bbs/appli/exGetInfoGdcmReader.bbs
rename to packages/gdcmvtk/bbs/appli/ExampleGetInfoGdcmReader.bbs

diff --git a/packages/gdcmvtk/src/bbgdcmvtkGetInfoGdcmReader.cxx b/packages/gdcmvtk/src/bbgdcmvtkGetInfoGdcmReader.cxx
index 75b96f071237093ccdf1d91a3e1dd01256e0ebc1..7877be5bf9c37f6e977cf9d33e778827aad47080 100644 (file)
--- a/packages/gdcmvtk/src/bbgdcmvtkGetInfoGdcmReader.cxx
+++ b/packages/gdcmvtk/src/bbgdcmvtkGetInfoGdcmReader.cxx
@@ -14,20 +14,17 @@ BBTK_ADD_BLACK_BOX_TO_PACKAGE(gdcmvtk,GetInfoGdcmReader)
 BBTK_BLACK_BOX_IMPLEMENTATION(GetInfoGdcmReader,bbtk::AtomicBlackBox);
 void GetInfoGdcmReader::Process()
 {
-std::cout << "Entree ds GetInfoGdcmReader::Process()" << std::endl;
     
    f = GDCM_NAME_SPACE::File::New();
    f->SetFileName( bbGetInputIn() );
    bool res = f->Load();  
    if ( !res )
    {
-std::cout << " f->Load() failed ..." << std::endl;
       
       f->Delete();
       bbSetOutputOut(0);
       return;
    }
-std::cout << "apres f->Load()" << std::endl;
 
    int i;
    std::vector<double> v_iop;