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

diff --git a/src2/creaImageIOWxTreeView.cpp b/src2/creaImageIOWxTreeView.cpp
index 7a948f5..2fced88 100644
--- a/src2/creaImageIOWxTreeView.cpp
+++ b/src2/creaImageIOWxTreeView.cpp
@@ -3,62 +3,104 @@
 #include <creaImageIOSystem.h>
 #include <wx/splitter.h>
 #include <wx/gdicmn.h>
+#include <boost/date_time/gregorian/gregorian.hpp>
+
+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
 {
   //=====================================================================
@@ -68,7 +110,7 @@ namespace creaImageIO
 			 wxWindow* parent,
 			 const wxWindowID id)
     : wxPanel(parent,id),
-      TreeView(handler,gimmick)
+      TreeView(handler, gimmick)
   {
     GimmickDebugMessage(1,"WxTreeView::WxTreeView"
 			<<std::endl);
@@ -82,25 +124,31 @@ namespace creaImageIO
     // Global sizer
     wxBoxSizer	*sizer = new wxBoxSizer(wxHORIZONTAL);
     
-    int ctrl_style = wxLC_REPORT | /*wxLC_VRULES |*/ wxLC_EDIT_LABELS;
+    int ctrl_style = wxLC_REPORT | wxLC_VRULES;
     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,
@@ -110,49 +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;
-	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"));
-		
-		    ctrl->InsertColumn(col,it);
-		    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
 
-    /// Initialize the first level splitter
- 
-      sizer->Add( mLevelList[0].wxSplitter ,1, wxGROW  ,0);
-	mColumnSelected=1;
+	 // 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) );
+
+
+
+	//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;
-	mDirection=true;
-	mSelectionMade=false;
-	CreateColorPalette();
+	mLastLevel=0;
+	//	mDirection=true;
+
+	mIgnoreSelectedChanged = false;
+
+	//CreateColorPalette();
     UpdateLevel(1);
 
     SetSizer( sizer );     
@@ -172,34 +267,32 @@ 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;
-	
-    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;
-			if(mLastSelected==i)
+	  else if (level < mLevelList.size()+2 ) 
+    {
+		long item = -1;
+		for ( ;; )
+		{
+			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();
@@ -207,57 +300,129 @@ namespace creaImageIO
 			}
 			else
 			{
+				
 				sel.push_back(n);
+			}			
+			
+		}
+		/*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 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)
-	  {
-		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);
-	  }
-	  
-  }
+	  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, 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;
@@ -274,45 +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;
-    //Adds the first item (filter)
-    GetCtrl(l)->InsertItem(0, _T("Filter:"));
+    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=1;
-	int colorId=0;
-
+	int _id=0;
+	
+	//Adds items and sets their attributes 
 	
-
-	//Adds items (other than the first) and sets their attributes 
 	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 |
@@ -321,356 +491,508 @@ namespace creaImageIO
 			 //			 wxLIST_MASK_WIDTH |
 			 wxLIST_MASK_FORMAT
 			 );
-
+	    
 	    ItemData* data = new ItemData;
+	    data->node = *j;
+	    data->id = _id;
 	    
-		data->node = *j;
-		item.SetId(_id);
-
-		data->id = _id;
+	    item.SetId(_id);
 	    item.SetData(data);
 	    
-		_id++;
-	    long id=GetCtrl(l)->InsertItem(item);
+	    _id++;
+	    GetCtrl(l)->InsertItem(item);
+	    
+	    //Setting attributes
+	    for (int k=0; k<GetCtrl(l)->GetColumnCount(); ++k)				
+	      {
+		std::string val;
+		//  Temporary correction : it works but no explanation about the problem FCY
 		
-		//Setting first column (number of children)
-	    std::ostringstream oss;
-	    int	n= GetTreeHandler()->GetNumberOfChildren(*j);
-	    oss << n;
-	    std::string s(oss.str());
-	    item.SetText( crea::std2wx(s));
-	
-		//Setting the color according to the parent
-		if(l==0)
+		if(k==0 && level <3)
 		{
-	        item.SetBackgroundColour
-		  (wxColourDatabase().Find
-		   (crea::std2wx(mColorPalette[colorId]))); 
-		mColorMap.insert
-		  (NodeColorPair
-		   (*j,wxColourDatabase().Find
-		    (crea::std2wx(mColorPalette[colorId]))));
-		if(colorId<64)
+		  val = (*j)->GetAttribute("NumberOfChildren");
+		}
+		else
+		  val = (*j)->GetAttribute(mLevelList[l].key[k]);
+		if(((*j)->GetAttributeDescriptor(mLevelList[l].key[k])).isDateEntry()) // Date
 		  {
-		    colorId++;
+		    //					  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
-			{
-			  colorId=0;
-			}
-		}
-		else if(l!=mLevelList.size()-1)
+		else if(((*j)->GetAttributeDescriptor(mLevelList[l].key[k])).isTimeEntry()) // Time
 		  {
-		    item.SetBackgroundColour(mColorMap[*i]); 
-			mColorMap.insert(NodeColorPair(*j,mColorMap[*i]));
-		}
+		    if ((val.size()>6) && 
+			(val != "" || val != " "))
+		      val = val.substr(0,2) + " : " 
+			+ val.substr(2,2) + " : " 
+			+ val.substr(4,2);
+		  }
 		else
-		{
-			item.SetBackgroundColour(mColorMap[*i]); 
-		}
-		
-
-	    item.SetColumn(0);
-	    GetCtrl(l)->SetItem(item);
-		
-		//Setting other attributes
-	  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);	
-	      }	    
+		GetCtrl(l)->SetItem(item);
+	      }	
+	    
 	  }
       }
     
+    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);
+
+    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;
-	for (level = 0; level<mLevelList.size(); ++level)
-	{
+    mLastSelected = event.m_itemIndex;
+    // retrieve the level
+    wxObject* obj = event.GetEventObject();   
+    unsigned int level = 0;
+    for (level = 0; level<mLevelList.size(); ++level)
+      {
 	if ( GetCtrl(level) == obj ) break;
-	}
-	GimmickDebugMessage(1,
+      }
+	mLastLevel=level;
+    GimmickDebugMessage(1,
 			" Level "<<level+1
 			<<std::endl);
-
-	if(event.m_itemIndex!=0)
-	{
-		if(level<mLevelList.size()-1)
-		{
-		mSelected=GetSelected(level+2);
-		}
-		else
-		{
-		mLastLevelSelected=GetSelected(level+2);
-		}
+    
+    // Update the children level (if selection not at last level)
+    if (level<mLevelList.size()-1) 
+      {
 		
-		if (level<mLevelList.size()-1) 
-		{
-			UpdateLevel( level + 2 ); 
-			GetGimmickView()->ClearSelection();
-		}
-		if (level==mLevelList.size()-2) SelectLowerLevel();
-		if (level==mLevelList.size()-1) ValidateSelectedImages ();
-	}
+	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
-	{
-		if(event.GetEventType()==10145)
-		{
-		
-		GetCtrl(level)->SetItemText(0,crea::std2wx(""));
-		GetCtrl(level)->EditLabel(event.m_itemIndex);
-		}
-		
-	}
-	
+	  {
+		  ValidateSelectedImages (false);
+	  }
+      }
+    
   }
   //================================================================
 
   //================================================================
-  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!=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::OnColClick(wxListEvent& event)
-  { 	  
-	//Obtain the column name and the level that needs to be organized
-	mColumnSelected=event.m_col;
-    GimmickDebugMessage(1,
-		" Column selected: " <<event.m_col
-			<<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);
+    
+  }
 
-	if(mColumnSelected!=0)
-	{
-		wxObject* ctrl = event.GetEventObject(); 
-		unsigned int level = 0;
-		for (level = 0; level<mLevelList.size(); ++level)
-		{
-		if ( GetCtrl(level) == ctrl ) break;
-		}
-		
-		wxBusyCursor busy;
-	 
-		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);
-			}
-			
-			mDirection=false;
-		}
-		else
-		{
-			if(ty==1)
-			{
-				GetCtrl(level)->SortItems(CompareFunctionInts, 1);
-			}
-			else
-			{
-				GetCtrl(level)->SortItems(CompareFunctionStrings, 1);
-			}
-			mDirection=true;
-		}
+   //================================================================
+  //================================================================
 
-		//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:"));
-	}
-	
-   }
+  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);
+    
+  }
+  
   //================================================================
-  void WxTreeView::OnBeginLabelEdit(wxListEvent& event)
+  //================================================================
+
+  void WxTreeView::OnPopupFilter(wxCommandEvent& event)
   {
-	GimmickDebugMessage(7,
-			"WxTreeView::OnBeginLabelEdit" 
+    wxBusyCursor busy;
+    GimmickDebugMessage(7,
+			"WxTreeView::OnEndLabelEdit" 
 			<<std::endl);
-	if(event.m_itemIndex!=0)
-	{
-		event.Veto();
-	}
+    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;
+      }
+    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::OnEndLabelEdit(wxListEvent& event)
+  void WxTreeView::OnLocalCopy(wxCommandEvent& event)
   {
-	  GimmickDebugMessage(7,
-			"WxTreeView::OnEndLabelEdit" 
-			<<std::endl);
-	  wxObject* ctrl = event.GetEventObject(); 
-		unsigned int level = 0;
-		for (level = 0; level<mLevelList.size(); ++level)
-		{
-		if ( GetCtrl(level) == ctrl ) break;
-		}
-		std::string filter = crea::wx2std(event.m_item.m_text.c_str());
-		
-		std::string att;
-		
-		long it = -1;
-		UpdateLevel(level+1);
-		
-		for ( ;; )
-		{
-			bool contains=false;
-			it = GetCtrl(level)->GetNextItem(it,
-										wxLIST_NEXT_ALL);
-			if ( it == -1 )
-				break;
-			if(it!=0)
-			{
-				long adr = GetCtrl(level)->GetItemData(it);
-				for (int j=1;j<GetCtrl(level)->GetColumnCount()-1&&!contains;j++)
-				{
-				tree::Node* nod = ((ItemData*)adr)->node;
-				att=(*nod).GetAttribute(mLevelList[level].key[j-1]);
-			
-				if(att.find(filter)<900)
-				{
-					contains=true;
-				}
-				}
-				if(!contains)
-				{
-					GetCtrl(level)->DeleteItem(it);
-				}
-			}
+    wxBusyCursor busy;
+    
+	unsigned int tempLevel = mLastLevel;
+    mLastLevel+=1;
+    const std::vector<tree::Node*>& sel=GetSelected(mLastLevel+1);
+	
+    if(sel.size() != 0)
+	{
+	    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;
+	}
+    
+    
+  }
+  //================================================================
+
+   //================================================================
+  void WxTreeView::OnEditField(wxCommandEvent& event)
+  {
+	if(mLastRightSelected!=-1)
+	{
+    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()->ClearSelection();
-		//GetCtrl(level)->DeleteAllItems();
+	}
+	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++;
+	  }
 
+	
+      }
+    mIgnoreSelectedChanged = false; 
+     GimmickDebugMessage(1,
+			"WxTreeView::SortLevel : " 
+			<<after<<" selected after sorting"
+			<<std::endl);  
+  
   }
   //================================================================
-  void WxTreeView::ValidateSelectedImages()
+
+  
+  //================================================================
+  void WxTreeView::ValidateSelectedImages(bool isSelection)
   {
     GimmickDebugMessage(7,
 			"WxTreeView::ValidateSelectedImages" 
 			<<std::endl);
-    std::vector<tree::Node*> sel(GetSelected(mLevelList.size()+1));
- 	GetGimmickView()->OnSelectionChange(sel);
+    const std::vector<tree::Node*>& sel(GetSelected(mLevelList.size()+1));
+    GetGimmickView()->OnSelectionChange(sel,
+					isSelection,(mLastSelected-1),
+					!mIgnoreSelectedChanged);
  
   }
   //================================================================
@@ -697,12 +1019,13 @@ 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;
 			nodes.push_back(nod);
@@ -710,21 +1033,93 @@ namespace creaImageIO
     }
 
   }
+  //================================================================
+   //=================================================
+  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();
-	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);
+      }
   }
 
+  //================================================================
+  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::SetColor(int l, int item)
+  {
+	  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)
+		{
+	        item.SetBackgroundColour
+		  (wxColourDatabase().Find
+		   (crea::std2wx(mColorPalette[colorId]))); 
+		mColorMap.insert
+		  (NodeColorPair
+		   (*j,wxColourDatabase().Find
+		    (crea::std2wx(mColorPalette[colorId]))));
+		if(colorId<64)
+		  {
+		    colorId++;
+		  }
+		else
+			{
+			  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()
   {
@@ -797,8 +1192,99 @@ namespace creaImageIO
 
 
   }
+
+   //================================================================
+  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)
+	{
+		if(a->GetFlags()==creaImageIO::tree::AttributeDescriptor::EDITABLE && IsAttributeVisible(a->GetName(),level))
+	    {
+			areShown.push_back(a->GetName());
+		}
+	}
+	notShown=mLevelList[level-1].notShownAtts;
+  }
+
   //================================================================
-  BEGIN_EVENT_TABLE(WxTreeView, wxPanel)
+  void WxTreeView::SetNonVisibleAttributes(const std::vector<std::string>& notShown, int nlevel)
+  {
+	mLevelList[nlevel].notShownAtts=notShown;
+  }
+
+  //================================================================
+   void WxTreeView::CreateCtrl(std::vector<std::string>& notShown, int nlevel)
+  {
+	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;
+
+  	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))
+	      {
+		  title=a->GetName();
+		  std::string temp = a->GetKey();
+		  if (temp.compare("ID") != 0)
+		  {
+			mLevelList[nlevel].wxCtrl->InsertColumn(col, 
+					crea::std2wx(title),
+					col_style);
+			col++;
+		  }
+		mLevelList[nlevel].key.push_back(a->GetKey());
+	      }
+		
+	  }
+	oldWin->Destroy();
+	UpdateLevel(1);
+	}
+
+   //================================================================
+  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)   
   /*
     EVT_SIZE(MyFrame::OnSize)
 
@@ -839,10 +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(-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
@@ -850,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)