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

16
MatterControlLib/SlicerConfiguration/UIFields/Vector4Field.cs
View file

@ -37,10 +37,10 @@ namespace MatterHackers.MatterControl.SlicerConfiguration
{
public static int VectorXYZWEditWidth = (int)(45 * GuiWidget.DeviceScale + .5);
private MHNumberEdit xEditWidget;
private MHNumberEdit yEditWidget;
private MHNumberEdit zEditWidget;
private MHNumberEdit wEditWidget;
private ThemedNumberEdit xEditWidget;
private ThemedNumberEdit yEditWidget;
private ThemedNumberEdit zEditWidget;
private ThemedNumberEdit wEditWidget;
private ThemeConfig theme;
@ -76,7 +76,7 @@ namespace MatterHackers.MatterControl.SlicerConfiguration
double.TryParse(xyzValueStrings[0], out double currentXValue);
xEditWidget = new MHNumberEdit(currentXValue, theme, Labels[0] /* X */, allowNegatives: true, allowDecimals: true, pixelWidth: VectorXYZWEditWidth, tabIndex: tabIndex)
xEditWidget = new ThemedNumberEdit(currentXValue, theme, Labels[0] /* X */, allowNegatives: true, allowDecimals: true, pixelWidth: VectorXYZWEditWidth, tabIndex: tabIndex)
{
ToolTipText = this.HelpText,
TabIndex = tabIndex,
@ -98,7 +98,7 @@ namespace MatterHackers.MatterControl.SlicerConfiguration
double.TryParse(xyzValueStrings[1], out double currentYValue);
yEditWidget = new MHNumberEdit(currentYValue, theme, Labels[1] /* Y */, allowNegatives: true, allowDecimals: true, pixelWidth: VectorXYZWEditWidth, tabIndex: tabIndex)
yEditWidget = new ThemedNumberEdit(currentYValue, theme, Labels[1] /* Y */, allowNegatives: true, allowDecimals: true, pixelWidth: VectorXYZWEditWidth, tabIndex: tabIndex)
{
ToolTipText = this.HelpText,
TabIndex = tabIndex + 1,
@ -120,7 +120,7 @@ namespace MatterHackers.MatterControl.SlicerConfiguration
double.TryParse(xyzValueStrings[2], out double currentZValue);
zEditWidget = new MHNumberEdit(currentZValue, theme, Labels[2] /* Z */, allowNegatives: true, allowDecimals: true, pixelWidth: VectorXYZWEditWidth, tabIndex: tabIndex)
zEditWidget = new ThemedNumberEdit(currentZValue, theme, Labels[2] /* Z */, allowNegatives: true, allowDecimals: true, pixelWidth: VectorXYZWEditWidth, tabIndex: tabIndex)
{
ToolTipText = this.HelpText,
TabIndex = tabIndex + 1,
@ -142,7 +142,7 @@ namespace MatterHackers.MatterControl.SlicerConfiguration
double.TryParse(xyzValueStrings[3], out double currentWValue);
wEditWidget = new MHNumberEdit(currentZValue, theme, Labels[3] /* W */, allowNegatives: true, allowDecimals: true, pixelWidth: VectorXYZWEditWidth, tabIndex: tabIndex)
wEditWidget = new ThemedNumberEdit(currentZValue, theme, Labels[3] /* W */, allowNegatives: true, allowDecimals: true, pixelWidth: VectorXYZWEditWidth, tabIndex: tabIndex)
{
ToolTipText = this.HelpText,
TabIndex = tabIndex + 1,