#3478 ContourExtractData

[creaMaracasVisu.git] / bbtk / src / bbcreaMaracasVisuContourControlPoints.cxx

diff --git a/bbtk/src/bbcreaMaracasVisuContourControlPoints.cxx b/bbtk/src/bbcreaMaracasVisuContourControlPoints.cxx
index 3fd817c778e0ca0ec86e9a657207cf1759aaaf75..8e79b7a100a2264c125d7577f28b8f2d945eea6e 100644 (file)
--- a/bbtk/src/bbcreaMaracasVisuContourControlPoints.cxx
+++ b/bbtk/src/bbcreaMaracasVisuContourControlPoints.cxx
@@ -4,7 +4,6 @@
 #include "bbcreaMaracasVisuContourControlPoints.h"
 #include "bbcreaMaracasVisuPackage.h"
 
-
 namespace bbcreaMaracasVisu
 {
 
@@ -37,39 +36,29 @@ void ContourControlPoints::Process()
        {
                if (_manContourControl_1==NULL)
                {
-                       _manContourControl_1            = new manualContourControler();
+                       _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);
-
-
 //EED 3 oct 2006
                        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);
-
-
                        _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)
@@ -78,10 +67,11 @@ void ContourControlPoints::Process()
                } else {
                   _mViewContour_1->RemoveCompleteContourActor ();
                }
+        double width = bbGetInputWidthLine();
+        _mViewContour_1->SetWidthLine( width );
+        _mViewContour_1->SetRange( 2*width );
                _mViewContour_1->RefreshContour();
-
         bbSetOutputManualBaseModel( _mContourModel_1 );
-
        } // wxVtkBaseView
 
 }
@@ -97,7 +87,8 @@ void ContourControlPoints::bbUserSetDefaultValues()
        bbSetInputVisible(true);
        bbSetInputOpenClose(true);
        bbSetInputwxVtkBaseView(NULL);
-       _manContourControl_1            = NULL;
+    bbSetInputWidthLine(1);
+       _manContourControl_1    = NULL;
        _mContourModel_1                = NULL;
        _mViewContour_1                 = NULL;