PPC. Job creation dialog. Change RML list to RMLModel list to improve performance.

Related Work Items: #6847

5 files changed, 35 insertions, 22 deletions

diff --git a/Software/Visual_Studio/PPC/Modules/Tango.PPC.JobsV2/Dialogs/JobCreationView.xaml b/Software/Visual_Studio/PPC/Modules/Tango.PPC.JobsV2/Dialogs/JobCreationView.xaml
index 399e2b64f..7118c30ff 100644
--- a/Software/Visual_Studio/PPC/Modules/Tango.PPC.JobsV2/Dialogs/JobCreationView.xaml
+++ b/Software/Visual_Studio/PPC/Modules/Tango.PPC.JobsV2/Dialogs/JobCreationView.xaml
@@ -72,7 +72,7 @@
                                 <DockPanel  HorizontalAlignment="Stretch" Margin="0 50 0 0">
                                     <TextBlock HorizontalAlignment="Left" Margin="0 10 0 0" Text="Thread Type" FontSize="{StaticResource TangoDialogFontSize}" Width="155"/>
                                     <Border Margin="49 0 0 0" BorderThickness="1"  Height="44" CornerRadius="22" BorderBrush="{StaticResource TangoMidAccentBrush}">
-                                        <touch:TouchComboBox Margin="20 0 10 10" ItemsSource="{Binding Rmls}" SelectedItem="{Binding SelectedRML,Mode=TwoWay}" Focusable="False" KeyboardNavigation.TabNavigation ="None">
+                                        <touch:TouchComboBox Margin="20 0 10 10" ItemsSource="{Binding RMLDisplayList}" SelectedItem="{Binding SelectedRML,Mode=TwoWay}" Focusable="False" KeyboardNavigation.TabNavigation ="None">
                                             <touch:TouchComboBox.ItemTemplate>
                                                 <DataTemplate>
                                                     <TextBlock Margin="20 10 10 10" TextTrimming="CharacterEllipsis" FontSize="{StaticResource TangoDialogFontSize}" Text="{Binding FinalName}">
diff --git a/Software/Visual_Studio/PPC/Modules/Tango.PPC.JobsV2/Dialogs/JobCreationViewVM.cs b/Software/Visual_Studio/PPC/Modules/Tango.PPC.JobsV2/Dialogs/JobCreationViewVM.cs
index 037c55f01..a23345e59 100644
--- a/Software/Visual_Studio/PPC/Modules/Tango.PPC.JobsV2/Dialogs/JobCreationViewVM.cs
+++ b/Software/Visual_Studio/PPC/Modules/Tango.PPC.JobsV2/Dialogs/JobCreationViewVM.cs
@@ -1,5 +1,6 @@
 using System;
 using System.Collections.Generic;
+using System.Collections.ObjectModel;
 using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
@@ -20,6 +21,15 @@ namespace Tango.PPC.Jobs.Dialogs
     /// <seealso cref="Tango.SharedUI.DialogViewVM" />
     public class JobCreationViewVM : DialogViewVM
     {
+        public class RMLModel
+        {
+            public String Name {  get; set; }
+
+            public String Guid { get; set; }
+
+            public String FinalName { get; set; }
+        }
+
         private String _jobName;
 
         public String JobName
@@ -31,22 +41,16 @@ namespace Tango.PPC.Jobs.Dialogs
             }
         }
 
-        private List<Rml> _rmls;
+        
         /// <summary>
         /// Gets or sets the available RMLS.
         /// </summary>
-        public List<Rml> Rmls
-        {
-            get { return _rmls; }
-            set { _rmls = value;
-                RaisePropertyChangedAuto(); }
-        }
+        public List<Rml> Rmls {  get; set; }
+        
+        public ObservableCollection<RMLModel> RMLDisplayList { get; set; }
 
