diff options
| author | Roy Ben Shabat <Roy.mail.net@gmail.com> | 2021-01-06 15:16:42 +0200 |
|---|---|---|
| committer | Roy Ben Shabat <Roy.mail.net@gmail.com> | 2021-01-06 15:16:42 +0200 |
| commit | c50e8793fc48afdb53a44ef670860e18f366a70d (patch) | |
| tree | 5c8e5af13fb370ef3b53b70ca4c5ee3ca64548a1 /Software | |
| parent | 88b747af66e4f2cbc62ef4fa42ad17024341d1bb (diff) | |
| download | Tango-c50e8793fc48afdb53a44ef670860e18f366a70d.tar.gz Tango-c50e8793fc48afdb53a44ef670860e18f366a70d.zip | |
Restored latest changes !!!
Diffstat (limited to 'Software')
3 files changed, 32 insertions, 2 deletions
diff --git a/Software/Visual_Studio/PPC/Modules/Tango.PPC.Jobs/ViewModels/JobsViewVM.cs b/Software/Visual_Studio/PPC/Modules/Tango.PPC.Jobs/ViewModels/JobsViewVM.cs index fe831587c..afbce995d 100644 --- a/Software/Visual_Studio/PPC/Modules/Tango.PPC.Jobs/ViewModels/JobsViewVM.cs +++ b/Software/Visual_Studio/PPC/Modules/Tango.PPC.Jobs/ViewModels/JobsViewVM.cs @@ -537,7 +537,19 @@ namespace Tango.PPC.Jobs.ViewModels if (colorProfile == null) { - job.AddSolidSegment(Settings.DefaultSegmentLength > 0 ? Settings.DefaultSegmentLength : 100); + var segment = job.AddSolidSegment(Settings.DefaultSegmentLength > 0 ? Settings.DefaultSegmentLength : 100); + + try + { + if (vm.SelectedColorSpace == ColorSpaces.Catalog) + { + segment.BrushStops[0].ColorCatalogGuid = catalogVM.SelectedCatalog.Guid; + } + } + catch (Exception ex) + { + LogManager.Log(ex, $"Error setting first segment brush stop color catalog guide."); + } } else { diff --git a/Software/Visual_Studio/PPC/Modules/Tango.PPC.Technician/Views/SystemView.xaml b/Software/Visual_Studio/PPC/Modules/Tango.PPC.Technician/Views/SystemView.xaml index 52abfc239..292a87bb9 100644 --- a/Software/Visual_Studio/PPC/Modules/Tango.PPC.Technician/Views/SystemView.xaml +++ b/Software/Visual_Studio/PPC/Modules/Tango.PPC.Technician/Views/SystemView.xaml @@ -131,6 +131,21 @@ </Table.Columns> <TableRowGroup> + + <TableRow> + <TableCell> + <Paragraph> + <TextBlock>Environment:</TextBlock> + </Paragraph> + </TableCell> + + <TableCell> + <Paragraph> + <TextBlock Text="{Binding Settings.DeploymentSlot,Converter={StaticResource EnumToDescriptionConverter},Mode=OneWay,TargetNullValue='N/A',FallbackValue='N/A'}"/> + </Paragraph> + </TableCell> + </TableRow> + <TableRow> <TableCell> <Paragraph> diff --git a/Software/Visual_Studio/PPC/Tango.PPC.UI/Views/LayoutView.xaml b/Software/Visual_Studio/PPC/Tango.PPC.UI/Views/LayoutView.xaml index 3e1f50e41..5c5b86140 100644 --- a/Software/Visual_Studio/PPC/Tango.PPC.UI/Views/LayoutView.xaml +++ b/Software/Visual_Studio/PPC/Tango.PPC.UI/Views/LayoutView.xaml @@ -56,6 +56,9 @@ <DataTrigger Binding="{Binding Settings.DeploymentSlot}" Value="PROD"> <Setter Property="Visibility" Value="Collapsed"></Setter> </DataTrigger> + <DataTrigger Binding="{Binding Settings.DeploymentSlot}" Value="BETA"> + <Setter Property="Visibility" Value="Collapsed"></Setter> + </DataTrigger> </Style.Triggers> </Style> </TextBlock.Style> @@ -350,7 +353,7 @@ <TextBlock VerticalAlignment="Center" Margin="5 0 0 0" Text="{Binding Message,Mode=OneWay}" FontSize="{StaticResource TangoSmallFontSize}"></TextBlock> </DockPanel> <touch:TouchProgressBar Foreground="{Binding Brush,Mode=OneWay}" Background="#DBDBDB" Height="3" Margin="0 2 0 0" Minimum="0" Maximum="100" Value="{Binding Status.ProgressPercentage}" /> - </StackPanel> + </StackPanel> </Border> </DataTemplate> </ItemsControl.ItemTemplate> |