From: Eduardo DAVILA <eduardo.davila@creatis.insa-lyon.fr>
Date: Mon, 19 Apr 2021 08:47:26 +0000 (+0200)
Subject: #3459 SliceImage-3DVisu box
X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=commitdiff_plain;h=098adaaafacebdcb0fc771357b71ce3e247e49aa;p=creaMaracasVisu.git

#3459 SliceImage-3DVisu box
---

diff --git a/bbtk/bbs/boxes/SliceImage-3DVisu.bbg b/bbtk/bbs/boxes/SliceImage-3DVisu.bbg
index fc085d5..f71ce6e 100644
--- a/bbtk/bbs/boxes/SliceImage-3DVisu.bbg
+++ b/bbtk/bbs/boxes/SliceImage-3DVisu.bbg
@@ -44,7 +44,7 @@ COMPLEX_PORT
 Render
 -100.149261:284.086627:-900.000000
 FIN_COMPLEX_PORT
-BOXES:44
+BOXES:43
 BOX
 creaMaracasVisu:SliceImage:Box00
 ISEXEC:FALSE
@@ -63,13 +63,13 @@ BOX
 vtk:Transform:Box17
 ISEXEC:FALSE
 -320.706867:-77.874112:-900.000000
--285.131867:-87.874112:-900.000000
+-221.593691:-87.874112:-900.000000
 FIN_BOX
 BOX
 std:ConcatStrings:Box18
 ISEXEC:FALSE
 -272.546519:-70.682423:-900.000000
--232.821519:-80.682423:-900.000000
+-195.023732:-80.682423:-900.000000
 PORT
 In1:"0  "
 PORT
@@ -103,6 +103,8 @@ ISEXEC:FALSE
 PORT
 Colour:"0 0 0"
 PORT
+iAxis:"0"
+PORT
 lstIndexs:"5"
 PORT
 lstPointX:"0   50  50      0      0"
@@ -115,7 +117,7 @@ BOX
 vtk:Transform:Box27
 ISEXEC:FALSE
 -316.662998:-136.217224:-900.000000
--281.087998:-146.217224:-900.000000
+-220.662861:-146.217224:-900.000000
 FIN_BOX
 BOX
 std:CreateArithmeticSuiteVector:Box33
@@ -149,7 +151,7 @@ BOX
 std:CreateArithmeticSuiteVector:Box36
 ISEXEC:FALSE
 -461.446157:-46.434918:-900.000000
--407.471157:-56.434918:-900.000000
+-260.565447:-56.434918:-900.000000
 PORT
 Delta:"0"
 PORT
@@ -159,7 +161,7 @@ BOX
 std:MathOperationVector:Box37
 ISEXEC:FALSE
 -462.838158:-67.517853:-900.000000
--415.313158:-77.517853:-900.000000
+-236.158155:-77.517853:-900.000000
 PORT
 In1:"0 0 1 1 0 "
 PORT
@@ -183,7 +185,7 @@ BOX
 std:StringSelect:Box41
 ISEXEC:FALSE
 -369.319073:-76.024573:-900.000000
--327.159073:-86.024573:-900.000000
+-214.516358:-86.024573:-900.000000
 PORT
 In0:"0 1 0 0"
 PORT
@@ -195,7 +197,7 @@ BOX
 std:StringSelect:Box42
 ISEXEC:FALSE
 -362.110000:-136.869133:-900.000000
--319.950000:-146.869133:-900.000000
+-212.887406:-146.869133:-900.000000
 PORT
 In0:"0 1 0 0"
 PORT
@@ -207,7 +209,7 @@ BOX
 std:GetVectorDoubleElement:Box44
 ISEXEC:FALSE
 -459.560548:-23.370210:-900.000000
--408.510548:-33.370210:-900.000000
+-260.100032:-33.370210:-900.000000
 PORT
 I:"1"
 FIN_BOX
@@ -239,13 +241,13 @@ BOX
 vtk:Transform:Box52
 ISEXEC:FALSE
 -312.196510:-56.034435:-900.000000
--276.621510:-66.034435:-900.000000
+-219.732031:-66.034435:-900.000000
 FIN_BOX
 BOX
 std:StringSelect:Box53
 ISEXEC:FALSE
 -357.946944:-52.565356:-900.000000
