X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=vv%2FvvQPacsConnection.h;h=4c98458470c14ba3f70f257655643d28472e1d69;hb=1865f86b7420682f57e160c911cfebabbfaa8375;hp=fbbdbeb3602c67d7743e51500a491235c7cdc6a0;hpb=3378f6c372da1e07e35c45562749416fcfee6798;p=clitk.git

diff --git a/vv/vvQPacsConnection.h b/vv/vvQPacsConnection.h
index fbbdbeb..4c98458 100644
--- a/vv/vvQPacsConnection.h
+++ b/vv/vvQPacsConnection.h
@@ -1,62 +1,85 @@
 #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"
 
   /**
    * \ingroup GUI
    */
   //=====================================================================
- //=====================================================================
-  class vvQPacsConnection : public QWidget , public Ui_vvPacsConnection
-  {
+ //======================================================================
+
+
+
+class vvQPacsConnection : public QDialog
+{
 	  Q_OBJECT
-  public:
-	  vvQPacsConnection(){}    
-	  vvQPacsConnection(QWidget *parent);
+public:
+	  //vvQPacsConnection(){}    
+	  vvQPacsConnection(QWidget *parent=0);
     
 	  ~vvQPacsConnection(){}
-	///Queries the PACS
-	 //void OnQueryPACS(wxCommandEvent& event);  
+	void refreshNetworks();
+	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();
-	void on_importButton_clicked();
+	void on_optionsButton_clicked();
 	void on_check_ModAll_clicked(bool state);
-
+	void on_importButton_clicked();
+ void chooseServer(int index);
+ void removeServer();
+ bool close();
+ 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 );
 	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();
+	void setNewPacs();
 	QStandardItemModel *Patientmodel;
 	QStandardItemModel *Studymodel;
 	QStandardItemModel *Seriesmodel;
 	QStandardItemModel *Imagesmodel;
 	void convertDataSet(std::vector<gdcm::DataSet> i_ds, QStandardItemModel *i_model, std::vector< std::pair<gdcm::Tag, std::string> > keys);
 	void manageSeriesFilter(bool i_enable);
+	std::vector< std::pair<gdcm::Tag, std::string> > fillMoveKeys();
 	std::string m_patient;
 	std::string m_study;
 	std::string m_series;
-	
-	std::string m_ip;
+	gdcm::EQueryLevel m_level;
+	std::string m_port;
 	std::string m_aetitle;
 	std::string m_adress;
-	std::string m_name;
-	//wxDialog* dialog;
+	std::string m_nickname;
+	vvDicomServerQueryFactory mQFactory;
+	vvQuery m_query;
+	vvQuery f_query;
+	 gdcm::Directory::FilenamesType m_files;
+	 std::vector < gdcm::Directory::FilenamesType> m_fileseries;
+
+
 	
   }; // class vvQPacsConnection
   //=====================================================================