New Viewer

diff --git a/bbtk_package_creaMiniTools/bbs/appli/ViewerContainer.bbg b/bbtk_package_creaMiniTools/bbs/appli/ViewerContainer.bbg
index 4211c92bd38a60387f54b151a40d4d1f81e17200..a77079a32ee4be6cad33ed9bbce64afe956746e0 100644 (file)
--- a/bbtk_package_creaMiniTools/bbs/appli/ViewerContainer.bbg
+++ b/bbtk_package_creaMiniTools/bbs/appli/ViewerContainer.bbg
@@ -9,7 +9,7 @@ DESCRIPTION:Description ??
 AUTHOR:Author ??
 COMPLEXBOX:FALSE
 COMPLEXINPUTS:0
-BOXES:28
+BOXES:31
 BOX
 vtk:LoadHola:Box00
 ISEXEC:FALSE
@@ -19,8 +19,8 @@ FIN_BOX
 BOX
 creaMaracasVisu:ViewerNV:Box01
 ISEXEC:FALSE
-0.988964:140.797687:-900.000000
-61.628964:130.797687:-900.000000
+30.710600:148.677702:-900.000000
+91.350600:138.677702:-900.000000
 FIN_BOX
 BOX
 vtk:vtkImageDataPointerRelay:Box02
@@ -63,8 +63,8 @@ FIN_BOX
 BOX
 creaMaracasVisu:PanelButtonContainerSettings:Box09
 ISEXEC:FALSE
--138.909688:-1.485795:-900.000000
--67.734688:-11.485795:-900.000000
+-134.271551:19.795068:-900.000000
+-63.096551:9.795068:-900.000000
 PORT
 ButtonName:"Ruler-2"
 PORT
@@ -75,20 +75,14 @@ FIN_BOX
 BOX
 std:MagicBox:Box10
 ISEXEC:FALSE
--129.279644:-14.462177:-900.000000
--83.704644:-24.462177:-900.000000
-FIN_BOX
-BOX
-creaMaracasVisu:Ruler01_XY_Widget:Box12
-ISEXEC:FALSE
--94.842662:114.287201:-900.000000
--49.267662:104.287201:-900.000000
+-128.188318:-2.457588:-900.000000
+-82.613318:-12.457588:-900.000000
 FIN_BOX
 BOX
 creaMaracasVisu:ContourControlPoints_Widget:Box13
 ISEXEC:FALSE
--18.693419:101.735911:-900.000000
-52.481581:91.735911:-900.000000
+19.354593:94.201072:-900.000000
+90.529593:84.201072:-900.000000
 FIN_BOX
 BOX
 std:MagicBox:Box14
@@ -117,8 +111,8 @@ FIN_BOX
 BOX
 std:MagicBox:Box17
 ISEXEC:FALSE
--118.244865:131.500819:-900.000000
--72.669865:121.500819:-900.000000
+-122.337339:124.952861:-900.000000
+-76.762339:114.952861:-900.000000
 FIN_BOX
 BOX
 wx:LayoutTab:Box18
@@ -135,8 +129,8 @@ FIN_BOX
 BOX
 wx:LayoutTab:Box20
 ISEXEC:FALSE
--55.580777:18.330843:-900.000000
-1.979223:8.330843:-900.000000
+-53.125293:39.611706:-900.000000
+4.434707:29.611706:-900.000000
 FIN_BOX
 BOX
 creaMaracasVisu:PanelButtonContainerSettings:Box21
@@ -159,8 +153,8 @@ FIN_BOX
 BOX
 creaMaracasVisu:ColorWindowLevel_Interface:Box24
 ISEXEC:FALSE
--31.503905:168.996235:-900.000000
-39.671095:158.996235:-900.000000
+-7.156884:175.909587:-900.000000
+64.018116:165.909587:-900.000000
 FIN_BOX
 BOX
 creaMaracasVisu:PanelButtonContainerSettings:Box25
@@ -216,7 +210,37 @@ ISEXEC:FALSE
 -19.147597:256.304682:-900.000000
 52.027403:246.304682:-900.000000
 FIN_BOX
