X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=vv%2FvvQPacsConnection.h;h=4c98458470c14ba3f70f257655643d28472e1d69;hb=85d87a4260fedf7ce53875ebd8654787a2dd941c;hp=f5c543f2b3e9a9cdf8c28aa01c86afd13e5718cb;hpb=f4ee750a005c1406848ffdfd85a0ebcbe824bca6;p=clitk.git

diff --git a/vv/vvQPacsConnection.h b/vv/vvQPacsConnection.h
index f5c543f..4c98458 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"
 
@@ -15,27 +15,26 @@
   //=====================================================================
  //======================================================================
 
-struct vvQuery{
-	gdcm::ERootType theRoot;
-	gdcm::EQueryLevel theLevel;
-	std::vector< std::pair<gdcm::Tag, std::string> > keys;
-};
 
-  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();
+	std::vector <std::string> getFileNames(int i_series);
+	int getSeriesCount() { return m_fileseries.size();}
+	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();
@@ -44,21 +43,17 @@ public slots:
 	void on_importButton_clicked();
  void chooseServer(int index);
  void removeServer();
+ bool close();
  void modifyServer();
 
   private :
 
-	  	 vvQuery getQueryPatient(const std::string i_patname, const std::string i_patid);
-
-
+	  	
 	  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 patient_id, const std::string study_id, bool bdisplay);
+	std::vector<gdcm::DataSet> findQuery(vvQuery i_query);
 
-std::vector< std::pair<gdcm::Tag, std::string> > getQueryKeysforImages(const std::string patient_id, const std::string study_id, const std::string series_id,bool bdisplay);
-vvQuery getQueryforImages(const std::string patient_id, const std::string study_id, const std::string series_id,bool bdisplay);
 	void manageStudiesFilter(bool i_enable);
 	void createTreeView();
 	void cleanTree();
@@ -78,15 +73,13 @@ vvQuery getQueryforImages(const std::string patient_id, const std::string study_
 	std::string m_aetitle;
 	std::string m_adress;
 	std::string m_nickname;
-	vvDicomServerQueryFactory mquery;
+	vvDicomServerQueryFactory mQFactory;
 	vvQuery m_query;
 	vvQuery f_query;
 	 gdcm::Directory::FilenamesType m_files;
+	 std::vector < gdcm::Directory::FilenamesType> m_fileseries;
 
-	 vvQuery getQueryforSeries(const std::string patient_id, const std::string study_id, bool bdisplay);
 
-	 vvQuery getQueryforStudy(const std::string patient_id, bool bdisplay);
-	 std::vector< std::pair<gdcm::Tag, std::string> > getQueryKeysforStudy(const std::string patient_id, bool bdisplay);
 	
   }; // class vvQPacsConnection
   //=====================================================================