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

Improving default loading markdown text

Browse source 
improving layout of progress bar in loading and unloading
This commit is contained in:
Lars Brubaker 2018-11-06 09:27:25 -08:00
parent 011c348e5d
commit 234ab03072
7 changed files with 27 additions and 19 deletions
Download patch file Download diff file Expand all files Collapse all files

14
MatterControlLib/ConfigurationPage/PrintLeveling/LoadFilamentWizard.cs
View file

@ -120,7 +120,7 @@ namespace MatterHackers.MatterControl.ConfigurationPage.PrintLeveling
{
BecomingActive = () =>
{
var markdownText = printer.Settings.GetValue(SettingsKey.insert_filament_markdown);
var markdownText = printer.Settings.GetValue(SettingsKey.insert_filament_markdown2);
var markdownWidget = new MarkdownWidget(theme);
markdownWidget.Markdown = markdownText = markdownText.Replace("\\n", "\n");
insertFilamentPage.ContentRow.AddChild(markdownWidget);
@ -180,18 +180,22 @@ namespace MatterHackers.MatterControl.ConfigurationPage.PrintLeveling
loadingFilamentPage.NextButton.Enabled = false;
// add the progress bar
var holder = new FlowLayoutWidget();
var holder = new FlowLayoutWidget()
{
Margin = new BorderDouble(3, 0, 0, 10),
};
var progressBar = new ProgressBar((int)(150 * GuiWidget.DeviceScale), (int)(15 * GuiWidget.DeviceScale))
{
FillColor = theme.PrimaryAccentColor,
BorderColor = theme.TextColor,
BackgroundColor = Color.White,
Margin = new BorderDouble(3, 0, 0, 10),
VAnchor = VAnchor.Center,
};
var progressBarText = new TextWidget("", pointSize: 10, textColor: theme.TextColor)
{
AutoExpandBoundsToText = true,
Margin = new BorderDouble(5, 0, 0, 0),
VAnchor = VAnchor.Center,
};
holder.AddChild(progressBar);
holder.AddChild(progressBarText);
@ -290,7 +294,7 @@ namespace MatterHackers.MatterControl.ConfigurationPage.PrintLeveling
{
BecomingActive = () =>
{
var markdownText = printer.Settings.GetValue(SettingsKey.running_clean_markdown);
var markdownText = printer.Settings.GetValue(SettingsKey.running_clean_markdown2);
var markdownWidget = new MarkdownWidget(theme);
markdownWidget.Markdown = markdownText = markdownText.Replace("\\n", "\n");
runningCleanPage.ContentRow.AddChild(markdownWidget);
@ -323,8 +327,8 @@ namespace MatterHackers.MatterControl.ConfigurationPage.PrintLeveling
if (runningGCodeCommands.Continue)
{
runningGCodeCommands.Continue = false;
printer.Settings.SetValue(SettingsKey.filament_has_been_loaded, "1");
}
printer.Settings.SetValue(SettingsKey.filament_has_been_loaded, "1");
};
yield return runningCleanPage;

8
MatterControlLib/ConfigurationPage/PrintLeveling/UnloadFilamentWizard.cs
View file

@ -108,18 +108,22 @@ namespace MatterHackers.MatterControl.ConfigurationPage.PrintLeveling
unloadingFilamentPage.NextButton.Enabled = false;
// add the progress bar
var holder = new FlowLayoutWidget();
var holder = new FlowLayoutWidget()
{
Margin = new BorderDouble(3, 0, 0, 10),
};
var progressBar = new ProgressBar((int)(150 * GuiWidget.DeviceScale), (int)(15 * GuiWidget.DeviceScale))
{
FillColor = theme.PrimaryAccentColor,
BorderColor = theme.TextColor,
BackgroundColor = Color.White,
Margin = new BorderDouble(3, 0, 0, 10),
VAnchor = VAnchor.Center,
};
var progressBarText = new TextWidget("", pointSize: 10, textColor: theme.TextColor)
{
AutoExpandBoundsToText = true,
Margin = new BorderDouble(5, 0, 0, 0),
VAnchor = VAnchor.Center,
};
holder.AddChild(progressBar);
holder.AddChild(progressBarText);

4
MatterControlLib/SlicerConfiguration/Settings/SettingsHelpers.cs
View file

@ -95,7 +95,7 @@ namespace MatterHackers.MatterControl.SlicerConfiguration
public const string include_firmware_updater = nameof(include_firmware_updater);
public const string infill_overlap_perimeter = nameof(infill_overlap_perimeter);
public const string infill_type = nameof(infill_type);
public const string insert_filament_markdown = nameof(insert_filament_markdown);
public const string insert_filament_markdown2 = nameof(insert_filament_markdown2);
public const string ip_address = nameof(ip_address);
public const string ip_port = nameof(ip_port);
public const string jerk_velocity = nameof(jerk_velocity);
@ -138,7 +138,7 @@ namespace MatterHackers.MatterControl.SlicerConfiguration
public const string recover_is_enabled = nameof(recover_is_enabled);
public const string recover_position_before_z_home = nameof(recover_position_before_z_home);
public const string resume_gcode = nameof(resume_gcode);
public const string running_clean_markdown = nameof(running_clean_markdown);
public const string running_clean_markdown2 = nameof(running_clean_markdown2);
public const string selector_ip_address = nameof(selector_ip_address);
public const string send_with_checksum = nameof(send_with_checksum);
public const string filament_has_been_loaded = nameof(filament_has_been_loaded);

4
MatterControlLib/SlicerConfiguration/SlicerMapping/EngineMappingMatterSlice.cs
View file

@ -117,8 +117,8 @@ namespace MatterHackers.MatterControl.SlicerConfiguration
SettingsKey.progress_reporting,
SettingsKey.load_filament_length,
SettingsKey.trim_filament_markdown,
SettingsKey.insert_filament_markdown,
SettingsKey.running_clean_markdown,
SettingsKey.insert_filament_markdown2,
SettingsKey.running_clean_markdown2,
SettingsKey.unload_filament_length,
SettingsKey.load_filament_speed,
};

4
MatterControlLib/SlicerConfiguration/SlicerMapping/MappingClasses.cs
View file

@ -66,8 +66,8 @@ namespace MatterHackers.MatterControl.SlicerConfiguration
new ScaledSingleNumber("travel_speed", "travel_speed", 60),
new ScaledSingleNumber(SettingsKey.load_filament_speed, SettingsKey.load_filament_speed, 60),
new MappedSetting(SettingsKey.trim_filament_markdown, SettingsKey.trim_filament_markdown),
new MappedSetting(SettingsKey.insert_filament_markdown, SettingsKey.insert_filament_markdown),
new MappedSetting(SettingsKey.running_clean_markdown, SettingsKey.running_clean_markdown),
new MappedSetting(SettingsKey.insert_filament_markdown2, SettingsKey.insert_filament_markdown2),
new MappedSetting(SettingsKey.running_clean_markdown2, SettingsKey.running_clean_markdown2),
};
public static string ReplaceMacroValues(string gcodeWithMacros)