X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=src2%2FcreaImageIOWxTreeView.cpp;h=1b3d20d7d0ff829db0b92e30b4ae12ab1aca9add;hb=633701590bade8ba6d0f8c7b37c033596b4b2c2a;hp=7f2826049c77f19aa56bf9a3290d51c32ddfa38f;hpb=918c6efd4f8ccabcdcfa92e5b13da5c64de5e638;p=creaImageIO.git diff --git a/src2/creaImageIOWxTreeView.cpp b/src2/creaImageIOWxTreeView.cpp index 7f28260..1b3d20d 100644 --- a/src2/creaImageIOWxTreeView.cpp +++ b/src2/creaImageIOWxTreeView.cpp @@ -1,7 +1,16 @@ #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; + + return 0; +} namespace creaImageIO { //===================================================================== @@ -32,15 +41,26 @@ namespace creaImageIO i < handler->GetTree().GetNumberOfLevels(); ++i) { - GimmickDebugMessage(5,"Creating ListCtrl for level "<1) sparent = mLevelList[i-2].wxSplitter; + + level.wxSplitter = new wxSplitterWindow( sparent , -1); + // level.wxSplitter->SetMinimumPaneSize(100); + + wxListCtrl* ctrl = new wxListCtrl(level.wxSplitter, i, wxDefaultPosition, wxDefaultSize, ctrl_style); level.wxCtrl = ctrl; + level.wxSplitter->Initialize(ctrl); // Create the columns : one for each attribute of the level int col = 0; @@ -53,11 +73,16 @@ namespace creaImageIO { if(col==0) { - ctrl->InsertColumn(col, _("Children"), col_style); - //ctrl->InsertItem(0, "1"); - //level.key.push_back(_("Children")); - //level.key.push_back(handler->GetTree().GetChildrenList().size()); - col++; + 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 "<Add( ctrl ,1, wxGROW ,0); } + + /// Initialize the first level splitter + + sizer->Add( mLevelList[0].wxSplitter ,1, wxGROW ,0); + UpdateLevel(1); SetSizer( sizer ); @@ -164,17 +193,39 @@ namespace creaImageIO //===================================================================== + //===================================================================== - /// void WxTreeView::UpdateLevel( int level ) { - GimmickDebugMessage(1, + GimmickDebugMessage(1, GetTreeHandler()->GetTree().GetLabel() <<" view : updating level "<IsSplit()) + GetSplitter(i)->SplitVertically( GetCtrl(i), GetSplitter(i+1), + 100 ); + } + if (GetSplitter(i)->IsSplit()) GetSplitter(i)->Unsplit(); + + } + //===================================================================== + + /// + void WxTreeView::RecursiveUpdateLevel( int level ) + { + GimmickDebugMessage(2, + GetTreeHandler()->GetTree().GetLabel() + <<" view : updating level (recursive)"< sel=GetSelected(level); int l = level - 1; @@ -215,22 +266,33 @@ namespace creaImageIO long id = GetCtrl(l)->InsertItem(item); - std::ostringstream oss; - - int n= GetTreeHandler()->GetNumberOfChildren(*j); - - oss << n; - std::string s(oss.str()); - - GetCtrl(l)->SetItem(id,0, crea::std2wx(s)); - GetCtrl(l)->SetColumnWidth(0, wxLIST_AUTOSIZE ); + std::ostringstream oss; + int n= GetTreeHandler()->GetNumberOfChildren(*j); + + oss << n; + std::string s(oss.str()); + + 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 = "?"; - GetCtrl(l)->SetItem(id,k, crea::std2wx(val)); - GetCtrl(l)->SetColumnWidth(k, wxLIST_AUTOSIZE ); + 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 ); } @@ -268,12 +330,251 @@ namespace creaImageIO " Level "< 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++; + } + } + + //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]))) + { + 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()); + + 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(); +*/ + } + //================================================================ + + void WxTreeView::ValidateSelectedImages() + { + GimmickMessage(1, + "Hello World Validate" + <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) + { + 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="<