X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=bbtk%2Fsrc%2FbbcreaMaracasVisuTubeFilter.cxx;h=dbb0a9e457551b8ab38f588d65e0fe566418746b;hb=3283472f764535492122c3b2ade020a749c1bd2a;hp=995c58d0fa086867a172f81cd0b321377b7e620e;hpb=0cc1383dff9255c9929097bbe9f44a6f4f31c97a;p=creaMaracasVisu.git

diff --git a/bbtk/src/bbcreaMaracasVisuTubeFilter.cxx b/bbtk/src/bbcreaMaracasVisuTubeFilter.cxx
index 995c58d..dbb0a9e 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)
 //===== 
@@ -84,8 +109,6 @@ namespace bbcreaMaracasVisu
 	
 	void MaracasTubeFilter::Run()
 	{
-		
-		
 		unsigned int i;
 		unsigned int nTv = 8;       // No. of surface elements for each tube vertex		
 		
@@ -107,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");
@@ -143,14 +175,28 @@ namespace bbcreaMaracasVisu
 		polyData->GetPointData()->AddArray(colors);
 		
 		vtkSmartPointer<vtkTubeFilter> tube = vtkSmartPointer<vtkTubeFilter>::New();
+		tube->CappingOn();
 		tube->SetInput(polyData);
 		tube->SetNumberOfSides(nTv);
 		tube->SetVaryRadiusToVaryRadiusByAbsoluteScalar();
 		
 		vtkSmartPointer<vtkPolyDataMapper> mapper =	vtkSmartPointer<vtkPolyDataMapper>::New();
 		mapper->SetInputConnection(tube->GetOutputPort());
+//		mapper->ScalarVisibilityOn();
+//		mapper->SetScalarModeToUsePointFieldData();
+		
 		mapper->ScalarVisibilityOn();
+		
+//		mapper->SetScalarModeToUseCellData();
+//		mapper->SetScalarModeToUseCellFieldData();
+//		mapper->SetScalarModeToUseFieldData();
+//		mapper->SetScalarModeToUsePointData();
 		mapper->SetScalarModeToUsePointFieldData();
+		
+		mapper->SetColorModeToDefault();
+//		mapper->SetColorModeToMapScalars();		
+		
+		
 		mapper->SelectColorArray("Colors");
 		
 		//		vtkSmartPointer<vtkActor> actor =vtkSmartPointer<vtkActor>::New();
@@ -194,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;
@@ -204,13 +248,20 @@ void TubeFilter::Process()
 	tubefilter = new MaracasTubeFilter();
 	tubefilter->SetvtkRenderer( bbGetInputRenderer() );	
 	tubefilter->SetlstPoints( bbGetInputlstPointX(), bbGetInputlstPointY(), bbGetInputlstPointZ() );
+
+	// Sets the default value for radius to 1 everywhere, if the radius input vevctor is empty.
+	if (bbGetInputlstRadio().size() == 0)
+	  {
+	    std::vector<double> radio;
+	    radio.resize(bbGetInputlstPointX().size(), 1.);
+	    bbSetInputlstRadio(radio);
+	  }
 	tubefilter->SetlstRadius( bbGetInputlstRadio() );
 	tubefilter->SetOpacity( bbGetInputOpacity() );
 	tubefilter->SetTransform( bbGetInputTransform() );	
 	tubefilter->SetlstColour( bbGetInputColour() );	
 	tubefilter->Run();
     bbSetOutputOutAxis( tubefilter->GetActor() );	
-	printf("EED TubeFilter::Process end \n");
 }
 	
 //===== 
@@ -229,8 +280,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);
 }
 	
 //=====