added frame to fixture labels

Author: Jannik-Hm

fixture_label.go

@@ -3,6 +3,7 @@ package rasterizer
 import (
 	"fmt"
 	"image"
+	"image/color"
 
 	MVRTypes "github.com/Patch2PDF/MVR-Parser/pkg/types"
 )
@@ -16,6 +17,12 @@ var fixture_label_padding = padding{5, 10, 5, 10}
 
 const fixture_distance = 15
 
+var fixture_label_background = color.NRGBA{255, 255, 255, 255}
+
+const fixture_label_border_width = 3
+
+var fixture_label_border_color = color.NRGBA{0, 0, 0, 255}
+
 // candidates for label positioning (order in array decides priority)
 // if no one fits, fall back to more expensive algorithm
 var candidates = []string{
@@ -124,7 +131,7 @@ func drawFixtureLabels(canvas *Canvas) error {
 			continue
 		}
 
-		drawLabelBackground(canvas, rect)
+		drawLabelBackground(canvas, rect, fixture_label_background, fixture_label_border_width, fixture_label_border_color)
 		fixtureLabelFillZBuf(canvas, rect)
 
 		drawLabelText(canvas, rect.Min.X+fixture_label_padding.left, rect.Min.Y+fixture_label_padding.top, label_text)

label_drawer.go

@@ -20,9 +20,6 @@ var (
 	fontBytes []byte
 )
 
-// const dpi = 72
-// const size = 18
-
 type fontFace struct {
 	face        *font.Face
 	ascent      int
@@ -90,8 +87,19 @@ func calcLabelDimensions(canvas *Canvas, text string) (width int, height int) {
 	return width, font_face.font_height * line_count
 }
 
-func drawLabelBackground(canvas *Canvas, rect image.Rectangle) {
-	draw.Draw(canvas.canvas, rect, image.NewUniform(color.White), image.Point{}, draw.Src)
+func drawLabelBackground(canvas *Canvas, rect image.Rectangle, background_color color.NRGBA, border_width int, border_color color.NRGBA) {
+	draw.Draw(
+		canvas.canvas,
+		image.Rectangle{
+			Min: image.Point{rect.Min.X + border_width, rect.Min.Y + border_width},
+			Max: image.Point{rect.Max.X - border_width, rect.Max.Y - border_width},
+		},
+		image.NewUniform(background_color),
+		image.Point{},
+		draw.Src,
+	)
+
+	frame(canvas.canvas, rect, border_width, border_color)
 }
 
 func drawLabelText(canvas *Canvas, x int, y int, text string) {