X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;ds=sidebyside;f=vv%2FvvQDicomSeriesSelector.h;h=8b3aaac0deab00f0f8f3f5e3e8da3fcc28380a57;hb=0fb2ed54dd57b161e88b6f378f039382f2577e51;hp=531e2bb11e7c5e8e805d3038d9f27ae321f8d1f0;hpb=931a42358442f4ee4f314613c991c838d4b4e3b7;p=clitk.git
diff --git a/vv/vvQDicomSeriesSelector.h b/vv/vvQDicomSeriesSelector.h
index 531e2bb..8b3aaac 100644
--- a/vv/vvQDicomSeriesSelector.h
+++ b/vv/vvQDicomSeriesSelector.h
@@ -1,33 +1,22 @@
/*=========================================================================
+ Program: vv http://www.creatis.insa-lyon.fr/rio/vv
- Program: vv
- Module: $RCSfile: vvQDicomSeriesSelector.h,v $
- Language: C++
- Date: $Date: 2010/01/06 13:31:57 $
- Version: $Revision: 1.1 $
- Author : Pierre Seroul (pierre.seroul@gmail.com)
+ Authors belong to:
+ - University of LYON http://www.universite-lyon.fr/
+ - Léon Bérard cancer center http://www.centreleonberard.fr
+ - CREATIS CNRS laboratory http://www.creatis.insa-lyon.fr
-Copyright (C) 2008
-Léon Bérard cancer center http://oncora1.lyon.fnclcc.fr
-CREATIS-LRMN http://www.creatis.insa-lyon.fr
+ This software is distributed WITHOUT ANY WARRANTY; without even
+ the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
+ PURPOSE. See the copyright notices for more information.
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, version 3 of the License.
+ It is distributed under dual licence
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program. If not, see .
-
-=========================================================================*/
+ - BSD See included LICENSE.txt file
+ - CeCILL-B http://www.cecill.info/licences/Licence_CeCILL-B_V1-en.html
+===========================================================================**/
#ifndef VVDICOMSERIESSELECTOR_H
#define VVDICOMSERIESSELECTOR_H
-
-// vv include
#include "ui_vvDicomSeriesSelector.h"
#include "clitkCommon.h"
#include "vvQProgressDialogITKCommand.h"
@@ -59,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:
@@ -69,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;
};