]> Creatis software - creaImageIO.git/blobdiff - src2/creaImageIOWxTreeView.cpp
move directory
[creaImageIO.git] / src2 / creaImageIOWxTreeView.cpp
index 4b1e5cd0b097cf4e87b5bff40606c27949c54cbe..86850e4192e795c7691f69567ea2f7dab904860e 100644 (file)
@@ -3,62 +3,91 @@
 #include <creaImageIOSystem.h>
 #include <wx/splitter.h>
 #include <wx/gdicmn.h>
+#include <boost/date_time/gregorian/gregorian.hpp>
+#include <creaImageIOGimmick.h>
+#ifdef _DEBUG
+#define new DEBUG_NEW
+#endif
+//=====================================================================
+namespace creaImageIO
+{
+
+  //=====================================================================
+}
+//=====================================================================
+
+//=====================================================================
 ///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;
+  creaImageIO::ItemData* data1 = (creaImageIO::ItemData*)item1;
+  creaImageIO::ItemData* data2 = (creaImageIO::ItemData*)item2;
 
-               return 0;
-       }
-       else
-       {
-               if (s1 < s2)
-                       return -1;
-               if (s1 > s2)
-                       return 1;
-
-               return 0;
-
-       }
-       
+  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 +97,7 @@ namespace creaImageIO
                         wxWindow* parent,
                         const wxWindowID id)
     : wxPanel(parent,id),
-      TreeView(handler,gimmick)
+      TreeView(handler, gimmick)
   {
     GimmickDebugMessage(1,"WxTreeView::WxTreeView"
                        <<std::endl);
@@ -80,27 +109,33 @@ namespace creaImageIO
     //    mSplitter = new wxSplitterWindow( this , -1);
 
     // Global sizer
-    wxBoxSizer *sizer = new wxBoxSizer(wxHORIZONTAL);
+    msizer = new wxBoxSizer(wxHORIZONTAL);
     
     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,38 +145,48 @@ namespace creaImageIO
                                          ctrl_style);
        level.wxCtrl = ctrl;
        level.wxSplitter->Initialize(ctrl);
-
-       // Create the first column : number of children
-       if(i<handler->GetTree().GetNumberOfLevels()-1)
-       {
-       std::string title = "#";
-       if (i<handler->GetTree().GetNumberOfLevels()-1)
-         {
-           title += handler->GetTree().GetLevelDescriptor(i+1).GetName();
-           if (title[title.size()-1]!='s')
-             title += "s";
-         }
-       ctrl->InsertColumn(0,crea::std2wx(title),col_style);
-       }
-
+   
        // Create the columns : one for each attribute of the level
-       int col = 1;
-       tree::LevelDescriptor::AttributeDescriptorListType::const_iterator a;
-       for (a  = handler->GetTree().GetAttributeDescriptorList(i).begin();
-            a != handler->GetTree().GetAttributeDescriptorList(i).end();
+       int col = 0;
+       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)
-         {
+
+{
        
-               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());
+             }
                
          }
          
@@ -150,6 +195,7 @@ namespace creaImageIO
     
 #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"));
@@ -160,22 +206,48 @@ namespace creaImageIO
        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) );
+
+
+       ////SubMenuItem EXPORT
+       subExportMenu = new wxMenu;
+       wxMenuItem *subExp1 = subExportMenu->Append(wxID_ANY, _T("&Export to Storage"));
+       Connect( subExp1->GetId(), wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler(WxTreeView::OnExportToStorage) );
+
+       //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"));
+       wxMenuItem* m4Item=menuItem->Append(wxID_ANY, _T("&Display Dicom Tags"));
+       menuItem->AppendSubMenu(subExportMenu, wxT("&Export"));
+
+       mAnonymizingID=m1Item->GetId();
+       mLocalCopyID=m2Item->GetId();
+       mEditFieldID=m3Item->GetId();
+       mDumpID=m4Item->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) );
+       Connect( mDumpID, wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler(WxTreeView::OnDumpTags) );
+       
+
        
 #endif // wxUSE_MENUS
