int number_of_threads)
: wxPanel(parent,id,pos,size),
GimmickView(gimmick, number_of_threads),
- mProgressDialog(0)
+ mProgressDialog(0),
+ mConstructed(false)
{
GimmickDebugMessage(1,"WxGimmickView::WxGimmickView"
<<std::endl);
mNotebook = new wxNotebook(mSplitter,
-1,wxDefaultPosition, wxDefaultSize, 0);
- //Gimmick
- mGimmick=gimmick;
- mViewer=new WxViewer(this, wxID_ANY, wxT("Gimmick! Viewer"),wxDefaultPosition, wxDefaultSize );
-
-
- mSelectionMaxDimension= max_dim;
- mSelectionMinDimension= min_dim;
+ //Gimmick
+ mGimmick=gimmick;
+
+ mSelectionMaxDimension= max_dim;
+ mSelectionMinDimension= min_dim;
+
// Create the views
CreateTreeViews();
// Bottom panel
mBottomPanel = new wxPanel(mSplitter,-1);
- mText = new wxStaticText(mBottomPanel, wxID_ANY, wxT("Status: Welcome to Gimmick!"));
-
+
+ wxBoxSizer *bottom_sizer = new wxBoxSizer(wxHORIZONTAL);
+
+ mText = new wxStaticText(mBottomPanel, wxID_ANY, wxT("Status: Welcome to Gimmick!"));
+ bottom_sizer->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 = 15;
SetSizer( sizer );
SetAutoLayout(true);
Layout();
-
+
+ mConstructed = true;
}
//======================================================================
GimmickMessage(2,"Creating the tree view for '"<<
name<<"'"<<std::endl);
// Create the WxTreeView
- WxTreeView* view = new WxTreeView(h,mNotebook,-1);
+ WxTreeView* view = new WxTreeView(h,this,mNotebook,-1);
// TO DO : TEST THAT A VIEW WITH SAME NAME IS NOT
// ALREADY IN THE MAP
//=================================================
//=================================================
- bool WxGimmickView::ValidateSelection(void * s)
+ void WxGimmickView::OnSelectionChange(std::vector<tree::Node*>& sel)
{
+ GimmickDebugMessage(5,
+ "WxGimmickView::OnSelectionChange"
+ <<std::endl);
wxBusyCursor busy;
- std::vector<tree::Node*> sel=* (std::vector<tree::Node*> *) s;
- bool valid=ValidateSelected(sel,mSelectionMinDimension,mSelectionMaxDimension );
- mText->SetLabel(_T("Status: ")+GetMessage());
- if(valid)
- {
- ReadImageThreaded(sel);
- }
- else
- {
- mViewer->Hide();
- }
- return valid;
+ bool valid = ValidateSelected(sel,
+ mSelectionMinDimension,
+ mSelectionMaxDimension );
+ mText->SetLabel(_T("Status: ")+crea::std2wx(GetMessage()));
+ if(valid)
+ {
+ ReadImageThreaded(sel);
+ }
+ else
+ {
+ mViewer->SetMovieSize(1);
+ mViewer->SetImage(0,GetDefaultImage());
+ // mViewer->Hide();
+ }
+
}
///Reads Images (Threaded)
void WxGimmickView::ReadImageThreaded(std::vector<tree::Node*> sel)
{
- int maxprio = GetMaximalPriority();
- int prio = maxprio + 2000;
+ GimmickDebugMessage(5,
+ "ReadImageThreaded"
+ <<std::endl);
+ int maxprio = GetMaximalPriority();
+ int prio = maxprio + 2000;
- //First load the selected images
- mCurImageItemToShow = sel.front();
- std::vector<tree::Node*>::iterator selected;
- for(selected=sel.begin();selected!=sel.end();++selected)
- {
- GimmickDebugMessage(5,
- "Requesting image from selected "
- <<(*selected)->GetAttribute("FullFileName")
- <<std::endl);
- RequestReading(*selected,prio);
- AddEntryToMap(*selected);
- prio--;
- }
+ mViewer->SetMovieSize(sel.size());//ClearImages();
+
+ //First load the selected images
+ mCurImageItemToShow = sel.front();
+ int index = 0;
+ std::vector<tree::Node*>::iterator selected;
+ for(selected=sel.begin();selected!=sel.end();++selected)
+ {
+ GimmickDebugMessage(5,
+ "Requesting image from selected "
+ <<(*selected)->GetAttribute("FullFileName")
+ <<std::endl);
+ RequestReading(*selected,prio,index);
+ // AddEntryToMap(*selected);
+ prio--;
+ index++;
+ }
//Going up
- prio = maxprio + 1000;
+ prio = maxprio + 20;
std::vector<tree::Node*> up;
GetTreeViewMap()["Local database"]->GetNodes(up,true);
std::vector<tree::Node*>::iterator iterUp;
"Requesting image from neighbors up "
<<(*iterUp)->GetAttribute("FullFileName")
<<std::endl);
- RequestReading(*iterUp,prio);
- AddEntryToMap(*iterUp);
+ RequestReading(*iterUp,prio,-1);
+ // AddEntryToMap(*iterUp);
prio--;
+ if (prio == maxprio) break;
}
//Going down
- prio = maxprio + 999;
+ prio = maxprio + 19;
std::vector<tree::Node*> down;
GetTreeViewMap()["Local database"]->GetNodes(down,false);
std::vector<tree::Node*>::iterator iterDown;
"Requesting image from neighbors down "
<<(*iterDown)->GetAttribute("FullFileName")
<<std::endl);
- RequestReading(*iterDown,prio);
- AddEntryToMap(*iterDown);
+ RequestReading(*iterDown,prio,-1);
+ // AddEntryToMap(*iterDown);
prio--;
+ if (prio == maxprio) break;
}
}
/// Processes the queue of image events
void WxGimmickView::ProcessImageEvents()
{
- int level=GetTreeViewMap()["Local database"]->GetNumberOfLevels();
- std::vector<tree::Node*> sel=GetTreeViewMap()["Local database"]->GetSelected(level+1);
- GimmickDebugMessage(5,
- "Processing Images. Lock Started"
- <<std::endl);
+ if (!mConstructed) return;
+
+ // int level=GetTreeViewMap()["Local database"]->GetNumberOfLevels();
+ // std::vector<tree::Node*> sel=GetTreeViewMap()["Local database"]->GetSelected(level+1);
+ /*
+ GimmickDebugMessage(5,
+ "Processing Images. Lock Started"
+ <<std::endl);
+ */
MultiThreadImageReaderEventLock();
+
- mViewer->ClearImages();
while (!IsQueueEmpty())
{
- vtkImageData* image=GetNextImageQueued();
- tree::Node* node=GetNextNodeQueued();
- if( image!=0 )
- {
- bool found=false;
- std::vector<tree::Node*>::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,
+ "Queue not empty"
+ <<std::endl);
+
+ vtkImageData* image = GetNextImageQueued();
+ if( image!=0 )
{
- mViewer->ShowImages();
- mViewer->Show();
+ int index = GetNextSelectionIndexQueued();
+ if (index>=0)
+ {
+ mViewer->SetImage(index,image);
+ }
+ /*
+ tree::Node* node=GetNextNodeQueued();
+
+
+ bool found=false;
+ std::vector<tree::Node*>::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"
+ <<std::endl);
+ // mViewer->ShowImages();
+ // mViewer->Show();
+ }
+ */
ClearQueue();
MultiThreadImageReaderEventUnlock();
+ /*
GimmickDebugMessage(5,
"Processing Images. Lock Ended"
<<std::endl);
+ */
}
//==================================================
//==================================================
void WxGimmickView::OnInternalIdle()
{
- ProcessImageEvents();
+ if (!mConstructed) return;
+ ProcessImageEvents();
+ // mViewer->Refresh();
}
//=================================================
git://git.creatis.insa-lyon.fr / creaImageIO.git / blobdiff