X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=src2%2FcreaImageIOWxGimmickTools.cpp;h=6bbcec286eefaba0de0912f21b2ee2f1ea43fd28;hb=6ce1377c642f91e9b173b8a5440543eb5320fcd5;hp=f2f082a74f7503795220f7dd6a5f79007cd897c1;hpb=ecd7eb9aca5b98c06f3ce9072b3f73fe71f1e4b0;p=creaImageIO.git

diff --git a/src2/creaImageIOWxGimmickTools.cpp b/src2/creaImageIOWxGimmickTools.cpp
index f2f082a..6bbcec2 100644
--- a/src2/creaImageIOWxGimmickTools.cpp
+++ b/src2/creaImageIOWxGimmickTools.cpp
@@ -1,5 +1,6 @@
 #include <creaImageIOWxGimmickTools.h>
 
+
 namespace creaImageIO
 {
 	/**
@@ -10,37 +11,42 @@ namespace creaImageIO
 	{
 		_currentDir = mCurrentDirectory;
 		_addFiles = true;
+		_mhd      = false;
 
-		_inputPath   = new wxTextCtrl(this, wxID_ANY, _T(""), wxDefaultPosition, wxSize(150,30));
-		_outputPath  = new wxTextCtrl(this, wxID_ANY, _T(""), wxDefaultPosition, wxSize(150,30));
-		_addCheckBox = new wxCheckBox(this, -1,       _T("Add Images to Database?") );
+		_inputPath      = new wxTextCtrl(this, wxID_ANY, _T(""), wxDefaultPosition, wxSize(400,30));
+		_outputPath     = new wxTextCtrl(this, wxID_ANY, _T(""), wxDefaultPosition, wxSize(400,30));
+		_addCheckBox    = new wxCheckBox(this, -1,       _T("Add Images to Database?") );
+		_mhdCheckBox    = new wxCheckBox(this, -1,       _T("Convert to MHD?") );
 		_addCheckBox->SetValue(_addFiles);
+		_mhdCheckBox->SetValue(_mhd);		
 
-		wxButton *inputDir  = new wxButton(this,wxID_ANY,_T("Input Directory"),  wxDefaultPosition, wxSize(150,30) );
-		wxButton *outputDir = new wxButton(this,wxID_ANY,_T("Output Directory"), wxDefaultPosition, wxSize(150,30) );
+		wxButton *inputDir  = new wxButton(this, wxID_ANY,_T("Input Directory"),  wxDefaultPosition, wxSize(140,30) );
+		wxButton *outputDir = new wxButton(this, wxID_ANY,_T("Output Directory"), wxDefaultPosition, wxSize(140,30) );
 
 		Connect( inputDir->GetId(),     wxEVT_COMMAND_BUTTON_CLICKED ,  (wxObjectEventFunction) &WxGimmickTools::onInputDir ); 
 		Connect( outputDir->GetId(),    wxEVT_COMMAND_BUTTON_CLICKED ,  (wxObjectEventFunction) &WxGimmickTools::onOutputDir );
 		Connect( _addCheckBox->GetId(), wxEVT_COMMAND_CHECKBOX_CLICKED, (wxObjectEventFunction) &WxGimmickTools::onAddToDatabase );
+		Connect( _mhdCheckBox->GetId(), wxEVT_COMMAND_CHECKBOX_CLICKED, (wxObjectEventFunction) &WxGimmickTools::onMHD );
+		
+		wxFlexGridSizer *textSizer = new wxFlexGridSizer(1,2);
+		textSizer->Add( new wxStaticText(this, -1, _T("Transform a Bruker image into Dicom / MHD format.")),          1, wxGROW );
+		textSizer->Add( new wxStaticText(this, -1, _T("If checkbox is selected images will be loaded into the DB.")), 1, wxGROW );
 
-		wxFlexGridSizer * textSizer	= new wxFlexGridSizer(1,2);
-		textSizer->Add( new wxStaticText(this,-1,_T("Transform a Bruker image into Dicom format."))  , 1, wxGROW );
-		textSizer->Add( new wxStaticText(this,-1,_T("If checkbox is selected images will be loaded into the DB."))  , 1, wxGROW );
-
-		wxFlexGridSizer * sizer	= new wxFlexGridSizer(2,5);
+		wxFlexGridSizer *sizer	= new wxFlexGridSizer(2,5);
 		sizer->Add( new wxStaticText(this, -1, _T(" ")), 1, wxGROW );
 		sizer->Add( new wxStaticText(this, -1, _T(" ")), 1, wxGROW );
-		sizer->Add( _inputPath, 1, wxGROW );
-		sizer->Add( inputDir, 1, wxGROW );
-		sizer->Add( _outputPath, 1, wxGROW );
-		sizer->Add( outputDir, 1, wxGROW );
+		sizer->Add( _inputPath,   1, wxGROW );
+		sizer->Add( inputDir,     1, wxGROW );
+		sizer->Add( _outputPath,  1, wxGROW );
+		sizer->Add( outputDir,    1, wxGROW );
 		sizer->Add( new wxStaticText(this, -1, _T(" ")), 1, wxGROW );
 		sizer->Add( new wxStaticText(this, -1, _T(" ")), 1, wxGROW );
 		sizer->Add( _addCheckBox, 1, wxGROW );
-
+		sizer->Add( _mhdCheckBox, 1, wxGROW );
+		
 		wxFlexGridSizer *topSizer = new wxFlexGridSizer(1, 2);
 		topSizer->Add( textSizer, 1, wxGROW );
-		topSizer->Add( sizer, 1, wxGROW );
+		topSizer->Add( sizer,     1, wxGROW );
 		this->SetSizer( topSizer );
 		this->SetAutoLayout( true );
 		this->Layout();
@@ -53,18 +59,23 @@ namespace creaImageIO
 
 	wxString WxGimmickTools::getInputDir()
 	{
-		return _inputPath->GetLabel();
+		return _inputPath->GetValue();
 	}
 
 	wxString WxGimmickTools::getOutputDir()
 	{
-		return _outputPath->GetLabel();
+		return _outputPath->GetValue();
 	}
 
-	bool WxGimmickTools::getCheckBoxValue()
+	bool WxGimmickTools::getAddToDBCheckBoxValue()
 	{
 		return _addCheckBox->GetValue();
 	}
+	
+	bool WxGimmickTools::getMHDCheckBoxValue()
+	{
+		return _mhdCheckBox->GetValue();
+	}	
 
 	void WxGimmickTools::onInputDir(wxCommandEvent& event)
 	{
@@ -72,10 +83,8 @@ namespace creaImageIO
 		wxDirDialog* FD = new wxDirDialog( 0, _T("Select the Input Directory"), _currentDir, style);
 			      
 		if (FD->ShowModal()==wxID_OK)
-		{
-			  
+		{  
 			_inputPath->SetValue(FD->GetPath());
-
 		}
 	}
 
@@ -94,6 +103,11 @@ namespace creaImageIO
 	{
 		_addFiles = _addCheckBox->GetValue();
 	}
+	
+	void WxGimmickTools::onMHD(wxCommandEvent& event)
+	{
+		_mhd = _mhdCheckBox->GetValue();
+	}	
 
 } // EO namespace creaImageIO