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

Merge pull request #1135 from gregory-diaz/master

Browse source 
Added the ability for users to load the last usable profile in their profile history in the event that their current profile is corrupt. Also added the ability to load a public profile in the event that a guest profile is corrupt.
This commit is contained in:
johnlewin 2016-07-20 12:34:30 -07:00 • committed by GitHub
commit edc7e13f3b
2 changed files with 81 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

86
SlicerConfiguration/Settings/PrinterSettings.cs
View file

@ -46,6 +46,7 @@ using MatterHackers.Agg;
using MatterHackers.VectorMath;
using MatterHackers.MeshVisualizer;
using MatterHackers.Agg.PlatformAbstract;
using System.Threading.Tasks;
namespace MatterHackers.MatterControl.SlicerConfiguration
{
@ -63,6 +64,8 @@ namespace MatterHackers.MatterControl.SlicerConfiguration
public string ID { get; set; }
public static Func<bool> ShouldShowAuthPanel { get; set; }
[JsonIgnore]
internal PrinterSettingsLayer QualityLayer { get; private set; }
@ -216,15 +219,51 @@ namespace MatterHackers.MatterControl.SlicerConfiguration
//
public static PrinterSettings LoadFile(string printerProfilePath)
{
JObject jObject;
JObject jObject = null;
try
{
jObject = JObject.Parse(File.ReadAllText(printerProfilePath));
}
catch
{
return RecoverProfile(printerProfilePath);
string profileKey = Path.GetFileNameWithoutExtension(printerProfilePath);
var profile = ProfileManager.Instance[profileKey];
if (MatterControlApplication.IsLoading)
{
UiThread.RunOnIdle(() =>
{
bool userIsLoggedIn = !ShouldShowAuthPanel?.Invoke() ?? false;
if (userIsLoggedIn && profile != null)
{
if (profile != null)
{
RevertToMostRecentProfile(profile).ContinueWith((t) => WarnAboutRevert(profile));
}
else
{
RevertToOemProfile(printerProfilePath);
WarnAboutRevert(profile);
}
}
}, 4);
return ProfileManager.LoadEmptyProfile();
}
else
{
bool userIsLoggedIn = !ShouldShowAuthPanel?.Invoke() ?? false;
if (userIsLoggedIn && profile != null)
{
RevertToMostRecentProfile(profile).ContinueWith((t) => WarnAboutRevert(profile));
return ProfileManager.LoadEmptyProfile();
}
else
{
WarnAboutRevert(profile);
return RevertToOemProfile(printerProfilePath);
}
}
}
int documentVersion = jObject?.GetValue("DocumentVersion")?.Value<int>() ?? 0;
@ -241,17 +280,34 @@ namespace MatterHackers.MatterControl.SlicerConfiguration
}
catch
{
return RecoverProfile(printerProfilePath);
return RevertToOemProfile(printerProfilePath);
}
}
public static PrinterSettings RecoverProfile(string printerProfilePath)
static bool warningOpen = false;
public static void WarnAboutRevert(PrinterInfo profile)
{
if (!warningOpen)
{
warningOpen = true;
UiThread.RunOnIdle(() =>
{
StyledMessageBox.ShowMessageBox((clicedOk) =>
{
warningOpen = false;
}, String.Format("The profile you are attempting to load has been corrupted. We loaded your last usable {0} {1} profile from your recent profile history instead.".Localize(), profile.Make, profile.Model), "Recovered printer profile".Localize(), messageType: StyledMessageBox.MessageType.OK);
});
}
}
public static PrinterSettings RevertToOemProfile(string printerProfilePath)
{
string profileKey = Path.GetFileNameWithoutExtension(printerProfilePath);
string profileKey = Path.GetFileNameWithoutExtension(printerProfilePath);
var profile = ProfileManager.Instance[profileKey];
string publicProfileDeviceToken = OemSettings.Instance.OemProfiles[profile.Make][profile.Model];
string publicProfileToLoad = Path.Combine(ApplicationDataStorage.ApplicationUserDataPath, "data", "temp", "cache", "profiles") + "\\" + publicProfileDeviceToken + ".json";
var oemProfile = JsonConvert.DeserializeObject<PrinterSettings>(File.ReadAllText(publicProfileToLoad));
oemProfile.ID = profile.ID;
oemProfile.SetValue(SettingsKey.printer_name, profile.Name);
@ -263,6 +319,22 @@ namespace MatterHackers.MatterControl.SlicerConfiguration
return oemProfile;
}
private static async Task RevertToMostRecentProfile(PrinterInfo profile)
{
var recentProfileHistoryItems = await ApplicationController.GetProfileHistory(profile.DeviceToken);
if (recentProfileHistoryItems != null)
{
string profileToken = recentProfileHistoryItems.OrderByDescending(kvp => kvp.Key).FirstOrDefault().Value;
// Download the specified json profile
await ApplicationController.GetPrinterProfile(profile, profileToken);
// Update the active instance to the newly downloaded item
var printerProfile = ProfileManager.LoadProfile(profile.ID, false);
ActiveSliceSettings.RefreshActiveInstance(printerProfile);
}
}
/// <summary>
/// Should contain both user created and oem specified material layers
/// </summary>