Merge branch 'master' of https://github.com/MatterHackers/MatterControl
This commit is contained in:
commit
dff01bdfd8
1 changed files with 10 additions and 4 deletions
|
|
@ -160,8 +160,11 @@ namespace MatterHackers.MatterControl.DataStorage.ClassicDB
|
||||||
var collections = Datastore.Instance.dbSQLite.Table<SliceSettingsCollection>().Where(v => v.PrinterId == printer.Id && v.Tag == "material");
|
var collections = Datastore.Instance.dbSQLite.Table<SliceSettingsCollection>().Where(v => v.PrinterId == printer.Id && v.Tag == "material");
|
||||||
foreach (var collection in collections)
|
foreach (var collection in collections)
|
||||||
{
|
{
|
||||||
var settingsDictionary = LoadSettings(collection);
|
layeredProfile.MaterialLayers.Add(new PrinterSettingsLayer(LoadSettings(collection))
|
||||||
layeredProfile.MaterialLayers.Add(new PrinterSettingsLayer(settingsDictionary));
|
{
|
||||||
|
LayerID = Guid.NewGuid().ToString(),
|
||||||
|
Name = collection.Name
|
||||||
|
});
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
@ -170,8 +173,11 @@ namespace MatterHackers.MatterControl.DataStorage.ClassicDB
|
||||||
var collections = Datastore.Instance.dbSQLite.Table<SliceSettingsCollection>().Where(v => v.PrinterId == printer.Id && v.Tag == "quality");
|
var collections = Datastore.Instance.dbSQLite.Table<SliceSettingsCollection>().Where(v => v.PrinterId == printer.Id && v.Tag == "quality");
|
||||||
foreach (var collection in collections)
|
foreach (var collection in collections)
|
||||||
{
|
{
|
||||||
var settingsDictionary = LoadSettings(collection);
|
layeredProfile.QualityLayers.Add(new PrinterSettingsLayer(LoadSettings(collection))
|
||||||
layeredProfile.QualityLayers.Add(new PrinterSettingsLayer(settingsDictionary));
|
{
|
||||||
|
LayerID = Guid.NewGuid().ToString(),
|
||||||
|
Name = collection.Name
|
||||||
|
});
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue