From: Eduardo DAVILA <davila@ei-ed-606.univ-lyon1.fr>
Date: Fri, 10 Jan 2020 15:30:25 +0000 (+0100)
Subject: #3337 creaMaracasVisu Feature New Normal  -  ManualPaint2 with 2D/3D option
X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=commitdiff_plain;h=36bb11ddad8e5a575caff464109e5b70356ca8fa;p=creaMaracasVisu.git

#3337 creaMaracasVisu Feature New Normal  -  ManualPaint2 with 2D/3D option
---

diff --git a/bbtk/bbs/boxes/ManualPaint2.bbg b/bbtk/bbs/boxes/ManualPaint2.bbg
index 1f2c640..a9dc028 100644
--- a/bbtk/bbs/boxes/ManualPaint2.bbg
+++ b/bbtk/bbs/boxes/ManualPaint2.bbg
@@ -76,7 +76,7 @@ COMPLEX_PORT
 colorBarPosition
 -180.034675:180.795982:-900.000000
 FIN_COMPLEX_PORT
-BOXES:31
+BOXES:34
 BOX
 creaMaracasVisu:ManualPaint_Model:Box00
 ISEXEC:FALSE
@@ -214,8 +214,8 @@ FIN_BOX
 BOX
 wx:RadioButton:Box18
 ISEXEC:FALSE
--242.357156:85.809216:-900.000000
--178.637156:75.809216:-900.000000
+-327.358460:96.434379:-900.000000
+-263.638460:86.434379:-900.000000
 PORT
 In:"1"
 PORT
@@ -343,7 +343,41 @@ ISEXEC:FALSE
 49.639480:114.047399:-900.000000
 85.714480:104.047399:-900.000000
 FIN_BOX
-CONNECTIONS:79
+BOX
+wx:LayoutLine:Box36
+ISEXEC:FALSE
+-294.584648:43.407556:-900.000000
+-237.024648:33.407556:-900.000000
+PORT
+Orientation:"H"
+FIN_BOX
+BOX
+wx:RadioButton:Box37
+ISEXEC:FALSE
+-251.576354:94.888910:-900.000000
+-187.856354:84.888910:-900.000000
+PORT
+In:"1"
+PORT
+In0:"2D"
+PORT
+In1:"3D"
+FIN_BOX
+BOX
+wx:RadioButton:Box39
+ISEXEC:FALSE
+-216.228897:75.929979:-900.000000
+-152.508897:65.929979:-900.000000
+PORT
+In:"1"
+PORT
+In0:"YZ"
+PORT
+In1:"XZ"
+PORT
+In2:"XY"
+FIN_BOX
+CONNECTIONS:84
 CONNECTION
 Box01:Out:Box02:In
 NumberOfControlPoints:0
@@ -546,9 +580,6 @@ CONNECTION
 Box00:BoxChange:Box28:BoxExecute
 NumberOfControlPoints:0
 CONNECTION
-Box18:Widget:Box29:Widget1
-NumberOfControlPoints:0
-CONNECTION
 Box29:Widget:Box19:Widget1
 NumberOfControlPoints:0
 CONNECTION
@@ -581,4 +612,22 @@ NumberOfControlPoints:0
 CONNECTION
 Box24:Out:Box32:wxvtkbaseview
 NumberOfControlPoints:0
+CONNECTION
+Box36:Widget:Box29:Widget1
+NumberOfControlPoints:0
+CONNECTION
+Box18:Widget:Box36:Widget1
+NumberOfControlPoints:0
+CONNECTION
+Box37:Widget:Box36:Widget2
+NumberOfControlPoints:0
+CONNECTION
+Box37:Out:Box00:2D3D
+NumberOfControlPoints:0
+CONNECTION
+Box39:Widget:Box36:Widget4
+NumberOfControlPoints:0
+CONNECTION
+Box39:Out:Box00:Direction
+NumberOfControlPoints:0
 APP_END
diff --git a/bbtk/bbs/boxes/ManualPaint2.bbs b/bbtk/bbs/boxes/ManualPaint2.bbs
index 7ce9788..6fb2bd6 100644
--- a/bbtk/bbs/boxes/ManualPaint2.bbs
+++ b/bbtk/bbs/boxes/ManualPaint2.bbs
@@ -119,6 +119,20 @@ new vtk:UpdateRender Box34
 
 new std:MagicBox Box38
 
+new wx:LayoutLine Box36
+  set Box36.Orientation "H"
+
+new wx:RadioButton Box37
+  set Box37.In "1"
+  set Box37.In0 "2D"
+  set Box37.In1 "3D"
+
+new wx:RadioButton Box39
+  set Box39.In "1"
+  set Box39.In0 "YZ"
+  set Box39.In1 "XZ"
+  set Box39.In2 "XY"
+
 
 connect Box01.Out Box02.In
 connect Box04.Out0 Box02.In0
@@ -172,7 +186,6 @@ connect Box25.Out Box27.Renderer
 connect Box26.Out Box28.Renderer
 connect Box00.BoxChange Box27.BoxExecute
 connect Box00.BoxChange Box28.BoxExecute
-connect Box18.Widget Box29.Widget1
 connect Box29.Widget Box19.Widget1
 connect Box30.Widget Box29.Widget2
 connect Box31.Widget Box29.Widget3
@@ -183,6 +196,12 @@ connect Box00.Manualpaintmodel Box33.Manualpaintmodel
 connect Box38.Out Box00.Point
 connect Box24.Out Box33.wxvtkbaseview
 connect Box24.Out Box32.wxvtkbaseview
+connect Box36.Widget Box29.Widget1
+connect Box18.Widget Box36.Widget1
+connect Box37.Widget Box36.Widget2
+connect Box37.Out Box00.2D3D
+connect Box39.Widget Box36.Widget4
+connect Box39.Out Box00.Direction
 
 # Complex input ports
 input TitleOptions Box20.In " "