+       /// Initialize the first level splitter
+         
+       msizer->Add( mLevelList[0].wxSplitter ,1, wxGROW  ,0);
+       //      mColumnSelected=1;
+       mLastSelected=0;
+       mLastLevel=0;
+       //      mDirection=true;
 
+       mIgnoreSelectedChanged = false;
 
-    /// Initialize the first level splitter
-      sizer->Add( mLevelList[0].wxSplitter ,1, wxGROW  ,0);
-       mColumnSelected=1;
-       mLastSelected=0;
-       mDirection=true;
-       mSelectionMade=false;
-       mProcess=true;
        //CreateColorPalette();
     UpdateLevel(1);
 
-    SetSizer( sizer );     
+    SetSizer( msizer );     
     SetAutoLayout(true);
     Layout();
 
@@ -188,38 +260,46 @@ namespace creaImageIO
   {
     GimmickDebugMessage(1,"WxTreeView::~WxTreeView"
                        <<std::endl);
+       delete menu;
+       delete menuItem;
+
   }
   //=====================================================================
   
   
+  
   //=====================================================================
-  struct ItemData
-  {
-    tree::Node* node;
-       int id;
-  };
-  //=====================================================================
-   std::vector<tree::Node*> WxTreeView::GetSelected(int level)
+  const std::vector<tree::Node*>& WxTreeView::GetSelected(int level)
   {
+         std::vector<tree::Node*>& sel = mLevelList[0].Selected;
+    //  if (GetSelectedUpToDate(level)) 
     int l = level - 1;
     // the selection of upper level
-    std::vector<tree::Node*> sel;
-       
-    if (level == 1) 
+       if(mLevelList.size() == level -1)
+                sel = mLevelList.back().Selected;
+       else
+                 sel=  mLevelList[l].Selected;
+       if (sel.size() > 0)
+       {
+               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();
@@ -227,57 +307,142 @@ 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::string &i_save)
   {
-         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)
+        bool erase=false;
+        
+        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)
+       {
+       
+           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 = new (tree::Node*)(*i);
+                         GetTreeHandler()->LoadChildren((*i),4);
+                         GetGimmickView()->AddIgnoreFile(*i);
+                         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;
+       }
+    
+       if (erase && mLastLevel == 1 && i_save == "0")
+       {
+       
+               RemoveAlertDlg *dial = new RemoveAlertDlg(this,  crea::std2wx("Remove files"), wxSize(370,100));
+               //dial->ShowModal();
+               if (dial->ShowModal() == wxID_OK)
                {
-                       GimmickDebugMessage(2,
-                                       "deleting '"
-                                       <<(*i)->GetLabel()
-                                       <<"'"<<level
-                                       <<std::endl);
-                               GetTreeHandler()->Remove(*i);
+                       i_save = dial->isChecked() == false? "0" : "1";
                }
-
-               UpdateLevel(level);
-         }
-         
+               
+       }
   }
-    
-
-  //=====================================================================
-
+  
+  
   //=====================================================================
