From 5f76a3752cd6e23874e8167f19c9ceb57223b390 Mon Sep 17 00:00:00 2001 From: caballero Date: Mon, 2 Mar 2009 16:20:25 +0000 Subject: [PATCH] Order by columns is done. For the moment it only compares as if everything were a string. --- src2/creaImageIOTreeAttributeDescriptor.cpp | 39 +++- src2/creaImageIOTreeAttributeDescriptor.h | 13 ++ src2/creaImageIOTreeDescriptor.cpp | 3 +- src2/creaImageIOTreeLevelDescriptor.cpp | 2 + src2/creaImageIOTreeLevelDescriptor.h | 2 +- src2/creaImageIOTreeNode.cpp | 30 ++- src2/creaImageIOTreeNode.h | 3 +- src2/creaImageIOWxTreeView.cpp | 212 ++++++++++---------- src2/creaImageIOWxTreeView.h | 11 +- 9 files changed, 191 insertions(+), 124 deletions(-) diff --git a/src2/creaImageIOTreeAttributeDescriptor.cpp b/src2/creaImageIOTreeAttributeDescriptor.cpp index 13616ce..799cb12 100644 --- a/src2/creaImageIOTreeAttributeDescriptor.cpp +++ b/src2/creaImageIOTreeAttributeDescriptor.cpp @@ -43,6 +43,7 @@ namespace creaImageIO GimmickDebugMessage(3,"AttributeDescriptor : '"<GetDefaultPubDict()->GetEntry(mGroup,mElement); - + if (entry) { mName = entry->GetName(); CleanName(mName); + DecodeType(); GimmickDebugMessage(3,"='"<GetDefaultPubDict()->GetEntry(mGroup,mElement); + + std::string type = entry->GetVR().str(); + CleanName(type); + GimmickDebugMessage(3,"VR Value is "< AttributeDescriptorListType; /// Returns the list of AttributeDescriptor (const) diff --git a/src2/creaImageIOTreeNode.cpp b/src2/creaImageIOTreeNode.cpp index 6814203..09c89dc 100644 --- a/src2/creaImageIOTreeNode.cpp +++ b/src2/creaImageIOTreeNode.cpp @@ -106,6 +106,30 @@ namespace creaImageIO { return GetTree()->GetLevelDescriptor(GetLevel()); } + + //============================================================= + + //============================================================= + /// Returns the attribute descriptor of the passed parameter + const AttributeDescriptor& Node::GetAttributeDescriptor(const std::string& k)const + { + LevelDescriptor::AttributeDescriptorListType::const_iterator a; + for (a = GetTree()->GetAttributeDescriptorList(GetLevel()).begin(); + a!= GetTree()->GetAttributeDescriptorList(GetLevel()).end(); + ++a) + { + GimmickMessage(1,"Hello my type is"<GetType()<GetGroup()<GetElement()<GetKey()==k) + { + return *a; + } + + } + return *a; + } //============================================================= //============================================================= @@ -180,10 +204,10 @@ namespace creaImageIO for (int i = 0; iPrint(); + (*j)->Print(); } } //============================================================= diff --git a/src2/creaImageIOTreeNode.h b/src2/creaImageIOTreeNode.h index 3ca0362..c85a944 100644 --- a/src2/creaImageIOTreeNode.h +++ b/src2/creaImageIOTreeNode.h @@ -94,8 +94,7 @@ namespace creaImageIO void UnsafeSetAttribute(const std::string& k, const std::string& v) { mAttributeMap[k] = v; } - const AttributeDescriptor& GetAttributeDescriptor(const std::string& k) - const; + const AttributeDescriptor& GetAttributeDescriptor(const std::string& k)const; // { return GetTypeDescription().GetFieldDescription(k); } diff --git a/src2/creaImageIOWxTreeView.cpp b/src2/creaImageIOWxTreeView.cpp index d34741c..cdf0c18 100644 --- a/src2/creaImageIOWxTreeView.cpp +++ b/src2/creaImageIOWxTreeView.cpp @@ -1,16 +1,39 @@ #include #include #include -int wxCALLBACK MyCompareFunction(long item1, long item2, long WXUNUSED(sortData)) -{ - // inverse the order - if (item1 < item2) - return -1; - if (item1 > item2) - return 1; +int wxCALLBACK MyCompareFunction(long item1, long item2, long sortData) +{ + std::string s1((char*)((long*)item1)[1]); + std::string s2((char*)((long*)item2)[1]); + GimmickMessage(1, + " Check: STRING 1: " + < s2) + return -1; - return 0; + return 0; + } + else + { + if (s1 < s2) + return -1; + if (s1 > s2) + return 1; + + return 0; + + } + } + namespace creaImageIO { //===================================================================== @@ -64,7 +87,6 @@ namespace creaImageIO // Create the columns : one for each attribute of the level int col = 0; - //ctrl->InsertItem(0, "1"); tree::LevelDescriptor::AttributeDescriptorListType::const_iterator a; for (a = handler->GetTree().GetAttributeDescriptorList(i).begin(); @@ -76,12 +98,8 @@ namespace creaImageIO wxListItem it; it.SetTextColour(*wxRED); it.SetText(_T("#C")); - it.SetColumn(col); - // ctrl->InsertColumn(col, _("Children"), col_style); + ctrl->InsertColumn(col,it); - //ctrl->InsertItem(0, "1"); - //level.key.push_back(_("Children")); - //level.key.push_back(handler->GetTree().GetChildrenList().size()); col++; } @@ -105,7 +123,8 @@ namespace creaImageIO /// Initialize the first level splitter sizer->Add( mLevelList[0].wxSplitter ,1, wxGROW ,0); - + mColumnSelected=1; + mDirection=true; UpdateLevel(1); SetSizer( sizer ); @@ -129,6 +148,7 @@ namespace creaImageIO struct ItemData { tree::Node* node; + int id; }; //===================================================================== @@ -242,7 +262,7 @@ namespace creaImageIO <<(*i)->GetLabel() <<"'"<LoadChildren(*i,1); tree::Node::ChildrenListType::reverse_iterator j; @@ -260,9 +280,20 @@ namespace creaImageIO ); ItemData* data = new ItemData; - data->node = *j; + + data->node = *j; + item.SetId(_id); + /* + std::string a=(*j)->GetAttribute(mLevelList[l].key[mColumnSelected-1]); + GimmickMessage(1, + "State Check: Att VAL" + <id = _id; item.SetData(data); + _id++; long id = GetCtrl(l)->InsertItem(item); @@ -272,6 +303,7 @@ namespace creaImageIO oss << n; std::string s(oss.str()); + item.SetText( crea::std2wx(s)); // item.SetTextColour(*wxRED); // item.SetBackgroundColour(*wxBLACK); @@ -342,10 +374,9 @@ namespace creaImageIO //================================================================ void WxTreeView::OnColClick(wxListEvent& event) - { - /* + { //Obtain the column name and the level that needs to be organized - int colNum=event.m_col; + mColumnSelected=event.m_col; GimmickMessage(1, " Column " < sel=GetSelected(level+1); - - tree::Node* nodes[20]; - - int l = level - 1; - // to speed up inserting we hide the control temporarily - GetCtrl(level)->Hide(); - GetCtrl(level)->DeleteAllItems(); - - std::vector::iterator i; - int num=0; - for (i=sel.begin(); i!=sel.end(); ++i) - { - - //Adds columns - GetTreeHandler()->LoadChildren(*i,1); - tree::Node::ChildrenListType::reverse_iterator j; - - for (j = (*i)->GetChildrenList().rbegin(); - j!= (*i)->GetChildrenList().rend(); - ++j) - { - nodes[num]=*j; - num++; - } - } + int l = level - 1; + + //Sets the data for the items to be sorted + std::string att; - //Sorting elements - int k, m; - tree::Node* index; - + 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 + tree::Node* nod = ((ItemData*)adr)->node; + //Obtains the organizing attribute + att=(*nod).GetAttribute(mLevelList[level].key[mColumnSelected-1]); + int ty=(*nod).GetAttributeDescriptor(mLevelList[level].key[mColumnSelected-1]).GetType(); + GimmickMessage(1,"Type:"<SetItemData(i,(long)lp); + } - for (k=1; kGetAttribute(mLevelList[level].key[colNum-1]) - <<"Comparison Key 2: "<<(index)->GetAttribute(mLevelList[level].key[colNum-1]) - < 0) && ((nodes[m-1])->GetAttribute(mLevelList[level].key[colNum-1]) > - (index)->GetAttribute(mLevelList[level].key[colNum-1]))) - { - nodes[m] = nodes[m-1]; - m = m - 1; - } - nodes[m] = index; - } - - for (m=0; mInsertItem(item); - int n; - if ((node)->GetChildrenLoaded()) - { - n=(node)->GetChildrenList().size(); - } - else - { - n= GetTreeHandler()->GetNumberOfChildren(node); - } - std::ostringstream oss; - - oss << n; - std::string s(oss.str()); + if(mDirection) + { + GetCtrl(level)->SortItems(MyCompareFunction, 0); + mDirection=false; + } + else + { + GetCtrl(level)->SortItems(MyCompareFunction, 1); + mDirection=true; + } - GetCtrl(level)->SetItem(id,0, crea::std2wx(s)); - GetCtrl(level)->SetColumnWidth(0, wxLIST_AUTOSIZE ); + //Resets original data - for (int k=1; kGetColumnCount(); k++) - { - std::string val = (node)->GetAttribute(mLevelList[level].key[k-1]); - if (val.size()==0) val = "?"; - GetCtrl(level)->SetItem(id,k, crea::std2wx(val)); - GetCtrl(level)->SetColumnWidth(k, wxLIST_AUTOSIZE ); + 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]); - } - } - - - GetCtrl(level)->Show(); -*/ - } + + } //================================================================ void WxTreeView::ValidateSelectedImages() @@ -559,4 +550,3 @@ END_EVENT_TABLE() } // EO namespace creaImageIO - diff --git a/src2/creaImageIOWxTreeView.h b/src2/creaImageIOWxTreeView.h index ba0dae2..6b93641 100644 --- a/src2/creaImageIOWxTreeView.h +++ b/src2/creaImageIOWxTreeView.h @@ -66,9 +66,16 @@ namespace creaImageIO void ValidateSelectedImages(); ///Gets selected filenames void GetSelectedAsString(std::vector&s); - // Updates the view of a level given the selected items of upper level - // Recursive method + /// Updates the view of a level given the selected items of upper level + /// Recursive method virtual void RecursiveUpdateLevel( int ); + + + /// Currently Selected Column + int mColumnSelected; + ///Boolean that defines the direction of the organization + ///True is ascending order and false is descending + bool mDirection; -- 2.45.1