-CONNECTIONS:40
+BOX
+creaMaracasVisu:Measure3DLength_Widget:Box33
+ISEXEC:FALSE
+45.699289:44.062300:-900.000000
+116.874289:34.062300:-900.000000
+FIN_BOX
+BOX
+creaMaracasVisu:PanelButtonContainerSettings:Box35
+ISEXEC:FALSE
+29.783522:16.331552:-900.000000
+100.958522:6.331552:-900.000000
+PORT
+ButtonName:"Ruler 3D"
+PORT
+GroupName:"Measurements"
+PORT
+Iconpath:"/home/davila/Creatis/creaTools/creatools_source/creaContours/data/Icons/Contour.png"
+FIN_BOX
+BOX
+std:MagicBox:Box36
+ISEXEC:FALSE
+30.682956:0.081191:-900.000000
+76.257956:-9.918809:-900.000000
+FIN_BOX
+BOX
+creaMaracasVisu:Ruler01_XY_MPR_Widget:Box37
+ISEXEC:FALSE
+54.751210:115.111167:-900.000000
+125.926210:105.111167:-900.000000
+FIN_BOX
+CONNECTIONS:49
 CONNECTION
 Box02:Out:Box01:In
 NumberOfControlPoints:0
@@ -236,24 +260,9 @@ CONNECTION
 Box05:Out:Box09:In
 NumberOfControlPoints:0
 CONNECTION
-Box01:Renderer4:Box12:vtkRenderer
-NumberOfControlPoints:0
-CONNECTION
-Box01:Point:Box12:Point
-NumberOfControlPoints:0
-CONNECTION
-Box02:Out:Box12:Image
-NumberOfControlPoints:0
-CONNECTION
-Box01:BoxChange:Box12:BoxExecuteRulerInterface
-NumberOfControlPoints:0
-CONNECTION
 Box01:wxVtkBaseView4:Box13:wxvtkbaseview
 NumberOfControlPoints:0
 CONNECTION
-Box01:Renderer4:Box13:vtkRenderer
-NumberOfControlPoints:0
-CONNECTION
 Box13:BoxChange2:Box14:In
 NumberOfControlPoints:0
 CONNECTION
@@ -272,9 +281,6 @@ CONNECTION
 Box18:Widget:Box15:Widget
 NumberOfControlPoints:0
 CONNECTION
-Box12:Widget:Box19:Widget1
-NumberOfControlPoints:0
-CONNECTION
 Box19:Widget:Box05:Widget
 NumberOfControlPoints:0
 CONNECTION
@@ -287,9 +293,6 @@ CONNECTION
 Box21:Widget:Box22:In
 NumberOfControlPoints:0
 CONNECTION
-Box09:Out:Box21:In
-NumberOfControlPoints:0
-CONNECTION
 Box24:widget:Box21:Widget
 NumberOfControlPoints:0
 CONNECTION
@@ -335,6 +338,54 @@ CONNECTION
 Box02:Out:Box27:In
 NumberOfControlPoints:0
 CONNECTION
-Box32:Out:Box02:In
+Box00:Out:Box02:In
+NumberOfControlPoints:0
+CONNECTION
+Box35:Widget:Box36:In
+NumberOfControlPoints:0
+CONNECTION
+Box33:widget:Box35:Widget
+NumberOfControlPoints:0
+CONNECTION
+Box01:BoxChange:Box33:boxexecute
+NumberOfControlPoints:0
+CONNECTION
+Box01:Point:Box33:point
+NumberOfControlPoints:0
+CONNECTION
+Box01:Renderer1:Box33:vtkrender
+NumberOfControlPoints:0
+CONNECTION
+Box02:Out:Box33:vtkimagedata
+NumberOfControlPoints:0
+CONNECTION
+Box09:Out:Box35:In
+NumberOfControlPoints:0
+CONNECTION
+Box35:Out:Box21:In
+NumberOfControlPoints:0
+CONNECTION
+Box02:Out:Box37:image
+NumberOfControlPoints:0
+CONNECTION
+Box01:Point:Box37:point3D
+NumberOfControlPoints:0
+CONNECTION
+Box01:wxVtkBaseView2:Box37:wxvtkbaseview1
+NumberOfControlPoints:0
+CONNECTION
+Box01:wxVtkBaseView3:Box37:wxvtkbaseview2
+NumberOfControlPoints:0
+CONNECTION
+Box01:wxVtkBaseView4:Box37:wxvtkbaseview3
+NumberOfControlPoints:0
+CONNECTION
+Box37:widget:Box19:Widget1
+NumberOfControlPoints:0
+CONNECTION
+Box01:BoxChange:Box37:boxexecute
+NumberOfControlPoints:0
+CONNECTION
+Box00:FileName:Box16:FileName
 NumberOfControlPoints:0
 APP_END

