github/weave-scope
1
0
Fork 0
mirror of https://github.com/weaveworks/scope.git synced 2026-07-27 17:21:34 +00:00
Code Issues Packages Projects Releases Wiki Activity

Rollback aggNode.nodeCount which was used for the stack shape.

Browse Source 
We're not using greyed out lower stacks for now.
This commit is contained in:
Simon Howe
2016-02-22 12:14:26 +01:00
parent 96c34507d6
commit dca7408ec1
3 changed files with 0 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
render/renderable_node.go
View File

@@ -17,7 +17,6 @@ type RenderableNode struct {
ControlNode string `json:"-"` // ID of node from which to show the controls in the UI
Shape string `json:"shape"` // Shape node should be rendered as
Stack bool `json:"stack"` // Should UI render this node as a stack?
NodeCount int `json:"node_count,omitempty"` // Number of nodes represented by this stack.
report.EdgeMetadata `json:"metadata"` // Numeric sums
report.Node
@@ -43,7 +42,6 @@ func NewRenderableNode(id string) RenderableNode {
EdgeMetadata: report.EdgeMetadata{},
Node: report.MakeNode(),
Shape: Circle,
NodeCount: 0,
}
}
@@ -59,7 +57,6 @@ func NewRenderableNodeWith(id, major, minor, rank string, node RenderableNode) R
EdgeMetadata: node.EdgeMetadata.Copy(),
Node: node.Node.Copy(),
Shape: Circle,
NodeCount: 0,
}
}
@@ -76,7 +73,6 @@ func NewDerivedNode(id string, node RenderableNode) RenderableNode {
Node: node.Node.Copy(),
ControlNode: "", // Do not propagate ControlNode when making a derived node!
Shape: Circle,
NodeCount: 0,
}
}
@@ -91,7 +87,6 @@ func newDerivedPseudoNode(id, major string, node RenderableNode) RenderableNode
EdgeMetadata: node.EdgeMetadata.Copy(),
Node: node.Node.Copy(),
Shape: Circle,
NodeCount: 0,
}
}
@@ -133,10 +128,6 @@ func (rn RenderableNode) Merge(other RenderableNode) RenderableNode {
panic(result.ID)
}
if result.NodeCount == 0 {
result.NodeCount = other.NodeCount
}
result.Stack = result.Stack || rn.Stack
result.Children = rn.Children.Merge(other.Children)
result.EdgeMetadata = rn.EdgeMetadata.Merge(other.EdgeMetadata)
@@ -159,7 +150,6 @@ func (rn RenderableNode) Copy() RenderableNode {
ControlNode: rn.ControlNode,
Shape: rn.Shape,
Stack: rn.Stack,
NodeCount: rn.NodeCount,
}
}