]> Creatis software - creaMaracasVisu.git/commitdiff
#3525 ShowNPoints Actual Visu collection option
authorEduardo DAVILA <davila@creatis.insa-lyon.fr>
Wed, 19 Jul 2023 15:50:10 +0000 (17:50 +0200)
committerEduardo DAVILA <davila@creatis.insa-lyon.fr>
Wed, 19 Jul 2023 15:50:10 +0000 (17:50 +0200)
bbtk/bbs/appli/exampleTransformWidget2.bbg
bbtk/bbs/appli/exampleTransformWidget2.bbs
lib/maracasVisuLib/src/interface/wxWindows/widgets/WidgetShowNPoints.cxx

index 7a942fccdc082094dbb9079053d87a58adcd2447..f61fb0caab6982230590b36de4414716ba844043 100644 (file)
@@ -9,104 +9,56 @@ DESCRIPTION:Show N Points
 AUTHOR:info-dev@creatis.insa-lyon.fr
 COMPLEXBOX:FALSE
 COMPLEXINPUTS:0
-BOXES:58
+BOXES:36
 BOX
 creaMaracasVisu:ViewerNV:viewer
 ISEXEC:FALSE
-85.967077:143.268387:-900.000000
-107.557077:140.768387:-900.000000
+74.159874:145.739662:-900.000000
+112.759874:143.239662:-900.000000
 PORT
 nTypeView:"5 1 2 0"
 FIN_BOX
 BOX
-creaMaracasVisu:ShowNPoints:showNpoints
-ISEXEC:FALSE
-208.256761:44.671338:-900.000000
-245.096761:42.171338:-900.000000
-PORT
-Radio:"2"
-PORT
-Type:"4"
-FIN_BOX
-BOX
 wx:LayoutSplit:main
 ISEXEC:TRUE
-45.687058:-119.933737:-900.000000
-67.352058:-122.433737:-900.000000
+36.236800:-7.222791:-900.000000
+58.996800:-9.722791:-900.000000
 PORT
 Orientation:"H"
 PORT
 Proportion:"10"
 FIN_BOX
 BOX
-vtk:MetaImageReader:Box04
-ISEXEC:FALSE
-93.477283:203.365927:-900.000000
-115.937283:200.865927:-900.000000
-PORT
-In:"/Users/davila/CreatisWork/tmpJCR/results/Experimental-XXXXX2/FG101-VT-B/images/Inspi-B.mhd"
-FIN_BOX
-BOX
 vtk:vtkImageDataPointerRelay:Box05
 ISEXEC:FALSE
-89.516479:153.129177:-900.000000
-112.726479:150.629177:-900.000000
+114.371174:153.939043:-900.000000
+137.581174:151.439043:-900.000000
 FIN_BOX
 BOX
 creaMaracasVisu:ImageChangeInformation:Box06
 ISEXEC:FALSE
-98.101265:186.052051:-900.000000
-121.251265:183.552051:-900.000000
-FIN_BOX
-BOX
-creaMaracasVisu:ManualContourModel_Box:Box07
-ISEXEC:FALSE
-194.916832:2.707670:-900.000000
-219.436832:0.207670:-900.000000
-PORT
-DoubleContour:"0"
-PORT
-NbPoints:"100"
-FIN_BOX
-BOX
-creaMaracasVisu:DrawAxisTree3D:Box08
-ISEXEC:FALSE
-182.751933:-6.684443:-900.000000
-210.791933:-9.184443:-900.000000
-PORT
-Colour:"0 0 1"
-PORT
-LineWidth:"2"
-PORT
-Opacity:"1"
-FIN_BOX
-BOX
-std:VectorFilterDouble:Box09
-ISEXEC:FALSE
-216.450684:21.779405:-900.000000
-242.730684:19.279405:-900.000000
-PORT
-Type:"11"
+116.009496:161.199811:-900.000000
+139.159496:158.699811:-900.000000
 FIN_BOX
 BOX
 vtk:ImageVtkProperties:Box10
 ISEXEC:FALSE
--38.467279:72.794940:-900.000000
-16.720000:70.294940:-900.000000
+-17.049563:99.429793:-900.000000
+5.485437:96.929793:-900.000000
 FIN_BOX
 BOX
 wx:LayoutLine:Box12
 ISEXEC:FALSE
--66.572804:-26.022814:-900.000000
--33.252804:-28.522814:-900.000000
+-41.585468:18.460136:-900.000000
+-8.265468:15.960136:-900.000000
 PORT
 Orientation:"H"
 FIN_BOX
 BOX
 creaMaracasVisu:SliceImage:Box21
 ISEXEC:FALSE
--80.494473:39.228278:-900.000000
--58.769473:36.728278:-900.000000
+-64.019306:76.297403:-900.000000
+-42.294306:73.797403:-900.000000
 PORT
 InterpolationMode:"1"
 PORT
@@ -119,8 +71,8 @@ FIN_BOX
 BOX
 creaVtk:TransformVector:Box25
 ISEXEC:FALSE
--81.471694:78.694065:-900.000000
--59.261694:76.194065:-900.000000
+-60.053978:105.328918:-900.000000
+-37.843978:102.828918:-900.000000
 PORT
 InX:"1  0  0"
 PORT
@@ -131,42 +83,42 @@ FIN_BOX
 BOX
 creaMaracasVisu:ImageActor:Box34
 ISEXEC:FALSE
--75.127992:1.355089:-900.000000
-15.720000:-1.144911:-900.000000
+-60.849514:51.878933:-900.000000
+-39.054514:49.378933:-900.000000
 PORT
 InterpolationMode:"1"
 FIN_BOX
 BOX
 vtk:UpdateRender:Box35
 ISEXEC:FALSE
--36.550423:-14.754442:-900.000000
-8.680000:-17.254442:-900.000000
+-24.468634:31.650610:-900.000000
+-2.443634:29.150610:-900.000000
 PORT
 Active:"true"
 FIN_BOX
 BOX
 vtk:Transform:Box36
 ISEXEC:FALSE
--52.487360:57.978654:-900.000000
-17.480000:55.478654:-900.000000
+-31.069644:84.613507:-900.000000
+-9.514644:82.113507:-900.000000
 FIN_BOX
 BOX
 creaVtk:ConcatTransform:Box37
 ISEXEC:FALSE
--59.880124:50.051963:-900.000000
--37.600124:47.551963:-900.000000
+-37.638649:75.313885:-900.000000
+-15.358649:72.813885:-900.000000
 FIN_BOX
 BOX
 std:ConcatStrings:Box38
 ISEXEC:FALSE
