Added pop up menus and tweaked the filter algorithm

diff --git a/src2/creaImageIOWxGimmickView.cpp b/src2/creaImageIOWxGimmickView.cpp
index ba41e35f13582bb720e92c40cdacdaaa8d2732c7..0b105926a7bd2b99222895c696ad0d5938b1101a 100644 (file)
--- a/src2/creaImageIOWxGimmickView.cpp
+++ b/src2/creaImageIOWxGimmickView.cpp
@@ -518,7 +518,10 @@ namespace creaImageIO
      }
    //   GimmickMessage(1,"WxGimmickView : Refresh viewer"<<std::endl);
        //  mViewer->StartPlayer();
-       mViewer->RefreshIfNecessary();
+   if(mViewer)
+   {
+          mViewer->RefreshIfNecessary();
+   }
   }
 
    //==================================================

diff --git a/src2/creaImageIOWxTreeView.cpp b/src2/creaImageIOWxTreeView.cpp
index b01b40f7649e435114a160f76fac26ff02d7d7bf..5cd382543dfea9a8774dfffc25b7756ecfc73e3e 100644 (file)
--- a/src2/creaImageIOWxTreeView.cpp
+++ b/src2/creaImageIOWxTreeView.cpp
@@ -82,7 +82,7 @@ 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)
@@ -147,6 +147,21 @@ namespace creaImageIO
        mLevelList.push_back(level);
       }
     
+#if wxUSE_MENUS
+
+    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) );
+       
+#endif // wxUSE_MENUS
+
 
     /// Initialize the first level splitter
  
@@ -156,7 +171,7 @@ namespace creaImageIO
        mDirection=true;
        mSelectionMade=false;
        mProcess=true;
-       CreateColorPalette();
+       //CreateColorPalette();
     UpdateLevel(1);
 
     SetSizer( sizer );     
@@ -296,70 +311,74 @@ namespace creaImageIO
     GetCtrl(l)->DeleteAllItems();
     
     std::vector<tree::Node*>::iterator i;
+       
     //Adds the first item (filter)
-    GetCtrl(l)->InsertItem(0, _T("Filter:"));
-    for (i=sel.begin(); i!=sel.end(); ++i)
+   
+       for (i=sel.begin(); i!=sel.end(); ++i)
       {
        GimmickDebugMessage(2,
                            "adding children of '"
                            <<(*i)->GetLabel()
-                           <<"'"<<level
+                           <<"'"
                            <<std::endl);
        int _id=1;
-               
-
+       
        //Adds items (other than the first) and sets their attributes 
+          GetCtrl(l)->InsertItem(0, _T("hELLO"));
        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 | 
+                        wxListItem* item= new wxListItem;
+           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);
+               item->SetId(_id);
 
                data->id = _id;
-           item.SetData(data);
+           item->SetData(data);
            
                _id++;
-           long id=GetCtrl(l)->InsertItem(item);
+               
                
                //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->SetText( crea::std2wx(s));            
 
-           item.SetColumn(0);
-           GetCtrl(l)->SetItem(item);
+           item->SetColumn(0);
+                GetCtrl(l)->InsertItem(*item);
+               //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]);
+                         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);      
-             }     
+               item->SetText( crea::std2wx(val));
+               item->SetColumn(k);
+               GetCtrl(l)->SetItem(*item);     
+               GetCtrl(l)->RefreshItem(*item);
+             } 
+                 
          }
+       GetCtrl(l)->DeleteItem(0);
       }
     
     GetCtrl(l)->Show();
-       
     
     if (level<mLevelList.size()) UpdateLevel(level+1);
        
@@ -392,8 +411,9 @@ namespace creaImageIO
        GimmickMessage(1,
                        " Event type "<<event.GetEventType()
                        <<std::endl);
+       /*
        if(event.m_itemIndex!=0)
-       {
+       {*/
                if(level<mLevelList.size()-1)
                {
                mSelected=GetSelected(level+2);
@@ -425,7 +445,7 @@ namespace creaImageIO
                        }
                }
                //SetColor(level,event.m_itemIndex);
-       }
+       /*}
        else
        {
                if(event.GetEventType()==10145)
@@ -435,7 +455,7 @@ namespace creaImageIO
                GetCtrl(level)->EditLabel(event.m_itemIndex);
                }
                
-       }
+       }*/
        
        
   }
@@ -463,11 +483,11 @@ namespace creaImageIO
                        mProcess=false;
                }
 
