X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=src2%2FcreaImageIOWxGimmickView.cpp;h=21c9a98b8b8cb618136e7a37086a6c7614f28145;hb=2af28133d2a0a10cf6377030a6c49e5c3c463a34;hp=99a007751758d8c6129b1fc7ce13280937b308f5;hpb=10480b68ab85e5e7a4ddcf56ebfc83f5870061b5;p=creaImageIO.git diff --git a/src2/creaImageIOWxGimmickView.cpp b/src2/creaImageIOWxGimmickView.cpp index 99a0077..21c9a98 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 = 200; + + 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; } //====================================================================== @@ -183,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 @@ -196,22 +219,32 @@ 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) + void WxGimmickView::GetSelectedImages(std::vector& s, int dim) { - return NULL; + std::vector files; + GetTreeViewMap()["Local database"]->GetSelectedAsString(files); + ReadImagesNotThreaded(s,files,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::GetImages(int dim, + const std::vector& files, + std::vector& s) + { + ReadImagesNotThreaded(s,files,dim); + } + //====================================================================== + //================================================= void WxGimmickView::CreateIconList() @@ -349,12 +382,186 @@ namespace creaImageIO } //================================================= - //================================================= + //================================================= + void WxGimmickView::OnSelectionChange(const std::vector& sel, bool isSelection, int selection, bool needProcess) + { + GimmickDebugMessage(5, + "WxGimmickView::OnSelectionChange" + <::const_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 + { + ResetExtent(); + std::vector::const_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(const std::vector& sel) + { + GimmickDebugMessage(5, + "ReadImageThreaded" + <0) + { + //First load the selected images + mCurImageItemToShow = sel.front(); + pointers.clear(); + int index = 0; + std::vector::const_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(); + ResetExtent(); + } + + //================================================= + + //================================================= void WxGimmickView::OnRemove(wxCommandEvent& event) { //TODO Select current tree handler wxBusyCursor busy; - GetTreeViewMap()["Local database"]->RemoveSelected(1); + GetTreeViewMap()["Local database"]->RemoveSelected(); + + ClearSelection(); } //================================================= @@ -406,6 +613,7 @@ namespace creaImageIO */ wxMessageBox(std2wx(mess.str()),_T("Addition result"),wxOK,this); } + //================================================= //================================================= @@ -413,7 +621,7 @@ namespace creaImageIO EVT_TOOL(TOOL_ADDFILES_ID, WxGimmickView::OnAddFiles) EVT_TOOL(TOOL_ADDDIR_ID, WxGimmickView::OnAddDir) EVT_TOOL(TOOL_REMOVE_ID, WxGimmickView::OnRemove) - END_EVENT_TABLE() + END_EVENT_TABLE() //================================================= } // EO namespace creaImageIO