Merge pull request #69 from owulveryck/pipeline

Adding pipelines in wtg

Author: owulveryck

components/wardley/component.go

@@ -39,7 +39,8 @@ type Component struct {
 	Color               color.Color
 	AbsoluteVisibility  int
 	Anchor              int
-	PipelinedComponents map[string]*Component
+	PipelinedComponents []*Component
+	PipelineReference   *Component
 }
 
 // GetAbsoluteVisibility returns the visibility of the component as seen from the anchor
@@ -141,8 +142,8 @@ func (c *Component) marshalSVGPipeline(e *xml.Encoder, canvas image.Rectangle, c
 			R:           image.Rect(lowestBound.X, lowestBound.Y+10, greaterBound.X, greaterBound.Y-10),
 			Rx:          0,
 			Ry:          0,
-			Fill:        svg.Color{},
-			Stroke:      svg.Color{},
+			Fill:        svg.Transparent,
+			Stroke:      svg.Black,
 			StrokeWidth: "1",
 			Style:       "",
 		})
@@ -167,8 +168,8 @@ func (c *Component) marshalSVGPipeline(e *xml.Encoder, canvas image.Rectangle, c
 	components := make([]interface{}, 0)
 	components = append(components, svg.Rectangle{
 		R: image.Rectangle{
-			Min: image.Point{-5, -5},
-			Max: image.Point{5, 5},
+			Min: image.Point{-5, -15},
+			Max: image.Point{5, -5},
 		},
 		StrokeWidth: "3",
 		Stroke:      col,

components/wardley/component_test.go

@@ -33,8 +33,8 @@ func TestComponent_MarshalSVG(t *testing.T) {
 		EvolutionPos:       0,
 		Color:              color.Gray{},
 		AbsoluteVisibility: 0,
-		PipelinedComponents: map[string]*Component{
-			"p1": {
+		PipelinedComponents: []*Component{
+			{
 				id:                  0,
 				Placement:           image.Point{20, 50},
 				Label:               "p1",
@@ -47,7 +47,7 @@ func TestComponent_MarshalSVG(t *testing.T) {
 				AbsoluteVisibility:  0,
 				PipelinedComponents: nil,
 			},
-			"p2": {
+			{
 				id:                  0,
 				Placement:           image.Point{70, 50},
 				Label:               "p2",

components/wardley/util.go

@@ -5,7 +5,7 @@ import (
 	"sort"
 )
 
-func getBounds(cs map[string]*Component) image.Rectangle {
+func getBounds(cs []*Component) image.Rectangle {
 	csCopy := make([]*Component, len(cs))
 	i := 0
 	for _, c := range cs {

docs/wtg.wasm

@@ -1,8 +1,8 @@
 a - b
 b -- c
-c -- d
+c -- d:dd
 c --- e
-e ---- f
+e:ee ---- f
 
 a: |.|.|x|.|
 b: |.|.|.x|.|