From 9ae1b3a039da8e28aa41c6963744bfa86c382a35 Mon Sep 17 00:00:00 2001
From: Juan Prieto <Juan.Prieto@creatis.insa-lyon.fr>
Date: Mon, 22 Jun 2009 13:40:48 +0000
Subject: [PATCH] *** empty log message ***

---
 src2/creaImageIOAbstractImageReader.h |   2 +-
 src2/creaImageIODicomImageReader.cpp  |   1 +
 src2/creaImageIODicomImageReader.h    |   2 +-
 src2/creaImageIOGimmickView.cpp       | 159 +++++++++++++-------------
 4 files changed, 83 insertions(+), 81 deletions(-)

diff --git a/src2/creaImageIOAbstractImageReader.h b/src2/creaImageIOAbstractImageReader.h
index e558560..c1c15ef 100644
--- a/src2/creaImageIOAbstractImageReader.h
+++ b/src2/creaImageIOAbstractImageReader.h
@@ -27,7 +27,7 @@ namespace creaImageIO
     const std::string& GetName() const { return mName; }
     virtual void PushBackExtensions(std::vector<std::string>&) {}
     virtual bool CanRead(const std::string& filename) { return false; }
-    virtual vtkImageData* ReadImage(const std::string& filename) { return 0; }
+    virtual vtkImageData* ReadImage(const std::string& filename) { return 0; }	
     virtual void ReadAttributes(const std::string& filename, 
 				tree::AttributeMapType& attr) {}
 
diff --git a/src2/creaImageIODicomImageReader.cpp b/src2/creaImageIODicomImageReader.cpp
index 95619e5..b95f27f 100644
--- a/src2/creaImageIODicomImageReader.cpp
+++ b/src2/creaImageIODicomImageReader.cpp
@@ -5,6 +5,7 @@
 #include "boost/filesystem/path.hpp"
 
 #include <creaImageIOTreeAttributeDescriptor.h>
