X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=src2%2FcreaImageIOWxGimmickView.cpp;h=2d8785147b5754b69a9c2d69bc715f89acbd8f31;hb=fc165c73bc8482c01caeee7c67405962f846a9b6;hp=cd23af7625236228405a889ff5be677d6f27d310;hpb=82026cc5a9a36392c481513cd86091714eca51d1;p=creaImageIO.git

diff --git a/src2/creaImageIOWxGimmickView.cpp b/src2/creaImageIOWxGimmickView.cpp
index cd23af7..2d87851 100644
--- a/src2/creaImageIOWxGimmickView.cpp
+++ b/src2/creaImageIOWxGimmickView.cpp
@@ -371,24 +371,60 @@ namespace creaImageIO
   //=================================================
 
   //=================================================
-  void WxGimmickView::OnSelectionChange(std::vector<tree::Node*>& sel)
+  void WxGimmickView::OnSelectionChange(std::vector<tree::Node*>& sel, bool isSelection, int selection, bool needProcess)
   {      
     GimmickDebugMessage(5,
 			"WxGimmickView::OnSelectionChange"
 			<<std::endl);
     wxBusyCursor busy;
-    bool valid = ValidateSelected(sel,
-				  mSelectionMinDimension,
-				  mSelectionMaxDimension );
+	bool valid=true;
+	
+	if(sel.size()==0)
+	{
+		
+		valid= ValidateSelected(NULL,
+				mSelectionMinDimension,
+				mSelectionMaxDimension );
+	}
+	else if(needProcess)
+	{
+		ClearStatus();
+		std::vector<tree::Node*>::iterator i;
+		for(i=sel.begin();i!=sel.end()&&valid;++i)
+		{
+			valid= ValidateSelected((*i),
+				mSelectionMinDimension,
+				mSelectionMaxDimension );
+		}
+	}
+	else if(isSelection)
+	{
+		valid= ValidateSelected(sel.front(),
+				mSelectionMinDimension,
+				mSelectionMaxDimension );
+	}
+	else
+	{
+		ClearStatus();
+		std::vector<tree::Node*>::iterator i;
+		for(i=sel.begin();i!=sel.end()&&valid;++i)
+		{
+			valid= ValidateSelected((*i),
+				mSelectionMinDimension,
+				mSelectionMaxDimension );
+		}
+	}
+	
     mText->SetLabel(crea::std2wx(GetMessage()));
-    if(valid)
+    /*if(valid)
       {
 	ReadImageThreaded(sel);
       }
     else
       {
 		  ClearSelection();
-      }
+      }*/
+	ReadImageThreaded(sel);
 
     
    }
@@ -462,6 +498,13 @@ namespace creaImageIO
 		if (prio == maxprio) break;
 	}
    }
+   else
+   {
+	   pointers.clear();
+	   ImagePointerHolder* ph=new ImagePointerHolder(GetDefaultImage());
+	   pointers.push_back(ph);
+	   mViewer->SetImageVector(pointers);
+   }
   }
 
   //==================================================
@@ -479,7 +522,10 @@ namespace creaImageIO
      }
    //   GimmickMessage(1,"WxGimmickView : Refresh viewer"<<std::endl);
 	//  mViewer->StartPlayer();
-	mViewer->RefreshIfNecessary();
+   if(mViewer)
+   {
+	   mViewer->RefreshIfNecessary();
+   }
   }
 
    //==================================================
@@ -491,6 +537,7 @@ namespace creaImageIO
 	pointers.push_back(new ImagePointerHolder(GetDefaultImage()));
 	mViewer->SetImageVector(pointers);
 	mViewer->RefreshIfNecessary();
+	ClearStatus();
   }
   
   //=================================================