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

diff --git a/src2/creaImageIOWxGimmickView.cpp b/src2/creaImageIOWxGimmickView.cpp
index cdda6f2..f60480e 100644
--- a/src2/creaImageIOWxGimmickView.cpp
+++ b/src2/creaImageIOWxGimmickView.cpp
@@ -156,6 +156,8 @@ namespace creaImageIO
   /// Destructor
   WxGimmickView::~WxGimmickView()
   {
+	// stop the viewer before application exit.
+	mViewer->StopPlayer();
     GimmickDebugMessage(1,"WxGimmickView::~WxGimmickView"
 			<<std::endl);
   }
@@ -221,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()
   {
@@ -335,6 +349,7 @@ namespace creaImageIO
       {
 	
 	bool recurse = false;
+
 	if (wxMessageBox(_T("Recurse into sub-directories ?"),
 			 _T("Scan directory"),
 			 wxYES_NO,this ) == wxYES)
@@ -371,7 +386,7 @@ namespace creaImageIO
   //=================================================
 
   //=================================================
-  void WxGimmickView::OnSelectionChange(std::vector<tree::Node*>& sel, bool isSelection, int selection, bool needProcess)
+  void WxGimmickView::OnSelectionChange(const std::vector<tree::Node*>& sel, bool isSelection, int selection, bool needProcess)
   {      
     GimmickDebugMessage(5,
 			"WxGimmickView::OnSelectionChange"
@@ -389,7 +404,7 @@ namespace creaImageIO
 	else if(needProcess)
 	{
 		ResetExtent();
-		std::vector<tree::Node*>::iterator i;
+		std::vector<tree::Node*>::const_iterator i;
 		for(i=sel.begin();i!=sel.end()&&valid;++i)
 		{
 			valid= ValidateSelected((*i),
@@ -406,7 +421,7 @@ namespace creaImageIO
 	else
 	{
 		ResetExtent();
-		std::vector<tree::Node*>::iterator i;
+		std::vector<tree::Node*>::const_iterator i;
 		for(i=sel.begin();i!=sel.end()&&valid;++i)
 		{
 			valid= ValidateSelected((*i),
@@ -433,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"
@@ -447,7 +462,7 @@ namespace creaImageIO
    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,
@@ -548,6 +563,7 @@ namespace creaImageIO
 	//TODO Select current tree handler       
     wxBusyCursor busy;
     GetTreeViewMap()["Local database"]->RemoveSelected();
+
 	ClearSelection();
   }
   //=================================================
@@ -558,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(),