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

Revise SliceSettings nomenclature, add GetValue<T> method

Browse source
This commit is contained in:
John Lewin 2016-06-15 14:50:12 -07:00
parent 45fc170e25
commit 250ed87f31
14 changed files with 151 additions and 137 deletions
Download patch file Download diff file Expand all files Collapse all files

16
SlicerConfiguration/Settings/ProfileManager.cs
View file

@ -113,7 +113,7 @@ namespace MatterHackers.MatterControl.SlicerConfiguration
public static SettingsProfile LoadEmptyProfile()
{
return new SettingsProfile(
new LayeredProfile(
new PrinterSettings(
new OemProfile(),
SliceSettingsOrganizer.Instance.GetDefaultSettings()));
}
@ -136,7 +136,7 @@ namespace MatterHackers.MatterControl.SlicerConfiguration
internal static SettingsProfile LoadProfileFromDisk(string profilePath)
{
return new SettingsProfile(LayeredProfile.LoadFile(profilePath));
return new SettingsProfile(PrinterSettings.LoadFile(profilePath));
}
internal static void ImportFromExisting(string settingsFilePath)
@ -168,12 +168,12 @@ namespace MatterHackers.MatterControl.SlicerConfiguration
break;
case ".ini":
var settingsToImport = SettingsLayer.LoadFromIni(settingsFilePath);
var settingsToImport = PrinterSettingsLayer.LoadFromIni(settingsFilePath);
var oemProfile = new OemProfile(settingsToImport);
SettingsLayer baseConfig = SliceSettingsOrganizer.Instance.GetDefaultSettings();
PrinterSettingsLayer baseConfig = SliceSettingsOrganizer.Instance.GetDefaultSettings();
var layeredProfile = new LayeredProfile(oemProfile, baseConfig)
var layeredProfile = new PrinterSettings(oemProfile, baseConfig)
{
ID = printerInfo.ID,
};
@ -197,9 +197,9 @@ namespace MatterHackers.MatterControl.SlicerConfiguration
string guid = Guid.NewGuid().ToString();
OemProfile printerProfile = LoadHttpOemProfile(make, model);
SettingsLayer baseConfig = SliceSettingsOrganizer.Instance.GetDefaultSettings();
PrinterSettingsLayer baseConfig = SliceSettingsOrganizer.Instance.GetDefaultSettings();
var layeredProfile = new LayeredProfile(printerProfile, baseConfig)
var layeredProfile = new PrinterSettings(printerProfile, baseConfig)
{
ID = guid
};
@ -295,7 +295,7 @@ namespace MatterHackers.MatterControl.SlicerConfiguration
try
{
var profile = new SettingsProfile(LayeredProfile.LoadFile(filePath));
var profile = new SettingsProfile(PrinterSettings.LoadFile(filePath));
ProfileManager.Instance.Profiles.Add(new PrinterInfo()
{
ComPort = profile.ComPort(),