-  /// Updates a level of the view (adds or removes children, proganizes, etc.)
+  /// Updates a level of the view (adds or removes children, etc.)
   void WxTreeView::UpdateLevel( int level )
   {
     GimmickDebugMessage(1,
                        GetTreeHandler()->GetTree().GetLabel()
-                       <<" view : updating level "<<level
+                       <<"WxTreeView::UpdateLevel(level "
+                       <<level
+                       <<")"
                        <<std::endl);
     
     wxBusyCursor busy;
@@ -294,215 +459,228 @@ 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)
-   
-       for (i=sel.begin(); i!=sel.end(); ++i)
+    std::vector<tree::Node*>::const_iterator i;
+    
+    for (i=sel.begin(); i!=sel.end(); ++i)
       {
-       GimmickDebugMessage(2,
+       GimmickDebugMessage(1,
                            "adding children of '"
                            <<(*i)->GetLabel()
                            <<"'"
                            <<std::endl);
-       int _id=1;
+       int _id=0;
+       
+       //Adds items and sets their attributes 
        
-       //Adds items (other than the first) and sets their attributes 
-          GetCtrl(l)->InsertItem(0, _T(""));
        GetTreeHandler()->LoadChildren(*i,1);
        tree::Node::ChildrenListType::reverse_iterator j;
        for (j = (*i)->GetChildrenList().rbegin(); 
             j!= (*i)->GetChildrenList().rend(); 
             ++j)
          {
-                        wxListItem* item= new wxListItem;
-           item->SetMask(wxLIST_MASK_STATE | 
+           GimmickDebugMessage(1,
+                               "adding children "
+                               <<(*j)->GetLabel()
+                               <<"'"
+                               <<std::endl);
+           
+           wxListItem item;
+           item.SetMask(wxLIST_MASK_STATE | 
                         wxLIST_MASK_TEXT |
                         //                      wxLIST_MASK_IMAGE |
                         wxLIST_MASK_DATA |
                         //                      wxLIST_MASK_WIDTH |
                         wxLIST_MASK_FORMAT
                         );
-          
-           ItemData* data = new ItemData;
            
-               data->node = *j;
-               item->SetId(_id);
+               ItemData* data = new ItemData();
+           data->node = *j;
+           data->id = _id;
+               
+           item.SetId(_id);
+           item.SetData(data);
 
-               data->id = _id;
-           item->SetData(data);
+           _id++;
+           GetCtrl(l)->InsertItem(item);
            
-               _id++;
-               
-               
-               //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));            
-
-           item->SetColumn(0);
-                GetCtrl(l)->InsertItem(*item);
-               //GetCtrl(l)->SetItem(item);
-               
-               //Setting other attributes
-               if(level<mLevelList.size())
-               { 
-               for (int k=1; k<GetCtrl(l)->GetColumnCount(); k++)
+           //Setting attributes
+           for (int k=0; 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)->RefreshItem(*item);
-             } 
-               }
-               else
+               std::string val;
+               //  Temporary correction : it works but no explanation about the problem FCY
+               
+               if(k==0 && level <3)
                {
-                       for (int k=0; k<GetCtrl(l)->GetColumnCount(); k++)
-             {
-                       std::string val = (*j)->GetAttribute(mLevelList[l].key[k]);
-                       if (val.size()==0) val = "?";
-                       item->SetText( crea::std2wx(val));
-                       item->SetColumn(k);
-                       GetCtrl(l)->SetItem(*item);     
-                       GetCtrl(l)->RefreshItem(*item);
-             } 
+                 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 = "?";
+                 }
+               if (val.size()==0) val = "X";
+               item.SetText( crea::std2wx(val));
+               item.SetColumn(k);
                  
+                 GetCtrl(l)->SetItem(item);
+                 }
+               item.Clear();
+           
          }
-       GetCtrl(l)->DeleteItem(0);
       }
     
+    SortLevel(l);
     GetCtrl(l)->Show();
-    
-    if (level<mLevelList.size()) UpdateLevel(level+1);
-       
- }
+  }
   //=====================================================================
-
-
+  
+  
   //================================================================
