#3253 creaMaracasVisu Bug New Normal - manual paint refresh

diff --git a/bbtk/bbs/boxes/ManualPaint2.bbg b/bbtk/bbs/boxes/ManualPaint2.bbg
index 503acadbe98e573dfaa53defb7533c159721148b..94d6d33f574b194c10cbbae84472eeed324a8971 100644 (file)
--- a/bbtk/bbs/boxes/ManualPaint2.bbg
+++ b/bbtk/bbs/boxes/ManualPaint2.bbg
@@ -1,6 +1,6 @@
 # ----------------------------------
 # - BBTKGEditor v 1.4 BBG BlackBox Diagram file
-# - /tmpEED/creaTools/creatools_source/creaMaracasVisu/bbtk/bbs/boxes/ManualPaint2.bbg
+# - /home/davila/Creatis/C8/creatools_source/creaMaracasVisu/bbtk/bbs/boxes/ManualPaint2.bbg
 # ----------------------------------
 
 APP_START
@@ -76,12 +76,12 @@ COMPLEX_PORT
 colorBarPosition
 -192.926981:179.217332:-900.000000
 FIN_COMPLEX_PORT
-BOXES:17
+BOXES:24
 BOX
 creaMaracasVisu:ManualPaint_Model:Box00
 ISEXEC:FALSE
--75.289692:-71.460987:-900.000000
--14.649692:-81.460987:-900.000000
+-95.174180:-58.098371:-900.000000
+-34.534180:-68.098371:-900.000000
 PORT
 2D3D:"1"
 PORT
@@ -119,13 +119,13 @@ BOX
 std:StringSelect:Box02
 ISEXEC:FALSE
 -37.673227:82.948986:-900.000000
-7.901773:72.948986:-900.000000
+4.486773:72.948986:-900.000000
 FIN_BOX
 BOX
 creaMaracasVisu:ColorLayerImageView:Box03
 ISEXEC:FALSE
--110.108419:-104.278922:-900.000000
--38.933419:-114.278922:-900.000000
+64.897021:-66.295426:-900.000000
+134.777021:-76.295426:-900.000000
 PORT
 TypeControlsInterface:"2"
 PORT
@@ -135,7 +135,7 @@ BOX
 std:TransposeVectorVectorString:Box04
 ISEXEC:FALSE
 -31.305556:125.161505:-900.000000
-39.869444:115.161505:-900.000000
+22.919444:115.161505:-900.000000
 PORT
 In0:"Desactivate Big-Blue Small-Blue Big-Clean Small-Clean"
 PORT
@@ -153,7 +153,7 @@ BOX
 std:GetVectorStringElement:Box05
 ISEXEC:FALSE
 -86.200317:53.438683:-900.000000
--15.025317:43.438683:-900.000000
+-36.800317:43.438683:-900.000000
 PORT
 I:"1"
 FIN_BOX
@@ -167,7 +167,7 @@ BOX
 std:GetVectorStringElement:Box11
 ISEXEC:FALSE
 -71.696483:40.964713:-900.000000
--0.521483:30.964713:-900.000000
+-22.296483:30.964713:-900.000000
 PORT
 I:"2"
 FIN_BOX
@@ -175,7 +175,7 @@ BOX
 std:GetVectorStringElement:Box12
 ISEXEC:FALSE
 -58.354926:28.065688:-900.000000
-12.820074:18.065688:-900.000000
+-8.954926:18.065688:-900.000000
 PORT
 I:"3"
 FIN_BOX
@@ -183,7 +183,7 @@ BOX
 std:ConcatStrings:Box13
 ISEXEC:FALSE
 -37.058068:-18.986769:-900.000000
-8.516932:-28.986769:-900.000000
+2.666932:-28.986769:-900.000000
 PORT
 In2:" "
 FIN_BOX
@@ -191,7 +191,7 @@ BOX
 std:GetVectorStringElement:Box14
 ISEXEC:FALSE
 -22.770985:-0.972910:-900.000000
-48.404015:-10.972910:-900.000000
+26.629015:-10.972910:-900.000000
 PORT
 I:"5"
 FIN_BOX
@@ -199,7 +199,7 @@ BOX
 std:GetVectorStringElement:Box15
 ISEXEC:FALSE
 -40.934702:12.586010:-900.000000
