X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=src%2FcreaImageIOWxGimmickView.cpp;h=3bdc716a035281c5246112fb3053f221db311d09;hb=dca2b96642a75acfa6f925ed6f86e146a2ddc3da;hp=d9f727cc56096b3acadd402892a59e2c1943ea98;hpb=80dc7421c0a44fa7f37d19c7c5752ff6d0c0d38c;p=creaImageIO.git

diff --git a/src/creaImageIOWxGimmickView.cpp b/src/creaImageIOWxGimmickView.cpp
index d9f727c..3bdc716 100644
--- a/src/creaImageIOWxGimmickView.cpp
+++ b/src/creaImageIOWxGimmickView.cpp
@@ -324,10 +324,10 @@ namespace creaImageIO
   /// By default if out_infos is empty, we dont' provide informations, we return only vtkImageData 
   /// if out_infos has only one entry "all" we provide all database informations
   void WxGimmickView::getSelectedFiles(std::vector<OutStrGimmick> &outG, std::vector< std::string> i_attr, 
-									  bool mult, const std::string out_model)
+                                       bool mult, const std::string out_model)
   {
 	// First we select the files
-    std::vector<std::string> files;
+        std::vector<std::string> files;
 	std::string db_name = crea::wx2std(mNotebook->GetPageText(mNotebook->GetSelection()));
 	GetTreeViewMap()[crea::wx2std(mNotebook->GetPageText(mNotebook->GetSelection()))]->GetSelectedAsString(files);
 
@@ -925,7 +925,7 @@ namespace creaImageIO
   void WxGimmickView::OnTools(wxCommandEvent& event)
   {
 	mViewer->StopPlayer();
-		
+	
 	wxDialog* dial = new wxDialog (this,-1,_T("Tools"),wxDefaultPosition, wxSize(550,350));
 
 	wxSizer* buttonsSizer = dial->CreateSeparatedButtonSizer(wxOK|wxCANCEL);
@@ -951,12 +951,12 @@ namespace creaImageIO
 		{
 			std::string inputDir  = crea::wx2std(gimmickTools->getInputDir());
 			std::string outputDir = crea::wx2std(gimmickTools->getOutputDir());
-			
+
 			bool addToDB = gimmickTools->getAddToDBCheckBoxValue();
 
 			if (inputDir.compare("")!=0 && outputDir.compare("")!=0)
 			{
-				if ( wxMessageBox(_T("Depending on the amount of Data the process can take between 1 and 5 minutes. Do you want to continue?"),
+				if ( wxMessageBox(_T("Depending on the amount of Data the process can take several minutes. Do you want to continue?"),
 						  _T("Please confirm"), wxICON_QUESTION | wxYES_NO) == wxYES )
 				{
 					Bruker2Dicom b2d;    
@@ -965,17 +965,23 @@ namespace creaImageIO
 					b2d.SetConvertModeToDicom();
 					b2d.verbose=false;
 					b2d.Execute();
-
 					if (addToDB)
 					{
+	std::cout <<"after addToDB" << std::endl;
 						mProgressDialog = new wxProgressDialog(_T("Adding directory"),_T(""),1000,this,wxPD_ELAPSED_TIME |wxPD_CAN_ABORT );
+	std::cout <<"after new wxProgressDialog" << std::endl;						
 						mCurrentDirectory = gimmickTools->getOutputDir();
+	std::cout <<"after gimmickTools->getOutputDir[" <<mCurrentDirectory << std::endl;						
 						mGimmick->AddDir(crea::wx2std(mNotebook->GetPageText(mNotebook->GetSelection())),outputDir,true);
+	std::cout <<"after mGimmick->AddDir" << std::endl;					
 						mProgressDialog->Pulse(_T("Updating view..."));
-
+	std::cout <<"after mProgressDialog->Pulse" << std::endl;
 						UpdateTreeViewLevel(crea::wx2std(mNotebook->GetPageText(mNotebook->GetSelection())),1);
+	std::cout <<"after UpdateTreeViewLevel" << std::endl;						
 						delete mProgressDialog;
+	std::cout <<"after delete mProgressDialog" << std::endl;							
 						DisplayAddSummary();
+	std::cout <<"after dDisplayAddSummary" << std::endl;						
 					}	
 				}
 			}