diff --git a/bbtk_package_creaMiniTools/bbs/appli/ViewerContainer.bbs b/bbtk_package_creaMiniTools/bbs/appli/ViewerContainer.bbs
index 52fa394d0b96778db36f0043b46f792c16a56dc4..eecdb3ffd3f9baab9e48616440d8e0cee5a4e21d 100644 (file)
--- a/bbtk_package_creaMiniTools/bbs/appli/ViewerContainer.bbs
+++ b/bbtk_package_creaMiniTools/bbs/appli/ViewerContainer.bbs
@@ -45,8 +45,6 @@ new PanelButtonContainerSettings Box09
 
 new MagicBox Box10
 
-new Ruler01_XY_Widget Box12
-
 new ContourControlPoints_Widget Box13
 
 new MagicBox Box14
@@ -95,6 +93,17 @@ new Crop_Widget Box31
 
 new ImagesChooserDialogBox Box32
 
+new Measure3DLength_Widget Box33
+
+new PanelButtonContainerSettings Box35
+  set Box35.ButtonName "Ruler 3D"
+  set Box35.GroupName "Measurements"
+  set Box35.Iconpath "/home/davila/Creatis/creaTools/creatools_source/creaContours/data/Icons/Contour.png"
+
+new MagicBox Box36
+
+new Ruler01_XY_MPR_Widget Box37
+
 
 connect Box02.Out Box01.In
 
@@ -108,18 +117,8 @@ connect Box09.Widget Box10.In
 
 connect Box05.Out Box09.In
 
-connect Box01.Renderer4 Box12.vtkRenderer
-
-connect Box01.Point Box12.Point
-
-connect Box02.Out Box12.Image
-
-connect Box01.BoxChange Box12.BoxExecuteRulerInterface
-
 connect Box01.wxVtkBaseView4 Box13.wxvtkbaseview
 
-connect Box01.Renderer4 Box13.vtkRenderer
-
 connect Box13.BoxChange2 Box14.In
 
 connect Box15.Out Box05.In
@@ -132,8 +131,6 @@ connect Box16.widget Box18.Widget1
 
 connect Box18.Widget Box15.Widget
 
-connect Box12.Widget Box19.Widget1
-
 connect Box19.Widget Box05.Widget
 
 connect Box13.Widget_Contour Box20.Widget1
@@ -142,8 +139,6 @@ connect Box20.Widget Box09.Widget
 
 connect Box21.Widget Box22.In
 
-connect Box09.Out Box21.In
-
 connect Box24.widget Box21.Widget
 
 connect Box02.Out Box24.Image
@@ -174,7 +169,39 @@ connect Box02.Out Box31.Image
 
 connect Box02.Out Box27.In
 
-connect Box32.Out Box02.In
+connect Box00.Out Box02.In
+
+connect Box35.Widget Box36.In
+
+connect Box33.widget Box35.Widget
+
+connect Box01.BoxChange Box33.boxexecute
+
+connect Box01.Point Box33.point
+
+connect Box01.Renderer1 Box33.vtkrender
+
+connect Box02.Out Box33.vtkimagedata
+
+connect Box09.Out Box35.In
+
+connect Box35.Out Box21.In
+
+connect Box02.Out Box37.image
+
+connect Box01.Point Box37.point3D
+
+connect Box01.wxVtkBaseView2 Box37.wxvtkbaseview1
+
+connect Box01.wxVtkBaseView3 Box37.wxvtkbaseview2
+
+connect Box01.wxVtkBaseView4 Box37.wxvtkbaseview3
+
+connect Box37.widget Box19.Widget1
+
+connect Box01.BoxChange Box37.boxexecute
+
+connect Box00.FileName Box16.FileName