From 758643070bd81cba668e856558e27cc389090a84 Mon Sep 17 00:00:00 2001 From: Frederic Cervenansky Date: Wed, 25 May 2011 15:06:16 +0000 Subject: [PATCH] *** empty log message *** --- ...bbcreaImageIOItkImagesChooserDialogBox.cxx | 12 ++++---- src/creaImageIOWxPACSConnectionPanel.cpp | 29 ++++++++++++++++--- 2 files changed, 31 insertions(+), 10 deletions(-) diff --git a/bbtk/src/bbcreaImageIOItkImagesChooserDialogBox.cxx b/bbtk/src/bbcreaImageIOItkImagesChooserDialogBox.cxx index 2d46651..4986d2c 100644 --- a/bbtk/src/bbcreaImageIOItkImagesChooserDialogBox.cxx +++ b/bbtk/src/bbcreaImageIOItkImagesChooserDialogBox.cxx @@ -33,14 +33,14 @@ void ItkImagesChooserDialogBox::Export() } else if (dlg->getImagesSelected().size() > 1) { - OutputImagesITKType temp; - //std::vector temp; - std::vector::iterator it = dlg->getTemplatedImagesSelected().begin(); - for(;it != dlg->getTemplatedImagesSelected().end(); ++it) + OutputImagesITKType outVect; + std::vector tempImgs= dlg->getTemplatedImagesSelected(); + std::vector::iterator it = tempImgs.begin(); + for(;it != tempImgs.end(); ++it) { - temp.push_back( (*it).GetPointer() ); + outVect.push_back( (*it).GetPointer() ); } - bbSetOutputOutIImages( temp); + bbSetOutputOutIImages( outVect); } else { diff --git a/src/creaImageIOWxPACSConnectionPanel.cpp b/src/creaImageIOWxPACSConnectionPanel.cpp index 36b22d4..5fdb569 100644 --- a/src/creaImageIOWxPACSConnectionPanel.cpp +++ b/src/creaImageIOWxPACSConnectionPanel.cpp @@ -1,7 +1,9 @@ #include #include #include - +#if defined (USE_GDCM2) +#include "gdcmCompositeNetworkFunctions.h" +#endif namespace creaImageIO { // CTor @@ -47,9 +49,28 @@ namespace creaImageIO void WxPACSConnectionPanel::OnQueryPACS(wxCommandEvent& event) { - PACSConnection* pc=new PACSConnection(crea::wx2std(aeTitle->GetValue())); - //mView->OnListenerCallback(crea::wx2std(drives->GetValue()),addFiles, removeFiles); - //dialog->Destroy(); + #if defined (USE_GDCM2) + bool didItWork = gdcm::CompositeNetworkFunctions::CEcho( crea::wx2std(address->GetValue()).c_str(), 3600, + "CREATIS", crea::wx2std(aeTitle->GetValue()).c_str() ); + gdcm::Tag tag; + tag.ReadFromCommaSeparatedString("10,10"); + /* tag.SetElement(8); + tag.SetGroup(8);*/ + std::vector< std::pair > keys; + + std::pair pa; + pa.first = tag; + pa.second = ""; + keys.push_back(std::make_pair(tag, "")); + gdcm::EQueryLevel theLevel = gdcm::ePatient; + gdcm::ERootType theRoot = gdcm::ePatientRootType; + gdcm::SmartPointer theQuery = gdcm::CompositeNetworkFunctions::ConstructQuery(theRoot, theLevel ,keys); + + + std::vector theDataSet; + gdcm::CompositeNetworkFunctions::CFind(crea::wx2std(address->GetValue()).c_str(), 3600, theQuery, theDataSet, + "CREATIS", crea::wx2std(aeTitle->GetValue()).c_str()); +#endif } //====================================================================== -- 2.47.1