Changeset 1688

Timestamp:

08/06/19 12:58:44 (5 years ago)

Author:

yushan

Message:

dev for trunk with graph. trunk at r1684

Location:

XIOS/dev/dev_trunk_graph

Files:

• inputs/vis2.html (modified) (2 diffs)
• src/filter/file_writer_filter.cpp (modified) (1 diff)
• src/filter/pass_through_filter.cpp (modified) (2 diffs)
• src/filter/source_filter.cpp (modified) (1 diff)
• src/filter/spatial_transform_filter.cpp (modified) (1 diff)
• src/node/field.cpp (modified) (4 diffs)

XIOS/dev/dev_trunk_graph/inputs/vis2.html

@@ -216 +216 @@
 
                 nodes.update(allNode);
+
+                node = nodes.get(nodeSelected);
+                connectedEdgeArray = edges.get(network.getConnectedEdges(node.id));
+                for (j = 0; j < connectedEdgeArray.length; j++) {
+                    var edge = connectedEdgeArray[j];
+                    if (edge.from == node.id) {
+                        edge.hidden = false;
+                    }
+
+                }
+                edges.update(connectedEdgeArray);
 
                 allNode = nodes.get();
@@ -895 +906 @@
                                 },
 
-                                joinCondition: function(nodeOptions) {
-                                    return nodeOptions.cid === 2;
-
-                                }
-
 
                             };

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

@@ -36 +36 @@
       (*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);
+      (*CWorkflowGraph::mapFilters_ptr_with_info)[this->filterID].distance = data[0]->distance+1;
 
       if(CXios::isClient && CWorkflowGraph::build_begin) 

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

@@ -25 +25 @@
 
       CWorkflowGraph::addNode(this->filterID, "Pass Through Filter\\n("+data[0]->field->getId()+")", 2, 1, 1, data[0]);
-      (*CWorkflowGraph::mapFilters_ptr_with_info)[this->filterID].distance = ++(data[0]->distance);
+      (*CWorkflowGraph::mapFilters_ptr_with_info)[this->filterID].distance = data[0]->distance+1;
 
       (*CWorkflowGraph::mapFilters_ptr_with_info)[this->filterID].attributes = this->field->record4graphXiosAttributes();
@@ -39 +39 @@
       
       data[0]->src_filterID=this->filterID;
+      data[0]->distance++;
 
     }

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

@@ -28 +28 @@
   {
     bool building_graph = this->tag ? packet->timestamp >= this->field->field_graph_start && packet->timestamp <= this->field->field_graph_end : false;
-   
     if(building_graph)
     {

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

@@ -215 +215 @@
     }
 
+    if(BG) packet->src_filterID=this->filterID;
+    if(BG) packet->distance=data[0]->distance+1;
+    packet->field = field;
+
     return packet;
   }

XIOS/dev/dev_trunk_graph/src/node/field.cpp

@@ -1117 +1117 @@
    TRY
    {     
-    if (!isReferenceSolvedAndTransformed) solveAllEnabledFieldsAndTransform();
-    if (!isGridChecked) checkGridOfEnabledFields();
+     if (!isReferenceSolvedAndTransformed) solveAllEnabledFieldsAndTransform();
+     if (!isGridChecked) checkGridOfEnabledFields();
 
      const bool detectMissingValues = (!detect_missing_value.isEmpty() && !default_value.isEmpty() && detect_missing_value == true);
@@ -1234 +1234 @@
              if (grid && grid != gridRef && grid->hasTransform())
              {
-                 std::pair<std::shared_ptr<CFilter>, std::shared_ptr<CFilter> > filters = CSpatialTransformFilter::buildFilterGraph(gc, gridRef, grid, detectMissingValues, defaultValue); 
+               std::pair<std::shared_ptr<CFilter>, std::shared_ptr<CFilter> > filters = CSpatialTransformFilter::buildFilterGraph(gc, gridRef, grid, detectMissingValues, defaultValue);
 
                filter->connectOutput(filters.first, 0);
@@ -1517 +1517 @@
      CContext* context = CContext::getCurrent();
 
-     // Time filter_start;
-     // if(!build_workflow_graph_start.isEmpty() && buildWorkflowGraph) filter_start = context->calendar->getInitDate()+build_workflow_graph_start;
-     // else if(build_workflow_graph_start.isEmpty() && buildWorkflowGraph) filter_start = 0;
-     // else filter_start = -1;
-
-     // Time filter_end;
-     // if(!build_workflow_graph_end.isEmpty() && buildWorkflowGraph) filter_end = context->calendar->getInitDate()+build_workflow_graph_end;
-     // else if(build_workflow_graph_end.isEmpty() && buildWorkflowGraph) filter_end = 9223372036854775807;
-     // else filter_end = -1;
-
-     // filter_start = this->field_graph_start;
-     // filter_end = this->field_graph_end;
-
-     // if(CXios::isClient) std::cout<<"getTemporalDataFilter field_id = "<<this->getId()<<" this->field_graph_start = "<<this->field_graph_start<<" this->field_graph_end = "<<this->field_graph_end<<std::endl;
 
      if (it == temporalDataFilters.end())
@@ -1594 +1580 @@
        bool buildWorkflowGraph = (!build_workflow_graph.isEmpty() && build_workflow_graph == true);
        std::shared_ptr<CTemporalFilter> temporalFilter(new CTemporalFilter(gc, operation,
-                                                                             CContext::getCurrent()->getCalendar()->getInitDate(),
-                                                                             freq_op, freq_offset, outFreq, detectMissingValues));
+                                                                           CContext::getCurrent()->getCalendar()->getInitDate(),
+                                                                           freq_op, freq_offset, outFreq, detectMissingValues));
 
        selfReferenceFilter->connectOutput(temporalFilter, 0);