X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=bbtk%2Fsrc%2FbbcreaMaracasVisuContourControlPoints.cxx;h=243352547a8716f305df14df2c40229d356471f4;hb=542063db4a06b1a74587bcab7d5c450ebdd53272;hp=a65b89431e8599302acf0bd232aadf85b6c7657d;hpb=b3204f9f9a51581a515da84ac6ffa9a24c83f237;p=creaMaracasVisu.git

diff --git a/bbtk/src/bbcreaMaracasVisuContourControlPoints.cxx b/bbtk/src/bbcreaMaracasVisuContourControlPoints.cxx
index a65b894..2433525 100644
--- a/bbtk/src/bbcreaMaracasVisuContourControlPoints.cxx
+++ b/bbtk/src/bbcreaMaracasVisuContourControlPoints.cxx
@@ -5,7 +5,6 @@
 #include "bbcreaMaracasVisuPackage.h"
 
 
-
 namespace bbcreaMaracasVisu
 {
 
@@ -16,7 +15,6 @@ BBTK_BLACK_BOX_IMPLEMENTATION(ContourControlPoints,bbtk::AtomicBlackBox);
 //===== 
 void ContourControlPoints::Process()
 {
-
 // THE MAIN PROCESSING METHOD BODY
 //   Here we simply set the input 'In' value to the output 'Out'
 //   And print out the output value
@@ -33,33 +31,57 @@ void ContourControlPoints::Process()
 //    std::cout << "Output value = " <<bbGetOutputOut() << std::endl;
   
 	// Contorno 1
-	_manContourControl_1	= new manualContourControler();
-	_mContourModel_1		= new manualContourModel();
-	_mViewContour_1			= new manualViewContour();
-	_mViewContour_1->SetModel( _mContourModel_1 );
-	_mViewContour_1->SetWxVtkBaseView( bbGetInputwxVtkBaseView() );
-	_mViewContour_1->SetRange( 2 );
-	_mViewContour_1->SetZ( 1000 );
+
+
+	if ( bbGetInputwxVtkBaseView() != NULL )
+	{
+		if (_manContourControl_1==NULL)
+		{
+			_manContourControl_1		= new manualContourControler();
+			_mContourModel_1		= new manualContourModel();
+			_mViewContour_1			= new manualViewContour();
+
+			_mContourModel_1 -> SetCloseContour( bbGetInputOpenClose() );
+
+			_mViewContour_1->SetModel( _mContourModel_1 );
+			_mViewContour_1->SetWxVtkBaseView( bbGetInputwxVtkBaseView() );
+			_mViewContour_1->SetRange( 2 );
+			_mViewContour_1->SetZ( 1000 );
 
 //JSTG 18-06-07
-	_mContourModel_1->SetNumberOfPointsSpline(100);
+			_mContourModel_1->SetNumberOfPointsSpline(100);
 
 
 //EED 3 oct 2006
-//	_mViewContour_1->SetSpacing(spc);
+			double spc[3];
+			bbGetInputwxVtkBaseView()->GetSpacing(spc);
+			_mViewContour_1->SetSpacing(spc);
 
 
 //EED 3 oct 2006
-	_mViewContour_1->SetColorNormalContour(0, 0, 1);
-	_mViewContour_1->SetColorEditContour(0.5, 0.5, 0.5);
+			_mViewContour_1->SetColorNormalContour(0, 0, 1);
+			_mViewContour_1->SetColorEditContour(0.5, 0.5, 0.5);
+
+
+			_manContourControl_1->SetModelView( _mContourModel_1 , _mViewContour_1 );
+			((vtkInteractorStyleBaseView*)bbGetInputwxVtkBaseView()->GetInteractorStyleBaseView())->AddInteractorStyleMaracas( _manContourControl_1 );
+			_manContourControl_1->CreateNewManualContour();
+			_manContourControl_1->SetActive(  bbGetInputActive() );
+			_mViewContour_1->RefreshContour();
+		} // _manContourControl_1
 
+		_mContourModel_1 -> SetCloseContour( bbGetInputOpenClose() );
+		_manContourControl_1->SetActive( bbGetInputActive() );
+		if ( bbGetInputVisible() == true)
+		{
+		   _mViewContour_1->AddCompleteContourActor (true); 
+		} else {
+		   _mViewContour_1->RemoveCompleteContourActor ();
+		}
+		_mViewContour_1->RefreshContour();
 
-	_manContourControl_1->SetModelView( _mContourModel_1 , _mViewContour_1 );
-	((vtkInteractorStyleBaseView*)bbGetInputwxVtkBaseView()->GetInteractorStyleBaseView())->AddInteractorStyleMaracas( _manContourControl_1 );
-	_manContourControl_1->CreateNewManualContour();
-	_manContourControl_1->SetActive(true);
-	_mViewContour_1->RefreshContour();
 
+	} // wxVtkBaseView
 
 }
 //===== 
@@ -70,7 +92,13 @@ void ContourControlPoints::bbUserSetDefaultValues()
 
 //  SET HERE THE DEFAULT INPUT/OUTPUT VALUES OF YOUR BOX 
 //    Here we initialize the input 'In' to 0
-   bbSetInputwxVtkBaseView(NULL);
+   	bbSetInputActive(false);
+   	bbSetInputVisible(true);
+   	bbSetInputOpenClose(true);
+   	bbSetInputwxVtkBaseView(NULL);
+	_manContourControl_1		= NULL;
+	_mContourModel_1		= NULL;
+	_mViewContour_1			= NULL;
   
 }
 //=====