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

diff --git a/src2/creaImageIOWxGimmickView.cpp b/src2/creaImageIOWxGimmickView.cpp
index 53aa4a8..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
@@ -115,9 +116,10 @@ namespace creaImageIO
     
     // Previewer
     mViewer = new WxViewer(mBottomPanel, wxID_ANY, wxT("Gimmick! Viewer"),wxDefaultPosition, wxDefaultSize );
-	mViewer->SetMovieSize(1);
-	mViewer->SetImage(0,GetDefaultImage());
-	  mViewer->ShowNextImage();
+	pointers.push_back(new ImagePointerHolder(GetDefaultImage()));
+	mViewer->SetImageVector(pointers);
+	mViewer->StartPlayer();
+
 
     bottom_sizer->Add(mViewer,1,wxGROW,1);
     //    mViewer->Show();
@@ -154,6 +156,8 @@ namespace creaImageIO
   /// Destructor
   WxGimmickView::~WxGimmickView()
   {
+	// stop the viewer before application exit.
+	mViewer->StopPlayer();
     GimmickDebugMessage(1,"WxGimmickView::~WxGimmickView"
 			<<std::endl);
   }
@@ -219,19 +223,31 @@ namespace creaImageIO
   }
 
   //======================================================================
-  /// 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()
   {
@@ -333,6 +349,7 @@ namespace creaImageIO
       {
 	
 	bool recurse = false;
+
 	if (wxMessageBox(_T("Recurse into sub-directories ?"),
 			 _T("Scan directory"),
 			 wxYES_NO,this ) == wxYES)
@@ -369,26 +386,60 @@ namespace creaImageIO
   //=================================================
 
   //=================================================
-  void WxGimmickView::OnSelectionChange(std::vector<tree::Node*>& sel)
+  void WxGimmickView::OnSelectionChange(const std::vector<tree::Node*>& sel, bool isSelection, int selection, bool needProcess)
   {      
     GimmickDebugMessage(5,
 			"WxGimmickView::OnSelectionChange"
 			<<std::endl);
     wxBusyCursor busy;
-    bool valid = ValidateSelected(sel,
-				  mSelectionMinDimension,
-				  mSelectionMaxDimension );
+	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)
+	{
+		valid= ValidateSelected(sel.front(),
+				mSelectionMinDimension,
+				mSelectionMaxDimension );
+	}
+	else
+	{
+		ResetExtent();
+		std::vector<tree::Node*>::const_iterator i;
+		for(i=sel.begin();i!=sel.end()&&valid;++i)
+		{
+			valid= ValidateSelected((*i),
+				mSelectionMinDimension,
+				mSelectionMaxDimension );
+		}
+	}
+	
     mText->SetLabel(crea::std2wx(GetMessage()));
-    if(valid)
+    /*if(valid)
       {
 	ReadImageThreaded(sel);
       }
     else
       {
-	mViewer->SetMovieSize(1);
-	mViewer->SetImage(0,GetDefaultImage());
-	//	mViewer->Hide();
-      }
+		  ClearSelection();
+      }*/
+	ReadImageThreaded(sel);
 
     
    }
@@ -397,7 +448,7 @@ namespace creaImageIO
 
   //==================================================
   ///Reads Images (Threaded)
-  void WxGimmickView::ReadImageThreaded(std::vector<tree::Node*> sel)
+  void WxGimmickView::ReadImageThreaded(const std::vector<tree::Node*>& sel)
   {	
    GimmickDebugMessage(5,
 		       "ReadImageThreaded"
@@ -405,25 +456,27 @@ namespace creaImageIO
    int maxprio = GetMaximalPriority();
    int prio = maxprio + 2000;
 
-   mViewer->SetMovieSize(sel.size());//ClearImages();
-   
+   if(sel.size()>0)
+   {
    //First load the selected images
    mCurImageItemToShow = sel.front();
+   pointers.clear();
    int index = 0;
-   std::vector<tree::Node*>::iterator selected;
- 
+   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);
-       RequestReading(*selected,prio,index);
+	   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 + 20;
 	std::vector<tree::Node*> up;
@@ -435,7 +488,8 @@ namespace creaImageIO
 				"Requesting image from neighbors up "
 				<<(*iterUp)->GetAttribute("FullFileName")
 				<<std::endl);
-		RequestReading(*iterUp,prio,-1);
+		ImagePointerHolder* ph=new ImagePointerHolder(GetDefaultImage());
+		RequestReading(*iterUp,prio,-1,ph);
 		//		AddEntryToMap(*iterUp);
 		prio--;
 		if (prio == maxprio) break;
@@ -452,83 +506,41 @@ namespace creaImageIO
 				"Requesting image from neighbors down "
 				<<(*iterDown)->GetAttribute("FullFileName")
 				<<std::endl);
-		RequestReading(*iterDown,prio,-1);
+		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()
-  {
-    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();
-    
-
-    while (!IsQueueEmpty())
-      {
-		  mViewer->StartPlayer();
-
-	GimmickDebugMessage(5,
-			    "Queue not empty"
-			    <<std::endl);
-	
-	vtkImageData* image = GetNextImageQueued();
-	if( image!=0 ) 
-	  {
-	    int index =  GetNextSelectionIndexQueued();
-	    if (index>=0) 
-	      {
-		mViewer->SetImage(index,image);
-	      }
-	    
-	  }
-	UnqueueNext();
-      }
-    
-    ClearQueue();
-
-    MultiThreadImageReaderEventUnlock();
-    /*
-	GimmickDebugMessage(5,
-				"Processing Images. Lock Ended"
-				<<std::endl);
-    */
-  }
- 
   //==================================================
 
   //==================================================
    void  WxGimmickView::OnInternalIdle()
   {
    if (!mConstructed) return;
-   ProcessImageEvents();
    static bool first_time = true;
    if (false)
-     {
-    	mViewer->SetMovieSize(1);
-	mViewer->SetImage(0,GetDefaultImage());
-	first_time = false;
+   {
+  	first_time = false;
      }
    //   GimmickMessage(1,"WxGimmickView : Refresh viewer"<<std::endl);
 	//  mViewer->StartPlayer();
-   if (mViewer->RefreshIfNecessary())
-     {
-       // mViewer->Refresh();
-       //       mViewer->SetFocus();
-     }
+   if(mViewer)
+   {
+	   mViewer->RefreshIfNecessary();
+   }
   }
 
    //==================================================
@@ -536,9 +548,11 @@ namespace creaImageIO
   //==================================================
    void  WxGimmickView::ClearSelection()
   {
-	mViewer->SetMovieSize(1);
-	mViewer->SetImage(0,GetDefaultImage());
+	pointers.clear();
+	pointers.push_back(new ImagePointerHolder(GetDefaultImage()));
+	mViewer->SetImageVector(pointers);
 	mViewer->RefreshIfNecessary();
+	ResetExtent();
   }
   
   //=================================================
@@ -548,7 +562,8 @@ namespace creaImageIO
   {
 	//TODO Select current tree handler       
     wxBusyCursor busy;
-    GetTreeViewMap()["Local database"]->RemoveSelected(1);
+    GetTreeViewMap()["Local database"]->RemoveSelected();
+
 	ClearSelection();
   }
   //=================================================
@@ -559,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(),