From 6b4e3e7339b74e8ed5d77b22dc6af8b2cee30a5a Mon Sep 17 00:00:00 2001 From: jean-pierre roux Date: Mon, 12 Oct 2009 22:53:15 +0000 Subject: [PATCH] Allow MHD convertion --- bbtk/src/bbcreaImageIOGimmick.xml_v2 | 23 +++++++++--------- src2/creaImageIOWxGimmickTools.cpp | 35 ++++++++++++++++++++-------- src2/creaImageIOWxGimmickTools.h | 14 ++++++----- src2/creaImageIOWxGimmickView.cpp | 2 +- src2/creaImageIOWxGimmickView.h | 4 ++-- 5 files changed, 48 insertions(+), 30 deletions(-) diff --git a/bbtk/src/bbcreaImageIOGimmick.xml_v2 b/bbtk/src/bbcreaImageIOGimmick.xml_v2 index 4628f10..5d2cd54 100644 --- a/bbtk/src/bbcreaImageIOGimmick.xml_v2 +++ b/bbtk/src/bbcreaImageIOGimmick.xml_v2 @@ -15,17 +15,18 @@ - - - - - - 
typedef std::vector OutputFilesType;
 + + + + + + + 
typedef std::vector   OutputFilesType; 
typedef std::vector OutputImagesType;
 - - - + + + @@ -61,9 +62,9 @@ { // if (bbGetOutputOut()!=0) // { - // bbGetOutputOut()->Delete(); +// bbGetOutputOut()->Delete(); // bbSetOutputOut(0); -// } +// } } diff --git a/src2/creaImageIOWxGimmickTools.cpp b/src2/creaImageIOWxGimmickTools.cpp index fc978c7..6bbcec2 100644 --- a/src2/creaImageIOWxGimmickTools.cpp +++ b/src2/creaImageIOWxGimmickTools.cpp @@ -11,21 +11,25 @@ namespace creaImageIO { _currentDir = mCurrentDirectory; _addFiles = true; + _mhd = false; - _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?") ); + _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(140,30) ); - wxButton *outputDir = new wxButton(this,wxID_ANY,_T("Output Directory"), wxDefaultPosition, wxSize(140,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 format.")), 1, wxGROW ); + 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 *sizer = new wxFlexGridSizer(2,5); @@ -38,10 +42,11 @@ namespace creaImageIO 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(); @@ -62,10 +67,15 @@ namespace creaImageIO return _outputPath->GetValue(); } - bool WxGimmickTools::getCheckBoxValue() + bool WxGimmickTools::getAddToDBCheckBoxValue() { return _addCheckBox->GetValue(); } + + bool WxGimmickTools::getMHDCheckBoxValue() + { + return _mhdCheckBox->GetValue(); + } void WxGimmickTools::onInputDir(wxCommandEvent& event) { @@ -93,6 +103,11 @@ namespace creaImageIO { _addFiles = _addCheckBox->GetValue(); } + + void WxGimmickTools::onMHD(wxCommandEvent& event) + { + _mhd = _mhdCheckBox->GetValue(); + } } // EO namespace creaImageIO diff --git a/src2/creaImageIOWxGimmickTools.h b/src2/creaImageIOWxGimmickTools.h index d4ec04d..88e862f 100644 --- a/src2/creaImageIOWxGimmickTools.h +++ b/src2/creaImageIOWxGimmickTools.h @@ -11,7 +11,7 @@ namespace creaImageIO * \ingroup Tools */ //===================================================================== - + //===================================================================== class WxGimmickTools : public wxPanel @@ -19,21 +19,23 @@ namespace creaImageIO public: WxGimmickTools(wxWindow *parent, wxString mCurrentDirectory); ~WxGimmickTools(); - + wxString getInputDir(); wxString getOutputDir(); - bool getCheckBoxValue(); - + bool getAddToDBCheckBoxValue(); + bool getMHDCheckBoxValue(); private: - wxCheckBox * _addCheckBox; + wxCheckBox * _addCheckBox; + wxCheckBox * _mhdCheckBox; wxTextCtrl * _inputPath; wxTextCtrl * _outputPath; wxString _currentDir; bool _addFiles; + bool _mhd; void onInputDir(wxCommandEvent& event); void onOutputDir(wxCommandEvent& event); void onAddToDatabase(wxCommandEvent& event); - + void onMHD(wxCommandEvent& event); }; } // EO namespace creaImageIO diff --git a/src2/creaImageIOWxGimmickView.cpp b/src2/creaImageIOWxGimmickView.cpp index bc12bf4..f187dec 100644 --- a/src2/creaImageIOWxGimmickView.cpp +++ b/src2/creaImageIOWxGimmickView.cpp @@ -829,7 +829,7 @@ namespace creaImageIO std::string inputDir = crea::wx2std(gimmickTools->getInputDir()); std::string outputDir = crea::wx2std(gimmickTools->getOutputDir()); - bool addToDB = gimmickTools->getCheckBoxValue(); + bool addToDB = gimmickTools->getAddToDBCheckBoxValue(); if (inputDir.compare("")!=0 && outputDir.compare("")!=0) { diff --git a/src2/creaImageIOWxGimmickView.h b/src2/creaImageIOWxGimmickView.h index f08e937..53dcf77 100644 --- a/src2/creaImageIOWxGimmickView.h +++ b/src2/creaImageIOWxGimmickView.h @@ -69,9 +69,9 @@ namespace creaImageIO ///Resets the default image void ClearSelection(); ///Copies selected files - void CopyFiles(const std::vector& filenames); + void CopyFiles(const std::vector& filenames); ///Add selected files to the Database - void AddDir(std::string dirName); + void AddDir(std::string dirName); ///Sends a request to read the currently selected node and the ones that surround it. -- 2.45.1