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

Move MatterControl dependencies into application layer

Browse source
This commit is contained in:
John Lewin 2018-11-25 07:39:09 -08:00
parent fe2f71559f
commit 4ee6169778
5 changed files with 82 additions and 71 deletions
Download patch file Download diff file Expand all files Collapse all files

70
MatterControlLib/SlicerConfiguration/Settings/PrinterSettingsExtensions.cs
View file

@ -27,10 +27,26 @@ of the authors and should not be interpreted as representing official policies,
either expressed or implied, of the FreeBSD Project.
*/
using System.Collections.Generic;
using System.IO;
using System.Linq;
namespace MatterHackers.MatterControl.SlicerConfiguration
{
public static class PrinterSettingsExtensions
{
private static Dictionary<string, string> blackListSettings = new Dictionary<string, string>()
{
[SettingsKey.spiral_vase] = "0",
[SettingsKey.layer_to_pause] = "",
[SettingsKey.print_leveling_data] = "",
[SettingsKey.print_leveling_enabled] = "0",
[SettingsKey.probe_has_been_calibrated] = "0",
[SettingsKey.filament_has_been_loaded] = "0"
};
private static object writeLock = new object();
public static double XSpeed(this PrinterSettings printerSettings)
{
return printerSettings.Helpers.GetMovementSpeeds()["x"];
@ -58,5 +74,59 @@ namespace MatterHackers.MatterControl.SlicerConfiguration
return movementSpeeds["e0"];
}
//[JsonIgnore]
//public string DocumentPath => ProfileManager.Instance.ProfilePath(this.ID);
//[JsonIgnore]
public static bool AutoSave { get; set; } = true;
public static void Save(this PrinterSettings settings, bool clearBlackListSettings = false)
{
// Skip save operation if on the EmptyProfile
if (!settings.PrinterSelected || !AutoSave)
{
return;
}
if (clearBlackListSettings)
{
foreach (var kvp in blackListSettings)
{
if (settings.UserLayer.ContainsKey(kvp.Key))
{
settings.UserLayer.Remove(kvp.Key);
}
settings.OemLayer[kvp.Key] = kvp.Value;
}
}
settings.Save(
filePath: ProfileManager.Instance.ProfilePath(settings.ID));
}
public static void Save(this PrinterSettings settings, string filePath)
{
// TODO: Rewrite to be owned by ProfileManager and simply mark as dirty and every n period persist and clear dirty flags
lock (writeLock)
{
string json = settings.ToJson();
var printerInfo = ProfileManager.Instance[settings.ID];
if (printerInfo != null)
{
printerInfo.ContentSHA1 = settings.ComputeSHA1(json);
ProfileManager.Instance.Save();
}
File.WriteAllText(filePath, json);
}
if (ApplicationController.Instance.ActivePrinters.FirstOrDefault(p => p.Settings.ID == settings.ID) is PrinterConfig printer)
{
ApplicationController.Instance.ActiveProfileModified.CallEvents(printer.Settings, null);
}
}
}
}