X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=vv%2FvvQPacsConnection.h;h=bafea832c9ad016a8d585a7a513a9a95bbaa1780;hb=4eb6f95e59a7602564b15f9d0715650dc91442a2;hp=36e715a1006c43bfe5ba712b0d83cdb37623c497;hpb=ff4397dc0e578a88346c1d61ed65062d2b922732;p=clitk.git diff --git a/vv/vvQPacsConnection.h b/vv/vvQPacsConnection.h index 36e715a..bafea83 100644 --- a/vv/vvQPacsConnection.h +++ b/vv/vvQPacsConnection.h @@ -1,11 +1,11 @@ #ifndef __vvQPacsConnection_h_INCLUDED__ #define __vvQPacsConnection_h_INCLUDED__ -#include +#include #include "ui_vvPacsConnection.h" #include "gdcmCompositeNetworkFunctions.h" -#include -#include +#include +#include #include #include "vvDicomServerQueryFactory.h" @@ -15,27 +15,25 @@ //===================================================================== //====================================================================== -struct vvQuery{ - gdcm::ERootType theRoot; - gdcm::EQueryLevel theLevel; - std::vector< std::pair > keys; -}; - class vvQPacsConnection : public QDialog - { + +class vvQPacsConnection : public QDialog +{ Q_OBJECT - public: +public: //vvQPacsConnection(){} vvQPacsConnection(QWidget *parent=0); ~vvQPacsConnection(){} void refreshNetworks(); std::vector 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(); @@ -48,15 +46,12 @@ public slots: private : - vvQuery getQueryPatient(const std::string i_patname, const std::string i_patid); - - + Ui::vvPacsConnection ui; std::vector< std::pair > getKeys(); - std::vector< std::pair > getPatientKeys(const std::string , const std::string ); std::vector< std::pair > getStudyKeys(const std::string); - std::vector< std::pair > getSeriesKeys(const std::string i_val); - std::vector< std::pair > getImageKeys(const std::string i_val); + std::vector findQuery(vvQuery i_query); + void manageStudiesFilter(bool i_enable); void createTreeView(); void cleanTree(); @@ -76,15 +71,12 @@ public slots: 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; - vvQuery getQueryforSeries(const std::string study_id); - vvQuery getQueryforStudy(const std::string patient_id); - std::vector< std::pair > getQueryKeysforStudy(const std::string patient_id); }; // class vvQPacsConnection //=====================================================================