--315.786944:-62.565356:-900.000000
+-211.723868:-62.565356:-900.000000
 PORT
 In0:"0 1 0 0"
 PORT
@@ -291,7 +293,7 @@ BOX
 std:ConcatStrings:Box62
 ISEXEC:FALSE
 -297.110093:125.771424:-900.000000
--257.385093:115.771424:-900.000000
+-200.841419:115.771424:-900.000000
 PORT
 In1:"1 1 0"
 FIN_BOX
@@ -299,7 +301,7 @@ BOX
 std:GetVectorDoubleElement:Box64
 ISEXEC:FALSE
 -387.763181:205.752953:-900.000000
--336.713181:195.752953:-900.000000
+-243.345093:195.752953:-900.000000
 PORT
 I:"0"
 FIN_BOX
@@ -307,7 +309,7 @@ BOX
 std:ConcatStrings:Box65
 ISEXEC:FALSE
 -366.909956:245.293365:-900.000000
--327.184956:235.293365:-900.000000
+-216.898236:235.293365:-900.000000
 FIN_BOX
 BOX
 std:Div:Box66
@@ -321,7 +323,7 @@ BOX
 std:Add:Box67
 ISEXEC:FALSE
 -389.417275:153.273064:-900.000000
--358.967275:143.273064:-900.000000
+-246.890508:143.273064:-900.000000
 FIN_BOX
 BOX
 std:GetVectorDoubleElement:Box68
@@ -335,7 +337,7 @@ BOX
 std:Mul:Box69
 ISEXEC:FALSE
 -406.100940:175.438942:-900.000000
--376.300940:165.438942:-900.000000
+-250.846535:165.438942:-900.000000
 PORT
 In2:"-1"
 FIN_BOX
@@ -343,13 +345,13 @@ BOX
 std:Add:Box70
 ISEXEC:FALSE
 -345.592205:152.557386:-900.000000
--315.142205:142.557386:-900.000000
+-236.651379:142.557386:-900.000000
 FIN_BOX
 BOX
 std:MathOperation:Box72
 ISEXEC:FALSE
 -257.408453:-30.946538:-900.000000
--216.358453:-40.946538:-900.000000
+-213.093120:-40.946538:-900.000000
 PORT
 In1:"1"
 PORT
@@ -359,7 +361,7 @@ BOX
 std:MathOperation:Box73
 ISEXEC:FALSE
 -263.661305:-53.857110:-900.000000
--222.611305:-63.857110:-900.000000
+-214.489365:-63.857110:-900.000000
 PORT
 Type:"2"
 FIN_BOX
@@ -382,16 +384,10 @@ ISEXEC:FALSE
 -210.843099:-8.788741:-900.000000
 FIN_BOX
 BOX
-wx:OutputText:Box76
-ISEXEC:FALSE
--382.573203:100.888434:-900.000000
--345.798203:90.888434:-900.000000
-FIN_BOX
-BOX
 vtk:Transform:Box79
 ISEXEC:FALSE
 -313.408336:-36.360191:-900.000000
--277.833336:-46.360191:-900.000000
+-219.964739:-46.360191:-900.000000
 PORT
 Scale:"1 1 1"
 FIN_BOX
@@ -419,13 +415,13 @@ BOX
 std:MathOperationVector:Box82
 ISEXEC:FALSE
 -450.471349:8.131320:-900.000000
--402.946349:-1.868680:-900.000000
+-233.365665:-1.868680:-900.000000
 PORT
 In1:"-1    -1   -1"
 PORT
 Type:"0"
 FIN_BOX
-CONNECTIONS:67
+CONNECTIONS:65
 CONNECTION
 Box22:LookupTable:Box04:LookupTable
 NumberOfControlPoints:0
@@ -592,12 +588,6 @@ CONNECTION
 Box74:Out:Box75:I
 NumberOfControlPoints:0
 CONNECTION
-Box57:BoxChange:Box76:BoxExecute
-NumberOfControlPoints:0
-CONNECTION
-Box57:Out:Box76:In
-NumberOfControlPoints:0
-CONNECTION
 Box79:Out:Box52:In
 NumberOfControlPoints:0
 CONNECTION
