nettika/mattercontrol
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Use new ImageBuffer constructor with common defaults

Browse source
This commit is contained in:
John Lewin 2016-09-23 10:35:06 -07:00
parent d9fdf5a788
commit 4344fc9765
10 changed files with 15 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

2
AboutPage/HTMLParser/HtmlWidget.cs
View file

@ -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.

2
CustomWidgets/LibrarySelector/LibrarySelectorWidget.cs
View file

@ -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;
}

8
CustomWidgets/PartThumbnailWidget.cs
View file

@ -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)
{

2
CustomWidgets/PluginChooserWindow.cs
View file

@ -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);

4
CustomWidgets/ThumbnailTracer.cs
View file

@ -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++)

2
Library/LibraryDataView.cs
View file

@ -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;
}

2
PartPreviewWindow/CreateDiscreteMeshes.cs
View file

@ -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);

4
Queue/OptionsMenu/PartsSheetCreator.cs
View file

@ -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);

2
SlicerConfiguration/SliceSettingsWidget.cs
View file

@ -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);

2
Submodules/agg-sharp

@ -1 +1 @@
Subproject commit 860fd9045e17bddd0408f69cdff29cccf18ef734
Subproject commit 67f380346e1565b51f166c47d7c89f31e59895b9