Add some more program output

data/option.go

@@ -267,6 +267,8 @@ type GoSliceOptions struct {
  // OutputFilePath specifies the path to the output gcode file.
  OutputFilePath string
 
+ // Logger can be used to redirect the log output to anything you want.
+ // All output in GoSlice just calls this logger.
  Logger *log.Logger
 }
 

gcode/generator.go

@@ -65,6 +65,7 @@ func (g *generator) Generate(layers []data.PartitionedLayer) (string, error) {
  maxLayer := len(layers) - 1
 
  for layerNr := range layers {
+ g.options.GoSlice.Logger.Printf("Render layer %d/%d\n", layerNr, maxLayer)
  for _, renderer := range g.renderers {
  z := g.options.Print.InitialLayerThickness + data.Micrometer(layerNr)*g.options.Print.LayerThickness
  err := renderer.Render(g.builder, layerNr, maxLayer, layers[layerNr], z, g.options)

gcode/generator_test.go

@@ -4,6 +4,7 @@ import (
  "github.com/aligator/goslice/data"
  "github.com/aligator/goslice/gcode"
  "github.com/aligator/goslice/util/test"
+ "log"
  "testing"
 )
 
@@ -38,7 +39,11 @@ func TestGCodeGenerator(t *testing.T) {
 
  layers := make([]data.PartitionedLayer, 3)
 
- generator := gcode.NewGenerator(&data.Options{}, gcode.WithRenderer(&fakeRenderer{t: t, c: rendererCounter}))
+ generator := gcode.NewGenerator(&data.Options{
+ GoSlice: data.GoSliceOptions{
+ Logger: log.Default(),
+ },
+ }, gcode.WithRenderer(&fakeRenderer{t: t, c: rendererCounter}))
  generator.Init(nil)
  result, err := generator.Generate(layers)
 

goslice.go

@@ -125,18 +125,20 @@ func (s *GoSlice) Process() error {
  startTime := time.Now()
 
  // 1. Load model
+ s.Options.Logger.Printf("Load model %v\n", s.Options.InputFilePath)
  models, err := s.Reader.Read(s.Options.InputFilePath)
  if err != nil {
  return err
  }
+ s.Options.Logger.Printf("Model loaded.\nFace count: %v\nSize: min: %v max %v\n", models.FaceCount(), models.Min(), models.Max())
 
  // 2. Optimize model
  var optimizedModel data.OptimizedModel
-
  optimizedModel, err = s.Optimizer.Optimize(models)
  if err != nil {
  return err
  }
+ s.Options.Logger.Printf("Model optimized\n")
 
  //err = optimizedModel.SaveDebugSTL("test.stl")
  //if err != nil {
@@ -148,6 +150,7 @@ func (s *GoSlice) Process() error {
  if err != nil {
  return err
  }
+ s.Options.Logger.Printf("Model sliced to %v layers\n", len(layers))
 
  // 4. Modify the layers
  // e.g. generate perimeter paths,
@@ -158,7 +161,9 @@ func (s *GoSlice) Process() error {
  if err != nil {
  return err
  }
+ s.Options.Logger.Printf("Modifier %s applied\n", m.GetName())
  }
+ s.Options.Logger.Printf("Layers modified %v\n", len(layers))
 
  // 5. generate gcode from the layers
  s.Generator.Init(optimizedModel)

handler/handler.go

@@ -4,6 +4,18 @@ package handler
 
 import "github.com/aligator/goslice/data"
 
+type Namer interface {
+ GetName() string
+}
+
+type Named struct {
+ Name string
+}
+
+func (n Named) GetName() string {
+ return n.Name
+}
+
 // ModelReader reads a model from a file.
 type ModelReader interface {
  Read(filename string) (data.Model, error)
@@ -21,6 +33,7 @@ type ModelSlicer interface {
 
 // LayerModifier can add new attributes to the layers or even alter the layer directly.
 type LayerModifier interface {
+ Namer
  Init(m data.OptimizedModel)
  Modify(layers []data.PartitionedLayer) error
 }

modifier/brim.go

@@ -8,6 +8,7 @@ import (
 )
 
 type brimModifier struct {
+ handler.Named
  options *data.Options
 }
 
@@ -25,6 +26,9 @@ func (m brimModifier) Init(model data.OptimizedModel) {}
 // "outerBrim" just contains the outline of the brim (taking into account the line width also).
 func NewBrimModifier(options *data.Options) handler.LayerModifier {
  return &brimModifier{
+ Named: handler.Named{
+ Name: "Brim",
+ },
  options: options,
  }
 }

modifier/infill.go

@@ -8,6 +8,7 @@ import (
 )
 
 type infillModifier struct {
+ handler.Named
  options *data.Options
 }
 
@@ -16,6 +17,9 @@ func (m infillModifier) Init(model data.OptimizedModel) {}
 // NewInfillModifier calculates the areas which need infill and passes them as "bottom" attribute to the layer.
 func NewInfillModifier(options *data.Options) handler.LayerModifier {
  return &infillModifier{
+ Named: handler.Named{
+ Name: "Infill",
+ },
  options: options,
  }
 }

modifier/internal_infill.go

@@ -8,6 +8,7 @@ import (
 )
 
 type internalInfillModifier struct {
+ handler.Named
  options *data.Options
 }
 
@@ -16,6 +17,9 @@ func (m internalInfillModifier) Init(model data.OptimizedModel) {}
 // NewInfillModifier calculates the areas which need infill and passes them as "bottom" attribute to the layer.
 func NewInternalInfillModifier(options *data.Options) handler.LayerModifier {
  return &internalInfillModifier{
+ Named: handler.Named{
+ Name: "InternalInfill",
+ },
  options: options,
  }
 }

modifier/perimeter.go

@@ -8,6 +8,7 @@ import (
 )
 
 type perimeterModifier struct {
+ handler.Named
  options *data.Options
 }
 
@@ -16,6 +17,9 @@ type perimeterModifier struct {
 // The perimeters are saved as attribute in the LayerPart.
 func NewPerimeterModifier(options *data.Options) handler.LayerModifier {
  return &perimeterModifier{
+ Named: handler.Named{
+ Name: "Perimeter",
+ },
  options: options,
  }
 }

modifier/support.go

@@ -31,6 +31,7 @@ func FullSupport(layer data.PartitionedLayer) ([]data.LayerPart, error) {
 }
 
 type supportDetectorModifier struct {
+ handler.Named
  options *data.Options
 }
 
@@ -63,6 +64,9 @@ func (m supportDetectorModifier) Init(_ data.OptimizedModel) {}
 // All areas that remain have a higher angle than the threshold and need to be supported."
 func NewSupportDetectorModifier(options *data.Options) handler.LayerModifier {
  return &supportDetectorModifier{
+ Named: handler.Named{
+ Name: "SupportDetector",
+ },
  options: options,
  }
 }
@@ -108,6 +112,7 @@ func (m supportDetectorModifier) Modify(layers []data.PartitionedLayer) error {
 }
 
 type supportGeneratorModifier struct {
+ handler.Named
  options *data.Options
 }
 
@@ -119,6 +124,9 @@ func (m supportGeneratorModifier) Init(_ data.OptimizedModel) {}
 // and removes them from the normal support areas.
 func NewSupportGeneratorModifier(options *data.Options) handler.LayerModifier {
  return &supportGeneratorModifier{
+ Named: handler.Named{
+ Name: "SupportGenerator",
+ },
  options: options,
  }
 }

slicer/slicer.go

@@ -32,7 +32,6 @@ 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
- s.options.GoSlice.Logger.Println("layer count:", layerCount)
 
  layers := make([]*layer, layerCount)