+#include <vtkStringArray.h>
 
 namespace creaImageIO
 {
diff --git a/src2/creaImageIODicomImageReader.h b/src2/creaImageIODicomImageReader.h
index 1efd8a8..ee10caa 100644
--- a/src2/creaImageIODicomImageReader.h
+++ b/src2/creaImageIODicomImageReader.h
@@ -25,7 +25,7 @@ namespace creaImageIO
 
     virtual void PushBackExtensions(std::vector<std::string>&);
     virtual bool CanRead(const std::string& filename);
-    virtual vtkImageData* ReadImage(const std::string& filename);
+    virtual vtkImageData* ReadImage(const std::string& filename);	
     virtual void ReadAttributes(const std::string& filename, 
 				tree::AttributeMapType& attr);
 
diff --git a/src2/creaImageIOGimmickView.cpp b/src2/creaImageIOGimmickView.cpp
index 945b091..b0d9041 100644
--- a/src2/creaImageIOGimmickView.cpp
+++ b/src2/creaImageIOGimmickView.cpp
@@ -273,13 +273,12 @@ namespace creaImageIO
 
    //======================================================================
   ///Reads Images (Non Threaded)
-  void GimmickView::ReadImagesNotThreaded(std::vector<vtkImageData*>& s,std::vector<std::string> im, int dimension)
-  {
+void GimmickView::ReadImagesNotThreaded(std::vector<vtkImageData*>& s,std::vector<std::string> im, int dimension)
+{
 	  
 	// Create the output data
 	if (im.size()==1) 
-      {
-		  
+	{		  
 		// Only one image : give it
 		vtkImageData* out = vtkImageData::New();
 		GimmickDebugMessage(3, "State Check: Full Filename: "
@@ -287,67 +286,66 @@ namespace creaImageIO
 						<<std::endl);
 		out->ShallowCopy(mReader.GetImage(im.front()));
 		s.push_back( out );
-      }
-	  
+	}	  
     else if (im.size()>1)
-      {
-	vtkImageData* first = mReader.GetImage( im.front());
-	if (dimension==2) 
-	  {   	
-	    // n2D to 3D
-	    vtkImageData* out = vtkImageData::New();
-	    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();
-	    
-	    //first->Print(std::cout);
-	    //	    out->Print(std::cout);
-	    
-	    int dim[3];
-	    first->GetDimensions(dim);
-	    unsigned long imsize = 
-	      ( (unsigned long)first->GetScalarPointer(0,1,0)
-		- (unsigned long)first->GetScalarPointer(0,0,0))
-	      *dim[1];
-
-	    int slice = 0;
-		std::vector<std::string>::iterator it;
- 	   for (it=im.begin(); it!=im.end(); ++it) 
-	      {
-		//std::cout << "copying slice "<<slice <<std::endl;
-			  vtkImageData* cur = mReader.GetImage( (*it));
-		
-		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);
-
-		slice++;
-	      }
-	    s.push_back(out);
-	  }
-	else 
-	  {
-	    // n3D
+	{
+		vtkImageData* first = mReader.GetImage( im.front());
+		if (dimension == 2) 
+		{  
+		 // n3D
 		  std::vector<std::string>::iterator it;
-	    for (it=im.begin(); it!=im.end(); ++it) 
-	      {
-		vtkImageData* out = vtkImageData::New();
-		out->ShallowCopy(mReader.GetImage(*it));
-		s.push_back(out);
-	      }
-	  }
-      }
-	
-  }
+			for (it=im.begin(); it!=im.end(); ++it) 
+			{
+				vtkImageData* out = vtkImageData::New();
+				out->ShallowCopy(mReader.GetImage(*it));
+				s.push_back(out);
+			}
+		}	  
+		else 
+		{
+			// n2D to 3D
+			vtkImageData* out = vtkImageData::New();
+			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();
+
+			//first->Print(std::cout);
+			//	    out->Print(std::cout);
+
+			int dim[3];
+			first->GetDimensions(dim);
+			unsigned long imsize = 
+				( (unsigned long)first->GetScalarPointer(0,1,0)
+			- (unsigned long)first->GetScalarPointer(0,0,0))
+				*dim[1];
+
+			int slice = 0;
+			std::vector<std::string>::iterator it;
+			for (it=im.begin(); it!=im.end(); ++it) 
+				{
+			//std::cout << "copying slice "<<slice <<std::endl;
+					vtkImageData* cur = mReader.GetImage( (*it));
+
+			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);
+
+			slice++;
+				}
+			s.push_back(out);
+
+		}
+	}	
+}
   //======================================================================
 
   //======================================================================
@@ -376,28 +374,31 @@ namespace creaImageIO
 			"MultiThreadImageReader event : "<<e<<std::endl);
 	if (e==ImageLoaded)
 	{
-    if (filename.size()==0)
-      {
+		if (filename.size()==0)
+		{
 		  //What to do in this case?
 		  /*
 		GimmickDebugMessage(5,
 					"Pushing unknown image in queue"
 					<<std::endl);
 		mImageEventQueue.push_back(ImageEventType(image));*/
-		return;
-      }
-    ImageEventTypeMap::iterator i;
-    i = mImageEventMap.find(filename);
-    if (i!=mImageEventMap.end())
-      {
-		GimmickDebugMessage(5,
-					"Putting image of file '"<<filename<<"' on pointer"
-					<<std::endl);
-		ImageEventType ie(i->second);
-		ie.image = image;
-		ie.pointerHolder->Set(ie.image);
-		//mImageEventMap.erase(i);
-      }
+			return;
+		}
+		ImageEventTypeMap::iterator i;
+//JCP 22-06-2009, test mImageEventMap.size() > 0
+		if(mImageEventMap.size()>0){
+			i = mImageEventMap.find(filename);
+			if (i!=mImageEventMap.end())
+			{
+				GimmickDebugMessage(5,
+							"Putting image of file '"<<filename<<"' on pointer"
+							<<std::endl);
+				ImageEventType ie(i->second);
+				ie.image = image;
+				ie.pointerHolder->Set(ie.image);
+				//mImageEventMap.erase(i);
+			}
+		}    
 	}
 	else if (e==Error)
 	{
-- 
2.45.0