Changeset 1205 for XIOS/dev/branch_yushan_merged/src/node/zoom_axis.cpp

Timestamp:

07/10/17 18:17:04 (7 years ago)

Author:

yushan

Message:

branch merged with trunk @1200

File:

• XIOS/dev/branch_yushan_merged/src/node/zoom_axis.cpp (modified) (2 diffs)

XIOS/dev/branch_yushan_merged/src/node/zoom_axis.cpp

@@ -46 +46 @@
     axisGlobalSize   = axisDest->n_glo.getValue();
 
-    begin = (this->begin.isEmpty()) ?  0 : this->begin.getValue();
-    n     = (this->n.isEmpty()) ?  axisGlobalSize : this->n.getValue();
-    end   = begin+n-1;
+    bool zoomByIndex = !this->index.isEmpty() && (0 != this->index.numElements());
+
+    if (zoomByIndex)
+    {
+      begin = min(this->index);
+      end   = max(this->index);
+      n     = end - begin + 1;
+    }
+    else
+    {
+      begin = (this->begin.isEmpty()) ?  0 : this->begin.getValue();
+      n     = (this->n.isEmpty()) ?  axisGlobalSize : this->n.getValue();
+      end   = begin+n-1;
+    }
 
     if (begin < 0 || begin > axisGlobalSize - 1 || end < 0 || end > axisGlobalSize - 1
@@ -55 +66 @@
             << "One or more attributes among 'begin' (" << begin << "), 'end' (" << end << "), 'n' (" << n << ") "
             << "of axis transformation [ id = '" << axisDest->getId() << "' , context = '" << CObjectFactory::GetCurrentContextId() << "' ] are not well specified");
+    
+    if (zoomByIndex && (!this->begin.isEmpty() || !this->n.isEmpty()))
+      ERROR("CZoomAxis::checkValid(CAxis* axisDest)",
+            << "Only one type of zoom is accepted. Define zoom by index with global_zoom_index or define zoom with begin and n. "
+            << "Axis transformation [ id = '" << axisDest->getId() << "' , context = '" << CObjectFactory::GetCurrentContextId() << "' ] are not well specified");
 
     this->begin.setValue(begin);