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

Use specialized rather than generic field

Browse source
This commit is contained in:
John Lewin 2018-01-12 15:00:20 -08:00
parent d8e3b3a9ac
commit 7a648d8f2f
3 changed files with 101 additions and 102 deletions
Download patch file Download diff file Expand all files Collapse all files

5
SlicerConfiguration/SliceSettingsOrganizer.cs
View file

@ -62,7 +62,7 @@ namespace MatterHackers.MatterControl.SlicerConfiguration
public string HelpText { get; set; } = "";
public string ExtraSettings { get; set; } = "";
public string Units { get; set; } = "";
public string ListValues { get; set; } = "";
@ -80,12 +80,11 @@ namespace MatterHackers.MatterControl.SlicerConfiguration
public OrganizerSubGroup OrganizerSubGroup { get; set; }
public SliceSettingData(string slicerConfigName, string presentationName, DataEditTypes dataEditType, string extraSettings = "", string helpText = "")
public SliceSettingData(string slicerConfigName, string presentationName, DataEditTypes dataEditType, string helpText = "")
{
// During deserialization Json.net has to call this constructor but may fail to find the optional ExtraSettings
// value. When this occurs, it passes null overriding the default empty string. To ensure empty string instead
// of null, we conditionally reassign "" if null
this.ExtraSettings = extraSettings ?? "";
this.SlicerConfigName = slicerConfigName;
this.PresentationName = presentationName;
this.DataEditType = dataEditType;