From 5142cb6cbb8bec738b3f22920effc9a6ec40fc3b Mon Sep 17 00:00:00 2001 From: guigues Date: Thu, 9 Apr 2009 12:55:58 +0000 Subject: [PATCH] *** empty log message *** --- appli/TestWxGimmickReaderDialog/main.cxx | 8 +- src2/creaImageIOGimmickView.h | 2 +- src2/creaImageIOTreeView.h | 2 +- src2/creaImageIOWxGimmickView.cpp | 21 +- src2/creaImageIOWxGimmickView.h | 220 +++--- src2/creaImageIOWxTreeView.cpp | 844 +++++++++++++---------- src2/creaImageIOWxTreeView.h | 134 ++-- 7 files changed, 702 insertions(+), 529 deletions(-) diff --git a/appli/TestWxGimmickReaderDialog/main.cxx b/appli/TestWxGimmickReaderDialog/main.cxx index 7c9dce1..8be4ec4 100644 --- a/appli/TestWxGimmickReaderDialog/main.cxx +++ b/appli/TestWxGimmickReaderDialog/main.cxx @@ -24,10 +24,10 @@ bool myApp::OnInit( ) #endif wxInitAllImageHandlers(); - /* - creaImageIO::SetGimmickMessageLevel(9); - creaImageIO::SetGimmickDebugMessageLevel(9); - */ + + creaImageIO::SetGimmickMessageLevel(1); + creaImageIO::SetGimmickDebugMessageLevel(1); + int min_dim = GIMMICK_2D_IMAGE_SELECTION; int max_dim = GIMMICK_3D_IMAGE_SELECTION; diff --git a/src2/creaImageIOGimmickView.h b/src2/creaImageIOGimmickView.h index d028b5d..8ab1c68 100644 --- a/src2/creaImageIOGimmickView.h +++ b/src2/creaImageIOGimmickView.h @@ -73,7 +73,7 @@ namespace creaImageIO virtual void GetImages(int dim, std::vector files, std::vector& s) { GimmickError("INTERNAL ERROR : GetImages not implemented"); } - virtual void OnSelectionChange(std::vector& s, bool isSelection, int selection, bool mProcess) + virtual void OnSelectionChange(const std::vector& s, bool isSelection, int selection, bool mProcess) { GimmickError("INTERNAL ERROR : OnSelectionChange not implemented"); } virtual void ClearSelection() diff --git a/src2/creaImageIOTreeView.h b/src2/creaImageIOTreeView.h index ca493c9..886fc38 100644 --- a/src2/creaImageIOTreeView.h +++ b/src2/creaImageIOTreeView.h @@ -45,7 +45,7 @@ namespace creaImageIO virtual void GetSelectedAsString(std::vector&s){ GimmickError("INTERNAL ERROR : TreeView::GetSelectedAsString not overloaded"); } /// Gets the user selected data from the level passed as a parameter - virtual std::vector GetSelected(int level){ GimmickError("INTERNAL ERROR : TreeView::GetSelected not overloaded"); } + virtual const std::vector& GetSelected(int level){ GimmickError("INTERNAL ERROR : TreeView::GetSelected not overloaded"); } /// Gets the next nodes on the list, be it up(true) or down(false). virtual void GetNodes(std::vector& nodes, bool direction){ GimmickError("INTERNAL ERROR : TreeView::GetNodes not overloaded"); } diff --git a/src2/creaImageIOWxGimmickView.cpp b/src2/creaImageIOWxGimmickView.cpp index 63ff888..21c9a98 100644 --- a/src2/creaImageIOWxGimmickView.cpp +++ b/src2/creaImageIOWxGimmickView.cpp @@ -227,16 +227,25 @@ namespace creaImageIO GetTreeViewMap()["Local database"]->GetSelectedAsString(files); ReadImagesNotThreaded(s,files,dim); } + //====================================================================== + //====================================================================== void WxGimmickView::GetSelectedFiles(std::vector& s) { GetTreeViewMap()["Local database"]->GetSelectedAsString(s); } //====================================================================== - void WxGimmickView::GetImages(int dim, std::vector files, std::vector& s) + + //====================================================================== + void WxGimmickView::GetImages(int dim, + const std::vector& files, + std::vector& s) { ReadImagesNotThreaded(s,files,dim); } + //====================================================================== + + //================================================= void WxGimmickView::CreateIconList() { @@ -374,7 +383,7 @@ namespace creaImageIO //================================================= //================================================= - void WxGimmickView::OnSelectionChange(std::vector& sel, bool isSelection, int selection, bool needProcess) + void WxGimmickView::OnSelectionChange(const std::vector& sel, bool isSelection, int selection, bool needProcess) { GimmickDebugMessage(5, "WxGimmickView::OnSelectionChange" @@ -392,7 +401,7 @@ namespace creaImageIO else if(needProcess) { ResetExtent(); - std::vector::iterator i; + std::vector::const_iterator i; for(i=sel.begin();i!=sel.end()&&valid;++i) { valid= ValidateSelected((*i), @@ -409,7 +418,7 @@ namespace creaImageIO else { ResetExtent(); - std::vector::iterator i; + std::vector::const_iterator i; for(i=sel.begin();i!=sel.end()&&valid;++i) { valid= ValidateSelected((*i), @@ -436,7 +445,7 @@ namespace creaImageIO //================================================== ///Reads Images (Threaded) - void WxGimmickView::ReadImageThreaded(std::vector sel) + void WxGimmickView::ReadImageThreaded(const std::vector& sel) { GimmickDebugMessage(5, "ReadImageThreaded" @@ -450,7 +459,7 @@ namespace creaImageIO mCurImageItemToShow = sel.front(); pointers.clear(); int index = 0; - std::vector::iterator selected; + std::vector::const_iterator selected; for(selected=sel.begin();selected!=sel.end();++selected) { GimmickDebugMessage(5, diff --git a/src2/creaImageIOWxGimmickView.h b/src2/creaImageIOWxGimmickView.h index 9fd54a9..06966a5 100644 --- a/src2/creaImageIOWxGimmickView.h +++ b/src2/creaImageIOWxGimmickView.h @@ -23,114 +23,120 @@ namespace creaImageIO /// Concrete derivative of GimmickView which implements a wxWidgets-based view class WxGimmickView : public wxPanel, virtual public GimmickView - { - public: - - typedef int EventType; - - /// Ctor - WxGimmickView(Gimmick*, - wxWindow *parent, - const wxWindowID id, - const wxPoint& pos, const wxSize& size, - int min_dim = GIMMICK_2D_IMAGE_SELECTION, - int max_dim = GIMMICK_3D_IMAGE_SELECTION, - int number_of_threads = 0); - /// Virtual destructor - virtual ~WxGimmickView(); - - /// Returns the selected files - ///(overloaded from GimmickView) - void GetSelectedFiles(std::vector& s); - /// Returns the selected Images so that they comply with the given parameter(4D) - //(overloaded from GimmickView) - void GetSelectedImages(std::vector& s, int dim); - /// Returns the images indicated by the filenames in the vector so that they comply with the given parameter(dim) - //(overloaded from GimmickView) - void GetImages(int dim, std::vector files, std::vector& s); - /// Callback called when a selection from a TreeView has changed - //(overloaded from GimmickView) - void OnSelectionChange(std::vector& s, bool isSelection, int selection, bool mProcess); - ///Stops the player - void StopPlayer(){mViewer->StopPlayer();} - ///Resets the default image - void ClearSelection(); - - - ///Sends a request to read the currently selected node and the ones that surround it. - void ReadImageThreaded(std::vector sel); - - - protected: - /// Creates the tool bar - void CreateToolBar(); - - /// Create the tree view for TreeHandler provided - /// (overloaded from GimmickView) - void CreateTreeView( TreeHandler* ); - - - private: - /// Is set to true at the end of constructor - /// (in order to lock callbacks from threaded objects or event - /// before everything is ok) - bool mConstructed; - /// The ToolBar and the tools - wxToolBar* mToolBar; - wxToolBarToolBase* mToolAddFile; - wxToolBarToolBase* mToolAddDir; - wxToolBarToolBase* mToolRemove; - wxToolBarToolBase* mToolAddDatabase; - wxToolBarToolBase* mToolHelp; - - wxSplitterWindow* mSplitter; - wxPanel* mBottomPanel; - wxStaticText * mText; - wxNotebook* mNotebook; - - /// The list of icons - wxImageList * mIcon; - void CreateIconList(); - - Gimmick * mGimmick; - /// Callback for adding files - void OnAddFiles(wxCommandEvent& event); - /// Callback for adding dir - void OnAddDir(wxCommandEvent& event); - /// Callback for removing files - void OnRemove(wxCommandEvent& event); - - /// Display a message box with the last addition statistics - void DisplayAddSummary(); - - - /// AddProgress Gimmick callback - void OnAddProgress( Gimmick::AddProgress& ); - /// Called upon to refresh the viewer once there are no actions to be done - void OnInternalIdle(); - - /// Progress dialog - wxProgressDialog* mProgressDialog; - ///The selection's maximum dimension - int mSelectionMaxDimension; - ///The selection's minimum dimension - int mSelectionMinDimension; - ///Image previewer - WxViewer* mViewer; - ///Currently Displayed Node - tree::Node* mCurImageItemToShow; - //Pointer holders for images to be shown - std::vector pointers; - - - wxString mCurrentDirectory; - - DECLARE_EVENT_TABLE() - }; - // EO class WxGimmickView - //===================================================================== + { + public: + + typedef int EventType; + + /// Ctor + WxGimmickView(Gimmick*, + wxWindow *parent, + const wxWindowID id, + const wxPoint& pos, const wxSize& size, + int min_dim = GIMMICK_2D_IMAGE_SELECTION, + int max_dim = GIMMICK_3D_IMAGE_SELECTION, + int number_of_threads = 0); + /// Virtual destructor + virtual ~WxGimmickView(); + + /// Returns the selected files + ///(overloaded from GimmickView) + void GetSelectedFiles(std::vector& s); + + /// Returns the selected Images so that they comply with the + /// given parameter(4D) (overloaded from GimmickView) + void GetSelectedImages(std::vector& s, int dim); + + /// Returns the images indicated by the filenames in the vector + /// so that they comply with the given parameter(dim) + //(overloaded from GimmickView) + void GetImages(int dim, const std::vector& files, + std::vector& s); + + /// Callback called when a selection from a TreeView has changed + //(overloaded from GimmickView) + void OnSelectionChange(const std::vector& s, + bool isSelection, int selection, bool mProcess); + ///Stops the player + void StopPlayer(){mViewer->StopPlayer();} + ///Resets the default image + void ClearSelection(); + + + ///Sends a request to read the currently selected node and the ones that surround it. + void ReadImageThreaded(const std::vector& sel); + + + protected: + /// Creates the tool bar + void CreateToolBar(); + + /// Create the tree view for TreeHandler provided + /// (overloaded from GimmickView) + void CreateTreeView( TreeHandler* ); + + + private: + /// Is set to true at the end of constructor + /// (in order to lock callbacks from threaded objects or event + /// before everything is ok) + bool mConstructed; + /// The ToolBar and the tools + wxToolBar* mToolBar; + wxToolBarToolBase* mToolAddFile; + wxToolBarToolBase* mToolAddDir; + wxToolBarToolBase* mToolRemove; + wxToolBarToolBase* mToolAddDatabase; + wxToolBarToolBase* mToolHelp; + + wxSplitterWindow* mSplitter; + wxPanel* mBottomPanel; + wxStaticText * mText; + wxNotebook* mNotebook; + + /// The list of icons + wxImageList * mIcon; + void CreateIconList(); + + Gimmick * mGimmick; + /// Callback for adding files + void OnAddFiles(wxCommandEvent& event); + /// Callback for adding dir + void OnAddDir(wxCommandEvent& event); + /// Callback for removing files + void OnRemove(wxCommandEvent& event); + + /// Display a message box with the last addition statistics + void DisplayAddSummary(); + + + /// AddProgress Gimmick callback + void OnAddProgress( Gimmick::AddProgress& ); + /// Called upon to refresh the viewer once there are no actions to be done + void OnInternalIdle(); + + /// Progress dialog + wxProgressDialog* mProgressDialog; + ///The selection's maximum dimension + int mSelectionMaxDimension; + ///The selection's minimum dimension + int mSelectionMinDimension; + ///Image previewer + WxViewer* mViewer; + ///Currently Displayed Node + tree::Node* mCurImageItemToShow; + //Pointer holders for images to be shown + std::vector pointers; + + + wxString mCurrentDirectory; + + DECLARE_EVENT_TABLE() + }; + // EO class WxGimmickView + //===================================================================== + - /* diff --git a/src2/creaImageIOWxTreeView.cpp b/src2/creaImageIOWxTreeView.cpp index e7a0042..73d2883 100644 --- a/src2/creaImageIOWxTreeView.cpp +++ b/src2/creaImageIOWxTreeView.cpp @@ -3,62 +3,103 @@ #include #include #include + +const std::string void_string(""); + +//===================================================================== +namespace creaImageIO +{ + //===================================================================== + /// Data stored by the list items + struct ItemData + { + ItemData() : node(0), id(-1), attr(&void_string) {} + // The corresponding Node + tree::Node* node; + // The id ? + int id; + // The pointer on the current attribute string to sort on + const std::string* attr; + // Was the item previously selected ? + // Useful for reselecting the item after sort + bool selected; + }; + //===================================================================== +} +//===================================================================== + +//===================================================================== ///Comparing function for ordering algorithm. Takes parameters as strings. int wxCALLBACK CompareFunctionStrings(long item1, long item2, long sortData) { - std::string s1((char*)((long*)item1)[1]); - std::string s2((char*)((long*)item2)[1]); - if(sortData==1) - { - // inverse the order - if (s1 < s2) - return 1; - if (s1 > s2) - return -1; - - return 0; - } - else - { - if (s1 < s2) - return -1; - if (s1 > s2) - return 1; - - return 0; + creaImageIO::ItemData* data1 = (creaImageIO::ItemData*)item1; + creaImageIO::ItemData* data2 = (creaImageIO::ItemData*)item2; - } - + const std::string& s1(*(data1->attr)); + const std::string& s2(*(data2->attr)); + if(sortData==1) + { + // inverse the order + if (s1 < s2) + return 1; + if (s1 > s2) + return -1; + + return 0; + } + else + { + if (s1 < s2) + return -1; + if (s1 > s2) + return 1; + + return 0; + + } } +//===================================================================== +//===================================================================== ///Comparing function for ordering algorithm. Takes parameters as ints. int wxCALLBACK CompareFunctionInts(long item1, long item2, long sortData) { - int val1=atoi((char*)((long*)item1)[1]); - int val2=atoi((char*)((long*)item2)[1]); - if(sortData==1) - { - // inverse the order - if (val1 < val2) - return 1; - if (val1 > val2) - return -1; + creaImageIO::ItemData* data1 = (creaImageIO::ItemData*)item1; + creaImageIO::ItemData* data2 = (creaImageIO::ItemData*)item2; - return 0; - } - else - { - if (val1 < val2) - return -1; - if (val1 > val2) - return 1; + const std::string& s1(*(data1->attr)); + const std::string& s2(*(data2->attr)); - return 0; + int val1=atoi(s1.c_str()); + int val2=atoi(s2.c_str()); - } - + if(sortData==1) + { + // inverse the order + if (val1 < val2) + return 1; + if (val1 > val2) + return -1; + + return 0; + } + else + { + if (val1 < val2) + return -1; + if (val1 > val2) + return 1; + + return 0; + + } + } +//===================================================================== + + +//===================================================================== namespace creaImageIO { //===================================================================== @@ -94,6 +135,8 @@ namespace creaImageIO GimmickDebugMessage(5,"Creating view for level "<GetName() <GetFlags()!=creaImageIO::tree::AttributeDescriptor::PRIVATE) - { - + + 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"; - - } + { + title = "#"; + title += handler->GetTree().GetLevelDescriptor(i+1).GetName(); + if (title[title.size()-1]!='s') + title += "s"; + + } else - { - title=a->GetName(); - } + { + title=a->GetName(); + } + ctrl->InsertColumn(col, - crea::std2wx(title), - col_style); + crea::std2wx(title), + col_style); level.key.push_back(a->GetKey()); + // ctrl->SetColumnWidth(col, wxLIST_AUTOSIZE ); + col++; - } + } } @@ -173,15 +219,16 @@ namespace creaImageIO #endif // wxUSE_MENUS - /// Initialize the first level splitter - - sizer->Add( mLevelList[0].wxSplitter ,1, wxGROW ,0); - mColumnSelected=1; + /// Initialize the first level splitter + + sizer->Add( mLevelList[0].wxSplitter ,1, wxGROW ,0); + // mColumnSelected=1; mLastSelected=0; mLastLevel=0; - mDirection=true; - mSelectionMade=false; - mProcess=true; + // mDirection=true; + + mIgnoreSelectedChanged = false; + //CreateColorPalette(); UpdateLevel(1); @@ -202,20 +249,17 @@ namespace creaImageIO //===================================================================== + //===================================================================== - struct ItemData - { - tree::Node* node; - int id; - }; - - //===================================================================== - std::vector WxTreeView::GetSelected(int level) + const std::vector& WxTreeView::GetSelected(int level) { + // if (GetSelectedUpToDate(level)) + int l = level - 1; // the selection of upper level - std::vector sel; - + std::vector& sel(mLevelList[level-1].Selected); + sel.clear(); + if (level == 1) { sel.push_back(GetTreeHandler()->GetTree().GetTree()); @@ -243,81 +287,86 @@ namespace creaImageIO } } - return sel; + // return mLevelList[level-1].Selected; + return sel; } //===================================================================== + //===================================================================== ///Removes selected nodes on last selected level + // NOT SPECIFIC void WxTreeView::RemoveSelected() { - mLastLevel+=1; - std::vector sel=GetSelected(mLastLevel+1); - bool erase=false; - std::stringstream out; - std::string levelName=GetTreeHandler()->GetTree().GetLevelDescriptor(mLastLevel).GetName(); - out<<"Delete "; - out<1&&levelName.at(levelName.size()-1)!='s') - { - out<<" "<GetTree().GetLevelDescriptor(mLastLevel).GetName()<<"?"; - } - if (wxMessageBox(crea::std2wx(out.str()), - _T("Remove Files"), - wxYES_NO,this ) == wxYES) - { - erase = true; - } - if(erase) + mLastLevel+=1; + const std::vector& sel=GetSelected(mLastLevel+1); + bool erase=false; + std::stringstream out; + std::string levelName=GetTreeHandler()->GetTree().GetLevelDescriptor(mLastLevel).GetName(); + out<<"Delete "; + out<1&&levelName.at(levelName.size()-1)!='s') + { + out<<" "<GetTree().GetLevelDescriptor(mLastLevel).GetName()<<"?"; + } + if (wxMessageBox(crea::std2wx(out.str()), + _T("Remove Files"), + wxYES_NO,this ) == wxYES) + { + erase = true; + } + if(erase) { - bool needRefresh=false; - std::vector::iterator i; - for (i=sel.begin(); i!=sel.end(); ++i) - { - GimmickMessage(1, - "deleting '" - <<(*i)->GetLabel() - <<"'"<GetParent()->GetNumberOfChildren()<2) - { - needRefresh=true; - } - GetTreeHandler()->Remove(*i); - } - - if(needRefresh && mLastLevel>1) - { + bool needRefresh=false; + std::vector::const_iterator i; + for (i=sel.begin(); i!=sel.end(); ++i) + { + GimmickMessage(1, + "deleting '" + <<(*i)->GetLabel() + <<"'"<GetParent()->GetNumberOfChildren()<2) + { + needRefresh=true; + } + GetTreeHandler()->Remove(*i); + } + + if(needRefresh && mLastLevel>1) + { UpdateLevel(mLastLevel-2); - } - else if(mLastLevel>1) - { + } + else if(mLastLevel>1) + { UpdateLevel(mLastLevel-1); - } - else - { + } + else + { UpdateLevel(mLastLevel); - } + } } - - } - + } + + //===================================================================== //===================================================================== - /// 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 "<GetTree().GetLabel() - <<" view : updating level (recursive)"< sel=GetSelected(level); + const std::vector& sel(GetSelected(level)); - int l = level - 1; + int l = level - 1; // to speed up inserting we hide the control temporarily GetCtrl(l)->Hide(); GetCtrl(l)->DeleteAllItems(); - std::vector::iterator i; - - for (i=sel.begin(); i!=sel.end(); ++i) + std::vector::const_iterator i; + + for (i=sel.begin(); i!=sel.end(); ++i) { GimmickDebugMessage(2, "adding children of '" @@ -363,61 +414,91 @@ namespace creaImageIO int _id=1; //Adds items and sets their attributes - GetCtrl(l)->InsertItem(0, _T("")); + //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; + wxListItem* item= new wxListItem; item->SetMask(wxLIST_MASK_STATE | - wxLIST_MASK_TEXT | - // wxLIST_MASK_IMAGE | - wxLIST_MASK_DATA | + wxLIST_MASK_TEXT | + // wxLIST_MASK_IMAGE | + wxLIST_MASK_DATA | // wxLIST_MASK_WIDTH | - wxLIST_MASK_FORMAT - ); - + wxLIST_MASK_FORMAT + ); + ItemData* data = new ItemData; - data->node = *j; - item->SetId(_id); - - data->id = _id; + data->node = *j; + item->SetId(_id); + + data->id = _id; item->SetData(data); - _id++; - GetCtrl(l)->InsertItem(*item); - - //Setting attributes - - for (int k=0; kGetColumnCount(); k++) + _id++; + GetCtrl(l)->InsertItem(*item); + + //Setting attributes + + for (int k=0; kGetColumnCount(); 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); + 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)->DeleteItem(0); + //GetCtrl(l)->DeleteItem(0); } + + SortLevel(l); GetCtrl(l)->Show(); - + + + } //===================================================================== //================================================================ - void WxTreeView::OnSelectedChanged(wxListEvent& event) + void WxTreeView::OnItemDeSelected(wxListEvent& event) { GimmickDebugMessage(1, GetTreeHandler()->GetTree().GetLabel() - <<" view : item selected " - <GetTree().GetLabel() + <<" WxTreeView::OnItemSelected"<ClearSelection(); } // Select all images if the selection is at series level - if (level==mLevelList.size()-2) SelectLowerLevel(); + 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 (level==(mLevelList.size()-1)) //&&mProcess) { if(event.GetEventType()==10145) { @@ -461,28 +542,28 @@ namespace creaImageIO //================================================================ //================================================================ - 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; - } - 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); + } } //================================================================ @@ -490,18 +571,18 @@ namespace creaImageIO void WxTreeView::OnColClick(wxListEvent& event) { - 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; levelGetScreenPosition().x; + clientpt.y = wxGetMousePosition().y - this->GetScreenPosition().y; + senderCtrl = event.GetEventObject(); + unsigned int level = 0; + for (level = 0; level 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::iterator iter; - for(iter=items.begin();iter!=items.end();++iter) - { - GetCtrl(level)->DeleteItem(*iter); - } - GetGimmickView()->ClearSelection(); + wxObject* ctrl = event.GetEventObject(); + unsigned int level = 0; + for (level = 0; level 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::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; levelGetItemCount(); - 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]).DecodeType(ty); - } - //Obtains the organizing attribute - att=(*nod).GetAttribute(mLevelList[level].key[mColumnSelected]); - - 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(" + <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 - 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; - - } + } + GimmickDebugMessage(1, + "WxTreeView::OnSort : " + <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 : " + < sel(GetSelected(mLevelList.size()+1)); - GetGimmickView()->OnSelectionChange(sel,isSelection,(mLastSelected-1), mProcess); + const std::vector& sel(GetSelected(mLevelList.size()+1)); + GetGimmickView()->OnSelectionChange(sel, + isSelection,(mLastSelected-1), + !mIgnoreSelectedChanged); } //================================================================ @@ -712,19 +846,21 @@ namespace creaImageIO } } + //================================================================ //================================================================ + // Should be in another place : not specific ! void WxTreeView::GetSelectedAsString(std::vector&s) { - int level=mLevelList.size(); - std::vector sel=GetSelected(level+1); - std::vector::iterator i; - + int level=mLevelList.size(); + const std::vector& sel=GetSelected(level+1); + std::vector::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); + } } //================================================================ @@ -889,9 +1025,9 @@ BEGIN_EVENT_TABLE(MyListCtrl, wxListCtrl) EVT_LIST_SET_INFO(LIST_CTRL, MyListCtrl::OnSetInfo) #endif */ - EVT_LIST_ITEM_SELECTED(-1, WxTreeView::OnSelectedChanged) + EVT_LIST_ITEM_SELECTED(-1, WxTreeView::OnItemSelected) - EVT_LIST_ITEM_DESELECTED(-1, WxTreeView::OnSelectedChanged) + EVT_LIST_ITEM_DESELECTED(-1, WxTreeView::OnItemDeSelected) /* EVT_LIST_KEY_DOWN(LIST_CTRL, MyListCtrl::OnListKeyDown) EVT_LIST_ITEM_ACTIVATED(LIST_CTRL, MyListCtrl::OnActivated) diff --git a/src2/creaImageIOWxTreeView.h b/src2/creaImageIOWxTreeView.h index 53dac45..fff5531 100644 --- a/src2/creaImageIOWxTreeView.h +++ b/src2/creaImageIOWxTreeView.h @@ -33,25 +33,30 @@ namespace creaImageIO /// Updates the view of a level given the selected items of upper level virtual void UpdateLevel( int ); - ///Removes selected nodes on given level - virtual void RemoveSelected(); - - /// Callback for selection change - void OnSelectedChanged(wxListEvent& event); + ///Removes selected nodes on given level + virtual void RemoveSelected(); + + /// Callback for item selection + void OnItemSelected(wxListEvent& event); - /// Callback for column click + /// Callback for item deselection + void OnItemDeSelected(wxListEvent& event); + + /// Callback for column click void OnColClick(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); - - ///Callback on mouse click - void OnMouseClick(wxMouseEvent& 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); + + ///Callback on mouse click + void OnMouseClick(wxMouseEvent& event); + + /// Actual processing of item selection/deselection + /// Called by OnItemSelected and OnItemDeSelected + // void ProcessItem private: /// The struct holding the data for one level /// Holds the wx control and other data @@ -62,6 +67,16 @@ namespace creaImageIO wxListCtrl* wxCtrl; wxSplitterWindow* wxSplitter; std::vector key; + // The vector of currently selected nodes of the level + std::vector Selected; + // True iff the vector Selected is up to date + bool SelectedUpToDate; + // The column used for sorting + unsigned int SortColumn; + ///Boolean that defines the direction of the sort + ///True is ascending order and false is descending + bool SortAscending; + // }; /// The vector of levels : one for each level of the tree std::vector mLevelList; @@ -70,52 +85,59 @@ namespace creaImageIO wxListCtrl* GetCtrl(int l) { return mLevelList[l].wxCtrl; } /// return the wxSplitter of one level wxSplitterWindow* GetSplitter(int l) { return mLevelList[l].wxSplitter; } - //Returns the maximum number of levels - int GetNumberOfLevels(){ return mLevelList.size(); } - /// Gets the user selected data from the level passed as a parameter - std::vector GetSelected(int level); - ///Validates the selected images + //Returns the maximum number of levels + int GetNumberOfLevels(){ return mLevelList.size(); } + /// Gets the user selected data from the level passed as a parameter + /// Updates the vector if necessary + const std::vector& GetSelected(int level); + /// Set the bool SelectedUpToDate for level l + void SetSelectedUpToDate(int l, bool v) { mLevelList[l].SelectedUpToDate = v; } + /// Get the bool SelectedUpToDate for level l + bool GetSelectedUpToDate(int l) { return mLevelList[l].SelectedUpToDate; } + ///Validates the selected images void ValidateSelectedImages(bool isSelection); - ///Gets selected filenames - void GetSelectedAsString(std::vector&s); - /// Gets the next nodes on the list, be it up(true) or down(false). + ///Gets selected filenames + void GetSelectedAsString(std::vector&s); + /// Gets the next nodes on the list, be it up(true) or down(false). void GetNodes(std::vector& nodes, bool direction); /// Updates the view of a level given the selected items of upper level /// Recursive method virtual void RecursiveUpdateLevel( int ); - ///Sets the color of a selected item - void SetColor(int level, int item); - ///Creates the color palette for the first level - void CreateColorPalette(); - ///Selects the lowest level (images) - void SelectLowerLevel(); - ///Sorts items - void OnSort(int level); - - - + ///Sets the color of a selected item + void SetColor(int level, int item); + ///Creates the color palette for the first level + void CreateColorPalette(); + ///Selects all the elements of a level + void SelectAll(int level); + ///UnSelects all the elements of a level + void UnSelectAll(int level); + + /// Sorts the level + void SortLevel(int level); + /// Currently Selected Column - int mColumnSelected; - ///Boolean that defines the direction of the organization - ///True is ascending order and false is descending - bool mDirection; - ///The last selected item on the list - long mLastSelected; - ///The color map - typedef std::map ColorMap; - typedef std::pair NodeColorPair; + int mColumnSelected; + ///The last selected item on the list + long mLastSelected; + ///The color map + typedef std::map ColorMap; + typedef std::pair NodeColorPair; ColorMap mColorMap; - ///Initial color palette - std::vector mColorPalette; - ///Boolean declaring if the last level selection has been made - bool mSelectionMade; - bool mProcess; - wxMenu* menu; - wxObject* senderCtrl; - int mAscendingID; - int mDescendingID; - int mFilterID; - unsigned int mLastLevel; + ///Initial color palette + std::vector mColorPalette; + + wxMenu* menu; + wxObject* senderCtrl; + int mAscendingID; + int mDescendingID; + int mFilterID; + unsigned int mLastLevel; + + // If set to true then OnSelectedChanged returns immediately. + // Used to do avoid useless process during multiple selections + // or sorting + bool mIgnoreSelectedChanged; + DECLARE_EVENT_TABLE() }; -- 2.45.1