X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=src2%2FcreaImageIOWxTreeView.cpp;h=cb53f3310b4964c785af46e60dffe78323cf70d1;hb=2af28133d2a0a10cf6377030a6c49e5c3c463a34;hp=18ced63630fae13fc05b87a03b46e45ed8587939;hpb=cac026929f2431aa4a966bf9ae3c8ff263f5dd63;p=creaImageIO.git

diff --git a/src2/creaImageIOWxTreeView.cpp b/src2/creaImageIOWxTreeView.cpp
index 18ced63..cb53f33 100644
--- a/src2/creaImageIOWxTreeView.cpp
+++ b/src2/creaImageIOWxTreeView.cpp
@@ -3,62 +3,103 @@
 #include <creaImageIOSystem.h>
 #include <wx/splitter.h>
 #include <wx/gdicmn.h>
+
+const std::string empty_string("");
+
+//=====================================================================
+namespace creaImageIO
+{
+  //=====================================================================
+  /// Data stored by the list items
+  struct ItemData
+  {
+    ItemData() : node(0), id(-1), attr(&empty_string) {}
+    // The corresponding Node
+    tree::Node* node;
+    // The id ?
+    int id;
+    // The pointer on the current attribute string to sort on
+    const std::string* attr;
+    // Was the item previously selected ?
+    // Useful for reselecting the item after sort
+    bool selected;
+  };
+  //=====================================================================
+}
+//=====================================================================
+
+//=====================================================================
 ///Comparing function for ordering algorithm. Takes parameters as strings.
 int wxCALLBACK CompareFunctionStrings(long item1, long item2, long sortData)
 {	
-	std::string s1((char*)((long*)item1)[1]);
-	std::string s2((char*)((long*)item2)[1]);
-	if(sortData==1)
-	{
-		// inverse the order
-		if (s1 < s2)
-			return 1;
-		if (s1 > s2)
-			return -1;
-
-		return 0;
-	}
-	else
-	{
-		if (s1 < s2)
-			return -1;
-		if (s1 > s2)
-			return 1;
-
-		return 0;
+  creaImageIO::ItemData* data1 = (creaImageIO::ItemData*)item1;
+  creaImageIO::ItemData* data2 = (creaImageIO::ItemData*)item2;
 
-	}
-	
+  const std::string& s1(*(data1->attr));
+  const std::string& s2(*(data2->attr));
+  if(sortData==1)
+    {
+      // inverse the order
+      if (s1 < s2)
+	return 1;
+      if (s1 > s2)
+	return -1;
+      
+      return 0;
+    }
+  else
+    {
+      if (s1 < s2)
+	return -1;
+      if (s1 > s2)
+	return 1;
+      
+      return 0;
+      
+    }
 }
+//=====================================================================
 
+//=====================================================================
 ///Comparing function for ordering algorithm. Takes parameters as ints.
 int wxCALLBACK CompareFunctionInts(long item1, long item2, long sortData)
 {	
-	int val1=atoi((char*)((long*)item1)[1]);
-	int val2=atoi((char*)((long*)item2)[1]);
-	if(sortData==1)
-	{
-		// inverse the order
-		if (val1 < val2)
-			return 1;
-		if (val1 > val2)
-			return -1;
+  creaImageIO::ItemData* data1 = (creaImageIO::ItemData*)item1;
+  creaImageIO::ItemData* data2 = (creaImageIO::ItemData*)item2;
 
-		return 0;
-	}
-	else
-	{
-		if (val1 < val2)
-			return -1;
-		if (val1 > val2)
-			return 1;
+  const std::string& s1(*(data1->attr));
+  const std::string& s2(*(data2->attr));
 
-		return 0;
+  int val1=atoi(s1.c_str());
+  int val2=atoi(s2.c_str());
 
-	}
-	
+  if(sortData==1)
+    {
+      // inverse the order
+      if (val1 < val2)
+	return 1;
+      if (val1 > val2)
+	return -1;
+      
+      return 0;
+    }
+  else
+    {
+      if (val1 < val2)
+	return -1;
+      if (val1 > val2)
+	return 1;
+
+      return 0;
+      
+    }
+  
 }
 
