diff options
Diffstat (limited to 'UVtools.WPF')
16 files changed, 299 insertions, 169 deletions
diff --git a/UVtools.WPF/Controls/Calibrators/CalibrateElephantFootControl.axaml b/UVtools.WPF/Controls/Calibrators/CalibrateElephantFootControl.axaml index 848c04f..c424156 100644 --- a/UVtools.WPF/Controls/Calibrators/CalibrateElephantFootControl.axaml +++ b/UVtools.WPF/Controls/Calibrators/CalibrateElephantFootControl.axaml @@ -36,7 +36,7 @@ VerticalAlignment="Center" Text="Bottom layers:"/> <NumericUpDown Grid.Row="2" Grid.Column="2" - ClipValueToMinMax="True" + Increment="1" Minimum="1" Maximum="1000" @@ -54,7 +54,7 @@ IsEnabled="{Binding !Operation.SyncLayers}" Text="Normal layers:"/> <NumericUpDown Grid.Row="2" Grid.Column="8" - ClipValueToMinMax="True" + IsEnabled="{Binding !Operation.SyncLayers}" Increment="1" Minimum="1" @@ -71,7 +71,7 @@ VerticalAlignment="Center" Text="Bottom exposure:"/> <NumericUpDown Grid.Row="4" Grid.Column="2" - ClipValueToMinMax="True" + Increment="0.5" Minimum="0.1" Maximum="200" @@ -84,7 +84,7 @@ VerticalAlignment="Center" Text="Normal exposure:"/> <NumericUpDown Grid.Row="4" Grid.Column="8" - ClipValueToMinMax="True" + Increment="0.5" Minimum="0.1" Maximum="200" @@ -97,7 +97,7 @@ VerticalAlignment="Center" Text="Part scale:"/> <NumericUpDown Grid.Row="6" Grid.Column="2" - ClipValueToMinMax="True" + Increment="0.1" Minimum="1" Maximum="10" @@ -110,7 +110,7 @@ VerticalAlignment="Center" Text="Margin:"/> <NumericUpDown Grid.Row="6" Grid.Column="8" - ClipValueToMinMax="True" + Increment="1" Minimum="0" Maximum="255" @@ -194,7 +194,7 @@ Text="Iterations range:"/> <NumericUpDown Grid.Row="2" Grid.Column="2" - ClipValueToMinMax="True" + IsEnabled="{Binding Operation.IsErodeEnabled}" Increment="1" Minimum="1" @@ -207,7 +207,7 @@ Text="-"/> <NumericUpDown Grid.Row="2" Grid.Column="6" - ClipValueToMinMax="True" + IsEnabled="{Binding Operation.IsErodeEnabled}" Increment="1" Minimum="1" @@ -223,7 +223,7 @@ Text="Step increment(s):"/> <NumericUpDown Grid.Row="2" Grid.Column="12" - ClipValueToMinMax="True" + IsEnabled="{Binding Operation.IsErodeEnabled}" Increment="1" Minimum="1" @@ -278,7 +278,7 @@ Text="Wall thickness:"/> <NumericUpDown Grid.Row="2" Grid.Column="2" - ClipValueToMinMax="True" + IsEnabled="{Binding Operation.IsDimmingEnabled}" Increment="1" Minimum="1" @@ -295,7 +295,7 @@ Text="Brightness range:"/> <NumericUpDown Grid.Row="4" Grid.Column="2" - ClipValueToMinMax="True" + IsEnabled="{Binding Operation.IsDimmingEnabled}" Increment="1" Minimum="1" @@ -309,7 +309,7 @@ Text="-"/> <NumericUpDown Grid.Row="4" Grid.Column="6" - ClipValueToMinMax="True" + IsEnabled="{Binding Operation.IsDimmingEnabled}" Increment="1" Minimum="2" @@ -321,7 +321,7 @@ Text="Step increment(s):"/> <NumericUpDown Grid.Row="4" Grid.Column="12" - ClipValueToMinMax="True" + IsEnabled="{Binding Operation.IsDimmingEnabled}" Increment="1" Minimum="2" diff --git a/UVtools.WPF/Controls/Calibrators/CalibrateExposureFinderControl.axaml b/UVtools.WPF/Controls/Calibrators/CalibrateExposureFinderControl.axaml index 5e7456b..c61c1f5 100644 --- a/UVtools.WPF/Controls/Calibrators/CalibrateExposureFinderControl.axaml +++ b/UVtools.WPF/Controls/Calibrators/CalibrateExposureFinderControl.axaml @@ -25,7 +25,7 @@ ToolTip.Tip="The printer display width. Required to calculate the pixels per mm." Text="Display width:"/> <NumericUpDown Grid.Row="0" Grid.Column="2" - ClipValueToMinMax="True" + Increment="0.1" Minimum="0" Maximum="10000" @@ -40,7 +40,7 @@ ToolTip.Tip="The printer display height. Required to calculate the pixels per mm." Text="Display height:"/> <NumericUpDown Grid.Row="0" Grid.Column="8" - ClipValueToMinMax="True" + Increment="0.1" Minimum="0" Maximum="10000" @@ -68,7 +68,7 @@ VerticalAlignment="Center" Text="Bottom layers:"/> <NumericUpDown Grid.Row="2" Grid.Column="8" - ClipValueToMinMax="True" + Increment="1" Minimum="1" Maximum="1000" @@ -81,7 +81,7 @@ VerticalAlignment="Center" Text="Bottom exposure:"/> <NumericUpDown Grid.Row="4" Grid.Column="2" - ClipValueToMinMax="True" + Increment="0.5" Minimum="0.1" Maximum="200" @@ -95,7 +95,7 @@ VerticalAlignment="Center" Text="Normal exposure:"/> <NumericUpDown Grid.Row="4" Grid.Column="8" - ClipValueToMinMax="True" + Increment="0.5" Minimum="0.1" Maximum="200" @@ -109,7 +109,7 @@ VerticalAlignment="Center" Text="Top/bottom margin:"/> <NumericUpDown Grid.Row="6" Grid.Column="2" - ClipValueToMinMax="True" + Increment="0.5" Minimum="0" Maximum="1000" @@ -122,7 +122,7 @@ VerticalAlignment="Center" Text="Left/right margin:"/> <NumericUpDown Grid.Row="6" Grid.Column="8" - ClipValueToMinMax="True" + Increment="0.5" Minimum="0" Maximum="1000" @@ -135,7 +135,7 @@ VerticalAlignment="Center" Text="Part margin:"/> <NumericUpDown Grid.Row="8" Grid.Column="2" - ClipValueToMinMax="True" + Increment="1" Minimum="0" Maximum="10000" @@ -149,7 +149,7 @@ ToolTip.Tip="Chamfer the bottom and top layers" Text="Chamfer layers:"/> <NumericUpDown Grid.Row="10" Grid.Column="2" - ClipValueToMinMax="True" + Increment="1" Minimum="0" Maximum="255" @@ -161,7 +161,7 @@ ToolTip.Tip="Erode bottom iterations to counter the elephant foot" Text="Erode bottom iter.:"/> <NumericUpDown Grid.Row="10" Grid.Column="8" - ClipValueToMinMax="True" + Increment="1" Minimum="0" Maximum="255" @@ -191,13 +191,13 @@ </Expander.Header> - <Grid RowDefinitions="Auto,10,Auto,10,Auto" + <Grid RowDefinitions="Auto,10,Auto,10,Auto,10,Auto,10,Auto,10,Auto,10,Auto,10,Auto,10,Auto,10,Auto" ColumnDefinitions="Auto,10,Auto,5,Auto,20,Auto,10,Auto,5,Auto,20,Auto,10,Auto,5,Auto"> <TextBlock Grid.Row="0" Grid.Column="0" Text="Base height:" VerticalAlignment="Center"/> <NumericUpDown Grid.Row="0" Grid.Column="2" - ClipValueToMinMax="True" + Increment="0.5" Minimum="0.3" Maximum="100" @@ -208,79 +208,210 @@ Text="mm"/> <TextBlock Grid.Row="0" Grid.Column="6" - Text="Hole height:" + Text="Features height:" VerticalAlignment="Center"/> <NumericUpDown Grid.Row="0" Grid.Column="8" - ClipValueToMinMax="True" + Increment="0.5" Minimum="1" Maximum="100" FormatString="F02" - Value="{Binding Operation.HoleHeight}"/> + Value="{Binding Operation.FeaturesHeight}"/> <TextBlock Grid.Row="0" Grid.Column="10" VerticalAlignment="Center" Text="mm"/> <TextBlock Grid.Row="0" Grid.Column="12" - Text="Hole margin:" + Text="Features margin:" VerticalAlignment="Center"/> <NumericUpDown Grid.Row="0" Grid.Column="14" - ClipValueToMinMax="True" + Increment="0.5" Minimum="1" Maximum="100" FormatString="F02" - Value="{Binding Operation.HoleMargin}"/> + Value="{Binding Operation.FeaturesMargin}"/> <TextBlock Grid.Row="0" Grid.Column="16" VerticalAlignment="Center" Text="mm"/> <TextBlock Grid.Row="2" Grid.Column="0" + Grid.ColumnSpan="17" + FontWeight="Bold" + Text="Pin (positive) / holes (negative):" + VerticalAlignment="Center"/> + + <TextBlock Grid.Row="4" Grid.Column="0" Text="Shape:" VerticalAlignment="Center"/> - <ComboBox Grid.Row="2" Grid.Column="2" + <ComboBox Grid.Row="4" Grid.Column="2" HorizontalAlignment="Stretch" Items="{Binding Operation.ShapesItems}" SelectedItem="{Binding Operation.HoleShape}"/> - <TextBlock Grid.Row="2" Grid.Column="6" + <TextBlock Grid.Row="4" Grid.Column="6" Text="Unit of measure:" VerticalAlignment="Center"/> - <ComboBox Grid.Row="2" Grid.Column="8" + <ComboBox Grid.Row="4" Grid.Column="8" HorizontalAlignment="Stretch" Items="{Binding Operation.MeasuresItems}" SelectedItem="{Binding Operation.UnitOfMeasure}"/> - - <TextBlock Grid.Row="4" Grid.Column="0" + <TextBlock Grid.Row="6" Grid.Column="0" Text="Diameters:" ToolTip.Tip="Diameters separated by a comma (,). 
Order doesn't matter. 
Values are pixel square, eg: 3 = 3x3 = 9 pixel hole" VerticalAlignment="Center"/> - <TextBox Grid.Row="4" Grid.Column="2" + <TextBox Grid.Row="6" Grid.Column="2" Grid.ColumnSpan="13" IsVisible="{Binding Operation.IsUnitOfMeasureMm}" Text="{Binding Operation.HoleDiametersMm}"/> - <TextBox Grid.Row="4" Grid.Column="2" + <TextBox Grid.Row="6" Grid.Column="2" Grid.ColumnSpan="13" IsVisible="{Binding !Operation.IsUnitOfMeasureMm}" Text="{Binding Operation.HoleDiametersPx}"/> - <TextBlock Grid.Row="4" Grid.Column="16" + <TextBlock Grid.Row="6" Grid.Column="16" IsVisible="{Binding Operation.IsUnitOfMeasureMm}" VerticalAlignment="Center" Text="mm"/> - <TextBlock Grid.Row="4" Grid.Column="16" + <TextBlock Grid.Row="6" Grid.Column="16" + IsVisible="{Binding !Operation.IsUnitOfMeasureMm}" + VerticalAlignment="Center" + Text="px"/> + + <TextBlock Grid.Row="8" Grid.Column="0" + Grid.ColumnSpan="17" + FontWeight="Bold" + Text="Zebra bars:" + VerticalAlignment="Center"/> + + + <TextBlock Grid.Row="10" Grid.Column="0" + Text="Bar spacing:" + VerticalAlignment="Center"/> + <NumericUpDown Grid.Row="10" Grid.Column="2" + + Increment="0.5" + Minimum="0.01" + Maximum="100" + FormatString="F02" + Value="{Binding Operation.BarSpacing}"/> + <TextBlock Grid.Row="10" Grid.Column="4" + VerticalAlignment="Center" + Text="mm"/> + + <TextBlock Grid.Row="10" Grid.Column="6" + Text="Bar length:" + HorizontalAlignment="Right" + VerticalAlignment="Center"/> + <NumericUpDown Grid.Row="10" Grid.Column="8" + + Increment="0.5" + Minimum="0.01" + Maximum="100" + FormatString="F02" + Value="{Binding Operation.BarLength}"/> + <TextBlock Grid.Row="10" Grid.Column="10" + VerticalAlignment="Center" + Text="mm"/> + + <TextBlock Grid.Row="10" Grid.Column="12" + Text="Vertical splitter:" + HorizontalAlignment="Right" + VerticalAlignment="Center"/> + <NumericUpDown Grid.Row="10" Grid.Column="14" + + Increment="1" + Minimum="0" + Maximum="255" + FormatString="F02" + Value="{Binding Operation.BarVerticalSplitter}"/> + <TextBlock Grid.Row="10" Grid.Column="16" + VerticalAlignment="Center" + Text="px"/> + + <TextBlock Grid.Row="12" Grid.Column="0" + Text="Thicknesses:" + VerticalAlignment="Center"/> + + <TextBox Grid.Row="12" Grid.Column="2" + Grid.ColumnSpan="13" + IsVisible="{Binding Operation.IsUnitOfMeasureMm}" + Text="{Binding Operation.BarThicknessesMm}"/> + + <TextBox Grid.Row="12" Grid.Column="2" + Grid.ColumnSpan="13" + IsVisible="{Binding !Operation.IsUnitOfMeasureMm}" + Text="{Binding Operation.BarThicknessesPx}"/> + <TextBlock Grid.Row="12" Grid.Column="16" + IsVisible="{Binding Operation.IsUnitOfMeasureMm}" + VerticalAlignment="Center" + Text="mm"/> + <TextBlock Grid.Row="12" Grid.Column="16" IsVisible="{Binding !Operation.IsUnitOfMeasureMm}" VerticalAlignment="Center" Text="px"/> + + <TextBlock Grid.Row="14" Grid.Column="0" + Grid.ColumnSpan="17" + FontWeight="Bold" + Text="Text:" + VerticalAlignment="Center"/> + + <TextBlock Grid.Row="16" Grid.Column="0" + Text="Font:" + VerticalAlignment="Center"/> + <ComboBox Grid.Row="16" Grid.Column="2" + Grid.ColumnSpan="2" + VerticalAlignment="Center" + HorizontalAlignment="Stretch" + Items="{Binding Operation.TextFonts}" + SelectedItem="{Binding Operation.TextFont}" + /> + + <TextBlock Grid.Row="16" Grid.Column="6" + Text="Text scale:" + HorizontalAlignment="Right" + VerticalAlignment="Center"/> + <NumericUpDown Grid.Row="16" Grid.Column="8" + Increment="0.5" + Minimum="0.1" + Maximum="100" + FormatString="F02" + Value="{Binding Operation.TextScale}"/> + <TextBlock Grid.Row="16" Grid.Column="10" + VerticalAlignment="Center" + Text="x"/> + + <TextBlock Grid.Row="16" Grid.Column="12" + Text="Text thickness:" + HorizontalAlignment="Right" + VerticalAlignment="Center"/> + <NumericUpDown Grid.Row="16" Grid.Column="14" + Increment="1" + Minimum="1" + Maximum="255" + Value="{Binding Operation.TextThickness}"/> + <TextBlock Grid.Row="16" Grid.Column="16" + VerticalAlignment="Center" + Text="px"/> + + <TextBlock Grid.Row="18" Grid.Column="0" + Text="Thicknesses:" + VerticalAlignment="Center"/> + + <TextBox Grid.Row="18" Grid.Column="2" + Grid.ColumnSpan="13" + Text="{Binding Operation.Text}"/> + </Grid> </Expander> diff --git a/UVtools.WPF/Controls/Calibrators/CalibrateGrayscaleControl.axaml b/UVtools.WPF/Controls/Calibrators/CalibrateGrayscaleControl.axaml index a3939ca..7087937 100644 --- a/UVtools.WPF/Controls/Calibrators/CalibrateGrayscaleControl.axaml +++ b/UVtools.WPF/Controls/Calibrators/CalibrateGrayscaleControl.axaml @@ -15,7 +15,7 @@ VerticalAlignment="Center" Text="Layer height:"/> <NumericUpDown Grid.Row="0" Grid.Column="2" - ClipValueToMinMax="True" + Increment="0.01" Minimum="0.01" Maximum="0.30" @@ -55,7 +55,7 @@ VerticalAlignment="Center" Text="Bottom layers:"/> <NumericUpDown Grid.Row="2" Grid.Column="2" - ClipValueToMinMax="True" + Increment="1" Minimum="1" Maximum="1000" @@ -70,7 +70,7 @@ ToolTip.Tip="Number of layers at normal exposure between bottom and normal layers" Text="Interface layers:"/> <NumericUpDown Grid.Row="2" Grid.Column="8" - ClipValueToMinMax="True" + Increment="1" Minimum="0" Maximum="1000" @@ -83,7 +83,7 @@ VerticalAlignment="Center" Text="Normal layers:"/> <NumericUpDown Grid.Row="4" Grid.Column="2" - ClipValueToMinMax="True" + Increment="1" Minimum="1" Maximum="1000" @@ -96,7 +96,7 @@ VerticalAlignment="Center" Text="Bottom exposure:"/> <NumericUpDown Grid.Row="6" Grid.Column="2" - ClipValueToMinMax="True" + Increment="0.5" Minimum="0.1" Maximum="200" @@ -110,7 +110,7 @@ VerticalAlignment="Center" Text="Normal exposure:"/> <NumericUpDown Grid.Row="6" Grid.Column="8" - ClipValueToMinMax="True" + Increment="0.5" Minimum="0.1" Maximum="200" @@ -125,7 +125,7 @@ VerticalAlignment="Center" Text="Outer margin:"/> <NumericUpDown Grid.Row="8" Grid.Column="2" - ClipValueToMinMax="True" + Increment="1" Minimum="0" Maximum="10000" @@ -138,7 +138,7 @@ VerticalAlignment="Center" Text="Inner margin:"/> <NumericUpDown Grid.Row="8" Grid.Column="8" - ClipValueToMinMax="True" + Increment="1" Minimum="0" Maximum="10000" @@ -181,7 +181,7 @@ Text="Brightness range:"/> <NumericUpDown Grid.Row="0" Grid.Column="2" - ClipValueToMinMax="True" + Increment="1" Minimum="1" Maximum="254" @@ -194,7 +194,7 @@ Text="-"/> <NumericUpDown Grid.Row="0" Grid.Column="6" - ClipValueToMinMax="True" + Increment="1" Minimum="2" Maximum="255" @@ -205,7 +205,7 @@ Text="Step increment(s):"/> <NumericUpDown Grid.Row="0" Grid.Column="12" - ClipValueToMinMax="True" + Increment="1" Minimum="2" Maximum="254" @@ -227,7 +227,7 @@ Text="Center hole diameter:"/> <NumericUpDown Grid.Row="4" Grid.Column="2" - ClipValueToMinMax="True" + Increment="1" Minimum="2" Maximum="10000" @@ -255,7 +255,7 @@ Text="Division thickness:"/> <NumericUpDown Grid.Row="8" Grid.Column="2" - ClipValueToMinMax="True" + Increment="1" Minimum="0" Maximum="255" @@ -275,7 +275,7 @@ <NumericUpDown Grid.Row="8" Grid.Column="9" Grid.ColumnSpan="2" - ClipValueToMinMax="True" + Increment="1" Minimum="0" Maximum="255" @@ -293,7 +293,7 @@ Text="X text offset:"/> <NumericUpDown Grid.Row="10" Grid.Column="2" - ClipValueToMinMax="True" + Increment="1" Minimum="-10000" Maximum="10000" diff --git a/UVtools.WPF/Controls/Calibrators/CalibrateStressTowerControl.axaml b/UVtools.WPF/Controls/Calibrators/CalibrateStressTowerControl.axaml index 4ea86a3..d2c6ec5 100644 --- a/UVtools.WPF/Controls/Calibrators/CalibrateStressTowerControl.axaml +++ b/UVtools.WPF/Controls/Calibrators/CalibrateStressTowerControl.axaml @@ -25,7 +25,7 @@ ToolTip.Tip="The printer display width. Required to calculate the pixels per mm." Text="Display width:"/> <NumericUpDown Grid.Row="0" Grid.Column="2" - ClipValueToMinMax="True" + Increment="0.1" Minimum="0" Maximum="10000" @@ -40,7 +40,7 @@ ToolTip.Tip="The printer display height. Required to calculate the pixels per mm." Text="Display height:"/> <NumericUpDown Grid.Row="0" Grid.Column="8" - ClipValueToMinMax="True" + Increment="0.1" Minimum="0" Maximum="10000" @@ -54,7 +54,7 @@ VerticalAlignment="Center" Text="Layer height:"/> <NumericUpDown Grid.Row="2" Grid.Column="2" - ClipValueToMinMax="True" + Increment="0.01" Minimum="0.01" Maximum="0.30" @@ -69,7 +69,7 @@ VerticalAlignment="Center" Text="Bottom layers:"/> <NumericUpDown Grid.Row="2" Grid.Column="8" - ClipValueToMinMax="True" + Increment="1" Minimum="1" Maximum="1000" @@ -82,7 +82,7 @@ VerticalAlignment="Center" Text="Bottom exposure:"/> <NumericUpDown Grid.Row="4" Grid.Column="2" - ClipValueToMinMax="True" + Increment="0.5" Minimum="0.1" Maximum="200" @@ -96,7 +96,7 @@ VerticalAlignment="Center" Text="Normal exposure:"/> <NumericUpDown Grid.Row="4" Grid.Column="8" - ClipValueToMinMax="True" + Increment="0.5" Minimum="0.1" Maximum="200" @@ -110,7 +110,7 @@ VerticalAlignment="Center" Text="Base height:"/> <NumericUpDown Grid.Row="6" Grid.Column="2" - ClipValueToMinMax="True" + Increment="1" Minimum="0" Maximum="100" @@ -124,7 +124,7 @@ VerticalAlignment="Center" Text="Base diameter:"/> <NumericUpDown Grid.Row="6" Grid.Column="8" - ClipValueToMinMax="True" + Increment="1" Minimum="1" Maximum="10000" @@ -138,7 +138,7 @@ VerticalAlignment="Center" Text="Ceil height:"/> <NumericUpDown Grid.Row="8" Grid.Column="2" - ClipValueToMinMax="True" + Increment="1" Minimum="0" Maximum="100" @@ -153,7 +153,7 @@ VerticalAlignment="Center" Text="Body height:"/> <NumericUpDown Grid.Row="8" Grid.Column="8" - ClipValueToMinMax="True" + Increment="1" Minimum="0" Maximum="10000" @@ -195,7 +195,7 @@ ToolTip.Tip="Chamfer the bottom layers" Text="Chamfer layers:"/> <NumericUpDown Grid.Row="10" Grid.Column="2" - ClipValueToMinMax="True" + Increment="1" Minimum="0" Maximum="255" @@ -234,7 +234,7 @@ Text="Number of spirals:" VerticalAlignment="Center"/> <NumericUpDown Grid.Row="0" Grid.Column="2" - ClipValueToMinMax="True" + Increment="1" Minimum="1" Maximum="10" @@ -255,7 +255,7 @@ Text="Spiral diameter:" VerticalAlignment="Center"/> <NumericUpDown Grid.Row="2" Grid.Column="2" - ClipValueToMinMax="True" + Increment="1" Minimum="0.1" Maximum="10000" @@ -270,7 +270,7 @@ ToolTip.Tip="Spirals will turn this angle per layer." VerticalAlignment="Center"/> <NumericUpDown Grid.Row="2" Grid.Column="8" - ClipValueToMinMax="True" + Increment="1" Minimum="0.01" Maximum="359.99" diff --git a/UVtools.WPF/Controls/Calibrators/CalibrateToleranceControl.axaml b/UVtools.WPF/Controls/Calibrators/CalibrateToleranceControl.axaml index 126bb72..67ce63a 100644 --- a/UVtools.WPF/Controls/Calibrators/CalibrateToleranceControl.axaml +++ b/UVtools.WPF/Controls/Calibrators/CalibrateToleranceControl.axaml @@ -25,7 +25,7 @@ ToolTip.Tip="The printer display width. Required to calculate the pixels per mm." Text="Display width:"/> <NumericUpDown Grid.Row="0" Grid.Column="2" - ClipValueToMinMax="True" + Increment="0.1" Minimum="0" Maximum="10000" @@ -40,7 +40,7 @@ ToolTip.Tip="The printer display height. Required to calculate the pixels per mm." Text="Display height:"/> <NumericUpDown Grid.Row="0" Grid.Column="8" - ClipValueToMinMax="True" + Increment="0.1" Minimum="0" Maximum="10000" @@ -54,7 +54,7 @@ VerticalAlignment="Center" Text="Layer height:"/> <NumericUpDown Grid.Row="2" Grid.Column="2" - ClipValueToMinMax="True" + Increment="0.01" Minimum="0.01" Maximum="0.30" @@ -69,7 +69,7 @@ VerticalAlignment="Center" Text="Bottom layers:"/> <NumericUpDown Grid.Row="2" Grid.Column="8" - ClipValueToMinMax="True" + Increment="1" Minimum="1" Maximum="1000" @@ -82,7 +82,7 @@ VerticalAlignment="Center" Text="Bottom exposure:"/> <NumericUpDown Grid.Row="4" Grid.Column="2" - ClipValueToMinMax="True" + Increment="0.5" Minimum="0.1" Maximum="200" @@ -96,7 +96,7 @@ VerticalAlignment="Center" Text="Normal exposure:"/> <NumericUpDown Grid.Row="4" Grid.Column="8" - ClipValueToMinMax="True" + Increment="0.5" Minimum="0.1" Maximum="200" @@ -110,7 +110,7 @@ VerticalAlignment="Center" Text="Z height:"/> <NumericUpDown Grid.Row="6" Grid.Column="2" - ClipValueToMinMax="True" + Increment="1" Minimum="5" Maximum="100" @@ -150,7 +150,7 @@ VerticalAlignment="Center" Text="Top/bottom margin:"/> <NumericUpDown Grid.Row="8" Grid.Column="2" - ClipValueToMinMax="True" + Increment="1" Minimum="0" Maximum="10000" @@ -163,7 +163,7 @@ VerticalAlignment="Center" Text="Left/right margin:"/> <NumericUpDown Grid.Row="8" Grid.Column="8" - ClipValueToMinMax="True" + Increment="1" Minimum="0" Maximum="10000" @@ -177,7 +177,7 @@ ToolTip.Tip="Chamfer the bottom and top layers" Text="Chamfer layers:"/> <NumericUpDown Grid.Row="10" Grid.Column="2" - ClipValueToMinMax="True" + Increment="1" Minimum="0" Maximum="255" @@ -189,7 +189,7 @@ ToolTip.Tip="Erode bottom iterations to counter the elephant foot" Text="Erode bottom iter.:"/> <NumericUpDown Grid.Row="10" Grid.Column="8" - ClipValueToMinMax="True" + Increment="1" Minimum="0" Maximum="255" @@ -206,7 +206,7 @@ VerticalAlignment="Center" Text="Part margin:"/> <NumericUpDown Grid.Row="12" Grid.Column="8" - ClipValueToMinMax="True" + Increment="1" Minimum="0" Maximum="10000" @@ -260,7 +260,7 @@ Text="Diameter:" VerticalAlignment="Center"/> <NumericUpDown Grid.Row="0" Grid.Column="2" - ClipValueToMinMax="True" + Increment="1.0" Minimum="2" Maximum="1000" @@ -274,7 +274,7 @@ Text="Hole diameter:" VerticalAlignment="Center"/> <NumericUpDown Grid.Row="0" Grid.Column="8" - ClipValueToMinMax="True" + Increment="1.0" Minimum="2" Maximum="1000" @@ -322,7 +322,7 @@ Text="Thinner models:" VerticalAlignment="Center"/> <NumericUpDown Grid.Row="0" Grid.Column="2" - ClipValueToMinMax="True" + Increment="1" Minimum="0" Maximum="1000" @@ -331,7 +331,7 @@ Text="-Offset:" VerticalAlignment="Center"/> <NumericUpDown Grid.Row="0" Grid.Column="8" - ClipValueToMinMax="True" + Increment="0.01" Minimum="-1000" Maximum="0" @@ -345,7 +345,7 @@ Text="-Step:" VerticalAlignment="Center"/> <NumericUpDown Grid.Row="0" Grid.Column="14" - ClipValueToMinMax="True" + Increment="0.01" Minimum="-1000" Maximum="-0.01" @@ -361,7 +361,7 @@ IsEnabled="{Binding !Operation.FuseParts}" VerticalAlignment="Center"/> <NumericUpDown Grid.Row="2" Grid.Column="2" - ClipValueToMinMax="True" + Increment="1" Minimum="0" Maximum="1000" @@ -372,7 +372,7 @@ IsEnabled="{Binding !Operation.FuseParts}" VerticalAlignment="Center"/> <NumericUpDown Grid.Row="2" Grid.Column="8" - ClipValueToMinMax="True" + Increment="0.01" Minimum="0" Maximum="1000" @@ -389,7 +389,7 @@ IsEnabled="{Binding !Operation.FuseParts}" VerticalAlignment="Center"/> <NumericUpDown Grid.Row="2" Grid.Column="14" - ClipValueToMinMax="True" + Increment="0.01" Minimum="0.01" Maximum="1000" @@ -423,7 +423,7 @@ <StackPanel Orientation="Horizontal" Spacing="5"> <TextBlock VerticalAlignment="Center" Text="X:"/> <NumericUpDown - ClipValueToMinMax="True" + Increment="1" Minimum="0" Maximum="100" @@ -435,7 +435,7 @@ <TextBlock VerticalAlignment="Center" Text="Y:" Margin="20,0,0,0"/> <NumericUpDown - ClipValueToMinMax="True" + Increment="1" Minimum="0" Maximum="100" @@ -447,7 +447,7 @@ <TextBlock VerticalAlignment="Center" Text="Z:" Margin="20,0,0,0"/> <NumericUpDown - ClipValueToMinMax="True" + Increment="1" Minimum="0" Maximum="100" diff --git a/UVtools.WPF/Controls/Calibrators/CalibrateXYZAccuracyControl.axaml b/UVtools.WPF/Controls/Calibrators/CalibrateXYZAccuracyControl.axaml index d7075f8..c6894f1 100644 --- a/UVtools.WPF/Controls/Calibrators/CalibrateXYZAccuracyControl.axaml +++ b/UVtools.WPF/Controls/Calibrators/CalibrateXYZAccuracyControl.axaml @@ -26,7 +26,7 @@ ToolTip.Tip="The printer display width. Required to calculate the pixels per mm." Text="Display width:"/> <NumericUpDown Grid.Row="0" Grid.Column="2" - ClipValueToMinMax="True" + Increment="0.1" Minimum="0" Maximum="10000" @@ -41,7 +41,7 @@ ToolTip.Tip="The printer display height. Required to calculate the pixels per mm." Text="Display height:"/> <NumericUpDown Grid.Row="0" Grid.Column="8" - ClipValueToMinMax="True" + Increment="0.1" Minimum="0" Maximum="10000" @@ -55,7 +55,7 @@ VerticalAlignment="Center" Text="Layer height:"/> <NumericUpDown Grid.Row="2" Grid.Column="2" - ClipValueToMinMax="True" + Increment="0.01" Minimum="0.01" Maximum="0.30" @@ -70,7 +70,7 @@ VerticalAlignment="Center" Text="Bottom layers:"/> <NumericUpDown Grid.Row="2" Grid.Column="8" - ClipValueToMinMax="True" + Increment="1" Minimum="1" Maximum="1000" @@ -83,7 +83,7 @@ VerticalAlignment="Center" Text="Bottom exposure:"/> <NumericUpDown Grid.Row="4" Grid.Column="2" - ClipValueToMinMax="True" + Increment="0.5" Minimum="0.1" Maximum="200" @@ -97,7 +97,7 @@ VerticalAlignment="Center" Text="Normal exposure:"/> <NumericUpDown Grid.Row="4" Grid.Column="8" - ClipValueToMinMax="True" + Increment="0.5" Minimum="0.1" Maximum="200" @@ -111,7 +111,7 @@ VerticalAlignment="Center" Text="X length:"/> <NumericUpDown Grid.Row="6" Grid.Column="2" - ClipValueToMinMax="True" + Increment="1" Minimum="5" Maximum="100" @@ -125,7 +125,7 @@ VerticalAlignment="Center" Text="Y length:"/> <NumericUpDown Grid.Row="6" Grid.Column="8" - ClipValueToMinMax="True" + Increment="1" Minimum="5" Maximum="100" @@ -139,7 +139,7 @@ VerticalAlignment="Center" Text="Z height:"/> <NumericUpDown Grid.Row="8" Grid.Column="2" - ClipValueToMinMax="True" + Increment="1" Minimum="5" Maximum="100" @@ -178,7 +178,7 @@ VerticalAlignment="Center" Text="Top/bottom margin:"/> <NumericUpDown Grid.Row="10" Grid.Column="2" - ClipValueToMinMax="True" + Increment="1" Minimum="0" Maximum="10000" @@ -191,7 +191,7 @@ VerticalAlignment="Center" Text="Left/right margin:"/> <NumericUpDown Grid.Row="10" Grid.Column="8" - ClipValueToMinMax="True" + Increment="1" Minimum="0" Maximum="10000" @@ -209,7 +209,7 @@ VerticalAlignment="Center" IsEnabled="{Binding Operation.HollowModel}"/> <NumericUpDown Grid.Row="12" Grid.Column="8" - ClipValueToMinMax="True" + Increment="0.5" Minimum="0" Maximum="100" @@ -357,7 +357,7 @@ <StackPanel Orientation="Horizontal" Spacing="5"> <TextBlock VerticalAlignment="Center" Text="X:"/> <NumericUpDown - ClipValueToMinMax="True" + Increment="1" Minimum="0" Maximum="100" @@ -369,7 +369,7 @@ <TextBlock VerticalAlignment="Center" Text="Y:" Margin="20,0,0,0"/> <NumericUpDown - ClipValueToMinMax="True" + Increment="1" Minimum="0" Maximum="100" @@ -381,7 +381,7 @@ <TextBlock VerticalAlignment="Center" Text="Z:" Margin="20,0,0,0"/> <NumericUpDown - ClipValueToMinMax="True" + Increment="1" Minimum="0" Maximum="100" diff --git a/UVtools.WPF/Controls/Tools/ToolCalculatorControl.axaml b/UVtools.WPF/Controls/Tools/ToolCalculatorControl.axaml index d71fd0f..2610afd 100644 --- a/UVtools.WPF/Controls/Tools/ToolCalculatorControl.axaml +++ b/UVtools.WPF/Controls/Tools/ToolCalculatorControl.axaml @@ -639,7 +639,7 @@ Maximum="0.20" Increment="0.01" FormatString="F02" - ClipValueToMinMax="True" + Value="{Binding Operation.CalcOptimalModelTilt.LayerHeight}" /> <TextBlock diff --git a/UVtools.WPF/Controls/Tools/ToolDynamicLayerHeightControl.axaml b/UVtools.WPF/Controls/Tools/ToolDynamicLayerHeightControl.axaml index 2ff77bf..383ac20 100644 --- a/UVtools.WPF/Controls/Tools/ToolDynamicLayerHeightControl.axaml +++ b/UVtools.WPF/Controls/Tools/ToolDynamicLayerHeightControl.axaml @@ -17,7 +17,7 @@ ToolTip.Tip="The printer display width. Required to calculate the XY pixel resolution." Text="Display width:"/> <NumericUpDown Grid.Row="0" Grid.Column="2" - ClipValueToMinMax="True" + Increment="0.1" Minimum="0" Maximum="10000" @@ -32,7 +32,7 @@ ToolTip.Tip="The printer display height. Required to calculate the XY pixel resolution." Text="Display height:"/> <NumericUpDown Grid.Row="0" Grid.Column="8" - ClipValueToMinMax="True" + Increment="0.1" Minimum="0" Maximum="10000" diff --git a/UVtools.WPF/Controls/Tools/ToolInfillControl.axaml b/UVtools.WPF/Controls/Tools/ToolInfillControl.axaml index 4fa2208..8e35495 100644 --- a/UVtools.WPF/Controls/Tools/ToolInfillControl.axaml +++ b/UVtools.WPF/Controls/Tools/ToolInfillControl.axaml @@ -36,7 +36,7 @@ Minimum="0" Maximum="65535" Increment="1" - ClipValueToMinMax="True" + Value="{Binding Operation.WallThickness}" /> @@ -61,7 +61,7 @@ Minimum="0" Maximum="255" Increment="1" - ClipValueToMinMax="True" + Value="{Binding Operation.InfillBrightness}" /> @@ -80,7 +80,7 @@ Minimum="0" Maximum="65535" Increment="1" - ClipValueToMinMax="True" + Value="{Binding Operation.InfillThickness}" /> @@ -105,7 +105,7 @@ Minimum="{Binding #InfillThickness.Value}" Maximum="65535" Increment="1" - ClipValueToMinMax="True" + Value="{Binding Operation.InfillSpacing}" /> diff --git a/UVtools.WPF/Controls/Tools/ToolLayerImportControl.axaml b/UVtools.WPF/Controls/Tools/ToolLayerImportControl.axaml index 9e40511..6862019 100644 --- a/UVtools.WPF/Controls/Tools/ToolLayerImportControl.axaml +++ b/UVtools.WPF/Controls/Tools/ToolLayerImportControl.axaml @@ -42,7 +42,7 @@ VerticalAlignment="Center" Text="Start at layer:"/> <NumericUpDown Grid.Row="2" Grid.Column="2" - ClipValueToMinMax="True" + Minimum="0" Maximum="{Binding MaximumLayer}" Value="{Binding Operation.StartLayerIndex}"/> @@ -61,7 +61,7 @@ IsVisible="{Binding Operation.IsImportStackType}" Text="Stack margin:"/> <NumericUpDown Grid.Row="6" Grid.Column="2" - ClipValueToMinMax="True" + IsVisible="{Binding Operation.IsImportStackType}" Minimum="0" Maximum="65535" diff --git a/UVtools.WPF/Controls/Tools/ToolRepairLayersControl.axaml b/UVtools.WPF/Controls/Tools/ToolRepairLayersControl.axaml index d20808e..4080dd5 100644 --- a/UVtools.WPF/Controls/Tools/ToolRepairLayersControl.axaml +++ b/UVtools.WPF/Controls/Tools/ToolRepairLayersControl.axaml @@ -51,7 +51,7 @@ Increment="1" Minimum="0" Maximum="65535" - ClipValueToMinMax="True" + ToolTip.Tip="The pixel area threshold above which islands will not be removed by this repair. 
Islands remaining after repair will require supports to be added manually." Value="{Binding Operation.RemoveIslandsBelowEqualPixelCount}" @@ -82,7 +82,7 @@ Increment="1" Minimum="0" Maximum="65535" - ClipValueToMinMax="True" + ToolTip.Tip="If the removal of an island in the current layer results in a new island being introduce in the layer above, the island in the layer above will also be automatically removed. 
This process will repeat for up to the number of layers specified. Set to 0 to repeat until there are no more valid islands to remove. 
 @@ -124,7 +124,7 @@ Increment="1" Minimum="0" Maximum="255" - ClipValueToMinMax="True" + ToolTip.Tip="Attempt to repair islands by attaching them to other nearby islands in safe increments. 
If enabled, gap closing is attempted before island removal is attempted. 
Set iterations to 0 to disable. @@ -151,7 +151,7 @@ Increment="1" Minimum="0" Maximum="255" - ClipValueToMinMax="True" + ToolTip.Tip="Remove individual or small clusters of pixels in iterations. 
This settings can remove noise from a layer, but will also remove fine details. 
Set iterations to 0 to disable. diff --git a/UVtools.WPF/MainWindow.axaml b/UVtools.WPF/MainWindow.axaml index 85de78b..53e000e 100644 --- a/UVtools.WPF/MainWindow.axaml +++ b/UVtools.WPF/MainWindow.axaml @@ -831,7 +831,7 @@ Grid.Column="2" Minimum="1" Maximum="255" - ClipValueToMinMax="True" + HorizontalAlignment="Stretch" Value="{Binding DrawingPixelDrawing.BrushSize}"/> <TextBlock @@ -850,7 +850,7 @@ Grid.Column="2" Minimum="-1" Maximum="255" - ClipValueToMinMax="True" + HorizontalAlignment="Stretch" Value="{Binding DrawingPixelDrawing.Thickness}"/> <TextBlock @@ -869,7 +869,7 @@ Grid.Column="2" Minimum="0" Maximum="255" - ClipValueToMinMax="True" + HorizontalAlignment="Stretch" Value="{Binding DrawingPixelDrawing.RemovePixelBrightness}"/> <TextBlock @@ -888,7 +888,7 @@ Grid.Column="2" Minimum="1" Maximum="255" - ClipValueToMinMax="True" + HorizontalAlignment="Stretch" Value="{Binding DrawingPixelDrawing.PixelBrightness}"/> <TextBlock @@ -907,7 +907,7 @@ Grid.Column="2" Grid.ColumnSpan="3" Minimum="0" - ClipValueToMinMax="True" + HorizontalAlignment="Stretch" Value="{Binding DrawingPixelDrawing.LayersBelow}"/> @@ -922,7 +922,7 @@ Grid.Column="2" Grid.ColumnSpan="3" Minimum="0" - ClipValueToMinMax="True" + HorizontalAlignment="Stretch" Value="{Binding DrawingPixelDrawing.LayersAbove}"/> @@ -992,7 +992,7 @@ Minimum="0.1" Maximum="255" Increment="0.1" - ClipValueToMinMax="True" + Value="{Binding DrawingPixelText.FontScale}"/> @@ -1007,7 +1007,7 @@ Grid.ColumnSpan="3" Minimum="1" Maximum="255" - ClipValueToMinMax="True" + Value="{Binding DrawingPixelText.Thickness}"/> <TextBlock @@ -1038,7 +1038,7 @@ Grid.Column="2" Minimum="0" Maximum="255" - ClipValueToMinMax="True" + Value="{Binding DrawingPixelText.RemovePixelBrightness}"/> <TextBlock Grid.Row="12" @@ -1056,7 +1056,7 @@ Grid.Column="2" Minimum="1" Maximum="255" - ClipValueToMinMax="True" + Value="{Binding DrawingPixelText.PixelBrightness}"/> <TextBlock Grid.Row="14" @@ -1075,7 +1075,7 @@ Grid.Column="2" Grid.ColumnSpan="3" Minimum="0" - ClipValueToMinMax="True" + Value="{Binding DrawingPixelText.LayersBelow}"/> @@ -1089,7 +1089,7 @@ Grid.Column="2" Grid.ColumnSpan="3" Minimum="0" - ClipValueToMinMax="True" + Value="{Binding DrawingPixelText.LayersAbove}"/> </Grid> @@ -1130,7 +1130,7 @@ Grid.Column="2" Minimum="0" Maximum="255" - ClipValueToMinMax="True" + Value="{Binding DrawingPixelEraser.PixelBrightness}"/> <TextBlock Grid.Row="0" @@ -1148,7 +1148,7 @@ Grid.Column="2" Grid.ColumnSpan="3" Minimum="0" - ClipValueToMinMax="True" + Value="{Binding DrawingPixelEraser.LayersBelow}"/> <TextBlock @@ -1161,7 +1161,7 @@ Grid.Column="2" Grid.ColumnSpan="3" Minimum="0" - ClipValueToMinMax="True" + Value="{Binding DrawingPixelEraser.LayersAbove}"/> @@ -1254,7 +1254,7 @@ Grid.Column="2" Minimum="0" Maximum="255" - ClipValueToMinMax="True" + Value="{Binding DrawingPixelSupport.PixelBrightness}"/> <TextBlock Grid.Row="6" diff --git a/UVtools.WPF/UVtools.WPF.csproj b/UVtools.WPF/UVtools.WPF.csproj index 3af71ff..9f8bed6 100644 --- a/UVtools.WPF/UVtools.WPF.csproj +++ b/UVtools.WPF/UVtools.WPF.csproj @@ -12,7 +12,7 @@ <PackageLicenseFile>LICENSE</PackageLicenseFile> <RepositoryUrl>https://github.com/sn4k3/UVtools</RepositoryUrl> <RepositoryType>Git</RepositoryType> - <Version>2.4.2</Version> + <Version>2.4.3</Version> </PropertyGroup> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'"> diff --git a/UVtools.WPF/UserSettings.cs b/UVtools.WPF/UserSettings.cs index d8686dd..89dfea1 100644 --- a/UVtools.WPF/UserSettings.cs +++ b/UVtools.WPF/UserSettings.cs @@ -36,7 +36,7 @@ namespace UVtools.WPF private bool _loadDemoFileOnStartup = true; private bool _windowsTakeIntoAccountScreenScaling = true; private ushort _windowsHorizontalMargin = 200; - private ushort _windowsVerticalMargin = 250; + private ushort _windowsVerticalMargin = 400; private byte _defaultOpenFileExtensionIndex; private string _defaultDirectoryOpenFile; private string _defaultDirectorySaveFile; diff --git a/UVtools.WPF/Windows/SettingsWindow.axaml b/UVtools.WPF/Windows/SettingsWindow.axaml index 63be73b..4d27dee 100644 --- a/UVtools.WPF/Windows/SettingsWindow.axaml +++ b/UVtools.WPF/Windows/SettingsWindow.axaml @@ -52,7 +52,7 @@ <NumericUpDown Grid.Row="0" Grid.Column="2" VerticalAlignment="Center" ToolTip.Tip="Limits the windows and dialogs maximum width to the screen resolution less this margin" - ClipValueToMinMax="True" + Minimum="0" Maximum="1000" Increment="1" @@ -69,7 +69,7 @@ <NumericUpDown Grid.Row="2" Grid.Column="2" VerticalAlignment="Center" ToolTip.Tip="Limits windows and dialogs maximum height to the screen resolution less this margin" - ClipValueToMinMax="True" + Minimum="0" Maximum="1000" Increment="1" @@ -265,7 +265,7 @@ <NumericUpDown Grid.Row="2" Grid.Column="2" Margin="10,0,0,0" VerticalAlignment="Center" - ClipValueToMinMax="True" + Minimum="1" Maximum="50" Value="{Binding Settings.LayerPreview.VolumeBoundsOutlineThickness}" @@ -299,7 +299,7 @@ <NumericUpDown Grid.Row="4" Grid.Column="2" Margin="10,0,0,0" VerticalAlignment="Center" - ClipValueToMinMax="True" + Minimum="1" Maximum="50" Value="{Binding Settings.LayerPreview.LayerBoundsOutlineThickness}" @@ -334,7 +334,7 @@ <NumericUpDown Grid.Row="6" Grid.Column="2" Margin="10,0,0,0" VerticalAlignment="Center" - ClipValueToMinMax="True" + Minimum="1" Maximum="50" Value="{Binding Settings.LayerPreview.HollowOutlineLineThickness}" @@ -593,7 +593,7 @@ <NumericUpDown Grid.Row="0" Grid.Column="3" Margin="10,0,0,0" VerticalAlignment="Center" - ClipValueToMinMax="True" + Minimum="1" Maximum="1000000" Width="70" @@ -624,7 +624,7 @@ <NumericUpDown Grid.Row="2" Grid.Column="3" Margin="10,0,0,0" VerticalAlignment="Center" - ClipValueToMinMax="True" + Minimum="1" Maximum="255" Width="70" @@ -737,7 +737,7 @@ <StackPanel Orientation="Horizontal" Margin="10,0,10,10" Spacing="10"> <NumericUpDown Width="60" - ClipValueToMinMax="True" + Minimum="0" Maximum="254" Value="{Binding Settings.Issues.IslandBinaryThreshold}" @@ -753,7 +753,7 @@ <StackPanel Orientation="Horizontal" Margin="10,0,10,10" Spacing="10"> <NumericUpDown Width="60" - ClipValueToMinMax="True" + Minimum="1" Maximum="255" Value="{Binding Settings.Issues.IslandRequiredAreaToProcessCheck}" @@ -767,7 +767,7 @@ <StackPanel Orientation="Horizontal" Margin="10,0,10,10" Spacing="10"> <NumericUpDown Width="60" - ClipValueToMinMax="True" + Minimum="1" Maximum="255" Value="{Binding Settings.Issues.IslandRequiredPixelBrightnessToProcessCheck}" @@ -781,7 +781,7 @@ <StackPanel Orientation="Horizontal" Margin="10,0,10,10" Spacing="10"> <NumericUpDown Width="60" - ClipValueToMinMax="True" + Minimum="0.05" Maximum="0.95" Increment="0.05" @@ -798,7 +798,7 @@ <StackPanel Orientation="Horizontal" Margin="10,0,10,10" Spacing="10"> <NumericUpDown Width="60" - ClipValueToMinMax="True" + Minimum="50" Maximum="255" Value="{Binding Settings.Issues.IslandRequiredPixelBrightnessToSupport}" @@ -813,7 +813,7 @@ <!-- <StackPanel Orientation="Horizontal" Margin="10,0,10,10" Spacing="10"> <NumericUpDown Width="60" - ClipValueToMinMax="True" + Minimum="1" Maximum="255" Value="{Binding Settings.Issues.IslandRequiredPixelsToSupport}" @@ -829,7 +829,7 @@ <StackPanel Orientation="Horizontal" Margin="10,0,10,10" Spacing="10"> <NumericUpDown Width="60" - ClipValueToMinMax="True" + Minimum="50" Maximum="255" Value="{Binding Settings.Issues.IslandRequiredPixelBrightnessToSupport}" @@ -861,7 +861,7 @@ <StackPanel Orientation="Horizontal" Margin="10,0,10,10" Spacing="10"> <NumericUpDown Width="60" - ClipValueToMinMax="True" + Minimum="2" Maximum="255" Value="{Binding Settings.Issues.OverhangErodeIterations}" @@ -885,7 +885,7 @@ <StackPanel Orientation="Horizontal" Margin="10" Spacing="10"> <NumericUpDown Width="60" - ClipValueToMinMax="True" + Minimum="1" Maximum="254" Value="{Binding Settings.Issues.ResinTrapBinaryThreshold}" @@ -902,7 +902,7 @@ <StackPanel Orientation="Horizontal" Margin="10,0,10,10" Spacing="10"> <NumericUpDown Width="60" - ClipValueToMinMax="True" + Minimum="1" Maximum="255" Value="{Binding Settings.Issues.ResinTrapRequiredAreaToProcessCheck}" @@ -916,7 +916,7 @@ <StackPanel Orientation="Horizontal" Margin="10,0,10,10" Spacing="10"> <NumericUpDown Width="60" - ClipValueToMinMax="True" + Minimum="1" Maximum="255" Value="{Binding Settings.Issues.ResinTrapRequiredBlackPixelsToDrain}" @@ -930,7 +930,7 @@ <StackPanel Orientation="Horizontal" Margin="10,0,10,10" Spacing="10"> <NumericUpDown Width="60" - ClipValueToMinMax="True" + Minimum="1" Maximum="150" Value="{Binding Settings.Issues.ResinTrapMaximumPixelBrightnessToDrain}" @@ -953,7 +953,7 @@ <StackPanel Orientation="Horizontal" Margin="10" Spacing="10"> <NumericUpDown Width="60" - ClipValueToMinMax="True" + Minimum="1" Maximum="255" Value="{Binding Settings.Issues.TouchingBoundMinimumPixelBrightness}" @@ -1016,7 +1016,7 @@ Minimum="1" Maximum="255" Margin="0,0,5,0" - ClipValueToMinMax="True" + Value="{Binding Settings.Issues.TouchingBoundMarginLeft}" /> @@ -1034,7 +1034,7 @@ Minimum="1" Maximum="255" Margin="0,0,0,5" - ClipValueToMinMax="True" + Value="{Binding Settings.Issues.TouchingBoundMarginTop}" /> <TextBlock @@ -1050,7 +1050,7 @@ Minimum="1" Maximum="255" Margin="5,0,0,0" - ClipValueToMinMax="True" + Value="{Binding Settings.Issues.TouchingBoundMarginRight}" /> <TextBlock @@ -1067,7 +1067,7 @@ Minimum="1" Maximum="255" Margin="0,5,0,0" - ClipValueToMinMax="True" + Value="{Binding Settings.Issues.TouchingBoundMarginBottom}" /> <CheckBox @@ -1242,7 +1242,7 @@ <NumericUpDown Value="{Binding Settings.LayerRepair.RemoveIslandsBelowEqualPixels}" Width="70" - ClipValueToMinMax="True" + Minimum="0" Maximum="255"/> <TextBlock VerticalAlignment="Center" Text="Default maximum pixel area for Island removal (0 = disable)"/> @@ -1252,7 +1252,7 @@ <NumericUpDown Value="{Binding Settings.LayerRepair.RemoveIslandsRecursiveIterations}" Width="70" - ClipValueToMinMax="True" + Minimum="0" Maximum="65535"/> <TextBlock VerticalAlignment="Center" Text="Default maximum layers for recursive island removal (0 = All)"/> @@ -1262,7 +1262,7 @@ <NumericUpDown Value="{Binding Settings.LayerRepair.ClosingIterations}" Width="70" - ClipValueToMinMax="True" + Minimum="0" Maximum="255"/> <TextBlock VerticalAlignment="Center" Text="Default 'Gap Closing' iterations"/> @@ -1272,7 +1272,7 @@ <NumericUpDown Value="{Binding Settings.LayerRepair.OpeningIterations}" Width="70" - ClipValueToMinMax="True" + Minimum="0" Maximum="255"/> <TextBlock VerticalAlignment="Center" Text="Default 'Noise Removal' iterations"/> @@ -1345,7 +1345,7 @@ Text="Light-off delay:" /> <NumericUpDown Grid.Row="0" Grid.Column="2" - ClipValueToMinMax="True" + Minimum="0" Maximum="255" Increment="0.5" @@ -1362,7 +1362,7 @@ 
Use '0' to ignore this automation." Text="Bottom light-off delay:" /> <NumericUpDown Grid.Row="0" Grid.Column="8" - ClipValueToMinMax="True" + Minimum="0" Maximum="255" Increment="0.5" diff --git a/UVtools.WPF/Windows/ToolWindow.axaml.cs b/UVtools.WPF/Windows/ToolWindow.axaml.cs index 74f42cb..ef8d3d4 100644 --- a/UVtools.WPF/Windows/ToolWindow.axaml.cs +++ b/UVtools.WPF/Windows/ToolWindow.axaml.cs @@ -528,7 +528,6 @@ namespace UVtools.WPF.Windows } } - // Ensure the description don't stretch window DispatcherTimer.Run(() => |