Return some errors which were not returned, yet. Inject logger to be …

…able to control the logs from the outside - better for usage as lib

clip/clip.go

@@ -13,7 +13,7 @@ import (
 type Pattern interface {
 	// Fill fills the given part.
 	// It returns the final infill pattern.
-	Fill(layerNr int, part data.LayerPart) data.Paths
+	Fill(layerNr int, part data.LayerPart) (data.Paths, error)
 }
 
 // OffsetResult is built the following way: [partNr][insetNr][insetPartsNr]data.LayerPart

clip/linear.go

@@ -3,7 +3,7 @@
 package clip
 
 import (
-	"fmt"
+	"errors"
 	"github.com/aligator/goslice/data"
 
 	clipper "github.com/aligator/go.clipper"
@@ -35,7 +35,7 @@ func NewLinearPattern(lineWidth data.Micrometer, lineDistance data.Micrometer, m
 }
 
 // Fill implements the Pattern interface by using simple linear lines as infill.
-func (p linear) Fill(layerNr int, part data.LayerPart) data.Paths {
+func (p linear) Fill(layerNr int, part data.LayerPart) (data.Paths, error) {
 	rotation := float64(p.degree)
 
 	// for rectlinear fill patterns rotate each 2nd layer by 90 degree.
@@ -73,13 +73,16 @@ func (p linear) Fill(layerNr int, part data.LayerPart) data.Paths {
 		smallerLines = p.lineWidth
 	}
 
-	resultInfill := p.getInfill(min, max, clipperPath(outline), clipperPaths(holes), 0, smallerLines)
+	resultInfill, err := p.getInfill(min, max, clipperPath(outline), clipperPaths(holes), 0, smallerLines)
+	if err != nil {
+		return nil, err
+	}
 
 	result := p.sortInfill(microPaths(resultInfill, false), p.zigZag, data.NewBasicLayerPart(outline, holes))
 
 	result.Rotate(-rotation)
 
-	return result
+	return result, nil
 }
 
 // sortInfill optimizes the order of the infill lines.
@@ -173,7 +176,7 @@ func (p linear) sortInfill(unsorted data.Paths, zigZag bool, part data.LayerPart
 }
 
 // getInfill fills a polygon (with holes)
-func (p linear) getInfill(min data.MicroPoint, max data.MicroPoint, outline clipper.Path, holes clipper.Paths, overlap float32, smallerLines data.Micrometer) clipper.Paths {
+func (p linear) getInfill(min data.MicroPoint, max data.MicroPoint, outline clipper.Path, holes clipper.Paths, overlap float32, smallerLines data.Micrometer) (clipper.Paths, error) {
 	var result clipper.Paths
 
 	// clip the paths with the lines using intersection
@@ -219,8 +222,7 @@ func (p linear) getInfill(min data.MicroPoint, max data.MicroPoint, outline clip
 
 	tree, ok := cl.Execute2(clipper.CtIntersection, clipper.PftEvenOdd, clipper.PftEvenOdd)
 	if !ok {
-		fmt.Println("getLinearFill failed")
-		return nil
+		return nil, errors.New("getLinearFill failed")
 	}
 
 	for _, c := range tree.Childs() {
@@ -242,5 +244,5 @@ func (p linear) getInfill(min data.MicroPoint, max data.MicroPoint, outline clip
 		}
 	}
 
-	return result
+	return result, nil
 }

data/option.go

@@ -5,6 +5,7 @@ package data
 import (
 	"errors"
 	"fmt"
+	"log"
 	"os"
 	"strconv"
 	"strings"
@@ -265,6 +266,8 @@ type GoSliceOptions struct {
 
 	// OutputFilePath specifies the path to the output gcode file.
 	OutputFilePath string
+
+	Logger *log.Logger
 }
 
 // SlicingOptions contains all options related to slice a model.
@@ -352,6 +355,7 @@ func DefaultOptions() Options {
 			PrintVersion:   false,
 			InputFilePath:  "",
 			OutputFilePath: "",
+			Logger:         log.New(os.Stdout, "", 0),
 		},
 	}
 }

gcode/renderer/infill.go

@@ -47,7 +47,11 @@ func (i *Infill) Render(b *gcode.Builder, layerNr int, maxLayer int, layer data.
 			b.AddComment(c)
 		}
 
-		for _, path := range i.pattern.Fill(layerNr, part) {
+		infill, err := i.pattern.Fill(layerNr, part)
+		if err != nil {
+			return err
+		}
+		for _, path := range infill {
 			err := b.AddPolygon(layer, path, z, true)
 			if err != nil {
 				return err

goslice.go

@@ -1,7 +1,6 @@
 package goslice
 
 import (
-	"fmt"
 	"github.com/aligator/goslice/clip"
 	"github.com/aligator/goslice/data"
 	"github.com/aligator/goslice/gcode"
@@ -174,7 +173,7 @@ func (s *GoSlice) Process() error {
 	}
 
 	err = s.Writer.Write(finalGcode, outputPath)
-	fmt.Println("full processing time:", time.Now().Sub(startTime))
+	s.Options.Logger.Println("full processing time:", time.Now().Sub(startTime))
 
 	return err
 }

optimizer/optimizer.go

@@ -22,7 +22,6 @@
 package optimizer
 
 import (
-	"fmt"
 	"github.com/aligator/goslice/data"
 	"github.com/aligator/goslice/handler"
 )
@@ -147,7 +146,7 @@ FacesLoop:
 		om.faces[i] = face
 	}
 
-	fmt.Printf("Number of open faces: %v\n", openFaces)
+	o.options.GoSlice.Logger.Printf("Number of open faces: %v\n", openFaces)
 
 	min := m.Min()
 	max := m.Max()

slicer/slicer.go

@@ -32,7 +32,7 @@ func NewSlicer(options *data.Options) handler.ModelSlicer {
 
 func (s slicer) Slice(m data.OptimizedModel) ([]data.PartitionedLayer, error) {
 	layerCount := (m.Size().Z()-s.options.Print.InitialLayerThickness)/s.options.Print.LayerThickness + 1
-	fmt.Println("layer count:", layerCount)
+	s.options.GoSlice.Logger.Println("layer count:", layerCount)
 
 	layers := make([]*layer, layerCount)
 

writer/writer.go

@@ -1,7 +1,6 @@
 package writer
 
 import (
-	"fmt"
 	"github.com/aligator/goslice/handler"
 	"os"
 )
@@ -16,7 +15,7 @@ func Writer() handler.GCodeWriter {
 func (w writer) Write(gcode string, filename string) error {
 	buf, err := os.Create(filename)
 	if err != nil {
-		fmt.Println(err)
+		return err
 	}
 
 	defer buf.Close()