+//=====================================================================
+
+
+//=====================================================================
 namespace creaImageIO
 {
   //=====================================================================
@@ -94,6 +135,8 @@ namespace creaImageIO
 	GimmickDebugMessage(5,"Creating view for level "<<i
 			    <<std::endl);
 	LevelType level;
+	level.SelectedUpToDate = true;
+	level.SortColumn = 0;
 
 	// If the first level : parent = this
 	wxWindow* sparent = this;
@@ -101,6 +144,10 @@ namespace creaImageIO
 	if (i>1) sparent = mLevelList[i-2].wxSplitter;
 
 	level.wxSplitter = new wxSplitterWindow( sparent , -1);
+	if(i!=1)
+	{
+	level.wxSplitter->Show(false);
+	}
 	//	    level.wxSplitter->SetMinimumPaneSize(100);
 	
 	wxListCtrl* ctrl = new wxListCtrl(level.wxSplitter,
@@ -111,37 +158,45 @@ namespace creaImageIO
 	level.wxCtrl = ctrl;
 	level.wxSplitter->Initialize(ctrl);
 
-	// Create the first column : number of children
-	if(i<handler->GetTree().GetNumberOfLevels()-1)
-	{
-	std::string title = "#";
-	if (i<handler->GetTree().GetNumberOfLevels()-1)
-	  {
-	    title += handler->GetTree().GetLevelDescriptor(i+1).GetName();
-	    if (title[title.size()-1]!='s')
-	      title += "s";
-	  }
-	ctrl->InsertColumn(0,crea::std2wx(title),col_style);
-	}
 
 	// Create the columns : one for each attribute of the level
-	int col = 1;
+	int col = 0;
+	std::string title;
 	tree::LevelDescriptor::AttributeDescriptorListType::const_iterator a;
 	for (a  = handler->GetTree().GetAttributeDescriptorList(i).begin();
 	     a != handler->GetTree().GetAttributeDescriptorList(i).end();
 	     ++a)
 	  {
 	
-		GimmickDebugMessage(5,"Creating column "<<col<<" : "
+	    GimmickDebugMessage(5,"Creating column "<<col<<" : "
 				<<a->GetName()
 				<<std::endl);
+	    
+	    if(a->GetFlags()!=creaImageIO::tree::AttributeDescriptor::PRIVATE)
+	      {
+		
+		if(a->GetName()=="UNKNOWN")
+		  {
+		    title = "#";
+		    title += handler->GetTree().GetLevelDescriptor(i+1).GetName();
+		    if (title[title.size()-1]!='s')
+		      title += "s";
+		    
+		  }
+		else
+		  {
+		    title=a->GetName();
+		  }
+		
 		ctrl->InsertColumn(col, 
-				crea::std2wx(a->GetName()),
-				col_style);
+				   crea::std2wx(title),
+				   col_style);
 		level.key.push_back(a->GetKey());
+
 		//	    ctrl->SetColumnWidth(col, wxLIST_AUTOSIZE );
+
 		col++;
-		
+	      }
 		
 	  }
 	  
@@ -164,14 +219,16 @@ namespace creaImageIO
 #endif // wxUSE_MENUS
 
 
-    /// Initialize the first level splitter
- 
-      sizer->Add( mLevelList[0].wxSplitter ,1, wxGROW  ,0);
-	mColumnSelected=1;
+	/// Initialize the first level splitter
+	  
+	sizer->Add( mLevelList[0].wxSplitter ,1, wxGROW  ,0);
+	//	mColumnSelected=1;
 	mLastSelected=0;
-	mDirection=true;
-	mSelectionMade=false;
-	mProcess=true;
+	mLastLevel=0;
+	//	mDirection=true;
+
+	mIgnoreSelectedChanged = false;
+
 	//CreateColorPalette();
     UpdateLevel(1);
 
@@ -192,20 +249,17 @@ namespace creaImageIO
   //=====================================================================
   
   
+  
   //=====================================================================
-  struct ItemData
-  {
-    tree::Node* node;
-	int id;
-  };
- 
-  //=====================================================================
-   std::vector<tree::Node*> WxTreeView::GetSelected(int level)
+   const std::vector<tree::Node*>& WxTreeView::GetSelected(int level)
   {
+    //  if (GetSelectedUpToDate(level)) 
+    
     int l = level - 1;
     // the selection of upper level
-    std::vector<tree::Node*> sel;
-	
+    std::vector<tree::Node*>& sel(mLevelList[level-1].Selected);
+    sel.clear();
+
     if (level == 1) 
       {
 	sel.push_back(GetTreeHandler()->GetTree().GetTree());
@@ -233,51 +287,86 @@ namespace creaImageIO
 	  }	
       }
 	 
-	  return sel;
+    //    return mLevelList[level-1].Selected;
+    return sel;
   }
 
   //=====================================================================
   
-  ///Removes selected nodes on given level
-  void WxTreeView::RemoveSelected( int level )
+  //=====================================================================
+  ///Removes selected nodes on last selected level
+   // NOT SPECIFIC 
+  void WxTreeView::RemoveSelected()
   {
-	  std::vector<tree::Node*> sel=GetSelected(level+1);
-	  bool erase=false;
-	  if (wxMessageBox(_T("Delete file(s) ?"),
-			 _T("Remove Files"),
-			 wxYES_NO,this ) == wxYES)
-	  {
-	    erase = true;
-	  }
-	  if(erase)
+    mLastLevel+=1;
+    const std::vector<tree::Node*>& sel=GetSelected(mLastLevel+1);
+    bool erase=false;
+    std::stringstream out;
+    std::string levelName=GetTreeHandler()->GetTree().GetLevelDescriptor(mLastLevel).GetName();
+    out<<"Delete ";
+    out<<sel.size();
+    if(sel.size()>1&&levelName.at(levelName.size()-1)!='s')
+      {
+	out<<" "<<levelName;
+	out<<"s?";
+      }
+    else
+      {
+	out<<" "<<GetTreeHandler()->GetTree().GetLevelDescriptor(mLastLevel).GetName()<<"?";
+      }
+    if (wxMessageBox(crea::std2wx(out.str()),
+		     _T("Remove Files"),
+		     wxYES_NO,this ) == wxYES)
+      {
+	erase = true;
+      }
+    if(erase)
 	  {
-		std::vector<tree::Node*>::iterator i;
-		for (i=sel.begin(); i!=sel.end(); ++i)
-		{
-			GimmickDebugMessage(2,
-					"deleting '"
-					<<(*i)->GetLabel()
-					<<"'"<<level
-					<<std::endl);
-				GetTreeHandler()->Remove(*i);
-		}
-
-		UpdateLevel(level);
+	    bool needRefresh=false;
+	    std::vector<tree::Node*>::const_iterator i;
+	    for (i=sel.begin(); i!=sel.end(); ++i)
+	      {
+		GimmickMessage(1,
+			       "deleting '"
+			       <<(*i)->GetLabel()
+			       <<"'"<<mLastLevel
+			       <<std::endl);
+		if((*i)->GetParent()->GetNumberOfChildren()<2)
+		  {
+		    needRefresh=true;
+		  }
+		GetTreeHandler()->Remove(*i);
+	      }
+	    
+	    if(needRefresh && mLastLevel>1)
+	      {
+		UpdateLevel(mLastLevel-2);
+	      }
+	    else if(mLastLevel>1)
+	      {
+		UpdateLevel(mLastLevel-1);
+	      }
+	    else
+	      {
+		UpdateLevel(mLastLevel);
+	      }
 	  }
-	  
-  }
     
-
+  }
+  
+  
   //=====================================================================
 
  
   //=====================================================================
