X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=src2%2FcreaImageIOWxTreeView.cpp;h=2fced885b158ecc2844ab93c8bb70ebe10625778;hb=381f766db11094bd9b96f9e948527cbec24f680a;hp=b4af0d9f6f502800c45ab1655a70ea977271ab75;hpb=3faba427694d4e57c89f2c69215dd58f24ce76fa;p=creaImageIO.git

diff --git a/src2/creaImageIOWxTreeView.cpp b/src2/creaImageIOWxTreeView.cpp
index b4af0d9..2fced88 100644
--- a/src2/creaImageIOWxTreeView.cpp
+++ b/src2/creaImageIOWxTreeView.cpp
@@ -1,25 +1,116 @@
 #include <creaImageIOWxTreeView.h>
+#include <creaImageIOGimmickView.h>
 #include <creaImageIOSystem.h>
 #include <wx/splitter.h>
-int wxCALLBACK MyCompareFunction(long item1, long item2, long WXUNUSED(sortData))
+#include <wx/gdicmn.h>
+#include <boost/date_time/gregorian/gregorian.hpp>
+
+const std::string empty_string("");
+
+//=====================================================================
+namespace creaImageIO
 {
-    // inverse the order
-    if (item1 < item2)
-        return -1;
-    if (item1 > item2)
-        return 1;
+  //=====================================================================
+  /// 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)
+{	
+  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)
+{	
+  creaImageIO::ItemData* data1 = (creaImageIO::ItemData*)item1;
+  creaImageIO::ItemData* data2 = (creaImageIO::ItemData*)item2;
+
+  const std::string& s1(*(data1->attr));
+  const std::string& s2(*(data2->attr));
+
+  int val1=atoi(s1.c_str());
+  int val2=atoi(s2.c_str());
 
-    return 0;
+  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
 {
   //=====================================================================
   // CTor
   WxTreeView::WxTreeView(TreeHandler* handler,
+			 GimmickView* gimmick,
 			 wxWindow* parent,
 			 const wxWindowID id)
     : wxPanel(parent,id),
-      TreeView(handler)
+      TreeView(handler, gimmick)
   {
     GimmickDebugMessage(1,"WxTreeView::WxTreeView"
 			<<std::endl);
@@ -37,21 +128,27 @@ namespace creaImageIO
     int col_style = wxLIST_FORMAT_LEFT;
 
     // Creating the ListCtrl for the levels > 0 (not for Root level)
-    for (int i = 1;
-	 i < handler->GetTree().GetNumberOfLevels();
+    for (int i = 0;
+	 i < handler->GetTree().GetNumberOfLevels() -1;
 	 ++i)
       {
-
 	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;
 	// else parent = last splitter
-	if (i>1) sparent = mLevelList[i-2].wxSplitter;
+	if (i>0) 
+		sparent = mLevelList[i-1].wxSplitter;
 
 	level.wxSplitter = new wxSplitterWindow( sparent , -1);
+	if(i!=0)
+	{
+	level.wxSplitter->Show(false);
+	}
 	//	    level.wxSplitter->SetMinimumPaneSize(100);
 	
 	wxListCtrl* ctrl = new wxListCtrl(level.wxSplitter,
@@ -61,51 +158,96 @@ namespace creaImageIO
 					  ctrl_style);
 	level.wxCtrl = ctrl;
 	level.wxSplitter->Initialize(ctrl);
-
+   
 	// Create the columns : one for each attribute of the level
 	int col = 0;
-			//ctrl->InsertItem(0, "1");
-	
-	tree::LevelDescriptor::AttributeDescriptorListType::const_iterator a;
-	for (a  = handler->GetTree().GetAttributeDescriptorList(i).begin();
-	     a != handler->GetTree().GetAttributeDescriptorList(i).end();
+	std::string title;
+
+  	tree::LevelDescriptor::AttributeDescriptorListType::const_iterator a;
+	for (a  = handler->GetTree().GetAttributeDescriptorList(i+1).begin();
+	     a != handler->GetTree().GetAttributeDescriptorList(i+1).end();
 	     ++a)
-	  {
-		  if(col==0)
-		  {
-		    wxListItem it;
-		    it.SetTextColour(*wxRED);
-		    it.SetText(_T("#C"));
-		    it.SetColumn(col);
-		    //		    ctrl->InsertColumn(col, _("Children"), col_style);
-		    ctrl->InsertColumn(col,it);
-		    //ctrl->InsertItem(0, "1");
-		    //level.key.push_back(_("Children"));
-		    //level.key.push_back(handler->GetTree().GetChildrenList().size());
-		    col++;
-		  }
-		  
-		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();
+		  }
+		  std::string temp = a->GetKey();
+		  if (temp.compare("ID") != 0)
+		  {
+		
 		ctrl->InsertColumn(col, 
-				crea::std2wx(a->GetName()),
-				col_style);
-		level.key.push_back(a->GetKey());
-		//	    ctrl->SetColumnWidth(col, wxLIST_AUTOSIZE );
+				   crea::std2wx(title),
+				   col_style);
 		col++;
-		
+		  }
+		level.key.push_back(a->GetKey());
+	      }
 		
 	  }
 	  
 	mLevelList.push_back(level);
       }
     
+#if wxUSE_MENUS
+
+	 // Column Menu
+    menu =new wxMenu;
+	wxMenuItem* m1=menu->Append(wxID_ANY, _T("&Sort ascending"));
+	wxMenuItem* m2=menu->Append(wxID_ANY, _T("&Sort descending"));
+	wxMenuItem* m3=menu->Append(wxID_ANY, _T("&Filter"));
+	mAscendingID=m1->GetId();
+	mDescendingID=m2->GetId();
+	mFilterID=m3->GetId();
+	Connect( mAscendingID, wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler(WxTreeView::OnPopupSort) );
+	Connect( mDescendingID, wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler(WxTreeView::OnPopupSort) );
+	Connect( mFilterID, wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler(WxTreeView::OnPopupFilter) );
+
 
-    /// Initialize the first level splitter
- 
-      sizer->Add( mLevelList[0].wxSplitter ,1, wxGROW  ,0);
 
+	//ItemMenu
+	menuItem =new wxMenu;
+	wxMenuItem* m1Item=menuItem->Append(wxID_ANY, _T("&Anonymize"));
+	wxMenuItem* m2Item=menuItem->Append(wxID_ANY, _T("&Local Copy"));
+	wxMenuItem* m3Item=menuItem->Append(wxID_ANY, _T("&Edit Fields"));
+	
+	mAnonymizingID=m1Item->GetId();
+	mLocalCopyID=m2Item->GetId();
+	mEditFieldID=m3Item->GetId();
+	//Connect( mAnonymizingID, wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler(WxTreeView::OnAnonymize) );
+	Connect( mLocalCopyID, wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler(WxTreeView::OnLocalCopy) );
+	Connect( mEditFieldID, wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler(WxTreeView::OnEditField) );
+	
+	
+#endif // wxUSE_MENUS
+	/// Initialize the first level splitter
+	  
+	sizer->Add( mLevelList[0].wxSplitter ,1, wxGROW  ,0);
+	//	mColumnSelected=1;
+	mLastSelected=0;
+	mLastLevel=0;
+	//	mDirection=true;
+
+	mIgnoreSelectedChanged = false;
+
+	//CreateColorPalette();
     UpdateLevel(1);
 
     SetSizer( sizer );     
@@ -125,82 +267,162 @@ namespace creaImageIO
   //=====================================================================
   
   
+  
   //=====================================================================
-  struct ItemData
-  {
-    tree::Node* node;
-  };
- 
-  //=====================================================================
-   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;
-	
-    if (level == 1) 
+	std::vector<tree::Node*>& sel(mLevelList[l].Selected);
+    sel.clear();
+	  if (level == 1) 
       {
 	sel.push_back(GetTreeHandler()->GetTree().GetTree());
       }
-    else 
-      {
-	int n = GetCtrl(l-1)->GetItemCount();
-	for (int i = 0; i < n; i++)
-	  {
-	    if ( GetCtrl(l-1)->GetItemState(i,wxLIST_STATE_SELECTED))
-	      {
-		long adr = GetCtrl(l-1)->GetItemData(i);
-		tree::Node* n = ((ItemData*)adr)->node;
-		sel.push_back(n);
-	      }
-	  }	
-      }
-	
-	  return sel;
-  }
-
-  //=====================================================================
-  
-  ///Removes selected nodes on given level
-  void WxTreeView::RemoveSelected( int level )
-  {
-	  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)
-	  {
-		std::vector<tree::Node*>::iterator i;
-		for (i=sel.begin(); i!=sel.end(); ++i)
+	  else if (level < mLevelList.size()+2 ) 
+    {
+		long item = -1;
+		for ( ;; )
 		{
-			GimmickDebugMessage(2,
-					"deleting '"
-					<<(*i)->GetLabel()
-					<<"'"<<level
-					<<std::endl);
-				GetTreeHandler()->Remove(*i);
+			item = GetCtrl(l-1)->GetNextItem(item,
+										 wxLIST_NEXT_ALL,
+										 wxLIST_STATE_SELECTED);
+			if ( item == -1 )
+				break;
+			long adr = GetCtrl(l-1)->GetItemData(item);
+			tree::Node* n = ((ItemData*)adr)->node;
+			if(mLastSelected==item)
+			{
+				std::vector<tree::Node*>::iterator it;
+				it = sel.begin();
+				it = sel.insert ( it , n );
+			}
+			else
+			{
+				
+				sel.push_back(n);
+			}			
+			
 		}
-
-		UpdateLevel(level);
+		/*int n = GetCtrl(l-1)->GetItemCount();
+		for (int i = 0; i<n; i++)
+		{
+			std::cout<<GetCtrl(l-1)->GetItemState(i,wxLIST_STATE_SELECTED)<<std::endl;
+			if ( GetCtrl(l-1)->GetItemState(i,wxLIST_STATE_SELECTED))
+			{
+				long adr = GetCtrl(l-1)->GetItemData(i);
+				tree::Node* n = ((ItemData*)adr)->node;
+				if(mLastSelected==i)
+				{
+					std::vector<tree::Node*>::iterator it;
+					it = sel.begin();
+					it = sel.insert ( it , n );
+				}
+				else
+				{
+					
+					sel.push_back(n);
+				}
+			}
+	      }*/
 	  }
-	  
+	else
+	{
+		// NOTHING
+	}   
+	 
+    //    return mLevelList[level-1].Selected;
+    return sel;
   }
-    
 
   //=====================================================================
-
- 
+  
   //=====================================================================
-  /// 
+  ///Removes selected nodes on last selected level
+   // NOT SPECIFIC 
+  void WxTreeView::RemoveSelected()
+  {
+	  unsigned int tempLevel = mLastLevel;
+    mLastLevel+=1;
+    const std::vector<tree::Node*>& sel=GetSelected(mLastLevel+1);
+	// if no selection, no remove action.
+    if(sel.size() != 0)
+	{
+	    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)
+		  {
+            GetGimmickView()->modifyValidationSignal(false);
+		    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;
+			  }
+			  tree::Node* n= (tree::Node*)(*i);
+			  GetTreeHandler()->LoadChildren((*i),4);
+			  GetGimmickView()->AddIgnoreFile(n);
+			  GetTreeHandler()->Remove(*i);
+		      }
+		    
+		    if(needRefresh && mLastLevel>1)
+		      {
+			UpdateLevel(mLastLevel-2);
+		      }
+		    else if(mLastLevel>1)
+		      {
+			UpdateLevel(mLastLevel-1);
+		      }
+		    else
+		      {
+			UpdateLevel(mLastLevel);
+		      }
+		  }
+	}
+	else
+	{
+		// no need to incremente level
+		mLastLevel = tempLevel;
+	}
+    
+  }
+  
+  
+  //=====================================================================
+  /// 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;
@@ -217,39 +439,50 @@ 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);
-
-
-    std::vector<tree::Node*> sel=GetSelected(level);
-
-	  int l = level - 1;
- 
+			<<"WxTreeView::RecursiveUpdateLevel(level "
+			<<level
+			<<")"<<std::endl);
+    
+    
+    const std::vector<tree::Node*>& sel(GetSelected(level));
+    
+    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;
+    std::vector<tree::Node*>::const_iterator i;
+    
     for (i=sel.begin(); i!=sel.end(); ++i)
       {
-	GimmickDebugMessage(2,
+	GimmickDebugMessage(1,
 			    "adding children of '"
 			    <<(*i)->GetLabel()
-			    <<"'"<<level
+			    <<"'"
 			    <<std::endl);
+	int _id=0;
+	
+	//Adds items and sets their attributes 
 	
-	//Adds columns
 	GetTreeHandler()->LoadChildren(*i,1);
 	tree::Node::ChildrenListType::reverse_iterator j;
 	for (j = (*i)->GetChildrenList().rbegin(); 
 	     j!= (*i)->GetChildrenList().rend(); 
 	     ++j)
 	  {
+	    GimmickDebugMessage(1,
+				"adding children "
+				<<(*j)->GetLabel()
+				<<"'"
+				<<std::endl);
+	    
 	    wxListItem item;
 	    item.SetMask(wxLIST_MASK_STATE | 
 			 wxLIST_MASK_TEXT |
@@ -258,67 +491,112 @@ namespace creaImageIO
 			 //			 wxLIST_MASK_WIDTH |
 			 wxLIST_MASK_FORMAT
 			 );
-
+	    
 	    ItemData* data = new ItemData;
 	    data->node = *j;
-	    item.SetData(data);
+	    data->id = _id;
 	    
-	  
-	    long id = GetCtrl(l)->InsertItem(item);
-
-	    std::ostringstream oss;
-	    int	n= GetTreeHandler()->GetNumberOfChildren(*j);
+	    item.SetId(_id);
+	    item.SetData(data);
 	    
-	    oss << n;
-	    std::string s(oss.str());
+	    _id++;
+	    GetCtrl(l)->InsertItem(item);
 	    
-	    item.SetText( crea::std2wx(s));
-	    //	    item.SetTextColour(*wxRED);
-	    //	    item.SetBackgroundColour(*wxBLACK); 
-	    item.SetColumn(0);
-	    GetCtrl(l)->SetItem(item);
-	    //	    GetCtrl(l)->SetItem(id,0, crea::std2wx(s));
-	    //	    GetCtrl(l)->SetColumnWidth(0, wxLIST_AUTOSIZE );
-
-	  for (int k=1; k<GetCtrl(l)->GetColumnCount(); k++)
+	    //Setting attributes
+	    for (int k=0; k<GetCtrl(l)->GetColumnCount(); ++k)				
 	      {
-
-		std::string val = (*j)->GetAttribute(mLevelList[l].key[k-1]);
+		std::string val;
+		//  Temporary correction : it works but no explanation about the problem FCY
+		
+		if(k==0 && level <3)
+		{
+		  val = (*j)->GetAttribute("NumberOfChildren");
+		}
+		else
+		  val = (*j)->GetAttribute(mLevelList[l].key[k]);
+		if(((*j)->GetAttributeDescriptor(mLevelList[l].key[k])).isDateEntry()) // Date
+		  {
+		    //					  std::cout << "["<<val<< "]" << std::endl;
+		    std::string valtmp(val);
+		    try
+		      {
+			boost::gregorian::date d1(boost::gregorian::from_undelimited_string(val));				   
+			val = to_iso_extended_string(d1);
+		      }
+		    catch (...)
+		      {
+			val =  valtmp;
+		      }
+		    //					  std::cout << "["<<val<< "]" << std::endl;	
+		  }
+		else if(((*j)->GetAttributeDescriptor(mLevelList[l].key[k])).isTimeEntry()) // Time
+		  {
+		    if ((val.size()>6) && 
+			(val != "" || val != " "))
+		      val = val.substr(0,2) + " : " 
+			+ val.substr(2,2) + " : " 
+			+ val.substr(4,2);
+		  }
+		else
+		  {
+		    
+		  }
 		if (val.size()==0) val = "?";
 		item.SetText( crea::std2wx(val));
-		//		item.SetTextColour(*wxBLACK);
-		//		item.SetBackgroundColour(*wxWHITE); 
 		item.SetColumn(k);
 		GetCtrl(l)->SetItem(item);
-
-		//		GetCtrl(l)->SetItem(id,k, crea::std2wx(val));
-		// GetCtrl(l)->SetColumnWidth(k, wxLIST_AUTOSIZE );
-		
-	      }
+	      }	
 	    
 	  }
       }
     