-30.240298:2.586010:-900.000000
+8.465298:2.586010:-900.000000
 PORT
 I:"4"
 FIN_BOX
@@ -207,7 +207,7 @@ BOX
 std:TransposeVectorVectorString:Box17
 ISEXEC:FALSE
 -117.618980:121.580114:-900.000000
--46.443980:111.580114:-900.000000
+-63.393980:111.580114:-900.000000
 PORT
 In0:"Desactivate Big-Blue Small-Blue Big-Clean Small-Clean"
 FIN_BOX
@@ -226,8 +226,8 @@ FIN_BOX
 BOX
 wx:LayoutLine:Box19
 ISEXEC:FALSE
--172.905988:-105.174791:-900.000000
--115.345988:-115.174791:-900.000000
+-182.190843:-97.578092:-900.000000
+-124.630843:-107.578092:-900.000000
 PORT
 Orientation:"H"
 FIN_BOX
@@ -235,17 +235,65 @@ BOX
 std:MagicBox:Box20
 ISEXEC:FALSE
 -82.351641:163.241009:-900.000000
--36.776641:153.241009:-900.000000
+-46.276641:153.241009:-900.000000
 FIN_BOX
 BOX
 std:GetVectorStringElement:Box21
 ISEXEC:FALSE
 -1.581707:-33.301126:-900.000000
-69.593293:-43.301126:-900.000000
+47.818293:-43.301126:-900.000000
 PORT
 I:"6"
 FIN_BOX
-CONNECTIONS:59
+BOX
+vtk:vtkImageDataPointerRelay:Box22
+ISEXEC:FALSE
+174.217065:39.039232:-900.000000
+226.392065:29.039232:-900.000000
+FIN_BOX
+BOX
+vtk:UpdateRender:Box23
+ISEXEC:FALSE
+39.953010:-129.847284:-900.000000
+80.278010:-139.847284:-900.000000
+PORT
+Active:"true"
+FIN_BOX
+BOX
+std:MagicBox:Box24
+ISEXEC:FALSE
+70.058448:54.161651:-900.000000
+106.133448:44.161651:-900.000000
+FIN_BOX
+BOX
+std:MagicBox:Box25
+ISEXEC:FALSE
+105.814564:70.785341:-900.000000
+141.889564:60.785341:-900.000000
+FIN_BOX
+BOX
+std:MagicBox:Box26
+ISEXEC:FALSE
+130.034953:54.490000:-900.000000
+166.109953:44.490000:-900.000000
+FIN_BOX
+BOX
+vtk:UpdateRender:Box27
+ISEXEC:FALSE
+90.902525:-130.949226:-900.000000
+131.227525:-140.949226:-900.000000
+PORT
+Active:"true"
+FIN_BOX
+BOX
+vtk:UpdateRender:Box28
+ISEXEC:FALSE
+141.007963:-130.644372:-900.000000
+181.332963:-140.644372:-900.000000
+PORT
+Active:"true"
+FIN_BOX
+CONNECTIONS:69
 CONNECTION
 Box01:Out:Box02:In
 NumberOfControlPoints:0
@@ -286,9 +334,6 @@ CONNECTION
 Box03:Widget:Box09:Widget2
 NumberOfControlPoints:0
 CONNECTION
-Box00:Out:Box03:In
-NumberOfControlPoints:0
-CONNECTION
 Box05:Out:Box00:Active
 NumberOfControlPoints:0
 CONNECTION
@@ -388,21 +433,9 @@ CONNECTION
 Image_ManualPaint_Model:Image_ManualPaint_Model:Box00:Image
 NumberOfControlPoints:0
 CONNECTION
-Image2_ManualPaint_Model:Image2_ManualPaint_Model:Box00:Image2
-NumberOfControlPoints:0
-CONNECTION
 BoxExecute_ManualPaint_Model:BoxExecute_ManualPaint_Model:Box00:BoxExecute
 NumberOfControlPoints:0
 CONNECTION
-wxvtkbaseview1:wxvtkbaseview1:Box03:WxVtkBaseView
-NumberOfControlPoints:0
-CONNECTION
-wxvtkbaseview2:wxvtkbaseview2:Box03:WxVtkBaseView1
-NumberOfControlPoints:0
-CONNECTION
-wxvtkbaseview3:wxvtkbaseview3:Box03:WxVtkBaseView2
-NumberOfControlPoints:0
-CONNECTION
 Box09:Widget:widgetOut:widgetOut
 NumberOfControlPoints:0
 CONNECTION