--61.804071:72.216477:-900.000000
--39.044071:69.716477:-900.000000
+-40.386355:98.851330:-900.000000
+-17.626355:96.351330:-900.000000
 FIN_BOX
 BOX
 std:ConcatStrings:Box42
 ISEXEC:FALSE
--83.220618:67.537653:-900.000000
-22.760000:65.037653:-900.000000
+-61.802902:94.172506:-900.000000
+-39.042902:91.672506:-900.000000
 PORT
 In2:"  "
 PORT
@@ -175,8 +127,8 @@ FIN_BOX
 BOX
 creaVtk:ScalarsToColors:Box48
 ISEXEC:FALSE
--98.732708:19.851377:-900.000000
-13.960000:17.351377:-900.000000
+24.007283:106.071415:-900.000000
+46.167283:103.571415:-900.000000
 PORT
 BelowAboveRangeTransparence:"false"
 PORT
@@ -191,50 +143,14 @@ FIN_BOX
 BOX
 vtk:vtkImageDataPointerRelay:Box57
 ISEXEC:FALSE
--37.376549:80.928257:-900.000000
--14.166549:78.428257:-900.000000
-FIN_BOX
-BOX
-wx:LayoutLine:Box59
-ISEXEC:FALSE
-12.895337:-90.189618:-900.000000
-34.555337:-92.689618:-900.000000
-PORT
-WinTitle:"Plane"
+-15.958833:107.563110:-900.000000
+7.251167:105.063110:-900.000000
 FIN_BOX
 BOX
 std:MagicBox:Box60
 ISEXEC:FALSE
--8.381788:38.267560:-900.000000
-13.218212:35.767560:-900.000000
-FIN_BOX
-BOX
-creaMaracasVisu:ManualContourModel_Box:Box61
-ISEXEC:FALSE
-164.264334:43.516761:-900.000000
-188.784334:41.016761:-900.000000
-PORT
-DoubleContour:"1"
-PORT
-NbPoints:"200"
-PORT
-OpenClose2:"true"
-FIN_BOX
-BOX
-creaVtk:CreateMeshFromPoints:Box62
-ISEXEC:FALSE
-159.141951:32.031198:-900.000000
-181.996951:29.531198:-900.000000
-PORT
-CloseSurface:"false"
-FIN_BOX
-BOX
-creaMaracasVisu:PolyDataToActor_Widget:Box63
-ISEXEC:FALSE
-174.158043:14.525211:-900.000000
-197.178043:12.025211:-900.000000
-PORT
-active:"true"
+-3.988410:74.512926:-900.000000
+17.611590:72.012926:-900.000000
 FIN_BOX
 BOX
 creaVtk:PointPicker:Box64
@@ -271,140 +187,36 @@ FIN_BOX
 BOX
 std:MultipleInputs:Box69
 ISEXEC:TRUE
-127.775959:-119.745040:-900.000000
-149.745959:-122.245040:-900.000000
-FIN_BOX
-BOX
-wx:LayoutTab:Box70
-ISEXEC:FALSE
-23.590887:-104.478048:-900.000000
-45.205887:-106.978048:-900.000000
-FIN_BOX
-BOX
-wx:LayoutLine:Box71
-ISEXEC:FALSE
-176.518334:134.643148:-900.000000
-198.178334:132.143148:-900.000000
-PORT
-Orientation:"H"
-FIN_BOX
-BOX
-PackRecalage:ImageConvolution:Box72
-ISEXEC:FALSE
-112.327108:162.476513:-900.000000
-134.762108:159.976513:-900.000000
-FIN_BOX
-BOX
-vtk:vtkImageDataPointerRelay:Box74
-ISEXEC:FALSE
-99.646770:172.833935:-900.000000
-122.856770:170.333935:-900.000000
-FIN_BOX
-BOX
-wx:Slider:Box75
-ISEXEC:FALSE
-160.291919:181.728860:-900.000000
-181.446919:179.228860:-900.000000
-PORT
-In:"-12000"
-PORT
-Label:"true"
-PORT
-Max:"12000"
-PORT
-Min:"-12000"
-PORT
-ReactiveOnTrack:"true"
-PORT
-Title:"Convolution1"
-PORT
-WinTitle:"Convolution1"
-FIN_BOX
-BOX
-std:Div:Box76
-ISEXEC:FALSE
-155.280291:174.925137:-900.000000
-176.205291:172.425137:-900.000000
-PORT
-In2:"100"
-FIN_BOX
-BOX
-wx:LayoutLine:Box78
-ISEXEC:FALSE
-56.989262:-89.883471:-900.000000
-78.649262:-92.383471:-900.000000
-PORT
-WinTitle:"Config Image"
-FIN_BOX
-BOX
-wx:CheckBox:Box80
-ISEXEC:FALSE
-148.962639:168.375469:-900.000000
-170.592639:165.875469:-900.000000
-PORT
-Title:"Convolution"
-FIN_BOX
-BOX
-std:StringSelect:Box81
-ISEXEC:FALSE
-187.500455:163.866474:-900.000000
-212.020455:161.366474:-900.000000
-PORT
-In0:"380 80"
-PORT
-In1:"10800 4300"
-FIN_BOX
-BOX
-std:GetVectorStringElement:Box82
-ISEXEC:FALSE
-185.527769:152.171268:-900.000000
-208.482769:149.671268:-900.000000
-PORT
-I:"0"
-FIN_BOX
-BOX
-std:GetVectorStringElement:Box83
-ISEXEC:FALSE
-220.142331:152.591387:-900.000000
-243.097331:150.091387:-900.000000
-PORT
-I:"1"
+123.772037:-12.934291:-900.000000
+145.742037:-15.434291:-900.000000
 FIN_BOX
 BOX
 vtk:LoadHola:Box84
 ISEXEC:FALSE
-62.963791:203.624575:-900.000000
-84.513791:201.124575:-900.000000
+117.508172:167.366176:-900.000000
+139.058172:164.866176:-900.000000
 FIN_BOX
 BOX
 creaMaracasVisu:wxVtkBaseView_Info:Box92
 ISEXEC:FALSE
--106.107062:85.120138:-900.000000
--78.827062:82.620138:-900.000000
+-16.317404:119.443402:-900.000000
+10.962596:116.943402:-900.000000
 PORT
 InteractionType:"12"
 FIN_BOX
 BOX
-creaMaracasVisu:MeshContours_Widget:Box93
-ISEXEC:FALSE
-192.848525:10.509373:-900.000000
-215.643525:8.009373:-900.000000
-PORT
-colorMesh:"1 1 0"
-FIN_BOX
-BOX
 wx:CheckBox:Box94
 ISEXEC:FALSE
