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

Removing settings base layer from being strode in users data

Browse source
This commit is contained in:
Lars Brubaker 2016-06-22 15:29:20 -07:00
parent abd5d113ad
commit 768d555f2a
4 changed files with 16 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

3
DataStorage/Classic/ClassicSqlitePrinterProfiles.cs
View file

@ -81,8 +81,7 @@ namespace MatterHackers.MatterControl.DataStorage.ClassicDB
profileData.Profiles.Add(printerInfo);
var layeredProfile = new PrinterSettings(
new OemProfile(LoadOemLayer(printer)),
SliceSettingsOrganizer.Instance.GetDefaultSettings());
new OemProfile(LoadOemLayer(printer)));
LoadQualitySettings(layeredProfile, printer);
LoadMaterialSettings(layeredProfile, printer);

13
SlicerConfiguration/Settings/LayeredProfile.cs
View file

@ -55,10 +55,9 @@ namespace MatterHackers.MatterControl.SlicerConfiguration
[JsonIgnore]
internal PrinterSettingsLayer MaterialLayer { get; private set; }
public PrinterSettings(OemProfile printerProfile, PrinterSettingsLayer baseConfig)
public PrinterSettings(OemProfile printerProfile)
{
this.OemProfile = printerProfile;
this.BaseLayer = baseConfig;
}
public List<GCodeMacro> Macros { get; set; } = new List<GCodeMacro>();
@ -245,7 +244,15 @@ namespace MatterHackers.MatterControl.SlicerConfiguration
return "";
}
public PrinterSettingsLayer BaseLayer { get; set; }
static PrinterSettingsLayer baseLayerCache = SliceSettingsOrganizer.Instance.GetDefaultSettings();
[JsonIgnore]
public PrinterSettingsLayer BaseLayer
{
get
{
return baseLayerCache;
}
}
private IEnumerable<PrinterSettingsLayer> defaultLayerCascade
{

11
SlicerConfiguration/Settings/ProfileManager.cs
View file

@ -117,10 +117,7 @@ namespace MatterHackers.MatterControl.SlicerConfiguration
public static SettingsProfile LoadEmptyProfile()
{
var empytProfile = new SettingsProfile(
new PrinterSettings(
new OemProfile(),
SliceSettingsOrganizer.Instance.GetDefaultSettings()));
var empytProfile = new SettingsProfile(new PrinterSettings(new OemProfile()));
empytProfile.SetActiveValue(SettingsKey.printer_name.ToString(), "Printers...".Localize());
@ -186,9 +183,8 @@ namespace MatterHackers.MatterControl.SlicerConfiguration
var settingsToImport = PrinterSettingsLayer.LoadFromIni(settingsFilePath);
var oemProfile = new OemProfile(settingsToImport);
PrinterSettingsLayer baseConfig = SliceSettingsOrganizer.Instance.GetDefaultSettings();
var layeredProfile = new PrinterSettings(oemProfile, baseConfig)
var layeredProfile = new PrinterSettings(oemProfile)
{
ID = printerInfo.ID,
};
@ -211,9 +207,8 @@ namespace MatterHackers.MatterControl.SlicerConfiguration
string guid = Guid.NewGuid().ToString();
OemProfile printerProfile = LoadHttpOemProfile(make, model);
PrinterSettingsLayer baseConfig = SliceSettingsOrganizer.Instance.GetDefaultSettings();
var layeredProfile = new PrinterSettings(printerProfile, baseConfig)
var layeredProfile = new PrinterSettings(printerProfile)
{
ID = guid,
// TODO: This should really be set by the system that generates the source documents

4
Tests/MatterControl.Tests/MatterControl/ConfigIniTests.cs
View file

@ -33,7 +33,7 @@ namespace MatterControl.Tests.MatterControl
RelativeFilePath = configIni.FullName.Substring(printerSettingsDirectory.Length + 1),
// The config.ini layer cascade contains only itself
LayerCascade = new PrinterSettings(oemProfile, new PrinterSettingsLayer()),
LayerCascade = new PrinterSettings(oemProfile),
},
MatterialLayers = LoadLayers(Path.Combine(configIni.Directory.FullName, "material"), oemProfile),
QualityLayers = LoadLayers(Path.Combine(configIni.Directory.FullName, "quality"), oemProfile)
@ -47,7 +47,7 @@ namespace MatterControl.Tests.MatterControl
Directory.GetFiles(layersDirectory, "*.slice").Select(file => new LayerInfo()
{
RelativeFilePath = file.Substring(printerSettingsDirectory.Length + 1),
LayerCascade = new PrinterSettings(new OemProfile(PrinterSettingsLayer.LoadFromIni(file)), oemProfile.OemLayer)
LayerCascade = new PrinterSettings(new OemProfile(PrinterSettingsLayer.LoadFromIni(file)))
}).ToList()
: new List<LayerInfo>();
}