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

Timestamp:

08/06/19 12:58:44 (5 years ago)

Author:

yushan

Message:

dev for trunk with graph. trunk at r1684

Location:

XIOS/dev/dev_trunk_graph/src/filter

Files:

• file_writer_filter.cpp (modified) (1 diff)
• pass_through_filter.cpp (modified) (2 diffs)
• source_filter.cpp (modified) (1 diff)
• spatial_transform_filter.cpp (modified) (1 diff)

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

@@ -36 +36 @@
       (*CWorkflowGraph::mapFilters_ptr_with_info)[this->filterID].attributes += "</br>file attributes : </br>" +this->field->file->record4graphXiosAttributes();
       (*CWorkflowGraph::mapFilters_ptr_with_info)[this->filterID].clusterID =1;
-      (*CWorkflowGraph::mapFilters_ptr_with_info)[this->filterID].distance = ++(data[0]->distance);
+      (*CWorkflowGraph::mapFilters_ptr_with_info)[this->filterID].distance = data[0]->distance+1;
 
       if(CXios::isClient && CWorkflowGraph::build_begin) 

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

@@ -25 +25 @@
 
       CWorkflowGraph::addNode(this->filterID, "Pass Through Filter\\n("+data[0]->field->getId()+")", 2, 1, 1, data[0]);
-      (*CWorkflowGraph::mapFilters_ptr_with_info)[this->filterID].distance = ++(data[0]->distance);
+      (*CWorkflowGraph::mapFilters_ptr_with_info)[this->filterID].distance = data[0]->distance+1;
 
       (*CWorkflowGraph::mapFilters_ptr_with_info)[this->filterID].attributes = this->field->record4graphXiosAttributes();
@@ -39 +39 @@
       
       data[0]->src_filterID=this->filterID;
+      data[0]->distance++;
 
     }

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

@@ -28 +28 @@
   {
     bool building_graph = this->tag ? packet->timestamp >= this->field->field_graph_start && packet->timestamp <= this->field->field_graph_end : false;
-   
     if(building_graph)
     {

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

@@ -215 +215 @@
     }
 
+    if(BG) packet->src_filterID=this->filterID;
+    if(BG) packet->distance=data[0]->distance+1;
+    packet->field = field;
+
     return packet;
   }