+/*
+# ---------------------------------------------------------------------
+#
+# Copyright (c) CREATIS (Centre de Recherche en Acquisition et Traitement de l'Image
+# pour la Santé)
+# Authors : Eduardo Davila, Frederic Cervenansky, Claire Mouton
+# Previous Authors : Laurent Guigues, Jean-Pierre Roux
+# CreaTools website : www.creatis.insa-lyon.fr/site/fr/creatools_accueil
+#
+# This software is governed by the CeCILL-B license under French law and
+# abiding by the rules of distribution of free software. You can use,
+# modify and/ or redistribute the software under the terms of the CeCILL-B
+# license as circulated by CEA, CNRS and INRIA at the following URL
+# http://www.cecill.info/licences/Licence_CeCILL-B_V1-en.html
+# or in the file LICENSE.txt.
+#
+# As a counterpart to the access to the source code and rights to copy,
+# modify and redistribute granted by the license, users are provided only
+# with a limited warranty and the software's author, the holder of the
+# economic rights, and the successive licensors have only limited
+# liability.
+#
+# The fact that you are presently reading this means that you have had
+# knowledge of the CeCILL-B license and that you accept its terms.
+# ------------------------------------------------------------------------
+*/
+
#include "creaImageIOWxSimpleDlg.h"
-#include "creaImageIOWxGimmickReaderDialog.h"
namespace creaImageIO
{
+
///Ctor
- WxSimpleDlg::WxSimpleDlg(wxWindow *parent, wxString i_title)
- : wxDialog(parent, -1,_T("DISPLAY IMAGES"), wxDefaultPosition, wxSize(230,150))
+ WxSimpleDlg::WxSimpleDlg(wxWindow *parent,
+ wxString i_title,
+ const std::string i_namedescp ,
+ const std::string i_namedb)
+ : wxDialog(parent, -1,_T("SELECT IMAGE(S)"), wxDefaultPosition, wxSize(230,150))
{
+ namedescp = i_namedescp;
+ namedb = i_namedb;
+
if(!i_title.empty())
{
this->SetTitle(i_title);
}
// Button to select file(s)
- wxButton *fileBut = new wxButton(this, -1,_T("Select a file to display"), wxPoint(10,7) );
+ wxButton *fileBut = new wxButton(this, -1,_T("Select a single file"), wxPoint(10,7) );
Connect( fileBut->GetId(), wxEVT_COMMAND_BUTTON_CLICKED , (wxObjectEventFunction) &WxSimpleDlg::OnReadFile );
// Button to select directory
- wxButton *directoryBut = new wxButton(this, -1,_T("Select a directory to display"), wxPoint(10,40) );
+ wxButton *directoryBut = new wxButton(this, -1,_T("Select all the files in a directory"), wxPoint(10,40) );
Connect( directoryBut->GetId(), wxEVT_COMMAND_BUTTON_CLICKED , (wxObjectEventFunction) &WxSimpleDlg::OnReadDirectory );
// button to select creaImageIO
- wxButton *gimmickBut = new wxButton(this, -1,_T("Select Gimmick"), wxPoint(10,70) );
+ wxButton *gimmickBut = new wxButton(this, -1,_T("Select thru Dicom browser"), wxPoint(10,70) );
Connect( gimmickBut->GetId(), wxEVT_COMMAND_BUTTON_CLICKED , (wxObjectEventFunction) &WxSimpleDlg::OnReadGimmick );
- //TO DO Button to select Bruker directory
-
+ /// \TODO Button to select Bruker directory
+ bInfo = false;
Layout();
}
//////////////////////////////////////////////////////////////////////
-// //
+// //
//////////////////////////////////////////////////////////////////////
void WxSimpleDlg::OnReadFile(wxCommandEvent& event)
{
- wxFileDialog* FD = new wxFileDialog( 0, _T("Select file"), _T(""), _T(""), crea::std2wx("*"), wxOPEN |wxFD_MULTIPLE, wxDefaultPosition);
+ int resultShowModal;
+ wxFileDialog* fileDlg = new wxFileDialog( 0, _T("Select file"), _T(""), _T(""), crea::std2wx("*"), wxOPEN |wxFD_MULTIPLE, wxDefaultPosition);
- if (FD->ShowModal()==wxID_OK)
+ resultShowModal = fileDlg->ShowModal();
+ if ( resultShowModal==wxID_OK )
{
wxArrayString wxArray;
- FD->GetPaths(wxArray);
+ fileDlg->GetPaths(wxArray);
if(wxArray.size() >0)
{
+ m_results.clear();
+ infoimage=_T("FILE(s):")+wxArray[0];
std::vector<std::string> files;
for( int i = 0; i < wxArray.GetCount(); i++)
{
{
//TO DO WARNING MESSAGE;
}
- }
- else
- {
+ } else {
// TO DO WARNING MESSAGES
}
}
- Close();
+ SetReturnCode( resultShowModal );
+// Close();
+ EndModal( resultShowModal );
}
//////////////////////////////////////////////////////////////////////
void WxSimpleDlg::OnReadDirectory(wxCommandEvent &event)
{
+ int resultShowModal;
long style = wxDD_DEFAULT_STYLE | wxDD_DIR_MUST_EXIST;
- wxDirDialog* FD = new wxDirDialog( 0, _T("Select the directory to display"), "", style);
+ wxDirDialog* dirDlg = new wxDirDialog( 0, _T("Select the directory to display"), _T(""), style);
- if (FD->ShowModal()==wxID_OK)
+ resultShowModal = dirDlg->ShowModal();
+ if ( resultShowModal==wxID_OK )
{
- if(! m_view.readDirectory(crea::wx2std(FD->GetPath()),m_results))
+ m_results.clear();
+ infoimage=_T("DIRECTORY:")+dirDlg->GetPath();
+ if(! m_view.readDirectory(crea::wx2std(dirDlg->GetPath()),m_results))
{
//TO DO WARNING MESSAGE;
}
}
- Close();
+ SetReturnCode( resultShowModal );
+// Close();
+ EndModal( resultShowModal );
}
//////////////////////////////////////////////////////////////////////
void WxSimpleDlg::OnReadGimmick(wxCommandEvent &event)
{
// Run Gimmick
- WxGimmickReaderDialog dlg(0,-1, "localdatabase_Descriptor.dscp",
- "Local Database", _T("Select image(s) - Gimmick! (c) CREATIS-LRMN 2008"),
+ WxGimmickReaderDialog dlg(0,-1,
+ namedescp,
+ namedb,
+ _T("Select image(s) - Gimmick! (c) CREATIS-LRMN 2008"),
wxDefaultPosition,
wxSize(810,750),
GIMMICK_2D_IMAGE_SELECTION,
dlg.ShowModal();
if (dlg.GetReturnCode() == wxID_OK)
{
- dlg.GetSelectedImages(m_results,3);
+ dlg.stopReading();
+
+ std::vector<creaImageIO::OutStrGimmick> outStrGimmick;
+ std::vector<std::string> attrDicomTags;
+
+ attrDicomTags.push_back("D0028_0010");
+ attrDicomTags.push_back("D0008_0023");
+ attrDicomTags.push_back("D0008_1070");
+ attrDicomTags.push_back("D0019_100e");
+
+ dlg.getSelected(outStrGimmick, attrDicomTags,true,"");
+
+ m_results.clear();
+ int size=(int)outStrGimmick.size();
+ int ii;
+// if(!bInfo)
+// {
+ for (ii=0;ii<size;ii++)
+ {
+ m_results.push_back(outStrGimmick[ii].img);
+ printf("EED WxSimpleDlg::OnReadGimmick D0028_0010 %s\n", outStrGimmick[ii].infos.find("D0028_0010")->second.c_str() );
+ printf("EED WxSimpleDlg::OnReadGimmick D0008_0023 %s\n", outStrGimmick[ii].infos.find("D0008_0023")->second.c_str() );
+ printf("EED WxSimpleDlg::OnReadGimmick D0008_1070 %s\n", outStrGimmick[ii].infos.find("D0008_1070")->second.c_str() );
+ printf("EED WxSimpleDlg::OnReadGimmick D0019_100e %s\n", outStrGimmick[ii].infos.find("D0019_100e")->second.c_str() );
+ m_resultsDicomAtr.push_back( outStrGimmick[ii].infos );
+ }
+// } else {
+// for (ii=0;ii<size;ii++)
+// {
+// m_resultsInfo.push_back(outStrGimmick[ii]);
+// }
+// }
+
dlg.OnExit();
}
- Close();
+ SetReturnCode( dlg.GetReturnCode() );
+ EndModal( dlg.GetReturnCode() );
}
+ wxString WxSimpleDlg::getInfoImage()
+ {
+ return infoimage;
+ }
//////////////////////////////////////////////////////////////////////
// Return the results vector //
{
return m_results;
}
+
+ std::vector< std::map<std::string, std::string> > WxSimpleDlg::getDicomInfoImagesSelected()
+ {
+ return m_resultsDicomAtr;
+ }
+
+
}
git://git.creatis.insa-lyon.fr / creaImageIO.git / blobdiff