-  void WxTreeView::OnSelectedChanged(wxListEvent& event)
+  void WxTreeView::OnItemDeSelected(wxListEvent& event)
   { 
     GimmickDebugMessage(1,
                        GetTreeHandler()->GetTree().GetLabel()
-                       <<" view : item selected "
-                       <<std::endl);
+                       <<" WxTreeView::OnItemDeselected"<<std::endl);
+    // retrieve the level
+    wxObject* obj = event.GetEventObject();   
+    unsigned int level = 0;
+    for (level = 0; level<mLevelList.size(); ++level)
+      {
+       if ( GetCtrl(level) == obj ) break;
+      } 
+    SetSelectedUpToDate(level,false);
+    // 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 if(mProcess)
-               {
-               mLastLevelSelected=GetSelected(level+2);
-               }
-               else
-               {
-                       event.Veto();
-               }
+    
+    // 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)&&mProcess) 
-               {
-                       if(event.GetEventType()==10145)
-                       {
-                       ValidateSelectedImages (true);
-                       }
-                       else
-                       {
-                               ValidateSelectedImages (false);
-                       }
-               }
-               //SetColor(level,event.m_itemIndex);
-       /*}
+       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==(GetCtrl(level)->GetItemCount()-1))
-               {
-                       mProcess=true;
-               }
-               else
-               {
-                       mProcess=false;
-               }
-
-               /*if(item!=0)
-               {*/
-               GetCtrl(level)->SetItemState(item,wxLIST_STATE_SELECTED, wxLIST_MASK_STATE 
-               | wxLIST_MASK_TEXT |wxLIST_MASK_IMAGE | wxLIST_MASK_DATA | wxLIST_MASK_WIDTH | wxLIST_MASK_FORMAT);
-               //}
-               
-    }
-
+         break;
        
+       if(item==(GetCtrl(level)->GetItemCount()-1))
+         {
+           mIgnoreSelectedChanged = false;//mProcess=true;
+         }
+       else
+         {
+           mIgnoreSelectedChanged = true;//    mProcess=false;
+         }
+       GetCtrl(level)->SetItemState(item,wxLIST_STATE_SELECTED, wxLIST_MASK_STATE 
+                                    | wxLIST_MASK_TEXT |wxLIST_MASK_IMAGE | wxLIST_MASK_DATA | wxLIST_MASK_WIDTH | wxLIST_MASK_FORMAT);
+      }
   }
 
   //================================================================
@@ -510,237 +688,374 @@ namespace creaImageIO
 
   void WxTreeView::OnColClick(wxListEvent& event)
   { 
-       mColumnSelected=event.m_col;
-       wxPoint clientpt = event.GetPoint();
-       senderCtrl = event.GetEventObject(); 
-       unsigned int level = 0;
-       for (level = 0; level<mLevelList.size(); ++level)
-       {
+    mColumnSelected = event.m_col;
+    wxPoint clientpt;
+    clientpt.x = wxGetMousePosition().x - this->GetScreenPosition().x;
+    clientpt.y = wxGetMousePosition().y - this->GetScreenPosition().y;
+    senderCtrl = event.GetEventObject(); 
+    unsigned int level = 0;
+    for (level = 0; level<mLevelList.size(); ++level)
+      {
        if ( GetCtrl(level) == senderCtrl ) break;
-       }
-       for(int i=0;i<mColumnSelected;i++)
+      }
+    PopupMenu(menu, clientpt);
+    
+  }
+
+   //================================================================
+  //================================================================
+
+  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::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::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::OnLocalCopy(wxCommandEvent& event)
+  {
+    wxBusyCursor busy;
+    
+       unsigned int tempLevel = mLastLevel;
+    mLastLevel+=1;
+    const std::vector<tree::Node*>& sel=GetSelected(mLastLevel+1);
+       
+    if(sel.size() != 0)
        {
-               clientpt.x+=GetCtrl(level)->GetColumnWidth(i);
+           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);
+                 }
        }
-       for(int i=0;i<level;i++)
+       else
        {
-               clientpt.x+=GetSplitter(i)->GetSashPosition();
+               mLastLevel = tempLevel;
        }
-       clientpt.y+=level*2;    
-       if(level==mLevelList.size()-1)
+    
+    
+  }
+  //================================================================
+
+   //================================================================
+  void WxTreeView::OnEditField(wxCommandEvent& event)
+  {
+       if(mLastRightSelected!=-1)
        {
-               mColumnSelected+=1;
-               PopupMenu(menu, clientpt);
-       }
-       else if(mColumnSelected!=0)
+    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)
        {
-               PopupMenu(menu, clientpt);
+               if(a->GetFlags()==creaImageIO::tree::AttributeDescriptor::EDITABLE)
+           {
+                       names.push_back(a->GetName());
+                       keys.push_back(a->GetKey());
+               }
+       }
+       GetGimmickView()->CreateEditFieldsDialog(node,names,keys);
        }
