X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FDDS%2FDDS_DicGroup.h;h=debefdbe68269c7b021ffeda43efc435f14ff77b;hb=refs%2Fheads%2Fngr%2Fpython3_dev_pv5.4;hp=5b7d2f6c85c1aa14c0ee672d64346a784dbf62d6;hpb=e07448c48ea5b2127e34fc7b8c3427d01c7ce17b;p=modules%2Fgui.git

diff --git a/src/DDS/DDS_DicGroup.h b/src/DDS/DDS_DicGroup.h
index 5b7d2f6c8..debefdbe6 100644
--- a/src/DDS/DDS_DicGroup.h
+++ b/src/DDS/DDS_DicGroup.h
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2016  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 // CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
@@ -6,7 +6,7 @@
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
 // License as published by the Free Software Foundation; either
-// version 2.1 of the License.
+// version 2.1 of the License, or (at your option) any later version.
 //
 // This library is distributed in the hope that it will be useful,
 // but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -38,27 +38,44 @@ DEFINE_STANDARD_HANDLE(DDS_DicGroup, MMgt_TShared)
 class DDS_DicGroup : public MMgt_TShared
 {
 public:
-  DDS_DicGroup( const TCollection_AsciiString& );
+  Standard_EXPORT DDS_DicGroup( const TCollection_AsciiString& );
 
-  TCollection_AsciiString                    GetName() const;
-  Standard_EXPORT void                       GetKeys( TColStd_SequenceOfAsciiString& ) const;
+  Standard_EXPORT TCollection_AsciiString     GetName() const;
+  Standard_EXPORT void                        GetKeys( TColStd_SequenceOfAsciiString& ) const;
 
-  Standard_EXPORT Handle(DDS_DicItem)        GetDicItem( const TCollection_AsciiString& ) const;
+  Standard_EXPORT Handle(DDS_DicItem)         GetDicItem( const TCollection_AsciiString& ) const;
 
-  Standard_EXPORT void                       GetUnitSystems( TColStd_SequenceOfAsciiString& ) const;
-  Standard_EXPORT TCollection_ExtendedString GetUnitSystemLabel( const TCollection_AsciiString& ) const;
+  Standard_EXPORT void                        GetUnitSystems( TColStd_SequenceOfAsciiString& ) const;
+  Standard_EXPORT TCollection_ExtendedString  GetUnitSystemLabel( const TCollection_AsciiString& ) const;
 
-  Standard_EXPORT TCollection_AsciiString    GetActiveUnitSystem() const;
-  Standard_EXPORT void                       SetActiveUnitSystem( const TCollection_AsciiString& );
+  Standard_EXPORT TCollection_AsciiString     GetActiveUnitSystem() const;
+  Standard_EXPORT void                        SetActiveUnitSystem( const TCollection_AsciiString& );
 
-private:
-  DDS_DicGroup( const DDS_DicGroup& );
+  virtual Standard_EXPORT Handle(DDS_DicItem) CreateItem() const;
+  
+protected:
 
-  void                                       operator=( const DDS_DicGroup& );
+  Standard_EXPORT DDS_DicGroup( const DDS_DicGroup& );
 
-  void                                       FillDataMap( const LDOM_Element&, const LDOM_Element& );
+  Standard_EXPORT void                        operator=( const DDS_DicGroup& );
+
+  Standard_EXPORT virtual void                FillDataMap( const LDOM_Element&, const LDOM_Element& );
+
+  Standard_EXPORT Standard_Boolean            AddDicItem( const TCollection_AsciiString&,
+                                                          const Handle(DDS_DicItem)& );
+
+  Standard_EXPORT Standard_Boolean            HasDicItem( const TCollection_AsciiString& ) const;
+
+  Standard_EXPORT void                        RemoveAllDicItems();
+
+  Standard_EXPORT const 
+    DDS_IndexedDataMapOfDicItems&             GetItemMap() const;
+
+  Standard_EXPORT Standard_Boolean            AddUnitSystem( const TCollection_AsciiString&,
+                                                             const TCollection_ExtendedString& );
+
+protected:
 
-private:
   typedef NCollection_DataMap<TCollection_AsciiString,
                               TCollection_ExtendedString> UnitSystemMap;
 
@@ -72,11 +89,9 @@ private:
   friend class DDS_Dictionary;
 
 public:
-  DEFINE_STANDARD_RTTI(DDS_DicGroup)
+  OCCT_DEFINE_STANDARD_RTTIEXT(DDS_DicGroup,MMgt_TShared)
 };
 
-DEFINE_BASECOLLECTION(DDS_BaseCollectionOfDicGroups, Handle(DDS_DicGroup))
-DEFINE_INDEXEDDATAMAP(DDS_IndexedDataMapOfDicGroups, DDS_BaseCollectionOfDicGroups,
-                      TCollection_AsciiString, Handle(DDS_DicGroup))
+typedef NCollection_IndexedDataMap<TCollection_AsciiString, Handle(DDS_DicGroup)> DDS_IndexedDataMapOfDicGroups;
 
 #endif