X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=src2%2FcreaImageIOWxGimmickView.cpp;h=522b0547258f52655e1b3cc96a00118e30b52e21;hb=62fe686c7ff816464b9b309933030ea88e27338f;hp=c3e2b07c20807c32ca585a052bdc2bfeb4d5120c;hpb=2c6aba33982fcbfe1c9180f615f304cbcf52369c;p=creaImageIO.git

diff --git a/src2/creaImageIOWxGimmickView.cpp b/src2/creaImageIOWxGimmickView.cpp
index c3e2b07..522b054 100644
--- a/src2/creaImageIOWxGimmickView.cpp
+++ b/src2/creaImageIOWxGimmickView.cpp
@@ -6,6 +6,7 @@
 #include <creaImageIOWxEditFieldsPanel.h>
 #include <creaImageIOWxAttributeSelectionPanel.h>
 #include <creaImageIOWxPACSConnectionPanel.h>
+#include <creaImageIOWxDescriptorPanel.h>
 
 using namespace crea;
 // Icons
@@ -36,15 +37,15 @@ namespace creaImageIO
   // The ids of the different tools
   enum
     {
-	  TOOL_CREATEDB_ID = 1,
-      TOOL_ADDFILES_ID = 2,
-      TOOL_ADDDIR_ID = 3,
-	  TOOL_ADDDATABASE_ID = 4,
-      TOOL_REMOVE_ID = 5,
-	  TOOL_SYNCHRONIZE_ID = 6,
-      TOOL_HELP_ID = 7,
-	  TOOL_SETTINGS_ID = 8,
-	  TOOL_TOOLS_ID = 9
+	  TOOL_ADDFILES_ID = 1,
+      TOOL_ADDDIR_ID = 2,
+	  TOOL_ADDDATABASE_ID = 3,
+      TOOL_REMOVE_ID = 4,
+	  TOOL_SYNCHRONIZE_ID = 5,
+      TOOL_HELP_ID = 6,
+	  TOOL_SETTINGS_ID = 7,
+	  TOOL_TOOLS_ID = 8,
+	  TOOL_CREATEDB_ID = 9,
     };
   //======================================================================
 
@@ -204,12 +205,7 @@ namespace creaImageIO
     mToolBar = new wxToolBar(this,-1,wxDefaultPosition,wxDefaultSize,
 			     style);
 