+  }
+
+  //================================================================
+
+  //================================================================
 
+  void WxTreeView::OnExportToStorage(wxCommandEvent &event)
+  {
+       std::vector<std::string> filesname;
+       std::vector<tree::Node*> nodes;
+       nodes.push_back(((ItemData*)GetCtrl(mLastRightLevel)->GetItemData(mLastRightSelected))->node);
+       GetFilenamesAsString(nodes,filesname);
+       GetGimmickView()->ExportToStorage(filesname);
   }
-    //================================================================
-  void WxTreeView::OnPopupFilter(wxCommandEvent& event)
+
+  //================================================================
+
+  //================================================================
+
+  void WxTreeView::OnDumpTags(wxCommandEvent &event)
   {
-               wxBusyCursor busy;
-                GimmickDebugMessage(7,
-                       "WxTreeView::OnEndLabelEdit" 
-                       <<std::endl);
-         wxObject* ctrl = event.GetEventObject(); 
-               unsigned int level = 0;
-               for (level = 0; level<mLevelList.size(); ++level)
-               {
-               if ( GetCtrl(level) == senderCtrl ) break;
-               }
-               std::string filter = crea::wx2std(wxGetTextFromUser(_T("Enter the filter to apply"), _T("Filter On Column")));
-               
-               std::string att;
-               
-               long it = -1;
-               UpdateLevel(level+1);
-               
-               std::vector<long> items;
-               bool in=false;
-               int del=0;
-               for ( ;; )
-               {
-                       it = GetCtrl(level)->GetNextItem(it,
-                                                                               wxLIST_NEXT_ALL);
-                       if ( it == -1 )
-                               break;
-                       
-                       long adr = GetCtrl(level)->GetItemData(it);
-                       tree::Node* nod = ((ItemData*)adr)->node;
-                       att=(*nod).GetAttribute(mLevelList[level].key[mColumnSelected-1]);
-                       
-                       
-                       if(att.find(filter)>900)
+         if(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(!in)
-                               {
-                                       in=true;
-                               }
-                               else
+                               if(a->GetKey()=="FullFileName")
                                {
-                                       del+=1;
+                                       GetGimmickView()->DumpTags(node->GetAttribute("FullFileName"));
+                                       return;
                                }
-                               
-                               items.push_back(it-del);
                        }
-                       
-               }
-               std::vector<long>::iterator iter;
-               for(iter=items.begin();iter!=items.end();++iter)
-               {
-                       GetCtrl(level)->DeleteItem(*iter);
-               }
-               GetGimmickView()->ClearSelection();
+         }
   }
-  //================================================================
+  
 
   //================================================================
-  void WxTreeView::OnPopupSort(wxCommandEvent& event)
-  {
-               wxBusyCursor busy;
-               unsigned int level = 0;
-               for (level = 0; level<mLevelList.size(); ++level)
-               {
-               if ( GetCtrl(level) == senderCtrl ) break;
-               }
-               if(event.GetId()==mAscendingID)
-               {
-                       mDirection=true;
-               }
-               else if(event.GetId()==mDescendingID)
-               {
-                       mDirection=false;
-               }
 
-        OnSort(level);
-  }
   //================================================================
