#3155 creaMaracasVisu Feature New Normal - ViewerPlane ComplexBox

diff --git a/bbtk/bbs/boxes/ViewerByPlane.bbg b/bbtk/bbs/boxes/ViewerByPlane.bbg
index f6418ee5e55a12c4fff180bfb3902a31ebf7e93c..5511b1d7e1d99ed1e1784dbe1643a5012df1905b 100644 (file)
--- a/bbtk/bbs/boxes/ViewerByPlane.bbg
+++ b/bbtk/bbs/boxes/ViewerByPlane.bbg
@@ -10,7 +10,7 @@ AUTHOR:Author ??
 COMPLEXBOX:TRUE
 COMPLEXBOXNAME:ViewerByPlane
 PACKAGENAME:creaMaracasVisu
-COMPLEXOUTPUTS:6
+COMPLEXOUTPUTS:12
 COMPLEX_PORT
 widget
 268.900118:-337.558426:-900.000000
@@ -35,6 +35,30 @@ COMPLEX_PORT
 render4
 240.655803:-336.838673:-900.000000
 FIN_COMPLEX_PORT
+COMPLEX_PORT
+Image
+179.904670:-338.577176:-900.000000
+FIN_COMPLEX_PORT
+COMPLEX_PORT
+point
+189.952033:-338.198030:-900.000000
+FIN_COMPLEX_PORT
+COMPLEX_PORT
+boxchange
+161.895245:-338.198030:-900.000000
+FIN_COMPLEX_PORT
+COMPLEX_PORT
+wxvtkbaseview2
+302.859434:-337.469661:-900.000000
+FIN_COMPLEX_PORT
+COMPLEX_PORT
+wxvtkbaseview3
+312.830164:-338.079868:-900.000000
+FIN_COMPLEX_PORT
+COMPLEX_PORT
+wxvtkbaseview4
+322.717792:-337.766525:-900.000000
+FIN_COMPLEX_PORT
 COMPLEXINPUTS:2
 COMPLEX_PORT
 FileNale
@@ -326,8 +350,8 @@ FIN_BOX
 BOX
 std:SetElementVectorVectorInt:Box42
 ISEXEC:FALSE
-348.677331:-330.043208:-900.000000
-419.852331:-340.043208:-900.000000
+363.744192:-321.568099:-900.000000
+434.919192:-331.568099:-900.000000
 PORT
 Value:"0"
 FIN_BOX
@@ -479,7 +503,7 @@ ISEXEC:FALSE
 613.705537:-176.303122:-900.000000
 659.280537:-186.303122:-900.000000
 FIN_BOX
-CONNECTIONS:106
+CONNECTIONS:112
 CONNECTION
 Box02:Out:Box01:In
 NumberOfControlPoints:0
@@ -798,4 +822,22 @@ NumberOfControlPoints:0
 CONNECTION
 Box01:Renderer4:render4:render4
 NumberOfControlPoints:0
+CONNECTION
+Box02:Out:Image:Image
+NumberOfControlPoints:0
+CONNECTION
+Box01:Point:point:point
+NumberOfControlPoints:0
+CONNECTION
+Box01:BoxChange:boxchange:boxchange
+NumberOfControlPoints:0
+CONNECTION
+Box01:wxVtkBaseView2:wxvtkbaseview2:wxvtkbaseview2
+NumberOfControlPoints:0
+CONNECTION
+Box01:wxVtkBaseView3:wxvtkbaseview3:wxvtkbaseview3
+NumberOfControlPoints:0
+CONNECTION
+Box01:wxVtkBaseView4:wxvtkbaseview4:wxvtkbaseview4
+NumberOfControlPoints:0
 APP_END

diff --git a/bbtk/bbs/boxes/ViewerByPlane.bbs b/bbtk/bbs/boxes/ViewerByPlane.bbs
index b2bf14be56dc0acc7b6cfa4c0caf8ddaaabf8554..9e64860fb68ed7d59cd51e1c2aaf4c7bf89a2d29 100644 (file)
--- a/bbtk/bbs/boxes/ViewerByPlane.bbs
+++ b/bbtk/bbs/boxes/ViewerByPlane.bbs
@@ -293,6 +293,12 @@ output render1 Box01.Renderer1 " "
 output render2 Box01.Renderer2 " "
 output render3 Box01.Renderer3 " "
 output render4 Box01.Renderer4 " "
+output Image Box02.Out " "
+output point Box01.Point " "
+output boxchange Box01.BoxChange " "
+output wxvtkbaseview2 Box01.wxVtkBaseView2 " "
+output wxvtkbaseview3 Box01.wxVtkBaseView3 " "
+output wxvtkbaseview4 Box01.wxVtkBaseView4 " "
 
 
 endefine

diff --git a/bbtk/src/bbcreaMaracasVisuShowNPoints_Reset.cxx b/bbtk/src/bbcreaMaracasVisuShowNPoints_Reset.cxx
index 044b3099cd27279e488f62cd1a6b73fcef232682..a4c96a9fb8c338f2a8e090ecbafbe4bc3db26ba7 100644 (file)
--- a/bbtk/src/bbcreaMaracasVisuShowNPoints_Reset.cxx
+++ b/bbtk/src/bbcreaMaracasVisuShowNPoints_Reset.cxx
@@ -29,9 +29,12 @@ void ShowNPoints_Reset::Process()
 //    bbSetOutputOut( bbGetInputIn() );
 //    std::cout << "Output value = " <<bbGetOutputOut() << std::endl;
   
