Changeset 621 for XIOS/trunk/src/node/axis.cpp

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/axis.cpp (modified) (4 diffs)

XIOS/trunk/src/node/axis.cpp

@@ -18 +18 @@
       , CAxisAttributes(), isChecked(false), relFiles(), baseRefObject(), areClientAttributesChecked_(false)
       , isDistributed_(false)
-   { /* Ne rien faire de plus */ }
+      , transformationMap_()
+   {
+   }
 
    CAxis::CAxis(const StdString & id)
@@ -24 +26 @@
       , CAxisAttributes(), isChecked(false), relFiles(), baseRefObject(), areClientAttributesChecked_(false)
       , isDistributed_(false)
-   { /* Ne rien faire de plus */ }
+      , transformationMap_()
+   {
+   }
 
    CAxis::~CAxis(void)
@@ -308 +312 @@
   bool CAxis::hasTransformation()
   {
-    return (!transformations_.empty());
-  }
-
-  void CAxis::setTransformations(const std::vector<CTransformation*>& transformations)
-  {
-    transformations_ = transformations;
-  }
-
-  std::vector<CTransformation*> CAxis::getAllTransformations(void)
-  {
-    if (!hasTransformation())
-      setTransformations(this->getVirtualTransformationGroup()->getAllChildren());
-
-    return transformations_;
+    return (!transformationMap_.empty());
+  }
+
+  void CAxis::setTransformations(const TransMapTypes& axisTrans)
+  {
+    transformationMap_ = axisTrans;
+  }
+
+  CAxis::TransMapTypes CAxis::getAllTransformations(void)
+  {
+    return transformationMap_;
+  }
+
+  /*!
+    Check the validity of all transformations applied on axis
+  This functions is called AFTER all inherited attributes are solved
+  */
+  void CAxis::checkTransformations()
+  {
+    TransMapTypes::const_iterator itb = transformationMap_.begin(), it,
+                                  ite = transformationMap_.end();
+    for (it = itb; it != ite; ++it)
+    {
+      (it->second)->checkValid(this);
+    }
   }
 
@@ -350 +365 @@
     if (node.goToChildElement())
     {
-      StdString tranformation("transformation");
+      StdString inverseAxisDefRoot("inverse_axis_definition");
+      StdString inverse("inverse_axis");
+      StdString zoomAxisDefRoot("zoom_axis_definition");
+      StdString zoom("zoom_axis");
       do
       {
-        if (node.getElementName() == tranformation) {
-           this->getVirtualTransformationGroup()->parseChild(node);
+        if (node.getElementName() == inverse) {
+          CInverseAxis* tmp = (CInverseAxisGroup::get(inverseAxisDefRoot))->createChild();
+          tmp->parse(node);
+          transformationMap_[TRANS_INVERSE_AXIS] = tmp;
+        } else if (node.getElementName() == zoom) {
+          CZoomAxis* tmp = (CZoomAxisGroup::get(zoomAxisDefRoot))->createChild();
+          tmp->parse(node);
+          transformationMap_[TRANS_ZOOM_AXIS] = tmp;
         }
       } while (node.goToNextElement()) ;
       node.goToParentElement();
     }
-    setTransformations(this->getVirtualTransformationGroup()->getAllChildren());
   }