luciano/d2
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

add FullShape to use shape's InnerBox for placement

Browse source
This commit is contained in:
Gavin Nishizawa 2023-02-10 11:03:07 -08:00
parent 6b65665b61
commit 93fa13ab0f
No known key found for this signature in database
GPG key ID: AE3B177777CE55CD
23 changed files with 97 additions and 27 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
lib/shape/shape.go
View file

@ -5,6 +5,7 @@ import (
"oss.terrastruct.com/d2/lib/geo"
"oss.terrastruct.com/d2/lib/svg"
"oss.terrastruct.com/util-go/go2"
)
const (
@ -58,8 +59,9 @@ type Shape interface {
}
type baseShape struct {
Type string
Box *geo.Box
Type string
Box *geo.Box
FullShape *Shape
}
func (s baseShape) Is(shapeType string) bool {
@ -87,8 +89,8 @@ func (s baseShape) GetInnerBox() *geo.Box {
}
func (s baseShape) GetInsidePlacement(_, _, padding float64) geo.Point {
innerTL := s.GetInnerBox().TopLeft
return *geo.NewPoint(innerTL.X+padding, innerTL.Y+padding)
innerTL := (*s.FullShape).GetInnerBox().TopLeft
return *geo.NewPoint(innerTL.X+padding/2, innerTL.Y+padding/2)
}
// return the minimum shape dimensions needed to fit content (width x height)
@ -157,12 +159,14 @@ func NewShape(shapeType string, box *geo.Box) Shape {
return NewText(box)
default:
return shapeSquare{
shape := shapeSquare{
baseShape: &baseShape{
Type: shapeType,
Box: box,
},
}
shape.FullShape = go2.Pointer(Shape(shape))
return shape
}
}

5
lib/shape/shape_callout.go
View file

@ -5,6 +5,7 @@ import (
"oss.terrastruct.com/d2/lib/geo"
"oss.terrastruct.com/d2/lib/svg"
"oss.terrastruct.com/util-go/go2"
)
type shapeCallout struct {
@ -17,12 +18,14 @@ const (
)
func NewCallout(box *geo.Box) Shape {
return shapeCallout{
shape := shapeCallout{
baseShape: &baseShape{
Type: CALLOUT_TYPE,
Box: box,
},
}
shape.FullShape = go2.Pointer(Shape(shape))
return shape
}
func getTipWidth(box *geo.Box) float64 {

5
lib/shape/shape_circle.go
View file

@ -4,6 +4,7 @@ import (
"math"
"oss.terrastruct.com/d2/lib/geo"
"oss.terrastruct.com/util-go/go2"
)
type shapeCircle struct {
@ -11,12 +12,14 @@ type shapeCircle struct {
}
func NewCircle(box *geo.Box) Shape {
return shapeCircle{
shape := shapeCircle{
baseShape: &baseShape{
Type: CIRCLE_TYPE,
Box: box,
},
}
shape.FullShape = go2.Pointer(Shape(shape))
return shape
}
func (s shapeCircle) GetInnerBox() *geo.Box {

5
lib/shape/shape_class.go
View file

@ -2,6 +2,7 @@ package shape
import (
"oss.terrastruct.com/d2/lib/geo"
"oss.terrastruct.com/util-go/go2"
)
// Class is basically a rectangle
@ -10,7 +11,7 @@ type shapeClass struct {
}
func NewClass(box *geo.Box) Shape {
return shapeClass{
shape := shapeClass{
shapeSquare{
baseShape: &baseShape{
Type: CLASS_TYPE,
@ -18,6 +19,8 @@ func NewClass(box *geo.Box) Shape {
},
},
}
shape.FullShape = go2.Pointer(Shape(shape))
return shape
}
func (s shapeClass) GetDefaultPadding() (paddingX, paddingY float64) {

5
lib/shape/shape_cloud.go
View file

@ -5,6 +5,7 @@ import (
"oss.terrastruct.com/d2/lib/geo"
"oss.terrastruct.com/d2/lib/svg"
"oss.terrastruct.com/util-go/go2"
)
// The percentage values of the cloud's wide inner box
@ -32,12 +33,14 @@ type shapeCloud struct {
}
func NewCloud(box *geo.Box) Shape {
return shapeCloud{
shape := shapeCloud{
baseShape: &baseShape{
Type: CLOUD_TYPE,
Box: box,
},
}
shape.FullShape = go2.Pointer(Shape(shape))
return shape
}
func (s shapeCloud) GetInnerBox() *geo.Box {

5
lib/shape/shape_code.go
View file

@ -2,6 +2,7 @@ package shape
import (
"oss.terrastruct.com/d2/lib/geo"
"oss.terrastruct.com/util-go/go2"
)
type shapeCode struct {
@ -9,7 +10,7 @@ type shapeCode struct {
}
func NewCode(box *geo.Box) Shape {
return shapeCode{
shape := shapeCode{
shapeSquare: shapeSquare{
baseShape: &baseShape{
Type: CODE_TYPE,
@ -17,6 +18,8 @@ func NewCode(box *geo.Box) Shape {
},
},
}
shape.FullShape = go2.Pointer(Shape(shape))
return shape
}
func (s shapeCode) GetDefaultPadding() (paddingX, paddingY float64) {

5
lib/shape/shape_cylinder.go
View file

@ -5,6 +5,7 @@ import (
"oss.terrastruct.com/d2/lib/geo"
"oss.terrastruct.com/d2/lib/svg"
"oss.terrastruct.com/util-go/go2"
)
type shapeCylinder struct {
@ -16,12 +17,14 @@ const (
)
func NewCylinder(box *geo.Box) Shape {
return shapeCylinder{
shape := shapeCylinder{
baseShape: &baseShape{
Type: CYLINDER_TYPE,
Box: box,
},
}
shape.FullShape = go2.Pointer(Shape(shape))
return shape
}
func getArcHeight(box *geo.Box) float64 {

5
lib/shape/shape_diamond.go
View file

@ -5,6 +5,7 @@ import (
"oss.terrastruct.com/d2/lib/geo"
"oss.terrastruct.com/d2/lib/svg"
"oss.terrastruct.com/util-go/go2"
)
type shapeDiamond struct {
@ -12,12 +13,14 @@ type shapeDiamond struct {
}
func NewDiamond(box *geo.Box) Shape {
return shapeDiamond{
shape := shapeDiamond{
baseShape: &baseShape{
Type: DIAMOND_TYPE,
Box: box,
},
}
shape.FullShape = go2.Pointer(Shape(shape))
return shape
}
func (s shapeDiamond) GetInnerBox() *geo.Box {

5
lib/shape/shape_document.go
View file

@ -5,6 +5,7 @@ import (
"oss.terrastruct.com/d2/lib/geo"
"oss.terrastruct.com/d2/lib/svg"
"oss.terrastruct.com/util-go/go2"
)
type shapeDocument struct {
@ -19,12 +20,14 @@ const (
)
func NewDocument(box *geo.Box) Shape {
return shapeDocument{
shape := shapeDocument{
baseShape: &baseShape{
Type: DOCUMENT_TYPE,
Box: box,
},
}
shape.FullShape = go2.Pointer(Shape(shape))
return shape
}
func (s shapeDocument) GetInnerBox() *geo.Box {

5
lib/shape/shape_hexagon.go
View file

@ -5,6 +5,7 @@ import (
"oss.terrastruct.com/d2/lib/geo"
"oss.terrastruct.com/d2/lib/svg"
"oss.terrastruct.com/util-go/go2"
)
type shapeHexagon struct {
@ -12,12 +13,14 @@ type shapeHexagon struct {
}
func NewHexagon(box *geo.Box) Shape {
return shapeHexagon{
shape := shapeHexagon{
baseShape: &baseShape{
Type: HEXAGON_TYPE,
Box: box,
},
}
shape.FullShape = go2.Pointer(Shape(shape))
return shape
}
func (s shapeHexagon) GetInnerBox() *geo.Box {

5
lib/shape/shape_image.go
View file

@ -2,6 +2,7 @@ package shape
import (
"oss.terrastruct.com/d2/lib/geo"
"oss.terrastruct.com/util-go/go2"
)
type shapeImage struct {
@ -9,12 +10,14 @@ type shapeImage struct {
}
func NewImage(box *geo.Box) Shape {
return shapeImage{
shape := shapeImage{
baseShape: &baseShape{
Type: IMAGE_TYPE,
Box: box,
},
}
shape.FullShape = go2.Pointer(Shape(shape))
return shape
}
func (s shapeImage) IsRectangular() bool {

5
lib/shape/shape_oval.go
View file

@ -4,6 +4,7 @@ import (
"math"
"oss.terrastruct.com/d2/lib/geo"
"oss.terrastruct.com/util-go/go2"
)
type shapeOval struct {
@ -11,12 +12,14 @@ type shapeOval struct {
}
func NewOval(box *geo.Box) Shape {
return shapeOval{
shape := shapeOval{
baseShape: &baseShape{
Type: OVAL_TYPE,
Box: box,
},
}
shape.FullShape = go2.Pointer(Shape(shape))
return shape
}
func (s shapeOval) GetInnerBox() *geo.Box {

5
lib/shape/shape_package.go
View file

@ -5,6 +5,7 @@ import (
"oss.terrastruct.com/d2/lib/geo"
"oss.terrastruct.com/d2/lib/svg"
"oss.terrastruct.com/util-go/go2"
)
type shapePackage struct {
@ -21,12 +22,14 @@ const (
)
func NewPackage(box *geo.Box) Shape {
return shapePackage{
shape := shapePackage{
baseShape: &baseShape{
Type: PACKAGE_TYPE,
Box: box,
},
}
shape.FullShape = go2.Pointer(Shape(shape))
return shape
}
func (s shapePackage) GetInnerBox() *geo.Box {

5
lib/shape/shape_page.go
View file

@ -5,6 +5,7 @@ import (
"oss.terrastruct.com/d2/lib/geo"
"oss.terrastruct.com/d2/lib/svg"
"oss.terrastruct.com/util-go/go2"
)
type shapePage struct {
@ -18,12 +19,14 @@ const (
)
func NewPage(box *geo.Box) Shape {
return shapePage{
shape := shapePage{
baseShape: &baseShape{
Type: PAGE_TYPE,
Box: box,
},
}
shape.FullShape = go2.Pointer(Shape(shape))
return shape
}
func (s shapePage) GetInnerBox() *geo.Box {

5
lib/shape/shape_parallelogram.go
View file

@ -5,6 +5,7 @@ import (
"oss.terrastruct.com/d2/lib/geo"
"oss.terrastruct.com/d2/lib/svg"
"oss.terrastruct.com/util-go/go2"
)
type shapeParallelogram struct {
@ -14,12 +15,14 @@ type shapeParallelogram struct {
const parallelWedgeWidth = 26.
func NewParallelogram(box *geo.Box) Shape {
return shapeParallelogram{
shape := shapeParallelogram{
baseShape: &baseShape{
Type: PARALLELOGRAM_TYPE,
Box: box,
},
}
shape.FullShape = go2.Pointer(Shape(shape))
return shape
}
func (s shapeParallelogram) GetInnerBox() *geo.Box {

5
lib/shape/shape_person.go
View file

@ -5,6 +5,7 @@ import (
"oss.terrastruct.com/d2/lib/geo"
"oss.terrastruct.com/d2/lib/svg"
"oss.terrastruct.com/util-go/go2"
)
type shapePerson struct {
@ -12,12 +13,14 @@ type shapePerson struct {
}
func NewPerson(box *geo.Box) Shape {
return shapePerson{
shape := shapePerson{
baseShape: &baseShape{
Type: PERSON_TYPE,
Box: box,
},
}
shape.FullShape = go2.Pointer(Shape(shape))
return shape
}
const (

5
lib/shape/shape_queue.go
View file

@ -5,6 +5,7 @@ import (
"oss.terrastruct.com/d2/lib/geo"
"oss.terrastruct.com/d2/lib/svg"
"oss.terrastruct.com/util-go/go2"
)
type shapeQueue struct {
@ -12,12 +13,14 @@ type shapeQueue struct {
}
func NewQueue(box *geo.Box) Shape {
return shapeQueue{
shape := shapeQueue{
baseShape: &baseShape{
Type: QUEUE_TYPE,
Box: box,
},
}
shape.FullShape = go2.Pointer(Shape(shape))
return shape
}
func getArcWidth(box *geo.Box) float64 {

5
lib/shape/shape_real_square.go
View file

@ -4,6 +4,7 @@ import (
"math"
"oss.terrastruct.com/d2/lib/geo"
"oss.terrastruct.com/util-go/go2"
)
type shapeRealSquare struct {
@ -11,12 +12,14 @@ type shapeRealSquare struct {
}
func NewRealSquare(box *geo.Box) Shape {
return shapeRealSquare{
shape := shapeRealSquare{
baseShape: &baseShape{
Type: REAL_SQUARE_TYPE,
Box: box,
},
}
shape.FullShape = go2.Pointer(Shape(shape))
return shape
}
func (s shapeRealSquare) AspectRatio1() bool {

5
lib/shape/shape_square.go
View file

@ -2,6 +2,7 @@ package shape
import (
"oss.terrastruct.com/d2/lib/geo"
"oss.terrastruct.com/util-go/go2"
)
type shapeSquare struct {
@ -9,12 +10,14 @@ type shapeSquare struct {
}
func NewSquare(box *geo.Box) Shape {
return shapeSquare{
shape := shapeSquare{
baseShape: &baseShape{
Type: SQUARE_TYPE,
Box: box,
},
}
shape.FullShape = go2.Pointer(Shape(shape))
return shape
}
func (s shapeSquare) IsRectangular() bool {

5
lib/shape/shape_step.go
View file

@ -5,6 +5,7 @@ import (
"oss.terrastruct.com/d2/lib/geo"
"oss.terrastruct.com/d2/lib/svg"
"oss.terrastruct.com/util-go/go2"
)
type shapeStep struct {
@ -12,12 +13,14 @@ type shapeStep struct {
}
func NewStep(box *geo.Box) Shape {
return shapeStep{
shape := shapeStep{
baseShape: &baseShape{
Type: STEP_TYPE,
Box: box,
},
}
shape.FullShape = go2.Pointer(Shape(shape))
return shape
}
const STEP_WEDGE_WIDTH = 35.0

5
lib/shape/shape_stored_data.go
View file

@ -5,6 +5,7 @@ import (
"oss.terrastruct.com/d2/lib/geo"
"oss.terrastruct.com/d2/lib/svg"
"oss.terrastruct.com/util-go/go2"
)
type shapeStoredData struct {
@ -14,12 +15,14 @@ type shapeStoredData struct {
const storedDataWedgeWidth = 15.
func NewStoredData(box *geo.Box) Shape {
return shapeStoredData{
shape := shapeStoredData{
baseShape: &baseShape{
Type: STORED_DATA_TYPE,
Box: box,
},
}
shape.FullShape = go2.Pointer(Shape(shape))
return shape
}
func (s shapeStoredData) GetInnerBox() *geo.Box {

5
lib/shape/shape_table.go
View file

@ -2,6 +2,7 @@ package shape
import (
"oss.terrastruct.com/d2/lib/geo"
"oss.terrastruct.com/util-go/go2"
)
// Table is basically a rectangle
@ -10,7 +11,7 @@ type shapeTable struct {
}
func NewTable(box *geo.Box) Shape {
return shapeTable{
shape := shapeTable{
shapeSquare{
baseShape: &baseShape{
Type: TABLE_TYPE,
@ -18,6 +19,8 @@ func NewTable(box *geo.Box) Shape {
},
},
}
shape.FullShape = go2.Pointer(Shape(shape))
return shape
}
func (s shapeTable) GetDefaultPadding() (paddingX, paddingY float64) {

5
lib/shape/shape_text.go
View file

@ -2,6 +2,7 @@ package shape
import (
"oss.terrastruct.com/d2/lib/geo"
"oss.terrastruct.com/util-go/go2"
)
// Text is basically a rectangle
@ -10,7 +11,7 @@ type shapeText struct {
}
func NewText(box *geo.Box) Shape {
return shapeText{
shape := shapeText{
shapeSquare: shapeSquare{
baseShape: &baseShape{
Type: TEXT_TYPE,
@ -18,6 +19,8 @@ func NewText(box *geo.Box) Shape {
},
},
}
shape.FullShape = go2.Pointer(Shape(shape))
return shape
}
func (s shapeText) GetDefaultPadding() (paddingX, paddingY float64) {