From 71365e2ce56b1ccf93054818d5d5cf64bcbaafb4 Mon Sep 17 00:00:00 2001
From: Frederic Cervenansky <Frederic.Cervenansky@creatis.insa-lyon.fr>
Date: Fri, 17 Apr 2009 08:53:14 +0000
Subject: [PATCH] =?utf8?q?correction=20sur=20la=20s=E9lection.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

---
 src2/creaImageIOWxGimmickView.cpp |  3 +--
 src2/creaImageIOWxTreeView.cpp    | 26 +++++++++++++-------------
 2 files changed, 14 insertions(+), 15 deletions(-)

diff --git a/src2/creaImageIOWxGimmickView.cpp b/src2/creaImageIOWxGimmickView.cpp
index f5d50c9..dd8745f 100644
--- a/src2/creaImageIOWxGimmickView.cpp
+++ b/src2/creaImageIOWxGimmickView.cpp
@@ -575,8 +575,7 @@ namespace creaImageIO
   //=================================================
   void WxGimmickView::OnRemove(wxCommandEvent& event)
   {
-    modifyValidationSignal(false);
-	//TODO Select current tree handler       
+  	//TODO Select current tree handler       
     wxBusyCursor busy;
     GetTreeViewMap()["Local database"]->RemoveSelected();
 
diff --git a/src2/creaImageIOWxTreeView.cpp b/src2/creaImageIOWxTreeView.cpp
index 505bf80..7e2cb86 100644
--- a/src2/creaImageIOWxTreeView.cpp
+++ b/src2/creaImageIOWxTreeView.cpp
@@ -6,9 +6,6 @@
 #include <boost/date_time/gregorian/gregorian.hpp>
 
 
-
-
-
 const std::string empty_string("");
 
 //=====================================================================
@@ -163,12 +160,12 @@ namespace creaImageIO
 					  ctrl_style);
 	level.wxCtrl = ctrl;
 	level.wxSplitter->Initialize(ctrl);
-
-
+   
 	// Create the columns : one for each attribute of the level
 	int col = 0;
 	std::string title;
-	tree::LevelDescriptor::AttributeDescriptorListType::const_iterator a;
+
+  	tree::LevelDescriptor::AttributeDescriptorListType::const_iterator a;
 	for (a  = handler->GetTree().GetAttributeDescriptorList(i+1).begin();
 	     a != handler->GetTree().GetAttributeDescriptorList(i+1).end();
 	     ++a)
@@ -197,16 +194,13 @@ namespace creaImageIO
 		  std::string temp = a->GetKey();
 		  if (temp.compare("ID") != 0)
 		  {
+		
 		ctrl->InsertColumn(col, 
 				   crea::std2wx(title),
 				   col_style);
 		col++;
 		  }
 		level.key.push_back(a->GetKey());
-
-		//	    ctrl->SetColumnWidth(col, wxLIST_AUTOSIZE );
-
-		
 	      }
 		
 	  }
@@ -343,6 +337,7 @@ namespace creaImageIO
 	      }
 	    if(erase)
 		  {
+            GetGimmickView()->modifyValidationSignal(false);
 		    bool needRefresh=false;
 		    std::vector<tree::Node*>::const_iterator i;
 		    for (i=sel.begin(); i!=sel.end(); ++i)
@@ -525,6 +520,9 @@ namespace creaImageIO
 	if ( GetCtrl(level) == obj ) break;
       } 
     SetSelectedUpToDate(level,false);
+	// to allow a first selection in images TreeView
+	if (level==mLevelList.size()-1) 
+		 OnItemSelected(event);
   }
   //================================================================
 
@@ -711,7 +709,7 @@ namespace creaImageIO
       {
 	mLevelList[level].SortAscending = false;
       }
-    
+	  
     SortLevel(level);
   }
   //================================================================
@@ -897,8 +895,10 @@ namespace creaImageIO
   {
 	  if(event.GetKeyCode() == WXK_DELETE)
 	  {
-		    RemoveSelected();
-		//	ClearSelection();
+		   wxBusyCursor busy;
+		  
+		   RemoveSelected();
+		   GetGimmickView()->ClearSelection();
 	  }
 		  
   }
-- 
2.45.0