-  void WxTreeView::OnSort(int level)
+  void WxTreeView::SortLevel(int level)
   {      
-       //Obtain the column name and the level that needs to be organized
-
-       if(level==mLevelList.size()-1||mColumnSelected!=0)
-       {        
-               int l = level - 1;
-               //GetCtrl(level)->DeleteItem(0);
-               //Sets the data for the items to be sorted
-               std::string att;
-               unsigned int ty=0;
-               int n = GetCtrl(level)->GetItemCount();
-               for (int i = 0; i < n; i++)
-               {
-                         
-                       //Gets current item data
-                       long adr = GetCtrl(level)->GetItemData(i);
-                       
-                       //Extracts the node and the type of attribute
-                       tree::Node* nod = ((ItemData*)adr)->node;
-                       if(i==0)
-                       {
-                               (*nod).GetAttributeDescriptor(mLevelList[level].key[mColumnSelected-1]).DecodeType(ty);
-                       }
-                       //Obtains the organizing attribute
-                       att=(*nod).GetAttribute(mLevelList[level].key[mColumnSelected-1]);
-                       
-                       char* d= new char [att.size()+1];
-                       strcpy (d, att.c_str());
-
-                       //Creates array
-                       long* lp= new long[2];
-                       lp[0]=adr;
-                       lp[1]=(long)d;
-                        
-                       //Sets it as the data
-                       GetCtrl(level)->SetItemData(i,(long)lp);
-               }       
-                 
-               if(mDirection)
-               {
-                       if(ty==1)
-                       {
-                               GetCtrl(level)->SortItems(CompareFunctionInts, 0);
-                       }
-                       else
-                       {
-                               GetCtrl(level)->SortItems(CompareFunctionStrings, 0);
-                       }
-                       
-               }
-               else
-               {
-                       if(ty==1)
-                       {
-                               GetCtrl(level)->SortItems(CompareFunctionInts, 1);
-                       }
-                       else
-                       {
-                               GetCtrl(level)->SortItems(CompareFunctionStrings, 1);
-                       }
-               }
+    GimmickDebugMessage(1,
+                       "WxTreeView::SortLevel(" 
+                       <<level<<")"
+                       <<std::endl);  
+    //Obtain the column name and the level that needs to be organized
+    
+    //    int l = level - 1;
+    //Sets the data for the items to be sorted
+    //    std::string att;
+    unsigned int ty=0;
+    int nbselected = 0;
+    int n = GetCtrl(level)->GetItemCount();
+    for (int i = 0; i < n; i++)
+      {
+       
+       //Gets current item data
+       ItemData* data = (ItemData*)GetCtrl(level)->GetItemData(i);
+       
+       //Extracts the node and the type of attribute   
+       tree::Node* nod = data->node;
+       if(i==0)
+         {
+           (*nod).GetAttributeDescriptor
+             (mLevelList[level].key[mLevelList[level].SortColumn])
+             .DecodeType( ty );
+         }
+       //Obtains the organizing attribute
+       data->attr = & (*nod).GetAttribute
+         (mLevelList[level].key[mLevelList[level].SortColumn]);
+       //Selected ?
+       data->selected = false;
+       if (GetCtrl(level)->GetItemState(i,wxLIST_STATE_SELECTED)>0)
+         {
+           data->selected = true;
+           nbselected++;
+         }
 
-               //Resets original data
-               std::vector<tree::Node*>::iterator selection;
-               std::vector<long> change;
-               long it = -1;
-               for ( ;; )
-               {
-                       it = GetCtrl(level)->GetNextItem(it,
-                                                                               wxLIST_NEXT_ALL);
-                       if ( it == -1 )
-                               break;
-                       
-                       //Gets current item data, extracts the node and resets it
-                       long item = GetCtrl(level)->GetItemData(it);
-                       GetCtrl(level)->SetItemData(it,((long*)item)[0]);
-                       tree::Node* n= ((ItemData*)((long*)item)[0])->node;
-                       if(level<mLevelList.size()-1)
-                       {
-                               for(selection=mSelected.begin();selection!=mSelected.end();++selection)
-                               {
-                                       if((*selection)->GetAttribute("ID").compare(n->GetAttribute("ID"))==0)
-                                       {
-                                               change.push_back(it);   
-                                       }
-                               }
-                       }
-                       else
-                       {
-                               for(selection=mLastLevelSelected.begin();selection!=mLastLevelSelected.end();++selection)
-                               {
-                                       if((*selection)->GetAttribute("ID").compare(n->GetAttribute("ID"))==0)
-                                       {
-                                               change.push_back(it);   
-                                       }
-                               }
-                       }
-                       
-                       
-               }
-               //Resets the selected items
-               std::vector<long>::iterator selectedIts;
-               for(selectedIts=change.begin();selectedIts!=change.end();++selectedIts)
-               {
-                       GetCtrl(level)->SetItemState(*selectedIts,wxLIST_STATE_SELECTED, wxLIST_MASK_STATE 
-               | wxLIST_MASK_TEXT |wxLIST_MASK_IMAGE | wxLIST_MASK_DATA | wxLIST_MASK_WIDTH | wxLIST_MASK_FORMAT);
-                       
-               }
-               //GetCtrl(level)->InsertItem(0,_T("Filter:"));
-       }
+      }        
+    GimmickDebugMessage(1,
+                       "WxTreeView::OnSort : " 
+                       <<nbselected<<" selected before sorting"
+                       <<std::endl);  
+
+    mIgnoreSelectedChanged = true; 
+    // 
+    if (mLevelList[level].SortAscending)
+      {
+       
+       if(ty==1)
+         {
+           GetCtrl(level)->SortItems(CompareFunctionInts, 0);
+         }
+       else
+         {
+           GetCtrl(level)->SortItems(CompareFunctionStrings, 0);
+         }
        
-   }
+      }
+    else
+      {
+       if(ty==1)
+         {
+           GetCtrl(level)->SortItems(CompareFunctionInts, 1);
+         }
+       else
+         {
+           GetCtrl(level)->SortItems(CompareFunctionStrings, 1);
+         }
+      }
  
