X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=src2%2FcreaImageIOWxGimmickView.cpp;h=5b87845400cd574b220c6011c5294055a1d05f05;hb=ab4f051eca01a4340f78587f97e89eeb46a8d8a7;hp=63ff888694a3fd09b8dfe5081687aa8c5e1967dc;hpb=bfe6b2a61bb41b040fb6d49718f1d3558baec84d;p=creaImageIO.git

diff --git a/src2/creaImageIOWxGimmickView.cpp b/src2/creaImageIOWxGimmickView.cpp
index 63ff888..5b87845 100644
--- a/src2/creaImageIOWxGimmickView.cpp
+++ b/src2/creaImageIOWxGimmickView.cpp
@@ -12,6 +12,7 @@ using namespace crea;
 #include "icons/help.xpm"
 
 #include <wx/imaglist.h>
+#include<boost/filesystem/operations.hpp>
 
 namespace creaImageIO
 {
@@ -156,6 +157,8 @@ namespace creaImageIO
   /// Destructor
   WxGimmickView::~WxGimmickView()
   {
+	// stop the viewer before application exit.
+	mViewer->StopPlayer();
     GimmickDebugMessage(1,"WxGimmickView::~WxGimmickView"
 			<<std::endl);
   }
@@ -203,13 +206,13 @@ namespace creaImageIO
  
   //======================================================================
   /// Create the tree view for TreeHandler provided
-  void WxGimmickView::CreateTreeView( TreeHandler* h)
+  void WxGimmickView::CreateTreeView( TreeHandler* h, TimestampDatabaseHandler* tdh)
   {
     std::string name(h->GetTree().GetAttribute("Name"));
     GimmickMessage(2,"Creating the tree view for '"<<
 		   name<<"'"<<std::endl);
     // Create the WxTreeView
-    WxTreeView* view = new WxTreeView(h,this,mNotebook,-1);
+    WxTreeView* view = new WxTreeView(h,tdh,this,mNotebook,-1);
 
     // TO DO : TEST THAT A VIEW WITH SAME NAME IS NOT
     // ALREADY IN THE MAP
@@ -227,16 +230,25 @@ namespace creaImageIO
 	GetTreeViewMap()["Local database"]->GetSelectedAsString(files);
 	ReadImagesNotThreaded(s,files,dim);
   }
+  //======================================================================
+
   //======================================================================
   void WxGimmickView::GetSelectedFiles(std::vector<std::string>& s)
   {
 	GetTreeViewMap()["Local database"]->GetSelectedAsString(s);
   }
   //======================================================================
-  void WxGimmickView::GetImages(int dim, std::vector<std::string> files, std::vector<vtkImageData*>& s)
+
+  //======================================================================
+  void WxGimmickView::GetImages(int dim, 
+				const std::vector<std::string>& files, 
+				std::vector<vtkImageData*>& s)
   {
 	ReadImagesNotThreaded(s,files,dim);
   }
+  //======================================================================
+
+
   //=================================================
   void WxGimmickView::CreateIconList()
   {
@@ -277,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, 
@@ -319,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, 
@@ -336,45 +351,63 @@ 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);
-	
-	mProgressDialog->Pulse(_T("Updating view..."));
-	
-	UpdateTreeViewLevel("Local database",1);
-	delete mProgressDialog;
-	DisplayAddSummary();
-      }
+    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(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"
@@ -392,7 +425,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),
@@ -409,7 +442,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),
@@ -436,7 +469,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"
@@ -450,7 +483,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,7 +581,7 @@ namespace creaImageIO
   //=================================================
   void WxGimmickView::OnRemove(wxCommandEvent& event)
   {
-	//TODO Select current tree handler       
+  	//TODO Select current tree handler       
     wxBusyCursor busy;
     GetTreeViewMap()["Local database"]->RemoveSelected();
 
@@ -562,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(),