Convert properties.json into C# code

This commit is contained in:
John Lewin 2019-01-06 08:15:39 -08:00
parent 9ea5a3206b
commit 9dc181bd59
5 changed files with 2200 additions and 8 deletions

View file

@ -13,6 +13,7 @@
<ItemGroup>
<ProjectReference Include="..\Submodules\agg-sharp\agg\Agg.csproj">
</ProjectReference>
<ProjectReference Include="..\Submodules\agg-sharp\Localizations\Localizations.csproj" />
<ProjectReference Include="..\Submodules\agg-sharp\VectorMath\VectorMath.csproj">
</ProjectReference>
</ItemGroup>

View file

@ -97,14 +97,8 @@ namespace MatterHackers.MatterControl.SlicerConfiguration
static PrinterSettings()
{
string propertiesFileContents = AggContext.StaticData.ReadAllText(Path.Combine("SliceSettings", "Properties.json"));
var propertiesJsonData = JsonConvert.DeserializeObject<List<SliceSettingData>>(propertiesFileContents);
SettingsData = new Dictionary<string, SliceSettingData>();
foreach (var settingsData in propertiesJsonData)
{
SettingsData.Add(settingsData.SlicerConfigName, settingsData);
}
// Load settings
PrinterSettings.SettingsData = LoadAllSettings();
PrinterSettings.Layout = new SettingsLayout();
@ -112,6 +106,58 @@ namespace MatterHackers.MatterControl.SlicerConfiguration
Empty.UserLayer[SettingsKey.printer_name] = "Empty Printer";
}
private static Dictionary<string, SliceSettingData> LoadAllSettings()
{
var settings = new Dictionary<string, SliceSettingData>();
foreach (var settingsData in SliceSettingsFields.AllSettings())
{
settings.Add(settingsData.SlicerConfigName, settingsData);
}
return settings;
}
//static SettingsOrganizerValidateAgainstJson()
//{
// string propertiesFileContents = AggContext.StaticData.ReadAllText(Path.Combine("SliceSettings", "Properties.json"));
// var propertiesJsonData = JsonConvert.DeserializeObject<List<SliceSettingData>>(propertiesFileContents);
// SettingsData = new Dictionary<string, SliceSettingData>();
// foreach (var settingsData in propertiesJsonData)
// {
// SettingsData.Add(settingsData.SlicerConfigName, settingsData);
// }
// var SettingsData2 = new Dictionary<string, SliceSettingData>();
// foreach (var settingsData in Gah.GetSettings())
// {
// SettingsData2.Add(settingsData.SlicerConfigName, settingsData);
// }
// var i = 0;
// foreach (var key in SettingsData.Keys)
// {
// var itemA = SettingsData[key];
// var itemSA = JsonConvert.SerializeObject(itemA, Formatting.Indented);
// var itemB = SettingsData2[key];
// var itemSB = JsonConvert.SerializeObject(itemB, Formatting.Indented);
// if (itemSA != itemSB)
// {
// File.WriteAllText($@"c:\temp\sa{i}.txt", itemSA);
// File.WriteAllText($@"c:\temp\sb{i}.txt", itemSB);
// i += 1;
// Console.WriteLine();
// }
// }
//}
public PrinterSettings()
{
this.Helpers = new SettingsHelpers(this);

File diff suppressed because it is too large Load diff