Changeset 2028


Ignore:
Timestamp:
02/03/21 17:42:33 (9 months ago)
Author:
yushan
Message:

Graph intermediate commit to a tmp branch.

Location:
XIOS/dev/dev_trunk_graph/src
Files:
8 edited

Legend:

Unmodified
Added
Removed
  • XIOS/dev/dev_trunk_graph/src/filter/pass_through_filter.cpp

    r2026 r2028  
    3636      for(int i=0; i<this->graphPackage->filterId; i++) 
    3737      { 
    38         if(  (*CWorkflowGraph::vectorOfNodes_)[i].label_field_id == this->label_field_id   
     38        if(CXios::isClient  
     39          &&  (*CWorkflowGraph::vectorOfNodes_)[i].label_field_id == this->label_field_id   
    3940          && (*CWorkflowGraph::vectorOfNodes_)[i].timestamp == data[0]->timestamp 
    40           && CXios::isClient 
    4141          && (*CWorkflowGraph::vectorOfNodes_)[i].filter_name == "Pass through filter" ) 
    4242        { 
  • XIOS/dev/dev_trunk_graph/src/filter/temporal_filter.cpp

    r2023 r2028  
    4747        graphCycleCompleted = false; 
    4848      } 
     49       
     50      data[0]->graphPackage->currentField = this->graphPackage->inFields[0]; 
     51      std::rotate(this->graphPackage->inFields.begin(), this->graphPackage->inFields.begin() + 1, this->graphPackage->inFields.end()); 
    4952       
    5053      CWorkflowGraph::addEdge(data[0]->graphPackage->fromFilter, this->graphPackage->filterId, data[0]); 
  • XIOS/dev/dev_trunk_graph/src/filter/transform_filter.cpp

    r2026 r2028  
    5353      if(this->graphPackage->show) 
    5454      { 
    55         packet->graphPackage->currentField = data[0]->graphPackage->currentField->getDirectFieldReference();//this->graphPackage->inFields[0]; 
     55        //packet->graphPackage->currentField = data[0]->graphPackage->currentField->getDirectFieldReference();//this->graphPackage->inFields[0]; 
     56        packet->graphPackage->currentField = this->graphPackage->inFields[0]; 
    5657        CWorkflowGraph::addNode("Spatial transform filter "+algorithm->getAlgoName(), 4, false, 1, packet); 
    5758        CWorkflowGraph::addEdge(packet->graphPackage->fromFilter, this->graphPackage->filterId, packet); 
  • XIOS/dev/dev_trunk_graph/src/node/field.hpp

    r2027 r2028  
    236236          bool isGridCompleted_ = true ; 
    237237      public: 
    238           bool isGridCompleted() { }  
     238          bool isGridCompleted() ;  
    239239          void setGridCompleted(void) { isGridCompleted_= true; } 
    240240          void unsetGridCompleted(void) { isGridCompleted_ = false ;} 
  • XIOS/dev/dev_trunk_graph/src/transformation/domain_algorithm/domain_algorithm_generate_rectilinear.hpp

    r2019 r2028  
    3535  static bool registerTrans(); 
    3636  virtual bool isGenerateTransformation(void) { return true ;} 
    37  
     37  virtual StdString getAlgoName() {return "\\ngenerate_rectilinear_domain";} 
    3838protected: 
    3939  void computeIndexSourceMapping_(const std::vector<CArray<double,1>* >& dataAuxInputs); 
  • XIOS/dev/dev_trunk_graph/src/transformation/domain_algorithm/domain_algorithm_interpolate.hpp

    r2019 r2028  
    3939 
    4040  static bool registerTrans(); 
     41  virtual StdString getAlgoName() {return "\\ninterpolate_domain";} 
    4142 
    4243private: 
  • XIOS/dev/dev_trunk_graph/src/workflow_graph.cpp

    r2026 r2028  
    44namespace xios 
    55{ 
    6  
    7    
    8  
    96 
    107  std::vector<graph_node_object> *CWorkflowGraph::vectorOfNodes_ = 0; 
    118  std::vector<graph_edge_object> *CWorkflowGraph::vectorOfEdges_ = 0; 
    129  std::vector<StdString> *CWorkflowGraph::vectorOfContexts_ = 0; 
    13    
    1410 
    1511  std::vector<graph_node_object> *CWorkflowGraph::vectorOfNodes_srv_ = 0; 
     
    1915  bool CWorkflowGraph::clientGraphBuilt = false; 
    2016  bool CWorkflowGraph::serverGraphBuilt = false; 
    21  
    22  
    23  
    2417  bool CWorkflowGraph::build_begin = false; 
    2518 
     
    10598      edge_obj.field = packet->graphPackage->currentField; 
    10699      edge_obj.show = true; 
     100       
     101      if(vectorOfNodes_->at(from).filter_class == 2) // from pass through filter 
     102      { 
     103        edge_obj.label_info = vectorOfNodes_->at(from).label_field_id; 
     104      } 
     105       
    107106      for(int i=0; i<vectorOfContexts_->size(); i++) 
    108107      { 
     
    273272      outfiles[ctx] << "\"from\":"<<vectorOfEdges_->at(i).from<<","<<std::endl; 
    274273      outfiles[ctx] << "\"to\":"<<vectorOfEdges_->at(i).to<<","<<std::endl; 
    275       if(vectorOfEdges_->at(i).show) outfiles[ctx] << "\"label\":"<<"\""<<vectorOfEdges_->at(i).field->getId()<<"\\n"<<vectorOfEdges_->at(i).date<<"\","<<std::endl; 
    276       else outfiles[ctx] << "\"label\":"<<"\"\\n"<<vectorOfEdges_->at(i).date<<"\","<<std::endl; 
     274      if(vectorOfEdges_->at(i).label_info != "none") 
     275      { 
     276        if(vectorOfEdges_->at(i).show) outfiles[ctx] << "\"label\":"<<"\""<<vectorOfEdges_->at(i).label_info<<"\\n"<<vectorOfEdges_->at(i).date<<"\","<<std::endl; 
     277        else outfiles[ctx] << "\"label\":"<<"\"\\n"<<vectorOfEdges_->at(i).date<<"\","<<std::endl; 
     278      } 
     279      else 
     280      { 
     281        if(vectorOfEdges_->at(i).show) outfiles[ctx] << "\"label\":"<<"\""<<vectorOfEdges_->at(i).field->getId()<<"\\n"<<vectorOfEdges_->at(i).date<<"\","<<std::endl; 
     282        else outfiles[ctx] << "\"label\":"<<"\"\\n"<<vectorOfEdges_->at(i).date<<"\","<<std::endl; 
     283      } 
    277284      outfiles[ctx] << "\"context\":"<<"\""<<vectorOfEdges_->at(i).context_id<<"\","<<std::endl; 
    278285      outfiles[ctx] << "\"attributes\":"<<"\""<<vectorOfEdges_->at(i).attributes<<"\","<<std::endl; 
  • XIOS/dev/dev_trunk_graph/src/workflow_graph.hpp

    r2026 r2028  
    5555    int context; 
    5656    bool show; 
     57    StdString label_info; 
    5758     
    58     graph_edge_object():show(true){} 
     59    graph_edge_object():show(true), label_info("none"){} 
    5960  }; 
    6061 
     
    100101      static int  getNodeSize(); 
    101102 
    102  
    103  
    104        
    105  
    106  
    107     private: 
    108  
    109       //! List of fields marked for visualizing of their workflow 
    110       static vector <StdString> fields; 
    111  
    112       //! List of connected filters for fields for visualizing of their workflow 
    113       static vector <StdString> filters; 
    114  
    115       //! Fields to filters connectivity 
    116       static vector <pair<int, int> > fieldsToFilters; 
    117  
    118       static void buildStaticWorkflow(); 
    119  
    120  
    121  
    122103  }; 
    123104 
Note: See TracChangeset for help on using the changeset viewer.