Merge branch 'master' of /home/dsarrut/clitk3.server

diff --git a/.cvsignore b/.cvsignore
deleted file mode 100644 (file)
index db9f634..0000000
--- a/.cvsignore
+++ /dev/null
@@ -1,11 +0,0 @@
-*.kdev4
-.git
-CVS
-mctools
-*.swp
-Makefile
-tags
-doc
-*.directory
-build/*
-*/.vimrc

diff --git a/.gitignore b/.gitignore
deleted file mode 100644 (file)
index c4986b3..0000000
--- a/.gitignore
+++ /dev/null
@@ -1,20 +0,0 @@
-CVS
-tests_jef
-mctools
-*.swp
-Makefile
-tags
-doc
-CVS
-CMakeFiles
-CMakeCache.txt
-*_ggo.*
-*.directory
-build/*
-*/.vimrc
-_*
-#*#
-notes.org
-build-release
-build-debug
-segmentation/clitkTestFilter*

diff --git a/Licence_CeCILL-B_V1-en.txt b/Licence_CeCILL-B_V1-en.txt
index fc5e8141bc9fa3797d4d0f74b16d64a3200cc7db..3ad4deaa3c84895c0ac4e6e7c74902b31d7b6e94 100644 (file)
--- a/Licence_CeCILL-B_V1-en.txt
+++ b/Licence_CeCILL-B_V1-en.txt
@@ -1,20 +1,3 @@
-/*=========================================================================
-  Program:   vv                     http://www.creatis.insa-lyon.fr/rio/vv
-
-  Authors belong to:
-  - University of LYON              http://www.universite-lyon.fr/
-  - Léon Bérard cancer center       http://www.centreleonberard.fr
-  - CREATIS CNRS laboratory         http://www.creatis.insa-lyon.fr
-
-  This software is distributed WITHOUT ANY WARRANTY; without even
-  the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
-  PURPOSE.  See the copyright notices for more information.
-
-  It is distributed under dual licence
-
-  - BSD        See included LICENSE.txt file
-  - CeCILL-B   http://www.cecill.info/licences/Licence_CeCILL-B_V1-en.html
-===========================================================================*/
 
 CeCILL-B FREE SOFTWARE LICENSE AGREEMENT
 

diff --git a/build/.cvsignore b/build/.cvsignore
deleted file mode 100644 (file)
index 72e8ffc..0000000
--- a/build/.cvsignore
+++ /dev/null
@@ -1 +0,0 @@
-*

