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

Use consistent format for SliceSetting -> PresentationName

Browse source 
- Enforce with test
This commit is contained in:
John Lewin 2017-09-14 14:11:49 -07:00
parent 9f8fab01a9
commit cebc48ba3b
2 changed files with 20 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

8
StaticData/SliceSettings/Properties.json
View file

@ -34,7 +34,7 @@
},
{
"SlicerConfigName": "bottom_solid_layers",
"PresentationName": "Bottom Solid Layers:",
"PresentationName": "Bottom Solid Layers",
"HelpText": "The number of layers or the distance in millimeters to solid fill on the bottom surface(s) of the object. Add mm to the end of the number to specify distance in millimeters.",
"DataEditType": "INT_OR_MM",
"ExtraSettings": "count or mm",
@ -42,7 +42,7 @@
},
{
"SlicerConfigName": "layer_to_pause",
"PresentationName": "Layer(s) To Pause:",
"PresentationName": "Layer(s) To Pause",
"HelpText": "The layer(s) at which the print will pause, allowing for a change in filament. Leave blank to disable. To pause on multiple layers, separate the layer numbers with semicolons. For example: \"16; 37\".",
"DataEditType": "STRING",
"ResetAtEndOfPrint": true,
@ -214,7 +214,7 @@
},
{
"SlicerConfigName": "extra_perimeters",
"PresentationName": "Generate Extra Perimeters When Needed:",
"PresentationName": "Generate Extra Perimeters When Needed",
"HelpText": "Allow slicer to generate extra perimeters when needed for sloping walls.",
"DataEditType": "CHECK_BOX",
"DefaultValue": "1"
@ -1659,7 +1659,7 @@
},
{
"SlicerConfigName": "top_solid_layers",
"PresentationName": "Top Solid Layers:",
"PresentationName": "Top Solid Layers",
"HelpText": "The number of layers, or the distance in millimeters, to solid fill on the top surface(s) of the object. Add mm to the end of the number to specify distance in millimeters.",
"DataEditType": "INT_OR_MM",
"ExtraSettings": "count or mm",

16
Tests/MatterControl.Tests/MatterControl/SettingsParseTests.cs
View file

@ -239,6 +239,22 @@ namespace MatterControl.Tests.MatterControl
}
}
[Test]
public void PresentationNamesLackColon()
{
AggContext.StaticData = new FileSystemStaticData(TestContext.CurrentContext.ResolveProjectPath(4, "StaticData"));
MatterControlUtilities.OverrideAppDataLocation(TestContext.CurrentContext.ResolveProjectPath(4));
string propertiesFileContents = AggContext.StaticData.ReadAllText(Path.Combine("SliceSettings", "Properties.json"));
var allSettings = JsonConvert.DeserializeObject<List<SliceSettingData>>(propertiesFileContents);
foreach (var setting in allSettings)
{
// TargetSetting source field must be defined/known
Assert.IsFalse(setting.PresentationName.Trim().EndsWith(":"), $"Presentation name should not end with trailing colon: '{setting.PresentationName}'");
}
}
PrinterSettings GetProfile(string[] settings)
{
Dictionary<string, string> dictionary = new Dictionary<string, string>();