@@ -423,4 +456,49 @@ NumberOfControlPoints:0
 CONNECTION
 colorBarPosition:colorBarPosition:Box03:ColorBarPosition
 NumberOfControlPoints:0
+CONNECTION
+Image2_ManualPaint_Model:Image2_ManualPaint_Model:Box22:In
+NumberOfControlPoints:0
+CONNECTION
+Box22:Out:Box00:Image2
+NumberOfControlPoints:0
+CONNECTION
+Box22:Out:Box03:In
+NumberOfControlPoints:0
+CONNECTION
+wxvtkbaseview1:wxvtkbaseview1:Box24:In
+NumberOfControlPoints:0
+CONNECTION
+Box24:Out:Box03:WxVtkBaseView
+NumberOfControlPoints:0
+CONNECTION
+wxvtkbaseview2:wxvtkbaseview2:Box25:In
+NumberOfControlPoints:0
+CONNECTION
+Box25:Out:Box03:WxVtkBaseView1
+NumberOfControlPoints:0
+CONNECTION
+wxvtkbaseview3:wxvtkbaseview3:Box26:In
+NumberOfControlPoints:0
+CONNECTION
+Box26:Out:Box03:WxVtkBaseView2
+NumberOfControlPoints:0
+CONNECTION
+Box24:Out:Box23:Renderer
+NumberOfControlPoints:0
+CONNECTION
+Box00:BoxChange:Box23:BoxExecute
+NumberOfControlPoints:0
+CONNECTION
+Box25:Out:Box27:Renderer
+NumberOfControlPoints:0
+CONNECTION
+Box26:Out:Box28:Renderer
+NumberOfControlPoints:0
+CONNECTION
+Box00:BoxChange:Box27:BoxExecute
+NumberOfControlPoints:0
+CONNECTION
+Box00:BoxChange:Box28:BoxExecute
+NumberOfControlPoints:0
 APP_END

diff --git a/bbtk/bbs/boxes/ManualPaint2.bbs b/bbtk/bbs/boxes/ManualPaint2.bbs
index cae9275f73d517323a2d02352254e0545aa80467..1f931bcea850de4d19955981fa27eeeabff3571b 100644 (file)
--- a/bbtk/bbs/boxes/ManualPaint2.bbs
+++ b/bbtk/bbs/boxes/ManualPaint2.bbs
@@ -1,6 +1,6 @@
 # ----------------------------------
 # - BBTKGEditor v 1.4 BBS BlackBox Script (Complex Box)
-# - /tmpEED/creaTools/creatools_source/creaMaracasVisu/bbtk/bbs/boxes/ManualPaint2.bbs
+# - /home/davila/Creatis/C8/creatools_source/creaMaracasVisu/bbtk/bbs/boxes/ManualPaint2.bbs
 # ----------------------------------
 
 include std
@@ -8,6 +8,7 @@ include itkvtk
 include creaMaracasVisu
 include wx
 include std
+include vtk
 
 define ManualPaint2 creaMaracasVisu
 
@@ -83,6 +84,23 @@ new std:MagicBox Box20
 new std:GetVectorStringElement Box21
   set Box21.I "6"
 
+new vtk:vtkImageDataPointerRelay Box22
+
+new vtk:UpdateRender Box23
+  set Box23.Active "true"
+
+new std:MagicBox Box24
+
+new std:MagicBox Box25
+
+new std:MagicBox Box26
+
+new vtk:UpdateRender Box27
+  set Box27.Active "true"
+
+new vtk:UpdateRender Box28
+  set Box28.Active "true"
+
 
 connect Box01.Out Box02.In
 connect Box04.Out0 Box02.In0
@@ -97,7 +115,6 @@ connect Box04.Out8 Box02.In8
 connect Box04.Out9 Box02.In9
 connect Box02.Out Box05.In
 connect Box03.Widget Box09.Widget2
-connect Box00.Out Box03.In
 connect Box05.Out Box00.Active
 connect Box02.Out Box11.In
 connect Box11.Out Box00.DistanceFill
