From: eduardo.davila@creatis.insa-lyon.fr Date: Mon, 14 Oct 2024 10:26:21 +0000 (+0200) Subject: #3391 clean onSegmentationAllSlices2 in wxContourMainFrame X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=commitdiff_plain;h=a1d8217075e7ebc6f037ba71641391a46ef5ed60;p=creaContours.git #3391 clean onSegmentationAllSlices2 in wxContourMainFrame --- diff --git a/bbtk/bbs/boxes/ContourReferenceGrid.bbg b/bbtk/bbs/boxes/ContourReferenceGrid.bbg index 2020d19..790d8ea 100644 --- a/bbtk/bbs/boxes/ContourReferenceGrid.bbg +++ b/bbtk/bbs/boxes/ContourReferenceGrid.bbg @@ -14,83 +14,87 @@ PACKAGENAME:creaContours COMPLEXOUTPUTS:1 COMPLEX_PORT boxChange -113.858704:-168.760855:-900.000000 +116.538660:-148.539367:-900.000000 FIN_COMPLEX_PORT -COMPLEXINPUTS:7 +COMPLEXINPUTS:8 COMPLEX_PORT boxExecute -11.820454:98.700585:-900.000000 +8.165968:169.597608:-900.000000 FIN_COMPLEX_PORT COMPLEX_PORT NameFileContour -117.444206:100.167803:-900.000000 +113.789720:171.064826:-900.000000 FIN_COMPLEX_PORT COMPLEX_PORT Image --4.717822:99.005581:-900.000000 +-8.372308:169.902604:-900.000000 FIN_COMPLEX_PORT COMPLEX_PORT RenderXY --78.148473:98.124722:-900.000000 +-81.802959:169.021745:-900.000000 FIN_COMPLEX_PORT COMPLEX_PORT RenderYZ --42.792598:98.481733:-900.000000 +-46.447084:169.378756:-900.000000 FIN_COMPLEX_PORT COMPLEX_PORT opacity --123.407648:97.080337:-900.000000 +-127.062134:167.977360:-900.000000 FIN_COMPLEX_PORT COMPLEX_PORT iaxis -222.332884:97.853088:-900.000000 +218.678398:168.750111:-900.000000 FIN_COMPLEX_PORT -BOXES:55 +COMPLEX_PORT +_direction +-160.923337:166.411266:-900.000000 +FIN_COMPLEX_PORT +BOXES:43 BOX std:VectorFilterDouble:Box05 ISEXEC:FALSE -162.824305:3.857849:-900.000000 -189.104305:1.357849:-900.000000 +128.715772:127.135834:-900.000000 +154.995772:124.635834:-900.000000 FIN_BOX BOX creaMaracasVisu:ReadCreaContourFile:Box26 ISEXEC:FALSE -88.818165:61.322861:-900.000000 -111.533165:58.822861:-900.000000 +62.262235:155.608593:-900.000000 +84.977235:153.108593:-900.000000 PORT FromDirection:"0" FIN_BOX BOX std:MixingVectors:Box31 ISEXEC:FALSE -37.887050:-76.675268:-900.000000 -60.647050:-79.175268:-900.000000 +116.074921:60.207674:-900.000000 +138.834921:57.707674:-900.000000 FIN_BOX BOX vtk:vtkImageDataPointerRelay:Box32 ISEXEC:FALSE --18.705355:8.266287:-900.000000 -4.504645:5.766287:-900.000000 +-20.410782:154.202084:-900.000000 +2.799218:151.702084:-900.000000 FIN_BOX BOX vtk:ImageVtkProperties:Box33 ISEXEC:FALSE --23.365929:-7.642690:-900.000000 --0.830929:-10.142690:-900.000000 +-22.635032:146.332975:-900.000000 +-0.100032:143.832975:-900.000000 FIN_BOX BOX std:GetVectorDoubleElement:Box37 ISEXEC:FALSE --20.873933:-31.890526:-900.000000 -2.251067:-34.390526:-900.000000 +-20.630301:132.317699:-900.000000 +2.494699:129.817699:-900.000000 PORT I:"2" FIN_BOX BOX std:CreateArithmeticSuiteVector:Box38 ISEXEC:FALSE -132.785051:-54.323268:-900.000000 -156.205051:-56.823268:-900.000000 +140.972993:60.487358:-900.000000 +164.392993:57.987358:-900.000000 PORT Delta:"0" PORT @@ -99,20 +103,20 @@ FIN_BOX BOX std:GetDoubleVectorSize:Box39 ISEXEC:FALSE -177.641776:-14.513259:-900.000000 -200.356776:-17.013259:-900.000000 +140.609654:112.662844:-900.000000 +163.324654:110.162844:-900.000000 FIN_BOX BOX std:MixingVectors:Box45 ISEXEC:FALSE -11.461406:-77.113693:-900.000000 -34.221406:-79.613693:-900.000000 +46.849078:66.633198:-900.000000 +69.609078:64.133198:-900.000000 FIN_BOX BOX std:CreateArithmeticSuiteVector:Box46 ISEXEC:FALSE -63.804506:-76.122838:-900.000000 -87.224506:-78.622838:-900.000000 +143.312552:74.234146:-900.000000 +166.732552:71.734146:-900.000000 PORT Delta:"0" PORT @@ -121,20 +125,20 @@ FIN_BOX BOX std:ConcatStrings:Box47 ISEXEC:FALSE --22.082122:-22.787523:-900.000000 -0.677878:-25.287523:-900.000000 +-19.645798:138.253481:-900.000000 +3.114202:135.753481:-900.000000 FIN_BOX BOX vtk:Transform:Box49 ISEXEC:FALSE -127.678604:-61.177993:-900.000000 -149.233604:-63.677993:-900.000000 +16.354091:63.427384:-900.000000 +37.909091:60.927384:-900.000000 FIN_BOX BOX creaMaracasVisu:DrawAxisTree3D:Box50 ISEXEC:FALSE -214.479593:-106.158303:-900.000000 -242.519593:-108.658303:-900.000000 +208.237772:-88.036886:-900.000000 +236.277772:-90.536886:-900.000000 PORT Colour:"1 1 0" PORT @@ -145,62 +149,62 @@ FIN_BOX BOX std:MixingVectors:Box51 ISEXEC:FALSE -235.533156:-67.005947:-900.000000 -258.293156:-69.505947:-900.000000 +205.304051:47.094117:-900.000000 +228.064051:44.594117:-900.000000 FIN_BOX BOX std:CreateArithmeticSuiteVector:Box59 ISEXEC:FALSE -196.047717:-67.392762:-900.000000 -219.467717:-69.892762:-900.000000 +192.446874:74.637069:-900.000000 +215.866874:72.137069:-900.000000 PORT Delta:"0" PORT -FirstValue:"1500" +FirstValue:"1000" FIN_BOX BOX std:Mul:Box62 ISEXEC:FALSE -198.487353:-56.080711:-900.000000 -219.462353:-58.580711:-900.000000 +191.423016:87.240470:-900.000000 +212.398016:84.740470:-900.000000 PORT In2:"2" FIN_BOX BOX std:ConcatStrings:Box58 ISEXEC:FALSE --133.602557:7.116336:-900.000000 --110.842557:4.616336:-900.000000 +-132.384395:155.244824:-900.000000 +-109.624395:152.744824:-900.000000 FIN_BOX BOX std:MagicBox:Box61 ISEXEC:FALSE -8.996148:90.081973:-900.000000 -30.596148:87.581973:-900.000000 +5.341662:160.978996:-900.000000 +26.941662:158.478996:-900.000000 FIN_BOX BOX std:ConcatStrings:Box63 ISEXEC:FALSE -112.571591:87.095893:-900.000000 -135.331591:84.595893:-900.000000 +108.917105:157.992916:-900.000000 +131.677105:155.492916:-900.000000 FIN_BOX BOX std:MagicBox:Box64 ISEXEC:FALSE --94.119022:9.645793:-900.000000 --72.519022:7.145793:-900.000000 +-94.229764:154.673505:-900.000000 +-72.629764:152.173505:-900.000000 FIN_BOX BOX std:MagicBox:Box65 ISEXEC:FALSE --51.683403:7.784355:-900.000000 --30.083403:5.284355:-900.000000 +-50.465241:155.912843:-900.000000 +-28.865241:153.412843:-900.000000 FIN_BOX BOX creaVtk:Actor:Box30 ISEXEC:FALSE -206.422628:-128.204390:-900.000000 -227.582628:-130.704390:-900.000000 +210.320746:-117.728198:-900.000000 +231.480746:-120.228198:-900.000000 PORT Active:"true" PORT @@ -213,8 +217,8 @@ FIN_BOX BOX creaVtk:Actor:Box35 ISEXEC:FALSE -4.812094:-118.884111:-900.000000 -25.972094:-121.384111:-900.000000 +58.854186:-112.682559:-900.000000 +80.014186:-115.182559:-900.000000 PORT Active:"true" PORT @@ -229,58 +233,56 @@ FIN_BOX BOX std:VectorFilterDouble:Box40 ISEXEC:FALSE -160.702584:-2.838499:-900.000000 -186.982584:-5.338499:-900.000000 +127.568580:119.708589:-900.000000 +153.848580:117.208589:-900.000000 PORT Type:"8" FIN_BOX BOX std:ConcatStrings:Box44 ISEXEC:FALSE -218.088465:3.322278:-900.000000 -240.848465:0.822278:-900.000000 +212.241288:158.028841:-900.000000 +235.001288:155.528841:-900.000000 FIN_BOX BOX std:MultipleInputs:Box48 ISEXEC:FALSE -111.927377:-151.792709:-900.000000 -133.897377:-154.292709:-900.000000 +116.312760:-139.367458:-900.000000 +138.282760:-141.867458:-900.000000 FIN_BOX BOX creaMaracasVisu:DrawAxisTree3D:Box54 ISEXEC:FALSE -15.832017:-102.295877:-900.000000 -43.872017:-104.795877:-900.000000 +63.155919:-89.341618:-900.000000 +91.195919:-91.841618:-900.000000 PORT Colour:"1 1 0" PORT LineWidth:"1" PORT -Opacity:"0" -PORT iAxis:"12" FIN_BOX BOX std:MathOperationVector:Box66 ISEXEC:FALSE -110.762501:3.086121:-900.000000 -135.282501:0.586121:-900.000000 +82.744777:134.160342:-900.000000 +107.264777:131.660342:-900.000000 PORT Type:"-17" FIN_BOX BOX std:GetVectorDoubleElement:Box68 ISEXEC:FALSE -92.017522:-4.331518:-900.000000 -115.142522:-6.831518:-900.000000 +82.028594:124.306380:-900.000000 +105.153594:121.806380:-900.000000 PORT I:"0" FIN_BOX BOX std:CreateArithmeticSuiteVector:Box71 ISEXEC:FALSE -239.951081:-56.826470:-900.000000 -263.371081:-59.326470:-900.000000 +228.324202:56.897298:-900.000000 +251.744202:54.397298:-900.000000 PORT Delta:"0" PORT @@ -289,8 +291,8 @@ FIN_BOX BOX std:CreateArithmeticSuiteVector:Box72 ISEXEC:FALSE -78.804045:-35.197052:-900.000000 -102.224045:-37.697052:-900.000000 +89.878244:86.820488:-900.000000 +113.298244:84.320488:-900.000000 PORT Delta:"0" PORT @@ -299,24 +301,24 @@ FIN_BOX BOX std:MathOperationVector:Box73 ISEXEC:FALSE -71.078020:3.323195:-900.000000 -95.598020:0.823195:-900.000000 +50.125635:134.641049:-900.000000 +74.645635:132.141049:-900.000000 PORT Type:"-16" FIN_BOX BOX std:GetVectorDoubleElement:Box74 ISEXEC:FALSE -35.180416:-2.730616:-900.000000 -58.305416:-5.230616:-900.000000 +36.398578:124.689120:-900.000000 +59.523578:122.189120:-900.000000 PORT I:"0" FIN_BOX BOX std:CreateArithmeticSuiteVector:Box76 ISEXEC:FALSE -40.874647:-52.259231:-900.000000 -64.294647:-54.759231:-900.000000 +39.263854:86.671631:-900.000000 +62.683854:84.171631:-900.000000 PORT Delta:"0" PORT @@ -325,8 +327,8 @@ FIN_BOX BOX std:CreateArithmeticSuiteVector:Box77 ISEXEC:FALSE -233.015109:-52.652581:-900.000000 -256.435109:-55.152581:-900.000000 +181.636107:60.405781:-900.000000 +205.056107:57.905781:-900.000000 PORT Delta:"0" PORT @@ -335,134 +337,62 @@ FIN_BOX BOX std:GetVectorDoubleElement:Box82 ISEXEC:FALSE -112.163064:-10.748020:-900.000000 -135.288064:-13.248020:-900.000000 +89.017988:119.351672:-900.000000 +112.142988:116.851672:-900.000000 PORT I:"1" FIN_BOX BOX std:GetVectorDoubleElement:Box83 ISEXEC:FALSE -48.433083:-8.836162:-900.000000 -71.558083:-11.336162:-900.000000 +52.331201:120.045368:-900.000000 +75.456201:117.545368:-900.000000 PORT I:"1" FIN_BOX BOX std:Mul:Box84 ISEXEC:FALSE -58.042408:-14.838112:-900.000000 -79.017408:-17.338112:-900.000000 +58.042408:114.629344:-900.000000 +79.017408:112.129344:-900.000000 PORT -In2:"1" +In2:"-1" FIN_BOX BOX std:Add:Box85 ISEXEC:FALSE -67.278053:-19.954724:-900.000000 -88.313053:-22.454724:-900.000000 +57.860957:107.599916:-900.000000 +78.895957:105.099916:-900.000000 FIN_BOX BOX std:Mul:Box86 ISEXEC:FALSE -112.311307:-16.612031:-900.000000 -133.286307:-19.112031:-900.000000 +96.404730:114.264868:-900.000000 +117.379730:111.764868:-900.000000 PORT -In2:"1" +In2:"-1" FIN_BOX BOX std:Add:Box87 ISEXEC:FALSE -121.546951:-23.127948:-900.000000 -142.581951:-25.627948:-900.000000 +97.099146:107.775127:-900.000000 +118.134146:105.275127:-900.000000 FIN_BOX BOX std:Mul:Box70 ISEXEC:FALSE -79.049276:-66.196832:-900.000000 -100.024276:-68.696832:-900.000000 +144.561071:85.872255:-900.000000 +165.536071:83.372255:-900.000000 PORT In2:"2" FIN_BOX BOX -wx:OutputText:Box75 -ISEXEC:FALSE --213.774135:-265.454597:-900.000000 --192.104135:-267.954597:-900.000000 -FIN_BOX -BOX -wx:OutputText:Box78 -ISEXEC:FALSE --203.514805:-260.928807:-900.000000 --181.844805:-263.428807:-900.000000 -FIN_BOX -BOX -wx:OutputText:Box79 -ISEXEC:FALSE --181.614748:-253.694423:-900.000000 --159.944748:-256.194423:-900.000000 -FIN_BOX -BOX -wx:LayoutLine:Box80 -ISEXEC:FALSE --200.871368:-274.217704:-900.000000 --167.551368:-276.717704:-900.000000 -FIN_BOX -BOX -wx:LayoutTab:Box81 -ISEXEC:FALSE --110.701482:-335.586507:-900.000000 --77.381482:-338.086507:-900.000000 -FIN_BOX -BOX -wx:OutputText:Box88 -ISEXEC:FALSE --111.823814:-256.771050:-900.000000 --90.153814:-259.271050:-900.000000 -FIN_BOX -BOX -wx:OutputText:Box89 -ISEXEC:FALSE --61.841067:-256.413933:-900.000000 --40.171067:-258.913933:-900.000000 -FIN_BOX -BOX -wx:OutputText:Box90 -ISEXEC:FALSE --87.510871:-256.490122:-900.000000 --65.840871:-258.990122:-900.000000 -FIN_BOX -BOX -wx:LayoutLine:Box91 +std:MagicBox:Box75 ISEXEC:FALSE --87.112139:-279.051583:-900.000000 --53.792139:-281.551583:-900.000000 +-161.124686:156.343813:-900.000000 +-139.524686:153.843813:-900.000000 FIN_BOX -BOX -wx:OutputText:Box92 -ISEXEC:FALSE --21.572850:-256.776864:-900.000000 -0.097150:-259.276864:-900.000000 -FIN_BOX -BOX -wx:OutputText:Box93 -ISEXEC:FALSE -2.417837:-256.832318:-900.000000 -24.087837:-259.332318:-900.000000 -FIN_BOX -BOX -wx:OutputText:Box94 -ISEXEC:FALSE -26.531768:-257.321080:-900.000000 -48.201768:-259.821080:-900.000000 -FIN_BOX -BOX -wx:LayoutLine:Box95 -ISEXEC:FALSE --10.888636:-280.020065:-900.000000 -22.431364:-282.520065:-900.000000 -FIN_BOX -CONNECTIONS:94 +CONNECTIONS:74 CONNECTION Box26:LstZ:Box05:In0 NumberOfControlPoints:0 @@ -488,6 +418,12 @@ CONNECTION Box38:ArithmeticSuiteVector:Box50:lstIndexs NumberOfControlPoints:0 CONNECTION +Box31:Out:Box50:lstPointY +NumberOfControlPoints:0 +CONNECTION +Box59:ArithmeticSuiteVector:Box50:lstPointX +NumberOfControlPoints:0 +CONNECTION Box39:VectorSize:Box62:In1 NumberOfControlPoints:0 CONNECTION @@ -542,6 +478,9 @@ CONNECTION Box61:BoxChange:Box48:BoxExecute NumberOfControlPoints:0 CONNECTION +Box58:Out:Box54:Opacity +NumberOfControlPoints:0 +CONNECTION Box65:Out:Box54:Renderer NumberOfControlPoints:0 CONNECTION @@ -554,6 +493,12 @@ CONNECTION Box45:Out:Box54:lstPointX NumberOfControlPoints:0 CONNECTION +Box31:Out:Box54:lstPointY +NumberOfControlPoints:0 +CONNECTION +Box46:ArithmeticSuiteVector:Box54:lstPointZ +NumberOfControlPoints:0 +CONNECTION Box54:OutAxis:Box35:In NumberOfControlPoints:0 CONNECTION @@ -581,6 +526,9 @@ CONNECTION Box66:Out:Box68:In NumberOfControlPoints:0 CONNECTION +Box51:Out:Box50:lstPointZ +NumberOfControlPoints:0 +CONNECTION Box39:VectorSize:Box71:Size NumberOfControlPoints:0 CONNECTION @@ -665,84 +613,6 @@ CONNECTION Box48:BoxChange:boxChange:boxChange NumberOfControlPoints:0 CONNECTION -Box75:Widget:Box80:Widget1 -NumberOfControlPoints:0 -CONNECTION -Box78:Widget:Box80:Widget2 -NumberOfControlPoints:0 -CONNECTION -Box79:Widget:Box80:Widget3 -NumberOfControlPoints:0 -CONNECTION -Box26:LstX:Box75:In -NumberOfControlPoints:0 -CONNECTION -Box26:LstY:Box78:In -NumberOfControlPoints:0 -CONNECTION -Box26:LstZ:Box79:In -NumberOfControlPoints:0 -CONNECTION -Box80:Widget:Box81:Widget1 -NumberOfControlPoints:0 -CONNECTION -Box91:Widget:Box81:Widget2 -NumberOfControlPoints:0 -CONNECTION -Box31:Out:Box89:In -NumberOfControlPoints:0 -CONNECTION -Box59:ArithmeticSuiteVector:Box50:lstPointX -NumberOfControlPoints:0 -CONNECTION -Box51:Out:Box50:lstPointY -NumberOfControlPoints:0 -CONNECTION -Box31:Out:Box50:lstPointZ -NumberOfControlPoints:0 -CONNECTION -Box88:Widget:Box91:Widget2 -NumberOfControlPoints:0 -CONNECTION -Box90:Widget:Box91:Widget4 -NumberOfControlPoints:0 -CONNECTION -Box89:Widget:Box91:Widget6 -NumberOfControlPoints:0 -CONNECTION -Box58:Out:Box54:Opacity -NumberOfControlPoints:0 -CONNECTION -Box51:Out:Box90:In -NumberOfControlPoints:0 -CONNECTION -Box59:ArithmeticSuiteVector:Box88:In -NumberOfControlPoints:0 -CONNECTION -Box92:Widget:Box95:Widget2 -NumberOfControlPoints:0 -CONNECTION -Box95:Widget:Box81:Widget4 -NumberOfControlPoints:0 -CONNECTION -Box45:Out:Box92:In -NumberOfControlPoints:0 -CONNECTION -Box31:Out:Box94:In -NumberOfControlPoints:0 -CONNECTION -Box46:ArithmeticSuiteVector:Box93:In -NumberOfControlPoints:0 -CONNECTION -Box46:ArithmeticSuiteVector:Box54:lstPointY -NumberOfControlPoints:0 -CONNECTION -Box93:Widget:Box95:Widget3 -NumberOfControlPoints:0 -CONNECTION -Box94:Widget:Box95:Widget4 -NumberOfControlPoints:0 -CONNECTION -Box31:Out:Box54:lstPointZ +_direction:_direction:Box75:In NumberOfControlPoints:0 APP_END diff --git a/bbtk/bbs/boxes/ContourReferenceGrid.bbs b/bbtk/bbs/boxes/ContourReferenceGrid.bbs index b3f7be7..4140731 100644 --- a/bbtk/bbs/boxes/ContourReferenceGrid.bbs +++ b/bbtk/bbs/boxes/ContourReferenceGrid.bbs @@ -9,7 +9,6 @@ include std include creaMaracasVisu include vtk include creaVtk -include wx define ContourReferenceGrid creaContours @@ -57,7 +56,7 @@ new std:MixingVectors Box51 new std:CreateArithmeticSuiteVector Box59 set Box59.Delta "0" - set Box59.FirstValue "1500" + set Box59.FirstValue "1000" new std:Mul Box62 set Box62.In2 "2" @@ -95,7 +94,6 @@ new std:MultipleInputs Box48 new creaMaracasVisu:DrawAxisTree3D Box54 set Box54.Colour "1 1 0" set Box54.LineWidth "1" - set Box54.Opacity "0" set Box54.iAxis "12" new std:MathOperationVector Box66 @@ -133,43 +131,19 @@ new std:GetVectorDoubleElement Box83 set Box83.I "1" new std:Mul Box84 - set Box84.In2 "1" + set Box84.In2 "-1" new std:Add Box85 new std:Mul Box86 - set Box86.In2 "1" + set Box86.In2 "-1" new std:Add Box87 new std:Mul Box70 set Box70.In2 "2" -new wx:OutputText Box75 - -new wx:OutputText Box78 - -new wx:OutputText Box79 - -new wx:LayoutLine Box80 - -new wx:LayoutTab Box81 - -new wx:OutputText Box88 - -new wx:OutputText Box89 - -new wx:OutputText Box90 - -new wx:LayoutLine Box91 - -new wx:OutputText Box92 - -new wx:OutputText Box93 - -new wx:OutputText Box94 - -new wx:LayoutLine Box95 +new std:MagicBox Box75 connect Box26.LstZ Box05.In0 @@ -180,6 +154,8 @@ connect Box39.VectorSize Box38.Size connect Box33.Spacing Box49.Scale connect Box49.Out Box50.Transform connect Box38.ArithmeticSuiteVector Box50.lstIndexs +connect Box31.Out Box50.lstPointY +connect Box59.ArithmeticSuiteVector Box50.lstPointX connect Box39.VectorSize Box62.In1 connect Box62.Out Box59.Size connect Box58.Out Box50.Opacity @@ -191,10 +167,13 @@ connect Box05.Out0 Box40.In0 connect Box30.BoxChange Box48.In4 connect Box35.BoxChange Box48.In1 connect Box61.BoxChange Box48.BoxExecute +connect Box58.Out Box54.Opacity connect Box65.Out Box54.Renderer connect Box49.Out Box54.Transform connect Box38.ArithmeticSuiteVector Box54.lstIndexs connect Box45.Out Box54.lstPointX +connect Box31.Out Box54.lstPointY +connect Box46.ArithmeticSuiteVector Box54.lstPointZ connect Box54.OutAxis Box35.In connect Box44.Out Box54.iAxis connect Box44.Out Box50.iAxis @@ -204,6 +183,7 @@ connect Box40.Out0 Box31.In2 connect Box26.LstX Box66.In0 connect Box26.LstY Box66.In1 connect Box66.Out Box68.In +connect Box51.Out Box50.lstPointZ connect Box39.VectorSize Box71.Size connect Box72.ArithmeticSuiteVector Box45.In2 connect Box68.Out Box72.FirstValue @@ -231,33 +211,6 @@ connect Box87.Out Box77.FirstValue connect Box82.Out Box86.In1 connect Box70.Out Box46.Size connect Box39.VectorSize Box70.In1 -connect Box75.Widget Box80.Widget1 -connect Box78.Widget Box80.Widget2 -connect Box79.Widget Box80.Widget3 -connect Box26.LstX Box75.In -connect Box26.LstY Box78.In -connect Box26.LstZ Box79.In -connect Box80.Widget Box81.Widget1 -connect Box91.Widget Box81.Widget2 -connect Box31.Out Box89.In -connect Box59.ArithmeticSuiteVector Box50.lstPointX -connect Box51.Out Box50.lstPointY -connect Box31.Out Box50.lstPointZ -connect Box88.Widget Box91.Widget2 -connect Box90.Widget Box91.Widget4 -connect Box89.Widget Box91.Widget6 -connect Box58.Out Box54.Opacity -connect Box51.Out Box90.In -connect Box59.ArithmeticSuiteVector Box88.In -connect Box92.Widget Box95.Widget2 -connect Box95.Widget Box81.Widget4 -connect Box45.Out Box92.In -connect Box31.Out Box94.In -connect Box46.ArithmeticSuiteVector Box93.In -connect Box46.ArithmeticSuiteVector Box54.lstPointY -connect Box93.Widget Box95.Widget3 -connect Box94.Widget Box95.Widget4 -connect Box31.Out Box54.lstPointZ # Complex input ports input boxExecute Box61.BoxExecute " " @@ -267,6 +220,7 @@ input RenderXY Box64.In " " input RenderYZ Box65.In " " input opacity Box58.In1 " " input iaxis Box44.In1 " " +input _direction Box75.In " " # Complex output ports output boxChange Box48.BoxChange " " diff --git a/bbtk/bbs/boxes/ContourReferenceStep.bbg b/bbtk/bbs/boxes/ContourReferenceStep.bbg index de1cf1e..8cc6a8f 100644 --- a/bbtk/bbs/boxes/ContourReferenceStep.bbg +++ b/bbtk/bbs/boxes/ContourReferenceStep.bbg @@ -77,10 +77,10 @@ BOXES:82 BOX creaContours:SetViewerPosition:Box83 ISEXEC:FALSE --306.397185:-49.360769:-900.000000 --284.062185:-51.860769:-900.000000 +-295.945351:-75.627877:-900.000000 +-273.610351:-78.127877:-900.000000 PORT -Direction:"1" +Direction:"0" FIN_BOX BOX wx:LayoutLine:Box84 @@ -273,8 +273,8 @@ FIN_BOX BOX std:CreateArithmeticSuiteVector:Box284 ISEXEC:FALSE -88.707994:56.677515:-900.000000 -112.237994:54.177515:-900.000000 +91.819752:56.128381:-900.000000 +115.349752:53.628381:-900.000000 PORT Delta:"0" PORT @@ -457,8 +457,8 @@ FIN_BOX BOX wx:ComboBox:Box330 ISEXEC:FALSE --66.236501:46.113613:-900.000000 --39.956501:43.613613:-900.000000 +-66.679469:48.992905:-900.000000 +-40.399469:46.492905:-900.000000 PORT In:"Direct Grid Contour Nothing" PORT @@ -553,16 +553,16 @@ FIN_BOX BOX creaMaracasVisu:wxVtkBaseView_Info:Box449 ISEXEC:FALSE -39.160251:87.314730:-900.000000 -68.200251:84.814730:-900.000000 +40.622045:86.583833:-900.000000 +69.662045:84.083833:-900.000000 PORT InteractionType:"8" FIN_BOX BOX std:MagicBox:Box450 ISEXEC:FALSE --107.427833:144.084412:-900.000000 --85.717833:141.584412:-900.000000 +-104.504244:140.917191:-900.000000 +-82.794244:138.417191:-900.000000 FIN_BOX BOX std:MagicBox:Box451 @@ -585,8 +585,8 @@ FIN_BOX BOX std:MagicBox:Box454 ISEXEC:FALSE -2.380392:110.379977:-900.000000 -24.090392:107.879977:-900.000000 +-0.055932:148.142996:-900.000000 +21.654068:145.642996:-900.000000 FIN_BOX BOX std:MagicBox:Box455 @@ -641,22 +641,22 @@ FIN_BOX BOX std:MagicBox:Box75 ISEXEC:FALSE --168.593455:133.868150:-900.000000 --146.993455:131.368150:-900.000000 +-169.665437:141.908019:-900.000000 +-148.065437:139.408019:-900.000000 FIN_BOX BOX std:VectorFilterDouble:Box76 ISEXEC:FALSE --102.104675:153.543465:-900.000000 --75.824675:151.043465:-900.000000 +-101.417054:152.443272:-900.000000 +-75.137054:149.943272:-900.000000 PORT Type:"15" FIN_BOX BOX std:MagicBox:Box77 ISEXEC:FALSE --94.889628:165.433252:-900.000000 --73.289628:162.933252:-900.000000 +-101.467702:164.702355:-900.000000 +-79.867702:162.202355:-900.000000 FIN_BOX BOX std:VectorFilterDouble:Box78 @@ -669,16 +669,16 @@ FIN_BOX BOX std:VectorFilterDouble:Box79 ISEXEC:FALSE --308.014491:-32.411782:-900.000000 --281.734491:-34.911782:-900.000000 +-304.692231:-29.311006:-900.000000 +-278.412231:-31.811006:-900.000000 PORT Type:"15" FIN_BOX BOX std:VectorFilterDouble:Box80 ISEXEC:FALSE --261.234862:-37.043013:-900.000000 --234.954862:-39.543013:-900.000000 +-258.798538:-37.530278:-900.000000 +-232.518538:-40.030278:-900.000000 PORT Type:"15" FIN_BOX @@ -1078,9 +1078,6 @@ CONNECTION Box75:Out:Box79:k1 NumberOfControlPoints:0 CONNECTION -Box75:Out:Box83:Direction -NumberOfControlPoints:0 -CONNECTION Box162:Out:Box80:In0 NumberOfControlPoints:0 CONNECTION @@ -1110,4 +1107,7 @@ NumberOfControlPoints:0 CONNECTION Box317:Out:_step:_step NumberOfControlPoints:0 +CONNECTION +Box75:Out:Box83:Direction +NumberOfControlPoints:0 APP_END diff --git a/bbtk/bbs/boxes/ContourReferenceStep.bbs b/bbtk/bbs/boxes/ContourReferenceStep.bbs index 29b57dd..efbb6b6 100644 --- a/bbtk/bbs/boxes/ContourReferenceStep.bbs +++ b/bbtk/bbs/boxes/ContourReferenceStep.bbs @@ -19,7 +19,7 @@ description "Description ??" category "" new creaContours:SetViewerPosition Box83 - set Box83.Direction "1" + set Box83.Direction "0" new wx:LayoutLine Box84 set Box84.WinTitle "Config" @@ -361,7 +361,6 @@ connect Box78.Out0 Box155.Point connect Box318.Out Box79.In0 connect Box79.Out0 Box83.Position connect Box75.Out Box79.k1 -connect Box75.Out Box83.Direction connect Box162.Out Box80.In0 connect Box80.Out0 Box161.Point connect Box75.Out Box80.k1 @@ -371,6 +370,7 @@ connect Box96.Out0 Box82.In connect Box96.Out0 Box97.In1 connect Box450.Out Box97.In0 connect Box97.Out Box436.In +connect Box75.Out Box83.Direction # Complex input ports input _wxvtkbaseview2 Box452.In " " diff --git a/bbtk/src/bbcreaContoursSetViewerPosition.cxx b/bbtk/src/bbcreaContoursSetViewerPosition.cxx index 5f0f233..ac9b9b9 100644 --- a/bbtk/src/bbcreaContoursSetViewerPosition.cxx +++ b/bbtk/src/bbcreaContoursSetViewerPosition.cxx @@ -29,7 +29,6 @@ void SetViewerPosition::Process() // bbSetOutputOut( bbGetInputIn() ); // std::cout << "Output value = " <onDeleteAllContours(); - wxContourMainFrame::getInstance()->onSegmentationAllSlices2(step ,isovalue,sampling,method,min,max, bbGetInputImage() ); // step,isovalue,sampling,method + wxContourMainFrame::getInstance()->onSegmentationAllSlices2(step ,isovalue ,sampling,method,x,y,minZ,maxZ, bbGetInputImage() ); + } else { printf("BBTK warnning!! wxContourMainFrame_tool box. In Type=1 the Param1 es not complite \n"); }// size @@ -64,26 +70,22 @@ void wxContourMainFrame_tool::Process() double isovalue = param1[0]; int sampling = param1[1]; int method = param1[2]; - - +// int x = param1[3]; +// int y = param1[4]; + int x = 0; + int y = 0; std::vector tempVector; wxContourMainFrame::getInstance()->getInstantVector( tempVector ); int step = 1; - int min = tempVector[1] ; - int max = tempVector[1] ; - + int minZ = tempVector[1] ; + int maxZ = tempVector[1] ; wxContourMainFrame::getInstance()->onDeleteContoursActSlice(); - wxContourMainFrame::getInstance()->onSegmentationAllSlices2(step ,isovalue,sampling,method,min,max, bbGetInputImage() ); // step,isovalue,sampling,method + wxContourMainFrame::getInstance()->onSegmentationAllSlices2(step ,isovalue,sampling,method,x,y,minZ,maxZ, bbGetInputImage() ); // step,isovalue,sampling,method } else { printf("BBTK warnning!! wxContourMainFrame_tool box. In Type=1 the Param1 es not complite \n"); }// size } // if Image } // Type==1 - - - - - } } diff --git a/bbtk/src/bbcreaContourswxContourMainFrame_tool.h b/bbtk/src/bbcreaContourswxContourMainFrame_tool.h index 927fced..edb6748 100644 --- a/bbtk/src/bbcreaContourswxContourMainFrame_tool.h +++ b/bbtk/src/bbcreaContourswxContourMainFrame_tool.h @@ -39,7 +39,7 @@ BBTK_BEGIN_DESCRIBE_BLACK_BOX(wxContourMainFrame_tool,bbtk::AtomicBlackBox); BBTK_DESCRIPTION("No Description."); BBTK_CATEGORY("empty"); BBTK_INPUT(wxContourMainFrame_tool,Type,"(default 0) Type 0:nothing 1:Isovalue segmentation of Image 2:Isovalue segmentation actual slice",int,""); - BBTK_INPUT(wxContourMainFrame_tool,Param1,"List of parameters Type1:[step,isovalue,sampling,method,min,max] Replace all old contours Type2:[isovalue,sampling,method,iSlice] Replace acutal slice ", std::vector,""); + BBTK_INPUT(wxContourMainFrame_tool,Param1,"List of parameters Type1:[step,isovalue,sampling,method,x,y,min,max] Replace all old contours Type2:[isovalue,sampling,method,iSlice,x,y] Replace acutal slice ", std::vector,""); BBTK_INPUT(wxContourMainFrame_tool,Image,"Image", vtkImageData*,""); // BBTK_OUTPUT(wxContourMainFrame_tool,Out,"First output",double,""); BBTK_END_DESCRIBE_BLACK_BOX(wxContourMainFrame_tool); diff --git a/lib/Interface_ManagerContour_NDimensions/wxContourMainFrame.cxx b/lib/Interface_ManagerContour_NDimensions/wxContourMainFrame.cxx index 55bd7ec..f963880 100644 --- a/lib/Interface_ManagerContour_NDimensions/wxContourMainFrame.cxx +++ b/lib/Interface_ManagerContour_NDimensions/wxContourMainFrame.cxx @@ -1961,7 +1961,7 @@ void wxContourMainFrame::GetImageDataRange(double *range) } // Used from wxContourMainFrame_tool bbtk box -void wxContourMainFrame::onSegmentationAllSlices2(int step ,double isovalue,int sampling,int method,int minZ, int maxZ,vtkImageData* imagedata) +void wxContourMainFrame::onSegmentationAllSlices2(int step ,double isovalue,int sampling,int method,int x, int y,int minZ, int maxZ,vtkImageData* imagedata) { //JCP 20-10-08 Undo redo implementation saveState(); @@ -1973,6 +1973,9 @@ void wxContourMainFrame::onSegmentationAllSlices2(int step ,double isovalue,int // double porcent; // wxString tmpString; // double totalZ = maxZ-minZ+1; + + x = _theViewPanel->GetX(); + y = _theViewPanel->GetY(); int ext[6]; imagedata->GetExtent(ext); int sizeZ = ext[5]-ext[4]+1; @@ -1987,7 +1990,7 @@ void wxContourMainFrame::onSegmentationAllSlices2(int step ,double isovalue,int // tmpString.Printf(_T(" %d %c %d/%d %d"), (int)porcent , 37 , z-minZ+1, (int)totalZ,z ); // interfMainPanel::getInstance()->setLabelSegmentationPanelVTK(tmpString); //_staticTextSegmentation->SetLabel(tmpString); - SegmentationOneSlice( 100,100,z,isovalue, sampling,method , imagedata ); + SegmentationOneSlice( x,y,z,isovalue, sampling,method , imagedata ); } // interfMainPanel::getInstance()->setLabelSegmentationPanelVTK(_T(" ")); RefreshInterface(); diff --git a/lib/Interface_ManagerContour_NDimensions/wxContourMainFrame.h b/lib/Interface_ManagerContour_NDimensions/wxContourMainFrame.h index a6c6105..8ae1572 100644 --- a/lib/Interface_ManagerContour_NDimensions/wxContourMainFrame.h +++ b/lib/Interface_ManagerContour_NDimensions/wxContourMainFrame.h @@ -221,7 +221,7 @@ class wxContourMainFrame : public wxPanel { int GetImageDataSizeZ(); void GetImageDataRange(double *range); void onSegmentationAllSlices(int minZ,int maxZ,double isovalue,int sampling,int method); - void onSegmentationAllSlices2(int step ,double isovalue,int samplsing,int method,int minZ, int maxZ,vtkImageData* imagedata); + void onSegmentationAllSlices2(int step ,double isovalue,int samplsing,int method,int x, int y,int minZ, int maxZ,vtkImageData* imagedata); //AD void referenceLine();