-               if(item!=0)
-               {
+               /*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);
-               }
+               //}
                
     }
 
@@ -475,29 +495,92 @@ namespace creaImageIO
   }
 
   //================================================================
-
   //================================================================
+
   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);
-
+       wxPoint clientpt = event.GetPoint();
+       senderCtrl = event.GetEventObject(); 
+       clientpt.x+=(mColumnSelected)*(GetCtrl(0)->GetColumnWidth(mColumnSelected));
+       wxPoint screenpt = ClientToScreen(clientpt);
        if(mColumnSelected!=0)
        {
-               wxObject* ctrl = event.GetEventObject(); 
+    PopupMenu(menu, clientpt);
+       }
+
+  }
+    //================================================================
+  void WxTreeView::OnPopupFilter(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) == ctrl ) break;
+               if ( GetCtrl(level) == senderCtrl ) break;
                }
+               std::string filter = wxGetTextFromUser(_T("Enter the filter to apply"), _T("Filter On Column"));
+               
+               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;
+                       
+                       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)
+                       {
+                               GetCtrl(level)->DeleteItem(it);
+                       }
+                       
+               }
+               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)
+  {      
+       //Obtain the column name and the level that needs to be organized
+
+       if(mColumnSelected!=0)
+       {        
                int l = level - 1;
-               GetCtrl(level)->DeleteItem(0);
+               //GetCtrl(level)->DeleteItem(0);
                //Sets the data for the items to be sorted
                std::string att;
                unsigned int ty=0;
@@ -507,6 +590,7 @@ namespace creaImageIO
                          
                        //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)
@@ -539,7 +623,6 @@ namespace creaImageIO
                                GetCtrl(level)->SortItems(CompareFunctionStrings, 0);
                        }
                        
-                       mDirection=false;
                }
                else
                {
@@ -551,7 +634,6 @@ namespace creaImageIO
                        {
                                GetCtrl(level)->SortItems(CompareFunctionStrings, 1);
                        }
-                       mDirection=true;
                }
 
                //Resets original data
@@ -600,7 +682,7 @@ namespace creaImageIO
                | wxLIST_MASK_TEXT |wxLIST_MASK_IMAGE | wxLIST_MASK_DATA | wxLIST_MASK_WIDTH | wxLIST_MASK_FORMAT);
                        
                }
-               GetCtrl(level)->InsertItem(0,_T("Filter:"));
+               //GetCtrl(level)->InsertItem(0,_T("Filter:"));
        }
        
    }
@@ -838,7 +920,7 @@ namespace creaImageIO
 
   }
   //================================================================
-  BEGIN_EVENT_TABLE(WxTreeView, wxPanel)
+  BEGIN_EVENT_TABLE(WxTreeView, wxPanel)   
   /*
     EVT_SIZE(MyFrame::OnSize)
 
@@ -897,9 +979,9 @@ BEGIN_EVENT_TABLE(MyListCtrl, wxListCtrl)
     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_LIST_COL_BEGIN_DRAG(LIST_CTRL, MyListCtrl::OnColBeginDrag)

diff --git a/src2/creaImageIOWxTreeView.h b/src2/creaImageIOWxTreeView.h
index bf13312cd896460e95a2f0e4afbbcb9bffc43ecd..dbd016242c4cd69ec619dde6edc48aa3dbb8aa73 100644 (file)
--- a/src2/creaImageIOWxTreeView.h
+++ b/src2/creaImageIOWxTreeView.h
@@ -48,6 +48,13 @@ namespace creaImageIO
          /// Callback when first item edition ends
          void OnEndLabelEdit(wxListEvent& event);
 
+         /// Callback when the user needs the items sorted
+         void OnPopupSort(wxCommandEvent& event);
+
+         ///Callback when the user need the items filtered
+          void OnPopupFilter(wxCommandEvent& event);
+ 
+
     private:
       /// The struct holding the data for one level
       /// Holds the wx control and other data
@@ -85,6 +92,9 @@ namespace creaImageIO
          void CreateColorPalette();
          ///Selects the lowest level (images)
          void SelectLowerLevel();
+         ///Sorts items
+         void OnSort(int level);
+
 
 
       /// Currently Selected Column
@@ -107,6 +117,11 @@ namespace creaImageIO
          ///Boolean declaring if the last level selection has been made
          bool mSelectionMade;
          bool mProcess;
+         wxMenu* menu;
+         wxObject* senderCtrl;
+         int mAscendingID;
+         int mDescendingID;
+         int mFilterID;
 
       DECLARE_EVENT_TABLE()
     };

diff --git a/src2/creaImageIOWxViewer.cpp b/src2/creaImageIOWxViewer.cpp
index ab189336f0e235094ecde7bf6e97889e974c9a52..cf7c3a68c8053a1127948ec215a200401a251f10 100644 (file)
--- a/src2/creaImageIOWxViewer.cpp
+++ b/src2/creaImageIOWxViewer.cpp
@@ -229,7 +229,7 @@ namespace creaImageIO
   void WxViewer::StopPlayer()
   {
          wxMutexLocker lock(mMutex);
-         if (mPlayer==0) return;
+         if (mPlayer==0 ) return;
          mPlayer->Delete();  
          mPlayer=0;
   }