-  /// Updates a level of the view (adds or removes children, proganizes, etc.)
+  /// Updates a level of the view (adds or removes children, etc.)
   void WxTreeView::UpdateLevel( int level )
   {
     GimmickDebugMessage(1,
 			GetTreeHandler()->GetTree().GetLabel()
-			<<" view : updating level "<<level
+			<<"WxTreeView::UpdateLevel(level "
+			<<level
+			<<")"
 			<<std::endl);
     
     wxBusyCursor busy;
@@ -294,28 +383,28 @@ namespace creaImageIO
   }
   //=====================================================================
   
+ //=====================================================================
   /// Recursive method called upon by UpdateLevel to refresh all windows
   void WxTreeView::RecursiveUpdateLevel( int level )
   {
-	  GimmickDebugMessage(2,
+    GimmickDebugMessage(1,
 			GetTreeHandler()->GetTree().GetLabel()
-			<<" view : updating level (recursive)"<<level
-			<<std::endl);
-
+			<<"WxTreeView::RecursiveUpdateLevel(level "
+			<<level
+			<<")"<<std::endl);
+    
 
-    std::vector<tree::Node*> sel=GetSelected(level);
+    const std::vector<tree::Node*>& sel(GetSelected(level));
 
-	  int l = level - 1;
+    int l = level - 1;
  
     // to speed up inserting we hide the control temporarily
     GetCtrl(l)->Hide();
     GetCtrl(l)->DeleteAllItems();
     
-    std::vector<tree::Node*>::iterator i;
-	
-    //Adds the first item (filter)
-   
-	for (i=sel.begin(); i!=sel.end(); ++i)
+    std::vector<tree::Node*>::const_iterator i;
+    
+    for (i=sel.begin(); i!=sel.end(); ++i)
       {
 	GimmickDebugMessage(2,
 			    "adding children of '"
@@ -324,91 +413,92 @@ namespace creaImageIO
 			    <<std::endl);
 	int _id=1;
 	
-	//Adds items (other than the first) and sets their attributes 
-	   GetCtrl(l)->InsertItem(0, _T(""));
+	//Adds items and sets their attributes 
+	//GetCtrl(l)->InsertItem(0, _T(""));
 	GetTreeHandler()->LoadChildren(*i,1);
 	tree::Node::ChildrenListType::reverse_iterator j;
 	for (j = (*i)->GetChildrenList().rbegin(); 
 	     j!= (*i)->GetChildrenList().rend(); 
 	     ++j)
 	  {
-		  	 wxListItem* item= new wxListItem;
+	    wxListItem* item= new wxListItem;
 	    item->SetMask(wxLIST_MASK_STATE | 
-			 wxLIST_MASK_TEXT |
-			 //			 wxLIST_MASK_IMAGE |
-			 wxLIST_MASK_DATA |
+			  wxLIST_MASK_TEXT |
+			  //			 wxLIST_MASK_IMAGE |
+			  wxLIST_MASK_DATA |
 			 //			 wxLIST_MASK_WIDTH |
-			 wxLIST_MASK_FORMAT
-			 );
-	   
+			  wxLIST_MASK_FORMAT
+			  );
+	    
 	    ItemData* data = new ItemData;
 	    
-		data->node = *j;
-		item->SetId(_id);
-
-		data->id = _id;
+	    data->node = *j;
+	    item->SetId(_id);
+	    
+	    data->id = _id;
 	    item->SetData(data);
 	    
-		_id++;
-		
-		
-		//Setting first column (number of children)
-	    std::ostringstream oss;
-	    int	n= 0; //GetTreeHandler()->GetNumberOfChildren(*j);
-	    oss << n;
-	    std::string s(oss.str());
-	    item->SetText( crea::std2wx(s));		
-
-	    item->SetColumn(0);
-		 GetCtrl(l)->InsertItem(*item);
-		//GetCtrl(l)->SetItem(item);
-		
-		//Setting other attributes
-		if(level<mLevelList.size())
-		{ 
-		for (int k=1; k<GetCtrl(l)->GetColumnCount(); k++)
-	      {
-			std::string val = (*j)->GetAttribute(mLevelList[l].key[k-1]);
-			if (val.size()==0) val = "?";
-			item->SetText( crea::std2wx(val));
-			item->SetColumn(k);
-			GetCtrl(l)->SetItem(*item);
-			// Unefficient
-			//			GetCtrl(l)->RefreshItem(*item);
-	      }	
-		}
-		else
-		{
-			for (int k=0; k<GetCtrl(l)->GetColumnCount(); k++)
+	    _id++;
+	    GetCtrl(l)->InsertItem(*item);
+	    
+	    //Setting attributes
+	    
+	    for (int k=0; k<GetCtrl(l)->GetColumnCount(); k++)
 	      {
-			std::string val = (*j)->GetAttribute(mLevelList[l].key[k]);
-			if (val.size()==0) val = "?";
-			item->SetText( crea::std2wx(val));
-			item->SetColumn(k);
-			GetCtrl(l)->SetItem(*item);	
-			//			GetCtrl(l)->RefreshItem(*item);
+		std::string val = (*j)->GetAttribute(mLevelList[l].key[k]);
+		if (val.size()==0) val = "?";
+		item->SetText( crea::std2wx(val));
+		item->SetColumn(k);
+		GetCtrl(l)->SetItem(*item);
 	      }	
-		}
-		  
+	    
 	  }
-	GetCtrl(l)->DeleteItem(0);
+	//GetCtrl(l)->DeleteItem(0);
       }
     
