*** empty log message ***

diff --git a/src2/creaImageIOTreeView.cpp b/src2/creaImageIOTreeView.cpp
index 43cb1ee1808b8ffc0d097cb75a70a1ee662cf49c..7a3f1287f8ab0796afd96c83b482626cc0d955c8 100644 (file)
--- a/src2/creaImageIOTreeView.cpp
+++ b/src2/creaImageIOTreeView.cpp
@@ -5,6 +5,7 @@ namespace creaImageIO
 {
   // CTor
   TreeView::TreeView(TreeHandler* handler)
+    : mTreeHandler(handler)
   {
     GimmickDebugMessage(1,"TreeView::TreeView"
                        <<std::endl);
@@ -18,12 +19,7 @@ namespace creaImageIO
   }
   
   
-  /// 
-  void TreeView::UpdateView()
-  {
-  }
-  
-
+ 
   
 } // EO namespace creaImageIO
 

diff --git a/src2/creaImageIOTreeView.h b/src2/creaImageIOTreeView.h
index df5f92f25b32ed8b1cf387b1b6853062864ff06c..fc345fee3a17105e8e982457771b6c41ceb4a246 100644 (file)
--- a/src2/creaImageIOTreeView.h
+++ b/src2/creaImageIOTreeView.h
@@ -21,9 +21,11 @@ namespace creaImageIO
       virtual ~TreeView();
 
       
-      /// Something like that ...
-      virtual void UpdateView();
+      /// Updates the view of a level given the selected items of upper level
+      virtual void UpdateLevel( int ) {}
       
+    protected:
+      TreeHandler* GetTreeHandler() { return mTreeHandler; }
 
     private:
       /// The TreeHandler with which it corresponds

diff --git a/src2/creaImageIOWxTreeView.cpp b/src2/creaImageIOWxTreeView.cpp
index f615a6916af72a5743e9c733241710410bf2d04e..a1d9142d5fd7276fb7938a7dc6035066e5587982 100644 (file)
--- a/src2/creaImageIOWxTreeView.cpp
+++ b/src2/creaImageIOWxTreeView.cpp
@@ -4,6 +4,7 @@
 
 namespace creaImageIO
 {
+  //=====================================================================
   // CTor
   WxTreeView::WxTreeView(TreeHandler* handler,
                         wxWindow* parent,
@@ -33,13 +34,14 @@ namespace creaImageIO
       {
        GimmickDebugMessage(5,"Creating ListCtrl for level "<<i
                            <<std::endl);
-
+       LevelType level;
        wxListCtrl* ctrl = new wxListCtrl(this,
                                          i,
                                          wxDefaultPosition, 
                                          wxDefaultSize,
                                          ctrl_style);
-       
+       level.wxCtrl = ctrl;
+
        // Create the columns : one for each attribute of the level
        int col = 0;
        tree::LevelDescriptor::AttributeDescriptorListType::const_iterator a;
@@ -53,32 +55,222 @@ namespace creaImageIO
            ctrl->InsertColumn(col, 
                               crea::std2wx(a->GetName()),
                               col_style);
+           level.key.push_back(a->GetKey());
+           // ctrl->SetColumnWidth(col, wxLIST_AUTOSIZE );
            col++;
          }
-       mListCtrl.push_back(ctrl);
+       mLevelList.push_back(level);
        sizer->Add( ctrl ,1, wxGROW  ,0);
       }
     
+    UpdateLevel(1);
+
     SetSizer( sizer );     
     SetAutoLayout(true);
     Layout();
 
   }
+  //=====================================================================
 
+  //=====================================================================
   /// Destructor
   WxTreeView::~WxTreeView()
   {
     GimmickDebugMessage(1,"WxTreeView::~WxTreeView"
                        <<std::endl);
   }
+  //=====================================================================
   
   
+  //=====================================================================
+  struct ItemData
+  {
+    tree::Node* node;
+  };
+  //=====================================================================
+
+  //=====================================================================
   /// 
