X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=src2%2FcreaImageIOWxTreeView.cpp;h=c121c96a04a2d745a97c0c802dbc3b28835176e5;hb=7c6f60361461c27cb809f3e5d0473f211801b813;hp=1b3d20d7d0ff829db0b92e30b4ae12ab1aca9add;hpb=633701590bade8ba6d0f8c7b37c033596b4b2c2a;p=creaImageIO.git diff --git a/src2/creaImageIOWxTreeView.cpp b/src2/creaImageIOWxTreeView.cpp index 1b3d20d..c121c96 100644 --- a/src2/creaImageIOWxTreeView.cpp +++ b/src2/creaImageIOWxTreeView.cpp @@ -1,25 +1,74 @@ #include +#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; +#include +///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; + + } + +} + +///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; + + return 0; + } + else + { + if (val1 < val2) + return -1; + if (val1 > val2) + return 1; - return 0; + return 0; + + } + } + namespace creaImageIO { //===================================================================== // CTor WxTreeView::WxTreeView(TreeHandler* handler, + GimmickView* gimmick, wxWindow* parent, const wxWindowID id) : wxPanel(parent,id), - TreeView(handler) + TreeView(handler,gimmick) { GimmickDebugMessage(1,"WxTreeView::WxTreeView" <1) sparent = mLevelList[i-2].wxSplitter; level.wxSplitter = new wxSplitterWindow( sparent , -1); + if(i!=1) + { + level.wxSplitter->Show(false); + } // level.wxSplitter->SetMinimumPaneSize(100); wxListCtrl* ctrl = new wxListCtrl(level.wxSplitter, @@ -62,50 +115,73 @@ namespace creaImageIO level.wxCtrl = ctrl; level.wxSplitter->Initialize(ctrl); + // Create the columns : one for each attribute of the level int col = 0; - //ctrl->InsertItem(0, "1"); - + std::string title; tree::LevelDescriptor::AttributeDescriptorListType::const_iterator a; for (a = handler->GetTree().GetAttributeDescriptorList(i).begin(); a != handler->GetTree().GetAttributeDescriptorList(i).end(); ++a) { - if(col==0) - { - 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++; - } - + GimmickDebugMessage(5,"Creating column "<GetName() <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(); + } ctrl->InsertColumn(col, - crea::std2wx(a->GetName()), + crea::std2wx(title), col_style); level.key.push_back(a->GetKey()); // ctrl->SetColumnWidth(col, wxLIST_AUTOSIZE ); col++; - + } } 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 sizer->Add( mLevelList[0].wxSplitter ,1, wxGROW ,0); - + mColumnSelected=1; + mLastSelected=0; + mDirection=true; + mSelectionMade=false; + mProcess=true; + //CreateColorPalette(); UpdateLevel(1); SetSizer( sizer ); @@ -129,6 +205,7 @@ namespace creaImageIO struct ItemData { tree::Node* node; + int id; }; //===================================================================== @@ -151,11 +228,20 @@ namespace creaImageIO { long adr = GetCtrl(l-1)->GetItemData(i); tree::Node* n = ((ItemData*)adr)->node; - sel.push_back(n); + if(mLastSelected==i) + { + std::vector::iterator it; + it = sel.begin(); + it = sel.insert ( it , n ); + } + else + { + sel.push_back(n); + } } } } - + return sel; } @@ -195,7 +281,7 @@ namespace creaImageIO //===================================================================== - /// + /// Updates a level of the view (adds or removes children, proganizes, etc.) void WxTreeView::UpdateLevel( int level ) { GimmickDebugMessage(1, @@ -217,7 +303,7 @@ namespace creaImageIO } //===================================================================== - /// + /// Recursive method called upon by UpdateLevel to refresh all windows void WxTreeView::RecursiveUpdateLevel( int level ) { GimmickDebugMessage(2, @@ -235,90 +321,76 @@ namespace creaImageIO GetCtrl(l)->DeleteAllItems(); std::vector::iterator i; - for (i=sel.begin(); i!=sel.end(); ++i) + + for (i=sel.begin(); i!=sel.end(); ++i) { GimmickDebugMessage(2, "adding children of '" <<(*i)->GetLabel() - <<"'"<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; - 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.SetData(data); - - long id = GetCtrl(l)->InsertItem(item); + data->node = *j; + item->SetId(_id); - std::ostringstream oss; - int n= GetTreeHandler()->GetNumberOfChildren(*j); - - oss << n; - std::string s(oss.str()); + data->id = _id; + item->SetData(data); - item.SetText( crea::std2wx(s)); - // item.SetTextColour(*wxRED); - // item.SetBackgroundColour(*wxBLACK); - item.SetColumn(0); - GetCtrl(l)->SetItem(item); - // GetCtrl(l)->SetItem(id,0, crea::std2wx(s)); - // GetCtrl(l)->SetColumnWidth(0, wxLIST_AUTOSIZE ); - - for (int k=1; kGetColumnCount(); k++) - { - - std::string val = (*j)->GetAttribute(mLevelList[l].key[k-1]); - if (val.size()==0) val = "?"; - item.SetText( crea::std2wx(val)); - // item.SetTextColour(*wxBLACK); - // item.SetBackgroundColour(*wxWHITE); - item.SetColumn(k); - GetCtrl(l)->SetItem(item); - - // GetCtrl(l)->SetItem(id,k, crea::std2wx(val)); - // GetCtrl(l)->SetColumnWidth(k, wxLIST_AUTOSIZE ); + _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); + } + } + GetCtrl(l)->DeleteItem(0); } GetCtrl(l)->Show(); - - - if (levelGetTree().GetLabel() <<" view : item selected " <ClearSelection(); + } + // Select all images if the selection is at series level + if (level==mLevelList.size()-2) SelectLowerLevel(); + // Validate selected images if the selection is at image level + if (level==(mLevelList.size()-1)&&mProcess) + { + if(event.GetEventType()==10145) + { + ValidateSelectedImages (true); + } + else + { + ValidateSelectedImages (false); + } + } + + } + //================================================================ + //================================================================ + void WxTreeView::SelectLowerLevel() + { + long item = -1; + int level=mLevelList.size()-1; + for ( ;; ) + { + 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); + } } + + //================================================================ //================================================================ -//================================================================ void WxTreeView::OnColClick(wxListEvent& event) { - /* - //Obtain the column name and the level that needs to be organized - int colNum=event.m_col; - GimmickMessage(1, - " Column " <GetScreenPosition().x; + clientpt.y = wxGetMousePosition().y - this->GetScreenPosition().y; + senderCtrl = event.GetEventObject(); unsigned int level = 0; - for (level = 0; level sel=GetSelected(level+1); - - tree::Node* nodes[20]; + for (level = 0; levelHide(); - 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; + //================================================================ + //================================================================ + + void WxTreeView::OnPopupFilter(wxCommandEvent& event) + { + wxBusyCursor busy; + GimmickDebugMessage(7, + "WxTreeView::OnEndLabelEdit" + <GetChildrenList().rbegin(); - j!= (*i)->GetChildrenList().rend(); - ++j) + long it = -1; + UpdateLevel(level+1); + + std::vector 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) { - nodes[num]=*j; - num++; + + if(!in) + { + in=true; + } + else + { + del+=1; + } + + items.push_back(it-del); } - } - - //Sorting elements - int k, m; - tree::Node* index; - - - 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]))) + + } + std::vector::iterator iter; + for(iter=items.begin();iter!=items.end();++iter) { - nodes[m] = nodes[m-1]; - m = m - 1; + GetCtrl(level)->DeleteItem(*iter); } - nodes[m] = index; - } - - for (m=0; mClearSelection(); + } + //================================================================ - long id = GetCtrl(level)->InsertItem(item); - int n; - if ((node)->GetChildrenLoaded()) + //================================================================ + void WxTreeView::OnPopupSort(wxCommandEvent& event) + { + wxBusyCursor busy; + unsigned int level = 0; + for (level = 0; levelGetChildrenList().size(); + if ( GetCtrl(level) == senderCtrl ) break; } - else + if(event.GetId()==mAscendingID) { - n= GetTreeHandler()->GetNumberOfChildren(node); + mDirection=true; + } + else if(event.GetId()==mDescendingID) + { + mDirection=false; } - std::ostringstream oss; - - oss << n; - std::string s(oss.str()); - - GetCtrl(level)->SetItem(id,0, crea::std2wx(s)); - GetCtrl(level)->SetColumnWidth(0, wxLIST_AUTOSIZE ); - - 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 ); - - } - - } - - GetCtrl(level)->Show(); -*/ + OnSort(level); } //================================================================ + void WxTreeView::OnSort(int level) + { + //Obtain the column name and the level that needs to be organized - void WxTreeView::ValidateSelectedImages() - { - GimmickMessage(1, - "Hello World Validate" - <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]).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); + } + } + + //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; + + } + } + + //================================================================ + void WxTreeView::ValidateSelectedImages(bool isSelection) + { + GimmickDebugMessage(7, + "WxTreeView::ValidateSelectedImages" + < sel(GetSelected(mLevelList.size()+1)); + GetGimmickView()->OnSelectionChange(sel,isSelection,(mLastSelected-1), mProcess); + } + //================================================================ + //================================================================ + void WxTreeView::GetNodes(std::vector& nodes, bool direction) + { + long item = mLastSelected; + int level=mLevelList.size()-1; + //Gets current item data + long adr = GetCtrl(level)->GetItemData(item); + //Extracts the node + tree::Node* nod = ((ItemData*)adr)->node; + for ( ;; ) + { + if(direction) + { + item = GetCtrl(level)->GetNextItem(item, + wxLIST_NEXT_ABOVE); + } + else + { + item = GetCtrl(level)->GetNextItem(item, + wxLIST_NEXT_BELOW); + } + if ( item == -1 ) + { + break; + } + if(GetCtrl(level)->GetItemState(item, wxLIST_STATE_SELECTED)==0 /*&& item!=0*/) + { + adr = GetCtrl(level)->GetItemData(item); + nod = ((ItemData*)adr)->node; + nodes.push_back(nod); + } + } + } - vtkImageData* WxTreeView::GetSelectedImage(int dim) + //================================================================ + void WxTreeView::GetSelectedAsString(std::vector&s) { - /* - wxArrayTreeItemIds id; - // TO DO : TEST THAT STYLE IS MULTIPLE - unsigned int nb = mTreeListCtrl->GetSelections(id); - f.clear(); - - // Collect the brute vector of Image nodes - std::vector im; - for (unsigned int i=0; i sel=GetSelected(level+1); + std::vector::iterator i; + + for (i=sel.begin(); i!=sel.end(); ++i) { - TreeItemData *data = - (TreeItemData *)mTreeListCtrl->GetItemData(id[i]); - if ((data) && (data->IsDicomNode())) - { - if (data->GetDicomNode()->GetType()==DicomNode::Image) - { - im.push_back ( data->GetDicomNode() ); + std::string filename=(*i)->GetAttribute("FullFileName"); + s.push_back(filename); + } + } - } - else if (data->GetDicomNode()->GetType()==DicomNode::Series) - { - DicomNode::ChildrenListType::iterator j; - for (j =data->GetDicomNode()->GetChildrenList().begin(); - j!=data->GetDicomNode()->GetChildrenList().end(); - j++) + //================================================================ + void WxTreeView::SetColor(int l, int item) + { + 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) { - im.push_back ( *j ); + colorId++; } - } - } - } - // Create the output data - if (im.size()==1) - { - // Only one image : give it - vtkImageData* out = vtkImageData::New(); - out->ShallowCopy(mReader.GetImage(im.front()->ImageGetFullFileName())); - f.push_back( out ); - } - else if (im.size()>1) - { - vtkImageData* first = mReader.GetImage( im.front()->ImageGetFullFileName() ); - if (first->GetDataDimension()==2) - { - // n2D to 3D - vtkImageData* out = vtkImageData::New(); - out->CopyStructure(first); - out->SetScalarType(first->GetScalarType()); - int ext[6]; - first->GetExtent(ext); - ext[5] = im.size(); - out->SetExtent(ext); - // LG : TODO : Z Spacing ? - - out->AllocateScalars(); - - //first->Print(std::cout); - // out->Print(std::cout); - - int dim[3]; - first->GetDimensions(dim); - unsigned long imsize = - ( (unsigned long)first->GetScalarPointer(0,1,0) - - (unsigned long)first->GetScalarPointer(0,0,0)) - *dim[1]; - - int slice = 0; - std::vector::iterator it; - for (it=im.begin(); it!=im.end(); ++it) - { - //std::cout << "copying slice "<ImageGetFullFileName() ); - - void* src = cur->GetScalarPointer(0,0,0); - void* dst = out->GetScalarPointer(0,0,slice); - // std::cout << "src="<