--34.183836:17.553423:-900.000000
-21.000000:15.053423:-900.000000
+-38.577214:65.880578:-900.000000
+-16.947214:63.380578:-900.000000
 PORT
 Title:"Pivot plane"
 FIN_BOX
 BOX
 creaMaracasVisu:DrawAxisTree3D:Box100
 ISEXEC:FALSE
--17.199624:5.214616:-900.000000
-28.040000:2.714616:-900.000000
+-12.531660:54.090943:-900.000000
+15.508340:51.590943:-900.000000
 PORT
 Colour:"1 0 0    1 1 0    0 0 1"
 PORT
@@ -423,131 +235,74 @@ FIN_BOX
 BOX
 creaMaracasVisu:TransformWidget2:Box105
 ISEXEC:FALSE
--73.017326:113.168725:-900.000000
--50.562326:110.668725:-900.000000
+-53.796298:126.623444:-900.000000
+-31.341298:124.123444:-900.000000
 PORT
 Type:"1"
 FIN_BOX
 BOX
 wx:LayoutSplit:Box96
 ISEXEC:FALSE
-77.617610:-105.424097:-900.000000
-99.282610:-107.924097:-900.000000
+74.797611:37.890905:-900.000000
+97.557611:35.390905:-900.000000
 FIN_BOX
 BOX
 creaMaracasVisu:ViewerNV:Box97
 ISEXEC:FALSE
-92.465258:-89.416058:-900.000000
-114.055258:-91.916058:-900.000000
+88.815800:61.971454:-900.000000
+127.415800:59.471454:-900.000000
 PORT
 nTypeView:"0"
 FIN_BOX
 BOX
 creaMaracasVisu:ImageChangeInformation:Box98
 ISEXEC:FALSE
-95.452651:-82.308567:-900.000000
-118.602651:-84.808567:-900.000000
+91.803193:69.078945:-900.000000
+114.953193:66.578945:-900.000000
 FIN_BOX
 BOX
 std:GetVectorDoubleElement:Box99
 ISEXEC:FALSE
-123.804357:-63.316601:-900.000000
-146.929357:-65.816601:-900.000000
+122.077002:80.382500:-900.000000
+145.202002:77.882500:-900.000000
 PORT
 I:"0"
 FIN_BOX
 BOX
 std:GetVectorDoubleElement:Box101
 ISEXEC:FALSE
-103.401113:-66.196632:-900.000000
-126.636113:-68.696632:-900.000000
+101.673758:77.502469:-900.000000
+124.908758:75.002469:-900.000000
 PORT
 I:"1"
 FIN_BOX
 BOX
-creaImageIO:ImagesChooserDialogBox:Box102
-ISEXEC:FALSE
-122.236090:203.990799:-900.000000
-145.391090:201.490799:-900.000000
-FIN_BOX
-BOX
 std:MathOperationVector:Box104
 ISEXEC:FALSE
--48.533350:63.839056:-900.000000
--24.013350:61.339056:-900.000000
+-27.115634:90.473909:-900.000000
+-2.595634:87.973909:-900.000000
 PORT
 Type:"2"
 FIN_BOX
 BOX
 std:MultipleInputs:Box106
 ISEXEC:FALSE
--35.585238:-5.984095:-900.000000
--13.505238:-8.484095:-900.000000
+-20.483002:39.048027:-900.000000
+1.596998:36.548027:-900.000000
 FIN_BOX
 BOX
 creaMaracasVisu:wxVtkBaseView_Info:Box107
 ISEXEC:FALSE
-73.772005:45.069956:-900.000000
-101.052005:42.569956:-900.000000
+103.125049:119.147292:-900.000000
+130.405049:116.647292:-900.000000
 PORT
 InteractionType:"12"
 FIN_BOX
-CONNECTIONS:118
-CONNECTION
-viewer:Renderer1:showNpoints:Renderer
-NumberOfControlPoints:0
-CONNECTION
-viewer:Point:showNpoints:In
-NumberOfControlPoints:0
-CONNECTION
-viewer:BoxChange:showNpoints:BoxExecute
-NumberOfControlPoints:0
-CONNECTION
-Box05:Out:showNpoints:Image
-NumberOfControlPoints:0
+CONNECTIONS:64
 CONNECTION
 Box05:Out:viewer:In
 NumberOfControlPoints:0
 CONNECTION
-showNpoints:lstIndexs:Box07:LstIndexsIn
-NumberOfControlPoints:0
-CONNECTION
-Box07:LstContourPointsX:Box08:lstPointX
-NumberOfControlPoints:0
-CONNECTION
-Box07:LstContourPointsY:Box08:lstPointY
-NumberOfControlPoints:0
-CONNECTION
-Box07:LstContourPointsZ:Box08:lstPointZ
-NumberOfControlPoints:0
-CONNECTION
-Box07:LstIndexsOut:Box08:lstIndexs
-NumberOfControlPoints:0
-CONNECTION
-viewer:Renderer1:Box08:Renderer
-NumberOfControlPoints:0
-CONNECTION
-showNpoints:BoxChange:Box08:BoxExecute
-NumberOfControlPoints:0
-CONNECTION
-showNpoints:lstPointsX:Box09:In0
-NumberOfControlPoints:0
-CONNECTION
-showNpoints:lstPointsY:Box09:In1
-NumberOfControlPoints:0
-CONNECTION
-showNpoints:lstPointsZ:Box09:In2
-NumberOfControlPoints:0
-CONNECTION
-Box09:Out0:Box07:LstControlPointsX
-NumberOfControlPoints:0
-CONNECTION
-Box09:Out1:Box07:LstControlPointsY
-NumberOfControlPoints:0
-CONNECTION
-Box09:Out2:Box07:LstControlPointsZ
-NumberOfControlPoints:0
-CONNECTION
 Box21:Out:Box34:In
 NumberOfControlPoints:0
 CONNECTION
@@ -578,21 +333,12 @@ CONNECTION
 Box05:Out:Box56:In
 NumberOfControlPoints:0
 CONNECTION
-Box56:Spacing:Box09:k1
-NumberOfControlPoints:0
-CONNECTION
 Box57:Out:Box21:In
 NumberOfControlPoints:0
 CONNECTION
 Box57:Out:Box10:In
 NumberOfControlPoints:0
 CONNECTION
-showNpoints:Widget:Box59:Widget1
-NumberOfControlPoints:0
-CONNECTION
-Box12:Widget:Box59:Widget3
-NumberOfControlPoints:0
-CONNECTION
 viewer:Renderer1:Box60:In
 NumberOfControlPoints:0
 CONNECTION
@@ -602,39 +348,6 @@ CONNECTION
 Box60:Out:Box35:Renderer
 NumberOfControlPoints:0
 CONNECTION
