X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=src2%2FcreaImageIOWxTreeView.cpp;h=1f3ccfeb1ff109fa35ba57ee90497ccb41cabd92;hb=384558d116ebb2ca264900f837c4a921d695515a;hp=5d77aadc95cd742af7e1885a005407aa65f65943;hpb=b2bd47502b2ed48d4001e26bae3a961a3310c60d;p=creaImageIO.git diff --git a/src2/creaImageIOWxTreeView.cpp b/src2/creaImageIOWxTreeView.cpp index 5d77aad..1f3ccfe 100644 --- a/src2/creaImageIOWxTreeView.cpp +++ b/src2/creaImageIOWxTreeView.cpp @@ -1,16 +1,72 @@ #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 CompareFunctionStrings(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; + } + else + { + if (s1 < s2) + return -1; + if (s1 > s2) + return 1; + + return 0; + + } + +} + +int wxCALLBACK CompareFunctionInts(long item1, long item2, long sortData) +{ + int val1=atoi((char*)((long*)item1)[1]); + int val2=atoi((char*)((long*)item2)[1]); + GimmickMessage(1, + " Check: STRING 1: " + < val2) + return -1; + + return 0; + } + else + { + if (val1 < val2) + return -1; + if (val1 > val2) + return 1; - return 0; + return 0; + + } + } + namespace creaImageIO { //===================================================================== @@ -64,7 +120,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 +131,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 +156,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 +181,7 @@ namespace creaImageIO struct ItemData { tree::Node* node; + int id; }; //===================================================================== @@ -242,7 +295,7 @@ namespace creaImageIO <<(*i)->GetLabel() <<"'"<LoadChildren(*i,1); tree::Node::ChildrenListType::reverse_iterator j; @@ -260,9 +313,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,17 +336,23 @@ namespace creaImageIO oss << n; std::string s(oss.str()); + item.SetText( crea::std2wx(s)); // item.SetTextColour(*wxRED); // item.SetBackgroundColour(*wxBLACK); item.SetColumn(0); + + //Sets the last level as selecte....How to make it select only the first time? + //if (level==mLevelList.size()) item.SetState(wxLIST_STATE_SELECTED); + 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)); @@ -337,10 +407,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; + int l = level - 1; + + //Sets the data for the items to be sorted + std::string att; + unsigned int ty=0; + 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 and the type of attribute + tree::Node* nod = ((ItemData*)adr)->node; + if(i==0) + { + (*nod).GetAttributeDescriptor(mLevelList[level].key[mColumnSelected-1]).DecodeType(ty); + } + //Obtains the organizing attribute + att=(*nod).GetAttribute(mLevelList[level].key[mColumnSelected-1]); - for (j = (*i)->GetChildrenList().rbegin(); - j!= (*i)->GetChildrenList().rend(); - ++j) - { - nodes[num]=*j; - num++; - } - } - - //Sorting elements - int k, m; - tree::Node* index; + 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); + } - - 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; + //int ty=GetAttributeDescriptor(mLevelList[level].key[mColumnSelected-1]).GetType(); + if(mDirection) + { + if(ty==1) + { + GetCtrl(level)->SortItems(CompareFunctionInts, 0); + } + else + { + GetCtrl(level)->SortItems(CompareFunctionStrings, 0); + } - oss << n; - std::string s(oss.str()); + mDirection=false; + } + else + { + if(ty==1) + { + GetCtrl(level)->SortItems(CompareFunctionInts, 1); + } + else + { + GetCtrl(level)->SortItems(CompareFunctionStrings, 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() { - int level=mLevelList.size(); - std::vector sel=GetSelected(level+1); - bool valid=true; - std::string mess; - if(sel.size()>0) - { - std::vector::iterator i; - std::string row; - std::string col; - std::string plane; - - - //Validation between image sizes - for (i=sel.begin(); i!=sel.end() && valid; ++i) - { - if(i==sel.begin()) - { - row=(*i)->GetAttribute(mLevelList[level-1].key[1]); - col=(*i)->GetAttribute(mLevelList[level-1].key[2]); - plane=(*i)->GetAttribute(mLevelList[level-1].key[3]); - } - else - { - if(((*i)->GetAttribute(mLevelList[level-1].key[1]))!=row || - ((*i)->GetAttribute(mLevelList[level-1].key[2]))!=col || - ((*i)->GetAttribute(mLevelList[level-1].key[3]))!=plane) - { - mess="The selected images are not compatible."; - valid=false; - } - } - } - - //Dimention validation - //Compatibility with maximum - if(valid) - { - int rows; - int cols; - int planes; - std::string s; - std::istringstream t(s); - s=row; - t >> rows; - if(row==""){rows=1;} - s=col; - t >> cols; - if(col==""){cols=1;} - s=plane; - t >> planes; - if(plane==""){planes=1;} - - int dim = 0; - if (planes>1) dim=3; - else if (cols>1) dim=2; - else if (rows>1) dim=1; - - if (dim == 0) - { - mess="Unknown image dimension : cannot select !"; - valid= false; - } - else if (dim>GetMaxDimension()) - { - mess="Selecting "; - mess+=dim; - mess+="D images is not allowed !"; - valid= false; - } - if ( dim == GetMaxDimension() ) - { - mess="Cannot add this image to selection : would result in a "; - mess+=(dim+1); - mess+="D image!"; - - valid= false; - } - if ( dim < GetMinDimension() && sel.size()<2 ) - { - mess="Cannot build the selection as it would result in a "; - mess+=dim; - mess+="D image, and the minimum is "; - mess+=GetMinDimension(); - mess+="D!"; - valid= false; - } - } - } - else - { - mess="Cannot have 0 images selected"; - GimmickMessage(1,"Cannot have 0 images selected"<< std::endl); - valid=false; - } - //Send an event telling wether the selection is valid or not wxCommandEvent event( 0, GetId() ); event.SetEventObject( this ); - if(valid) - { - mess="Selection OK !"; - event.SetInt(0); - } - else - {event.SetInt(1);} - event.SetString(crea::std2wx(mess)); + std::vector sel=GetSelected((mLevelList.size()+1)); + event.SetClientData(&sel); GetEventHandler()->ProcessEvent( event ); - - } - //================================================================ - - - 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; iGetItemData(id[i]); - if ((data) && (data->IsDicomNode())) - { - if (data->GetDicomNode()->GetType()==DicomNode::Image) - { - im.push_back ( data->GetDicomNode() ); - - } - else if (data->GetDicomNode()->GetType()==DicomNode::Series) - { - DicomNode::ChildrenListType::iterator j; - for (j =data->GetDicomNode()->GetChildrenList().begin(); - j!=data->GetDicomNode()->GetChildrenList().end(); - j++) - { - im.push_back ( *j ); - } - } - } - } - // 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) + int level=mLevelList.size(); + std::vector sel=GetSelected(level+1); + std::vector::iterator i; + + for (i=sel.begin(); i!=sel.end(); ++i) { - 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="<::iterator it; - for (it=im.begin(); it!=im.end(); ++it) - { - vtkImageData* out = vtkImageData::New(); - out->ShallowCopy(mReader.GetImage((*it)->ImageGetFullFileName())); - f.push_back(out); - } - } - } - */ - return NULL; - } - - void WxTreeView::GetSelectedImages(std::vector& s, int dim) - { - } + //================================================================ BEGIN_EVENT_TABLE(WxTreeView, wxPanel) /* EVT_SIZE(MyFrame::OnSize) @@ -753,4 +603,3 @@ END_EVENT_TABLE() } // EO namespace creaImageIO -