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

diff --git a/.gitignore b/.gitignore
index c4986b3f8e80fb0cebb40c52953003a775644467..c9b39854a34afb558839c4732a29422f98bc4d35 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -1,20 +1,25 @@
-CVS
-tests_jef
-mctools
-*.swp
-Makefile
-tags
-doc
-CVS
-CMakeFiles
-CMakeCache.txt
-*_ggo.*
+#*#
 *.directory
-build/*
+*.swp
 */.vimrc
+*_ggo.*
+*~
+/
+/.gitignore
+/notes.org~
+CMakeCache.txt
+CMakeFiles
+CVS
+CVS
+Makefile
 _*
-#*#
-notes.org
-build-release
 build-debug
+build-release
+build/*
+doc
+mctools
+notes.org
+notes.org~
 segmentation/clitkTestFilter*
+tags
+tests_jef

diff --git a/notes.org~ b/notes.org~
index ec58a0b5d7e0c341ddb988d93ee7de67ce82e7b7..db3e8d152f5818a8b2c134107b1dfbe1b538c1d2 100644 (file)
--- a/notes.org~
+++ b/notes.org~
@@ -1,12 +1,27 @@
 
 * GIT emacs command
 C-x v d 
-.gitignore -> contains ignored files
+.gitignore -> contains ignored files (recursive)
 commit (local)
 push (repository)
 pull
 
+gitk for GUI
+meld / kdiff3
+
+git status
+git add (-> index)
+git commit (->local commit)
+git pull (fetch + merge)
+git push
+
+COMMIT : C-x g c f
+(git-commit-file &optional AMEND)
+
 * Test in temp
 git clone http://www.creatis.insa-lyon.fr/~dsarrut/clitk3.pub.git clitk3
 need itk4 (git) ?
 
+
+* git merge cvs
+

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