Changeset 1681 for XIOS/dev/dev_trunk_omp/src/filter/file_writer_filter.cpp

Timestamp:

07/19/19 15:28:33 (5 years ago)

Author:

yushan

Message:

MARK: Dynamic workflow graph developement. Branch up to date with trunk @1676. Bug fixed

File:

• XIOS/dev/dev_trunk_omp/src/filter/file_writer_filter.cpp (modified) (3 diffs)

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

@@ -19 +19 @@
   }
 
-  void CFileWriterFilter::onInputReady(std::vector<CDataPacketPtr> data)
+  void CFileWriterFilter::buildGraph(std::vector<CDataPacketPtr> data)
   {
     bool building_graph = this->tag ? data[0]->timestamp >= this->start_graph && data[0]->timestamp <= this->end_graph: false;
@@ -29 +29 @@
 
       CWorkflowGraph::allocNodeEdge();
+      StdString namestring = to_string(this->field->name);
+      namestring.erase(0, 6);
+      namestring.erase(namestring.length()-1, 1);
 
-      CWorkflowGraph::addNode(this->filterID, "File Writer Filter \\n("+this->field->file->getId()+".nc)", 6, 0, 1, data[0]);
+      CWorkflowGraph::addNode(this->filterID, namestring + "\\n("+this->field->file->getId()+".nc)", 6, 0, 1, data[0]);
 
-      // (*CWorkflowGraph::mapFilters_ptr_with_info)[this->filterID].attributes = this->field->file->recordXiosAttributes();
-      (*CWorkflowGraph::mapFilters_ptr_with_info)[this->filterID].attributes = this->field->recordXiosAttributes();
-      (*CWorkflowGraph::mapFilters_ptr_with_info)[this->filterID].attributes += "</br>file attributes : </br>" +this->field->file->recordXiosAttributes();
-
-      // if(CXios::isClient) std::cout<<"CFileWriterFilter::apply filter tag = "<<this->tag<<" start = "<<start_graph<<" end = "<<end_graph<<std::endl;
+      (*CWorkflowGraph::mapFilters_ptr_with_info)[this->filterID].attributes = this->field->record4graphXiosAttributes();
+      (*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);
 
       if(CXios::isClient && CWorkflowGraph::build_begin) 
@@ -47 +49 @@
       else CWorkflowGraph::build_begin=true;
     }
+  }
+
+  void CFileWriterFilter::onInputReady(std::vector<CDataPacketPtr> data)
+  {
+    buildGraph(data);
     
     const bool detectMissingValue = ( !field->default_value.isEmpty() &&