-  void WxTreeView::UpdateView()
+  void WxTreeView::UpdateLevel( int level )
   {
+    GimmickDebugMessage(1,
+                       GetTreeHandler()->GetTree().GetLabel()
+                       <<" view : updating level "<<level
+                       <<std::endl);
+    int l = level - 1;
+    // the selection of upper level
+    std::vector<tree::Node*> sel;
+    if (level == 1) 
+      {
+       sel.push_back(GetTreeHandler()->GetTree().GetTree());
+      }
+    else 
+      {
+       int n = GetCtrl(l-1)->GetItemCount();
+       for (int i = 0; i < n; i++)
+         {
+           if ( GetCtrl(l-1)->GetItemState(i,wxLIST_STATE_SELECTED))
+             {
+               long adr = GetCtrl(l-1)->GetItemData(i);
+               tree::Node* n = ((ItemData*)adr)->node;
+               sel.push_back(n);
+             }
+         }     
+      }
+
+    // to speed up inserting we hide the control temporarily
+    GetCtrl(l)->Hide();
+    GetCtrl(l)->DeleteAllItems();
+    
+    std::vector<tree::Node*>::iterator i;
+    for (i=sel.begin(); i!=sel.end(); ++i)
+      {
+       GimmickDebugMessage(2,
+                           "adding children of '"
+                           <<(*i)->GetLabel()
+                           <<"'"<<level
+                           <<std::endl);
+       
+       GetTreeHandler()->LoadChildren(*i,1);
+       tree::Node::ChildrenListType::reverse_iterator j;
+       for (j = (*i)->GetChildrenList().rbegin(); 
+            j!= (*i)->GetChildrenList().rend(); 
+            ++j)
+         {
+           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.SetData(data);
+           
+           long id = GetCtrl(l)->InsertItem(item);
+
+           for (int k=0; k<GetCtrl(l)->GetColumnCount(); k++)
+             {
+               GetCtrl(l)->SetItem
+                 (id,k,
+                  crea::std2wx
+                  ( (*j)->GetAttribute(mLevelList[l].key[k]) ));
+             }
+           
+         }
+      }
+    
+    GetCtrl(l)->Show();
+ }
+  //=====================================================================
+
+
+  //================================================================
+  void WxTreeView::OnSelected(wxListEvent& event)
+  { 
+    GimmickDebugMessage(1,
+                       GetTreeHandler()->GetTree().GetLabel()
+                       <<" view : item selected "
+                       <<std::endl);
+
+    
+    wxListItem info;
+    info.m_itemId = 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,
+                       " Level "<<level+1
+                       <<std::endl);
+    if (level<mLevelList.size()-1) UpdateLevel( level + 2 ); 
+    
   }
