diff options
| author | Mirta <mirta@twine-s.com> | 2021-02-03 10:45:49 +0200 |
|---|---|---|
| committer | Mirta <mirta@twine-s.com> | 2021-02-03 10:45:49 +0200 |
| commit | f2f083789efa972642dd51d08b8e8aa44de8c819 (patch) | |
| tree | a0aa1cb05b1c281a5bc85c30ae74e391150007e1 /Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.RML | |
| parent | aa151f5fdf47dc02c77bb4ef46164e43aaba872d (diff) | |
| parent | 0a1203a500d309ff2a2a20e5643d3f85c7c6d3a9 (diff) | |
| download | Tango-f2f083789efa972642dd51d08b8e8aa44de8c819.tar.gz Tango-f2f083789efa972642dd51d08b8e8aa44de8c819.zip | |
Merged Vika's changes with Mirta's Changes
Diffstat (limited to 'Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.RML')
2 files changed, 8 insertions, 5 deletions
diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.RML/ViewModels/ColorConversionViewVM.cs b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.RML/ViewModels/ColorConversionViewVM.cs index 4a6fd7d36..6ba539078 100644 --- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.RML/ViewModels/ColorConversionViewVM.cs +++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.RML/ViewModels/ColorConversionViewVM.cs @@ -353,6 +353,9 @@ namespace Tango.MachineStudio.RML.ViewModels input.ThreadA = RML.WhitePointA; input.ThreadB = RML.WhitePointB; + input.UseLightInks = RML.UseLightInks; + input.VMax = RML.VMax; + foreach (var vm in LiquidsCalibrationData.Where(x => x.LiquidType.HasPigment)) { InputLiquid inputLiquid = new InputLiquid(); diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.RML/Views/RmlsView.xaml b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.RML/Views/RmlsView.xaml index b1a1f4aa5..fd05ee28e 100644 --- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.RML/Views/RmlsView.xaml +++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.RML/Views/RmlsView.xaml @@ -84,10 +84,12 @@ <Setter Property="BorderThickness" Value="0"/> <Setter Property="FocusVisualStyle" Value="{x:Null}"/> <Setter Property="VerticalContentAlignment" Value="Center"></Setter> + <Setter Property="Padding" Value="4"></Setter> + <Setter Property="Margin" Value="0 5 0 0"></Setter> </Style> </DataGrid.CellStyle> <DataGrid.Columns> - <DataGridTextColumn Header="NAME" Binding="{Binding Name}" Width="140" /> + <DataGridTextColumn Header="NAME" Binding="{Binding Name}" Width="140"/> <DataGridTextColumn Header="MANUFACTURER" Binding="{Binding Manufacturer}" Width="Auto" /> <DataGridTextColumn Header="MATERIAL" Binding="{Binding MediaMaterial.Name}" Width="Auto" /> <DataGridTextColumn Header="PURPOSE" Binding="{Binding MediaPurpose.Name}" Width="Auto" /> @@ -97,7 +99,7 @@ <DataGridTemplateColumn Header="LIQUID FACTORS" Width="1*"> <DataGridTemplateColumn.CellTemplate> <DataTemplate> - <ItemsControl ItemsSource="{Binding LiquidTypesRmls}" Margin="0 10 0 0"> + <ItemsControl ItemsSource="{Binding LiquidTypesRmls}" Margin="0 -5 0 0"> <ItemsControl.ItemsPanel> <ItemsPanelTemplate> <StackPanel HorizontalAlignment="Left" Orientation="Horizontal" IsItemsHost="True"></StackPanel> @@ -105,7 +107,7 @@ </ItemsControl.ItemsPanel> <ItemsControl.ItemTemplate> <DataTemplate DataType="{x:Type observables:LiquidTypesRml}"> - <Grid Width="47" Height="40" Margin="10 -10 0 0"> + <Grid Width="35" Height="32" Margin="10 0 0 0"> <shapes:Hexagon StrokeThickness="1" Stroke="Gray"> <shapes:Hexagon.Fill> <LinearGradientBrush Opacity="0.7" > @@ -114,8 +116,6 @@ </LinearGradientBrush> </shapes:Hexagon.Fill> </shapes:Hexagon> - - <TextBlock FontSize="8" Width="40" TextTrimming="CharacterEllipsis" TextAlignment="Center" HorizontalAlignment="Center" VerticalAlignment="Center" Background="Transparent" Foreground="{StaticResource Hexagon.ForegroundBrush}" Text="{Binding LiquidType.Name}" FontStyle="Italic"></TextBlock> </Grid> </DataTemplate> </ItemsControl.ItemTemplate> |