X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=src2%2FcreaImageIOWxGimmickView.cpp;h=0c7229c08930a013711dd166c4d87de455be6e70;hb=17d5467beff3cbd305bfdd0505fe87e07dff3c66;hp=f1ba21805ddd712d56acffd5a9a4cf70ff31a29e;hpb=b2bd47502b2ed48d4001e26bae3a961a3310c60d;p=creaImageIO.git diff --git a/src2/creaImageIOWxGimmickView.cpp b/src2/creaImageIOWxGimmickView.cpp index f1ba218..0c7229c 100644 --- a/src2/creaImageIOWxGimmickView.cpp +++ b/src2/creaImageIOWxGimmickView.cpp @@ -65,8 +65,9 @@ namespace creaImageIO int max_dim, int number_of_threads) : wxPanel(parent,id,pos,size), - GimmickView(gimmick), - mProgressDialog(0) + GimmickView(gimmick, number_of_threads), + mProgressDialog(0), + mConstructed(false) { GimmickDebugMessage(1,"WxGimmickView::WxGimmickView" <Add(mText,1,wxGROW,0); + + // Previewer + mViewer = new WxViewer(mBottomPanel, wxID_ANY, wxT("Gimmick! Viewer"),wxDefaultPosition, wxDefaultSize ); + + bottom_sizer->Add(mViewer,1,wxGROW,0); + // mViewer->Show(); + + mBottomPanel->SetSizer(bottom_sizer); + // Splitting int hsize = size.GetHeight(); - int bottom_minsize = 20; + int bottom_minsize = 40; mSplitter->SetMinimumPaneSize( bottom_minsize ); mSplitter->SplitHorizontally( mNotebook, mBottomPanel, @@ -123,7 +137,8 @@ namespace creaImageIO SetSizer( sizer ); SetAutoLayout(true); Layout(); - + + mConstructed = true; } //====================================================================== @@ -184,10 +199,7 @@ namespace creaImageIO GimmickMessage(2,"Creating the tree view for '"<< name<<"'"<SetMaxDimension(mSelectionMaxDimension); - view->SetMinDimension(mSelectionMinDimension); + WxTreeView* view = new WxTreeView(h,this,mNotebook,-1); // TO DO : TEST THAT A VIEW WITH SAME NAME IS NOT // ALREADY IN THE MAP @@ -198,22 +210,27 @@ namespace creaImageIO } //====================================================================== - /// Returns the selected Images so that they comply with the given parameter(<4D) + /// Returns the selected Image so that it complies with the given parameter(<4D) vtkImageData* WxGimmickView::GetSelectedImage(int dim) { return NULL; + //GetTreeViewMap()["Local database"]->GetSelectedImage(dim); } //====================================================================== /// Returns the selected Images so that they comply with the given parameter(4D) void WxGimmickView::GetSelectedImages(std::vector& s, int dim) { - - //GetTreeViewMap()["Local database"]->GetImageData() - //return NULL ; - + int level=GetTreeViewMap()["Local database"]->GetNumberOfLevels(); + std::vector im=GetTreeViewMap()["Local database"]->GetSelected(level+1); + ReadImagesNotThreaded(s,im,dim); + } + //====================================================================== + /// Returns the selected Images so that they comply with the given parameter(4D) + void WxGimmickView::GetSelectedFiles(std::vector& s) + { + GetTreeViewMap()["Local database"]->GetSelectedAsString(s); } - //================================================= void WxGimmickView::CreateIconList() { @@ -351,15 +368,187 @@ namespace creaImageIO //================================================= //================================================= - void WxGimmickView::SetMessage(const wxString& mess) + void WxGimmickView::OnSelectionChange(std::vector& sel) { + GimmickDebugMessage(5, + "WxGimmickView::OnSelectionChange" + <SetLabel(_T("Status: ")+crea::std2wx(GetMessage())); + if(valid) + { + ReadImageThreaded(sel); + } + else + { + mViewer->SetMovieSize(1); + mViewer->SetImage(0,GetDefaultImage()); + // mViewer->Hide(); + } + - mText->SetLabel(_T("Status: ")+mess); } - //================================================= - //================================================= + //================================================== + + //================================================== + ///Reads Images (Threaded) + void WxGimmickView::ReadImageThreaded(std::vector sel) + { + GimmickDebugMessage(5, + "ReadImageThreaded" + <SetMovieSize(sel.size());//ClearImages(); + + //First load the selected images + mCurImageItemToShow = sel.front(); + int index = 0; + std::vector::iterator selected; + for(selected=sel.begin();selected!=sel.end();++selected) + { + GimmickDebugMessage(5, + "Requesting image from selected " + <<(*selected)->GetAttribute("FullFileName") + < up; + GetTreeViewMap()["Local database"]->GetNodes(up,true); + std::vector::iterator iterUp; + for(iterUp=up.begin();iterUp!=up.end();++iterUp) + { + GimmickDebugMessage(5, + "Requesting image from neighbors up " + <<(*iterUp)->GetAttribute("FullFileName") + < down; + GetTreeViewMap()["Local database"]->GetNodes(down,false); + std::vector::iterator iterDown; + for(iterDown=down.begin();iterDown!=down.end();++iterDown) + { + GimmickDebugMessage(5, + "Requesting image from neighbors down " + <<(*iterDown)->GetAttribute("FullFileName") + <GetNumberOfLevels(); + // std::vector sel=GetTreeViewMap()["Local database"]->GetSelected(level+1); + /* + GimmickDebugMessage(5, + "Processing Images. Lock Started" + <=0) + { + mViewer->SetImage(index,image); + } + /* + tree::Node* node=GetNextNodeQueued(); + + + bool found=false; + std::vector::iterator i; + for(i=sel.begin();i!=sel.end()&&!found;++i) + { + if((*i)==node) + { + mViewer->AddImage(image); + found=true; + } + } + */ + + } + UnqueueNext(); + } + /* + if(!(mViewer->ImagesEmpty())) + { + GimmickDebugMessage(5, + "Showing images" + <ShowImages(); + // mViewer->Show(); + } + */ + ClearQueue(); + + + MultiThreadImageReaderEventUnlock(); + /* + GimmickDebugMessage(5, + "Processing Images. Lock Ended" + <SetMovieSize(1); + mViewer->SetImage(0,GetDefaultImage()); + first_time = false; + } + // mViewer->Refresh(); + } + + //================================================= + + //================================================= void WxGimmickView::OnRemove(wxCommandEvent& event) { //TODO Select current tree handler @@ -416,6 +605,7 @@ namespace creaImageIO */ wxMessageBox(std2wx(mess.str()),_T("Addition result"),wxOK,this); } + //================================================= //=================================================