+
+    SortLevel(l);
     GetCtrl(l)->Show();
+
+
     
-    //  if (level<mLevelList.size()) UpdateLevel(level+1);
-	
  }
   //=====================================================================
 
 
   //================================================================
-  void WxTreeView::OnSelectedChanged(wxListEvent& event)
+  void WxTreeView::OnItemDeSelected(wxListEvent& event)
   { 
     GimmickDebugMessage(1,
 			GetTreeHandler()->GetTree().GetLabel()
-			<<" view : item selected "
-			<<std::endl);
+			<<" WxTreeView::OnItemDeselected"<<std::endl);
+    // retrieve the level
+    wxObject* obj = event.GetEventObject();   
+    unsigned int level = 0;
+    for (level = 0; level<mLevelList.size(); ++level)
+      {
+	if ( GetCtrl(level) == obj ) break;
+      } 
+    SetSelectedUpToDate(level,false);
+  }
+  //================================================================
+
+  //================================================================
+  void WxTreeView::OnItemSelected(wxListEvent& event)
+  { 
+    GimmickDebugMessage(1,
+			GetTreeHandler()->GetTree().GetLabel()
+			<<" WxTreeView::OnItemSelected"<<std::endl);
+
+    if (mIgnoreSelectedChanged) 
+      {
+	GimmickDebugMessage(1,
+			    " mIgnoreSelectedChanged true: returning"
+			    <<std::endl);
+	return;
+      }
+    
+
     
     wxListItem info;
     info.m_itemId = event.m_itemIndex;
@@ -420,37 +510,23 @@ namespace creaImageIO
       {
 	if ( GetCtrl(level) == obj ) break;
       }
+	mLastLevel=level;
     GimmickDebugMessage(1,
 			" Level "<<level+1
 			<<std::endl);
-    /*
-      if(event.m_itemIndex!=0)
-      {*/
-    
-    if(level<mLevelList.size()-1)
-      {
-	//mSelected=GetSelected(level+1); //2);
-      }
-    else if(mProcess)
-      {
-	//mLastLevelSelected=GetSelected(level+1); //2);
-      }
-    else
-      {
-	event.Veto();
-      }
     
     // Update the children level (if selection not at last level)
     if (level<mLevelList.size()-1) 
       {
+		
 	UpdateLevel( level + 2 ); 
 	// Reset the viewer setting the default image
 	GetGimmickView()->ClearSelection();
       }
     // Select all images if the selection is at series level
-    if (level==mLevelList.size()-2) SelectLowerLevel();
+    if (level==mLevelList.size()-2) SelectAll(level+1);
     // Validate selected images if the selection is at image level
-    if (level==(mLevelList.size()-1)&&mProcess) 
+    if (level==(mLevelList.size()-1)) //&&mProcess) 
       {
 	if(event.GetEventType()==10145)
 	  {
@@ -461,305 +537,276 @@ namespace creaImageIO
 	    ValidateSelectedImages (false);
 	  }
       }
-    //SetColor(level,event.m_itemIndex);
-    /*}
-      else
-      {
-      if(event.GetEventType()==10145)
-      {
-      
-      GetCtrl(level)->SetItemText(0,crea::std2wx(""));
-      GetCtrl(level)->EditLabel(event.m_itemIndex);
-      }
-      
-      }*/
-    
     
   }
   //================================================================
 
   //================================================================
