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

Upgrading to .net 6

Browse source
This commit is contained in:
Lars Brubaker 2022-07-15 17:28:39 -07:00
parent 738c6e20ea
commit 32a192c2b8
155 changed files with 2030 additions and 2536 deletions
Download patch file Download diff file Expand all files Collapse all files

10
MatterControlLib/PrinterControls/ControlWidgets/AdjustmentControls.cs
View file

@ -41,8 +41,8 @@ namespace MatterHackers.MatterControl.PrinterControls
{
public class AdjustmentControls : FlowLayoutWidget
{
private MHNumberEdit feedRateValue;
private MHNumberEdit extrusionValue;
private ThemedNumberEdit feedRateValue;
private ThemedNumberEdit extrusionValue;
private SolidSlider feedRateRatioSlider;
private SolidSlider extrusionRatioSlider;
@ -55,7 +55,7 @@ namespace MatterHackers.MatterControl.PrinterControls
private PrinterConfig printer;
private AdjustmentControls(PrinterConfig printer, ThemeConfig theme)
: base (FlowDirection.TopToBottom)
: base(FlowDirection.TopToBottom)
{
double sliderWidth = 300 * GuiWidget.DeviceScale;
double sliderThumbWidth = 10 * GuiWidget.DeviceScale;
@ -99,7 +99,7 @@ namespace MatterHackers.MatterControl.PrinterControls
};
settingsRow.AddChild(feedRateRatioSlider);
feedRateValue = new MHNumberEdit(Math.Round(printer.Settings.GetValue<double>(SettingsKey.feedrate_ratio), 2), theme, allowDecimals: true, minValue: minFeedRateRatio, maxValue: maxFeedRateRatio, pixelWidth: 40 * GuiWidget.DeviceScale)
feedRateValue = new ThemedNumberEdit(Math.Round(printer.Settings.GetValue<double>(SettingsKey.feedrate_ratio), 2), theme, allowDecimals: true, minValue: minFeedRateRatio, maxValue: maxFeedRateRatio, pixelWidth: 40 * GuiWidget.DeviceScale)
{
Name = "Feed Rate NumberEdit",
SelectAllOnFocus = true,
@ -157,7 +157,7 @@ namespace MatterHackers.MatterControl.PrinterControls
};
settingsRow.AddChild(extrusionRatioSlider);
extrusionValue = new MHNumberEdit(Math.Round(printer.Settings.GetValue<double>(SettingsKey.extrusion_ratio), 2), theme, allowDecimals: true, minValue: minExtrutionRatio, maxValue: maxExtrusionRatio, pixelWidth: 40 * GuiWidget.DeviceScale)
extrusionValue = new ThemedNumberEdit(Math.Round(printer.Settings.GetValue<double>(SettingsKey.extrusion_ratio), 2), theme, allowDecimals: true, minValue: minExtrutionRatio, maxValue: maxExtrusionRatio, pixelWidth: 40 * GuiWidget.DeviceScale)
{
Name = "Extrusion Multiplier NumberEdit",
SelectAllOnFocus = true,

4
MatterControlLib/PrinterControls/ControlWidgets/FanControlsRow.cs
View file

@ -38,7 +38,7 @@ namespace MatterHackers.MatterControl.PrinterControls
{
public class FanControlsRow : SettingsRow
{
private MHNumberEdit fanSpeedDisplay;
private ThemedNumberEdit fanSpeedDisplay;
private RoundedToggleSwitch toggleSwitch;
private PrinterConfig printer;
@ -57,7 +57,7 @@ namespace MatterHackers.MatterControl.PrinterControls
this.AddChild(container);
this.BorderColor = Color.Transparent;
fanSpeedDisplay = new MHNumberEdit(0, theme, minValue: 0, maxValue: 100, pixelWidth: 30 * GuiWidget.DeviceScale)
fanSpeedDisplay = new ThemedNumberEdit(0, theme, minValue: 0, maxValue: 100, pixelWidth: 30 * GuiWidget.DeviceScale)
{
Value = printer.Connection.GetFanSpeed0To255(fanIndex) * 100 / 255,
VAnchor = VAnchor.Center | VAnchor.Fit,