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

making the loading filament wizard use markdown rather than images

Browse source 
issue: MatterHackers/MCCentral#3878
Clarify what 'grabbing filament' really means during initial filament load
This commit is contained in:
Lars Brubaker 2018-07-17 14:32:56 -07:00
parent 7eedd3c400
commit 5e9d4363ce
10 changed files with 40 additions and 49 deletions
Download patch file Download diff file Expand all files Collapse all files

2
SlicerConfiguration/SettingsOrganizer.cs
View file

@ -46,7 +46,7 @@ namespace MatterHackers.MatterControl.SlicerConfiguration
public class SliceSettingData
{
[JsonConverter(typeof(StringEnumConverter))]
public enum DataEditTypes { STRING, WIDE_STRING, INT, INT_OR_MM, DOUBLE, POSITIVE_DOUBLE, OFFSET, DOUBLE_OR_PERCENT, VECTOR2, OFFSET2, CHECK_BOX, LIST, MULTI_LINE_TEXT, HARDWARE_PRESENT, COM_PORT, IP_LIST };
public enum DataEditTypes { STRING, WIDE_STRING, INT, INT_OR_MM, DOUBLE, POSITIVE_DOUBLE, OFFSET, DOUBLE_OR_PERCENT, VECTOR2, OFFSET2, CHECK_BOX, LIST, MULTI_LINE_TEXT, MARKDOWN_TEXT, HARDWARE_PRESENT, COM_PORT, IP_LIST };
public string SlicerConfigName { get; set; }

1
SlicerConfiguration/SliceSettingsWidget.cs
View file

@ -769,6 +769,7 @@ namespace MatterHackers.MatterControl.SlicerConfiguration
break;
case SliceSettingData.DataEditTypes.MULTI_LINE_TEXT:
case SliceSettingData.DataEditTypes.MARKDOWN_TEXT:
uiField = new MultilineStringField();
placeFieldInDedicatedRow = true;
break;

7
SlicerConfiguration/SlicerMapping/EngineMappingMatterSlice.cs
View file

@ -114,10 +114,9 @@ namespace MatterHackers.MatterControl.SlicerConfiguration
SettingsKey.ip_port,
SettingsKey.progress_reporting,
"load_filament_length",
"trim_image",
"clean_nozzle_image",
"insert_image",
"running_clean_image",
"trim_filament_markdown",
"insert_filament_markdown",
"running_clean_markdown",
"unload_filament_length",
"load_filament_speed",
};

7
SlicerConfiguration/SlicerMapping/MappingClasses.cs
View file

@ -68,10 +68,9 @@ namespace MatterHackers.MatterControl.SlicerConfiguration
new AsPercentOfReferenceOrDirect("load_filament_length_over_six", "", "load_filament_length", 1.0/6.0, false),
new AsPercentOfReferenceOrDirect("unload_filament_length_over_six", "", "unload_filament_length", 1.0/6.0, false),
new ScaledSingleNumber("load_filament_speed", "load_filament_speed", 60),
new MappedSetting("trim_image", "trim_image"),
new MappedSetting("clean_nozzle_image", "clean_nozzle_image"),
new MappedSetting("insert_image", "insert_image"),
new MappedSetting("running_clean_image", "running_clean_image"),
new MappedSetting("trim_filament_markdown", "trim_filament_markdown"),
new MappedSetting("insert_filament_markdown", "insert_filament_markdown"),
new MappedSetting("running_clean_markdown", "running_clean_markdown"),
};
public static string ReplaceMacroValues(string gcodeWithMacros)