@@ -127,6 +144,17 @@ connect Box20.Out Box17.In0
 connect Box20.Out Box04.In0
 connect Box02.Out Box21.In
 connect Box21.Out Box00.ToleranceFill
+connect Box22.Out Box00.Image2
+connect Box22.Out Box03.In
+connect Box24.Out Box03.WxVtkBaseView
+connect Box25.Out Box03.WxVtkBaseView1
+connect Box26.Out Box03.WxVtkBaseView2
+connect Box24.Out Box23.Renderer
+connect Box00.BoxChange Box23.BoxExecute
+connect Box25.Out Box27.Renderer
+connect Box26.Out Box28.Renderer
+connect Box00.BoxChange Box27.BoxExecute
+connect Box00.BoxChange Box28.BoxExecute
 
 # Complex input ports
 input TitleOptions Box20.In " "
@@ -137,13 +165,13 @@ input MinRange_ManualPaint_Model Box04.In4 " "
 input MaxRange_ManualPaint_Model Box04.In5 " "
 input Point_ManualPaint_Model Box00.Point " "
 input Image_ManualPaint_Model Box00.Image " "
-input Image2_ManualPaint_Model Box00.Image2 " "
 input BoxExecute_ManualPaint_Model Box00.BoxExecute " "
-input wxvtkbaseview1 Box03.WxVtkBaseView " "
-input wxvtkbaseview2 Box03.WxVtkBaseView1 " "
-input wxvtkbaseview3 Box03.WxVtkBaseView2 " "
 input Tolerance_Fill_ManualPaint_Model Box04.In6 " "
 input colorBarPosition Box03.ColorBarPosition " "
+input Image2_ManualPaint_Model Box22.In " "
+input wxvtkbaseview1 Box24.In " "
+input wxvtkbaseview2 Box25.In " "
+input wxvtkbaseview3 Box26.In " "
 
 # Complex output ports
 output widgetOut Box09.Widget " "

diff --git a/bbtk/src/bbcreaMaracasVisuManualPaint_Model.cxx b/bbtk/src/bbcreaMaracasVisuManualPaint_Model.cxx
index a7c224d243ffd1bed0165e110559490f5fa8dcde..e97b39033a1cbc0bca71a1c5829bbbdd25e8c775 100644 (file)
--- a/bbtk/src/bbcreaMaracasVisuManualPaint_Model.cxx
+++ b/bbtk/src/bbcreaMaracasVisuManualPaint_Model.cxx
@@ -34,8 +34,10 @@ void ManualPaint_Model::Process()
 //    bbSetOutputOut( bbGetInputIn() );
 //    std::cout << "Output value = " <<bbGetOutputOut() << std::endl;
 
+
        if (bbGetInputImage()!=NULL)
        {  
+
                manualpaintmodel->SetActive( bbGetInputActive() );
                manualpaintmodel->SetTool( bbGetInputTool() );
                manualpaintmodel->Set2D3D( bbGetInput2D3D() );
@@ -48,11 +50,14 @@ void ManualPaint_Model::Process()
                manualpaintmodel->SetDistanceFill( bbGetInputDistanceFill() );          
                manualpaintmodel->SetRangeMin( bbGetInputRange()[0] );
                manualpaintmodel->SetRangeMax( bbGetInputRange()[1] );
+
                if (bbGetInputPoint().size()==3)
                {
                        manualpaintmodel->PaintImage( bbGetInputPoint()[0] , bbGetInputPoint()[1] , bbGetInputPoint()[2] );
                } // if Points
 
+
+
                if ( bbGetInputByLstPointsX().size()!=0 )
                {
                        int i,size = bbGetInputByLstPointsX().size();
@@ -111,9 +116,13 @@ void ManualPaint_Model::Process()
 
                        printf("ManualPaint_Model %d%\n", 100 );
                } // if ByImagePoints
+
+
+
         } else {
                printf("EED Warning: Image not set. Box creaMaracasVisu::ManualPaint_Model (BBTK) \n");
-       } // if 
+       } // if bbGetInputImage()
+
 
        if (bbGetInputImage2()!=NULL)
        { 
@@ -123,6 +132,7 @@ void ManualPaint_Model::Process()
        } else { 
                bbSetOutputOut( NULL );
        } 
+
 }
 //===== 
 // Before editing this file, make sure it's a file of your own (i.e.: it wasn't generated from xml description; if so : your modifications will be lost)