Changeset 1679 for XIOS/dev/dev_trunk_omp/src/filter/spatial_transform_filter.hpp

Timestamp:

07/02/19 11:42:27 (5 years ago)

Author:

yushan

Message:

MARK: Dynamic workflow graph developement. Branch up to date with trunk @1676. Using vis.js

File:

• XIOS/dev/dev_trunk_omp/src/filter/spatial_transform_filter.hpp (modified) (8 diffs)

XIOS/dev/dev_trunk_omp/src/filter/spatial_transform_filter.hpp

@@ -3 +3 @@
 
 #include "filter.hpp"
+#include "field.hpp"
 
 namespace xios
@@ -9 +10 @@
   class CGridTransformation;
   class CSpatialTransformFilterEngine;
+
+  class CField;
 
   /*!
@@ -23 +26 @@
        * \param outputValue default value of output pin
        * \param [in] inputSlotsCount number of input, by default there is only one for field src
-       * \param buildWorkflowGraph indicates whether data will be visualized
        */
       CSpatialTransformFilter(CGarbageCollector& gc, CSpatialTransformFilterEngine* engine,
-                              double outputValue, size_t inputSlotsCount = 1, bool buildWorkflowGraph = false);
+                              double outputValue, size_t inputSlotsCount = 1);
 
       inline StdString GetName(void) {return StdString("Spatial transform filter");};
@@ -38 +40 @@
        * \param hasMissingValue whether field source has missing value
        * \param defaultValue default value
-       * \param buildWorkflowGraph indicates whether data will be visualized
        * \return the first and the last filters of the filter graph
        */
       static std::pair<std::shared_ptr<CSpatialTransformFilter>, std::shared_ptr<CSpatialTransformFilter> >
-      buildFilterGraph(CGarbageCollector& gc, CGrid* srcGrid, CGrid* destGrid, bool hasMissingValue, double defaultValue, bool buildWorkflowGraph = false);
+      buildFilterGraph(CGarbageCollector& gc, CGrid* srcGrid, CGrid* destGrid, bool hasMissingValue, double defaultValue);
 
     protected:
@@ -72 +73 @@
        * \param outputValue default value of output pin
        * \param [in] inputSlotsCount number of input, by default there is only one for field src
-       * \param buildWorkflowGraph indicates whether data will be visualized
        *
        */
       CSpatialTemporalFilter(CGarbageCollector& gc, CSpatialTransformFilterEngine* engine, CGridTransformation* gridTransformation,
-                            double outputValue, size_t inputSlotsCount = 1, bool buildWorkflowGraph = false);
+                            double outputValue, size_t inputSlotsCount = 1);
 
 
@@ -104 +104 @@
       int filterID;
       int tag;
+      CField *field;
       /*!
        * Returns the engine wrapping the specified grid transformation.
@@ -120 +121 @@
        * \return the result of the grid transformation
        */
-      CDataPacketPtr applyFilter(std::vector<CDataPacketPtr> data, double defaultValue = 0, int tag=0, StdString fieldID=0);
+      CDataPacketPtr applyFilter(std::vector<CDataPacketPtr> data, double defaultValue = 0, int tag=0, Time start_graph=0, Time end_graph=-1, CField *field=0);
 
        /*!
@@ -147 +148 @@
        * \param dataDest the resulting transformed data
        */
-      void apply(const CArray<double, 1>& dataSrc, CArray<double,1>& dataDest);
+      void apply(const CArray<double, 1>& dataSrc, CArray<double,1>& dataDest, int filterID=-1);
 
       CGridTransformation* gridTransformation; //!< The grid transformation used by the engine