diff options
| author | Roy Ben Shabat <Roy.mail.net@gmail.com> | 2021-11-28 15:54:00 +0200 |
|---|---|---|
| committer | Roy Ben Shabat <Roy.mail.net@gmail.com> | 2021-11-28 15:54:00 +0200 |
| commit | d24e385225807f71b4bee2e0d5b76ed3f2c3555d (patch) | |
| tree | 999bd943b2f0262f510f76410bf45192f7dd9536 /Software/Visual_Studio/PPC/Modules | |
| parent | b06d20f230ddd393691179e02b591fc0ac6d362c (diff) | |
| download | Tango-d24e385225807f71b4bee2e0d5b76ed3f2c3555d.tar.gz Tango-d24e385225807f71b4bee2e0d5b76ed3f2c3555d.zip | |
Removed spool type selection from job edit.
Diffstat (limited to 'Software/Visual_Studio/PPC/Modules')
| -rw-r--r-- | Software/Visual_Studio/PPC/Modules/Tango.PPC.Jobs/ViewModels/JobsViewVM.cs | 2 | ||||
| -rw-r--r-- | Software/Visual_Studio/PPC/Modules/Tango.PPC.Jobs/Views/JobView.xaml | 8 |
2 files changed, 5 insertions, 5 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 4c1805cce..7bb8d05ab 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 @@ -523,7 +523,7 @@ namespace Tango.PPC.Jobs.ViewModels job.UserGuid = null; job.RmlGuid = (Settings.DefaultRmlGuid != null && _rmls.Select(x => x.Guid).Contains(Settings.DefaultRmlGuid)) ? Settings.DefaultRmlGuid : _rmls.FirstOrDefault().Guid; job.WindingMethodGuid = Adapter.WindingMethods.FirstOrDefault().Guid; - job.SpoolTypeGuid = Settings.SpoolTypeGuid != null ? Settings.SpoolTypeGuid : Adapter.SpoolTypes.FirstOrDefault().Guid; + job.SpoolTypeGuid = Settings.SpoolTypeGuid != null ? Settings.SpoolTypeGuid : Adapter.SpoolTypes.FirstOrDefault(x => x.Code == (int)SpoolTypes.StandardSpool).Guid; if (vm.SelectedColorSpace == ColorSpaces.Catalog) { diff --git a/Software/Visual_Studio/PPC/Modules/Tango.PPC.Jobs/Views/JobView.xaml b/Software/Visual_Studio/PPC/Modules/Tango.PPC.Jobs/Views/JobView.xaml index af14f7522..79e24be21 100644 --- a/Software/Visual_Studio/PPC/Modules/Tango.PPC.Jobs/Views/JobView.xaml +++ b/Software/Visual_Studio/PPC/Modules/Tango.PPC.Jobs/Views/JobView.xaml @@ -677,17 +677,17 @@ </DockPanel> </StackPanel> - <Rectangle Stroke="{StaticResource TangoDividerBrush}" Margin="0 30 0 0" /> + <!--<Rectangle Stroke="{StaticResource TangoDividerBrush}" Margin="0 30 0 0" />--> - <StackPanel x:Name="stackOutput" Orientation="Horizontal" VerticalAlignment="Center" Style="{StaticResource Level1Container}"> + <StackPanel x:Name="stackOutput" Orientation="Horizontal" VerticalAlignment="Center" Style="{StaticResource Level1Container}" Height="0"> <Image Source="../Images/JobView/output.png" Width="39" /> <TextBlock FontWeight="Medium" Margin="20 0 0 0" VerticalAlignment="Center" FontSize="{StaticResource TangoExpanderHeaderFontSize}">Output</TextBlock> </StackPanel> - <DockPanel Style="{StaticResource Level2Container}"> + <!--<DockPanel Style="{StaticResource Level2Container}"> <TextBlock Text="Spool Type:" VerticalAlignment="Center"></TextBlock> <touch:TouchComboBox ItemsSource="{Binding SpoolTypes}" SelectedItem="{Binding Job.SpoolType}" Margin="40 -15 0 0" DisplayMemberPath="Name" Title="Select Spool Type" /> - </DockPanel> + </DockPanel>--> <!--<DockPanel Style="{StaticResource Level2Container}"> <TextBlock Text="Segments per spool:" VerticalAlignment="Center"></TextBlock> |