Changeset 1112

Timestamp:

05/03/17 14:59:25 (8 years ago)

Author:

ymipsl

Message:

For xml : if attribute get the string value of "_reset_", attribute will be empty and the attribute will remain empty after inheritance.

YM

Location:

XIOS/trunk/src

Files:

• attribute.cpp (modified) (1 diff)
• attribute.hpp (modified) (1 diff)
• attribute_array.hpp (modified) (1 diff)
• attribute_array_impl.hpp (modified) (1 diff)
• attribute_enum.hpp (modified) (1 diff)
• attribute_enum_impl.hpp (modified) (1 diff)
• attribute_map.cpp (modified) (1 diff)
• attribute_template.hpp (modified) (1 diff)
• attribute_template_impl.hpp (modified) (1 diff)

XIOS/trunk/src/attribute.cpp

@@ -6 +6 @@
 namespace xios
 {
+
+      const StdString CAttribute::resetInheritanceStr("_reset_") ;
+
       /// ////////////////////// Définitions ////////////////////// ///
       CAttribute::CAttribute(const StdString & id)
-         : CObject(id), CBaseType()
+         : CObject(id), CBaseType(), _canInherite(true)
 //         , value()
       { /* Ne rien faire de plus */ }

XIOS/trunk/src/attribute.hpp

@@ -65 +65 @@
             virtual void setInheritedValue(const CAttribute& ) = 0 ;
             virtual bool hasInheritedValue(void) const = 0;
-            
+
+            bool canInherite(void) {return _canInherite ;}
          protected : 
+            bool _canInherite ;
+            static const StdString resetInheritanceStr ; 
 
       }; // class CAttribute

XIOS/trunk/src/attribute_array.hpp

@@ -53 +53 @@
             /// Autre ///
             virtual string toString(void) const { return _toString();}
-            virtual void fromString(const StdString & str) { _fromString(str);}
+            virtual void fromString(const StdString & str) { if (str==resetInheritanceStr) { reset(); _canInherite=false ;}  else _fromString(str);}
             virtual bool toBuffer  (CBufferOut& buffer) const { return _toBuffer(buffer);}
             virtual bool fromBuffer(CBufferIn& buffer) { return _fromBuffer(buffer); }

XIOS/trunk/src/attribute_array_impl.hpp

@@ -83 +83 @@
     void CAttributeArray<T_numtype,N_rank>::setInheritedValue(const CAttributeArray& attr)
     {
-      if (this->isEmpty() && attr.hasInheritedValue())
+      if (this->isEmpty() && _canInherite && attr.hasInheritedValue())
       {
         inheritedValue.resize(attr.shape()) ;

XIOS/trunk/src/attribute_enum.hpp

@@ -62 +62 @@
             /// Autre ///
             virtual StdString toString(void) const { return _toString();}
-            virtual void fromString(const StdString & str) { _fromString(str);}
+            virtual void fromString(const StdString & str) { if (str==resetInheritanceStr) { reset(); _canInherite=false ;}  else _fromString(str);}
 
             virtual bool toBuffer  (CBufferOut& buffer) const { return _toBuffer(buffer);} 

XIOS/trunk/src/attribute_enum_impl.hpp

@@ -88 +88 @@
   void CAttributeEnum<T>::setInheritedValue(const CAttributeEnum& attr)
   {
-    if (this->isEmpty() && attr.hasInheritedValue()) inheritedValue.set(attr.getInheritedValue());
+    if (this->isEmpty() && _canInherite && attr.hasInheritedValue()) inheritedValue.set(attr.getInheritedValue());
   }
 

XIOS/trunk/src/attribute_map.cpp

@@ -170 +170 @@
                if (apply)
                {
-                 if (currentAtt->isEmpty() && !el.second->isEmpty())
+                 if (currentAtt->isEmpty() && currentAtt->canInherite() && !el.second->isEmpty())
                  {
                     this->setAttribute(el.first, el.second);

XIOS/trunk/src/attribute_template.hpp

@@ -65 +65 @@
             /// Autre ///
             virtual StdString toString(void) const { return _toString();}
-            virtual void fromString(const StdString & str) { _fromString(str);}
+            virtual void fromString(const StdString & str) { if (str==resetInheritanceStr) { reset(); _canInherite=false ;}  else _fromString(str);}
 //            virtual CAttributeTemplate* clone() const {}
 //            virtual void toBinary  (StdOStream & os) const;

XIOS/trunk/src/attribute_template_impl.hpp

@@ -125 +125 @@
     void CAttributeTemplate<T>::setInheritedValue(const CAttributeTemplate& attr)
     {
-      if (this->isEmpty() && attr.hasInheritedValue()) inheritedValue.set(attr.getInheritedValue()) ;
+      if (this->isEmpty() && _canInherite && attr.hasInheritedValue()) inheritedValue.set(attr.getInheritedValue()) ;
     }