more name conflicts

diff --git a/CMakeLists.txt b/CMakeLists.txt
index abd2d3e219eddf90f7eae4f66671404268e63e6b..48f125772db517ac6d22b08b3a8ba6169fcf6f14 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -113,7 +113,7 @@ ENDIF(BUILD_TESTING)
 #=========================================================
 # Install scripts when running make install
 SET(SCRIPTS 
-  scripts/common.sh
+  scripts/midp_common.sh
   scripts/registration.sh
   scripts/create_midP.sh
   scripts/create_midP-2.0.sh        

diff --git a/scripts/create_midP-2.0.sh b/scripts/create_midP-2.0.sh
index 8b530085f8cfb7052d0b43d62000a09da5f8b06a..93290c860baca2be7924e711ede155c768857be8 100755 (executable)
--- a/scripts/create_midP-2.0.sh
+++ b/scripts/create_midP-2.0.sh
@@ -21,7 +21,7 @@
 
 source `dirname $0`/create_midP_masks-2.0.sh using-as-lib 2 nn
 source `dirname $0`/registration.sh
-source `dirname $0`/common.sh
+source `dirname $0`/midp_common.sh
 
 registration()
 {

diff --git a/scripts/create_midP.sh b/scripts/create_midP.sh
index 164fb5e11091b7b1080f636a60f283d0fe4c5e08..7591efb8004e2c7ad51b384377f4e62893c6abb9 100755 (executable)
--- a/scripts/create_midP.sh
+++ b/scripts/create_midP.sh
@@ -3,7 +3,7 @@
 #################################################################
 # create_MidP  arguments : CT_4D.mhd ref_phase spacing         #
 #################################################################
-source `dirname $0`/common.sh
+source `dirname $0`/midp_common.sh
 
 extract_patient()
 {

diff --git a/scripts/create_midP_masks-2.0.sh b/scripts/create_midP_masks-2.0.sh
index 6023df578f5e32c6c7e439589b584af911fcda16..68560cae1c76750fbe9319f95dc224d53c5fa6eb 100755 (executable)
--- a/scripts/create_midP_masks-2.0.sh
+++ b/scripts/create_midP_masks-2.0.sh
@@ -15,7 +15,7 @@
 #
 ###############################################################################
 
-source `dirname $0`/common.sh
+source `dirname $0`/midp_common.sh
 
 extract_patient()
 {

diff --git a/scripts/create_midP_masks.sh b/scripts/create_midP_masks.sh
index 471ce6b8132afeeb1991c6c2cf17833141bb4cd8..845237d6a31dd3a4923fdc7acd4786b262b073c1 100755 (executable)
--- a/scripts/create_midP_masks.sh
+++ b/scripts/create_midP_masks.sh
@@ -1,6 +1,6 @@
 #! /bin/bash -x
 
-source `dirname $0`/common.sh
+source `dirname $0`/midp_common.sh
 
 extract_patient()
 {

diff --git a/scripts/midp_common.sh b/scripts/midp_common.sh
index 73d17873c7bc30135074e130c1767b027d22e4bc..0f767070e217639fc5b2548db0e2b315610f6608 100755 (executable)
--- a/scripts/midp_common.sh
+++ b/scripts/midp_common.sh
@@ -2,7 +2,7 @@
 
 ###############################################################################
 #
-# FILE: common.sh
+# FILE: midp_common.sh
 # AUTHOR: Rômulo Pinho 05/08/2011
 #
 # Helper file with many functions used in the midP scripts.