Merge branch 'master' of /home/romulo/creatis/clitk3-git-shared/clitk3

[clitk.git] / vv / vvQDicomSeriesSelector.h

diff --git a/vv/vvQDicomSeriesSelector.h b/vv/vvQDicomSeriesSelector.h
index e75e52603bb22b61d064c515d54cfff306caf540..8b3aaac0deab00f0f8f3f5e3e8da3fcc28380a57 100644 (file)
--- a/vv/vvQDicomSeriesSelector.h
+++ b/vv/vvQDicomSeriesSelector.h
@@ -48,8 +48,12 @@ protected:
     QString mPreviousPath;
     QString mFoldername;
     void AddSerieToTheTable(int i, std::vector<std::string> & 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<std::string, std::vector<std::string>* > mListOfSeriesFilenames;
     std::vector<std::string> * mFilenames;
     std::map<std::string, QString> mDicomInfo;
+#if GDCM_MAJOR_VERSION == 2
+    std::map<std::string, gdcm::Reader> mDicomHeader;
+#else
     std::map<std::string, gdcm::File*> mDicomHeader;
+#endif
     std::map<std::string, std::string> mDicomDetails;
 };