- **Dynamic lifts:**
  - (Improvement) Remove the 'light-off delay' set logic as it is now better integrated on 'Wait time before cure' suggestion and should run/applied there if intended
  - (Fix) Prevent set NaN values to lift height and/or speed
  - (Fix) Lift height and speed for the current layer must be calculated from previous layer (#618)
- (Improvement) Windows auto-updater will install the update without dialogs, just displaying installation progress
This commit is contained in:
Tiago Conceição
2022-12-11 05:18:33 +00:00
parent d406bc87a6
commit 439e0d162c
14 changed files with 152 additions and 181 deletions
@@ -6,7 +6,7 @@
x:Class="UVtools.WPF.Controls.Tools.ToolDynamicLiftsControl">
<StackPanel Spacing="10">
<Grid RowDefinitions="Auto,20,Auto,10,Auto,10,Auto,10,Auto,10,Auto,10,Auto,10,Auto,5,Auto"
<Grid RowDefinitions="Auto,20,Auto,10,Auto,10,Auto,10,Auto,10,Auto"
ColumnDefinitions="Auto,10,180,Auto,210,10,Auto">
<TextBlock Grid.Row="0" Grid.Column="0"
VerticalAlignment="Center"
@@ -206,105 +206,6 @@
CommandParameter="False"
ToolTip.Tip="View the largest normal layer for the selected layer range"
Content="Largest"/>
<TextBlock Grid.Row="12" Grid.Column="0"
IsVisible="{Binding SlicerFile.CanUseLayerLightOffDelay}"
VerticalAlignment="Center"
Text="Light-off mode:"/>
<ComboBox Grid.Row="12" Grid.Column="2" Grid.ColumnSpan="3"
IsVisible="{Binding SlicerFile.CanUseLayerLightOffDelay}"
HorizontalAlignment="Stretch"
Items="{Binding Operation.LightOffDelaySetMode, Converter={StaticResource EnumToCollectionConverter}, Mode=OneTime}"
SelectedItem="{Binding Operation.LightOffDelaySetMode, Converter={StaticResource FromValueDescriptionToEnumConverter}}"/>
<TextBlock Grid.Row="14" Grid.Column="2"
IsEnabled="{Binding !Operation.LightOffDelaySetMode}"
VerticalAlignment="Center"
HorizontalAlignment="Center"
FontWeight="Bold"
Text="Bottom extra time">
<TextBlock.IsVisible>
<MultiBinding Converter="{x:Static BoolConverters.And}">
<Binding Path="SlicerFile.CanUseLayerLightOffDelay"/>
<Binding Path="!Operation.LightOffDelaySetMode"/>
</MultiBinding>
</TextBlock.IsVisible>
</TextBlock>
<TextBlock Grid.Row="14" Grid.Column="4"
IsEnabled="{Binding !Operation.LightOffDelaySetMode}"
VerticalAlignment="Center"
HorizontalAlignment="Center"
FontWeight="Bold"
Text="Normal extra time">
<TextBlock.IsVisible>
<MultiBinding Converter="{x:Static BoolConverters.And}">
<Binding Path="SlicerFile.CanUseLayerLightOffDelay"/>
<Binding Path="!Operation.LightOffDelaySetMode"/>
</MultiBinding>
</TextBlock.IsVisible>
</TextBlock>
<TextBlock Grid.Row="16" Grid.Column="0"
IsEnabled="{Binding !Operation.LightOffDelaySetMode}"
VerticalAlignment="Center"
Text="Light-off delay:">
<TextBlock.IsVisible>
<MultiBinding Converter="{x:Static BoolConverters.And}">
<Binding Path="SlicerFile.CanUseLayerLightOffDelay"/>
<Binding Path="!Operation.LightOffDelaySetMode"/>
</MultiBinding>
</TextBlock.IsVisible>
</TextBlock>
<NumericUpDown Grid.Row="16" Grid.Column="2"
Classes="ValueLabel ValueLabel_s"
IsEnabled="{Binding !Operation.LightOffDelaySetMode}"
VerticalAlignment="Center"
Minimum="0"
Maximum="100"
Increment="1"
FormatString="F2"
Value="{Binding Operation.LightOffDelayBottomExtraTime}">
<NumericUpDown.IsVisible>
<MultiBinding Converter="{x:Static BoolConverters.And}">
<Binding Path="SlicerFile.CanUseLayerLightOffDelay"/>
<Binding Path="!Operation.LightOffDelaySetMode"/>
</MultiBinding>
</NumericUpDown.IsVisible>
</NumericUpDown>
<TextBlock Grid.Row="16" Grid.Column="3"
IsEnabled="{Binding !Operation.LightOffDelaySetMode}"
VerticalAlignment="Center"
HorizontalAlignment="Center"
FontWeight="Bold"
Text="/">
<TextBlock.IsVisible>
<MultiBinding Converter="{x:Static BoolConverters.And}">
<Binding Path="SlicerFile.CanUseLayerLightOffDelay"/>
<Binding Path="!Operation.LightOffDelaySetMode"/>
</MultiBinding>
</TextBlock.IsVisible>
</TextBlock>
<NumericUpDown Grid.Row="16" Grid.Column="4"
Classes="ValueLabel ValueLabel_s"
IsEnabled="{Binding !Operation.LightOffDelaySetMode}"
VerticalAlignment="Center"
Minimum="0"
Maximum="100"
Increment="1"
FormatString="F2"
Value="{Binding Operation.LightOffDelayExtraTime}">
<NumericUpDown.IsVisible>
<MultiBinding Converter="{x:Static BoolConverters.And}">
<Binding Path="SlicerFile.CanUseLayerLightOffDelay"/>
<Binding Path="!Operation.LightOffDelaySetMode"/>
</MultiBinding>
</NumericUpDown.IsVisible>
</NumericUpDown>
</Grid>
</StackPanel>
+1
View File
@@ -355,6 +355,7 @@
</Border>
<TabControl
Name="MainTabControl"
DockPanel.Dock="Left"
Width="400"
SelectedItem="{Binding SelectedTabItem}">
+2 -2
View File
@@ -1699,8 +1699,6 @@ public partial class MainWindow : WindowEx
UpdateLayerTrackerHighlightIssues();
};
TabGCode.IsVisible = HaveGCode;
if (SlicerFile.DecodeType == FileFormat.FileDecodeType.Full)
{
if (Settings.Issues.ComputeIssuesOnLoad)
@@ -1744,6 +1742,8 @@ public partial class MainWindow : WindowEx
}
UserSettings.Save();
}
TabGCode.IsVisible = HaveGCode;
}
private void SlicerFileOnPropertyChanged(object? sender, PropertyChangedEventArgs e)
+7 -1
View File
@@ -1,7 +1,6 @@
using System;
using System.Diagnostics;
using System.Globalization;
using System.Text;
using System.Threading.Tasks;
using Avalonia;
using Projektanker.Icons.Avalonia;
@@ -55,6 +54,13 @@ public static class Program
Console.WriteLine(e);
return;
}
/*foreach (var s in FileFormat.AllFileExtensions.Where(extension => !extension.Extension.Contains('.')).DistinctBy(extension => extension.Extension))
{
Debug.WriteLine($"- {s.Extension}");
}
Debug.WriteLine(FileFormat.AllFileExtensions.Where(extension => !extension.Extension.Contains('.')).DistinctBy(extension => extension.Extension).Count());
return;*/
if (Args.Length >= 1)
{
+1 -1
View File
@@ -212,7 +212,7 @@ public class AppVersionChecker : BindableBase
if (OperatingSystem.IsWindows())
{
SystemAware.StartProcess(DownloadedFile);
SystemAware.StartProcess(DownloadedFile, "/qb");
}
else if (downloadFilename.EndsWith(".AppImage") && Linux.IsRunningAppImageGetPath(out var appImagePath)) // Linux AppImage
{
+1 -1
View File
@@ -12,7 +12,7 @@
<PackageLicenseFile>LICENSE</PackageLicenseFile>
<RepositoryUrl>https://github.com/sn4k3/UVtools</RepositoryUrl>
<RepositoryType>Git</RepositoryType>
<Version>3.9.1</Version>
<Version>3.9.2</Version>
<Platforms>AnyCPU;x64</Platforms>
<PackageIcon>UVtools.png</PackageIcon>
<PackageReadmeFile>README.md</PackageReadmeFile>