X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=vv%2FvvQDicomSeriesSelector.h;h=8b3aaac0deab00f0f8f3f5e3e8da3fcc28380a57;hb=765020625fbc092d283e221e36c83e60a1844cb7;hp=e75e52603bb22b61d064c515d54cfff306caf540;hpb=573d80d0f7a17607d2ee883c21c940c0ba020282;p=clitk.git diff --git a/vv/vvQDicomSeriesSelector.h b/vv/vvQDicomSeriesSelector.h index e75e526..8b3aaac 100644 --- a/vv/vvQDicomSeriesSelector.h +++ b/vv/vvQDicomSeriesSelector.h @@ -48,8 +48,12 @@ protected: QString mPreviousPath; QString mFoldername; void AddSerieToTheTable(int i, std::vector & filenames); +#if GDCM_MAJOR_VERSION == 2 + QString MakeDicomInfo(std::string & s, const gdcm::Reader& header); +#else QString MakeDicomInfo(std::string & s, gdcm::File *header); - QString AddInfo(gdcm::File *header, QString n, unsigned short group, unsigned short elem); +#endif + QString AddInfo(const gdcm::File *header, QString n, unsigned short group, unsigned short elem); QString AddInfo(std::string n, std::string m); private: @@ -58,7 +62,11 @@ private: std::map* > mListOfSeriesFilenames; std::vector * mFilenames; std::map mDicomInfo; +#if GDCM_MAJOR_VERSION == 2 + std::map mDicomHeader; +#else std::map mDicomHeader; +#endif std::map mDicomDetails; };