+
+    // Reselects the unselected 
+    n = GetCtrl(level)->GetItemCount();
+    int after = 0;
+    for (int i = 0; i < n; i++)
+      {
+       
+       //Gets current item data
+       ItemData* data = (ItemData*)GetCtrl(level)->GetItemData(i);
+  
+       //  long item = -1;
+       //    for ( ;; )
+       //      {
+       //      item = GetCtrl(level)->GetNextItem(item,wxLIST_NEXT_ALL);
+       //      if ( item == -1 ) break;
+       //Gets current item data
+       //      ItemData* data = (ItemData*)GetCtrl(level)->GetItemData(item);
+       // was selected ?
+       
+       if (data->selected)
+         {
+           nbselected--;
+           if (nbselected==0)
+             {
+               // if it is the last one we must process the selection
+               mIgnoreSelectedChanged = false;
+             }
+           GetCtrl(level)->SetItemState(i,
+                                        wxLIST_STATE_SELECTED, 
+                                        wxLIST_MASK_STATE 
+                                        | wxLIST_MASK_TEXT 
+                                        | wxLIST_MASK_IMAGE 
+                                        | wxLIST_MASK_DATA 
+                                        | wxLIST_MASK_WIDTH 
+                                        | wxLIST_MASK_FORMAT);   
+         }
+       if (GetCtrl(level)->GetItemState(i,wxLIST_STATE_SELECTED)>0)
+         {
+           after++;
+         }
+
+       
+      }
+    mIgnoreSelectedChanged = false; 
+     GimmickDebugMessage(1,
+                       "WxTreeView::SortLevel : " 
+                       <<after<<" selected after sorting"
+                       <<std::endl);  
+  
+  }
+  //================================================================
+
+  
   //================================================================
   void WxTreeView::ValidateSelectedImages(bool isSelection)
   {
     GimmickDebugMessage(7,
                        "WxTreeView::ValidateSelectedImages" 
                        <<std::endl);
-    std::vector<tree::Node*> sel(GetSelected(mLevelList.size()+1));
-       GetGimmickView()->OnSelectionChange(sel,isSelection,(mLastSelected-1), mProcess);
+    const std::vector<tree::Node*>& sel(GetSelected(mLevelList.size()+1));
+    GetGimmickView()->OnSelectionChange(sel,
+                                       isSelection,(mLastSelected-1),
+                                       !mIgnoreSelectedChanged);
  
   }
   //================================================================
@@ -767,12 +1082,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);
@@ -780,130 +1096,189 @@ namespace creaImageIO
     }
 
   }
