Say 'registration', not 'recalage'!

diff --git a/bbtk_package_creaMiniTools/bbs/appli/recalage2DExample.bbg b/bbtk_package_creaMiniTools/bbs/appli/registration2DExample.bbg
similarity index 97%
rename from bbtk_package_creaMiniTools/bbs/appli/recalage2DExample.bbg
rename to bbtk_package_creaMiniTools/bbs/appli/registration2DExample.bbg
index 6afb951441f83731058aa8ea60f58eb355aec06c..17feb6cb9b16615a2c3a20f3f7de11cc73e8e154 100755 (executable)
--- a/bbtk_package_creaMiniTools/bbs/appli/recalage2DExample.bbg
+++ b/bbtk_package_creaMiniTools/bbs/appli/registration2DExample.bbg
@@ -1,6 +1,6 @@
 # ----------------------------------
 # - BBTKGEditor v 1.2 BBG BlackBox Diagram file
-# - /home/pechan/Documents/courses/development/creatis/dev/src/creaMiniTools/examples/bbg/recalage/recalage2DExample.bbg
+# - /home/pechan/Documents/courses/development/creatis/dev/src/creaMiniTools/examples/bbg/registration/registration2DExample.bbg
 # ----------------------------------
 
 APP_START
@@ -116,31 +116,31 @@ PORT
 Title:"% Scale in Y"
 FIN_BOX
 BOX
-PackRecalage:Transform2DBox:transform
+PackRegistration:Transform2DBox:transform
 ISEXEC:FALSE
 -237.249355:-389.187175:900.000000
 -137.249355:-399.187175:900.000000
 FIN_BOX
 BOX
-PackRecalage:ReSlicerBox:reslice1
+PackRegistration:ReSlicerBox:reslice1
 ISEXEC:FALSE
 0.000000:-350.000000:900.000000
 100.000000:-360.000000:900.000000
 FIN_BOX
 BOX
-PackRecalage:ImageConvolution:convol1
+PackRegistration:ImageConvolution:convol1
 ISEXEC:FALSE
 146.936340:-300.687873:900.000000
 246.936340:-310.687873:900.000000
 FIN_BOX
 BOX
-PackRecalage:ImageConvolution:convol2
+PackRegistration:ImageConvolution:convol2
 ISEXEC:FALSE
 104.624508:-463.437249:900.000000
 204.624508:-473.437249:900.000000
 FIN_BOX
 BOX
-PackRecalage:ImageRecalageProperties:properties
+PackRegistration:ImageRegistrationProperties:properties
 ISEXEC:FALSE
 123.873948:-98.001607:900.000000
 223.873948:-108.001607:900.000000
@@ -242,7 +242,7 @@ ISEXEC:FALSE
 0.000000:-750.000000:900.000000
 FIN_BOX
 BOX
-PackRecalage:CheckBoardBox:cbb
+PackRegistration:CheckBoardBox:cbb
 ISEXEC:FALSE
 0.000000:-770.000000:900.000000
 100.000000:-780.000000:900.000000
@@ -294,7 +294,7 @@ PORT
 nTypeView:"0"
 FIN_BOX
 BOX
-PackRecalage:TransparencyBox:trans
+PackRegistration:TransparencyBox:trans
 ISEXEC:FALSE
 0.000000:-950.000000:900.000000
 100.000000:-960.000000:900.000000
@@ -330,7 +330,7 @@ PORT
 Proportion:"80"
 FIN_BOX
 BOX
-PackRecalage:ImageSwitcherBox:switch
+PackRegistration:ImageSwitcherBox:switch
 ISEXEC:FALSE
 21.374900:-1096.437376:900.000000
 121.374900:-1106.437376:900.000000

diff --git a/bbtk_package_creaMiniTools/bbs/appli/recalage2DExample.bbs b/bbtk_package_creaMiniTools/bbs/appli/registration2DExample.bbs
similarity index 98%
rename from bbtk_package_creaMiniTools/bbs/appli/recalage2DExample.bbs
rename to bbtk_package_creaMiniTools/bbs/appli/registration2DExample.bbs
index 87f38c93772f4af42581f6703113dc85b762a374..6963396d9403206041acbb084319978365d26dcd 100755 (executable)
--- a/bbtk_package_creaMiniTools/bbs/appli/recalage2DExample.bbs
+++ b/bbtk_package_creaMiniTools/bbs/appli/registration2DExample.bbs
@@ -1,6 +1,6 @@
 # ----------------------------------
 # - BBTKGEditor v 1.2 BBS BlackBox Script
