JPEGFragmentsInfo declares PixelReadConvert as friend.

[gdcm.git] / src / gdcmSerieHelper.h

diff --git a/src/gdcmSerieHelper.h b/src/gdcmSerieHelper.h
index b41c9eceb00f08b50c7a3d999622aedc20038c6f..acb98ec7cb397ed9c43290c545a65f00368fdf6f 100644 (file)
--- a/src/gdcmSerieHelper.h
+++ b/src/gdcmSerieHelper.h
@@ -3,8 +3,8 @@
   Program:   gdcm
   Module:    $RCSfile: gdcmSerieHelper.h,v $
   Language:  C++
-  Date:      $Date: 2005/10/26 06:23:37 $
-  Version:   $Revision: 1.26 $
+  Date:      $Date: 2005/11/14 15:50:33 $
+  Version:   $Revision: 1.28 $
                                                                                 
   Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
   l'Image). All rights reserved. See Doc/License.txt or
@@ -22,6 +22,7 @@
 #include "gdcmCommon.h" 
 #include "gdcmTagKey.h" 
 #include "gdcmDebug.h"  // for LEGACY
+#include "gdcmRefCounter.h"
  
 #include <vector>
 #include <iostream>
@@ -55,8 +56,10 @@ class File;
  *    into several XCoherent Filesets 
  *   XCoherent stands for 'Extra Coherent' (same orientation, or same position)
  */
-class GDCM_EXPORT SerieHelper 
+class GDCM_EXPORT SerieHelper  : public RefCounter
 {
+   gdcmTypeMacro(SerieHelper);
+   
 public:
    /// SingleSerieUIDFileSetmap replaces the former CoherentFileListmap
    /// ( List were actually std::vectors, and wher no coherent at all :
@@ -65,9 +68,9 @@ public:
 
    typedef std::vector<File* > FileVector;
 
-  
-   SerieHelper();
-   ~SerieHelper();
+    static SerieHelper *New() {return new SerieHelper();}
+     
+   virtual ~SerieHelper();
    void Print(std::ostream &os = std::cout, std::string const &indent = "" );
 
    /// \todo should return bool or throw error ?
@@ -98,8 +101,7 @@ public:
    /// All the following allow user to restrict DICOM file to be part
    /// of a particular serie
    GDCM_LEGACY( void AddRestriction(TagKey const &key, std::string const &value) );
-   void AddRestriction(uint16_t group, uint16_t elem, 
-                       std::string const &value, int op);
+   void AddRestriction(TagKey const &key, std::string const &value, int op);
  
 /**
  * \brief Sets the LoadMode as a boolean string. 
@@ -126,6 +128,9 @@ public:
    XCoherentFileSetmap SplitOnPosition(FileList *fileSet); 
    XCoherentFileSetmap SplitOnTagValue(FileList *fileSet,
                                                uint16_t group, uint16_t elem);
+protected :
+   SerieHelper();
+   
 private:
    void ClearAll();
    bool UserOrdering(FileList *fileSet);