diff options
author | Tiago Conceição <Tiago_caza@hotmail.com> | 2021-01-03 03:47:20 +0300 |
---|---|---|
committer | Tiago Conceição <Tiago_caza@hotmail.com> | 2021-01-03 03:47:20 +0300 |
commit | a7d15a24d0179b06b64daf1be5f4e08c488cb930 (patch) | |
tree | b3823c82f6031da7a6c10571945973a88390778a /UVtools.WPF/Controls/Tools/ToolLayerImportControl.axaml | |
parent | 92588fd1592236d5fef67391e55cf05b6111ed9b (diff) |
v2.1.1v2.1.1
* (Add) About box: Primary screen identifier and open on screen identifier
* (Add) Calibrator - External tests
* (Change) Rewrite 'Action - Import Layer(s)' to support file formats and add the followig importation types:
* **Insert:** Insert layers. (Requires images with bounds equal or less than file resolution)
* **Replace:** Replace layers. (Requires images with bounds equal or less than file resolution)
* **Stack:** Stack layers content. (Requires images with bounds equal or less than file resolution)
* **Merge:** Merge/Sum layers content. (Requires images with same resolution)
* **Subtract:** Subtract layers content. (Requires images with same resolution)
* **BitwiseAnd:** Perform a 'bitwise and' operation over layer pixels. (Requires images with same resolution)
* **BitwiseOr:** Perform a 'bitwise or' operation over layer pixels. (Requires images with same resolution)
* **BitwiseXOr:** Perform a 'bitwise xor' operation over layer pixels. (Requires images with same resolution)
* (Change) Icon for Tool - Raft Relief
* (Change) Windows and dialogs max size are now calculated to where window is opened instead of use the primary or first screen all the time
Diffstat (limited to 'UVtools.WPF/Controls/Tools/ToolLayerImportControl.axaml')
-rw-r--r-- | UVtools.WPF/Controls/Tools/ToolLayerImportControl.axaml | 103 |
1 files changed, 68 insertions, 35 deletions
diff --git a/UVtools.WPF/Controls/Tools/ToolLayerImportControl.axaml b/UVtools.WPF/Controls/Tools/ToolLayerImportControl.axaml index ce0164f..fa74937 100644 --- a/UVtools.WPF/Controls/Tools/ToolLayerImportControl.axaml +++ b/UVtools.WPF/Controls/Tools/ToolLayerImportControl.axaml @@ -6,42 +6,75 @@ x:Class="UVtools.WPF.Controls.Tools.ToolLayerImportControl"> <StackPanel Spacing="10"> - <StackPanel Spacing="10" Orientation="Horizontal"> - <TextBlock - VerticalAlignment="Center" - Text="Insert after layer:"/> - <NumericUpDown - Width="70" - Minimum="0" - Maximum="{Binding MaximumLayer}" - Value="{Binding Operation.InsertAfterLayerIndex}" - /> - <TextBlock - VerticalAlignment="Center" - Text="{Binding InfoLayerHeightStr}"/> - </StackPanel> - - <StackPanel Spacing="10" Orientation="Horizontal"> - <CheckBox - IsChecked="{Binding Operation.ReplaceStartLayer}" - Content="Replace this layer"/> - - <CheckBox - IsChecked="{Binding Operation.ReplaceSubsequentLayers}" - Content="Replace subsequent layers"/> - - <CheckBox - IsChecked="{Binding Operation.DiscardRemainingLayers}" - Content="Discard remaining layers"/> - - <CheckBox - IsChecked="{Binding Operation.MergeImages}" - Content="Merge images"/> - </StackPanel> - + <Grid RowDefinitions="Auto,10,Auto,10,Auto,10,Auto" + ColumnDefinitions="Auto,10,100,5,Auto,20,Auto"> + + <TextBlock Grid.Row="0" Grid.Column="0" + VerticalAlignment="Center" + ToolTip.Tip="Insert: Insert layers. (Requires images with bounds equal or less than file resolution) +
Replace: Replace layers. (Requires images with bounds equal or less than file resolution) +
Stack: Stack layers content. (Requires images with bounds equal or less than file resolution) +
Merge: Merge/Sum layers content. (Requires images with same resolution) +
Subtract: Subtract layers content. (Requires images with same resolution) +
BitwiseAnd: Perform a 'bitwise and' operation over layer pixels. (Requires images with same resolution) +
BitwiseOr: Perform a 'bitwise or' operation over layer pixels. (Requires images with same resolution) +
BitwiseXOr: Perform a 'bitwise xor' operation over layer pixels. (Requires images with same resolution)" + Text="Import type:"/> + + <ComboBox Grid.Row="0" Grid.Column="2" + VerticalAlignment="Center" + SelectedItem="{Binding Operation.ImportType}" + Items="{Binding Operation.ImportTypesItems}"/> + + <TextBlock Grid.Row="0" Grid.Column="4" + VerticalAlignment="Center" + Text="layers"/> + + <CheckBox Grid.Row="0" Grid.Column="6" + IsChecked="{Binding Operation.ExtendBeyondLayerCount}" + IsVisible="{Binding Operation.IsExtendBeyondLayerCountVisible}" + ToolTip.Tip="If enabled, imported images that go beyond last layer are appended. The file will grow in layer count if necessary to fit all imported layers. +
If disabled, all imported images that go beyond last layer are discarded. The file will maintain same layer count." + Content="Extend beyond layer count"/> + + <TextBlock Grid.Row="2" Grid.Column="0" + VerticalAlignment="Center" + Text="Start at layer:"/> + <NumericUpDown Grid.Row="2" Grid.Column="2" + ClipValueToMinMax="True" + Minimum="0" + Maximum="{Binding MaximumLayer}" + Value="{Binding Operation.StartLayerIndex}"/> + <TextBlock Grid.Row="2" Grid.Column="4" + VerticalAlignment="Center" + Text="{Binding InfoLayerHeightStr}"/> + + <CheckBox Grid.Row="4" Grid.Column="2" Grid.ColumnSpan="5" + IsChecked="{Binding Operation.DiscardUnmodifiedLayers}" + ToolTip.Tip="If enabled, all unmodified layers forward the last inserted layer are discarded. +
If disabled, the unmodified layers are kept." + Content="Discard unmodified layers"/> + + <TextBlock Grid.Row="6" Grid.Column="0" + VerticalAlignment="Center" + IsVisible="{Binding Operation.IsImportStackType}" + Text="Stack margin:"/> + <NumericUpDown Grid.Row="6" Grid.Column="2" + ClipValueToMinMax="True" + IsVisible="{Binding Operation.IsImportStackType}" + Minimum="0" + Maximum="65535" + Value="{Binding Operation.StackMargin}"/> + <TextBlock Grid.Row="6" Grid.Column="4" + VerticalAlignment="Center" + IsVisible="{Binding Operation.IsImportStackType}" + Text="px"/> + </Grid> + + <CheckBox IsChecked="{Binding IsAutoSortLayersByFileNameChecked}" - Content="Auto sort layers by file name"/> + Content="Auto sort files by filename"/> <TextBlock Text="{Binding InfoImportResult}" /> @@ -90,7 +123,7 @@ <TextBlock VerticalAlignment="Center" - Text="{Binding Operation.Files.Count, StringFormat=Layers: \{0\}}"/> + Text="{Binding Operation.Files.Count, StringFormat=Files: \{0\}}"/> </StackPanel> </Grid> </Border> |