From: guigues <guigues>
Date: Thu, 2 Oct 2008 07:03:30 +0000 (+0000)
Subject: *** empty log message ***
X-Git-Tag: v0.2.0~13
X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=commitdiff_plain;h=0f77ffb489a57c12a23d1afa592d07a37c41d8b5;p=creaImageIO.git

*** empty log message ***
---

diff --git a/src/creaImageIOWxGimmick.cpp b/src/creaImageIOWxGimmick.cpp
index 2bcc3ab..1acf888 100644
--- a/src/creaImageIOWxGimmick.cpp
+++ b/src/creaImageIOWxGimmick.cpp
@@ -1844,7 +1844,7 @@ namespace creaImageIO
 	    return false;
 	  }
       }
-    std::cout << "Selecting : "<<node->ImageGetFullFileName() << std::endl;
+    //    std::cout << "Selecting : "<<node->ImageGetFullFileName() << std::endl;
     return true;
   }
   //================================================================
@@ -2237,14 +2237,18 @@ namespace creaImageIO
 	  {   	
 	    // n2D to 3D
 	    vtkImageData* out = vtkImageData::New();
-	    out->CopyStructure(first);
+	    out->CopyStructure(first);	
+	    out->SetScalarType(first->GetScalarType());
 	    int ext[6];
 	    first->GetExtent(ext);
 	    ext[5] = im.size();
 	    out->SetExtent(ext);
+	    // LG : TODO : Z Spacing  ?
 	    
 	    out->AllocateScalars();
-	    out->Print(std::cout);
+	    
+	    //first->Print(std::cout);
+	    //	    out->Print(std::cout);
 	    
 	    int dim[3];
 	    first->GetDimensions(dim);
@@ -2252,17 +2256,36 @@ namespace creaImageIO
 	      ( (unsigned long)first->GetScalarPointer(0,1,0)
 		- (unsigned long)first->GetScalarPointer(0,0,0))
 	      *dim[1];
-	    std::cout << "imsize="<<imsize<<std::endl;
 
 	    int slice = 0;
 	    std::vector<DicomNode*>::iterator it;
 	    for (it=im.begin(); it!=im.end(); ++it) 
 	      {
+		//std::cout << "copying slice "<<slice <<std::endl;
 		vtkImageData* cur = mReader.GetImage( (*it)->ImageGetFullFileName() );
 		
 		void* src = cur->GetScalarPointer(0,0,0);
 		void* dst = out->GetScalarPointer(0,0,slice);
+		//		std::cout << "src="<<src<<std::endl;
+		//		std::cout << "dst="<<dst<<std::endl;
+		//		std::cout << "siz="<<imsize<<std::endl;
 		memcpy(dst,src,imsize);
+
+		/*
+		// verif
+		int ii,jj;
+		for (ii=1;ii<4;ii++) {
+		  for (jj=1;jj<4;jj++) {
+		    int x = (int)(ii*dim[0] / 4);
+		    int y = (int)(jj*dim[1] / 4);
+		    std::cout << cur->GetScalarComponentAsFloat(x,y,0,0)
+			      << " vs "
+			      << out->GetScalarComponentAsFloat(x,y,slice,0)
+			      << std::endl;
+		  }
+		}
+		*/
+
 		slice++;
 	      }
 	    f.push_back(out);