+  //================================================================
+   //=================================================
+  void WxTreeView::OnKeyDown(wxListEvent &event)
+  {
+         if(event.GetKeyCode() == WXK_DELETE)
+         {
+                  wxBusyCursor busy;
+                  std::string temp = "0";
+                  RemoveSelected(temp);
+                  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::SetColor(int l, int item)
+  //================================================================
+  void WxTreeView::GetFilenamesAsString(const std::vector<tree::Node*>& nodes, std::vector<std::string>&s)
   {
-         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)
+    std::vector<tree::Node*>::const_iterator i;
+    
+    for (i=nodes.begin(); i!=nodes.end(); ++i)
+      {
+                 if((*i)->GetLevel()<mLevelList.size())
                  {
-                   colorId++;
+                        GetTreeHandler()->LoadChildren(*i,0);
+                        GetFilenamesAsString((*i)->GetChildrenList(),s);
                  }
-               else
-                       {
-                         colorId=0;
-                       }
-               }
-               else if(l!=mLevelList.size()-1)
+                 else
                  {
-                   item.SetBackgroundColour(mColorMap[*i]); 
-                       mColorMap.insert(NodeColorPair(*j,mColorMap[*i]));
+                       std::string filename=(*i)->GetAttribute("FullFileName");
+                       s.push_back(filename);
+                 }
+      }
+  }
+
+   //================================================================
+
+   //================================================================
+  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());
                }
-               else
-               {
-                       item.SetBackgroundColour(mColorMap[*i]); 
-               }*/
+       }
+       notShown=mLevelList[level-1].notShownAtts;
   }
+
   //================================================================
-  void WxTreeView::CreateColorPalette()
+  void WxTreeView::SetNonVisibleAttributes(const std::vector<std::string>& notShown, int nlevel)
   {
-  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");
+       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;
   }
+ //================================================================
+  //================================================================
+
+       RemoveAlertDlg::RemoveAlertDlg(wxWindow *parent, 
+                                              wxString title,    
+                                                  const wxSize& size)
+ :   wxDialog( parent, 
+                 wxID_ANY, 
+                 title,
+                 wxDefaultPosition,
+                 size,
+                 wxDEFAULT_DIALOG_STYLE)
+       {
+           wxBoxSizer *topsizer = new wxBoxSizer(wxVERTICAL);
+
+               //std::string out("To reload deleted patient, you should synchronize your database before.");  // JPR
+               //wxTextCtrl *text = new wxTextCtrl(this, wxID_ANY,crea::std2wx(out),wxDefaultPosition, wxSize(500,20));
+               wxTextCtrl *text = new wxTextCtrl(this, wxID_ANY,
+                                       _T("To reload deleted patient, you should synchronize your database before."),
+                                       wxDefaultPosition, wxSize(500,20));
+               mcheck = new wxCheckBox(this, 5478, _T("Do not display this warning again!"));
+               Connect( mcheck->GetId(), wxEVT_COMMAND_CHECKBOX_CLICKED , (wxObjectEventFunction) &RemoveAlertDlg::onCheck ); 
+               wxSizer* buttonsSizer = this->CreateSeparatedButtonSizer(wxOK|wxCANCEL);
+               
+               topsizer->Add(text);
+               topsizer->Add(mcheck,0,wxGROW);
+               topsizer->Add(buttonsSizer,0,wxGROW);
+               SetSizer(topsizer, true);
+               mSave = false;
+               Layout();
+       }
+       RemoveAlertDlg::~RemoveAlertDlg(){};
+       bool RemoveAlertDlg::isChecked()
+       {
+               return mSave;
+       }
+       void RemoveAlertDlg::onCheck(wxCommandEvent &Event)
+       {
+               mSave = mcheck->IsChecked();
+       }
+       
+
+  //================================================================
   //================================================================
   BEGIN_EVENT_TABLE(WxTreeView, wxPanel)   
   /*
@@ -957,9 +1332,10 @@ 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)
@@ -968,6 +1344,8 @@ BEGIN_EVENT_TABLE(MyListCtrl, wxListCtrl)
     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)