Changeset 1679 for XIOS/dev/dev_trunk_omp/src/filter/store_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/store_filter.cpp (modified) (1 diff)

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

@@ -90 +90 @@
   void CStoreFilter::onInputReady(std::vector<CDataPacketPtr> data)
   {
-    if(CXios::isClient) std::cout<<"CStoreFilter onInputReady"<<std::endl;
 
-    if(this->tag)
+    bool building_graph = this->tag ? data[0]->timestamp >= this->start_graph && data[0]->timestamp <= this->end_graph : false;
+
+    if(building_graph)
     {
       this->filterID = InvalidableObject::filterIdGenerator++;
+      int edgeID = InvalidableObject::edgeIdGenerator++;
 
-      if(CWorkflowGraph::mapFieldToFilters_ptr==0) CWorkflowGraph::mapFieldToFilters_ptr = new std::unordered_map <StdString, vector <int> >;
-      if(CWorkflowGraph::mapFilters_ptr==0) CWorkflowGraph::mapFilters_ptr = new std::unordered_map <int, StdString>;
+      if(CWorkflowGraph::mapFieldToFilters_ptr_with_info==0) CWorkflowGraph::mapFieldToFilters_ptr_with_info = new std::unordered_map <int, graph_info_box_edge >;
+      if(CWorkflowGraph::mapFilters_ptr_with_info==0) CWorkflowGraph::mapFilters_ptr_with_info = new std::unordered_map <int, graph_info_box_node>;
 
-      (*CWorkflowGraph::mapFilters_ptr)[this->filterID] = "Store Filter";
+
+      (*CWorkflowGraph::mapFilters_ptr_with_info)[this->filterID].filter_name = "Store Filter";
+      (*CWorkflowGraph::mapFilters_ptr_with_info)[this->filterID].filter_class = 4;
+      (*CWorkflowGraph::mapFilters_ptr_with_info)[this->filterID].filter_filled = 1;
+      (*CWorkflowGraph::mapFilters_ptr_with_info)[this->filterID].expected_entry_nb = 1;
+      (*CWorkflowGraph::mapFilters_ptr_with_info)[this->filterID].date = data[0]->date;
+      (*CWorkflowGraph::mapFilters_ptr_with_info)[this->filterID].timestamp = data[0]->timestamp;
 
       if(CXios::isClient) std::cout<<"CStoreFilter::apply filter tag = "<<this->tag<<std::endl;
 
-      if(CXios::isClient) 
+      if(CXios::isClient && CWorkflowGraph::build_begin) 
       {
-        StdString str = data[0]->fieldID +" ts=" + to_string(data[0]->timestamp);
-        (*CWorkflowGraph::mapFieldToFilters_ptr)[str].push_back(data[0]->src_filterID);
-        (*CWorkflowGraph::mapFieldToFilters_ptr)[str].push_back(this->filterID);  
+        CWorkflowGraph::addEdge(edgeID, this->filterID, data[0]);;
+        (*CWorkflowGraph::mapFilters_ptr_with_info)[data[0]->src_filterID].filter_filled = 0;
       }
+      else CWorkflowGraph::build_begin = true;
     }