Changeset 621 for XIOS/trunk/src/node/transformation.hpp

Timestamp:

06/22/15 13:36:21 (9 years ago)

Author:

mhnguyen

Message:

Implementing generic transformation algorithm (local commit)

+) Change a little bit to make sure everything work in order

Test
+) test_new_features passe with inverse

File:

• XIOS/trunk/src/node/transformation.hpp (modified) (1 diff)

XIOS/trunk/src/node/transformation.hpp

@@ -2 +2 @@
 #define __XMLIO_CTransformation__
 
-/// xios headers ///
 #include "xmlioserver_spl.hpp"
-#include "attribute_enum.hpp"
-#include "attribute_enum_impl.hpp"
-#include "attribute_array.hpp"
-#include "declare_attribute.hpp"
-#include "object_template.hpp"
-#include "group_factory.hpp"
-#include "declare_group.hpp"
+#include "transformation_enum.hpp"
 
 namespace xios {
-
-  /// ////////////////////// Déclarations ////////////////////// ///
-  class CTransformationGroup;
-  class CTransformationAttributes;
-  class CTransformation;
-  ///--------------------------------------------------------------
-
-  // Declare/Define CFileAttribute
-  BEGIN_DECLARE_ATTRIBUTE_MAP(CTransformation)
-#include "transformation_attribute.conf"
-  END_DECLARE_ATTRIBUTE_MAP(CTransformation)
 
   ///--------------------------------------------------------------
   /*!
     \class CTransformation
-    This class describes transformation in xml file.
+    This class describes inverse_axis in xml file.
   */
+  template<typename T>
   class CTransformation
-    : public CObjectTemplate<CTransformation>
-    , public CTransformationAttributes
   {
-    public :
-      enum TransformationId
-      {
-        TRANS_ID_ZOOM, TRANS_ID_INVERSE
-      };
-      typedef CObjectTemplate<CTransformation> SuperClass;
-      typedef CTransformationAttributes SuperClassAttribute;
+  public:
+    typedef typename boost::unordered_map<ETranformationType, CTransformation<T>*, boost::hash<int> > TransformationMapTypes;
+    typedef TransformationMapTypes TransMapTypes;
 
     public :
       /// Constructeurs ///
-      CTransformation(void);
-      explicit CTransformation(const StdString& id);
+      CTransformation(void) {}
+      virtual void checkValid(T* dest) = 0;
 
       /// Destructeur ///
-      virtual ~CTransformation(void);
-
-      /// Accesseurs statiques ///
-      static StdString GetName(void);
-      static StdString GetDefName(void);
-      static ENodeType GetType(void);
-    private:
-      static std::vector<StdString> TransformationTypes;
-      static std::vector<TransformationId> TransformationTypeIds;
-
-    public :
-      void checkAttributes();
-
-    private:
-      void checkAttributesType(TransformationId& transType);
-      void checkAttributesZoomType();
-      void checkAttributesInverseType();
-
-    private:
+      virtual ~CTransformation(void) {}
   }; // class CTransformation
 
-  DECLARE_GROUP(CTransformation);
 } // namespace xios