Changeset 1679 for XIOS/dev/dev_trunk_omp/src/filter/source_filter.cpp

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/source_filter.cpp (modified) (3 diffs)

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

@@ -12 +12 @@
                                const CDuration offset /*= NoneDu*/, bool manualTrigger /*= false*/,
                                bool hasMissingValue /*= false*/,
-                               double defaultValue /*= 0.0*/,
-                               bool buildWorkflowGraph /*= false*/)
-    : COutputPin(gc, manualTrigger, buildWorkflowGraph)
+                               double defaultValue /*= 0.0*/)
+    : COutputPin(gc, manualTrigger)
     , grid(grid)
     , compression(compression)
@@ -63 +62 @@
     }
 
-    packet->fieldID = field_id;
-    this->output_field_id = field_id;
-
-
-    if(this->tag)
-    {
-      this->filterID.first = InvalidableObject::filterIdGenerator++;  
-      packet->src_filterID=this->filterID.first;
+    
+    bool building_graph = this->tag ? packet->timestamp >= this->start_graph && packet->timestamp <= this->end_graph : false;
+
+    if(building_graph)
+    {
+      this->filterID = InvalidableObject::filterIdGenerator++;  
+      packet->src_filterID=this->filterID;
+      packet->field = this->field;
       
       
-      if(CXios::isClient) std::cout<<"source filter tag = "<<this->tag<<std::endl;
-    
-      if(CWorkflowGraph::mapFilters_ptr==0) CWorkflowGraph::mapFilters_ptr = new std::unordered_map <int, StdString>;
-
-      (*CWorkflowGraph::mapFilters_ptr)[this->filterID.first] = "Source Filter";
-
-      if(CWorkflowGraph::mapFieldToFilters_ptr==0) CWorkflowGraph::mapFieldToFilters_ptr = new std::unordered_map <StdString, vector <int> >;
-
-
+      if(CXios::isClient) std::cout<<"source filter tag = "<<this->tag<<" start = "<<start_graph<<" end = "<<end_graph<<std::endl;
+    
+      if(CWorkflowGraph::mapFilters_ptr_with_info==0) CWorkflowGraph::mapFilters_ptr_with_info = new std::unordered_map <int, graph_info_box_node>;
+
+      (*CWorkflowGraph::mapFilters_ptr_with_info)[this->filterID].filter_name = "Source Filter "+ this->field->getId();
+      (*CWorkflowGraph::mapFilters_ptr_with_info)[this->filterID].filter_class = 1;
+      (*CWorkflowGraph::mapFilters_ptr_with_info)[this->filterID].filter_filled = 1;
+      (*CWorkflowGraph::mapFilters_ptr_with_info)[this->filterID].expected_entry_nb = 0;
+      (*CWorkflowGraph::mapFilters_ptr_with_info)[this->filterID].date = date;
+      (*CWorkflowGraph::mapFilters_ptr_with_info)[this->filterID].timestamp = packet->timestamp;
+
+      if(CWorkflowGraph::mapFieldToFilters_ptr_with_info==0) CWorkflowGraph::mapFieldToFilters_ptr_with_info = new std::unordered_map <int, graph_info_box_edge>;
+
+      CWorkflowGraph::build_begin = true;
     }
 
@@ -132 +136 @@
       }
     }
-    this->filterID.first = InvalidableObject::filterIdGenerator++;
-    packet->src_filterID=this->filterID.first;
+    this->filterID = InvalidableObject::filterIdGenerator++;
+    packet->src_filterID=this->filterID;
 
     if(CXios::isClient) std::cout<<"source filter filter tag = "<<this->tag<<std::endl;
-    
-    if(CWorkflowGraph::mapFilters_ptr==0) CWorkflowGraph::mapFilters_ptr = new std::unordered_map <int, StdString>;
-
-    (*CWorkflowGraph::mapFilters_ptr)[this->filterID.first] = "Source Filter";
-
-
 
     onOutputReady(packet);