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

Remove redundant default values from properties.json

Browse source 
- Ensure valid SliceSettingData defaults
- Ensure ExtraSettings keeps "" default if missing
- Use auto properties in SliceSettingsOrganizer
- Remove single use private defaultEngineType variable
This commit is contained in:
John Lewin 2017-02-16 08:33:25 -08:00
parent d1cb4a87ca
commit 3211eae456
5 changed files with 35 additions and 1130 deletions
Download patch file Download diff file Expand all files Collapse all files

8
SlicerConfiguration/Settings/SettingsHelpers.cs
View file

@ -342,14 +342,10 @@ namespace MatterHackers.MatterControl.SlicerConfiguration
return Vector2.Zero;
}
private static readonly SlicingEngineTypes defaultEngineType = SlicingEngineTypes.MatterSlice;
public SlicingEngineTypes ActiveSliceEngineType()
{
List<SliceEngineInfo> availableEnginens = SlicingQueue.AvailableSliceEngines;
if (OsInformation.OperatingSystem == OSType.Android
|| availableEnginens.Count == 1)
|| SlicingQueue.AvailableSliceEngines.Count == 1)
{
// android only has MatterSlice available, so always return it.
return SlicingEngineTypes.MatterSlice;
@ -358,7 +354,7 @@ namespace MatterHackers.MatterControl.SlicerConfiguration
string engineType = printerSettings.GetValue("slicing_engine");
if (string.IsNullOrEmpty(engineType))
{
return defaultEngineType;
return SlicingEngineTypes.MatterSlice;
}
var engine = (SlicingEngineTypes)Enum.Parse(typeof(SlicingEngineTypes), engineType);