From 4344fc9765dae0deb98c8f99ee2616e156705c82 Mon Sep 17 00:00:00 2001 From: John Lewin Date: Fri, 23 Sep 2016 10:35:06 -0700 Subject: [PATCH] Use new ImageBuffer constructor with common defaults --- AboutPage/HTMLParser/HtmlWidget.cs | 2 +- CustomWidgets/LibrarySelector/LibrarySelectorWidget.cs | 2 +- CustomWidgets/PartThumbnailWidget.cs | 8 ++++---- CustomWidgets/PluginChooserWindow.cs | 2 +- CustomWidgets/ThumbnailTracer.cs | 4 ++-- Library/LibraryDataView.cs | 2 +- PartPreviewWindow/CreateDiscreteMeshes.cs | 2 +- Queue/OptionsMenu/PartsSheetCreator.cs | 4 ++-- SlicerConfiguration/SliceSettingsWidget.cs | 2 +- Submodules/agg-sharp | 2 +- 10 files changed, 15 insertions(+), 15 deletions(-) diff --git a/AboutPage/HTMLParser/HtmlWidget.cs b/AboutPage/HTMLParser/HtmlWidget.cs index 8986328a5..f595b3c19 100644 --- a/AboutPage/HTMLParser/HtmlWidget.cs +++ b/AboutPage/HTMLParser/HtmlWidget.cs @@ -181,7 +181,7 @@ namespace MatterHackers.MatterControl case "img": { - ImageBuffer image = new ImageBuffer(Math.Max(elementState.SizeFixed.x, 1), Math.Max(elementState.SizeFixed.y, 1), 32, new BlenderBGRA()); + ImageBuffer image = new ImageBuffer(Math.Max(elementState.SizeFixed.x, 1), Math.Max(elementState.SizeFixed.y, 1)); ImageWidget imageWidget = new ImageWidget(image); imageWidget.Load += (s, e) => StaticData.DownloadToImageAsync(image, elementState.src, elementState.SizeFixed.x == 0 ? true : false); // put the image into the widget when it is done downloading. diff --git a/CustomWidgets/LibrarySelector/LibrarySelectorWidget.cs b/CustomWidgets/LibrarySelector/LibrarySelectorWidget.cs index 644127446..cf838c41e 100644 --- a/CustomWidgets/LibrarySelector/LibrarySelectorWidget.cs +++ b/CustomWidgets/LibrarySelector/LibrarySelectorWidget.cs @@ -320,7 +320,7 @@ namespace MatterHackers.MatterControl.CustomWidgets.LibrarySelector Vector2 expectedSize = new Vector2((int)(50 * GuiWidget.DeviceScale), (int)(50 * GuiWidget.DeviceScale)); if (imageBuffer.Width != expectedSize.x) { - ImageBuffer scaledImageBuffer = new ImageBuffer((int)expectedSize.x, (int)expectedSize.y, 32, new BlenderBGRA()); + ImageBuffer scaledImageBuffer = new ImageBuffer((int)expectedSize.x, (int)expectedSize.y); scaledImageBuffer.NewGraphics2D().Render(imageBuffer, 0, 0, scaledImageBuffer.Width, scaledImageBuffer.Height); imageBuffer = scaledImageBuffer; } diff --git a/CustomWidgets/PartThumbnailWidget.cs b/CustomWidgets/PartThumbnailWidget.cs index 7b51560d5..46bdbc1d0 100644 --- a/CustomWidgets/PartThumbnailWidget.cs +++ b/CustomWidgets/PartThumbnailWidget.cs @@ -279,7 +279,7 @@ namespace MatterHackers.MatterControl && loadedMeshGroups[0].Meshes != null && loadedMeshGroups[0].Meshes[0] != null) { - ImageBuffer tempImage = new ImageBuffer(size.x, size.y, 32, new BlenderBGRA()); + ImageBuffer tempImage = new ImageBuffer(size.x, size.y); Graphics2D partGraphics2D = tempImage.NewGraphics2D(); partGraphics2D.Clear(new RGBA_Bytes()); @@ -326,7 +326,7 @@ namespace MatterHackers.MatterControl private static void CreateImage(PartThumbnailWidget thumbnailWidget, double Width, double Height) { - thumbnailWidget.thumbnailImage = new ImageBuffer((int)Width, (int)Height, 32, new BlenderBGRA()); + thumbnailWidget.thumbnailImage = new ImageBuffer((int)Width, (int)Height); } private static string GetImageFileName(string stlHashCode) @@ -390,7 +390,7 @@ namespace MatterHackers.MatterControl private static ImageBuffer LoadImageFromDisk(PartThumbnailWidget thumbnailWidget, string stlHashCode) { - ImageBuffer tempImage = new ImageBuffer(BigRenderSize.x, BigRenderSize.y, 32, new BlenderBGRA()); + ImageBuffer tempImage = new ImageBuffer(BigRenderSize.x, BigRenderSize.y); string imageFileName = GetImageFileName(stlHashCode); if (File.Exists(imageFileName)) @@ -452,7 +452,7 @@ namespace MatterHackers.MatterControl this.thumbnailImage = new ImageBuffer(this.buildingThumbnailImage); this.thumbnailImage.NewGraphics2D().Clear(new RGBA_Bytes(255, 255, 255, 0)); - bigRender = new ImageBuffer(BigRenderSize.x, BigRenderSize.y, 32, new BlenderBGRA()); + bigRender = new ImageBuffer(BigRenderSize.x, BigRenderSize.y); foreach (MeshGroup meshGroup in loadedMeshGroups) { diff --git a/CustomWidgets/PluginChooserWindow.cs b/CustomWidgets/PluginChooserWindow.cs index 2cbea822b..cccb9d54e 100644 --- a/CustomWidgets/PluginChooserWindow.cs +++ b/CustomWidgets/PluginChooserWindow.cs @@ -49,7 +49,7 @@ namespace MatterHackers.MatterControl.CreatorPlugins private ImageBuffer LoadImage(string imageName) { string path = Path.Combine("Icons", imageName); - ImageBuffer buffer = new ImageBuffer(10, 10, 32, new BlenderBGRA()); + ImageBuffer buffer = new ImageBuffer(10, 10); StaticData.Instance.LoadImage(path, buffer); diff --git a/CustomWidgets/ThumbnailTracer.cs b/CustomWidgets/ThumbnailTracer.cs index 9a8101a37..5a2e6445d 100644 --- a/CustomWidgets/ThumbnailTracer.cs +++ b/CustomWidgets/ThumbnailTracer.cs @@ -88,7 +88,7 @@ namespace MatterHackers.RayTracer RectangleInt rect = new RectangleInt(0, 0, size.x, size.y); if (destImage == null || destImage.Width != rect.Width || destImage.Height != rect.Height) { - destImage = new ImageBuffer(rect.Width, rect.Height, 32, new BlenderBGRA()); + destImage = new ImageBuffer(rect.Width, rect.Height); } rayTracer.MultiThreaded = !PrinterConnectionAndCommunication.Instance.PrinterIsPrinting; @@ -110,7 +110,7 @@ namespace MatterHackers.RayTracer private void AddAFloor() { - ImageBuffer testImage = new ImageBuffer(200, 200, 32, new BlenderBGRA()); + ImageBuffer testImage = new ImageBuffer(200, 200); Graphics2D graphics = testImage.NewGraphics2D(); Random rand = new Random(0); for (int i = 0; i < 100; i++) diff --git a/Library/LibraryDataView.cs b/Library/LibraryDataView.cs index bbd38073a..5f8e047ed 100644 --- a/Library/LibraryDataView.cs +++ b/Library/LibraryDataView.cs @@ -312,7 +312,7 @@ namespace MatterHackers.MatterControl.PrintLibrary Vector2 expectedSize = new Vector2((int)(50 * GuiWidget.DeviceScale), (int)(50 * GuiWidget.DeviceScale)); if (imageBuffer.Width != expectedSize.x) { - ImageBuffer scaledImageBuffer = new ImageBuffer((int)expectedSize.x, (int)expectedSize.y, 32, new BlenderBGRA()); + ImageBuffer scaledImageBuffer = new ImageBuffer((int)expectedSize.x, (int)expectedSize.y); scaledImageBuffer.NewGraphics2D().Render(imageBuffer, 0, 0, scaledImageBuffer.Width, scaledImageBuffer.Height); imageBuffer = scaledImageBuffer; } diff --git a/PartPreviewWindow/CreateDiscreteMeshes.cs b/PartPreviewWindow/CreateDiscreteMeshes.cs index 9b258030c..324bfbf4b 100644 --- a/PartPreviewWindow/CreateDiscreteMeshes.cs +++ b/PartPreviewWindow/CreateDiscreteMeshes.cs @@ -148,7 +148,7 @@ namespace MatterHackers.MatterControl // Create a 2D image the size of the printer bed at some scale with the parts draw on it top down double scaleFactor = 5; - ImageBuffer partPlate = new ImageBuffer((int)(buildVolume.x * scaleFactor), (int)(buildVolume.y * scaleFactor), 32, new BlenderBGRA()); + ImageBuffer partPlate = new ImageBuffer((int)(buildVolume.x * scaleFactor), (int)(buildVolume.y * scaleFactor)); Vector2 renderOffset = new Vector2(buildVolume.x / 2, buildVolume.y / 2) - new Vector2(partBounds.Center.x, partBounds.Center.y); PolygonMesh.Rendering.OrthographicZProjection.DrawTo(partPlate.NewGraphics2D(), meshToSplit, renderOffset, scaleFactor, RGBA_Bytes.White); diff --git a/Queue/OptionsMenu/PartsSheetCreator.cs b/Queue/OptionsMenu/PartsSheetCreator.cs index c5feb8ad8..30c34e29a 100644 --- a/Queue/OptionsMenu/PartsSheetCreator.cs +++ b/Queue/OptionsMenu/PartsSheetCreator.cs @@ -225,7 +225,7 @@ namespace MatterHackers.MatterControl double sizeOfNameX = typeFacePrinter.GetSize().x + PartMarginPixels * 2; Vector2 sizeOfRender = new Vector2(widthInMM * PixelPerMM, heightMM * PixelPerMM); - ImageBuffer imageOfPart = new ImageBuffer((int)(Math.Max(sizeOfNameX, sizeOfRender.x)), (int)(sizeOfRender.y), 32, new BlenderBGRA()); + ImageBuffer imageOfPart = new ImageBuffer((int)(Math.Max(sizeOfNameX, sizeOfRender.x)), (int)(sizeOfRender.y)); typeFacePrinter.Origin = new Vector2(imageOfPart.Width / 2, (textSpaceMM / 2) * PixelPerMM); Graphics2D partGraphics2D = imageOfPart.NewGraphics2D(); @@ -297,7 +297,7 @@ namespace MatterHackers.MatterControl private void CreateOnePage(int plateNumber, ref int nextPartToPrintIndex, PdfPage pdfPage) { - ImageBuffer plateInventoryImage = new ImageBuffer((int)(300 * 8.5), 300 * 11, 32, new BlenderBGRA()); + ImageBuffer plateInventoryImage = new ImageBuffer((int)(300 * 8.5), 300 * 11); Graphics2D plateGraphics = plateInventoryImage.NewGraphics2D(); double currentlyPrintingHeightPixels = PrintTopOfPage(plateInventoryImage, plateGraphics); diff --git a/SlicerConfiguration/SliceSettingsWidget.cs b/SlicerConfiguration/SliceSettingsWidget.cs index d600c7dd8..6a8276514 100644 --- a/SlicerConfiguration/SliceSettingsWidget.cs +++ b/SlicerConfiguration/SliceSettingsWidget.cs @@ -1637,7 +1637,7 @@ namespace MatterHackers.MatterControl.SlicerConfiguration private static ImageBuffer ColorCircle(int size, RGBA_Bytes color) { - ImageBuffer imageBuffer = new ImageBuffer(size, size, 32, new BlenderBGRA()); + ImageBuffer imageBuffer = new ImageBuffer(size, size); Graphics2D normalGraphics = imageBuffer.NewGraphics2D(); Vector2 center = new Vector2(size / 2.0, size / 2.0); normalGraphics.Circle(center, size / 2.0, color); diff --git a/Submodules/agg-sharp b/Submodules/agg-sharp index 860fd9045..67f380346 160000 --- a/Submodules/agg-sharp +++ b/Submodules/agg-sharp @@ -1 +1 @@ -Subproject commit 860fd9045e17bddd0408f69cdff29cccf18ef734 +Subproject commit 67f380346e1565b51f166c47d7c89f31e59895b9