X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=src%2FcreaImageIOWxGimmickView.cpp;fp=src%2FcreaImageIOWxGimmickView.cpp;h=0e2fa1e537a7005d5695f4f288d2a26f58d1f866;hb=f5a8c7765cb23e949c7fe124a4b8a3b87b2d35ad;hp=11e8c8889850810d9bf1d5cb1dd9a2f3436bb293;hpb=7a7bbac184759163de981962bed465ae1d71f84b;p=creaImageIO.git

diff --git a/src/creaImageIOWxGimmickView.cpp b/src/creaImageIOWxGimmickView.cpp
index 11e8c88..0e2fa1e 100644
--- a/src/creaImageIOWxGimmickView.cpp
+++ b/src/creaImageIOWxGimmickView.cpp
@@ -659,9 +659,7 @@ namespace creaImageIO
   //=================================================
   void WxGimmickView::OnSelectionChange(const std::vector<tree::Node*>& sel, bool isSelection, int selection, bool needProcess)
   {      
-    GimmickDebugMessage(5,
-			"WxGimmickView::OnSelectionChange"
-			<<std::endl);
+	GimmickDebugMessage(5,"WxGimmickView::OnSelectionChange"<<std::endl);
     wxBusyCursor busy;
 	bool valid=true;
 	
@@ -670,9 +668,7 @@ namespace creaImageIO
 		valid= ValidateSelected(NULL,
 				mSelectionMinDimension,
 				mSelectionMaxDimension );
-	}
-	else if(needProcess)
-	{
+	} else if(needProcess) {
 		ResetExtent();
 		std::vector<tree::Node*>::const_iterator i;
 		for(i=sel.begin();i!=sel.end()&&valid;++i)
@@ -680,16 +676,12 @@ namespace creaImageIO
 			valid= ValidateSelected((*i),
 				mSelectionMinDimension,
 				mSelectionMaxDimension );
-		}
-	}
-	else if(isSelection)
-	{
+		} // for
+	} else if(isSelection) {
 		valid= ValidateSelected(sel.front(),
 				mSelectionMinDimension,
 				mSelectionMaxDimension );
-	}
-	else
-	{
+	} else {
 		ResetExtent();
 		std::vector<tree::Node*>::const_iterator i;
 		for(i=sel.begin();i!=sel.end()&&valid;++i)
@@ -697,22 +689,22 @@ namespace creaImageIO
 			valid= ValidateSelected((*i),
 				mSelectionMinDimension,
 				mSelectionMaxDimension );
-		}
-	}
+		} // for 
+	} // if sel.size 
 	mText->SetLabel(crea::std2wx(GetMessage()));
-    /*if(valid)
-      {
-	ReadImageThreaded(sel);
-      }
-    else
-      {
-		  ClearSelection();
-      }*/
+/*
+	if(valid)
+    {
+		ReadImageThreaded(sel);
+    } else {
+		ClearSelection();
+    }
+*/
+	  
 	  
-  printf("EED Warnning WxGimmickView::OnSelectionChange ....... To avoid threads conflicts//ReadImageThreaded(sel)\n ");
+//EED1 2018-08  
 //EED1	ReadImageThreaded(sel);
 
-
    }
 
   //==================================================
@@ -784,17 +776,15 @@ namespace creaImageIO
 		RequestReading(*iterDown,prio,-1,ph);
 		//		AddEntryToMap(*iterDown);
 		prio--;
-		if (prio == maxprio) break;
-	}
-   }
-   else
-   {
+		if (prio == maxprio) { break; }
+	} // for
+   } else {
 	   pointers.clear();
 	   //ImagePointerHolder* ph=new ImagePointerHolder(GetDefaultImage());
 	   boost::shared_ptr<ImagePointerHolder> ph(new ImagePointerHolder(GetDefaultImage()));
 	   pointers.push_back(ph);
 	   mViewer->SetImageVector(pointers);
-   }
+   } // if
   }
 
   //==================================================
@@ -832,12 +822,14 @@ namespace creaImageIO
   //==================================================
    void  WxGimmickView::ClearSelection()
    {
+printf("EED WxGimmickView::ClearSelection Start\n");	   
 	pointers.clear();
 	pointers.push_back(boost::shared_ptr<creaImageIO::ImagePointerHolder>(new ImagePointerHolder(GetDefaultImage())));
 	//pointers.push_back(new ImagePointerHolder(GetDefaultImage()));
 	mViewer->SetImageVector(pointers);
 	mViewer->RefreshIfNecessary();
 	ResetExtent();
+printf("EED WxGimmickView::ClearSelection End\n");	   
   }
 
   //=================================================