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

The name of ImageBMPIO changed to ImageIO

Browse source
This commit is contained in:
larsbrubaker 2014-03-12 15:37:19 -07:00
parent 4af2bfa0d9
commit a74dcce12f
11 changed files with 32 additions and 32 deletions
Download patch file Download diff file Expand all files Collapse all files

2
ActionBar/PrinterActionRow.cs
View file

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

4
ConfigurationPage/ConfigurationPage.cs
View file

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

8
ControlElements/ImageButtonFactory.cs
View file

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

20
ControlElements/TextImageButtonFactory.cs
View file

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

4
CustomWidgets/PartThumbnailWidget.cs
View file

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

6
PartPreviewWindow/CreateDiscreteMeshes.cs
View file

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

2
PrintLibrary/PluginChooserWindow.cs
View file

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

4
PrintLibrary/PrintLibraryListItem.cs
View file

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

4
PrintQueue/PartsSheet.cs
View file

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

2
PrintQueue/PrintQueueControl.cs
View file

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

8
PrinterControls/ManualPrinterControls.cs
View file

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