#2989 creaMaracasVisu Bug New Normal - ManualContourModel duplicate last point...

diff --git a/bbtk/src/bbcreaMaracasVisuTubeFilter.cxx b/bbtk/src/bbcreaMaracasVisuTubeFilter.cxx
index c25e3e5bb8411b9c2b0be0849a7609223cf93bf2..dbb0a9e457551b8ab38f588d65e0fe566418746b 100644 (file)
--- a/bbtk/src/bbcreaMaracasVisuTubeFilter.cxx
+++ b/bbtk/src/bbcreaMaracasVisuTubeFilter.cxx
@@ -109,8 +109,6 @@ namespace bbcreaMaracasVisu
        
        void MaracasTubeFilter::Run()
        {
-               
-               
                unsigned int i;
                unsigned int nTv = 8;       // No. of surface elements for each tube vertex             
                
@@ -242,8 +240,6 @@ void TubeFilter::Process()
 //    * TYPE is the C++ type of the input/output
 //      (the one provided in the attribute 'type' of the tag 'input')
        
-       printf("EED TubeFilter::Process start \n");
-
        if (tubefilter!=NULL) 
        { 
                delete tubefilter;
@@ -266,7 +262,6 @@ void TubeFilter::Process()
        tubefilter->SetlstColour( bbGetInputColour() ); 
        tubefilter->Run();
     bbSetOutputOutAxis( tubefilter->GetActor() );      
-       printf("EED TubeFilter::Process end \n");
 }
        
 //===== 

diff --git a/bbtk/src/bbcreaMaracasVisuTubeFilter.h b/bbtk/src/bbcreaMaracasVisuTubeFilter.h
index e69a630626310c8885524a9f031716eab6877d34..5228422d36a8c3249c2a42757cf3fb0a8bbdad9f 100644 (file)
--- a/bbtk/src/bbcreaMaracasVisuTubeFilter.h
+++ b/bbtk/src/bbcreaMaracasVisuTubeFilter.h
@@ -108,9 +108,9 @@ BBTK_BEGIN_DESCRIBE_BLACK_BOX(TubeFilter,bbtk::AtomicBlackBox);
        BBTK_INPUT(TubeFilter,lstPointY,"lstPointY",std::vector<double>,"");
        BBTK_INPUT(TubeFilter,lstPointZ,"lstPointZ",std::vector<double>,"");
        BBTK_INPUT(TubeFilter,lstRadio,"lstRadio. Default value is 1 everywhere.",std::vector<double>,"");
-       BBTK_INPUT(TubeFilter,Colour,"Colour",std::vector<double>,"");
+       BBTK_INPUT(TubeFilter,Colour,"Colour (default 1 0 0)",std::vector<double>,"");
        BBTK_INPUT(TubeFilter,Transform,"vtkTransform", vtkLinearTransform *,"");
-       BBTK_INPUT(TubeFilter,Opacity,"Opacity",double,"");
+       BBTK_INPUT(TubeFilter,Opacity,"Opacity (default 1)",double,"");
        BBTK_OUTPUT(TubeFilter,OutAxis,"Tube Actor",vtkProp3D *,"");
 BBTK_END_DESCRIBE_BLACK_BOX(TubeFilter);
 //=====

diff --git a/lib/maracasVisuLib/src/interface/wxWindows/widgets/manualContour/manualContourModel.cpp b/lib/maracasVisuLib/src/interface/wxWindows/widgets/manualContour/manualContourModel.cpp
index 947e614bd77f90dfe4d3c581249f885ee699b8c5..7e3e8b83387a4e228c2ecf9e601482633c0a7941 100644 (file)
--- a/lib/maracasVisuLib/src/interface/wxWindows/widgets/manualContour/manualContourModel.cpp
+++ b/lib/maracasVisuLib/src/interface/wxWindows/widgets/manualContour/manualContourModel.cpp
@@ -337,7 +337,8 @@ void manualContourModel::UpdateSpline() // virtual
                _delta_JSTG = (double) (np) / double (_sizePointsContour - 1);  //Without the -1 the curve is not close
        } else {
 //             _delta_JSTG = (double) (np-1) / double (_sizePointsContour );  //Without the -1 the curve is not close
-               _delta_JSTG = (double) (np) / double (_sizePointsContour-1 );  //Without the -1 the curve is not close
+//EED 9/7/2016                 _delta_JSTG = (double) (np) / double (_sizePointsContour-1 );  //Without the -1 the curve is not close
+               _delta_JSTG = (double) (np-1) / double (_sizePointsContour-1 );  //Without the -1 the curve is not close
        }
 //-----------------------------------------------------------------------------------------------------------
 }
@@ -357,14 +358,14 @@ void manualContourModel::UpdateSpline() // virtual
 void manualContourModel::GetSpline_i_Point(int i, double *x, double *y, double *z) // virtal
 {
        GetSpline_t_Point(i*_delta_JSTG,x,y,z);
-}
+
 
 // ----------------------------------------------------------------------------
 
 //JSTG 25-02-08 ---------------------------------------------------------------
 void manualContourModel::GetSpline_t_Point(double t, double *x, double *y, double *z)
 {
-               if (_lstPoints.size()==0)
+       if (_lstPoints.size()==0)
        {
                *x      = 0;
                *y      = 0;