-# - /home/pechan/Documents/courses/development/creatis/dev/src/creaMiniTools/examples/bbg/recalage/recalage2DExample.bbs
+# - /home/pechan/Documents/courses/development/creatis/dev/src/creaMiniTools/examples/bbg/registration/registration2DExample.bbs
 # ----------------------------------
 
 # BBTK GEditor Script
@@ -10,7 +10,7 @@ include std
 include itkvtk
 include creaMaracasVisu
 include wx
-include PackRecalage
+include PackRegistration
 include std
 include vtk
 include wxvtk
@@ -70,7 +70,7 @@ new ImageConvolution convol1
 
 new ImageConvolution convol2
 
-new ImageRecalageProperties properties
+new ImageRegistrationProperties properties
 
 new Slider sdrZ
   set sdrZ.Min "0"

diff --git a/bbtk_package_creaMiniTools/bbs/appli/recalage3D1PointExample.bbg b/bbtk_package_creaMiniTools/bbs/appli/registration3D1PointExample.bbg
similarity index 97%
rename from bbtk_package_creaMiniTools/bbs/appli/recalage3D1PointExample.bbg
rename to bbtk_package_creaMiniTools/bbs/appli/registration3D1PointExample.bbg
index 45680198e266a4d5baa1eb2c35d5767cb5757ac4..e0b2b30dad4f97b9558c63a054480fb83f8afc46 100755 (executable)
--- a/bbtk_package_creaMiniTools/bbs/appli/recalage3D1PointExample.bbg
+++ b/bbtk_package_creaMiniTools/bbs/appli/registration3D1PointExample.bbg
@@ -1,6 +1,6 @@
 # ----------------------------------
 # - BBTKGEditor v 1.2 BBG BlackBox Diagram file
-# - /home/pechan/Documents/courses/development/creatis/dev/src/creaMiniTools/examples/bbg/recalage/recalage3D1PointExample.bbg
+# - /home/pechan/Documents/courses/development/creatis/dev/src/creaMiniTools/examples/bbg/registration/registration3D1PointExample.bbg
 # ----------------------------------
 
 APP_START
@@ -122,13 +122,13 @@ PORT
 Title:"Scale in Z Axis"
 FIN_BOX
 BOX
-PackRecalage:Transform3D1PointBox:transform
+PackRegistration:Transform3D1PointBox:transform
 ISEXEC:FALSE
 0.000000:-290.000000:900.000000
 100.000000:-300.000000:900.000000
 FIN_BOX
 BOX
-PackRecalage:ReSlicerBox:reslicer
+PackRegistration:ReSlicerBox:reslicer
 ISEXEC:FALSE
 -221.351035:-101.653595:900.000000
 -121.351035:-111.653595:900.000000

diff --git a/bbtk_package_creaMiniTools/bbs/appli/recalage3D1PointExample.bbs b/bbtk_package_creaMiniTools/bbs/appli/registration3D1PointExample.bbs
similarity index 97%
rename from bbtk_package_creaMiniTools/bbs/appli/recalage3D1PointExample.bbs
rename to bbtk_package_creaMiniTools/bbs/appli/registration3D1PointExample.bbs
index 4215586dd09cad9c9fc4b53dcc94f910c95ff790..83f0742f94ff8e16e22f68448a1135c6d5c11d6d 100755 (executable)
--- a/bbtk_package_creaMiniTools/bbs/appli/recalage3D1PointExample.bbs
+++ b/bbtk_package_creaMiniTools/bbs/appli/registration3D1PointExample.bbs
@@ -1,6 +1,6 @@
 # ----------------------------------
 # - BBTKGEditor v 1.2 BBS BlackBox Script
-# - /home/pechan/Documents/courses/development/creatis/dev/src/creaMiniTools/examples/bbg/recalage/recalage3D1PointExample.bbs
+# - /home/pechan/Documents/courses/development/creatis/dev/src/creaMiniTools/examples/bbg/registration/registration3D1PointExample.bbs
 # ----------------------------------
 
 # BBTK GEditor Script
@@ -10,7 +10,7 @@ include std
 include itkvtk
 include creaMaracasVisu
 include wx
