Changeset 127 for XMLIO_V2/dev/dev_rv/src/XMLIO/attribut.hpp

Timestamp:

10/07/10 16:17:04 (14 years ago)

Author:

hozdoba

Message:

suite du précédent commit

File:

• XMLIO_V2/dev/dev_rv/src/XMLIO/attribut.hpp (modified) (1 diff)

XMLIO_V2/dev/dev_rv/src/XMLIO/attribut.hpp

@@ -86 +86 @@
    { _hasValue = true ; value.resize(val.shape()); value = val ; }
 
+#define PRINT_ARRAY(type)                                             \
+   template <>                                                        \
+      ostream& Attribut<Array<type, 1> >::print(ostream & _out) const \
+   {                                                                  \
+      if (_hasValue) _out << " " << getName() << "=\"" << value(0);   \
+      _out << "..." << value(value.size()-1); _out << "\"" ;          \
+      return (_out) ;                                                 \
+   }
+
 #define SET_ARRAY_TYPE(type) \
-   SET_ARRAY_DIM(type,1)     \
-   SET_ARRAY_DIM(type,2)     \
-   SET_ARRAY_DIM(type,3)     \
-   SET_ARRAY_DIM(type,4)
+   PRINT_ARRAY(type)         \
+   SET_ARRAY_DIM(type, 1)    \
+   SET_ARRAY_DIM(type, 2)    \
+   SET_ARRAY_DIM(type, 3)    \
+   SET_ARRAY_DIM(type, 4)
 
    SET_ARRAY_TYPE(double)
+   SET_ARRAY_TYPE(float)
    SET_ARRAY_TYPE(int)
    SET_ARRAY_TYPE(bool)
 
-   template <>
-      ostream& Attribut<Array<double,1> >::print(ostream & o) const
-   {
-      if (_hasValue) o << " " << getName() << "=\"" << value(0);
-      /*for (int i = 1; i < value.size(); i++)
-      { o << "," << value(i); }*/
-      o << value(0) << "..." << value(value.size()-1);
-      o << "\"" ;
-      return (o) ;
-   }
+#undef SET_ARRAY_DIM
+#undef SET_ARRAY_TYPE
+#undef PRINT_ARRAY
 
    template <>
-      void Attribut<Array<double,1> >::setFromString(const std::string& _str)
+      void Attribut<Array<double, 1> >::setFromString(const std::string& _str)
    {
       istringstream iss(_str) ;