diff --git a/ActionBar/PrinterActionRow.cs b/ActionBar/PrinterActionRow.cs index 7f2d7df7c..f84d7145c 100644 --- a/ActionBar/PrinterActionRow.cs +++ b/ActionBar/PrinterActionRow.cs @@ -75,7 +75,7 @@ namespace MatterHackers.MatterControl.ActionBar { ImageBuffer gearImage = new ImageBuffer(); string imagePathAndFile = Path.Combine(ApplicationDataStorage.Instance.ApplicationStaticDataPath, "gear_icon.png"); - ImageBMPIO.LoadImageData(imagePathAndFile, gearImage); + ImageIO.LoadImageData(imagePathAndFile, gearImage); FlowLayoutWidget leftToRight = new FlowLayoutWidget(); leftToRight.Margin = new BorderDouble(5, 0); diff --git a/ConfigurationPage/ConfigurationPage.cs b/ConfigurationPage/ConfigurationPage.cs index 9fd546ed0..7da5d768c 100644 --- a/ConfigurationPage/ConfigurationPage.cs +++ b/ConfigurationPage/ConfigurationPage.cs @@ -105,7 +105,7 @@ namespace MatterHackers.MatterControl eePromControlsLayout.Padding = new BorderDouble(0); { Agg.Image.ImageBuffer eePromImage = new Agg.Image.ImageBuffer(); - ImageBMPIO.LoadImageData(Path.Combine(ApplicationDataStorage.Instance.ApplicationStaticDataPath,"Icons", "PrintStatusControls", "leveling-24x24.png"), eePromImage); + ImageIO.LoadImageData(Path.Combine(ApplicationDataStorage.Instance.ApplicationStaticDataPath,"Icons", "PrintStatusControls", "leveling-24x24.png"), eePromImage); ImageWidget eePromIcon = new ImageWidget(eePromImage); eePromIcon.Margin = new BorderDouble (right: 6); @@ -214,7 +214,7 @@ namespace MatterHackers.MatterControl runPrintLevelingButton.Click += new ButtonBase.ButtonEventHandler(runPrintLeveling_Click); Agg.Image.ImageBuffer levelingImage = new Agg.Image.ImageBuffer(); - ImageBMPIO.LoadImageData(Path.Combine(ApplicationDataStorage.Instance.ApplicationStaticDataPath,"Icons", "PrintStatusControls", "leveling-24x24.png"), levelingImage); + ImageIO.LoadImageData(Path.Combine(ApplicationDataStorage.Instance.ApplicationStaticDataPath,"Icons", "PrintStatusControls", "leveling-24x24.png"), levelingImage); ImageWidget levelingIcon = new ImageWidget(levelingImage); levelingIcon.Margin = new BorderDouble (right: 6); diff --git a/ControlElements/ImageButtonFactory.cs b/ControlElements/ImageButtonFactory.cs index 3b9b0e8ea..e851e4af3 100644 --- a/ControlElements/ImageButtonFactory.cs +++ b/ControlElements/ImageButtonFactory.cs @@ -36,10 +36,10 @@ namespace MatterHackers.MatterControl Agg.Image.ImageBuffer hoverImage = new Agg.Image.ImageBuffer(); Agg.Image.ImageBuffer disabledImage = new Agg.Image.ImageBuffer(); - ImageBMPIO.LoadImageData(this.GetImageLocation(normalImageName), normalImage); - ImageBMPIO.LoadImageData(this.GetImageLocation(pressedImageName), pressedImage); - ImageBMPIO.LoadImageData(this.GetImageLocation(hoverImageName), hoverImage); - ImageBMPIO.LoadImageData(this.GetImageLocation(disabledImageName), disabledImage); + ImageIO.LoadImageData(this.GetImageLocation(normalImageName), normalImage); + ImageIO.LoadImageData(this.GetImageLocation(pressedImageName), pressedImage); + ImageIO.LoadImageData(this.GetImageLocation(hoverImageName), hoverImage); + ImageIO.LoadImageData(this.GetImageLocation(disabledImageName), disabledImage); //normalImage.NewGraphics2D().Line(0, 0, normalImage.Width, normalImage.Height, RGBA_Bytes.Violet); //pressedImage.NewGraphics2D().Line(0, 0, normalImage.Width, normalImage.Height, RGBA_Bytes.Violet); diff --git a/ControlElements/TextImageButtonFactory.cs b/ControlElements/TextImageButtonFactory.cs index 6a564d7bc..257755bc8 100644 --- a/ControlElements/TextImageButtonFactory.cs +++ b/ControlElements/TextImageButtonFactory.cs @@ -186,7 +186,7 @@ namespace MatterHackers.MatterControl { string path = Path.Combine(ApplicationDataStorage.Instance.ApplicationStaticDataPath, imageName); ImageBuffer buffer = new ImageBuffer(10, 10, 32, new BlenderBGRA()); - ImageBMPIO.LoadImageData(path, buffer); + ImageIO.LoadImageData(path, buffer); return buffer; } @@ -279,22 +279,22 @@ namespace MatterHackers.MatterControl if (normalImageName != null) { - ImageBMPIO.LoadImageData(this.GetImageLocation(normalImageName), normalImage); + ImageIO.LoadImageData(this.GetImageLocation(normalImageName), normalImage); } if (hoverImageName != null) { - ImageBMPIO.LoadImageData(this.GetImageLocation(pressedImageName), pressedImage); + ImageIO.LoadImageData(this.GetImageLocation(pressedImageName), pressedImage); } if (pressedImageName != null) { - ImageBMPIO.LoadImageData(this.GetImageLocation(hoverImageName), hoverImage); + ImageIO.LoadImageData(this.GetImageLocation(hoverImageName), hoverImage); } if (disabledImageName != null) { - ImageBMPIO.LoadImageData(this.GetImageLocation(disabledImageName), disabledImage); + ImageIO.LoadImageData(this.GetImageLocation(disabledImageName), disabledImage); } if (invertImageLocation) @@ -331,22 +331,22 @@ namespace MatterHackers.MatterControl if (normalImageName != null) { - ImageBMPIO.LoadImageData(this.GetImageLocation(normalImageName), normalImage); + ImageIO.LoadImageData(this.GetImageLocation(normalImageName), normalImage); } if (pressedImageName != null) { - ImageBMPIO.LoadImageData(this.GetImageLocation(pressedImageName), pressedImage); + ImageIO.LoadImageData(this.GetImageLocation(pressedImageName), pressedImage); } if (normalToPressedImageName != null) { - ImageBMPIO.LoadImageData(this.GetImageLocation(normalToPressedImageName), normalToPressedImage); + ImageIO.LoadImageData(this.GetImageLocation(normalToPressedImageName), normalToPressedImage); } if (pressedToNormalImageName != null) { - ImageBMPIO.LoadImageData(this.GetImageLocation(pressedToNormalImageName), pressedToNormalImage); + ImageIO.LoadImageData(this.GetImageLocation(pressedToNormalImageName), pressedToNormalImage); } if (normalToPressedImageName == null) @@ -393,7 +393,7 @@ namespace MatterHackers.MatterControl if (iconImageName != null) { iconImage = new ImageBuffer(); - ImageBMPIO.LoadImageData(this.GetImageLocation(iconImageName), iconImage); + ImageIO.LoadImageData(this.GetImageLocation(iconImageName), iconImage); } BorderDouble internalMargin = new BorderDouble(0); diff --git a/CustomWidgets/PartThumbnailWidget.cs b/CustomWidgets/PartThumbnailWidget.cs index 0dec8b49e..a2ba455c8 100644 --- a/CustomWidgets/PartThumbnailWidget.cs +++ b/CustomWidgets/PartThumbnailWidget.cs @@ -105,8 +105,8 @@ namespace MatterHackers.MatterControl // set background images if (noThumbnailImage.Width == 0) { - ImageBMPIO.LoadImageData(this.GetImageLocation(noThumbnailFileName), noThumbnailImage); - ImageBMPIO.LoadImageData(this.GetImageLocation(buildingThumbnailFileName), buildingThumbnailImage); + ImageIO.LoadImageData(this.GetImageLocation(noThumbnailFileName), noThumbnailImage); + ImageIO.LoadImageData(this.GetImageLocation(buildingThumbnailFileName), buildingThumbnailImage); } this.image = new ImageBuffer(buildingThumbnailImage); diff --git a/PartPreviewWindow/CreateDiscreteMeshes.cs b/PartPreviewWindow/CreateDiscreteMeshes.cs index b20d81a85..773478545 100644 --- a/PartPreviewWindow/CreateDiscreteMeshes.cs +++ b/PartPreviewWindow/CreateDiscreteMeshes.cs @@ -73,10 +73,10 @@ namespace MatterHackers.MatterControl backgroundWorker.ReportProgress(startPercent + (int)(lengthPercent * .2)); } - //ImageBMPIO.SaveImageData("test part plate 0.png", partPlate); + //ImageIO.SaveImageData("test part plate 0.png", partPlate); // expand the bounds a bit so that we can collect all the vertices and polygons within each bound Dilate.DoDilate3x3Binary(partPlate, 1); - //ImageBMPIO.SaveImageData("test part plate 1.png", partPlate); + //ImageIO.SaveImageData("test part plate 1.png", partPlate); // trace all the bounds of the objects on the plate PolyTree polyTreeForPlate = FindDistictObjectBounds(partPlate); @@ -112,7 +112,7 @@ namespace MatterHackers.MatterControl { backgroundWorker.ReportProgress(startPercent + (int)(lengthPercent * .50)); } - //ImageBMPIO.SaveImageData("test part plate 2.png", partPlate); + //ImageIO.SaveImageData("test part plate 2.png", partPlate); // add each of the separate bounds polygons to new meshes Mesh[] discreteMeshes = new Mesh[discreteAreas.Count]; diff --git a/PrintLibrary/PluginChooserWindow.cs b/PrintLibrary/PluginChooserWindow.cs index f07adbe4c..50e6622d8 100644 --- a/PrintLibrary/PluginChooserWindow.cs +++ b/PrintLibrary/PluginChooserWindow.cs @@ -52,7 +52,7 @@ namespace MatterHackers.MatterControl.PrintLibrary { string path = Path.Combine(ApplicationDataStorage.Instance.ApplicationStaticDataPath, imageName); ImageBuffer buffer = new ImageBuffer(10, 10, 32, new BlenderBGRA()); - ImageBMPIO.LoadImageData(path, buffer); + ImageIO.LoadImageData(path, buffer); return buffer; } diff --git a/PrintLibrary/PrintLibraryListItem.cs b/PrintLibrary/PrintLibraryListItem.cs index a9728be67..a202c0682 100644 --- a/PrintLibrary/PrintLibraryListItem.cs +++ b/PrintLibrary/PrintLibraryListItem.cs @@ -76,8 +76,8 @@ namespace MatterHackers.MatterControl.PrintLibrary // set background images if (noThumbnailImage.Width == 0) { - ImageBMPIO.LoadImageData(this.GetImageLocation(noThumbnailFileName), noThumbnailImage); - ImageBMPIO.LoadImageData(this.GetImageLocation(buildingThumbnailFileName), buildingThumbnailImage); + ImageIO.LoadImageData(this.GetImageLocation(noThumbnailFileName), noThumbnailImage); + ImageIO.LoadImageData(this.GetImageLocation(buildingThumbnailFileName), buildingThumbnailImage); } this.image = new ImageBuffer(buildingThumbnailImage); diff --git a/PrintQueue/PartsSheet.cs b/PrintQueue/PartsSheet.cs index 7f3371410..1d1050588 100644 --- a/PrintQueue/PartsSheet.cs +++ b/PrintQueue/PartsSheet.cs @@ -330,7 +330,7 @@ namespace MatterHackers.MatterControl { Directory.CreateDirectory(folderToSavePrintsTo); } - ImageBMPIO.SaveImageData(jpegFileName, plateInventoryImage); + ImageIO.SaveImageData(jpegFileName, plateInventoryImage); XGraphics gfx = XGraphics.FromPdfPage(pdfPage); XImage jpegImage = XImage.FromFile(jpegFileName); @@ -350,7 +350,7 @@ namespace MatterHackers.MatterControl if(File.Exists(logoPathAndFile)) { ImageBuffer logoImage = new ImageBuffer(); - ImageBMPIO.LoadImageData(logoPathAndFile, logoImage); + ImageIO.LoadImageData(logoPathAndFile, logoImage); currentlyPrintingHeightPixels -= logoImage.Height; plateGraphics.Render(logoImage, (plateInventoryImage.Width - logoImage.Width) / 2, currentlyPrintingHeightPixels); } diff --git a/PrintQueue/PrintQueueControl.cs b/PrintQueue/PrintQueueControl.cs index bf01c41ab..4d28e18ab 100644 --- a/PrintQueue/PrintQueueControl.cs +++ b/PrintQueue/PrintQueueControl.cs @@ -49,7 +49,7 @@ namespace MatterHackers.MatterControl.PrintQueue if (File.Exists(imagePathAndFile)) { ImageBuffer wattermarkImage = new ImageBuffer(); - ImageBMPIO.LoadImageData(imagePathAndFile, wattermarkImage); + ImageIO.LoadImageData(imagePathAndFile, wattermarkImage); GuiWidget watermarkWidget = new ImageWidget(wattermarkImage); watermarkWidget.VAnchor = Agg.UI.VAnchor.ParentCenter; watermarkWidget.HAnchor = Agg.UI.HAnchor.ParentCenter; diff --git a/PrinterControls/ManualPrinterControls.cs b/PrinterControls/ManualPrinterControls.cs index 4ed2aeaa5..f62df8403 100644 --- a/PrinterControls/ManualPrinterControls.cs +++ b/PrinterControls/ManualPrinterControls.cs @@ -247,7 +247,7 @@ namespace MatterHackers.MatterControl eePromControlsLayout.Padding = new BorderDouble(0); { Agg.Image.ImageBuffer eePromImage = new Agg.Image.ImageBuffer(); - ImageBMPIO.LoadImageData(Path.Combine(ApplicationDataStorage.Instance.ApplicationStaticDataPath,"Icons", "PrintStatusControls", "leveling-24x24.png"), eePromImage); + ImageIO.LoadImageData(Path.Combine(ApplicationDataStorage.Instance.ApplicationStaticDataPath,"Icons", "PrintStatusControls", "leveling-24x24.png"), eePromImage); ImageWidget eePromIcon = new ImageWidget(eePromImage); eePromIcon.Margin = new BorderDouble (right: 6); @@ -543,7 +543,7 @@ namespace MatterHackers.MatterControl runPrintLevelingButton.Click += new ButtonBase.ButtonEventHandler(runPrintLeveling_Click); Agg.Image.ImageBuffer levelingImage = new Agg.Image.ImageBuffer(); - ImageBMPIO.LoadImageData(Path.Combine(ApplicationDataStorage.Instance.ApplicationStaticDataPath,"Icons", "PrintStatusControls", "leveling-24x24.png"), levelingImage); + ImageIO.LoadImageData(Path.Combine(ApplicationDataStorage.Instance.ApplicationStaticDataPath,"Icons", "PrintStatusControls", "leveling-24x24.png"), levelingImage); ImageWidget levelingIcon = new ImageWidget(levelingImage); levelingIcon.Margin = new BorderDouble (right: 6); @@ -634,7 +634,7 @@ namespace MatterHackers.MatterControl this.textImageButtonFactory.FixedHeight = TallButtonHeight; Agg.Image.ImageBuffer terminalImage = new Agg.Image.ImageBuffer(); - ImageBMPIO.LoadImageData(Path.Combine(ApplicationDataStorage.Instance.ApplicationStaticDataPath,"Icons", "PrintStatusControls", "terminal-24x24.png"), terminalImage); + ImageIO.LoadImageData(Path.Combine(ApplicationDataStorage.Instance.ApplicationStaticDataPath,"Icons", "PrintStatusControls", "terminal-24x24.png"), terminalImage); ImageWidget terminalIcon = new ImageWidget(terminalImage); terminalIcon.Margin = new BorderDouble (right: 6); @@ -799,7 +799,7 @@ namespace MatterHackers.MatterControl string homeIconFile = "icon_home_white_24x24.png"; string fileAndPath = Path.Combine(ApplicationDataStorage.Instance.ApplicationStaticDataPath, homeIconFile); ImageBuffer helpIconImage = new ImageBuffer(); - ImageBMPIO.LoadImageData(fileAndPath, helpIconImage); + ImageIO.LoadImageData(fileAndPath, helpIconImage); ImageWidget homeIconImageWidget = new ImageWidget(helpIconImage); homeIconImageWidget.Margin = new BorderDouble(0, 0, 6, 0); homeIconImageWidget.OriginRelativeParent += new Vector2(0, 2);