X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=src2%2FcreaImageIOWxGimmickView.cpp;h=f60480e8365f0762b610b088c582cd52d15eadba;hb=b573a12c2f9e5c887ae36166c531fb17cdb7db8f;hp=a21617c744a831daa3727994dcbd2338e9e60a93;hpb=6cac83c30fb8c3cd89c41685078eccff6e952a50;p=creaImageIO.git

diff --git a/src2/creaImageIOWxGimmickView.cpp b/src2/creaImageIOWxGimmickView.cpp
index a21617c..f60480e 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
@@ -66,7 +67,8 @@ namespace creaImageIO
 			       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);
@@ -96,36 +98,57 @@ namespace creaImageIO
     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(wxVERTICAL); //HORIZONTAL);
+    
+    
+    // Previewer
+    mViewer = new WxViewer(mBottomPanel, wxID_ANY, wxT("Gimmick! Viewer"),wxDefaultPosition, wxDefaultSize );
+	pointers.push_back(new ImagePointerHolder(GetDefaultImage()));
+	mViewer->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 = 15;
+
+    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;
   }
   //======================================================================
 
@@ -133,6 +156,8 @@ namespace creaImageIO
   /// Destructor
   WxGimmickView::~WxGimmickView()
   {
+	// stop the viewer before application exit.
+	mViewer->StopPlayer();
     GimmickDebugMessage(1,"WxGimmickView::~WxGimmickView"
 			<<std::endl);
   }
@@ -186,7 +211,7 @@ namespace creaImageIO
     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
@@ -196,28 +221,33 @@ namespace creaImageIO
     mNotebook->AddPage( view, crea::std2wx(name) );
 
   }
