Changeset 2028 for XIOS/dev/dev_trunk_graph/src/workflow_graph.cpp

Timestamp:

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

Author:

yushan

Message:

Graph intermediate commit to a tmp branch.

File:

• XIOS/dev/dev_trunk_graph/src/workflow_graph.cpp (modified) (4 diffs)

XIOS/dev/dev_trunk_graph/src/workflow_graph.cpp

@@ -4 +4 @@
 namespace xios
 {
-
-  
-
 
   std::vector<graph_node_object> *CWorkflowGraph::vectorOfNodes_ = 0;
   std::vector<graph_edge_object> *CWorkflowGraph::vectorOfEdges_ = 0;
   std::vector<StdString> *CWorkflowGraph::vectorOfContexts_ = 0;
-  
 
   std::vector<graph_node_object> *CWorkflowGraph::vectorOfNodes_srv_ = 0;
@@ -19 +15 @@
   bool CWorkflowGraph::clientGraphBuilt = false;
   bool CWorkflowGraph::serverGraphBuilt = false;
-
-
-
   bool CWorkflowGraph::build_begin = false;
 
@@ -105 +98 @@
       edge_obj.field = packet->graphPackage->currentField;
       edge_obj.show = true;
+      
+      if(vectorOfNodes_->at(from).filter_class == 2) // from pass through filter
+      {
+        edge_obj.label_info = vectorOfNodes_->at(from).label_field_id;
+      }
+      
       for(int i=0; i<vectorOfContexts_->size(); i++)
       {
@@ -273 +272 @@
       outfiles[ctx] << "\"from\":"<<vectorOfEdges_->at(i).from<<","<<std::endl;
       outfiles[ctx] << "\"to\":"<<vectorOfEdges_->at(i).to<<","<<std::endl;
-      if(vectorOfEdges_->at(i).show) outfiles[ctx] << "\"label\":"<<"\""<<vectorOfEdges_->at(i).field->getId()<<"\\n"<<vectorOfEdges_->at(i).date<<"\","<<std::endl;
-      else outfiles[ctx] << "\"label\":"<<"\"\\n"<<vectorOfEdges_->at(i).date<<"\","<<std::endl;
+      if(vectorOfEdges_->at(i).label_info != "none")
+      {
+        if(vectorOfEdges_->at(i).show) outfiles[ctx] << "\"label\":"<<"\""<<vectorOfEdges_->at(i).label_info<<"\\n"<<vectorOfEdges_->at(i).date<<"\","<<std::endl;
+        else outfiles[ctx] << "\"label\":"<<"\"\\n"<<vectorOfEdges_->at(i).date<<"\","<<std::endl;
+      }
+      else
+      {
+        if(vectorOfEdges_->at(i).show) outfiles[ctx] << "\"label\":"<<"\""<<vectorOfEdges_->at(i).field->getId()<<"\\n"<<vectorOfEdges_->at(i).date<<"\","<<std::endl;
+        else outfiles[ctx] << "\"label\":"<<"\"\\n"<<vectorOfEdges_->at(i).date<<"\","<<std::endl;
+      }
       outfiles[ctx] << "\"context\":"<<"\""<<vectorOfEdges_->at(i).context_id<<"\","<<std::endl;
       outfiles[ctx] << "\"attributes\":"<<"\""<<vectorOfEdges_->at(i).attributes<<"\","<<std::endl;