X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=packages%2Fvtk%2Fsrc%2FbbvtkCreateImage.cxx;h=9bc6d5144adcdc2c6448f662aeb59eb9065eeba5;hb=03110e730a19cb174f6a820f97b7a972a1ff9fc2;hp=f4fff37631c4b8b9abb8bf136b6c58b107c3376e;hpb=5aadf601c2cac6a4b998840f66fef9ba26ae67cd;p=bbtk.git

diff --git a/packages/vtk/src/bbvtkCreateImage.cxx b/packages/vtk/src/bbvtkCreateImage.cxx
index f4fff37..9bc6d51 100644
--- a/packages/vtk/src/bbvtkCreateImage.cxx
+++ b/packages/vtk/src/bbvtkCreateImage.cxx
@@ -1,4 +1,31 @@
-//===== 
+/*
+ # ---------------------------------------------------------------------
+ #
+ # 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)
 //===== 
 #include "bbvtkCreateImage.h"
@@ -27,21 +54,23 @@ void CreateImage::Process()
 //      (the one provided in the attribute 'type' of the tag 'input')
 
 	
+       printf("EED CreateImage::Process Start\n");
+
 	double	spc[6];
 	int		dim[3];	
 	int		outputformat = VTK_UNSIGNED_SHORT;
 	
-	if (bbGetInputOutputFormat()=="VTK_BIT")					outputformat = VTK_BIT;
-	else if (bbGetInputOutputFormat()=="VTK_CHAR")				outputformat = VTK_CHAR;
+	if (bbGetInputOutputFormat()=="VTK_BIT")			outputformat = VTK_BIT;
+	else if (bbGetInputOutputFormat()=="VTK_CHAR")			outputformat = VTK_CHAR;
 	else if (bbGetInputOutputFormat()=="VTK_SIGNED_CHAR")		outputformat = VTK_SIGNED_CHAR;
 	else if (bbGetInputOutputFormat()=="VTK_UNSIGNED_CHAR")		outputformat = VTK_UNSIGNED_CHAR;
 	else if (bbGetInputOutputFormat()=="VTK_UNSIGNED_SHORT")	outputformat = VTK_UNSIGNED_SHORT;
-	else if (bbGetInputOutputFormat()=="VTK_INT")				outputformat = VTK_INT;
+	else if (bbGetInputOutputFormat()=="VTK_INT")			outputformat = VTK_INT;
 	else if (bbGetInputOutputFormat()=="VTK_UNSIGNED_INT")		outputformat = VTK_UNSIGNED_INT;
-	else if (bbGetInputOutputFormat()=="VTK_LONG")				outputformat = VTK_LONG;
+	else if (bbGetInputOutputFormat()=="VTK_LONG")			outputformat = VTK_LONG;
 	else if (bbGetInputOutputFormat()=="VTK_UNSIGNED_LONG")		outputformat = VTK_UNSIGNED_LONG;
-	else if (bbGetInputOutputFormat()=="VTK_FLOAT")				outputformat = VTK_FLOAT;
-	else if (bbGetInputOutputFormat()=="VTK_DOUBLE")			outputformat = VTK_DOUBLE;
+	else if (bbGetInputOutputFormat()=="VTK_FLOAT")			outputformat = VTK_FLOAT;
+	else if (bbGetInputOutputFormat()=="VTK_DOUBLE")		outputformat = VTK_DOUBLE;
 		
 	spc[0] = bbGetInputSpacing()[0];
 	spc[1] = bbGetInputSpacing()[1];
@@ -57,21 +86,33 @@ void CreateImage::Process()
 	imageoutput->SetDimensions(  dim[0], dim[1], dim[2] );
 	imageoutput->AllocateScalars();
 	
-		
+
 		int i,j,k;
+		long sizeBlock;	
+
 		for (i=0; i<dim[0]; i++)
 		{
-			for (j=0; j<dim[1]; j++)
-			{
-				for (k=0; k<dim[2]; k++)
-				{
-					imageoutput->SetScalarComponentFromDouble(i,j,k, 0, bbGetInputInitialValue() );
-				} // for k
-			} // for j
-		} // for i
+			imageoutput->SetScalarComponentFromDouble(i,0,0, 0, bbGetInputInitialValue() );
+		}
 		
+		sizeBlock= dim[0] * imageoutput->GetScalarSize();
+                for (j=1; j<dim[1]; j++)
+		{
+			memcpy(  imageoutput->GetScalarPointer(0,j,0), imageoutput->GetScalarPointer()  , sizeBlock );
+		}		
+
+		sizeBlock= dim[0] * dim[1] * imageoutput->GetScalarSize();
+		for (k=0; k<dim[2]; k++)
+		{
+			memcpy(  imageoutput->GetScalarPointer(0,0,k) ,imageoutput->GetScalarPointer()  , sizeBlock );
+		} // for k
+
+		imageoutput->Update();
+		imageoutput->Modified();
 		bbSetOutputOut(imageoutput);
 
+ printf("EED CreateImage::Process End\n");
+
 }	
 	
 //===== 
@@ -87,9 +128,9 @@ void CreateImage::bbUserSetDefaultValues()
 	dim.push_back(250);
 	dim.push_back(250);
 	std::vector<double> spc;
-	dim.push_back(1.0);
-	dim.push_back(1.0);
-	dim.push_back(1.0);
+	spc.push_back(1.0);
+	spc.push_back(1.0);
+	spc.push_back(1.0);
 	
 	bbSetInputDimensions(dim);
 	bbSetInputSpacing(spc);