#3316 creaVtk Feature New - NormalVoiMPR box

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

diff --git a/bbtk/src/bbcreaMaracasVisuTubeFilter.cxx b/bbtk/src/bbcreaMaracasVisuTubeFilter.cxx
index a3b0184eca1c53e43df3037620e765e55a152e9d..e3989b55f32b3b274128bc5fdc82736f6db175f9 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             
                
@@ -132,14 +130,23 @@ namespace bbcreaMaracasVisu
                polyData->SetPoints(points);
                polyData->SetLines(lines);
                
-
+               double radio;
                // Varying tube radius using sine-function
                vtkSmartPointer<vtkDoubleArray> tubeRadius = vtkSmartPointer<vtkDoubleArray>::New();
                tubeRadius->SetName("TubeRadius");
-               tubeRadius->SetNumberOfTuples( lstRadius.size() );
-               for (i=0 ;i<lstRadius.size() ; i++)
+               tubeRadius->SetNumberOfTuples( lstPointX.size() );
+               for (i=0 ;i<lstPointX.size() ; i++)
                {
-                       tubeRadius->SetTuple1(i, lstRadius[i] );
+                       if (lstRadius.size()==0)
+                       { 
+                          radio=1;
+                       } else if (i<lstRadius.size()) {
+                         radio = lstRadius[i];
+                       } else if (i>=lstRadius.size()) {
+                         radio= lstRadius[ lstRadius.size()-1 ];
+                       }   
+
+                       tubeRadius->SetTuple1(i, radio );
                }
                polyData->GetPointData()->AddArray(tubeRadius);
                polyData->GetPointData()->SetActiveScalars("TubeRadius");
@@ -169,7 +176,14 @@ namespace bbcreaMaracasVisu
                
                vtkSmartPointer<vtkTubeFilter> tube = vtkSmartPointer<vtkTubeFilter>::New();
                tube->CappingOn();
+
+//EED 2017-01-01 Migration VTK7
+#if VTK_MAJOR_VERSION <= 5
                tube->SetInput(polyData);
+#else
+               tube->SetInputData(polyData);
+#endif
+
                tube->SetNumberOfSides(nTv);
                tube->SetVaryRadiusToVaryRadiusByAbsoluteScalar();
                
@@ -233,8 +247,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;
@@ -257,7 +269,6 @@ void TubeFilter::Process()
        tubefilter->SetlstColour( bbGetInputColour() ); 
        tubefilter->Run();
     bbSetOutputOutAxis( tubefilter->GetActor() );      
-       printf("EED TubeFilter::Process end \n");
 }
        
 //===== 
@@ -276,6 +287,10 @@ void TubeFilter::bbUserSetDefaultValues()
        colour.push_back(0.0);
        colour.push_back(0.0);
        bbSetInputColour(colour);
+
+       std::vector<double> lstRadius;
+       lstRadius.push_back(1);
+        bbSetInputColour(lstRadius);
 }
        
 //=====