Merge branch 'master' of https://twinetfs.visualstudio.com/_git/Tango

1 files changed, 5 insertions, 8 deletions

diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/ViewModels/MainViewVM.cs b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/ViewModels/MainViewVM.cs
index 4cc41e5a7..fc0680d9c 100644
--- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/ViewModels/MainViewVM.cs
+++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/ViewModels/MainViewVM.cs
@@ -91,7 +91,6 @@ namespace Tango.MachineStudio.Developer.ViewModels
         private JobDTO _beforeSaveJobDTO;
         private IActionLogManager _actionLogManager;
         private RmlDTO _selectedRMLBeforeLiquidFactorsSaves;
-        private List<Cct> _cctCache;
 
         #region Properties
 
@@ -758,8 +757,6 @@ namespace Tango.MachineStudio.Developer.ViewModels
         {
             _converter = new DefaultColorConverter();
 
-            _cctCache = new List<Cct>();
-
             CanWork = true;
             EnableColorConversion = true;
 
@@ -1625,7 +1622,7 @@ namespace Tango.MachineStudio.Developer.ViewModels
             {
                 LogManager.Log("Invalidating liquid factors, process parameters and process group history...");
 
-                _selectedRML = new RmlBuilder(_activeJobDbContext).Set(SelectedRML).WithAllParametersGroup().WithCAT(SelectedMachine.Guid).WithCctCache(_cctCache).WithCCT().WithLiquidFactors().WithSpools().Build();
+                _selectedRML = new RmlBuilder(_activeJobDbContext).Set(SelectedRML.Guid).WithAllParametersGroup().WithCAT(SelectedMachine.Guid).WithCCT().WithLiquidFactors().WithSpools().Build();
 
                 _selectedRMLBeforeLiquidFactorsSaves = RmlDTO.FromObservable(_selectedRML);
 
@@ -1682,7 +1679,7 @@ namespace Tango.MachineStudio.Developer.ViewModels
                             InvalidateLiquidFactorsAndProcessTables();
                         }
                         catch
-                        { }
+                        {}
                         finally
                         {
                             IsFree = true;
@@ -1870,7 +1867,7 @@ namespace Tango.MachineStudio.Developer.ViewModels
                             _activeJobDbContext.Spools.Where(x => x.MachineGuid == SelectedMachine.Guid).Load();
 
                             LogManager.Log("Setting active job...");
-                            ActiveJob = new JobBuilder(_activeJobDbContext).Set(SelectedMachineJob.Guid).WithUser().WithSegments().WithBrushStops().WithConfiguration().WithRML(_cctCache).Build();
+                            ActiveJob = new JobBuilder(_activeJobDbContext).Set(SelectedMachineJob.Guid).WithUser().WithSegments().WithBrushStops().WithConfiguration().WithRML().Build();
 
                             //_activeJobDbContext.Ccts.Where(x => x.RmlGuid == ActiveJob.RmlGuid).ToList();
                             //_activeJobDbContext.Cats.Where(x => x.RmlGuid == ActiveJob.RmlGuid).ToList();
@@ -2335,7 +2332,7 @@ namespace Tango.MachineStudio.Developer.ViewModels
                         }
                         SelectedSegment.BrushStops.Remove(x);
                         var existingBrushStop = _activeJobDbContext.BrushStops.FirstOrDefault(y => y.Guid == x.Guid);
-                        if (existingBrushStop != null)
+                        if(existingBrushStop != null)
                         {
                             _activeJobDbContext.BrushStops.Remove(existingBrushStop);
                         }
@@ -2375,7 +2372,7 @@ namespace Tango.MachineStudio.Developer.ViewModels
                 stop.SetAllDispensingStepDivisions(BL.Dispensing.DispenserStepDivisions.D8);
                 stop.SetLiquidVolumes(SelectedMachine.Configuration, SelectedRML, SelectedProcessParametersTable);
                 SelectedSegment.BrushStops.Add(stop);
-                // _activeJobDbContext.BrushStops.Add(stop);
+               // _activeJobDbContext.BrushStops.Add(stop);
                 SelectedSegment.BrushStops.ToList().ForEach(x => x.RaiseOffsetChanged());
                 ArrangeBrushStopsIndices();
             }