+printf("EED ShowNPoints_Reset::Process Start\n");
+
        bbGetInputWidgetShowNPoints()->DeleteAllPoints();
        bbGetInputWidgetShowNPoints()->GetModelShowNPoints()->SetFirstTime(true);
        
+printf("EED ShowNPoints_Reset::Process End\n");
 }
 //===== 
 // 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)

diff --git a/bbtk/src/bbmaracasvisuImageChangeInformation.cxx b/bbtk/src/bbmaracasvisuImageChangeInformation.cxx
index 2c0e5108500a2cced85ddf2a6d121acb0420c5d4..e0b3f1cc43adc7f1415c038742ff1d4753c477c4 100644 (file)
--- a/bbtk/src/bbmaracasvisuImageChangeInformation.cxx
+++ b/bbtk/src/bbmaracasvisuImageChangeInformation.cxx
@@ -43,9 +43,9 @@ void ImageChangeInformation::Process()
                mchange = vtkImageChangeInformation::New();
                img->GetExtent( ext );  
                double origin[3];
-               origin[0]=0.0;
-               origin[1]=0.0;
-               origin[2]=0.0;
+               origin[0] = 0.0;
+               origin[1] = 0.0;
+               origin[2] = 0.0;
                img->SetOrigin(origin);         
                mchange->SetInput( img );
 //EED 2016 15 06
@@ -59,6 +59,7 @@ void ImageChangeInformation::Process()
                        spc[2] = bbGetInputNewSpacing()[2];
                        mchange->SetOutputSpacing( spc[0] , spc[1] , spc [2] );    //spacing
                }
+               mchange->Modified();    //important
                mchange->Update();    //important
                bbSetOutputOut( mchange->GetOutput() );
        }  
@@ -66,9 +67,9 @@ void ImageChangeInformation::Process()
 
 void ImageChangeInformation::bbUserSetDefaultValues()
 {
-  mchange = NULL;
-   bbSetOutputOut( NULL);
-   bbSetInputIn(NULL);
+       mchange = NULL;
+       bbSetOutputOut( NULL);
+       bbSetInputIn(NULL);
 }
 
 void ImageChangeInformation::bbUserInitializeProcessing()

diff --git a/bbtk/src/bbmaracasvisuShowNPoints.cxx b/bbtk/src/bbmaracasvisuShowNPoints.cxx
index 440f361de35ba84b59ce86dfe3cac5b8ba35b140..796b3c1091916502dd6eb9080968c478a2f21eb5 100644 (file)
--- a/bbtk/src/bbmaracasvisuShowNPoints.cxx
+++ b/bbtk/src/bbmaracasvisuShowNPoints.cxx
@@ -50,7 +50,6 @@ WidgetShowNPointsBox::~WidgetShowNPointsBox()
 //------------------------------------------------------------------------
 void WidgetShowNPointsBox::UpdatePoints(wxCommandEvent &event)
 {
-printf("EED WidgetShowNPointsBox::UpdatePoints start\n");
        WidgetShowNPoints::UpdatePoints(event);
        //Difference in Radio for text placement
 //     double radio=GetModelShowNPoints()->GetRadio();
@@ -62,8 +61,6 @@ printf("EED WidgetShowNPointsBox::UpdatePoints start\n");
        mbbShowNPoints->bbSetInputRadio( GetRadio() );
        // EED 
 //     RefreshPoints();
-printf("EED WidgetShowNPointsBox::UpdatePoints end\n");
-
 }
 
 
@@ -100,6 +97,7 @@ BBTK_BLACK_BOX_IMPLEMENTATION(ShowNPoints,bbtk::WxBlackBox);
 //-----------------------------------------------------------------
 void ShowNPoints::Process()
 {
+printf("EED ShowNPoints::Process Start\n");
        if (mwxwidget!=NULL)
        {
                mwxwidget->SetRenderer( bbGetInputRenderer() );
@@ -111,6 +109,7 @@ void ShowNPoints::Process()
 
                if ( mwxwidget->GetModelShowNPoints()->GetFirstTime()==true )
                {
+printf("EED ShowNPoints::Process   firsttime\n");
                        mwxwidget->GetModelShowNPoints()->SetFirstTime(false);
                        mwxwidget->SetInitLstPoints( bbGetInputInitLstPointsX() , bbGetInputInitLstPointsY() , bbGetInputInitLstPointsZ() , bbGetInputInitLstLabels() );
                }
@@ -121,6 +120,7 @@ void ShowNPoints::Process()
                bbSetOutputlstLabels( mwxwidget->GetModelShowNPoints()->GetLstLabels() );
                bbSetOutputWidgetShowNPoints( (WidgetShowNPoints*)mwxwidget );
        } // mwxwidget
+printf("EED ShowNPoints::Process End\n");
 }
 
 //-----------------------------------------------------------------