-include PackRecalage
+include PackRegistration
 include std
 include creaImageIO
 include vtk

diff --git a/bbtk_package_creaMiniTools/bbs/appli/recalage3D2PointsExample.bbg b/bbtk_package_creaMiniTools/bbs/appli/registration3D2PointsExample.bbg
similarity index 97%
rename from bbtk_package_creaMiniTools/bbs/appli/recalage3D2PointsExample.bbg
rename to bbtk_package_creaMiniTools/bbs/appli/registration3D2PointsExample.bbg
index 6c5c546a2f0d2321c5440b91fcb11d98b1fc3c73..716205874eb301ccb40bd33bf41a0ec4558c3158 100755 (executable)
--- a/bbtk_package_creaMiniTools/bbs/appli/recalage3D2PointsExample.bbg
+++ b/bbtk_package_creaMiniTools/bbs/appli/registration3D2PointsExample.bbg
@@ -1,6 +1,6 @@
 # ----------------------------------
 # - BBTKGEditor v 1.2 BBG BlackBox Diagram file
-# - /home/pechan/Documents/courses/development/creatis/dev/src/minitools/examples/bbg/recalage/recalage3D2PointsExample.bbg
+# - /home/pechan/Documents/courses/development/creatis/dev/src/minitools/examples/bbg/registration/registration3D2PointsExample.bbg
 # ----------------------------------
 
 APP_START
@@ -42,13 +42,13 @@ PORT
 Radio:"10"
 FIN_BOX
 BOX
-PackRecalage:Transform3D2PointsBox:transform
+PackRegistration:Transform3D2PointsBox:transform
 ISEXEC:FALSE
 0.000000:-170.000000:900.000000
 100.000000:-180.000000:900.000000
 FIN_BOX
 BOX
-PackRecalage:ReSlicerBox:reslice1
+PackRegistration:ReSlicerBox:reslice1
 ISEXEC:FALSE
 -100.000000:-200.000000:900.000000
 0.000000:-210.000000:900.000000

diff --git a/bbtk_package_creaMiniTools/bbs/appli/recalage3D2PointsExample.bbs b/bbtk_package_creaMiniTools/bbs/appli/registration3D2PointsExample.bbs
similarity index 96%
rename from bbtk_package_creaMiniTools/bbs/appli/recalage3D2PointsExample.bbs
rename to bbtk_package_creaMiniTools/bbs/appli/registration3D2PointsExample.bbs
index eb8b4be9977a71daa5974486115b163f8b58d956..8f2d5329f37428b1d56eead1b54cac96bfef3522 100755 (executable)
--- a/bbtk_package_creaMiniTools/bbs/appli/recalage3D2PointsExample.bbs
+++ b/bbtk_package_creaMiniTools/bbs/appli/registration3D2PointsExample.bbs
@@ -1,6 +1,6 @@
 # ----------------------------------
 # - BBTKGEditor v 1.2 BBS BlackBox Script
-# - /home/pechan/Documents/courses/development/creatis/dev/src/creaMiniTools/examples/bbg/recalage/recalage3D2PointsExample.bbs
+# - /home/pechan/Documents/courses/development/creatis/dev/src/creaMiniTools/examples/bbg/registration/registration3D2PointsExample.bbs
 # ----------------------------------
 
 # BBTK GEditor Script
@@ -9,7 +9,7 @@
 include std
 include itkvtk
 include creaMaracasVisu
-include PackRecalage
+include PackRegistration
 include wx
 include vtk
 include creaImageIO

diff --git a/bbtk_package_creaMiniTools/bbs/appli/recalage3D3PointsExample.bbg b/bbtk_package_creaMiniTools/bbs/appli/registration3D3PointsExample.bbg
similarity index 97%
rename from bbtk_package_creaMiniTools/bbs/appli/recalage3D3PointsExample.bbg
rename to bbtk_package_creaMiniTools/bbs/appli/registration3D3PointsExample.bbg
index 32305c2c95ea1e1770abdbe3d8621bf0186caf4a..b37c721211eff38d8cf56727b4def7f787758b89 100755 (executable)
--- a/bbtk_package_creaMiniTools/bbs/appli/recalage3D3PointsExample.bbg
+++ b/bbtk_package_creaMiniTools/bbs/appli/registration3D3PointsExample.bbg
@@ -1,6 +1,6 @@
 # ----------------------------------
 # - BBTKGEditor v 1.2 BBG BlackBox Diagram file