-Box09:Out0:Box61:LstControlPointsX
-NumberOfControlPoints:0
-CONNECTION
-Box09:Out1:Box61:LstControlPointsY
-NumberOfControlPoints:0
-CONNECTION
-Box09:Out2:Box61:LstControlPointsZ
-NumberOfControlPoints:0
-CONNECTION
-showNpoints:lstIndexs:Box61:LstIndexsIn
-NumberOfControlPoints:0
-CONNECTION
-Box61:LstContourPointsX:Box62:LstX
-NumberOfControlPoints:0
-CONNECTION
-Box61:LstContourPointsY:Box62:LstY
-NumberOfControlPoints:0
-CONNECTION
-Box61:LstContourPointsZ:Box62:LstZ
-NumberOfControlPoints:0
-CONNECTION
-Box61:LstIndexsOut:Box62:LstIndexs
-NumberOfControlPoints:0
-CONNECTION
-Box62:Out:Box63:polydata
-NumberOfControlPoints:0
-CONNECTION
-viewer:Renderer1:Box63:render
-NumberOfControlPoints:0
-CONNECTION
-Box63:widget:Box59:Widget4
-NumberOfControlPoints:0
-CONNECTION
 Box56:Spacing:Box66:In1
 NumberOfControlPoints:0
 CONNECTION
@@ -653,60 +366,6 @@ CONNECTION
 Box64:BoxChange:Box69:In1
 NumberOfControlPoints:0
 CONNECTION
-Box59:Widget:Box70:Widget1
-NumberOfControlPoints:0
-CONNECTION
-Box70:Widget:main:Widget1
-NumberOfControlPoints:0
-CONNECTION
-Box74:Out:Box72:In
-NumberOfControlPoints:0
-CONNECTION
-Box75:Out:Box76:In1
-NumberOfControlPoints:0
-CONNECTION
-Box76:Out:Box72:Factor
-NumberOfControlPoints:0
-CONNECTION
-Box75:BoxChange:Box72:BoxExecute
-NumberOfControlPoints:0
-CONNECTION
-Box71:Widget:Box78:Widget1
-NumberOfControlPoints:0
-CONNECTION
-Box78:Widget:Box70:Widget2
-NumberOfControlPoints:0
-CONNECTION
-Box75:Widget:Box71:Widget3
-NumberOfControlPoints:0
-CONNECTION
-Box06:Out:Box74:In
-NumberOfControlPoints:0
-CONNECTION
-Box80:Widget:Box71:Widget1
-NumberOfControlPoints:0
-CONNECTION
-Box80:Out:Box72:On
-NumberOfControlPoints:0
-CONNECTION
-Box72:Out:Box05:In
-NumberOfControlPoints:0
-CONNECTION
-Box80:Out:Box81:In
-NumberOfControlPoints:0
-CONNECTION
-Box81:Out:Box82:In
-NumberOfControlPoints:0
-CONNECTION
-Box82:Out:viewer:WindowLevel
-NumberOfControlPoints:0
-CONNECTION
-Box81:Out:Box83:In
-NumberOfControlPoints:0
-CONNECTION
-Box83:Out:viewer:ColorLevel
-NumberOfControlPoints:0
-CONNECTION
 viewer:Renderer1:Box64:Renderer
 NumberOfControlPoints:0
 CONNECTION
@@ -725,27 +384,6 @@ CONNECTION
 viewer:wxVtkBaseView3:Box92:wxVtkBaseView2
 NumberOfControlPoints:0
 CONNECTION
-Box62:Out:Box93:_polydata
-NumberOfControlPoints:0
-CONNECTION
-viewer:wxVtkBaseView2:Box93:_wxvtkbaseview2D1
-NumberOfControlPoints:0
-CONNECTION
-viewer:wxVtkBaseView3:Box93:_wxvtkbaseview2D2
-NumberOfControlPoints:0
-CONNECTION
-viewer:wxVtkBaseView4:Box93:_wxvtkbaseview2D3
-NumberOfControlPoints:0
-CONNECTION
-Box93:_widget:Box59:Widget6
-NumberOfControlPoints:0
-CONNECTION
-viewer:BoxChange:Box93:_execute
-NumberOfControlPoints:0
-CONNECTION
-viewer:wxVtkBaseView1:Box93:_wxvtkbaseview3D1
-NumberOfControlPoints:0
-CONNECTION
 Box94:Out:Box34:Opacity
 NumberOfControlPoints:0
 CONNECTION
@@ -847,4 +485,10 @@ NumberOfControlPoints:0
 CONNECTION
 Box94:Out:Box35:Active
 NumberOfControlPoints:0
+CONNECTION
+Box06:Out:Box05:In
+NumberOfControlPoints:0
+CONNECTION
+Box12:Widget:main:Widget1
+NumberOfControlPoints:0
 APP_END
index dd7cff3df9ae0807922c11699aceb1df3aeee594..af0f7200c9f1dac05bb567d8c8aef9d347b89df2 100644 (file)
@@ -11,10 +11,8 @@ include itkvtk
 include creaMaracasVisu
 include wx
 include vtk
-include std
 include creaVtk
-include PackRecalage
-include creaImageIO
+include std
 
 author "info-dev@creatis.insa-lyon.fr"
 description "Show N Points"
@@ -23,33 +21,14 @@ category "demo"
 new creaMaracasVisu:ViewerNV viewer
   set viewer.nTypeView "5 1 2 0"
 
-new creaMaracasVisu:ShowNPoints showNpoints
-  set showNpoints.Radio "2"
-  set showNpoints.Type "4"
-
 new wx:LayoutSplit main
   set main.Orientation "H"
   set main.Proportion "10"
 
-new vtk:MetaImageReader Box04
-  set Box04.In "/Users/davila/CreatisWork/tmpJCR/results/Experimental-XXXXX2/FG101-VT-B/images/Inspi-B.mhd"
-
 new vtk:vtkImageDataPointerRelay Box05
 
 new creaMaracasVisu:ImageChangeInformation Box06
 
-new creaMaracasVisu:ManualContourModel_Box Box07
-  set Box07.DoubleContour "0"
-  set Box07.NbPoints "100"
-
-new creaMaracasVisu:DrawAxisTree3D Box08
-  set Box08.Colour "0 0 1"
-  set Box08.LineWidth "2"
-  set Box08.Opacity "1"
-
-new std:VectorFilterDouble Box09
-  set Box09.Type "11"
-
 new vtk:ImageVtkProperties Box10
 
 new wx:LayoutLine Box12
@@ -90,22 +69,8 @@ new vtk:ImageVtkProperties Box56
 
 new vtk:vtkImageDataPointerRelay Box57
 