+    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);
+    // to allow a first selection in images TreeView
+    if (level==mLevelList.size()-1) 
+      OnItemSelected(event);
+  }
+  //================================================================
+  
+  //================================================================
+  void WxTreeView::OnItemSelected(wxListEvent& event)
+  { 
+	  
+    GimmickDebugMessage(1,
+			GetTreeHandler()->GetTree().GetLabel()
+			<<" WxTreeView::OnItemSelected"<<std::endl);
 
-    wxListItem info;
-    info.m_itemId = event.m_itemIndex;
+    if (mIgnoreSelectedChanged) 
+      {
+	GimmickDebugMessage(1,
+			    " mIgnoreSelectedChanged true: returning"
+			    <<std::endl);
+	return;
+      }
     
 
+    
+    wxListItem info;
+    info.m_itemId = event.m_itemIndex;
+    mLastSelected = event.m_itemIndex;
     // retrieve the level
     wxObject* obj = event.GetEventObject();   
     unsigned int level = 0;
@@ -326,355 +604,687 @@ namespace creaImageIO
       {
 	if ( GetCtrl(level) == obj ) break;
       }
+	mLastLevel=level;
     GimmickDebugMessage(1,
 			" Level "<<level+1
 			<<std::endl);
-    if (level<mLevelList.size()-1) UpdateLevel( level + 2 ); 
-	if (level==mLevelList.size()-1) ValidateSelectedImages ();
+    
+    // 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) SelectAll(level+1);
+    // Validate selected images if the selection is at image level
+    if (level==(mLevelList.size()-1)) //&&mProcess) 
+      {
+	if(event.GetEventType()==wxEVT_COMMAND_LIST_ITEM_SELECTED)
+	  {
+		  ValidateSelectedImages (true);
+	  }
+	else
+	  {
+		  ValidateSelectedImages (false);
+	  }
+      }
+    
+  }
+  //================================================================
 
