X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=src%2FcreaImageIOWxGimmick.cpp;h=2bcc3ab50c53bc08f25fcdfd1ebbae703b725365;hb=29cfc2f238ce7c522d3c878e032982d3a52d1044;hp=7bfed5b624ed7a85adf498ebb648410652db836e;hpb=684add23b4f64cb3c6e39e12a4af20d2c2500df6;p=creaImageIO.git diff --git a/src/creaImageIOWxGimmick.cpp b/src/creaImageIOWxGimmick.cpp index 7bfed5b..2bcc3ab 100644 --- a/src/creaImageIOWxGimmick.cpp +++ b/src/creaImageIOWxGimmick.cpp @@ -255,14 +255,26 @@ namespace creaImageIO //================================================================ //================================================================ WxGimmick::WxGimmick(wxWindow *parent, - wxWindowID id, - const wxPoint& pos, - const wxSize& size, - int threads) + wxWindowID id, + const wxPoint& pos, + const wxSize& size, + int image_type, + int threads) : wxPanel(parent,id,pos,size), + mSelectionType(image_type), mSaveConfigurationOnClose(true), mReader(threads) { + // Initialize image size corresponding to current selection + switch (mSelectionType) + { + case GIMMICK_2D_IMAGE_SELECTION : mSelectionMaxImageDimension = 2; break; + case GIMMICK_3D_IMAGE_SELECTION : mSelectionMaxImageDimension = 3; break; + case GIMMICK_4D_IMAGE_SELECTION : mSelectionMaxImageDimension = 4; break; + default : mSelectionMaxImageDimension = 0; + } + + // Start the threads ... mReader.Start(); @@ -1023,6 +1035,54 @@ namespace creaImageIO } //================================================================ + //================================================================ + void WxGimmick::LoadChildren(wxTreeItemId& id) + { + TreeItemData *item = (TreeItemData *)mTreeListCtrl->GetItemData(id); + if (item) + { + if ( ( item->IsDicomNode() || item->IsDatabase() ) && + ( ! item->GetDicomNode()->ChildrenLoaded() ) ) + { + + // If children not already loaded : do it + if ( + item->GetDicomNode()->GetDicomDatabase()->DBLoadChildren + (item->GetDicomNode(),item->GetDicomNode()->GetType()+1) + > 0 ) + { + // Some new children loaded + // Sort them + if (mSettings.HasActiveComparator + (item->GetDicomNode()->GetType()+1)) + { + /* std::cout << "Sorting using '" + << mSettings.GetActiveComparator + (item->GetDicomNode()->GetType()+1).GetName() + << "' ... "; + */ + item->GetDicomNode()->SortChildren + ( mSettings.GetActiveComparator + (item->GetDicomNode()->GetType()+1) + ); + // std::cout << "ok"<GetDicomNode()->GetChildrenList().begin(); + i!=item->GetDicomNode()->GetChildrenList().end(); + i++) + { + UpdateDicomNodeView(*i,id); + } + } + // EO If children not already loaded + } + } + } + //================================================================ + + //================================================================ void WxGimmick::OnItemExpanded(wxTreeEvent& event) { @@ -1033,7 +1093,10 @@ namespace creaImageIO wxBusyCursor busy; wxTreeItemId itemId = event.GetItem(); - + LoadChildren(itemId); + + return; + // expand if collapsed and collapse if expanded ... TreeItemData *item = (TreeItemData *)mTreeListCtrl->GetItemData(itemId); @@ -1725,25 +1788,111 @@ namespace creaImageIO } //================================================= + + + + + + + + //================================================================ + bool WxGimmick::IsImageSelectable(DicomNode* node) + { + int rows = node->ImageGetRows(); + int cols = node->ImageGetColumns(); + int frms = node->ImageGetFrames(); + + // std::cout << "R/C/F = " << rows << "/"<< cols <<"/"<0) dim=3; + else if (cols>0) dim=2; + else if (rows>0) dim=1; + + if (dim == 0) + { + std::cout << "Unknown image dimension : cannot select !" + << std::endl; + return false; + } + else if (dim>mSelectionMaxImageDimension) + { + std::cout << "Selecting "<GetSelectionSize() == 0 ) + { + mCurrentSelectionImageSize[0] = cols; + mCurrentSelectionImageSize[1] = rows; + mCurrentSelectionImageSize[2] = frms; + return true; + } + else + { + if ( dim == mSelectionMaxImageDimension ) + { + std::cout << "Cannot add this image to selection : would result in a "<ImageGetFullFileName() << std::endl; + return true; + } + //================================================================ + //================================================================ void WxGimmick::OnSelChanging(wxTreeEvent& event) { + event.Veto(); wxTreeItemId id = event.GetItem(); if (!id.IsOk()) { - std::cout << "ERROR : ID NOT OK"<GetItemData(id); - event.Veto(); + TreeItemData *data = (TreeItemData *)mTreeListCtrl->GetItemData(id); if (data->IsDicomNode()) { - if ((data->GetDicomNode()>0)&& - ( data->GetDicomNode()->GetType()==DicomNode::Image)) + if (data->GetDicomNode()>0) { - event.Allow(); + // An image was selected + if (data->GetDicomNode()->GetType()==DicomNode::Image) + { + if (IsImageSelectable(data->GetDicomNode())) event.Allow(); + } + // A series was selected + else if (data->GetDicomNode()->GetType()==DicomNode::Series) + { + // If images not loaded do it + LoadChildren(id); + // can be selected if all its images can + wxTreeItemId child; + wxTreeItemIdValue cookie; + for (child = mTreeListCtrl->GetFirstChild(id,cookie); + child.IsOk(); + child = mTreeListCtrl->GetNextChild(id,cookie)) + { + TreeItemData *cdata = + (TreeItemData *)mTreeListCtrl->GetItemData(child); + if ((cdata->IsDicomNode())&& + (cdata->GetDicomNode()>0)&& + (cdata->GetDicomNode()->GetType()==DicomNode::Image)&& + (!IsImageSelectable(cdata->GetDicomNode()))) + return; + } + event.Allow(); + } } } } @@ -1817,9 +1966,9 @@ namespace creaImageIO // << nsib->GetFieldValue("FullFileName") // << "' prio="<GetFieldValue("FullFileName"), + nsib->ImageGetFullFileName(), prio); - mImageFileNameToNode[nsib->GetFieldValue("FullFileName")] = + mImageFileNameToNode[nsib->ImageGetFullFileName()] = nsib; prio--; } @@ -1836,9 +1985,9 @@ namespace creaImageIO // << nsib->GetFieldValue("FullFileName") // << "' prio="<GetFieldValue("FullFileName"), + nsib->ImageGetFullFileName(), prio); - mImageFileNameToNode[nsib->GetFieldValue("FullFileName")] = + mImageFileNameToNode[nsib->ImageGetFullFileName()] = nsib; prio--; } @@ -1999,9 +2148,17 @@ namespace creaImageIO //================================================================ + //================================================================ + // LG : For the moment any selection is valid but in the future + // incomplete selections can be invalid... + bool WxGimmick::IsSelectionValid() + { + return (mTreeListCtrl->GetSelectionSize()>0); + } + //================================================================ //================================================================ - void WxGimmick::GetSelectedImages(std::vector& f) + void WxGimmick::GetSelectedFiles(std::vector& f) { wxArrayTreeItemIds id; // TO DO : TEST THAT STYLE IS MULTIPLE @@ -2015,7 +2172,7 @@ namespace creaImageIO { if (data->GetDicomNode()->GetType()==DicomNode::Image) { - f.push_back ( data->GetDicomNode()->GetFieldValue("FullFileName") ); + f.push_back ( data->GetDicomNode()->ImageGetFullFileName() ); } else if (data->GetDicomNode()->GetType()==DicomNode::Series) { @@ -2024,7 +2181,7 @@ namespace creaImageIO j!=data->GetDicomNode()->GetChildrenList().end(); j++) { - f.push_back((*j)->GetFieldValue("FullFileName")); + f.push_back((*j)->ImageGetFullFileName()); } } } @@ -2032,6 +2189,99 @@ namespace creaImageIO } //================================================================ + //================================================================ + void WxGimmick::GetSelectedImages(std::vector& f) + { + 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) + { + vtkImageData* first = mReader.GetImage( im.front()->ImageGetFullFileName() ); + if (first->GetDataDimension()==2) + { + // n2D to 3D + vtkImageData* out = vtkImageData::New(); + out->CopyStructure(first); + int ext[6]; + first->GetExtent(ext); + ext[5] = im.size(); + out->SetExtent(ext); + + out->AllocateScalars(); + 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]; + std::cout << "imsize="<::iterator it; + for (it=im.begin(); it!=im.end(); ++it) + { + vtkImageData* cur = mReader.GetImage( (*it)->ImageGetFullFileName() ); + + void* src = cur->GetScalarPointer(0,0,0); + void* dst = out->GetScalarPointer(0,0,slice); + memcpy(dst,src,imsize); + slice++; + } + f.push_back(out); + } + else + { + // n3D + std::vector::iterator it; + for (it=im.begin(); it!=im.end(); ++it) + { + vtkImageData* out = vtkImageData::New(); + out->ShallowCopy(mReader.GetImage((*it)->ImageGetFullFileName())); + f.push_back(out); + } + } + } + } + //================================================================ + //================================================================ void WxGimmick::GetSelectedDicomNodes(std::vector& f) @@ -2052,7 +2302,7 @@ namespace creaImageIO if (data->GetDicomNode()->GetType()==DicomNode::Image) { - f.push_back ( data->GetDicomNode() ); //->GetFieldValue("FullFileName") ); + f.push_back ( data->GetDicomNode() ); //->ImageGetFullFileName() ); } else if (data->GetDicomNode()->GetType()==DicomNode::Series) { @@ -2061,8 +2311,7 @@ namespace creaImageIO j!=data->GetDicomNode()->GetChildrenList().end(); j++) { - f.push_back((*j)); //->GetFieldValue("FullFileName")); - } + f.push_back((*j)); //->ImageGetFullFileName() ); } } } */ @@ -2596,17 +2845,14 @@ namespace creaImageIO //================================================================ //================================================================ WxGimmickFrame::WxGimmickFrame( wxWindow *parent, - wxString title, - wxSize size) + wxString title, + wxSize size) : wxFrame((wxFrame *)parent, -1, title, wxDefaultPosition, size) { wxBoxSizer *sizer = new wxBoxSizer(wxVERTICAL); - long style = wxTR_DEFAULT_STYLE | -#ifndef NO_VARIABLE_HEIGHT - wxTR_HAS_VARIABLE_ROW_HEIGHT | -#endif - wxTR_EDIT_LABELS | wxSUNKEN_BORDER; - mWxGimmick = new WxGimmick(this,-1,wxDefaultPosition,wxDefaultSize,style); + mWxGimmick = new WxGimmick(this,-1, + wxDefaultPosition, + wxDefaultSize); sizer->Add(mWxGimmick,1,wxGROW); SetSizer(sizer); SetAutoLayout(true);