-	mToolAddFile = mToolBar->AddTool( TOOL_CREATEDB_ID, 
-				      _T("Create database"),
-				      mIcon->GetBitmap(Icon_create_database),
-				      _T("Create DB from an Attributes Descriptor file")
-				      );
-    mToolAddFile = mToolBar->AddTool( TOOL_ADDFILES_ID, 
+	mToolAddFile = mToolBar->AddTool( TOOL_ADDFILES_ID, 
 				      _T("Add file(s)"),
 				      mIcon->GetBitmap(Icon_page_down),
 				      _T("Add one or more file to database")
@@ -249,6 +245,12 @@ namespace creaImageIO
 				      mIcon->GetBitmap(Icon_tools),
 				      _T("Applies tools to images")
 				      );
+	mToolAddFile = mToolBar->AddTool( TOOL_CREATEDB_ID, 
+				      _T("Create database"),
+				      mIcon->GetBitmap(Icon_create_database),
+				      _T("Create DB from an Attributes Descriptor file")
+				      );
+
     //const wxBitmap& bitmap1, const wxString& shortHelpString = "", wxItemKind kind = wxITEM_NORMAL)
 
     mToolBar->Realize();
@@ -783,7 +785,8 @@ namespace creaImageIO
   {
 		mViewer->StopPlayer();
 		
-		wxDialog* dial = new wxDialog (this,-1,_T("Tools"),wxDefaultPosition, wxSize(300,250));
+	
+		wxDialog* dial = new wxDialog (this,-1,_T("Tools"),wxDefaultPosition, wxSize(550,350));
 
 		wxSizer* buttonsSizer = dial->CreateSeparatedButtonSizer(wxOK|wxCANCEL);
 		wxNotebook* nb= new wxNotebook(dial, -1, wxDefaultPosition, wxDefaultSize, 0);
@@ -797,6 +800,7 @@ namespace creaImageIO
 			WxGimmickTools * gimmickTools = new WxGimmickTools(nb, mCurrentDirectory);
 			nb->AddPage( gimmickTools, _T("Bruker Image Reader") );
 #endif
+			
 
 		dial->SetSizer(dialSizer, true);
 		dial->Layout();
@@ -1027,21 +1031,6 @@ namespace creaImageIO
     mess << "Files\tscanned\t: " << p.GetNumberScannedFiles() << "\n";
     mess << "Files\thandled\t: " << p.GetNumberHandledFiles() << "\n\n";
     mess << "Files\tadded  \t: " << p.GetNumberAddedFiles()   << "\n\n";
-
-    /*    char times[500];
-    sprintf(times,"Time to parse dir \t\t: %ld ms \t%d°/o\nTime to read files info \t: %ld ms \t%d°/o\nTime to update structs \t: %ld ms \t%d°/o\nTime to update database \t: %ld ms \t%d°/o\nTotal time \t\t\t: %ld ms",
-	    summary.parse_time,
-	    (int)( summary.parse_time*100./summary.total_time),
-	    summary.file_scan_time,
-	    (int)(summary.file_scan_time*100./summary.total_time),
-	    summary.update_structs_time,
-	    (int)(summary.update_structs_time*100./summary.total_time),
-	    summary.update_database_time,
-	    (int)(summary.update_database_time*100./summary.total_time),
-	    summary.total_time );
-    
-    mess << times;
-    */
     wxMessageBox(std2wx(mess.str()),_T("Addition result"),wxOK,this);
   }
 
@@ -1092,38 +1081,29 @@ namespace creaImageIO
   void WxGimmickView::OnCreateDB(wxCommandEvent& event)
   {
     
-	  //Select DB
-	  long style = wxDD_DEFAULT_STYLE | wxDD_DIR_MUST_EXIST;
-	  std::string wc("*.txt");
-	  wxFileDialog* FD = new wxFileDialog( 0, 
-					 _T("Select file"),
-					 _T(""),
-					 _T(""),
-					 crea::std2wx(wc),
-					 style,
-					 wxDefaultPosition);
-    
-    if (FD->ShowModal()==wxID_OK)
-	{
-		wxBusyCursor busy;
-		wxArrayString afile;
-		FD->GetPaths(afile);
-		//get name of DB (file name)
-		std::string file = crea::wx2std(afile[0]);
-		size_t pos = file.find_last_of("\\");
-		std::string name = file.substr(pos+1);
-		std::string directory = file.substr(0,pos);
-		pos = name.find_last_of(".");
-		name = name.substr(0,pos);
-		//get directory to store DB
-		directory +=  "\\" + name + ".sqlite3";
-		//create createDB
-		mGimmick->createDB(name, file,directory);
-		//create TreeHandler
-		mGimmick->addDB(name, directory);
-		//create TreeView
-		CreateSingleTreeView(name);
-	}
+	  WxDescriptorPanel * DescriptorPan = new WxDescriptorPanel(this);
+		DescriptorPan->Layout();
+		if ( DescriptorPan->ShowModal() == ID_DSCP_APPLY)
+		{
+			wxBusyCursor busy;
+			std::string file(DescriptorPan->GetDescriptor());
+			if (!file.empty())
+			{
+				size_t pos = file.find_last_of("\\");
+				std::string name = file.substr(pos+1);
+				std::string directory = file.substr(0,pos);
+				pos = name.find_last_of(".");
+				name = name.substr(0,pos);
+				//get directory to store DB
+				directory +=  "\\" + name + ".sqlite3";
+				//create createDB
+				mGimmick->createDB(name, file,directory);
+				//create TreeHandler
+				mGimmick->addDB(name, directory);
+				//create TreeView
+				CreateSingleTreeView(name);
+			}
+		}
   }
 
    //=================================================