X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=src2%2FcreaImageIOGimmickView.cpp;h=c7e0cf15c0f1aedb86f6ee447a76b2b70e24abae;hb=da80530068246081505e9649523d10e8da8e6acd;hp=68dfb92b016ac89b33f232070c949f83a12f052d;hpb=45cfee3cd71c734acb1d5041bfb31301d360e89b;p=creaImageIO.git

diff --git a/src2/creaImageIOGimmickView.cpp b/src2/creaImageIOGimmickView.cpp
index 68dfb92..c7e0cf1 100644
--- a/src2/creaImageIOGimmickView.cpp
+++ b/src2/creaImageIOGimmickView.cpp
@@ -114,7 +114,7 @@ namespace creaImageIO
   /// Create a tree view with a given name
   void GimmickView::CreateSingleTreeView(std::string &i_name)
   {
-		this->CreateTreeView(mGimmick->GetTreeHandlerMap()[i_name]);
+	this->CreateTreeView(mGimmick->GetTreeHandlerMap()[i_name]);
      
   }
 
@@ -135,6 +135,7 @@ namespace creaImageIO
       }
     i->second->UpdateLevel(l);    
   }
+
   //======================================================================
   /// Clears the status and begins a new selection process
   void GimmickView::ResetExtent()
@@ -146,7 +147,6 @@ namespace creaImageIO
 	  valid=true;
   }
 
-
   //======================================================================
   
   //======================================================================
@@ -204,9 +204,9 @@ namespace creaImageIO
 	else
 	{
 		boost::shared_ptr<ImageExtent> ie=boost::shared_ptr<ImageExtent>(new ImageExtent((*sel).GetAttribute("D0028_0010"),
-			                         (*sel).GetAttribute("D0028_0011"),
-									 (*sel).GetAttribute("D0028_0012"), 
-									 ""));
+			                         			(*sel).GetAttribute("D0028_0011"),
+									(*sel).GetAttribute("D0028_0012"), 
+									""));
 	if(mImageExtent==0)
 	{
 		mImageExtent=ie;
@@ -218,7 +218,7 @@ namespace creaImageIO
 		{
 			std::stringstream out;
 			out << mImageExtent->GetDimension() << "D image " << mImageExtent->Get(0) << "x"<< mImageExtent->Get(1) << "x"<< mImageExtent->Get(2) <<" selected";
-	        mMessage = out.str();
+	        	mMessage = out.str();
 			mImageExtent->SetDimension(2);
 			valid=true;
 		}
@@ -254,10 +254,10 @@ namespace creaImageIO
 			}
 			else
 			{
-            mImageExtent->Add(*ie);
-			std::stringstream out;
-			out << mImageExtent->GetDimension() << "D image " << mImageExtent->Get(0) << "x"<< mImageExtent->Get(1) << "x"<< mImageExtent->Get(2) <<" selected";
-	        mMessage = out.str();
+            			mImageExtent->Add(*ie);
+				std::stringstream out;
+				out << mImageExtent->GetDimension() << "D image " << mImageExtent->Get(0) << "x"<< mImageExtent->Get(1) << "x"<< mImageExtent->Get(2) <<" selected";
+	        		mMessage = out.str();
 			}
 		}
 		else
@@ -289,15 +289,15 @@ void GimmickView::ReadImagesNotThreaded(std::vector<vtkImageData*>& s, std::vect
 		// Only one image : give it
 		vtkImageData* out = vtkImageData::New();
 		GimmickDebugMessage(3, "State Check: Full Filename: "
-						<<im.front()
-						<<std::endl);
+					<<im.front()
+					<<std::endl);
 		out->ShallowCopy(mReader.GetImage(im.front()));
 		s.push_back( out );
 	}	  
     	else if (im.size()>1) // Test inutile ? JPR
 	{
 		vtkImageData* first = mReader.GetImage( im.front());
-		if (dimension == 2) 
+		if (dimension == 2)
 		{  
 		 // n3D
 		    std::vector<std::string>::iterator it;
@@ -315,7 +315,13 @@ void GimmickView::ReadImagesNotThreaded(std::vector<vtkImageData*>& s, std::vect
 			out->CopyStructure(first);	
 			out->SetScalarType(first->GetScalarType());
 			int ext[6];
-			first->GetExtent(ext);
+			//first->GetExtent(ext);  // JPR
+			first->GetWholeExtent(ext);
+std::cout <<"in GimmickView::ReadImagesNotThreaded GetWholeExtent ext =";
+for (int jjj=0;jjj<6;jjj++)
+	std:cout << "   [" << jjj << "]=" << ext[jjj];
+std::cout << endl;
+			
 			if(ext[5] == 0)
 			{
 				ext[5] = im.size()-1;