]> Creatis software - bbtk.git/commitdiff
no message
authorEduardo Davila <Eduardo.Davila@creatis.insa-lyon.fr>
Fri, 22 Jul 2011 12:30:31 +0000 (12:30 +0000)
committerEduardo Davila <Eduardo.Davila@creatis.insa-lyon.fr>
Fri, 22 Jul 2011 12:30:31 +0000 (12:30 +0000)
packages/wx/src/bbwxInputText.cxx
packages/wxvtk/bbs/boxes/bbIsoSurfaceWidget.bbg
packages/wxvtk/bbs/boxes/bbIsoSurfaceWidget.bbs

index 58c329be058d3e9f4818ca3ece0c8d15992064c1..66058c39062b91b7dfaa87d00eaa4beb6b34e020 100644 (file)
@@ -2,8 +2,8 @@
   Program:   bbtk
   Module:    $RCSfile: bbwxInputText.cxx,v $
   Language:  C++
-  Date:      $Date: 2011/06/17 16:19:42 $
-  Version:   $Revision: 1.11 $
+  Date:      $Date: 2011/07/22 12:30:31 $
+  Version:   $Revision: 1.12 $
 =========================================================================*/
 
 /* ---------------------------------------------------------------------
@@ -194,8 +194,9 @@ namespace bbwx
                }
                w->SetTitle( bbtk::std2wx ( bbGetInputTitle() ) );
                bbSetOutputOut( w->GetValue() );
-       }
+       } else {
          bbSetOutputOut( "<VOID>" );
+       }
   }
   
 
index 2b9c82055f06228a840c332469b49465732b4db5..c61f57cb51becacd6dee8e3bb46963ada85f79fd 100644 (file)
@@ -10,38 +10,42 @@ AUTHOR:laurent.guigues@creatis.insa-lyon.fr
 COMPLEXBOX:TRUE
 COMPLEXBOXNAME:IsoSurfaceWidget
 PACKAGENAME:wxvtk
-COMPLEXINPUTS:8
+COMPLEXINPUTS:9
 COMPLEX_PORT
 Title
-269.713920:108.970260:900.000000
+283.154725:158.660509:900.000000
 FIN_COMPLEX_PORT
 COMPLEX_PORT
 In
--37.343740:114.308545:900.000000
+-16.833633:160.323981:900.000000
 FIN_COMPLEX_PORT
 COMPLEX_PORT
 Opacity
-95.735038:118.363406:900.000000
+87.996393:158.685822:900.000000
 FIN_COMPLEX_PORT
 COMPLEX_PORT
 Isovalue
-4.347463:114.949730:900.000000
+16.600142:158.290245:900.000000
 FIN_COMPLEX_PORT
 COMPLEX_PORT
 Colour
-147.814907:117.940519:900.000000
+142.520044:157.855637:900.000000
 FIN_COMPLEX_PORT
 COMPLEX_PORT
 BoxExecute
-230.326575:112.814205:900.000000
+238.065220:158.024186:900.000000
 FIN_COMPLEX_PORT
 COMPLEX_PORT
 Vertical
-244.742921:108.328020:900.000000
+256.961835:159.240161:900.000000
 FIN_COMPLEX_PORT
 COMPLEX_PORT
 vtkRenderer
-63.230501:116.504290:900.000000
+70.561849:158.455894:900.000000
+FIN_COMPLEX_PORT
+COMPLEX_PORT
+maxIsovalue
+42.085827:158.422433:900.000000
 FIN_COMPLEX_PORT
 COMPLEXOUTPUTS:3
 COMPLEX_PORT
@@ -80,8 +84,8 @@ FIN_BOX
 BOX
 wx:Slider:isovalue
 ISEXEC:FALSE
--7.898242:76.039566:900.000000
-43.501758:66.039566:900.000000
+10.463291:74.344052:900.000000
+61.863291:64.344052:900.000000
 PORT
 Max:5000
 PORT
@@ -124,12 +128,12 @@ FIN_BOX
 BOX
 std:Div:div
 ISEXEC:FALSE
-14.827619:4.428984:900.000000
-47.602619:-5.571016:900.000000
+31.270053:4.693506:900.000000
+64.045053:-5.306494:900.000000
 PORT
 In2:"100"
 FIN_BOX
-CONNECTIONS:24
+CONNECTIONS:25
 CONNECTION
 sliders:Widget:controls:Widget1
 NumberOfControlPoints:0
@@ -170,9 +174,6 @@ CONNECTION
 Title:Title:controls:WinTitle
 NumberOfControlPoints:0
 CONNECTION
-In:In:surface:In
-NumberOfControlPoints:0
-CONNECTION
 Opacity:Opacity:opacity:In
 NumberOfControlPoints:0
 CONNECTION
@@ -202,4 +203,10 @@ NumberOfControlPoints:0
 CONNECTION
 vtkRenderer:vtkRenderer:surface:Renderer
 NumberOfControlPoints:0
+CONNECTION
+In:In:surface:In
+NumberOfControlPoints:0
+CONNECTION
+maxIsovalue:maxIsovalue:isovalue:Max
+NumberOfControlPoints:0
 APP_END
index 6fddd51fd0da268925c6d76cbece14b9612b1c4a..8a6492d6ff5fb4161caf6f9b1df6df91247a94a6 100644 (file)
@@ -61,13 +61,14 @@ connect refresh.Out surface.BoxExecute
 
 # Complex input ports
 input Title controls.WinTitle " "
-input In surface.In " "
 input Opacity opacity.In " "
 input Isovalue isovalue.In " "
 input Colour colour.In " "
 input Vertical controls.Orientation " "
 input BoxExecute refresh.In4 " "
 input vtkRenderer surface.Renderer " "
+input In surface.In " "
+input maxIsovalue isovalue.Max " "
 
 # Complex output ports
 output Out surface.Out " "