-  void WxTreeView::SelectLowerLevel()
+  void WxTreeView::SelectAll(int level)
   {
-	long item = -1;
-	int level=mLevelList.size()-1;
-	
+    long item = -1;
+    //    int level=mLevelList.size()-1;
     for ( ;; )
-    {
-		item = GetCtrl(level)->GetNextItem(item,
-                                     wxLIST_NEXT_ALL);
+      {
+	item = GetCtrl(level)->GetNextItem(item,
+					   wxLIST_NEXT_ALL);
         if ( item == -1 )
-            break;
-
-		if(item==(GetCtrl(level)->GetItemCount()-1))
-		{
-			mProcess=true;
-		}
-		else
-		{
-			mProcess=false;
-		}
-
-		/*if(item!=0)
-		{*/
-		GetCtrl(level)->SetItemState(item,wxLIST_STATE_SELECTED, wxLIST_MASK_STATE 
-		| wxLIST_MASK_TEXT |wxLIST_MASK_IMAGE | wxLIST_MASK_DATA | wxLIST_MASK_WIDTH | wxLIST_MASK_FORMAT);
-		//}
-		
-    }
-
+	  break;
 	
+	if(item==(GetCtrl(level)->GetItemCount()-1))
+	  {
+	    mIgnoreSelectedChanged = false;//mProcess=true;
+	  }
+	else
+	  {
+	    mIgnoreSelectedChanged = true;//	mProcess=false;
+	  }
+	GetCtrl(level)->SetItemState(item,wxLIST_STATE_SELECTED, wxLIST_MASK_STATE 
+				     | wxLIST_MASK_TEXT |wxLIST_MASK_IMAGE | wxLIST_MASK_DATA | wxLIST_MASK_WIDTH | wxLIST_MASK_FORMAT);
+      }
   }
 
-  
   //================================================================
   //================================================================
 
-  void WxTreeView::OnMouseClick(wxMouseEvent& event)
+  void WxTreeView::OnColClick(wxListEvent& event)
   { 
-	   if (event.ButtonDown())
-	   {
-	   }
-	  std::cout<<"HELLO WORLD"<<std::endl;
+    mColumnSelected = event.m_col;
+    wxPoint clientpt;
+    clientpt.x = wxGetMousePosition().x - this->GetScreenPosition().x;
+    clientpt.y = wxGetMousePosition().y - this->GetScreenPosition().y;
+    senderCtrl = event.GetEventObject(); 
+    unsigned int level = 0;
+    for (level = 0; level<mLevelList.size(); ++level)
+      {
+	if ( GetCtrl(level) == senderCtrl ) break;
+      }
+    PopupMenu(menu, clientpt);
+    
   }
+    
   //================================================================
   //================================================================
 
