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

Merge pull request #1181 from mmoening/master

Browse source 
Fixed Capitalization errors in oemProfiles.json
This commit is contained in:
Lars Brubaker 2016-07-25 16:03:05 -07:00 • committed by GitHub
commit d6c8cb9b04
2 changed files with 3 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

4
SettingsManagement/OemSettings.cs
View file

@ -128,7 +128,7 @@ namespace MatterHackers.MatterControl.SettingsManagement
private void Deserialized(StreamingContext context)
{
// Load from StaticData to prepopulate oemProfiles for when user create a printer before load cacheable is done
OemProfiles = JsonConvert.DeserializeObject<OemProfileDictionary>(StaticData.Instance.ReadAllText(Path.Combine("Profiles", "oemprofiles.json")));
OemProfiles = JsonConvert.DeserializeObject<OemProfileDictionary>(StaticData.Instance.ReadAllText(Path.Combine("Profiles", "oemProfiles.json")));
var manufacturesList = OemProfiles.Keys.ToDictionary(oem => oem).ToList();
SetManufacturers(manufacturesList);
@ -143,7 +143,7 @@ namespace MatterHackers.MatterControl.SettingsManagement
}
var oemProfiles = await ApplicationController.LoadCacheableAsync<OemProfileDictionary>(
"oemprofiles.json",
"oemProfiles.json",
"profiles",
ApplicationController.GetPublicProfileList);

2
Tests/MatterControl.AutomationTests/RetrievePublicProfileTest.cs
View file

@ -32,7 +32,7 @@ namespace MatterControl.Tests.MatterControl
/*
StaticData.Instance = new MatterHackers.Agg.FileSystemStaticData(Path.Combine("..", "..", "..", "..", "StaticData"));
string profilePath = Path.Combine(ApplicationDataStorage.ApplicationUserDataPath, "data", "temp", "cache", "profiles", "oemprofiles.json");
string profilePath = Path.Combine(ApplicationDataStorage.ApplicationUserDataPath, "data", "temp", "cache", "profiles", "oemProfiles.json");
//MatterControlUtilities.OverrideAppDataLocation();