X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;ds=sidebyside;f=vv%2FvvQPacsConnection.h;h=bafea832c9ad016a8d585a7a513a9a95bbaa1780;hb=4eb6f95e59a7602564b15f9d0715650dc91442a2;hp=365a40f502bf841563e7a1821933315ca4136acb;hpb=00d2878dd8a4c0487cffb758e08671b228de1200;p=clitk.git

diff --git a/vv/vvQPacsConnection.h b/vv/vvQPacsConnection.h
index 365a40f..bafea83 100644
--- a/vv/vvQPacsConnection.h
+++ b/vv/vvQPacsConnection.h
@@ -1,11 +1,11 @@
 #ifndef __vvQPacsConnection_h_INCLUDED__
 #define __vvQPacsConnection_h_INCLUDED__
 
-#include <QTGUI/QWidget>
+#include <QWidget>
 #include "ui_vvPacsConnection.h"
 #include "gdcmCompositeNetworkFunctions.h"
-#include <QtGui/QStandardItemModel.h>
-#include <QtGui/QStringListModel.h>
+#include <QStandardItemModel>
+#include <QStringListModel>
 #include <QFileDialog>
 #include "vvDicomServerQueryFactory.h"
 
@@ -14,21 +14,26 @@
    */
   //=====================================================================
  //======================================================================
-  class vvQPacsConnection : public QDialog 
-  {
+
+
+
+class vvQPacsConnection : public QDialog
+{
 	  Q_OBJECT
-  public:
+public:
 	  //vvQPacsConnection(){}    
 	  vvQPacsConnection(QWidget *parent=0);
     
 	  ~vvQPacsConnection(){}
 	void refreshNetworks();
 	std::vector <std::string> getFileNames();
+	void clearMove();
 
 public slots:
 	void selectStudies(const QModelIndex &index);
 	void selectSeries(const QModelIndex &index);
 	void selectImages(const QModelIndex &index);
+	void selectImage(const QModelIndex &index);
   private slots:
     void on_scanButton_clicked();
 	void on_clearButton_clicked();
@@ -40,12 +45,13 @@ public slots:
  void modifyServer();
 
   private :
+
+	  	
 	  Ui::vvPacsConnection ui;
 	std::vector< std::pair<gdcm::Tag, std::string> > getKeys();
-	std::vector< std::pair<gdcm::Tag, std::string> > getPatientKeys(const std::string , const std::string );
 	std::vector< std::pair<gdcm::Tag, std::string> > getStudyKeys(const std::string);
-	std::vector< std::pair<gdcm::Tag, std::string> > getSeriesKeys(const std::string i_val);
-	std::vector< std::pair<gdcm::Tag, std::string> > getImageKeys(const std::string i_val);
+	std::vector<gdcm::DataSet> findQuery(vvQuery i_query);
+
 	void manageStudiesFilter(bool i_enable);
 	void createTreeView();
 	void cleanTree();
@@ -65,9 +71,12 @@ public slots:
 	std::string m_aetitle;
 	std::string m_adress;
 	std::string m_nickname;
-	vvDicomServerQueryFactory mquery;
-	gdcm::SmartPointer<gdcm::BaseRootQuery> m_query;
+	vvDicomServerQueryFactory mQFactory;
+	vvQuery m_query;
+	vvQuery f_query;
 	 gdcm::Directory::FilenamesType m_files;
+
+
 	
   }; // class vvQPacsConnection
   //=====================================================================