-  void WxTreeView::OnColClick(wxListEvent& event)
-  { 
-	mColumnSelected=event.m_col;
-	wxPoint clientpt;
-	clientpt.x = wxGetMousePosition().x - this->GetScreenPosition().x;
-	clientpt.y = wxGetMousePosition().y - this->GetScreenPosition().y;
-	senderCtrl = event.GetEventObject(); 
-	unsigned int level = 0;
-	for (level = 0; level<mLevelList.size(); ++level)
-	{
-	if ( GetCtrl(level) == senderCtrl ) break;
-	}
-	/*for(int i=0;i<mColumnSelected;i++)
-	{
-		clientpt.x+=GetCtrl(level)->GetColumnWidth(i);
-	}
-	for(int i=0;i<level;i++)
-	{
-		clientpt.x+=GetSplitter(i)->GetSashPosition();
-	}
-	clientpt.y+=level*2;	*/
-	if(level==mLevelList.size()-1)
-	{
-		mColumnSelected+=1;
-		PopupMenu(menu, clientpt);
-	}
-	else if(mColumnSelected!=0)
-	{
-		PopupMenu(menu, clientpt);
-	}
-
-  }
-    //================================================================
   void WxTreeView::OnPopupFilter(wxCommandEvent& event)
   {
-		wxBusyCursor busy;
-		 GimmickDebugMessage(7,
+    wxBusyCursor busy;
+    GimmickDebugMessage(7,
 			"WxTreeView::OnEndLabelEdit" 
 			<<std::endl);
-	  wxObject* ctrl = event.GetEventObject(); 
-		unsigned int level = 0;
-		for (level = 0; level<mLevelList.size(); ++level)
-		{
-		if ( GetCtrl(level) == senderCtrl ) break;
-		}
-		std::string filter = crea::wx2std(wxGetTextFromUser(_T("Enter the filter to apply"), _T("Filter On Column")));
-		
-		std::string att;
-		
-		long it = -1;
-		UpdateLevel(level+1);
-		
-		std::vector<long> items;
-		bool in=false;
-		int del=0;
-		for ( ;; )
-		{
-			it = GetCtrl(level)->GetNextItem(it,
-										wxLIST_NEXT_ALL);
-			if ( it == -1 )
-				break;
-			
-			long adr = GetCtrl(level)->GetItemData(it);
-			tree::Node* nod = ((ItemData*)adr)->node;
-			att=(*nod).GetAttribute(mLevelList[level].key[mColumnSelected-1]);
-			
-			
-			if(att.find(filter)>900)
-			{
-				
-				if(!in)
-				{
-					in=true;
-				}
-				else
-				{
-					del+=1;
-				}
-				
-				items.push_back(it-del);
-			}
-			
-		}
-		std::vector<long>::iterator iter;
-		for(iter=items.begin();iter!=items.end();++iter)
-		{
-			GetCtrl(level)->DeleteItem(*iter);
-		}
-		GetGimmickView()->ClearSelection();
+    wxObject* ctrl = event.GetEventObject(); 
+    unsigned int level = 0;
+    for (level = 0; level<mLevelList.size(); ++level)
+      {
+	if ( GetCtrl(level) == senderCtrl ) break;
+      }
+    std::string filter = crea::wx2std(wxGetTextFromUser(_T("Enter the filter to apply"), _T("Filter On Column")));
+    
+    std::string att;
+    
+    long it = -1;
+    UpdateLevel(level+1);
+    
+    std::vector<long> items;
+    bool in=false;
+    int del=0;
+    for ( ;; )
+      {
+	it = GetCtrl(level)->GetNextItem(it,
+					 wxLIST_NEXT_ALL);
+	if ( it == -1 )
+	  break;
+	
+	long adr = GetCtrl(level)->GetItemData(it);
+	tree::Node* nod = ((ItemData*)adr)->node;
+	att=(*nod).GetAttribute(mLevelList[level].key[mColumnSelected]);
+	
+	
+	if(att.find(filter)>900)
+	  {
+	    
+	    if(!in)
+	      {
+		in=true;
+	      }
+	    else
+	      {
+		del+=1;
+	      }
+	    
+	    items.push_back(it-del);
+	  }
+	
+      }
+    std::vector<long>::iterator iter;
+    for(iter=items.begin();iter!=items.end();++iter)
+      {
+	GetCtrl(level)->DeleteItem(*iter);
+      }
+    GetGimmickView()->ClearSelection();
   }
   //================================================================
-
+  
   //================================================================
   void WxTreeView::OnPopupSort(wxCommandEvent& event)
   {
-		wxBusyCursor busy;
-		unsigned int level = 0;
-		for (level = 0; level<mLevelList.size(); ++level)
-		{
-		if ( GetCtrl(level) == senderCtrl ) break;
-		}
-		if(event.GetId()==mAscendingID)
-		{
-			mDirection=true;
-		}
-		else if(event.GetId()==mDescendingID)
-		{
-			mDirection=false;
-		}
+    wxBusyCursor busy;
+    unsigned int level = 0;
+    for (level = 0; level<mLevelList.size(); ++level)
+      {
+	if ( GetCtrl(level) == senderCtrl ) break;
+      }
+    mLevelList[level].SortColumn = mColumnSelected;
 
-        OnSort(level);
+    if(event.GetId()==mAscendingID)
+      {
+	mLevelList[level].SortAscending = true;
+      }
+    else if(event.GetId()==mDescendingID)
+      {
+	mLevelList[level].SortAscending = false;
+      }
+    
+    SortLevel(level);
   }
   //================================================================
-  void WxTreeView::OnSort(int level)
+
+  //================================================================
+  void WxTreeView::SortLevel(int level)
   { 	  
-	//Obtain the column name and the level that needs to be organized
-
-	if(level==mLevelList.size()-1||mColumnSelected!=0)
-	{	 
-		int l = level - 1;
-		//GetCtrl(level)->DeleteItem(0);
-		//Sets the data for the items to be sorted
-		std::string att;
-		unsigned int ty=0;
-		int n = GetCtrl(level)->GetItemCount();
-		for (int i = 0; i < n; i++)
-		{
-			  
-			//Gets current item data
-			long adr = GetCtrl(level)->GetItemData(i);
-			
-			//Extracts the node and the type of attribute
-			tree::Node* nod = ((ItemData*)adr)->node;
-			if(i==0)
-			{
-				(*nod).GetAttributeDescriptor(mLevelList[level].key[mColumnSelected-1]).DecodeType(ty);
-			}
-			//Obtains the organizing attribute
-			att=(*nod).GetAttribute(mLevelList[level].key[mColumnSelected-1]);
-			
-			char* d= new char [att.size()+1];
-			strcpy (d, att.c_str());
-
-			//Creates array
-			long* lp= new long[2];
-			lp[0]=adr;
-			lp[1]=(long)d;
-			 
-			//Sets it as the data
-			GetCtrl(level)->SetItemData(i,(long)lp);
-		}	
-		  
-		if(mDirection)
-		{
-			if(ty==1)
-			{
-				GetCtrl(level)->SortItems(CompareFunctionInts, 0);
-			}
-			else
-			{
-				GetCtrl(level)->SortItems(CompareFunctionStrings, 0);
-			}
-			
-		}
-		else
-		{
-			if(ty==1)
-			{
-				GetCtrl(level)->SortItems(CompareFunctionInts, 1);
-			}
-			else
-			{
-				GetCtrl(level)->SortItems(CompareFunctionStrings, 1);
-			}
-		}
+    GimmickDebugMessage(1,
+			"WxTreeView::SortLevel(" 
+			<<level<<")"
+			<<std::endl);  
+    //Obtain the column name and the level that needs to be organized
+    
+    //    int l = level - 1;
+    //Sets the data for the items to be sorted
+    //    std::string att;
+    unsigned int ty=0;
+    int nbselected = 0;
+    int n = GetCtrl(level)->GetItemCount();
+    for (int i = 0; i < n; i++)
+      {
+	
+	//Gets current item data
+	ItemData* data = (ItemData*)GetCtrl(level)->GetItemData(i);
+	
+	//Extracts the node and the type of attribute	
+	tree::Node* nod = data->node;
+	if(i==0)
+	  {
+	    (*nod).GetAttributeDescriptor
+	      (mLevelList[level].key[mLevelList[level].SortColumn])
+	      .DecodeType( ty );
+	  }
+	//Obtains the organizing attribute
+	data->attr = & (*nod).GetAttribute
+	  (mLevelList[level].key[mLevelList[level].SortColumn]);
+	//Selected ?
+	data->selected = false;
+	if (GetCtrl(level)->GetItemState(i,wxLIST_STATE_SELECTED)>0)
+	  {
+	    data->selected = true;
+	    nbselected++;
+	  }
 
-		//Resets original data
-		std::vector<tree::Node*>::iterator selection;
-		std::vector<long> change;
-		long it = -1;
-		for ( ;; )
-		{
-			it = GetCtrl(level)->GetNextItem(it,
-										wxLIST_NEXT_ALL);
-			if ( it == -1 )
-				break;
-			
-			//Gets current item data, extracts the node and resets it
-			long item = GetCtrl(level)->GetItemData(it);
-			GetCtrl(level)->SetItemData(it,((long*)item)[0]);
-			tree::Node* n= ((ItemData*)((long*)item)[0])->node;
-			if(level<mLevelList.size()-1)
-			{
-				for(selection=mSelected.begin();selection!=mSelected.end();++selection)
-				{
-					if((*selection)->GetAttribute("ID").compare(n->GetAttribute("ID"))==0)
-					{
-						change.push_back(it);	
-					}
-				}
-			}
-			else
-			{
-				for(selection=mLastLevelSelected.begin();selection!=mLastLevelSelected.end();++selection)
-				{
-					if((*selection)->GetAttribute("ID").compare(n->GetAttribute("ID"))==0)
-					{
-						change.push_back(it);	
-					}
-				}
-			}
-			
-			
-		}
-		//Resets the selected items
-		std::vector<long>::iterator selectedIts;
-		for(selectedIts=change.begin();selectedIts!=change.end();++selectedIts)
-		{
-			GetCtrl(level)->SetItemState(*selectedIts,wxLIST_STATE_SELECTED, wxLIST_MASK_STATE 
-		| wxLIST_MASK_TEXT |wxLIST_MASK_IMAGE | wxLIST_MASK_DATA | wxLIST_MASK_WIDTH | wxLIST_MASK_FORMAT);
-			
-		}
-		//GetCtrl(level)->InsertItem(0,_T("Filter:"));
-	}
+      }	
+    GimmickDebugMessage(1,
+			"WxTreeView::OnSort : " 
+			<<nbselected<<" selected before sorting"
+			<<std::endl);  
+
+    mIgnoreSelectedChanged = true; 
+    // 
+    if (mLevelList[level].SortAscending)
+      {
 	
-   }
+	if(ty==1)
+	  {
+	    GetCtrl(level)->SortItems(CompareFunctionInts, 0);
+	  }
+	else
+	  {
+	    GetCtrl(level)->SortItems(CompareFunctionStrings, 0);
+	  }
+	
+      }
+    else
+      {
+	if(ty==1)
+	  {
+	    GetCtrl(level)->SortItems(CompareFunctionInts, 1);
+	  }
+	else
+	  {
+	    GetCtrl(level)->SortItems(CompareFunctionStrings, 1);
+	  }
+      }
  
+
+    // Reselects the unselected 
+    n = GetCtrl(level)->GetItemCount();
+    int after = 0;
+    for (int i = 0; i < n; i++)
+      {
+	
+	//Gets current item data
+	ItemData* data = (ItemData*)GetCtrl(level)->GetItemData(i);
+  
+	//  long item = -1;
+	//    for ( ;; )
+	//      {
+	//	item = GetCtrl(level)->GetNextItem(item,wxLIST_NEXT_ALL);
+	//	if ( item == -1 ) break;
+	//Gets current item data
+	//	ItemData* data = (ItemData*)GetCtrl(level)->GetItemData(item);
+	// was selected ?
+	
+	if (data->selected)
+	  {
+	    nbselected--;
+	    if (nbselected==0)
+	      {
+		// if it is the last one we must process the selection
+		mIgnoreSelectedChanged = false;
+	      }
+	    GetCtrl(level)->SetItemState(i,
+					 wxLIST_STATE_SELECTED, 
+					 wxLIST_MASK_STATE 
+					 | wxLIST_MASK_TEXT 
+					 | wxLIST_MASK_IMAGE 
+					 | wxLIST_MASK_DATA 
+					 | wxLIST_MASK_WIDTH 
+					 | wxLIST_MASK_FORMAT);   
+	  }
+	if (GetCtrl(level)->GetItemState(i,wxLIST_STATE_SELECTED)>0)
+	  {
+	    after++;
+	  }
+
+	
+      }
+    mIgnoreSelectedChanged = false; 
+     GimmickDebugMessage(1,
+			"WxTreeView::SortLevel : " 
+			<<after<<" selected after sorting"
+			<<std::endl);  
+  
+  }
+  //================================================================
+
+  
   //================================================================
   void WxTreeView::ValidateSelectedImages(bool isSelection)
   {
     GimmickDebugMessage(7,
 			"WxTreeView::ValidateSelectedImages" 
 			<<std::endl);
-    std::vector<tree::Node*> sel(GetSelected(mLevelList.size()+1));
- 	GetGimmickView()->OnSelectionChange(sel,isSelection,(mLastSelected-1), mProcess);
+    const std::vector<tree::Node*>& sel(GetSelected(mLevelList.size()+1));
+    GetGimmickView()->OnSelectionChange(sel,
+					isSelection,(mLastSelected-1),
+					!mIgnoreSelectedChanged);
  
   }
   //================================================================