-new wx:LayoutLine Box59
-  set Box59.WinTitle "Plane"
-
 new std:MagicBox Box60
 
-new creaMaracasVisu:ManualContourModel_Box Box61
-  set Box61.DoubleContour "1"
-  set Box61.NbPoints "200"
-  set Box61.OpenClose2 "true"
-
-new creaVtk:CreateMeshFromPoints Box62
-  set Box62.CloseSurface "false"
-
-new creaMaracasVisu:PolyDataToActor_Widget Box63
-  set Box63.active "true"
-
 new creaVtk:PointPicker Box64
   set Box64.DefaultPoint "50 50 50"
   set Box64.TypeEvent "2"
@@ -120,51 +85,11 @@ new creaMaracasVisu:SetPosition Box68
 
 new std:MultipleInputs Box69
 
-new wx:LayoutTab Box70
-
-new wx:LayoutLine Box71
-  set Box71.Orientation "H"
-
-new PackRecalage:ImageConvolution Box72
-
-new vtk:vtkImageDataPointerRelay Box74
-
-new wx:Slider Box75
-  set Box75.In "-12000"
-  set Box75.Label "true"
-  set Box75.Max "12000"
-  set Box75.Min "-12000"
-  set Box75.ReactiveOnTrack "true"
-  set Box75.Title "Convolution1"
-  set Box75.WinTitle "Convolution1"
-
-new std:Div Box76
-  set Box76.In2 "100"
-
-new wx:LayoutLine Box78
-  set Box78.WinTitle "Config Image"
-
-new wx:CheckBox Box80
-  set Box80.Title "Convolution"
-
-new std:StringSelect Box81
-  set Box81.In0 "380 80"
-  set Box81.In1 "10800 4300"
-
-new std:GetVectorStringElement Box82
-  set Box82.I "0"
-
-new std:GetVectorStringElement Box83
-  set Box83.I "1"
-
 new vtk:LoadHola Box84
 
 new creaMaracasVisu:wxVtkBaseView_Info Box92
   set Box92.InteractionType "12"
 
-new creaMaracasVisu:MeshContours_Widget Box93
-  set Box93.colorMesh "1 1 0"
-
 new wx:CheckBox Box94
   set Box94.Title "Pivot plane"
 
@@ -193,8 +118,6 @@ new std:GetVectorDoubleElement Box99
 new std:GetVectorDoubleElement Box101
   set Box101.I "1"
 
-new creaImageIO:ImagesChooserDialogBox Box102
-
 new std:MathOperationVector Box104
   set Box104.Type "2"
 
@@ -204,42 +127,8 @@ new creaMaracasVisu:wxVtkBaseView_Info Box107
   set Box107.InteractionType "12"
 
 
-connect viewer.Renderer1 showNpoints.Renderer
-
-connect viewer.Point showNpoints.In
-
-connect viewer.BoxChange showNpoints.BoxExecute
-
-connect Box05.Out showNpoints.Image
-
 connect Box05.Out viewer.In
 
-connect showNpoints.lstIndexs Box07.LstIndexsIn
-
-connect Box07.LstContourPointsX Box08.lstPointX
-
-connect Box07.LstContourPointsY Box08.lstPointY
-
-connect Box07.LstContourPointsZ Box08.lstPointZ
-
-connect Box07.LstIndexsOut Box08.lstIndexs
-
-connect viewer.Renderer1 Box08.Renderer
-
-connect showNpoints.BoxChange Box08.BoxExecute
-
-connect showNpoints.lstPointsX Box09.In0
-
-connect showNpoints.lstPointsY Box09.In1
-
-connect showNpoints.lstPointsZ Box09.In2
-
-connect Box09.Out0 Box07.LstControlPointsX
-
-connect Box09.Out1 Box07.LstControlPointsY
-
-connect Box09.Out2 Box07.LstControlPointsZ
-
 connect Box21.Out Box34.In
 
 connect Box38.Out Box21.AxisOrigin
@@ -260,44 +149,16 @@ connect Box48.LookupTable Box34.LookupTable
 
 connect Box05.Out Box56.In
 
-connect Box56.Spacing Box09.k1
-
 connect Box57.Out Box21.In
 
 connect Box57.Out Box10.In
 
-connect showNpoints.Widget Box59.Widget1
-
-connect Box12.Widget Box59.Widget3
-
 connect viewer.Renderer1 Box60.In
 
 connect Box60.Out Box34.Renderer
 
 connect Box60.Out Box35.Renderer
 
-connect Box09.Out0 Box61.LstControlPointsX
-
-connect Box09.Out1 Box61.LstControlPointsY
-
-connect Box09.Out2 Box61.LstControlPointsZ
-
-connect showNpoints.lstIndexs Box61.LstIndexsIn
-
-connect Box61.LstContourPointsX Box62.LstX
-
-connect Box61.LstContourPointsY Box62.LstY
-
-connect Box61.LstContourPointsZ Box62.LstZ
-
-connect Box61.LstIndexsOut Box62.LstIndexs
-
-connect Box62.Out Box63.polydata
-
-connect viewer.Renderer1 Box63.render
-
-connect Box63.widget Box59.Widget4
-
 connect Box56.Spacing Box66.In1
 
 connect Box66.Out Box67.In0
@@ -310,42 +171,6 @@ connect Box64.BoxChange Box68.BoxExecute
 
 connect Box64.BoxChange Box69.In1
 
-connect Box59.Widget Box70.Widget1
-
-connect Box70.Widget main.Widget1
-
-connect Box74.Out Box72.In
-
-connect Box75.Out Box76.In1
-
-connect Box76.Out Box72.Factor
-
-connect Box75.BoxChange Box72.BoxExecute
-
-connect Box71.Widget Box78.Widget1
-
-connect Box78.Widget Box70.Widget2
-
-connect Box75.Widget Box71.Widget3
-
-connect Box06.Out Box74.In
-
-connect Box80.Widget Box71.Widget1
-
-connect Box80.Out Box72.On
-
-connect Box72.Out Box05.In
-
-connect Box80.Out Box81.In
-
-connect Box81.Out Box82.In
-
-connect Box82.Out viewer.WindowLevel
-
-connect Box81.Out Box83.In
-
-connect Box83.Out viewer.ColorLevel
-
 connect viewer.Renderer1 Box64.Renderer
 
 connect Box64.Point Box66.In0
@@ -358,20 +183,6 @@ connect viewer.wxVtkBaseView2 Box92.wxVtkBaseView
 
 connect viewer.wxVtkBaseView3 Box92.wxVtkBaseView2
 
