X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=src2%2FcreaImageIOWxGimmickView.cpp;h=5b87845400cd574b220c6011c5294055a1d05f05;hb=ab4f051eca01a4340f78587f97e89eeb46a8d8a7;hp=cec329ba94ba9d9bc30c8651f121d8255b627930;hpb=2f0e50f69eb904d629cf8db62eb9a4094db93097;p=creaImageIO.git diff --git a/src2/creaImageIOWxGimmickView.cpp b/src2/creaImageIOWxGimmickView.cpp index cec329b..5b87845 100644 --- a/src2/creaImageIOWxGimmickView.cpp +++ b/src2/creaImageIOWxGimmickView.cpp @@ -12,9 +12,11 @@ using namespace crea; #include "icons/help.xpm" #include +#include namespace creaImageIO { + //====================================================================== // The ids of the different tools enum @@ -63,11 +65,11 @@ namespace creaImageIO const wxPoint& pos, const wxSize& size, int min_dim, int max_dim, - int out_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; } //====================================================================== @@ -132,6 +157,8 @@ namespace creaImageIO /// Destructor WxGimmickView::~WxGimmickView() { + // stop the viewer before application exit. + mViewer->StopPlayer(); GimmickDebugMessage(1,"WxGimmickView::~WxGimmickView" <GetTree().GetAttribute("Name")); GimmickMessage(2,"Creating the tree view for '"<< name<<"'"<SetMaxDimension(mSelectionMaxDimension); - view->SetMinDimension(mSelectionMinDimension); - view->SetOutputDimension(mOutputDimension); + WxTreeView* view = new WxTreeView(h,tdh,this,mNotebook,-1); // TO DO : TEST THAT A VIEW WITH SAME NAME IS NOT // ALREADY IN THE MAP @@ -199,22 +222,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() @@ -256,6 +289,7 @@ namespace creaImageIO //================================================= void WxGimmickView::OnAddFiles(wxCommandEvent& event) { + mViewer->StopPlayer(); long style = wxOPEN | wxFILE_MUST_EXIST | wxFD_MULTIPLE; std::string wc("*.*"); wxFileDialog* FD = new wxFileDialog( 0, @@ -298,14 +332,16 @@ namespace creaImageIO UpdateTreeViewLevel("Local database",1); delete mProgressDialog; DisplayAddSummary(); + } - + mViewer->StartPlayer(); } //================================================= //================================================= void WxGimmickView::OnAddDir(wxCommandEvent& event) { + mViewer->StopPlayer(); long style = wxDD_DEFAULT_STYLE | wxDD_DIR_MUST_EXIST; wxDirDialog* FD = new wxDirDialog( 0, @@ -315,49 +351,241 @@ namespace creaImageIO if (FD->ShowModal()==wxID_OK) { + - bool recurse = false; - if (wxMessageBox(_T("Recurse into sub-directories ?"), - _T("Scan directory"), - wxYES_NO,this ) == wxYES) - { - recurse = true; + std::string dirname = wx2std (FD->GetPath()); + bool recurse = isNeedRecursive(dirname); + if (recurse) + { + recurse = wxMessageBox(_T("Recurse into sub-directories ?"), _T("Scan directory"), wxYES_NO,this ) == wxYES ? true : false; + } + + wxBusyCursor busy; + wxString title(_T("Adding directory")); + if (recurse) + title = _T("Adding directory (recursive)"); + mProgressDialog = + new wxProgressDialog(_T("Adding directory"), + _T(""), + 1000, + this, + wxPD_ELAPSED_TIME | + // wxPD_ESTIMATED_TIME | + // wxPD_REMAINING_TIME | + wxPD_CAN_ABORT ); + + mCurrentDirectory = FD->GetPath(); + + // TO DO : select the current tree handler + mGimmick->AddDir("Local database",dirname,recurse); + + mProgressDialog->Pulse(_T("Updating view...")); + + UpdateTreeViewLevel("Local database",1); + delete mProgressDialog; + DisplayAddSummary(); + } - - wxBusyCursor busy; - wxString title(_T("Adding directory")); - if (recurse) - title = _T("Adding directory (recursive)"); - mProgressDialog = - new wxProgressDialog(_T("Adding directory"), - _T(""), - 1000, - this, - wxPD_ELAPSED_TIME | - // wxPD_ESTIMATED_TIME | - // wxPD_REMAINING_TIME | - wxPD_CAN_ABORT ); - std::string dirname = wx2std (FD->GetPath()) ; - mCurrentDirectory = FD->GetPath(); - - // TO DO : select the current tree handler - mGimmick->AddDir("Local database",dirname,recurse); + mViewer->StartPlayer(); + } + + //================================================= + // Test a directory to know if contains sub-directory to analyze + bool WxGimmickView::isNeedRecursive(std::string i_name) + { + boost::filesystem::directory_iterator iter(i_name), end_iter; + bool bfindir = false; + for(; iter != end_iter; ++iter) + { + if(boost::filesystem::is_directory(*iter)) + { + return true; + } + } + return false; + } + //================================================= + + //================================================= + void WxGimmickView::OnSelectionChange(const std::vector& sel, bool isSelection, int selection, bool needProcess) + { + GimmickDebugMessage(5, + "WxGimmickView::OnSelectionChange" + <Pulse(_T("Updating view...")); + if(sel.size()==0) + { + + valid= ValidateSelected(NULL, + mSelectionMinDimension, + mSelectionMaxDimension ); + } + else if(needProcess) + { + ResetExtent(); + std::vector::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 ); + } + } - UpdateTreeViewLevel("Local database",1); - delete mProgressDialog; - DisplayAddSummary(); + 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 + //TODO Select current tree handler wxBusyCursor busy; - GetTreeViewMap()["Local database"]->RemoveSelected(1); + GetTreeViewMap()["Local database"]->RemoveSelected(); + + ClearSelection(); } //================================================= @@ -367,7 +595,8 @@ namespace creaImageIO { char mess[200]; - sprintf(mess,"%i dirs - %i files - %i handled - %i added", + + sprintf(mess,"%i dirs : %i files :\n %i handled - %i added", p.GetNumberScannedDirs(), p.GetNumberScannedFiles(), p.GetNumberHandledFiles(), @@ -409,6 +638,7 @@ namespace creaImageIO */ wxMessageBox(std2wx(mess.str()),_T("Addition result"),wxOK,this); } + //================================================= //================================================= @@ -416,7 +646,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