+/*
+# ---------------------------------------------------------------------
+#
+# 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"
wxString i_title,
const std::string i_namedescp ,
const std::string i_namedb)
- : wxDialog(parent, -1,_T("SELECT IMAGE(S)"), wxDefaultPosition, wxSize(230,150))
+ : wxDialog(parent, -1,_T("SELECT IMAGE(S)"), wxDefaultPosition, wxSize(500,300))
{
namedescp = i_namedescp;
namedb = i_namedb;
this->SetTitle(i_title);
}
// Button to select file(s)
- wxButton *fileBut = new wxButton(this, -1,_T("Select a single file"), wxPoint(10,7) );
+ wxButton *fileBut = new wxButton(this, -1,_T("Select a single file"), wxPoint(10,10) );
Connect( fileBut->GetId(), wxEVT_COMMAND_BUTTON_CLICKED , (wxObjectEventFunction) &WxSimpleDlg::OnReadFile );
// Button to select directory
- wxButton *directoryBut = new wxButton(this, -1,_T("Select all the files in a directory"), wxPoint(10,40) );
+ wxButton *directoryBut = new wxButton(this, -1,_T("Select all the files in a directory"), wxPoint(10,50) );
Connect( directoryBut->GetId(), wxEVT_COMMAND_BUTTON_CLICKED , (wxObjectEventFunction) &WxSimpleDlg::OnReadDirectory );
// button to select creaImageIO
- wxButton *gimmickBut = new wxButton(this, -1,_T("Select thru Dicom browser"), wxPoint(10,70) );
+ wxButton *gimmickBut = new wxButton(this, -1,_T("Select thru Dicom browser"), wxPoint(10,90) );
Connect( gimmickBut->GetId(), wxEVT_COMMAND_BUTTON_CLICKED , (wxObjectEventFunction) &WxSimpleDlg::OnReadGimmick );
/// \TODO Button to select Bruker directory
void WxSimpleDlg::OnReadFile(wxCommandEvent& event)
{
int resultShowModal;
+//EED 2017-09-16 Migration wxWidgets 2.8 to 3.0
+#if wxMAJOR_VERSION <= 2
wxFileDialog* fileDlg = new wxFileDialog( 0, _T("Select file"), _T(""), _T(""), crea::std2wx("*"), wxOPEN |wxFD_MULTIPLE, wxDefaultPosition);
+#else
+ wxFileDialog* fileDlg = new wxFileDialog( 0, _T("Select file"), _T(""), _T(""), crea::std2wx("*"), wxFD_OPEN |wxFD_MULTIPLE, wxDefaultPosition);
+#endif
resultShowModal = fileDlg->ShowModal();
if ( resultShowModal==wxID_OK )
fileDlg->GetPaths(wxArray);
if(wxArray.size() >0)
{
-
- infoimage=_T("FILE(s):")+wxArray[0];
+ m_results.clear();
+ infoimage = wxArray[0];
+ infoimageSource = _T("FILE(s)");
std::vector<std::string> files;
for( int i = 0; i < wxArray.GetCount(); i++)
{
files.push_back( crea::wx2std(wxArray[i]));
}
- if(!m_view.readFile(files,m_results))
+ if( !m_view.readFile(files , m_attrDicomTags , m_resultsDicomAtr , m_results) )
{
//TO DO WARNING MESSAGE;
}
resultShowModal = dirDlg->ShowModal();
if ( resultShowModal==wxID_OK )
{
- infoimage=_T("DIRECTORY:")+dirDlg->GetPath();
- if(! m_view.readDirectory(crea::wx2std(dirDlg->GetPath()),m_results))
+ m_results.clear();
+ infoimage = dirDlg->GetPath();
+ infoimageSource = _T("DIRECTORY");
+ if(! m_view.readDirectory(crea::wx2std(dirDlg->GetPath()) , m_attrDicomTags , m_resultsDicomAtr , m_results))
{
//TO DO WARNING MESSAGE;
}
WxGimmickReaderDialog dlg(0,-1,
namedescp,
namedb,
- _T("Select image(s) - Gimmick! (c) CREATIS-LRMN 2008"),
+ _T("Select image(s) - Gimmick! (c)"),
wxDefaultPosition,
wxSize(810,750),
GIMMICK_2D_IMAGE_SELECTION,
GIMMICK_3D_IMAGE_SELECTION,
_3D,
- 1);
+ 0);
dlg.ShowModal();
if (dlg.GetReturnCode() == wxID_OK)
{
- std::vector<creaImageIO::OutStrGimmick> out;
- std::vector<std::string> attr;
- dlg.stopReading();
- dlg.getSelected(out, attr,true,"");
+ dlg.stopReading();
+ std::vector<creaImageIO::OutStrGimmick> outStrGimmick;
+ dlg.getSelected(outStrGimmick, m_attrDicomTags,true,"");
m_results.clear();
- int size=out.size();
+ int size=(int)outStrGimmick.size();
int ii;
- if(!bInfo)
- {
+// if(!bInfo)
+// {
for (ii=0;ii<size;ii++)
{
- m_results.push_back(out[ii].img);
+ m_results.push_back(outStrGimmick[ii].img);
+ m_resultsDicomAtr.push_back( outStrGimmick[ii].infos );
}
- }
- else
- {
- for (ii=0;ii<size;ii++)
- {
- m_resultsInfo.push_back(out[ii]);
- }
- }
+// } else {
+// for (ii=0;ii<size;ii++)
+// {
+// m_resultsInfo.push_back(outStrGimmick[ii]);
+// }
+// }
+
+ infoimage = _T("EED Missing info <void> ???");
+ infoimageSource = _T("GIMMICK");
dlg.OnExit();
}
SetReturnCode( dlg.GetReturnCode() );
EndModal( dlg.GetReturnCode() );
}
+//-----------------------------------------------------------------------------
wxString WxSimpleDlg::getInfoImage()
{
return infoimage;
}
+//-----------------------------------------------------------------------------
+ wxString WxSimpleDlg::getInfoImageSource()
+ {
+ return infoimageSource;
+ }
+
//////////////////////////////////////////////////////////////////////
// Return the results vector //
//////////////////////////////////////////////////////////////////////
{
return m_results;
}
-}
+
+//-----------------------------------------------------------------------------
+ std::vector< std::map<std::string, std::string> > WxSimpleDlg::getDicomInfoImagesSelected()
+ {
+ return m_resultsDicomAtr;
+ }
+
+//-----------------------------------------------------------------------------
+ void WxSimpleDlg::SetAttrDicomTags( std::vector<std::string> attr )
+ {
+ m_attrDicomTags=attr;
+ }
+
+
+//-----------------------------------------------------------------------------
+ vtkImageData* WxSimpleDlg::getVolumeSelected()
+ {
+ return m_view.getVolumeSelected( getImagesSelected() );
+ }
+
+} // namespace creaImageIO
git://git.creatis.insa-lyon.fr / creaImageIO.git / blobdiff