Removed option 'show advanced (segment&gradient) in job editor'

Related Work Items: #9131

4 files changed, 6 insertions, 23 deletions

diff --git a/Software/Visual_Studio/PPC/Modules/Tango.PPC.JobsV2/Models/JobModel.cs b/Software/Visual_Studio/PPC/Modules/Tango.PPC.JobsV2/Models/JobModel.cs
index d8a71fc78..bcf35a741 100644
--- a/Software/Visual_Studio/PPC/Modules/Tango.PPC.JobsV2/Models/JobModel.cs
+++ b/Software/Visual_Studio/PPC/Modules/Tango.PPC.JobsV2/Models/JobModel.cs
@@ -1132,6 +1132,7 @@ namespace Tango.PPC.Jobs.Models
                 GroupingSegments.Where(i => i.SegmentIndex != max).ToList().ForEach(x => x.EnableInterSegment = InterSegmentLength > 0);
             }
             _preventChange = false;
+            EnableInterSegment = InterSegmentLength > 0;
             OnLengthChanged();
         }
         
diff --git a/Software/Visual_Studio/PPC/Modules/Tango.PPC.JobsV2/ViewModels/JobViewVM.cs b/Software/Visual_Studio/PPC/Modules/Tango.PPC.JobsV2/ViewModels/JobViewVM.cs
index 345231e57..5d8473018 100644
--- a/Software/Visual_Studio/PPC/Modules/Tango.PPC.JobsV2/ViewModels/JobViewVM.cs
+++ b/Software/Visual_Studio/PPC/Modules/Tango.PPC.JobsV2/ViewModels/JobViewVM.cs
@@ -280,19 +280,7 @@ namespace Tango.PPC.Jobs.ViewModels
                 }
             }
         }
-
-        private bool _showAdvanced;
-
-        public bool ShowAdvanced
-        {
-            get { return _showAdvanced; }
-            set
-            {
-                _showAdvanced = value;
-                RaisePropertyChangedAuto();
-            }
-        }
-
+        
         private JobResumeModel _resumeModel;
         public JobResumeModel ResumeModel
         {
@@ -547,7 +535,7 @@ namespace Tango.PPC.Jobs.ViewModels
                     RaisePropertyChanged(nameof(SelectedRML));
 
                     await LoadRML(_selectedRML);
-                    if (BuildProvider.IsEureka && Job.Segments.Count == 1 && Job.Segments[0].BrushStops.Count == 1)
+                    if (BuildProvider.IsEureka && Job.Segments.Count == 1 && Job.Segments[0].BrushStops.Count <= 1)
                     {
                         IsBasicMode = true;
                     }
@@ -581,7 +569,6 @@ namespace Tango.PPC.Jobs.ViewModels
 
                 IsFullMode = true;
                 DyeCommand.RaiseCanExecuteChanged();
-                ShowAdvanced = Settings.ShowAdvancedOptions;
             }
             catch (Exception ex)
             {
diff --git a/Software/Visual_Studio/PPC/Modules/Tango.PPC.JobsV2/Views/JobEurekaView.xaml b/Software/Visual_Studio/PPC/Modules/Tango.PPC.JobsV2/Views/JobEurekaView.xaml
index a10524e71..adf8c22d5 100644
--- a/Software/Visual_Studio/PPC/Modules/Tango.PPC.JobsV2/Views/JobEurekaView.xaml
+++ b/Software/Visual_Studio/PPC/Modules/Tango.PPC.JobsV2/Views/JobEurekaView.xaml
@@ -962,7 +962,7 @@
                                 </Grid.RowDefinitions>
                                 <Grid Grid.Row="0">
                                     <DockPanel x:Name="ColorPropertiesPanel" VerticalAlignment="Top" >
-                                        <StackPanel x:Name="AdvansedOptions" DockPanel.Dock="Right" Orientation="Horizontal"  Margin="0 5 18 0" Height="55" HorizontalAlignment="Right" Width="Auto" Visibility="{Binding ShowAdvanced, Converter={StaticResource BooleanToVisibilityConverter}}" VerticalAlignment="Center">
+                                        <StackPanel x:Name="AdvansedOptions" DockPanel.Dock="Right" Orientation="Horizontal"  Margin="0 5 18 0" Height="55" HorizontalAlignment="Right" Width="Auto"  VerticalAlignment="Center">
                                             <TextBlock FontSize="20" VerticalAlignment="Center" >Advanced Options</TextBlock>
                                             <touch:TouchToggleSlider Style="{StaticResource TangoToggleButtonGreenAccent}" Height="28" CornerRadius="14"  HorizontalAlignment="Right" VerticalAlignment="Center" Margin="10 0 0 0" Width="54" IsChecked="{Binding IsBasicMode, Converter={StaticResource BooleanInverseConverter}, Mode=TwoWay}"></touch:TouchToggleSlider>
                                         </StackPanel>
diff --git a/Software/Visual_Studio/PPC/Modules/Tango.PPC.MachineSettings/Views/MainView.xaml b/Software/Visual_Studio/PPC/Modules/Tango.PPC.MachineSettings/Views/MainView.xaml
index 764f044d0..7de2818f8 100644
--- a/Software/Visual_Studio/PPC/Modules/Tango.PPC.MachineSettings/Views/MainView.xaml
+++ b/Software/Visual_Studio/PPC/Modules/Tango.PPC.MachineSettings/Views/MainView.xaml
@@ -457,15 +457,10 @@
 
                                         <DockPanel Margin="0 20 0 0" TextElement.FontSize="{StaticResource TangoDefaultFontSize}">
                                             <TextBlock VerticalAlignment="Center">Min limit dL (Fine Tuning)</TextBlock>
-                                            <touch:TouchNumericTextBox Minimum="0" Maximum="10" KeyboardContainer="{Binding ElementName=Container}" Value="{Binding Settings.FineTuningMinLimitdL}" Margin="0 0 100 0" DockPanel.Dock="Right" HorizontalAlignment="Right" Width="90" HasDecimalPoint="True"></touch:TouchNumericTextBox>
+                                            <touch:TouchNumericTextBox Minimum="0" Maximum="10" KeyboardContainer="{Binding ElementName=Container}" Value="{Binding Settings.FineTuningMinLimitdL}" Margin="0 0 100 0" DockPanel.Dock="Right" HorizontalAlignment="Right" Width="90" HasDecimalPoint="True" ></touch:TouchNumericTextBox>
                                         </DockPanel>
 
-                                        <DockPanel Margin="0 20 0 0" TextElement.FontSize="{StaticResource TangoDefaultFontSize}">
-                                            <TextBlock VerticalAlignment="Center">Show advanced options (Segments &amp; Gradients) in the Job Editor</TextBlock>
-                                            <touch:TouchToggleSlider IsChecked="{Binding Settings.ShowAdvancedOptions}" Margin="0 0 100 0" DockPanel.Dock="Right" Style="{StaticResource TangoToggleButtonGrayAccent}" HorizontalAlignment="Right" Width="90"></touch:TouchToggleSlider>
-                                        </DockPanel>
-
-                                        <DockPanel Margin="0 20 0 0">
+                                        <DockPanel Margin="0 20 0 10">
                                             <touch:TouchIcon VerticalAlignment="Top" Icon="InformationOutline" Foreground="{StaticResource TangoGrayTextBrush}"></touch:TouchIcon>
                                             <TextBlock Margin="10 0 0 0" VerticalAlignment="Top" TextWrapping="Wrap" FontSize="{StaticResource TangoSmallFontSize}" Foreground="{StaticResource TangoGrayTextBrush}">
                                                 Please restart the application for advanced settings to take effect.