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

Moving slice settings properties file to json to make it easier to add in preset lists.

Browse source
This commit is contained in:
larsbrubaker 2014-11-19 21:09:42 -08:00
parent 79550afc29
commit 1029b85e9f
4 changed files with 1070 additions and 168 deletions
Download patch file Download diff file Expand all files Collapse all files

21
SlicerConfiguration/SliceSettingsOrganizer.cs
View file

@ -215,10 +215,10 @@ namespace MatterHackers.MatterControl.SlicerConfiguration
SliceSettingsOrganizer()
{
string layouts = Path.Combine(ApplicationDataStorage.Instance.ApplicationStaticDataPath, "SliceSettings", "Layouts.txt");
string properties = Path.Combine(ApplicationDataStorage.Instance.ApplicationStaticDataPath, "SliceSettings", "Properties.txt");
string layoutsPathAndFilename = Path.Combine(ApplicationDataStorage.Instance.ApplicationStaticDataPath, "SliceSettings", "Layouts.txt");
string propertiesPathAndFilename = Path.Combine(ApplicationDataStorage.Instance.ApplicationStaticDataPath, "SliceSettings", "Properties.json");
LoadAndParseSettingsFiles(properties, layouts);
LoadAndParseSettingsFiles(propertiesPathAndFilename, layoutsPathAndFilename);
#if false
Categories.Add(CreatePrintSettings());
@ -279,11 +279,11 @@ namespace MatterHackers.MatterControl.SlicerConfiguration
sw.Close();
}
void LoadAndParseSettingsFiles(string properties, string layout)
void LoadAndParseSettingsFiles(string propertiesPathAndFilename, string layoutPathAndFilename)
{
{
string propertiesFileContents = "";
using (FileStream fileStream = new FileStream(properties, FileMode.Open, FileAccess.Read, FileShare.ReadWrite))
using (FileStream fileStream = new FileStream(propertiesPathAndFilename, FileMode.Open, FileAccess.Read, FileShare.ReadWrite))
{
using (StreamReader propertiesReader = new StreamReader(fileStream))
{
@ -291,19 +291,12 @@ namespace MatterHackers.MatterControl.SlicerConfiguration
}
}
string[] lines = propertiesFileContents.Split('\n');
foreach (string line in lines)
{
if (line.Trim().Length > 0)
{
settingsData.Add(OrganizerSettingsData.NewOrganizerSettingData(line));
}
}
settingsData = (List<OrganizerSettingsData>)JsonConvert.DeserializeObject<List<OrganizerSettingsData>>(propertiesFileContents);
}
{
string layoutFileContents = "";
using (FileStream fileStream = new FileStream(layout, FileMode.Open, FileAccess.Read, FileShare.ReadWrite))
using (FileStream fileStream = new FileStream(layoutPathAndFilename, FileMode.Open, FileAccess.Read, FileShare.ReadWrite))
{
using (StreamReader layoutReader = new StreamReader(fileStream))
{