From 569ca9d3d9d023cb8a9b4ed486073515a445d609 Mon Sep 17 00:00:00 2001 From: Simon Howe Date: Thu, 25 Feb 2016 16:27:13 +0100 Subject: [PATCH] Pentagon -> Heptagon! --- .../{node-shape-septagon.js => node-shape-heptagon.js} | 2 +- client/app/scripts/charts/node.js | 4 ++-- client/app/scripts/components/debug-toolbar.js | 2 +- render/expected/expected.go | 8 ++++---- render/mapping.go | 8 ++++---- render/renderable_node.go | 2 +- 6 files changed, 13 insertions(+), 13 deletions(-) rename client/app/scripts/charts/{node-shape-septagon.js => node-shape-heptagon.js} (94%) diff --git a/client/app/scripts/charts/node-shape-septagon.js b/client/app/scripts/charts/node-shape-heptagon.js similarity index 94% rename from client/app/scripts/charts/node-shape-septagon.js rename to client/app/scripts/charts/node-shape-heptagon.js index fedcf58c1..f595d8659 100644 --- a/client/app/scripts/charts/node-shape-septagon.js +++ b/client/app/scripts/charts/node-shape-heptagon.js @@ -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 { diff --git a/client/app/scripts/charts/node.js b/client/app/scripts/charts/node.js index 8b68ff4c6..3413f2395 100644 --- a/client/app/scripts/charts/node.js +++ b/client/app/scripts/charts/node.js @@ -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 }; diff --git a/client/app/scripts/components/debug-toolbar.js b/client/app/scripts/components/debug-toolbar.js index 8dc56c764..16054e9e8 100644 --- a/client/app/scripts/components/debug-toolbar.js +++ b/client/app/scripts/components/debug-toolbar.js @@ -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]; diff --git a/render/expected/expected.go b/render/expected/expected.go index 026da4157..70a9dcccf 100644 --- a/render/expected/expected.go +++ b/render/expected/expected.go @@ -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], diff --git a/render/mapping.go b/render/mapping.go index be6526634..6bdd0745a 100644 --- a/render/mapping.go +++ b/render/mapping.go @@ -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} } diff --git a/render/renderable_node.go b/render/renderable_node.go index c35357cd8..6d43b63eb 100644 --- a/render/renderable_node.go +++ b/render/renderable_node.go @@ -26,7 +26,7 @@ type RenderableNode struct { const ( Circle = "circle" Square = "square" - Pentagon = "pentagon" + Heptagon = "heptagon" Hexagon = "hexagon" Cloud = "cloud" )