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

Merge pull request #5140 from larsbrubaker/main

Browse source 
main
This commit is contained in:
Lars Brubaker 2021-10-07 21:20:12 -07:00 • committed by GitHub
commit e99170b5fa
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 7 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

2
MatterControl.Printing/Settings/SliceSettingsFields.cs
View file

@ -82,8 +82,6 @@ namespace MatterHackers.MatterControl.SlicerConfiguration
HelpText = "When filling bottom and top solid layers always create them so that each new print segment side is touching a previous segment on the same side.".Localize(), HelpText = "When filling bottom and top solid layers always create them so that each new print segment side is touching a previous segment on the same side.".Localize(),
DataEditType = DataEditTypes.CHECK_BOX, DataEditType = DataEditTypes.CHECK_BOX,
DefaultValue = "0", DefaultValue = "0",
RequiredDisplayDetail = DisplayDetailRequired.Advanced,
UiUpdate = UiUpdateRequired.SliceSettings,
Converter = new MappedToBoolString(), Converter = new MappedToBoolString(),
}, },
new SliceSettingData() new SliceSettingData()

2
MatterControlLib/DesignTools/Operations/ArrayLinearObject3D.cs
View file

@ -96,7 +96,7 @@ namespace MatterHackers.MatterControl.DesignTools.Operations
var updateItems = SheetObject3D.SortAndLockUpdateItems(this, (item) => var updateItems = SheetObject3D.SortAndLockUpdateItems(this, (item) =>
{ {
if (!SheetObject3D.HasExpressionWithString(item, "[index]", false)) if (!SheetObject3D.HasExpressionWithString(item, "=", true))
{ {
return false; return false;
} }

6
MatterControlLib/DesignTools/Sheets/SheetObject3D.cs
View file

@ -343,8 +343,7 @@ namespace MatterHackers.MatterControl.DesignTools
int index = 0; int index = 0;
foreach (var child in arrayObject.Children) foreach (var child in arrayObject.Children)
{ {
if (!(child is OperationSourceContainerObject3D) if (!(child is OperationSourceObject3D))
&& !(child is OperationSourceObject3D))
{ {
if (child.DescendantsAndSelf().Where(i => i == owner).Any()) if (child.DescendantsAndSelf().Where(i => i == owner).Any())
{ {
@ -385,8 +384,9 @@ namespace MatterHackers.MatterControl.DesignTools
return stringWithConstants; return stringWithConstants;
} }
public static T EvaluateExpression<T>(IObject3D owner, string inputExpression) public static T EvaluateExpression<T>(IObject3D owner, string inExpression)
{ {
var inputExpression = inExpression;
var printer = owner.ContainingPrinter(); var printer = owner.ContainingPrinter();
if (printer != null) if (printer != null)
{ {

6
MatterControlLib/SlicerConfiguration/UIFields/Vector3Field.cs
View file

@ -71,7 +71,7 @@ namespace MatterHackers.MatterControl.SlicerConfiguration
double.TryParse(xyzStrings[0], out double currentXValue); double.TryParse(xyzStrings[0], out double currentXValue);
xEditWidget = new MHNumberEdit(currentXValue, theme, 'X', allowNegatives: true, allowDecimals: true, pixelWidth: VectorXYZEditWidth, tabIndex: tabIndex) xEditWidget = new MHNumberEdit(currentXValue, theme, 'X', allowNegatives: true, allowDecimals: true, pixelWidth: VectorXYZEditWidth, tabIndex: tabIndex++)
{ {
ToolTipText = this.HelpText, ToolTipText = this.HelpText,
TabIndex = tabIndex, TabIndex = tabIndex,
@ -93,7 +93,7 @@ namespace MatterHackers.MatterControl.SlicerConfiguration
double.TryParse(xyzStrings[1], out double currentYValue); double.TryParse(xyzStrings[1], out double currentYValue);
yEditWidget = new MHNumberEdit(currentYValue, theme, 'Y', allowNegatives: true, allowDecimals: true, pixelWidth: VectorXYZEditWidth, tabIndex: tabIndex) yEditWidget = new MHNumberEdit(currentYValue, theme, 'Y', allowNegatives: true, allowDecimals: true, pixelWidth: VectorXYZEditWidth, tabIndex: tabIndex++)
{ {
ToolTipText = this.HelpText, ToolTipText = this.HelpText,
TabIndex = tabIndex + 1, TabIndex = tabIndex + 1,
@ -115,7 +115,7 @@ namespace MatterHackers.MatterControl.SlicerConfiguration
double.TryParse(xyzStrings[2], out double currentZValue); double.TryParse(xyzStrings[2], out double currentZValue);
zEditWidget = new MHNumberEdit(currentZValue, theme, 'Z', allowNegatives: true, allowDecimals: true, pixelWidth: VectorXYZEditWidth, tabIndex: tabIndex) zEditWidget = new MHNumberEdit(currentZValue, theme, 'Z', allowNegatives: true, allowDecimals: true, pixelWidth: VectorXYZEditWidth, tabIndex: tabIndex++)
{ {
ToolTipText = this.HelpText, ToolTipText = this.HelpText,
TabIndex = tabIndex + 1, TabIndex = tabIndex + 1,