X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=bbtk%2Fsrc%2FbbcreaMaracasVisuTubeFilter.cxx;h=c25e3e5bb8411b9c2b0be0849a7609223cf93bf2;hb=a7017a8ade695bd14a4c7ee70b197d63b5e76765;hp=56f418faae8e9f7faa1dbc8e93d7fe94047229b4;hpb=76e2ec73c0cbddf9c9d55af7e36bc2a6a67f6fb8;p=creaMaracasVisu.git

diff --git a/bbtk/src/bbcreaMaracasVisuTubeFilter.cxx b/bbtk/src/bbcreaMaracasVisuTubeFilter.cxx
index 56f418f..c25e3e5 100644
--- a/bbtk/src/bbcreaMaracasVisuTubeFilter.cxx
+++ b/bbtk/src/bbcreaMaracasVisuTubeFilter.cxx
@@ -1,3 +1,28 @@
+/*# ---------------------------------------------------------------------
+#
+# Copyright (c) CREATIS (Centre de Recherche en Acquisition et Traitement de l'Image
+#                        pour la Sant�)
+# Authors : Eduardo Davila, Frederic Cervenansky, Claire Mouton
+# Previous Authors : Laurent Guigues, Jean-Pierre Roux
+# CreaTools website : www.creatis.insa-lyon.fr/site/fr/creatools_accueil
+#
+#  This software is governed by the CeCILL-B license under French law and
+#  abiding by the rules of distribution of free software. You can  use,
+#  modify and/ or redistribute the software under the terms of the CeCILL-B
+#  license as circulated by CEA, CNRS and INRIA at the following URL
+#  http://www.cecill.info/licences/Licence_CeCILL-B_V1-en.html
+#  or in the file LICENSE.txt.
+#
+#  As a counterpart to the access to the source code and  rights to copy,
+#  modify and redistribute granted by the license, users are provided only
+#  with a limited warranty  and the software's author,  the holder of the
+#  economic rights,  and the successive licensors  have only  limited
+#  liability.
+#
+#  The fact that you are presently reading this means that you have had
+#  knowledge of the CeCILL-B license and that you accept its terms.
+# ------------------------------------------------------------------------ */
+
 //===== 
 // 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)
 //===== 
@@ -107,14 +132,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");
@@ -251,6 +285,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);
 }
 	
 //=====