-connect Box62.Out Box93._polydata
-
-connect viewer.wxVtkBaseView2 Box93._wxvtkbaseview2D1
-
-connect viewer.wxVtkBaseView3 Box93._wxvtkbaseview2D2
-
-connect viewer.wxVtkBaseView4 Box93._wxvtkbaseview2D3
-
-connect Box93._widget Box59.Widget6
-
-connect viewer.BoxChange Box93._execute
-
-connect viewer.wxVtkBaseView1 Box93._wxvtkbaseview3D1
-
 connect Box94.Out Box34.Opacity
 
 connect Box94.Widget Box12.Widget4
@@ -440,6 +251,10 @@ connect viewer.Point Box105.PossiblePoint
 
 connect Box94.Out Box35.Active
 
+connect Box06.Out Box05.In
+
+connect Box12.Widget main.Widget1
+
 
 
 # Complex input ports
index d3df6e329be025848f714e71c88eca51490a0507..20dc25377a3d88ba25da9ecb6525a5ae16c24bdf 100644 (file)
@@ -1,17 +1,11 @@
 
-#include "vtkSphereSource.h"
-#include "vtkRenderer.h"
-#include "vtkTextActor3D.h"
-
 #include <wx/button.h>
 #include <wx/sizer.h>
 #include <wx/filedlg.h>
 #include <wx/msgdlg.h>
 #include <wx/notebook.h>
+#include <wx/spinctrl.h>
 
-#include "WidgetShowNPoints.h"
-
-#include <creaContoursFactory.h>
 
 #include <vtkStaticPointLocator.h>
 #include <vtkPointData.h>
 #include <vtkStaticPointLocator.h>
 #include <vtkPoints.h>
 
+#include "vtkSphereSource.h"
+#include "vtkRenderer.h"
+#include "vtkTextActor3D.h"
+
+#include "WidgetShowNPoints.h"
+#include <creaContoursFactory.h>
+
+
 //----------------------------------------------------------------------
 //----------------------------------------------------------------------
 //----------------------------------------------------------------------
                           wxNB_TOP );
       panel  = new wxPanel(bookSetPoints);
 
-      wxSize sizeButton;
-      sizeButton.Set( 45  ,  -1 );
-      wxSize sizeSlider;
-      sizeSlider.Set( 90  ,  -1 );
+      wxSize sizeButton( 50  ,  -1 );
+      wxSize sizeSlider( 90  ,  -1 );
 
     // Group Manager
     if (mtype==4)
                               wxDefaultSize,
                               wxNB_TOP );
           panel2  = new wxPanel(bookGroupManager);
-          txtNrCollections                      = new wxStaticText(panel2,-1, _T("1   /  1 "));
-          wxButton *btnBackCollection           = new wxButton( panel2, -1, _T("<")     ,   wxDefaultPosition, sizeButton );
-          wxButton *btnNextCollection           = new wxButton( panel2, -1, _T(">")     ,   wxDefaultPosition, sizeButton );
-          wxButton *btnInsertCollectionBefore   = new wxButton( panel2, -1, _T("+<")    ,   wxDefaultPosition, sizeButton );
-          wxButton *btnInsertCollectionAfter    = new wxButton( panel2, -1, _T("+>")    ,   wxDefaultPosition, sizeButton );
-          wxButton *btnDeleteCollection         = new wxButton( panel2, -1, _T("-")     ,   wxDefaultPosition, sizeButton );
-          wxButton *btnResetCollection          = new wxButton( panel2, -1, _T("--")    ,   wxDefaultPosition, sizeButton );
-          wxButton *btnSaveCollection           = new wxButton( panel2, -1, _T("Save")  ,   wxDefaultPosition, sizeButton );
-          wxButton *btnLoadCollection           = new wxButton( panel2, -1, _T("Load")  ,   wxDefaultPosition, sizeButton );
+          wxCheckBox *cbVisuActualCollection    = new wxCheckBox    ( panel2,-1, _T("A.V.")       ,   wxDefaultPosition, sizeButton );
+          txtNrCollections                      = new wxStaticText  ( panel2,-1, _T("    1/1    "));
+          wxButton *btnBackCollection           = new wxButton      ( panel2, -1, _T("<")     ,   wxDefaultPosition, sizeButton );
+          wxButton *btnNextCollection           = new wxButton      ( panel2, -1, _T(">")     ,   wxDefaultPosition, sizeButton );
+          wxButton *btnInsertCollectionBefore   = new wxButton      ( panel2, -1, _T("+<")    ,   wxDefaultPosition, sizeButton );
+          wxButton *btnInsertCollectionAfter    = new wxButton      ( panel2, -1, _T("+>")    ,   wxDefaultPosition, sizeButton );
+          wxButton *btnDeleteCollection         = new wxButton      ( panel2, -1, _T("-")     ,   wxDefaultPosition, sizeButton );
+          wxButton *btnResetCollection          = new wxButton      ( panel2, -1, _T("--")    ,   wxDefaultPosition, sizeButton );
+          wxButton *btnSaveCollection           = new wxButton      ( panel2, -1, _T("Save")  ,   wxDefaultPosition, sizeButton );
+          wxButton *btnLoadCollection           = new wxButton      ( panel2, -1, _T("Load")  ,   wxDefaultPosition, sizeButton );
           wxFlexGridSizer *sizer1               = new wxFlexGridSizer(1);
           wxFlexGridSizer *sizer2               = new wxFlexGridSizer(2);
           wxFlexGridSizer *sizer3               = new wxFlexGridSizer(3);
           wxFlexGridSizer *sizer4               = new wxFlexGridSizer(3);
           wxFlexGridSizer *sizer5               = new wxFlexGridSizer(1);
+          wxFlexGridSizer *sizer5a              = new wxFlexGridSizer(2);
           wxFlexGridSizer *sizer6               = new wxFlexGridSizer(2);
+          wxFlexGridSizer *sizer7               = new wxFlexGridSizer(2);
  //         wxStaticText* txOpacity               = new wxStaticText(panel2, -1, wxString(_T("Op:")));
         
+          cbVisuActualCollection      -> SetToolTip( _T("Visu actual collection") );
           btnInsertCollectionBefore   -> SetToolTip( _T("+  Add group before") );
           btnInsertCollectionAfter    -> SetToolTip( _T("+>  Add group after") );
           btnDeleteCollection         -> SetToolTip( _T("-  Erase group") );
           Connect(btnInsertCollectionBefore->GetId(), wxEVT_COMMAND_BUTTON_CLICKED, (wxObjectEventFunction) & WidgetShowNPoints::OnInsertCollectionBefore   );
           Connect(btnInsertCollectionAfter->GetId() , wxEVT_COMMAND_BUTTON_CLICKED, (wxObjectEventFunction) & WidgetShowNPoints::OnInsertCollectionAfter    );
           Connect(btnDeleteCollection->GetId()      , wxEVT_COMMAND_BUTTON_CLICKED, (wxObjectEventFunction) & WidgetShowNPoints::OnDeleteCollection         );
