mirror of
https://github.com/weaveworks/scope.git
synced 2026-07-21 22:36:39 +00:00
Pentagon -> Heptagon!
This commit is contained in:
@@ -14,7 +14,7 @@ function polygon(r, sides) {
|
||||
return points;
|
||||
}
|
||||
|
||||
export default function NodeShapeSeptagon({onlyHighlight, highlighted, size, color}) {
|
||||
export default function NodeShapeHeptagon({onlyHighlight, highlighted, size, color}) {
|
||||
const scaledSize = size * 1.0;
|
||||
const pathProps = (v) => {
|
||||
return {
|
||||
@@ -9,7 +9,7 @@ import NodeShapeCircle from './node-shape-circle';
|
||||
import NodeShapeStack from './node-shape-stack';
|
||||
import NodeShapeRoundedSquare from './node-shape-rounded-square';
|
||||
import NodeShapeHex from './node-shape-hex';
|
||||
import NodeShapeSeptagon from './node-shape-septagon';
|
||||
import NodeShapeHeptagon from './node-shape-heptagon';
|
||||
import NodeShapeCloud from './node-shape-cloud';
|
||||
|
||||
function stackedShape(Shape) {
|
||||
@@ -23,7 +23,7 @@ function stackedShape(Shape) {
|
||||
const nodeShapes = {
|
||||
'circle': NodeShapeCircle,
|
||||
'hexagon': NodeShapeHex,
|
||||
'pentagon': NodeShapeSeptagon,
|
||||
'heptagon': NodeShapeHeptagon,
|
||||
'square': NodeShapeRoundedSquare,
|
||||
'cloud': NodeShapeCloud
|
||||
};
|
||||
|
||||
@@ -7,7 +7,7 @@ const log = debug('scope:debug-panel');
|
||||
import { receiveNodesDelta } from '../actions/app-actions';
|
||||
import AppStore from '../stores/app-store';
|
||||
|
||||
const SHAPES = ['circle', 'hexagon', 'square', 'pentagon'];
|
||||
const SHAPES = ['circle', 'hexagon', 'square', 'heptagon'];
|
||||
const NODE_COUNTS = [1, 2, 3];
|
||||
const STACK_VARIANTS = [true, false];
|
||||
|
||||
|
||||
@@ -12,7 +12,7 @@ import (
|
||||
var (
|
||||
circle = "circle"
|
||||
square = "square"
|
||||
pentagon = "pentagon"
|
||||
heptagon = "heptagon"
|
||||
hexagon = "hexagon"
|
||||
cloud = "cloud"
|
||||
|
||||
@@ -372,7 +372,7 @@ var (
|
||||
LabelMinor: "1 container",
|
||||
Rank: "ping/pong-a",
|
||||
Pseudo: false,
|
||||
Shape: pentagon,
|
||||
Shape: heptagon,
|
||||
Children: report.MakeNodeSet(
|
||||
fixture.Report.Process.Nodes[fixture.ClientProcess1NodeID],
|
||||
fixture.Report.Process.Nodes[fixture.ClientProcess2NodeID],
|
||||
@@ -392,7 +392,7 @@ var (
|
||||
LabelMinor: "1 container",
|
||||
Rank: "ping/pong-b",
|
||||
Pseudo: false,
|
||||
Shape: pentagon,
|
||||
Shape: heptagon,
|
||||
Children: report.MakeNodeSet(
|
||||
fixture.Report.Process.Nodes[fixture.ServerProcessNodeID],
|
||||
fixture.Report.Container.Nodes[fixture.ServerContainerNodeID],
|
||||
@@ -441,7 +441,7 @@ var (
|
||||
LabelMinor: "2 pods",
|
||||
Rank: fixture.ServiceID,
|
||||
Pseudo: false,
|
||||
Shape: pentagon,
|
||||
Shape: heptagon,
|
||||
Stack: true,
|
||||
Children: report.MakeNodeSet(
|
||||
fixture.Report.Process.Nodes[fixture.ClientProcess1NodeID],
|
||||
|
||||
@@ -211,7 +211,7 @@ func MapPodIdentity(m RenderableNode, _ report.Networks) RenderableNodes {
|
||||
)
|
||||
|
||||
node := NewRenderableNodeWith(id, major, "", rank, m)
|
||||
node.Shape = Pentagon
|
||||
node.Shape = Heptagon
|
||||
return RenderableNodes{id: node}
|
||||
}
|
||||
|
||||
@@ -231,7 +231,7 @@ func MapServiceIdentity(m RenderableNode, _ report.Networks) RenderableNodes {
|
||||
)
|
||||
|
||||
node := NewRenderableNodeWith(id, major, "", rank, m)
|
||||
node.Shape = Pentagon
|
||||
node.Shape = Heptagon
|
||||
node.Stack = true
|
||||
return RenderableNodes{id: node}
|
||||
}
|
||||
@@ -590,7 +590,7 @@ func MapPod2Service(n RenderableNode, _ report.Networks) RenderableNodes {
|
||||
n := NewDerivedNode(id, n.WithParents(report.EmptySets))
|
||||
n.Node.Counters = n.Node.Counters.Add(podsKey, 1)
|
||||
n.Children = n.Children.Add(n.Node)
|
||||
n.Shape = Pentagon
|
||||
n.Shape = Heptagon
|
||||
n.Stack = true
|
||||
result[id] = n
|
||||
}
|
||||
@@ -703,7 +703,7 @@ func MapContainer2Pod(n RenderableNode, _ report.Networks) RenderableNodes {
|
||||
}
|
||||
|
||||
result.Children = result.Children.Add(n.Node)
|
||||
result.Shape = Pentagon
|
||||
result.Shape = Heptagon
|
||||
return RenderableNodes{id: result}
|
||||
}
|
||||
|
||||
|
||||
@@ -26,7 +26,7 @@ type RenderableNode struct {
|
||||
const (
|
||||
Circle = "circle"
|
||||
Square = "square"
|
||||
Pentagon = "pentagon"
|
||||
Heptagon = "heptagon"
|
||||
Hexagon = "hexagon"
|
||||
Cloud = "cloud"
|
||||
)
|
||||
|
||||
Reference in New Issue
Block a user