Changeset 2028 for XIOS/dev/dev_trunk_graph/src/filter

Timestamp:

02/03/21 17:42:33 (3 years ago)

Author:

yushan

Message:

Graph intermediate commit to a tmp branch.

Location:

XIOS/dev/dev_trunk_graph/src/filter

Files:

• pass_through_filter.cpp (modified) (1 diff)
• temporal_filter.cpp (modified) (1 diff)
• transform_filter.cpp (modified) (1 diff)

XIOS/dev/dev_trunk_graph/src/filter/pass_through_filter.cpp

@@ -36 +36 @@
       for(int i=0; i<this->graphPackage->filterId; i++)
       {
-        if(  (*CWorkflowGraph::vectorOfNodes_)[i].label_field_id == this->label_field_id  
+        if(CXios::isClient 
+          &&  (*CWorkflowGraph::vectorOfNodes_)[i].label_field_id == this->label_field_id  
           && (*CWorkflowGraph::vectorOfNodes_)[i].timestamp == data[0]->timestamp
-          && CXios::isClient
           && (*CWorkflowGraph::vectorOfNodes_)[i].filter_name == "Pass through filter" )
         {

XIOS/dev/dev_trunk_graph/src/filter/temporal_filter.cpp

@@ -47 +47 @@
         graphCycleCompleted = false;
       }
+      
+      data[0]->graphPackage->currentField = this->graphPackage->inFields[0];
+      std::rotate(this->graphPackage->inFields.begin(), this->graphPackage->inFields.begin() + 1, this->graphPackage->inFields.end());
       
       CWorkflowGraph::addEdge(data[0]->graphPackage->fromFilter, this->graphPackage->filterId, data[0]);

XIOS/dev/dev_trunk_graph/src/filter/transform_filter.cpp

@@ -53 +53 @@
       if(this->graphPackage->show)
       {
-        packet->graphPackage->currentField = data[0]->graphPackage->currentField->getDirectFieldReference();//this->graphPackage->inFields[0];
+        //packet->graphPackage->currentField = data[0]->graphPackage->currentField->getDirectFieldReference();//this->graphPackage->inFields[0];
+        packet->graphPackage->currentField = this->graphPackage->inFields[0];
         CWorkflowGraph::addNode("Spatial transform filter "+algorithm->getAlgoName(), 4, false, 1, packet);
         CWorkflowGraph::addEdge(packet->graphPackage->fromFilter, this->graphPackage->filterId, packet);