@@ -786,11 +833,11 @@ namespace creaImageIO
 			item = GetCtrl(level)->GetNextItem(item,
                                      wxLIST_NEXT_BELOW);
 		}
-        if ( item == -1  )
+        if ( item == -1 || item==0  )
 		{
             break;
 		}
-		if(GetCtrl(level)->GetItemState(item, wxLIST_STATE_SELECTED)==0 && item!=0)
+		if(GetCtrl(level)->GetItemState(item, wxLIST_STATE_SELECTED)==0 )
 		{
 			adr = GetCtrl(level)->GetItemData(item);
 			nod = ((ItemData*)adr)->node;
@@ -799,19 +846,21 @@ namespace creaImageIO
     }
 
   }
+  //================================================================
 
   //================================================================
+  // Should be in another place : not specific !
   void WxTreeView::GetSelectedAsString(std::vector<std::string>&s)
   {
-	  int level=mLevelList.size();
-	std::vector<tree::Node*> sel=GetSelected(level+1);
-	std::vector<tree::Node*>::iterator i;
-	
+    int level=mLevelList.size();
+    const std::vector<tree::Node*>& sel=GetSelected(level+1);
+    std::vector<tree::Node*>::const_iterator i;
+    
     for (i=sel.begin(); i!=sel.end(); ++i)
       {
-		  std::string filename=(*i)->GetAttribute("FullFileName");
-		  s.push_back(filename);
-	  }
+	std::string filename=(*i)->GetAttribute("FullFileName");
+	s.push_back(filename);
+      }
   }
 
    //================================================================
@@ -976,9 +1025,9 @@ BEGIN_EVENT_TABLE(MyListCtrl, wxListCtrl)
     EVT_LIST_SET_INFO(LIST_CTRL, MyListCtrl::OnSetInfo)
 #endif
   */
-    EVT_LIST_ITEM_SELECTED(-1, WxTreeView::OnSelectedChanged)
+    EVT_LIST_ITEM_SELECTED(-1, WxTreeView::OnItemSelected)
   
-    EVT_LIST_ITEM_DESELECTED(-1, WxTreeView::OnSelectedChanged)
+    EVT_LIST_ITEM_DESELECTED(-1, WxTreeView::OnItemDeSelected)
 	/*
     EVT_LIST_KEY_DOWN(LIST_CTRL, MyListCtrl::OnListKeyDown)
     EVT_LIST_ITEM_ACTIVATED(LIST_CTRL, MyListCtrl::OnActivated)