From: jean-pierre roux Date: Mon, 23 May 2011 13:58:24 +0000 (+0000) Subject: Say 'registration', not 'recalage'! X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?p=creaMiniTools.git;a=commitdiff_plain;h=42fa6380e5cf2de3d3ccaac22ddb7ed6d2496691 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 6afb951..17feb6c 100755 --- 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 87f38c9..6963396 100755 --- 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 4568019..e0b2b30 100755 --- 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 4215586..83f0742 100755 --- 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 6c5c546..7162058 100755 --- 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 eb8b4be..8f2d532 100755 --- 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 32305c2..b37c721 100755 --- 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 c578992..50fe959 100755 --- 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 ef0d721..1fd2e2a 100644 --- 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 4ef8945..e71deb4 100644 --- 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