diff --git a/bbtk/bbs/boxes/SliceImage-3DVisu.bbs b/bbtk/bbs/boxes/SliceImage-3DVisu.bbs
index c9d55bb..b4a518d 100644
--- a/bbtk/bbs/boxes/SliceImage-3DVisu.bbs
+++ b/bbtk/bbs/boxes/SliceImage-3DVisu.bbs
@@ -9,7 +9,6 @@ include creaMaracasVisu
 include vtk
 include std
 include creaVtk
-include wx
 
 define SliceImage-3DVisu creaMaracasVisu
 
@@ -38,6 +37,7 @@ new vtk:Transform Box32
 
 new creaMaracasVisu:DrawAxisTree3D Box26
   set Box26.Colour "0 0 0"
+  set Box26.iAxis "0"
   set Box26.lstIndexs "5"
   set Box26.lstPointX "0   50  50      0      0"
   set Box26.lstPointY "0     0   50    50      0"
@@ -147,8 +147,6 @@ new std:StringSelect Box74
 
 new std:GetVectorDoubleElement Box75
 
-new wx:OutputText Box76
-
 new vtk:Transform Box79
   set Box79.Scale "1 1 1"
 
@@ -212,8 +210,6 @@ connect Box73.Out Box18.In3
 connect Box40.Out Box74.In
 connect Box20.Spacing Box75.In
 connect Box74.Out Box75.I
-connect Box57.BoxChange Box76.BoxExecute
-connect Box57.Out Box76.In
 connect Box79.Out Box52.In
 connect Box00.Out Box80.In
 connect Box80.Out Box04.In
diff --git a/bbtk/src/bbmaracasvisuDrawAxisTree3D.cxx b/bbtk/src/bbmaracasvisuDrawAxisTree3D.cxx
index 45ec0b7..7d1c262 100644
--- a/bbtk/src/bbmaracasvisuDrawAxisTree3D.cxx
+++ b/bbtk/src/bbmaracasvisuDrawAxisTree3D.cxx
@@ -225,27 +225,25 @@ void DrawAxisTree3D::Process()
             numPoints = lstIndexs[iAxis];
             DrawOneAxis(iGeneral,numPoints,iAxis);
             iGeneral = iGeneral+numPoints;
-
     //		if ((iAxis % 1)==0)
     //		{
     //			printf("EED  DrawAxisTree3D::Process  %d/%d\n", iAxis,sizeLstAxis );
     //		}
-
         } // for iAxis
 
-        if ( bbGetInputiAxis() < (int)(vecVtkActors.size()-1) )
+        if ( bbGetInputiAxis() < (int)(vecVtkActors.size() ) )
         {
             bbSetOutputOutAxis( vecVtkActors[ bbGetInputiAxis() ] );
         } else 	{
-            printf("DrawAxisTree3D .ERROR. missing index vector...\n");
+            printf("DrawAxisTree3D .ERROR.  iAxis for exist in actors vector ...\n");
         } // if 
 
  //   } else {// if oldLstSize
 
         for (iActor=0 ; iActor<sizeActors; iActor++)
         {
-            vecVtkActors[iActor]->GetProperty()->SetOpacity( bbGetInputOpacity() );
-   	    vecVtkActors[iActor]->GetProperty()->SetLineWidth( bbGetInputLineWidth() );
+			vecVtkActors[iActor]->GetProperty()->SetOpacity( bbGetInputOpacity() );
+			vecVtkActors[iActor]->GetProperty()->SetLineWidth( bbGetInputLineWidth() );
         }
 //    } // if oldLstSize
 
diff --git a/bbtk/src/bbmaracasvisuDrawAxisTree3D.h b/bbtk/src/bbmaracasvisuDrawAxisTree3D.h
index fb3a67a..2ddfe43 100644
--- a/bbtk/src/bbmaracasvisuDrawAxisTree3D.h
+++ b/bbtk/src/bbmaracasvisuDrawAxisTree3D.h
@@ -65,9 +65,9 @@ class /*BBTK_EXPORT*/ DrawAxisTree3D
 private:
 
     int oldLstSize;
-	std::vector<vtkPolyData*>	vecVtkPolyData;
+	std::vector<vtkPolyData*>		vecVtkPolyData;
 	std::vector<vtkPolyDataMapper*>	vecVtkPolyDataMaper;
-	std::vector<vtkActor*>		vecVtkActors;
+	std::vector<vtkActor*>			vecVtkActors;
 
 	void DrawOneAxis(int iGeneral,int numPoints, int iAxis);
 };