X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=src2%2FcreaImageIOWxGimmickView.cpp;h=2d8785147b5754b69a9c2d69bc715f89acbd8f31;hb=cac026929f2431aa4a966bf9ae3c8ff263f5dd63;hp=6f38c234655efc63f20e61160838873fc6e9669c;hpb=3faba427694d4e57c89f2c69215dd58f24ce76fa;p=creaImageIO.git diff --git a/src2/creaImageIOWxGimmickView.cpp b/src2/creaImageIOWxGimmickView.cpp index 6f38c23..2d87851 100644 --- a/src2/creaImageIOWxGimmickView.cpp +++ b/src2/creaImageIOWxGimmickView.cpp @@ -15,6 +15,7 @@ using namespace crea; namespace creaImageIO { + //====================================================================== // The ids of the different tools enum @@ -65,8 +66,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" <SetImageVector(pointers); + mViewer->StartPlayer(); + + + bottom_sizer->Add(mViewer,1,wxGROW,1); + // mViewer->Show(); + + mText = new wxStaticText(mBottomPanel, wxID_ANY, wxT("Welcome to Gimmick!")); + bottom_sizer->Add(mText,0,wxGROW,0); + + + + mBottomPanel->SetSizer(bottom_sizer); + // Splitting int hsize = size.GetHeight(); - int bottom_minsize = 20; + + int top_minsize = 450; + int bottom_minsize = 50; mSplitter->SetMinimumPaneSize( bottom_minsize ); mSplitter->SplitHorizontally( mNotebook, mBottomPanel, - hsize - bottom_minsize); - + top_minsize); + sizer->Add( mSplitter,1,wxGROW ,0); SetSizer( sizer ); SetAutoLayout(true); Layout(); - + + mConstructed = true; } //====================================================================== @@ -184,10 +209,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 @@ -197,23 +219,21 @@ namespace creaImageIO mNotebook->AddPage( view, crea::std2wx(name) ); } + //====================================================================== - /// Returns the selected Images so that they comply with the given parameter(<4D) - vtkImageData* WxGimmickView::GetSelectedImage(int dim) + /// Returns the selected Images so that they comply with the given parameter(4D) + void WxGimmickView::GetSelectedImages(std::vector& s, int dim) { - 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::GetSelectedImages(std::vector& s, int dim) + void WxGimmickView::GetSelectedFiles(std::vector& s) { - - //GetTreeViewMap()["Local database"]->GetImageData() - //return NULL ; - + GetTreeViewMap()["Local database"]->GetSelectedAsString(s); } - //================================================= void WxGimmickView::CreateIconList() { @@ -351,19 +371,184 @@ namespace creaImageIO //================================================= //================================================= - void WxGimmickView::SetMessage(wxString& mess) + void WxGimmickView::OnSelectionChange(std::vector& sel, bool isSelection, int selection, bool needProcess) { + GimmickDebugMessage(5, + "WxGimmickView::OnSelectionChange" + <SetLabel("Status: "+mess); + bool valid=true; + + if(sel.size()==0) + { + + valid= ValidateSelected(NULL, + mSelectionMinDimension, + mSelectionMaxDimension ); + } + else if(needProcess) + { + ClearStatus(); + std::vector::iterator i; + for(i=sel.begin();i!=sel.end()&&valid;++i) + { + valid= ValidateSelected((*i), + mSelectionMinDimension, + mSelectionMaxDimension ); + } + } + else if(isSelection) + { + valid= ValidateSelected(sel.front(), + mSelectionMinDimension, + mSelectionMaxDimension ); + } + else + { + ClearStatus(); + std::vector::iterator i; + for(i=sel.begin();i!=sel.end()&&valid;++i) + { + valid= ValidateSelected((*i), + mSelectionMinDimension, + mSelectionMaxDimension ); + } + } + + mText->SetLabel(crea::std2wx(GetMessage())); + /*if(valid) + { + ReadImageThreaded(sel); + } + else + { + ClearSelection(); + }*/ + ReadImageThreaded(sel); + + } - //================================================= - //================================================= + //================================================== + + //================================================== + ///Reads Images (Threaded) + void WxGimmickView::ReadImageThreaded(std::vector sel) + { + GimmickDebugMessage(5, + "ReadImageThreaded" + <0) + { + //First load the selected images + mCurImageItemToShow = sel.front(); + pointers.clear(); + int index = 0; + std::vector::iterator selected; + for(selected=sel.begin();selected!=sel.end();++selected) + { + GimmickDebugMessage(5, + "Requesting image from selected " + <<(*selected)->GetAttribute("FullFileName") + <SetImageVector(pointers); + //Going up + prio = maxprio + 20; + std::vector 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") + <SetImageVector(pointers); + } + } + + //================================================== + + //================================================== + + //================================================== + void WxGimmickView::OnInternalIdle() + { + if (!mConstructed) return; + static bool first_time = true; + if (false) + { + first_time = false; + } + // GimmickMessage(1,"WxGimmickView : Refresh viewer"<StartPlayer(); + if(mViewer) + { + mViewer->RefreshIfNecessary(); + } + } + + //================================================== + + //================================================== + void WxGimmickView::ClearSelection() + { + pointers.clear(); + pointers.push_back(new ImagePointerHolder(GetDefaultImage())); + mViewer->SetImageVector(pointers); + mViewer->RefreshIfNecessary(); + ClearStatus(); + } + + //================================================= + + //================================================= void WxGimmickView::OnRemove(wxCommandEvent& event) { //TODO Select current tree handler wxBusyCursor busy; GetTreeViewMap()["Local database"]->RemoveSelected(1); + ClearSelection(); } //================================================= @@ -415,6 +600,7 @@ namespace creaImageIO */ wxMessageBox(std2wx(mess.str()),_T("Addition result"),wxOK,this); } + //================================================= //=================================================