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

Timestamp:

02/01/21 11:54:16 (3 years ago)

Author:

yushan

Message:

Graph intermediate commit to a tmp branch.

Location:

XIOS/dev/dev_trunk_graph/src/filter

Files:

• pass_through_filter.cpp (modified) (3 diffs)
• transform_filter.cpp (modified) (2 diffs)

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

@@ -19 +19 @@
     if(this->graphEnabled)
     {
-      if(data[0]->graphPackage->currentField->getId() == this->graphPackage->inFields[0]->getId())
+      if(data[0]->graphPackage && data[0]->graphPackage->currentField->getId() == this->graphPackage->inFields[0]->getId())
       {
         std::cout<<"PASS THROUGH FILTER OMITTED "<<this<<std::endl;
@@ -31 +31 @@
         data[0]->graphPackage = new CGraphDataPackage;
         data[0]->graphPackage->fromFilter = -1;
+        data[0]->graphPackage->currentField = this->graphPackage->inFields[0];
       }
 
@@ -52 +53 @@
       std::rotate(this->graphPackage->inFields.begin(), this->graphPackage->inFields.begin() + 1, this->graphPackage->inFields.end());
       
-      
       data[0]->graphPackage->fromFilter = this->graphPackage->filterId;
         

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

@@ -22 +22 @@
     if (packet->status == CDataPacket::NO_ERROR) 
     {
-      cout<<"transformeFilter = "<<this<<" and graphEnabled = "<<this->graphEnabled<<std::endl;
       buildWorkflowGraph(data, packet, algorithm_);
       
@@ -50 +49 @@
       packet->graphPackage->current_filter_name = data[0]->graphPackage->current_filter_name;
       packet->graphPackage->contextId = data[0]->graphPackage->contextId;          
-      packet->graphPackage->currentField = data[0]->graphPackage->currentField;//this->graphPackage->inFields[0];
     
-      CWorkflowGraph::addNode("Spatial transform filter "+algorithm->getAlgoName(), 4, false, 1, packet);
-      CWorkflowGraph::addEdge(packet->graphPackage->fromFilter, this->graphPackage->filterId, packet);
-      
-      
-      
-      packet->graphPackage->fromFilter = this->graphPackage->filterId;
-      packet->graphPackage->currentField = this->graphPackage->inFields[0];
-      std::rotate(this->graphPackage->inFields.begin(), this->graphPackage->inFields.begin() + 1, this->graphPackage->inFields.end());
+      int tmp_from = packet->graphPackage->fromFilter;
+      if(this->graphPackage->show)
+      {
+        packet->graphPackage->currentField = data[0]->graphPackage->currentField->getDirectFieldReference();//this->graphPackage->inFields[0];
+        CWorkflowGraph::addNode("Spatial transform filter "+algorithm->getAlgoName(), 4, false, 1, packet);
+        CWorkflowGraph::addEdge(packet->graphPackage->fromFilter, this->graphPackage->filterId, packet);
+        packet->graphPackage->fromFilter = this->graphPackage->filterId;
+        packet->graphPackage->currentField = this->graphPackage->inFields[0];
+        std::rotate(this->graphPackage->inFields.begin(), this->graphPackage->inFields.begin() + 1, this->graphPackage->inFields.end());
+      }
+      else
+      {
+        packet->graphPackage->currentField = this->graphPackage->inFields[0];
+        if(CXios::isClient) CWorkflowGraph::vectorOfNodes_->at(tmp_from).filter_name += algorithm->getAlgoName();
+        else                CWorkflowGraph::vectorOfNodes_srv_->at(tmp_from).filter_name += algorithm->getAlgoName();
+        
+      }     
     }
   }