-          Connect(sdrOpacity->GetId()               , wxEVT_COMMAND_SLIDER_UPDATED, (wxObjectEventFunction) &WidgetShowNPoints::UpdatePoints                );
-          Connect(sdrRadio->GetId()                 , wxEVT_COMMAND_SLIDER_UPDATED, (wxObjectEventFunction) &WidgetShowNPoints::UpdatePoints                );
+          Connect(sdrOpacity->GetId()               , wxEVT_COMMAND_SLIDER_UPDATED, (wxObjectEventFunction) & WidgetShowNPoints::UpdatePoints                );
+          Connect(sdrRadio->GetId()                 , wxEVT_COMMAND_SLIDER_UPDATED, (wxObjectEventFunction) & WidgetShowNPoints::UpdatePoints                );
           Connect(btnSaveCollection->GetId()        , wxEVT_COMMAND_BUTTON_CLICKED, (wxObjectEventFunction) & WidgetShowNPoints::OnSaveCollections          );
           Connect(btnLoadCollection->GetId()        , wxEVT_COMMAND_BUTTON_CLICKED, (wxObjectEventFunction) & WidgetShowNPoints::OnLoadCollections          );
           Connect(btnResetCollection->GetId()       , wxEVT_COMMAND_BUTTON_CLICKED, (wxObjectEventFunction) & WidgetShowNPoints::OnResetCollections         );
           sizer5->Add( sdrRadio ,wxGROW );
 //          sizer5->Add( txOpacity ,wxGROW );
           sizer5->Add( sdrOpacity ,wxGROW );
+
+        /*
+        wxChoice *wxchoiceA = new wxChoice ( panel2 , -1, wxDefaultPosition,sizeButton2);
+        wxChoice *wxchoiceB = new wxChoice ( panel2 , -1, wxDefaultPosition,sizeButton2);
+        wxchoiceA->Append(_T("0") );
+        wxchoiceA->Append(_T("1") );
+        wxchoiceA->Append(_T("2") );
+        wxchoiceA->Append(_T("3") );
+        wxchoiceA->Append(_T("4") );
+        wxchoiceA->Append(_T("5") );
+        wxchoiceA->Append(_T("6") );
+        wxchoiceA->Append(_T("7") );
+        wxchoiceA->Append(_T("8") );
+        wxchoiceA->Append(_T("9") );
+        wxchoiceA->Append(_T("10") );
+        wxchoiceB->Append(_T("0%") );
+        wxchoiceB->Append(_T("10%") );
+        wxchoiceB->Append(_T("20%") );
+        wxchoiceB->Append(_T("30%") );
+        wxchoiceB->Append(_T("40%") );
+        wxchoiceB->Append(_T("50%") );
+        wxchoiceB->Append(_T("60%") );
+        wxchoiceB->Append(_T("70%") );
+        wxchoiceB->Append(_T("80%") );
+        wxchoiceB->Append(_T("90") );
+        wxchoiceB->Append(_T("100") );
+*/
+        
+        wxSpinCtrl *mwxSpinButtonA = new wxSpinCtrl( panel2, -1  , wxEmptyString, wxDefaultPosition, sizeButton );
+        mwxSpinButtonA->SetRange(1,10);
+        mwxSpinButtonA->SetValue( 2 );
+        wxSpinCtrl *mwxSpinButtonB = new wxSpinCtrl( panel2, -1  , wxEmptyString, wxDefaultPosition, sizeButton );
+        mwxSpinButtonB->SetRange(0,10);
+        mwxSpinButtonB->SetValue( 10 );
+
+        
+//        sizer5a->Add( wxchoiceA ,wxGROW );
+//        sizer5a->Add( wxchoiceB ,wxGROW );
+        sizer5a->Add( mwxSpinButtonA ,wxGROW );
+        sizer5a->Add( mwxSpinButtonB ,wxGROW );
+
+        
           sizer6->Add( btnDeleteCollection );
           sizer6->Add( btnResetCollection );
+        
+        sizer7->Add( cbVisuActualCollection  );
+        sizer7->Add( txtNrCollections );
 
-          sizer1->Add( txtNrCollections );
+          sizer1->Add( sizer7 );
           sizer1->Add( sizer2 );
           sizer1->Add( sizer3 );
           sizer1->Add( sizer6 );
           sizer1->Add( sizer4 );
+          sizer1->Add( sizer5a );
+
           sizer1->Add( sizer5 ,wxGROW );
 
           MNPsizer                        = sizer1;
                      cbTrackPoint           = new wxCheckBox(panel,-1, _T("Tra.")       ,   wxDefaultPosition, sizeButton );
         wxButton    *btnRenamePoint                = new wxButton( panel, -1, _T("Ren.")       ,   wxDefaultPosition, sizeButton );
         wxButton    *btnErasePoint          = new wxButton( panel, -1, _T("-")          ,   wxDefaultPosition, sizeButton );
-               wxButton    *btnEraseLastPoint      = new wxButton( panel, -1, _T("- lst")      ,   wxDefaultPosition, sizeButton );
+//             wxButton    *btnEraseLastPoint      = new wxButton( panel, -1, _T("- lst")      ,   wxDefaultPosition, sizeButton );
                wxButton    *btnDeleteAllPoints     = new wxButton( panel, -1, _T("--")         ,   wxDefaultPosition, sizeButton );
         wxButton    *btnUndo                = new wxButton( panel, -1, _T("Undo")       ,   wxDefaultPosition, sizeButton );
         wxButton    *btnRedo                = new wxButton( panel, -1, _T("Redo")       ,   wxDefaultPosition, sizeButton );
                wxButton    *btnLoadPoints                  = NULL;
                 
 
-        btnBackPoint         -> SetToolTip( _T("Select befor point")                        );
-        btnNextPoint         -> SetToolTip( _T("Select next point")                         );
+        btnBackPoint        -> SetToolTip( _T("Select befor point")                        );
+        btnNextPoint        -> SetToolTip( _T("Select next point")                         );
         cbAutoAddPoints     -> SetToolTip( _T("Auto Add point")                             );
         btnAddPoint         -> SetToolTip( _T("+  Add point")                               );
         btnInsertPoint      -> SetToolTip( _T("(-)  Insert point")                          );
         btnMovePointDown    -> SetToolTip( _T("Move point Down in the normal direction")    );
 
         btnErasePoint       -> SetToolTip( _T("-  Erase point")                             );