-# - /home/pechan/Documents/courses/development/creatis/dev/src/creaMiniTools/examples/bbg/recalage/recalage3D3PointsExample.bbg
+# - /home/pechan/Documents/courses/development/creatis/dev/src/creaMiniTools/examples/bbg/registration/registration3D3PointsExample.bbg
 # ----------------------------------
 
 APP_START
@@ -42,13 +42,13 @@ PORT
 Radio:"10"
 FIN_BOX
 BOX
-PackRecalage:Transform3D3PointsBox:transform
+PackRegistration:Transform3D3PointsBox:transform
 ISEXEC:FALSE
 13.787455:-187.070183:900.000000
 113.787455:-197.070183:900.000000
 FIN_BOX
 BOX
-PackRecalage:ReSlicerBox:reslice1
+PackRegistration:ReSlicerBox:reslice1
 ISEXEC:FALSE
 -87.525636:-235.453456:900.000000
 12.474364:-245.453456:900.000000

diff --git a/bbtk_package_creaMiniTools/bbs/appli/recalage3D3PointsExample.bbs b/bbtk_package_creaMiniTools/bbs/appli/registration3D3PointsExample.bbs
similarity index 96%
rename from bbtk_package_creaMiniTools/bbs/appli/recalage3D3PointsExample.bbs
rename to bbtk_package_creaMiniTools/bbs/appli/registration3D3PointsExample.bbs
index c578992b29919ef269402e422daef433a5322507..50fe959cdf3e1642e4bce7d69bbd231aa34f6c49 100755 (executable)
--- a/bbtk_package_creaMiniTools/bbs/appli/recalage3D3PointsExample.bbs
+++ b/bbtk_package_creaMiniTools/bbs/appli/registration3D3PointsExample.bbs
@@ -1,6 +1,6 @@
 # ----------------------------------
 # - BBTKGEditor v 1.2 BBS BlackBox Script
-# - /home/pechan/Documents/courses/development/creatis/dev/src/creaMiniTools/examples/bbg/recalage/recalage3D3PointsExample.bbs
+# - /home/pechan/Documents/courses/development/creatis/dev/src/creaMiniTools/examples/bbg/registration/registration3D3PointsExample.bbs
 # ----------------------------------
 
 # BBTK GEditor Script
@@ -9,7 +9,7 @@
 include std
 include itkvtk
 include creaMaracasVisu
-include PackRecalage
+include PackRegistration
 include wx
 include creaImageIO
 include vtk

diff --git a/bbtk_package_creaMiniTools/bbs/boxes/imageToolsMenu.bbg b/bbtk_package_creaMiniTools/bbs/boxes/imageToolsMenu.bbg
index ef0d7216a520c554d6701abe8a3b5cc0688a1c6d..1fd2e2a2ea806366072c55e82b270ffa536ef258 100644 (file)
--- a/bbtk_package_creaMiniTools/bbs/boxes/imageToolsMenu.bbg
+++ b/bbtk_package_creaMiniTools/bbs/boxes/imageToolsMenu.bbg
@@ -122,7 +122,7 @@ PORT
 WinTitle:"Modify image"
 FIN_BOX
 BOX
-creaMiniToolsBase:RecalageMenu:Box20
+creaMiniToolsBase:RegistrationMenu:Box20
 ISEXEC:FALSE
 113.257885:39.738184:900.000000
 158.832885:29.738184:900.000000

diff --git a/bbtk_package_creaMiniTools/bbs/boxes/imageToolsMenu.bbs b/bbtk_package_creaMiniTools/bbs/boxes/imageToolsMenu.bbs
index 4ef8945b3b3ea33efcac493234fb2cedf56051f4..e71deb4854da38cb2b922c208cbf83026fdcb644 100644 (file)
--- a/bbtk_package_creaMiniTools/bbs/boxes/imageToolsMenu.bbs
+++ b/bbtk_package_creaMiniTools/bbs/boxes/imageToolsMenu.bbs
@@ -55,7 +55,7 @@ new LayoutLine Box18
 new LayoutLine Box19
   set Box19.WinTitle "Modify image"
 
-new RecalageMenu Box20
+new RegistrationMenu Box20
 
 new RescaleSlopeInterceptMenu Box21