diff --git a/common/vvImageReader.txx b/common/vvImageReader.txx
index fa111e200c06fbbc4e6ad07f682b8ecedccbc37c..01fc707ed910373e5b96af38544083e0f7d4b03b 100644 (file)
--- a/common/vvImageReader.txx
+++ b/common/vvImageReader.txx
@@ -67,7 +67,7 @@ void vvImageReader::UpdateWithDim(std::string InputPixelType)
 template<class InputPixelType, unsigned int VImageDimension>
 void vvImageReader::UpdateWithDimAndInputPixelType()
 {
-  itk::AnalyzeImageIO *analyzeImageIO;
+  itk::AnalyzeImageIO *analyzeImageIO = NULL;
 
   if (mType == MERGEDWITHTIME)   // In this case we can load the images
     // one at the time to avoid excessive
@@ -118,6 +118,9 @@ void vvImageReader::UpdateWithDimAndInputPixelType()
     filter->SetExtractionRegion(extractedRegion);
     filter->SetInput(reader->GetOutput());
     filter->ReleaseDataFlagOn();
+#if ITK_VERSION_MAJOR == 4
+    filter->SetDirectionCollapseToSubmatrix();
+#endif
     try {
       mImage->AddItkImage<SlicedImageType>(filter->GetOutput());
     } catch ( itk::ExceptionObject & err ) {

diff --git a/notes.org~ b/notes.org~
deleted file mode 100644 (file)
index ec58a0b..0000000
--- a/notes.org~
+++ /dev/null
@@ -1,12 +0,0 @@
-
-* GIT emacs command
-C-x v d 
-.gitignore -> contains ignored files
-commit (local)
-push (repository)
-pull
-
-* Test in temp
-git clone http://www.creatis.insa-lyon.fr/~dsarrut/clitk3.pub.git clitk3
-need itk4 (git) ?
-

diff --git a/segmentation/.gitignore b/segmentation/.gitignore
deleted file mode 100644 (file)
index 15164e1..0000000
--- a/segmentation/.gitignore
+++ /dev/null
@@ -1,5 +0,0 @@
-/clitkExtractMediastinalVessels.ggo~
-/clitkExtractMediastinalVesselsFilter.h~
-/clitkExtractMediastinalVesselsFilter.txx~
-/clitkExtractMediastinalVesselsGenericFilter.txx~
-/clitkTestFilter.cxx

diff --git a/tools/.cvsignore b/tools/.cvsignore
deleted file mode 100644 (file)
index 59659d6..0000000
--- a/tools/.cvsignore
+++ /dev/null
@@ -1 +0,0 @@
-*_ggo.*

diff --git a/vv/.gitignore b/vv/.gitignore
deleted file mode 100644 (file)
index e1993c8..0000000
--- a/vv/.gitignore
+++ /dev/null
@@ -1,14 +0,0 @@
-build/*
-Louise
-tests_jef
-mctools
-*.swp
-Makefile
-tags
-doc
-CVS
-CMakeFiles
-CMakeCache.txt
-.vimrc
-*_ggo.*
-*.directory

diff --git a/vv/CMakeLists.txt b/vv/CMakeLists.txt
index 777f53ad0b75023fce170284a1d2d496fa1bac03..ca6152b39b91137024b6170d8cc69745c4bd1cb3 100644 (file)
--- a/vv/CMakeLists.txt
+++ b/vv/CMakeLists.txt
@@ -235,6 +235,7 @@ SET(CPACK_PACKAGE_VERSION_MAJOR "1")
 SET(CPACK_PACKAGE_VERSION_MINOR "2")
 SET(CPACK_PACKAGE_VERSION_PATCH "0")
 SET(CPACK_PACKAGE_INSTALL_DIRECTORY "vv")
+SET(CPACK_STRIP_FILES TRUE)
 
 IF(WIN32)
   # There is a bug in NSI that does not handle full unix paths properly. Make

diff --git a/vv/License.txt b/vv/License.txt
index 8eabad242e50fdbafa9f5823cff6f31ee8f3babd..5beaac5a90b6fc4d79c9c01f79ded7fe5f21a730 100644 (file)
--- a/vv/License.txt
+++ b/vv/License.txt
@@ -3,7 +3,7 @@
 
   Authors belong to:
   - University of LYON              http://www.universite-lyon.fr/
-  - Léon Bérard cancer center       http://www.centreleonberard.fr
+  - Léon Bérard cancer center       http://www.centreleonberard.fr
   - CREATIS CNRS laboratory         http://www.creatis.insa-lyon.fr
 
   This software is distributed WITHOUT ANY WARRANTY; without even
@@ -25,7 +25,7 @@ copyright is shown below.
  
 Copyright (c) 2008 CLB / CREATIS-LRMN
 
-CLB = Léon Bérard cancer center http://www.centreleonberard.fr
+CLB = Léon Bérard cancer center http://www.centreleonberard.fr
 CREATIS-LMRN = Centre de Recherche et d'Applications en Traitement de l'Image http://www.creatis.insa-lyon.fr
 
 All rights reserved.

diff --git a/vv/vvToolCropImage.cxx b/vv/vvToolCropImage.cxx
index 9fe30f398e60f052f219e48780584ac09691aff3..58117561f5e0f3cb40d4637f97eea6b273cd4c95 100644 (file)
--- a/vv/vvToolCropImage.cxx
+++ b/vv/vvToolCropImage.cxx
@@ -360,7 +360,7 @@ void vvToolCropImage::apply()
   // Retrieve result and display it
   vvImage::Pointer output = filter->GetOutputVVImage();
   std::ostringstream osstream;
-  osstream << "Croped_" << mCurrentSlicerManager->GetSlicer(0)->GetFileName() << ".mhd";
+  osstream << "Cropped_" << mCurrentSlicerManager->GetSlicer(0)->GetFileName() << ".mhd";
   AddImage(output,osstream.str());
 
   // End

diff --git a/vv/vvToolStructureSetManager.cxx b/vv/vvToolStructureSetManager.cxx
index 16d53cb91cce2c0bcf8d5ed9dfe10c7e2bf693aa..151435faaf2c4d8f7f8480eaa79101029c431ba5 100644 (file)
--- a/vv/vvToolStructureSetManager.cxx
+++ b/vv/vvToolStructureSetManager.cxx
@@ -137,6 +137,7 @@ void vvToolStructureSetManager::InputIsSelected(vvSlicerManager *m)
   if (mCurrentImage->GetNumberOfDimensions() != 3) {
     QMessageBox::information(this,tr("Sorry only 3D yet"), tr("Sorry only 3D yet"));
     close();
+    return;
   }
   // Hide selector
   HideInputSelector(); // splitter