-        btnEraseLastPoint   -> SetToolTip( _T("- lst  Erase last point")                    );
+//        btnEraseLastPoint   -> SetToolTip( _T("- lst  Erase last point")                    );
         btnDeleteAllPoints  -> SetToolTip( _T("-- Erase all points")                        );
         
                if ( mtype==0 )
             Connect(btnSavePoints->GetId()    , wxEVT_COMMAND_BUTTON_CLICKED  , (wxObjectEventFunction) &WidgetShowNPoints::OnSavePoints);
             Connect(btnLoadPoints->GetId()    , wxEVT_COMMAND_BUTTON_CLICKED  , (wxObjectEventFunction) &WidgetShowNPoints::OnLoadPoints);
                } // if mtype
-               txtNrPoints                                             = new wxStaticText(panel,-1, _T(" "));
+               txtNrPoints                                             = new wxStaticText(panel,-1, _T("   -/-"));
 
         wxStaticText* txOpacity;
         wxStaticText* txRadio;
         Connect(btnMovePointDown->GetId()   , wxEVT_COMMAND_BUTTON_CLICKED  , (wxObjectEventFunction) &WidgetShowNPoints::OnMovePointDown);
                Connect(btnSetPositionPoint->GetId(), wxEVT_COMMAND_BUTTON_CLICKED  , (wxObjectEventFunction) &WidgetShowNPoints::OnSetPoint);
                Connect(btnRenamePoint->GetId()         , wxEVT_COMMAND_BUTTON_CLICKED  , (wxObjectEventFunction) &WidgetShowNPoints::OnRenamePoint);
-               Connect(btnEraseLastPoint->GetId()      , wxEVT_COMMAND_BUTTON_CLICKED  , (wxObjectEventFunction) &WidgetShowNPoints::OnEraseLastPoint);
+//             Connect(btnEraseLastPoint->GetId()      , wxEVT_COMMAND_BUTTON_CLICKED  , (wxObjectEventFunction) &WidgetShowNPoints::OnEraseLastPoint);
                Connect(btnErasePoint->GetId()          , wxEVT_COMMAND_BUTTON_CLICKED  , (wxObjectEventFunction) &WidgetShowNPoints::OnErasePoint);
                Connect(btnDeleteAllPoints->GetId()     , wxEVT_COMMAND_BUTTON_CLICKED  , (wxObjectEventFunction) &WidgetShowNPoints::OnDeleteAllPoints);
         Connect(cbTrackPoint->GetId()       , wxEVT_COMMAND_CHECKBOX_CLICKED, (wxObjectEventFunction) &WidgetShowNPoints::OnTrackPoint);
         wxFlexGridSizer *sizer5 = new wxFlexGridSizer(2);
         wxFlexGridSizer *sizer6 = new wxFlexGridSizer(2);
         wxFlexGridSizer *sizer7 = new wxFlexGridSizer(2);
+        wxFlexGridSizer *sizer8 = new wxFlexGridSizer(2);
         sizer1->Add( textCtrl               );
         sizer1->Add( btnRenamePoint         );
-  //      sizer2->Add( cbAutoAddPoints        );
-  //      sizer2->Add( new wxStaticText(panel, -1, _T(" "))            );
         sizer2->Add( btnAddPoint            );
-        sizer2->Add( btnInsertPoint         );//CFT
-        sizer2->Add( cbAutoAddPoints        );
+        sizer2->Add( btnInsertPoint         );
+//        sizer2->Add( cbAutoAddPoints      );
         sizer3->Add( btnSetPositionPoint    );
         sizer3->Add( cbTrackPoint           );
         sizer4->Add( btnErasePoint          );
-        sizer4->Add( btnEraseLastPoint      );
+//        sizer4->Add( btnEraseLastPoint    );
         sizer4->Add( btnDeleteAllPoints     );
         sizer5->Add( btnUndo                );
         sizer5->Add( btnRedo                );
         sizer6->Add( btnBackPoint           );
         sizer6->Add( btnNextPoint           );
-        sizer7->Add( btnMovePointUp        );
-        sizer7->Add( btnMovePointDown      );
+        sizer7->Add( btnMovePointUp         );
+        sizer7->Add( btnMovePointDown       );
+        sizer8->Add( cbAutoAddPoints        );
+        sizer8->Add( txtNrPoints            );
 
         //             sizer0->Add(askPointLabel); // JPR
-        sizer0->Add(txtNrPoints);
+        sizer0->Add(sizer8);
         sizer0->Add(sizer6);
         sizer0->Add(sizer2);
         sizer0->Add(sizer7);
          {
                  // Widget interface
                  wxButton *btnSetPositionPoint         = new wxButton( panel, -1, _T("Set nearest point"));
-                 txtNrPoints                                           = new wxStaticText(panel,-1, _T(" "));
+                 txtNrPoints                                           = new wxStaticText(panel,-1, _T("-/-"));
 
                  //NTU: Sliders for opacity and radio change
                  wxStaticText* txOpacity                       = new wxStaticText(panel, -1, wxString(_T("  Points Opacity  ")));
@@ -710,14 +762,12 @@ void WidgetShowNPoints::StopAutoAddPoints( )
 //------------------------------------------------------------------------
        void WidgetShowNPoints::SetOutputBox()
        {
-//EED          renderer->GetRenderWindow()->Render();
                wxString strTmp;
-        wxString strTmp2;
         if (GetModelShowNPoints()->GetIdCurrentPoint()<0)
         {
-            strTmp2.Printf(_T(" -- / %d") , GetModelShowNPoints()->GetLstPointsSize() );
+            strTmp.Printf(_T("   -/%d") , GetModelShowNPoints()->GetLstPointsSize() );
         } else {
-            strTmp.Printf(_T(" %d / %d"), GetModelShowNPoints()->GetIdCurrentPoint()+1 , GetModelShowNPoints()->GetLstPointsSize() );
+            strTmp.Printf(_T("   %d/%d"), GetModelShowNPoints()->GetIdCurrentPoint()+1 , GetModelShowNPoints()->GetLstPointsSize() );
         }// if IdCurrent<0
                txtNrPoints->SetLabel( strTmp );
                //--BBTK
@@ -1655,7 +1705,7 @@ void WidgetShowNPoints::RefreshCollectionText()
     if ((mtype==4) && (txtNrCollections!=NULL))  // Just for Collection interface
     {
         wxString strTmp;
-        strTmp.Printf(_T("%d   /  %d "),  (int)mActualCollection+1, (int)lstModelShowNPoints.size() );
+        strTmp.Printf(_T("   %d/%d"),  (int)mActualCollection+1, (int)lstModelShowNPoints.size() );
         txtNrCollections->SetLabel( strTmp );
     } // if mtype 4
     SetOutputBox();