Changeset 623 for XIOS/trunk/src/filter/axis_algorithm_inverse.cpp

Timestamp:

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

Author:

mhnguyen

Message:

Implementing transformation algorithm: zoom axis (local commit)

+) Implement zoom axis: zoomed points are points not masked
+) Correct some minor bugs

Test
+) Ok with normal cases: zoom in the last of transformation list
+) There is still a bug in case of zoom then inverse

File:

• XIOS/trunk/src/filter/axis_algorithm_inverse.cpp (moved) (moved from XIOS/trunk/src/filter/axis_inverse.cpp) (2 diffs)

XIOS/trunk/src/filter/axis_algorithm_inverse.cpp

@@ -1 @@
-#include "axis_inverse.hpp"
+#include "axis_algorithm_inverse.hpp"
 
 namespace xios {
 
-CAxisInverse::CAxisInverse(CAxis* axisDestination, CAxis* axisSource)
+CAxisAlgorithmInverse::CAxisAlgorithmInverse(CAxis* axisDestination, CAxis* axisSource)
  : CAxisAlgorithmTransformation(axisDestination, axisSource)
 {
   if (axisDestination->size.getValue() != axisSource->size.getValue())
   {
-    ERROR("CAxisInverse::CAxisInverse(CAxis* axisDestination, CAxis* axisSource)",
+    ERROR("CAxisAlgorithmInverse::CAxisAlgorithmInverse(CAxis* axisDestination, CAxis* axisSource)",
            << "Two axis have different size"
            << "Size of axis source " <<axisSource->getId() << " is " << axisSource->size.getValue()  << std::endl
@@ -19 +19 @@
   int ibeginDest = axisDestination->ibegin.getValue();
 
-  for (int idx = 0; idx < niDest; ++idx) axisDestGlobalIndex_.push_back(ibeginDest+idx);
+  for (int idx = 0; idx < niDest; ++idx)
+    if ((axisDestination->mask)(idx)) axisDestGlobalIndex_.push_back(ibeginDest+idx);
   this->computeIndexSourceMapping();
 }
 
-void CAxisInverse::computeIndexSourceMapping()
+void CAxisAlgorithmInverse::computeIndexSourceMapping()
 {
   std::map<int, std::vector<int> >& transMap = this->transformationMapping_;