+  //================================================================
+  void WxTreeView::SelectAll(int level)
+  {
+    long item = -1;
+    //    int level=mLevelList.size()-1;
+    for ( ;; )
+      {
+	item = GetCtrl(level)->GetNextItem(item,
+					   wxLIST_NEXT_ALL);
+        if ( item == -1 )
+	  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::OnColClick(wxListEvent& event)
   { 
-	  /*
-	//Obtain the column name and the level that needs to be organized
-	int colNum=event.m_col;
-    GimmickMessage(1,
-			" Column " <<event.m_col
-			<<std::endl);
-
-	
-    wxObject* ctrl = event.GetEventObject(); 
-	unsigned int level = 0;
+    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) == ctrl ) break;
+	if ( GetCtrl(level) == senderCtrl ) break;
       }
+    PopupMenu(menu, clientpt);
+    
+  }
 
-	  wxBusyCursor busy;
-    std::vector<tree::Node*> sel=GetSelected(level+1);
+   //================================================================
+  //================================================================
 
-	tree::Node* nodes[20];
+  void WxTreeView::OnItemMenu(wxListEvent &event)
+  {
+	 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;
+      }
+	  long* ptr=0;
+	  int flag;
+	  mLastRightLevel=level;
+	  mLastRightSelected=GetCtrl(level)->HitTest(wxPoint(0,clientpt.y-8),flag,ptr);
+    PopupMenu(menuItem, clientpt);
+    
+  }
+  
+  //================================================================
+  //================================================================
 
-	  int l = level - 1;
- 
-    // to speed up inserting we hide the control temporarily
-    GetCtrl(level)->Hide();
-    GetCtrl(level)->DeleteAllItems();
+  void WxTreeView::OnPopupFilter(wxCommandEvent& event)
+  {
+    wxBusyCursor busy;
+    GimmickDebugMessage(7,
+			"WxTreeView::OnEndLabelEdit" 
+			<<std::endl);
+    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::vector<tree::Node*>::iterator i;
-	int num=0;
-    for (i=sel.begin(); i!=sel.end(); ++i)
+    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;
 	
-		//Adds columns
-		GetTreeHandler()->LoadChildren(*i,1);
-		tree::Node::ChildrenListType::reverse_iterator j;
-		
-		for (j = (*i)->GetChildrenList().rbegin(); 
-			j!= (*i)->GetChildrenList().rend(); 
-			++j)
-			{
-				nodes[num]=*j;
-				num++;
-			}
-      }
+	long adr = GetCtrl(level)->GetItemData(it);
+	tree::Node* nod = ((ItemData*)adr)->node;
+	att=(*nod).GetAttribute(mLevelList[level].key[mColumnSelected]);
 	
-	  //Sorting elements
-	  int k, m; 
-	  tree::Node* index;
+	
+	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;
+      }
+    mLevelList[level].SortColumn = mColumnSelected;
+
+    if(event.GetId()==mAscendingID)
+      {
+	mLevelList[level].SortAscending = true;
+      }
+    else if(event.GetId()==mDescendingID)
+      {
+	mLevelList[level].SortAscending = false;
+      }
 	  
+    SortLevel(level);
+  }
+  //================================================================
+
+  //================================================================
+  void WxTreeView::OnLocalCopy(wxCommandEvent& event)
+  {
+    wxBusyCursor busy;
+    
+	unsigned int tempLevel = mLastLevel;
+    mLastLevel+=1;
+    const std::vector<tree::Node*>& sel=GetSelected(mLastLevel+1);
 	
-	for (k=1; k<num; ++k)
+    if(sel.size() != 0)
 	{
-		index = nodes[k];
-		m = k;
-		GimmickMessage(1,
-			"Comparison Key 1: "
-			    <<(nodes[m-1])->GetAttribute(mLevelList[level].key[colNum-1])
-				<<"Comparison Key 2: "<<(index)->GetAttribute(mLevelList[level].key[colNum-1])
-			    <<std::endl);
-		while ((m > 0) && ((nodes[m-1])->GetAttribute(mLevelList[level].key[colNum-1]) > 
-						   (index)->GetAttribute(mLevelList[level].key[colNum-1])))
-		{
-		nodes[m] = nodes[m-1];
-		m = m - 1;
-		}
-		nodes[m] = index;
+	    bool copy=false;
+	    std::stringstream out;
+	    std::string levelName=GetTreeHandler()->GetTree().GetLevelDescriptor(mLastLevel).GetName();
+	    out<<"Copy ";
+	    out<<sel.size();
+	    if(sel.size()>1&&levelName.at(levelName.size()-1)!='s')
+	      {
+		out<<" "<<levelName;
+		out<<"s to .gimmick?";
+	      }
+	    else
+	      {
+		out<<" "<<GetTreeHandler()->GetTree().GetLevelDescriptor(mLastLevel).GetName()<<" to .gimmick?";
+	      }
+	    if (wxMessageBox(crea::std2wx(out.str()),
+			     _T("Remove Files"),
+			     wxYES_NO,this ) == wxYES)
+	      {
+		copy = true;
+	      }
+	    if(copy)
+		  {
+			std::vector<std::string> s;
+			GetFilenamesAsString(sel,s);
+            GetGimmickView()->CopyFiles(s);
+		  }
+	}
+	else
+	{
+		mLastLevel = tempLevel;
 	}
+    
+    
+  }
+  //================================================================
 
-	for (m=0; m<num; ++m)
+   //================================================================
+  void WxTreeView::OnEditField(wxCommandEvent& event)
+  {
+	if(mLastRightSelected!=-1)
 	{
-		tree::Node* node=nodes[m];
-	    wxListItem item;
-	    item.SetMask(wxLIST_MASK_STATE | 
-			 wxLIST_MASK_TEXT |
-			 //			 wxLIST_MASK_IMAGE |
-			 wxLIST_MASK_DATA |
-			 //			 wxLIST_MASK_WIDTH |
-			 wxLIST_MASK_FORMAT
-			 );
+    tree::Node* node=((ItemData*)GetCtrl(mLastRightLevel)->GetItemData(mLastRightSelected))->node;
+  	tree::LevelDescriptor::AttributeDescriptorListType::const_iterator a;
+	std::vector<std::string> names;
+	std::vector<std::string> keys;
+	for (a  = GetTreeHandler()->GetTree().GetAttributeDescriptorList(mLastRightLevel+1).begin();
+	     a != GetTreeHandler()->GetTree().GetAttributeDescriptorList(mLastRightLevel+1).end();
+	     ++a)
+	{
+		if(a->GetFlags()==creaImageIO::tree::AttributeDescriptor::EDITABLE)
+	    {
+			names.push_back(a->GetName());
+			keys.push_back(a->GetKey());
+		}
+	}
+	GetGimmickView()->CreateEditFieldsDialog(node,names,keys);
+	}
+  }
+  //================================================================
+
+  //================================================================
+  void WxTreeView::SortLevel(int level)
+  { 	  
+    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++;
+	  }
+
+      }	
+    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++;
+	  }
 
-	    long id = GetCtrl(level)->InsertItem(item);
-		int n;
-		if ((node)->GetChildrenLoaded()) 
+	
+      }
+    mIgnoreSelectedChanged = false; 
+     GimmickDebugMessage(1,
+			"WxTreeView::SortLevel : " 
+			<<after<<" selected after sorting"
+			<<std::endl);  
+  
+  }
+  //================================================================
+
+  
+  //================================================================
+  void WxTreeView::ValidateSelectedImages(bool isSelection)
+  {
+    GimmickDebugMessage(7,
+			"WxTreeView::ValidateSelectedImages" 
+			<<std::endl);
+    const std::vector<tree::Node*>& sel(GetSelected(mLevelList.size()+1));
+    GetGimmickView()->OnSelectionChange(sel,
+					isSelection,(mLastSelected-1),
+					!mIgnoreSelectedChanged);
+ 
+  }
+  //================================================================
+
+
+  //================================================================
+  void WxTreeView::GetNodes(std::vector<tree::Node*>& nodes, bool direction)
+  {
+	long item = mLastSelected;
+	int level=mLevelList.size()-1;
+	//Gets current item data
+	long adr = GetCtrl(level)->GetItemData(item);
+	//Extracts the node
+	tree::Node* nod = ((ItemData*)adr)->node;
+    for ( ;; )
+    {
+		if(direction)
 		{
-			n=(node)->GetChildrenList().size();
+			item = GetCtrl(level)->GetNextItem(item,
+                                     wxLIST_NEXT_ABOVE);
 		}
 		else
 		{
-			n= GetTreeHandler()->GetNumberOfChildren(node);
+			item = GetCtrl(level)->GetNextItem(item,
+                                     wxLIST_NEXT_BELOW);
 		}
-		std::ostringstream oss;
-		
-		oss << n;
-		std::string s(oss.str());
+        if ( item == -1 || item==0  )
+		{
+            break;
+		}
+		if(GetCtrl(level)->GetItemState(item, wxLIST_STATE_SELECTED)==0 )
+		{
 
-		GetCtrl(level)->SetItem(id,0, crea::std2wx(s));
-		GetCtrl(level)->SetColumnWidth(0, wxLIST_AUTOSIZE );
-		
-	  for (int k=1; k<GetCtrl(level)->GetColumnCount(); k++)
-	      {
-		std::string val = (node)->GetAttribute(mLevelList[level].key[k-1]);
-		if (val.size()==0) val = "?";
-		GetCtrl(level)->SetItem(id,k, crea::std2wx(val));
-		GetCtrl(level)->SetColumnWidth(k, wxLIST_AUTOSIZE );
-		
-	      }
-	    
+			adr = GetCtrl(level)->GetItemData(item);
+			nod = ((ItemData*)adr)->node;
+			nodes.push_back(nod);
+		}
+    }
+
+  }
+  //================================================================
+   //=================================================
+  void WxTreeView::OnKeyDown(wxListEvent &event)
+  {
+	  if(event.GetKeyCode() == WXK_DELETE)
+	  {
+		   wxBusyCursor busy;
+		  
+		   RemoveSelected();
+		   GetGimmickView()->ClearSelection();
 	  }
+		  
+  }
+  //================================================================
 
+  //================================================================
+  // Should be in another place : not specific !
+  void WxTreeView::GetSelectedAsString(std::vector<std::string>&s)
+  {
+    int level=mLevelList.size();
+    const std::vector<tree::Node*>& sel=GetSelected(level+1);
+    std::vector<tree::Node*>::const_iterator i;
     
-    GetCtrl(level)->Show();
-*/
+    for (i=sel.begin(); i!=sel.end(); ++i)
+      {
+	std::string filename=(*i)->GetAttribute("FullFileName");
+	s.push_back(filename);
+      }
   }
+
   //================================================================
+  void WxTreeView::GetFilenamesAsString(const std::vector<tree::Node*>& nodes, std::vector<std::string>&s)
+  {
+    std::vector<tree::Node*>::const_iterator i;
+    
+    for (i=nodes.begin(); i!=nodes.end(); ++i)
+      {
+		  if((*i)->GetLevel()<mLevelList.size())
+		  {
+			 GetTreeHandler()->LoadChildren(*i,0);
+			 GetFilenamesAsString((*i)->GetChildrenList(),s);
+		  }
+		  else
+		  {
+			std::string filename=(*i)->GetAttribute("FullFileName");
+			s.push_back(filename);
+		  }
+      }
+  }
 
-  void WxTreeView::ValidateSelectedImages()
+   //================================================================
+  void WxTreeView::SetColor(int l, int item)
   {
-	int level=mLevelList.size();
-	std::vector<tree::Node*> sel=GetSelected(level+1);
-	bool valid=true;
-	std::string mess;
-	if(sel.size()>0)
-	{
-		std::vector<tree::Node*>::iterator i;
-		std::string row;
-		std::string col;
-		std::string plane;
-		
-		
-		//Validation between image sizes
-		for (i=sel.begin(); i!=sel.end() && valid; ++i)
+	  int colorId=12;
+	  GetCtrl(l)->SetItemTextColour(item, wxColourDatabase().Find
+		   (crea::std2wx(mColorPalette[colorId])));
+	  GetCtrl(l)->SetItemState(item,wxLIST_STATE_SELECTED | wxLIST_STATE_FOCUSED, wxLIST_STATE_SELECTED);  /*
+	  int colorId=0;
+	  //Setting the color according to the parent
+		if(l==0)
 		{
-			if(i==sel.begin())
-			{
-				row=(*i)->GetAttribute(mLevelList[level-1].key[1]);
-				col=(*i)->GetAttribute(mLevelList[level-1].key[2]);
-				plane=(*i)->GetAttribute(mLevelList[level-1].key[3]);
-			}
-			else
+	        item.SetBackgroundColour
+		  (wxColourDatabase().Find
+		   (crea::std2wx(mColorPalette[colorId]))); 
+		mColorMap.insert
+		  (NodeColorPair
+		   (*j,wxColourDatabase().Find
+		    (crea::std2wx(mColorPalette[colorId]))));
+		if(colorId<64)
+		  {
+		    colorId++;
+		  }
+		else
 			{
-				if(((*i)->GetAttribute(mLevelList[level-1].key[1]))!=row ||
-					((*i)->GetAttribute(mLevelList[level-1].key[2]))!=col ||
-					((*i)->GetAttribute(mLevelList[level-1].key[3]))!=plane)
-					{
-						mess="The selected images are not compatible.";
-						valid=false;
-					}
+			  colorId=0;
 			}
 		}
+		else if(l!=mLevelList.size()-1)
+		  {
+		    item.SetBackgroundColour(mColorMap[*i]); 
+			mColorMap.insert(NodeColorPair(*j,mColorMap[*i]));
+		}
+		else
+		{
+			item.SetBackgroundColour(mColorMap[*i]); 
+		}*/
+  }
+  //================================================================
+  void WxTreeView::CreateColorPalette()
+  {
+  GimmickDebugMessage(6,"WxTreeView::CreateColorPalette");
+  mColorPalette.push_back("WHITE");
+  mColorPalette.push_back("LIGHT GREY");
+  mColorPalette.push_back("AQUAMARINE");
+  mColorPalette.push_back("MEDIUM FOREST GREEN");
+  mColorPalette.push_back("INDIAN RED");
+  mColorPalette.push_back("KHAKI");
+  mColorPalette.push_back("ORANGE");
+  mColorPalette.push_back("LIGHT BLUE");
+  mColorPalette.push_back("LIGHT STEEL BLUE");
+  mColorPalette.push_back("PINK");
+  mColorPalette.push_back("PLUM");
+  mColorPalette.push_back("PURPLE");
+  mColorPalette.push_back("RED");
+  mColorPalette.push_back("SEA GREEN");
+  mColorPalette.push_back("SIENNA");
+  mColorPalette.push_back("SKY BLUE");
+  mColorPalette.push_back("SLATE BLUE");
+  mColorPalette.push_back("SPRING GREEN");
+  mColorPalette.push_back("TAN");
+  mColorPalette.push_back("THISTLE");
+  mColorPalette.push_back("TURQUOISE");
+  mColorPalette.push_back("VIOLET");
+  mColorPalette.push_back("VIOLET RED");
+  mColorPalette.push_back("WHEAT");
+  mColorPalette.push_back("YELLOW");
+  mColorPalette.push_back("YELLOW GREEN");
+  mColorPalette.push_back("BLUE");
+  mColorPalette.push_back("BLUE VIOLET");
+  mColorPalette.push_back("BROWN");
+  mColorPalette.push_back("CADET BLUE");
+  mColorPalette.push_back("CORAL");
+  mColorPalette.push_back("CORNFLOWER BLUE");
+  mColorPalette.push_back("CYAN");
+  mColorPalette.push_back("DARK GREY");
+  mColorPalette.push_back("DARK GREEN");
+  mColorPalette.push_back("DARK OLIVE GREEN");
+  mColorPalette.push_back("DARK ORCHID");
+  mColorPalette.push_back("DARK SLATE BLUE");
+  mColorPalette.push_back("DARK SLATE GREY");
+  mColorPalette.push_back("DARK TURQUOISE");
+  mColorPalette.push_back("FIREBRICK");
+  mColorPalette.push_back("FOREST GREEN");
+  mColorPalette.push_back("GOLD");
+  mColorPalette.push_back("GOLDENROD");
+  mColorPalette.push_back("GREY");
+  mColorPalette.push_back("GREEN");
+  mColorPalette.push_back("GREEN YELLOW");
+  mColorPalette.push_back("LIME GREEN");
+  mColorPalette.push_back("MAGENTA");
+  mColorPalette.push_back("MAROON");
+  mColorPalette.push_back("MEDIUM AQUAMARINE");
+  mColorPalette.push_back("MEDIUM BLUE");
+  mColorPalette.push_back("MEDIUM GOLDENROD");
+  mColorPalette.push_back("MEDIUM ORCHID");
+  mColorPalette.push_back("MEDIUM SEA GREEN");
+  mColorPalette.push_back("MEDIUM SLATE BLUE");
+  mColorPalette.push_back("MEDIUM SPRING GREEN");
+  mColorPalette.push_back("MEDIUM TURQUOISE");
+  mColorPalette.push_back("MEDIUM VIOLET RED");
+  mColorPalette.push_back("MIDNIGHT BLUE");
+  mColorPalette.push_back("NAVY");
+  mColorPalette.push_back("ORANGE RED");
+  mColorPalette.push_back("ORCHID, PALE GREEN");
+  mColorPalette.push_back("STEEL BLUE");
+  mColorPalette.push_back("BLACK");
 
-		//Dimention validation
-		//Compatibility with maximum 
-			if(valid)
-			{	
-				int rows;
-				int cols;
-				int planes;
-				std::string s;
-				std::istringstream t(s);
-				s=row;
-				t >> rows;
-				if(row==""){rows=1;}
-				s=col;
-				t >> cols;
-				if(col==""){cols=1;}
-				s=plane;
-				t >> planes;
-				if(plane==""){planes=1;}
-
-				int dim = 0;
-				if (planes>1) dim=3;
-				else if (cols>1) dim=2;
-				else if (rows>1) dim=1;
-			    
-				if (dim == 0) 
-				{
-					mess="Unknown image dimension : cannot select !";
-					valid= false;
-				}
-				else if (dim>GetMaxDimension())
-				{
-					mess="Selecting ";
-					mess+=dim;
-					mess+="D images is not allowed !";
-					valid= false;
-				}
-				if ( dim == GetMaxDimension() )
-				{
-					mess="Cannot add this image to selection : would result in a ";
-					mess+=(dim+1);
-					mess+="D image!";
-					
-					valid= false;
-				}
-				if ( dim < GetMinDimension() && sel.size()<2 )
-				{
-					mess="Cannot build the selection as it would result in a ";
-					mess+=dim;
-					mess+="D image, and the minimum is ";
-					mess+=GetMinDimension();
-					mess+="D!";
-					valid= false;
-				}
-			}
-	  }
-	else
+
+  }
+
+   //================================================================
+  void WxTreeView::GetAttributes(std::vector<std::string>& areShown, std::vector<std::string>& notShown, int level)
+  {
+	  areShown.clear();
+	  notShown.clear();
+  	tree::LevelDescriptor::AttributeDescriptorListType::const_iterator a;
+	for (a  = GetTreeHandler()->GetTree().GetAttributeDescriptorList(level).begin();
+	     a != GetTreeHandler()->GetTree().GetAttributeDescriptorList(level).end();
+	     ++a)
 	{
-		mess="Cannot have 0 images selected";
-		GimmickMessage(1,"Cannot have 0 images selected"<< std::endl);
-		valid=false;
-	}
-	
-		//Send an event telling wether the selection is valid or not
-		wxCommandEvent event( 0, GetId() );
-		event.SetEventObject( this );
-		if(valid)
-		{
-			mess="Selection OK !";
-			event.SetInt(0);
+		if(a->GetFlags()==creaImageIO::tree::AttributeDescriptor::EDITABLE && IsAttributeVisible(a->GetName(),level))
+	    {
+			areShown.push_back(a->GetName());
 		}
-		else
-		{event.SetInt(1);}
-		event.SetString(wxT(mess));
-		GetEventHandler()->ProcessEvent( event );
-	  
-	
+	}
+	notShown=mLevelList[level-1].notShownAtts;
   }
 
   //================================================================
+  void WxTreeView::SetNonVisibleAttributes(const std::vector<std::string>& notShown, int nlevel)
+  {
+	mLevelList[nlevel].notShownAtts=notShown;
+  }
 
-
-  vtkImageData* WxTreeView::GetSelectedImage(int dim)
+  //================================================================
+   void WxTreeView::CreateCtrl(std::vector<std::string>& notShown, int nlevel)
   {
-	  /*
-		wxArrayTreeItemIds id;
-    // TO DO : TEST THAT STYLE IS MULTIPLE 
-    unsigned int nb = mTreeListCtrl->GetSelections(id);
-    f.clear();
-
-    // Collect the brute vector of Image nodes
-    std::vector<DicomNode*> im;
-    for (unsigned int i=0; i<nb; ++i)
-      {
-	TreeItemData *data = 
-	  (TreeItemData *)mTreeListCtrl->GetItemData(id[i]);
-	if ((data) && (data->IsDicomNode()))
-	  {
-	    if (data->GetDicomNode()->GetType()==DicomNode::Image)
-	      {
-		im.push_back ( data->GetDicomNode() );
+	int ctrl_style = wxLC_REPORT | wxLC_VRULES;
+    int col_style = wxLIST_FORMAT_LEFT;
+	LevelType level;
+	mLevelList[nlevel].SelectedUpToDate = true;
+	mLevelList[nlevel].SortColumn = 0;
+	mLevelList[nlevel].key.clear();
+	
+	mLevelList[nlevel].wxCtrl = new wxListCtrl(mLevelList[nlevel].wxSplitter,
+					  nlevel,
+					  wxDefaultPosition, 
+					  wxDefaultSize,
+					  ctrl_style);
+	wxWindow* oldWin=mLevelList[nlevel].wxSplitter->GetWindow1();
+	mLevelList[nlevel].wxSplitter->ReplaceWindow(oldWin,mLevelList[nlevel].wxCtrl);
+	mLevelList[nlevel].wxSplitter->Initialize(mLevelList[nlevel].wxCtrl);
+   
+	// Create the columns : one for each attribute of the level
+	int col = 0;
+	std::string title;
 
-	      }
-	    else if (data->GetDicomNode()->GetType()==DicomNode::Series)
+  	tree::LevelDescriptor::AttributeDescriptorListType::const_iterator a;
+	for (a  = GetTreeHandler()->GetTree().GetAttributeDescriptorList(nlevel+1).begin();
+	     a != GetTreeHandler()->GetTree().GetAttributeDescriptorList(nlevel+1).end();
+	     ++a)
+
+	{   
+	    if(a->GetFlags()!=creaImageIO::tree::AttributeDescriptor::PRIVATE && IsAttributeVisible(a->GetName(),nlevel+1))
 	      {
-		DicomNode::ChildrenListType::iterator j;
-		for (j =data->GetDicomNode()->GetChildrenList().begin();
-		     j!=data->GetDicomNode()->GetChildrenList().end();
-		     j++) 
+		  title=a->GetName();
+		  std::string temp = a->GetKey();
+		  if (temp.compare("ID") != 0)
 		  {
-		    im.push_back ( *j );
+			mLevelList[nlevel].wxCtrl->InsertColumn(col, 
+					crea::std2wx(title),
+					col_style);
+			col++;
 		  }
+		mLevelList[nlevel].key.push_back(a->GetKey());
 	      }
-	  }
-      }
-    // Create the output data
-    if (im.size()==1) 
-      {
-	// Only one image : give it
-	vtkImageData* out = vtkImageData::New();
-	out->ShallowCopy(mReader.GetImage(im.front()->ImageGetFullFileName()));
-	f.push_back( out );
-      }
-    else if (im.size()>1)
-      {
-	vtkImageData* first = mReader.GetImage( im.front()->ImageGetFullFileName() );
-	if (first->GetDataDimension()==2) 
-	  {   	
-	    // n2D to 3D
-	    vtkImageData* out = vtkImageData::New();
-	    out->CopyStructure(first);	
-	    out->SetScalarType(first->GetScalarType());
-	    int ext[6];
-	    first->GetExtent(ext);
-	    ext[5] = im.size();
-	    out->SetExtent(ext);
-	    // LG : TODO : Z Spacing  ?
-	    
-	    out->AllocateScalars();
-	    
-	    //first->Print(std::cout);
-	    //	    out->Print(std::cout);
-	    
-	    int dim[3];
-	    first->GetDimensions(dim);
-	    unsigned long imsize = 
-	      ( (unsigned long)first->GetScalarPointer(0,1,0)
-		- (unsigned long)first->GetScalarPointer(0,0,0))
-	      *dim[1];
-
-	    int slice = 0;
-	    std::vector<DicomNode*>::iterator it;
-	    for (it=im.begin(); it!=im.end(); ++it) 
-	      {
-		//std::cout << "copying slice "<<slice <<std::endl;
-		vtkImageData* cur = mReader.GetImage( (*it)->ImageGetFullFileName() );
 		
-		void* src = cur->GetScalarPointer(0,0,0);
-		void* dst = out->GetScalarPointer(0,0,slice);
-		//		std::cout << "src="<<src<<std::endl;
-		//		std::cout << "dst="<<dst<<std::endl;
-		//		std::cout << "siz="<<imsize<<std::endl;
-		memcpy(dst,src,imsize);
-
-		slice++;
-	      }
-	    f.push_back(out);
-	  }
-	else 
-	  {
-	    // n3D
-	    std::vector<DicomNode*>::iterator it;
-	    for (it=im.begin(); it!=im.end(); ++it) 
-	      {
-		vtkImageData* out = vtkImageData::New();
-		out->ShallowCopy(mReader.GetImage((*it)->ImageGetFullFileName()));
-		f.push_back(out);
-	      }
 	  }
-      }
-	  */
-	return NULL;
-  }
+	oldWin->Destroy();
+	UpdateLevel(1);
+	}
 
-  void WxTreeView::GetSelectedImages(std::vector<vtkImageData*>& s, int dim)
+   //================================================================
+  bool WxTreeView::IsAttributeVisible(const std::string& val, int level)
   {
+	  std::vector<std::string> ns=mLevelList[level-1].notShownAtts;
+	  std::vector<std::string>::iterator it;
+	  bool found=false;
+	  for(it=ns.begin();it!=ns.end()&&!found;++it)
+	  {
+		  if(val.compare(*it)==0)
+		  {
+			  found=true;
+		  }
+	  }
 
+	  return !found;
   }
-  BEGIN_EVENT_TABLE(WxTreeView, wxPanel)
+
+  //================================================================
+  //================================================================
+  BEGIN_EVENT_TABLE(WxTreeView, wxPanel)   
   /*
     EVT_SIZE(MyFrame::OnSize)
 
@@ -715,8 +1325,10 @@ END_EVENT_TABLE()
 BEGIN_EVENT_TABLE(MyListCtrl, wxListCtrl)
     EVT_LIST_BEGIN_DRAG(LIST_CTRL, MyListCtrl::OnBeginDrag)
     EVT_LIST_BEGIN_RDRAG(LIST_CTRL, MyListCtrl::OnBeginRDrag)
-    EVT_LIST_BEGIN_LABEL_EDIT(LIST_CTRL, MyListCtrl::OnBeginLabelEdit)
-    EVT_LIST_END_LABEL_EDIT(LIST_CTRL, MyListCtrl::OnEndLabelEdit)
+	
+    EVT_LIST_BEGIN_LABEL_EDIT(-1, WxTreeView::OnBeginLabelEdit)
+    EVT_LIST_END_LABEL_EDIT(-1, WxTreeView::OnEndLabelEdit)
+	
     EVT_LIST_DELETE_ITEM(LIST_CTRL, MyListCtrl::OnDeleteItem)
     EVT_LIST_DELETE_ALL_ITEMS(LIST_CTRL, MyListCtrl::OnDeleteAllItems)
 #if WXWIN_COMPATIBILITY_2_4
@@ -724,17 +1336,20 @@ BEGIN_EVENT_TABLE(MyListCtrl, wxListCtrl)
     EVT_LIST_SET_INFO(LIST_CTRL, MyListCtrl::OnSetInfo)
 #endif
   */
-    EVT_LIST_ITEM_SELECTED(-1, WxTreeView::OnSelectedChanged)
-  
-    EVT_LIST_ITEM_DESELECTED(-1, WxTreeView::OnSelectedChanged)
+    EVT_LIST_KEY_DOWN(-1, WxTreeView::OnKeyDown)
+    EVT_LIST_ITEM_SELECTED(-1, WxTreeView::OnItemSelected)
+	EVT_LIST_ITEM_RIGHT_CLICK(-1, WxTreeView::OnItemMenu)
+    EVT_LIST_ITEM_DESELECTED(-1, WxTreeView::OnItemDeSelected)
 	/*
     EVT_LIST_KEY_DOWN(LIST_CTRL, MyListCtrl::OnListKeyDown)
     EVT_LIST_ITEM_ACTIVATED(LIST_CTRL, MyListCtrl::OnActivated)
     EVT_LIST_ITEM_FOCUSED(LIST_CTRL, MyListCtrl::OnFocused)
-
-    EVT_LIST_COL_RIGHT_CLICK(LIST_CTRL, MyListCtrl::OnColRightClick)
-	*/
+*/
+    EVT_LIST_COL_RIGHT_CLICK(-1, WxTreeView::OnColClick)
+	
     EVT_LIST_COL_CLICK(-1, WxTreeView::OnColClick)
+
+	//EVT_LEFT_DOWN(WxTreeView::OnMouseClick)
 	/*
     EVT_LIST_COL_BEGIN_DRAG(LIST_CTRL, MyListCtrl::OnColBeginDrag)
     EVT_LIST_COL_DRAGGING(LIST_CTRL, MyListCtrl::OnColDragging)
@@ -753,4 +1368,3 @@ END_EVENT_TABLE()
   
 } // EO namespace creaImageIO
 
-