From cdd04e9f95a818a67f43db0e90b1be685d034865 Mon Sep 17 00:00:00 2001 From: Michael Smith Date: Wed, 4 May 2016 07:44:35 -0700 Subject: [PATCH] Correction for inverted image. --- OSCADSharp/OSCADSharp.ConsoleTests/Program.cs | 12 +++++------- .../Solids/Imported/CubistImageProcessor.cs | 7 ++----- 2 files changed, 7 insertions(+), 12 deletions(-) diff --git a/OSCADSharp/OSCADSharp.ConsoleTests/Program.cs b/OSCADSharp/OSCADSharp.ConsoleTests/Program.cs index 0659bc7..a9dd0b8 100644 --- a/OSCADSharp/OSCADSharp.ConsoleTests/Program.cs +++ b/OSCADSharp/OSCADSharp.ConsoleTests/Program.cs @@ -58,16 +58,14 @@ namespace OSCADSharp.ConsoleTests static void Main(string[] args) { var img = ImportedImage.FromFile("seahawks coaster.png").Scale(1, 1, Inches.Quarter + Inches.Eigth); - img.ToFile("testImg").Open(); + var imgPos = img.Position(); + var _base = new Cylinder(img.Bounds().Width + Inches.Quarter, Inches.Quarter); - //var imgPos = img.Position(); - //var _base = new Cylinder(img.Bounds().Width + Inches.Quarter, Inches.Quarter); - - //var rim = _base.Clone().Scale(1, 1, 1.25) - _base.Clone().Scale(.9, .9, 3.5).Translate(0, 0, -Inches.Eigth); - //var coaster = img + _base.Translate(imgPos.X, imgPos.Y, 0) + rim.Translate(imgPos.X, imgPos.Y, Inches.Quarter); ; + var rim = _base.Clone().Scale(1, 1, 1.25) - _base.Clone().Scale(.9, .9, 3.5).Translate(0, 0, -Inches.Eigth); + var coaster = img + _base.Translate(imgPos.X, imgPos.Y, 0) + rim.Translate(imgPos.X, imgPos.Y, Inches.Quarter); ; - //coaster.ToFile("seaImg").Open(); + coaster.ToFile("seaImg").Open(); //makePeg(); diff --git a/OSCADSharp/OSCADSharp/Solids/Imported/CubistImageProcessor.cs b/OSCADSharp/OSCADSharp/Solids/Imported/CubistImageProcessor.cs index 3285c21..f466638 100644 --- a/OSCADSharp/OSCADSharp/Solids/Imported/CubistImageProcessor.cs +++ b/OSCADSharp/OSCADSharp/Solids/Imported/CubistImageProcessor.cs @@ -30,11 +30,8 @@ namespace OSCADSharp.Solids.Imported public OSCADObject ProcessImage() { this.cubes = this.processImage(); - OSCADObject obj = new OSCADObject.MultiStatementObject("union()", cubes); - obj = obj.Rotate(0, 0, 180); - obj = obj.Translate(ImageBounds.Length, ImageBounds.Width, 0); - - return obj; + OSCADObject obj = new OSCADObject.MultiStatementObject("union()", cubes); + return obj.Scale(1, -1, 1).Translate(0, ImageBounds.Width, 0); }