-  
+  //================================================================
+
+
+
+  BEGIN_EVENT_TABLE(WxTreeView, wxPanel)
+  /*
+    EVT_SIZE(MyFrame::OnSize)
+
+    EVT_MENU(LIST_QUIT, MyFrame::OnQuit)
+    EVT_MENU(LIST_ABOUT, MyFrame::OnAbout)
+    EVT_MENU(LIST_LIST_VIEW, MyFrame::OnListView)
+    EVT_MENU(LIST_REPORT_VIEW, MyFrame::OnReportView)
+    EVT_MENU(LIST_ICON_VIEW, MyFrame::OnIconView)
+    EVT_MENU(LIST_ICON_TEXT_VIEW, MyFrame::OnIconTextView)
+    EVT_MENU(LIST_SMALL_ICON_VIEW, MyFrame::OnSmallIconView)
+    EVT_MENU(LIST_SMALL_ICON_TEXT_VIEW, MyFrame::OnSmallIconTextView)
+    EVT_MENU(LIST_VIRTUAL_VIEW, MyFrame::OnVirtualView)
+    EVT_MENU(LIST_SMALL_VIRTUAL_VIEW, MyFrame::OnSmallVirtualView)
+
+    EVT_MENU(LIST_FOCUS_LAST, MyFrame::OnFocusLast)
+    EVT_MENU(LIST_TOGGLE_FIRST, MyFrame::OnToggleFirstSel)
+    EVT_MENU(LIST_DESELECT_ALL, MyFrame::OnDeselectAll)
+    EVT_MENU(LIST_SELECT_ALL, MyFrame::OnSelectAll)
+    EVT_MENU(LIST_DELETE, MyFrame::OnDelete)
+    EVT_MENU(LIST_ADD, MyFrame::OnAdd)
+    EVT_MENU(LIST_EDIT, MyFrame::OnEdit)
+    EVT_MENU(LIST_DELETE_ALL, MyFrame::OnDeleteAll)
+    EVT_MENU(LIST_SORT, MyFrame::OnSort)
+    EVT_MENU(LIST_SET_FG_COL, MyFrame::OnSetFgColour)
+    EVT_MENU(LIST_SET_BG_COL, MyFrame::OnSetBgColour)
+    EVT_MENU(LIST_TOGGLE_MULTI_SEL, MyFrame::OnToggleMultiSel)
+    EVT_MENU(LIST_SHOW_COL_INFO, MyFrame::OnShowColInfo)
+    EVT_MENU(LIST_SHOW_SEL_INFO, MyFrame::OnShowSelInfo)
+    EVT_MENU(LIST_FREEZE, MyFrame::OnFreeze)
+    EVT_MENU(LIST_THAW, MyFrame::OnThaw)
+    EVT_MENU(LIST_TOGGLE_LINES, MyFrame::OnToggleLines)
+    EVT_MENU(LIST_MAC_USE_GENERIC, MyFrame::OnToggleMacUseGeneric)
+
+    EVT_UPDATE_UI(LIST_SHOW_COL_INFO, MyFrame::OnUpdateShowColInfo)
+    EVT_UPDATE_UI(LIST_TOGGLE_MULTI_SEL, MyFrame::OnUpdateToggleMultiSel)
+END_EVENT_TABLE()
+
+BEGIN_EVENT_TABLE(MyListCtrl, wxListCtrl)
+    EVT_LIST_BEGIN_DRAG(LIST_CTRL, MyListCtrl::OnBeginDrag)
+    EVT_LIST_BEGIN_RDRAG(LIST_CTRL, MyListCtrl::OnBeginRDrag)
+    EVT_LIST_BEGIN_LABEL_EDIT(LIST_CTRL, MyListCtrl::OnBeginLabelEdit)
+    EVT_LIST_END_LABEL_EDIT(LIST_CTRL, MyListCtrl::OnEndLabelEdit)
+    EVT_LIST_DELETE_ITEM(LIST_CTRL, MyListCtrl::OnDeleteItem)
+    EVT_LIST_DELETE_ALL_ITEMS(LIST_CTRL, MyListCtrl::OnDeleteAllItems)
+#if WXWIN_COMPATIBILITY_2_4
+    EVT_LIST_GET_INFO(LIST_CTRL, MyListCtrl::OnGetInfo)
+    EVT_LIST_SET_INFO(LIST_CTRL, MyListCtrl::OnSetInfo)
+#endif
+  */
+    EVT_LIST_ITEM_SELECTED(-1, WxTreeView::OnSelected)
+  /*
+    EVT_LIST_ITEM_DESELECTED(LIST_CTRL, MyListCtrl::OnDeselected)
+    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_CLICK(LIST_CTRL, MyListCtrl::OnColClick)
+    EVT_LIST_COL_RIGHT_CLICK(LIST_CTRL, MyListCtrl::OnColRightClick)
+    EVT_LIST_COL_BEGIN_DRAG(LIST_CTRL, MyListCtrl::OnColBeginDrag)
+    EVT_LIST_COL_DRAGGING(LIST_CTRL, MyListCtrl::OnColDragging)
+    EVT_LIST_COL_END_DRAG(LIST_CTRL, MyListCtrl::OnColEndDrag)
+
+    EVT_LIST_CACHE_HINT(LIST_CTRL, MyListCtrl::OnCacheHint)
+
+#if USE_CONTEXT_MENU
+    EVT_CONTEXT_MENU(MyListCtrl::OnContextMenu)
+#endif
+    EVT_CHAR(MyListCtrl::OnChar)
 
+    EVT_RIGHT_DOWN(MyListCtrl::OnRightClick)
+  */
+END_EVENT_TABLE()
   
 } // EO namespace creaImageIO
 

diff --git a/src2/creaImageIOWxTreeView.h b/src2/creaImageIOWxTreeView.h
index 65e783d6435c9b571c0d092388222737b60d27aa..a7935830070898011ec489f7b2f44a2619a1499e 100644 (file)
--- a/src2/creaImageIOWxTreeView.h
+++ b/src2/creaImageIOWxTreeView.h
@@ -7,6 +7,7 @@
 #include <creaWx.h>
 
 #include <wx/listctrl.h>
+//#include <vector>
 
 namespace creaImageIO
 {
@@ -26,14 +27,31 @@ namespace creaImageIO
       virtual ~WxTreeView();
 
       
-      /// Something like that ...
-      virtual void UpdateView();
+      /// Updates the view of a level given the selected items of upper level
+      virtual void UpdateLevel( int );
       
+      /// Callback for selection change
+      void OnSelected(wxListEvent& event);
+
 
     private:
-      /// The vector of wxListCtrl : one for each level of the tree
-      std::vector<wxListCtrl*> mListCtrl;
+      /// The struct holding the data for one level
+      /// Holds the wx control and other data
+      /// such as the vector of attribute keys corresponding to the columns
+      struct LevelType
+      {
+       // The
+       wxListCtrl* wxCtrl;
+       std::vector<std::string> key;
+      };
+      /// The vector of levels : one for each level of the tree      
+      std::vector<LevelType> mLevelList;
       
+      /// return the wxListCtrl of one level
+      wxListCtrl* GetCtrl(int l) { return mLevelList[l].wxCtrl; }
+ 
+
+      DECLARE_EVENT_TABLE()
     };
     // EO class WxTreeView
     //=====================================================================