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

Better images in macros

Browse source
This commit is contained in:
Lars Brubaker 2017-02-03 14:41:18 -08:00
parent 7b62dcd34b
commit 97dffa1d53
3 changed files with 40 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

27
PrinterCommunication/Io/QueuedCommandsStream.cs
View file

@ -160,6 +160,10 @@ namespace MatterHackers.MatterControl.PrinterCommunication.Io
UiThread.RunOnIdle(() => WizardWindow.Close("Macro"));
break;
case "Ding":
MatterControlApplication.Instance.PlaySound("timer-done.wav");
break;
case "Message":
if (messages.Count > 0)
{
@ -208,18 +212,31 @@ namespace MatterHackers.MatterControl.PrinterCommunication.Io
return lineToSend;
}
public ImageBuffer LoadImageAsset(string fileName)
public ImageBuffer LoadImageAsset(string uri)
{
string filePath = Path.Combine("Images", "Macros", fileName);
if (StaticData.Instance.FileExists(filePath))
string filePath = Path.Combine("Images", "Macros", uri);
bool imageOnDisk = false;
if (uri.IndexOfAny(Path.GetInvalidFileNameChars()) == 0)
{
try
{
imageOnDisk = StaticData.Instance.FileExists(filePath);
}
catch
{
imageOnDisk = false;
}
}
if (imageOnDisk)
{
return StaticData.Instance.LoadImage(filePath);
}
else
{
var imageBuffer = new ImageBuffer();
var imageBuffer = new ImageBuffer(320, 10);
ApplicationController.Instance.DownloadToImageAsync(imageBuffer, "http://sync-dot-mattercontrol-test.appspot.com/static/macros/" + fileName, false);
ApplicationController.Instance.DownloadToImageAsync(imageBuffer, uri, true);
return imageBuffer;
}