]> Creatis software - creaImageIO.git/commitdiff
*** empty log message ***
authorFrederic Cervenansky <Frederic.Cervenansky@creatis.insa-lyon.fr>
Wed, 25 May 2011 15:06:16 +0000 (15:06 +0000)
committerFrederic Cervenansky <Frederic.Cervenansky@creatis.insa-lyon.fr>
Wed, 25 May 2011 15:06:16 +0000 (15:06 +0000)
bbtk/src/bbcreaImageIOItkImagesChooserDialogBox.cxx
src/creaImageIOWxPACSConnectionPanel.cpp

index 2d466515a29406b57e089245a5ca17b0a44b414e..4986d2cf83d4eca990327424730a3ed1114660ea 100644 (file)
@@ -33,14 +33,14 @@ void ItkImagesChooserDialogBox::Export()
         } 
          else if (dlg->getImagesSelected().size() > 1)
          { 
-                 OutputImagesITKType temp;
-                 //std::vector<TImage*> temp;
-                 std::vector<TImage::Pointer>::iterator it = dlg->getTemplatedImagesSelected<TImage>().begin();
-                 for(;it != dlg->getTemplatedImagesSelected<TImage>().end(); ++it)
+                 OutputImagesITKType outVect;
+                 std::vector<TImage::Pointer> tempImgs= dlg->getTemplatedImagesSelected<TImage>();
+                 std::vector<TImage::Pointer>::iterator it = tempImgs.begin();
+                 for(;it != tempImgs.end(); ++it)
                  {
-                         temp.push_back( (*it).GetPointer() );
+                         outVect.push_back( (*it).GetPointer() );
                  }
-               bbSetOutputOutIImages( temp); 
+               bbSetOutputOutIImages( outVect); 
       } 
          else
          {
index 36b22d45683899d8abaa04ad377d447e0eb553eb..5fdb5697a5ff0ad33b235335a14341df2c5bf9bd 100644 (file)
@@ -1,7 +1,9 @@
 #include <creaImageIOWxPACSConnectionPanel.h>
 #include <creaImageIOPACSConnection.h>
 #include <creaImageIOSystem.h>
-
+#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<gdcm::Tag, std::string> > keys;
+
+               std::pair<gdcm::Tag, std::string> 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<gdcm::BaseRootQuery> theQuery =  gdcm::CompositeNetworkFunctions::ConstructQuery(theRoot, theLevel ,keys);
+
+       
+                   std::vector<gdcm::DataSet> theDataSet;
+  gdcm::CompositeNetworkFunctions::CFind(crea::wx2std(address->GetValue()).c_str(), 3600, theQuery, theDataSet,
+       "CREATIS", crea::wx2std(aeTitle->GetValue()).c_str());
+#endif
   }
   
 //======================================================================