-  //======================================================================
-  /// 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<vtkImageData*>& s, int dim)
   {
-	int level=GetTreeViewMap()["Local database"]->GetNumberOfLevels();
-	std::vector<tree::Node*> im=GetTreeViewMap()["Local database"]->GetSelected(level+1);
-	ReadImagesNotThreaded(s,im,dim);
+	std::vector<std::string> 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::GetSelectedFiles(std::vector<std::string>& s)
   {
 	GetTreeViewMap()["Local database"]->GetSelectedAsString(s);
   }
+  //======================================================================
+
+  //======================================================================
+  void WxGimmickView::GetImages(int dim, 
+				const std::vector<std::string>& files, 
+				std::vector<vtkImageData*>& s)
+  {
+	ReadImagesNotThreaded(s,files,dim);
+  }
+  //======================================================================
+
+
   //=================================================
   void WxGimmickView::CreateIconList()
   {
@@ -319,6 +349,7 @@ namespace creaImageIO
       {
 	
 	bool recurse = false;
+
 	if (wxMessageBox(_T("Recurse into sub-directories ?"),
 			 _T("Scan directory"),
 			 wxYES_NO,this ) == wxYES)
@@ -355,21 +386,61 @@ namespace creaImageIO
   //=================================================
 
   //=================================================
-  bool WxGimmickView::ValidateSelection(void * s)
+  void WxGimmickView::OnSelectionChange(const std::vector<tree::Node*>& sel, bool isSelection, int selection, bool needProcess)
   {      
+    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)
+	bool valid=true;
+	
+	if(sel.size()==0)
+	{
+		
+		valid= ValidateSelected(NULL,
+				mSelectionMinDimension,
+				mSelectionMaxDimension );
+	}
+	else if(needProcess)
+	{
+		ResetExtent();
+		std::vector<tree::Node*>::const_iterator i;
+		for(i=sel.begin();i!=sel.end()&&valid;++i)
+		{
+			valid= ValidateSelected((*i),
+				mSelectionMinDimension,
+				mSelectionMaxDimension );
+		}
+	}
+	else if(isSelection)
 	{
-		ReadImageThreaded(sel);
+		valid= ValidateSelected(sel.front(),
+				mSelectionMinDimension,
+				mSelectionMaxDimension );
 	}
 	else
 	{
-		mViewer->Hide();
+		ResetExtent();
+		std::vector<tree::Node*>::const_iterator i;
+		for(i=sel.begin();i!=sel.end()&&valid;++i)
+		{
+			valid= ValidateSelected((*i),
+				mSelectionMinDimension,
+				mSelectionMaxDimension );
+		}
 	}
-	return valid;
+	
+    mText->SetLabel(crea::std2wx(GetMessage()));
+    /*if(valid)
+      {
+	ReadImageThreaded(sel);
+      }
+    else
+      {
+		  ClearSelection();
+      }*/
+	ReadImageThreaded(sel);
+
     
    }
 
@@ -377,27 +448,37 @@ namespace creaImageIO
 
   //==================================================
   ///Reads Images (Threaded)
-  void WxGimmickView::ReadImageThreaded(std::vector<tree::Node*> sel)
+  void WxGimmickView::ReadImageThreaded(const std::vector<tree::Node*>& sel)
   {	
-	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--;
-	}
-	
+   GimmickDebugMessage(5,
+		       "ReadImageThreaded"
+		       <<std::endl);
+   int maxprio = GetMaximalPriority();
+   int prio = maxprio + 2000;
+
+   if(sel.size()>0)
+   {
+   //First load the selected images
+   mCurImageItemToShow = sel.front();
+   pointers.clear();
+   int index = 0;
+   std::vector<tree::Node*>::const_iterator selected;
+   for(selected=sel.begin();selected!=sel.end();++selected)
+     {
+       GimmickDebugMessage(5,
+			   "Requesting image from selected "
+			   <<(*selected)->GetAttribute("FullFileName")
+			   <<std::endl);
+	   ImagePointerHolder* ph=new ImagePointerHolder(GetDefaultImage());
+	   pointers.push_back(ph);
+       RequestReading(*selected,prio,index,ph);
+       //       AddEntryToMap(*selected);
+       prio--;
+       index++;
+     }
+	mViewer->SetImageVector(pointers);
 	//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;
@@ -407,13 +488,15 @@ namespace creaImageIO
 				"Requesting image from neighbors up "
 				<<(*iterUp)->GetAttribute("FullFileName")
 				<<std::endl);
-		RequestReading(*iterUp,prio);
-		AddEntryToMap(*iterUp);
+		ImagePointerHolder* ph=new ImagePointerHolder(GetDefaultImage());
+		RequestReading(*iterUp,prio,-1,ph);
+		//		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;
@@ -423,65 +506,53 @@ namespace creaImageIO
 				"Requesting image from neighbors down "
 				<<(*iterDown)->GetAttribute("FullFileName")
 				<<std::endl);
-		RequestReading(*iterDown,prio);
-		AddEntryToMap(*iterDown);
+		ImagePointerHolder* ph=new ImagePointerHolder(GetDefaultImage());
+		RequestReading(*iterDown,prio,-1,ph);
+		//		AddEntryToMap(*iterDown);
 		prio--;
-	}	
+		if (prio == maxprio) break;
+	}
+   }
+   else
+   {
+	   pointers.clear();
+	   ImagePointerHolder* ph=new ImagePointerHolder(GetDefaultImage());
+	   pointers.push_back(ph);
+	   mViewer->SetImageVector(pointers);
+   }
   }
 
   //==================================================
 
   //==================================================
-  /// 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);
-    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()))
-	  {
-		mViewer->ShowImages();
-		mViewer->Show();
-	  }
-    ClearQueue();
-	
-
-    MultiThreadImageReaderEventUnlock();
-	GimmickDebugMessage(5,
-				"Processing Images. Lock Ended"
-				<<std::endl);
-  }
- 
   //==================================================
+   void  WxGimmickView::OnInternalIdle()
+  {
+   if (!mConstructed) return;
+   static bool first_time = true;
+   if (false)
+   {
+  	first_time = false;
+     }
+   //   GimmickMessage(1,"WxGimmickView : Refresh viewer"<<std::endl);
+	//  mViewer->StartPlayer();
+   if(mViewer)
+   {
+	   mViewer->RefreshIfNecessary();
+   }
+  }
+
+   //==================================================
 
   //==================================================
-   void  WxGimmickView::OnInternalIdle()
+   void  WxGimmickView::ClearSelection()
   {
-    ProcessImageEvents();
+	pointers.clear();
+	pointers.push_back(new ImagePointerHolder(GetDefaultImage()));
+	mViewer->SetImageVector(pointers);
+	mViewer->RefreshIfNecessary();
+	ResetExtent();
   }
   
   //=================================================
@@ -491,7 +562,9 @@ namespace creaImageIO
   {
 	//TODO Select current tree handler       
     wxBusyCursor busy;
-    GetTreeViewMap()["Local database"]->RemoveSelected(1);
+    GetTreeViewMap()["Local database"]->RemoveSelected();
+
+	ClearSelection();
   }
   //=================================================
 
@@ -501,7 +574,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(),