-        private Rml _selectedRML;
-        /// <summary>
-        /// Gets or sets the selected RML.
-        /// </summary>
-        public Rml SelectedRML
+        private RMLModel _selectedRML;
+        public RMLModel SelectedRML
         {
             get { return _selectedRML; }
             set {
@@ -150,7 +154,7 @@ namespace Tango.PPC.Jobs.Dialogs
         /// </summary>
         /// <param name="supportedJobTypes">The supported job types.</param>
         /// <param name="supportedColorSpaces">The supported color spaces</param>
-        public JobCreationViewVM(List<SpoolType> spoolTypes, List<Rml> rmls, double whitegap, bool showDuplicate) : base()
+        public JobCreationViewVM(List<SpoolType> spoolTypes, List<Rml> rmls, string selectedRmlGuid, double whitegap, bool showDuplicate) : base()
         {
             JobName = "Unnamed";
             SpoolTypes = spoolTypes;
@@ -159,6 +163,9 @@ namespace Tango.PPC.Jobs.Dialogs
             IsDuplicate = false;
             ShowDuplicate = showDuplicate;
             WhiteGap = whitegap;
+
+            RMLDisplayList = rmls.Select( p  => new RMLModel{ Guid = p.Guid, Name = p.Name, FinalName = p.FinalName }).OrderBy(x => x.FinalName).ToObservableCollection();
+            SelectedRML = String.IsNullOrEmpty(selectedRmlGuid) ? RMLDisplayList.FirstOrDefault() : RMLDisplayList.FirstOrDefault( x=> x.Guid == selectedRmlGuid);
         }
 
         #region Commands
@@ -217,7 +224,11 @@ namespace Tango.PPC.Jobs.Dialogs
             {
                 using (ObservablesContext db = ObservablesContext.CreateDefault())
                 {
-                    BtsrSpoolTension = await SelectedRML.GetRequiredBtsrSpoolTension(db, SelectedSpoolType);
+                    Rml selectedRML = Rmls.FirstOrDefault( x=> x.Guid == SelectedRML.Guid);
+                    if(selectedRML != null)
+                    {
+                        BtsrSpoolTension = await selectedRML.GetRequiredBtsrSpoolTension(db, SelectedSpoolType);
+                    }
                 }
             }
         }
diff --git a/Software/Visual_Studio/PPC/Modules/Tango.PPC.JobsV2/Models/BrushStopModel.cs b/Software/Visual_Studio/PPC/Modules/Tango.PPC.JobsV2/Models/BrushStopModel.cs
index ce4807f5c..39e04cac6 100644
--- a/Software/Visual_Studio/PPC/Modules/Tango.PPC.JobsV2/Models/BrushStopModel.cs
+++ b/Software/Visual_Studio/PPC/Modules/Tango.PPC.JobsV2/Models/BrushStopModel.cs
@@ -704,7 +704,7 @@ namespace Tango.PPC.Jobs.Models
             _stopindex = brushStop.StopIndex;
 
             PreventPropertyUpdate = true;
-            if (version == 1)//loaded from MS
+            if (version < 2)//loaded from MS
             {
                 if (brushStop.ColorSpace.Space == ColorSpaces.CMYK)
                 {
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 6626ee569..5095801af 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
@@ -683,9 +683,8 @@ namespace Tango.PPC.Jobs.ViewModels
             try
             {
                 LogManager.Log("Editing the job details.");
-                JobCreationViewVM vm = new JobCreationViewVM(_spoolTypes.ToList(), _rmls.ToList(), JobModel.InterSegmentLength, true);
+                JobCreationViewVM vm = new JobCreationViewVM(_spoolTypes.ToList(), _rmls, JobModel.Rml.Guid, JobModel.InterSegmentLength, true);
                 vm.JobName = JobModel.Name;
-                vm.SelectedRML = JobModel.Rml;
                 vm.SelectedSpoolType = JobModel.SpoolType;
                 vm = await NotificationProvider.ShowDialog<JobCreationViewVM>(vm);
 
@@ -702,8 +701,11 @@ namespace Tango.PPC.Jobs.ViewModels
                 Job.SpoolType = vm.SelectedSpoolType;
                 JobModel.SpoolType = vm.SelectedSpoolType;//update  length!!!!
                 
-                SelectedRML = vm.SelectedRML;
-
+                if(vm.SelectedRML.Guid != SelectedRML.Guid)
+                {
+                    SelectedRML = _rmls.FirstOrDefault(x=>x.Guid == vm.SelectedRML.Guid);
+                }
+                
                 if (vm.IsDuplicate)
                 {
                     try
diff --git a/Software/Visual_Studio/PPC/Modules/Tango.PPC.JobsV2/ViewModels/JobsViewVM.cs b/Software/Visual_Studio/PPC/Modules/Tango.PPC.JobsV2/ViewModels/JobsViewVM.cs
index da2ae8b0e..b1df2f163 100644
--- a/Software/Visual_Studio/PPC/Modules/Tango.PPC.JobsV2/ViewModels/JobsViewVM.cs
+++ b/Software/Visual_Studio/PPC/Modules/Tango.PPC.JobsV2/ViewModels/JobsViewVM.cs
@@ -422,10 +422,10 @@ namespace Tango.PPC.Jobs.ViewModels
                 {
                     await Task.Delay(200);
                 }
-                JobCreationViewVM vm = new JobCreationViewVM( _spoolTypes.ToList(), _rmls.ToList(), 0, false );
                 var selectedRmlGuid = Settings.DefaultRmlGuid;
+                JobCreationViewVM vm = new JobCreationViewVM( _spoolTypes.ToList(), _rmls.ToList(), selectedRmlGuid, 0, false );
+                
                 var selectedSpoolTypeGuid = Settings.SpoolTypeGuid;
-                vm.SelectedRML =  _rmls.FirstOrDefault(x => x.Guid == Settings.DefaultRmlGuid);
                 vm.SelectedSpoolType = false == String.IsNullOrEmpty(selectedSpoolTypeGuid ) ? _spoolTypes.FirstOrDefault( x=>x.Guid == selectedSpoolTypeGuid) : _spoolTypes.FirstOrDefault(x=>x.Type == SpoolTypes.StandardSpool);
                 if (twnFile == null)
                 {