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

1 files changed, 40 insertions, 2 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 e04b1539a..6c3e31325 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
@@ -657,6 +657,12 @@ namespace Tango.MachineStudio.Developer.ViewModels
         /// Gets or sets to running job command.
         /// </summary>
         public RelayCommand ToRunningJobCommand { get; set; }
+
+        /// <summary>
+        /// Gets or sets the reset process parameters command.
+        /// </summary>
+        public RelayCommand ResetProcessParametersCommand { get; set; }
+
         #endregion
 
         #region Constructors
@@ -713,6 +719,7 @@ namespace Tango.MachineStudio.Developer.ViewModels
             ImportEmbroideryFileCommand = new RelayCommand(ImportEmbroideryFile, () => SelectedMachine != null && CanWork);
             DisplayJobEmbroideryFileCommand = new RelayCommand<Job>(DisplayJobEmbroideryFile, () => CanWork);
             ReloadMachinesCommand = new RelayCommand(() => LoadMachine(), () => CanWork && SelectedMachine != null);
+            ResetProcessParametersCommand = new RelayCommand(ResetProcessParameters);
 
             ApplicationManager.ConnectedMachineChanged += ApplicationManager_ConnectedMachineChanged;
 
@@ -1491,6 +1498,29 @@ namespace Tango.MachineStudio.Developer.ViewModels
             CanWork = true;
         }
 
+        /// <summary>
+        /// Resets the process parameters.
+        /// </summary>
+        private async void ResetProcessParameters()
+        {
+            if (_notification.ShowQuestion("This will reset the process parameters. Are you sure?"))
+            {
+                using (_notification.PushTaskItem("Resetting process parameters..."))
+                {
+                    try
+                    {
+                        await ApplicationManager.ConnectedMachine.UploadProcessParameters(new ProcessParametersTable());
+                        _notification.ShowInfo("Heaters are turned off.");
+                    }
+                    catch (Exception ex)
+                    {
+                        LogManager.Log(ex, "Error resetting process parameters.");
+                        _notification.ShowError("Error resetting process parameters." + Environment.NewLine + ex.Message);
+                    }
+                }
+            }
+        }
+
         #endregion
 
         #region Active Job Management
@@ -1575,6 +1605,11 @@ namespace Tango.MachineStudio.Developer.ViewModels
                     SegmentsCollectionView = CollectionViewSource.GetDefaultView(ActiveJob.Segments);
                     SegmentsCollectionView.SortDescriptions.Add(new SortDescription(nameof(Segment.SegmentIndex), ListSortDirection.Ascending));
 
+                    foreach (var segment in ActiveJob.Segments)
+                    {
+                        SetSegmentBrushStopsLiquidVolumes(segment);
+                    }
+
                     SelectedSegment = _selectedSegment;
 
                     UIHelper.DoEvents();
@@ -1810,7 +1845,7 @@ namespace Tango.MachineStudio.Developer.ViewModels
                 LogManager.LogFormat("Adding new segment to job {0}...", ActiveJob.Name);
                 Segment seg = new Segment();
                 seg.Job = ActiveJob;
-                seg.Name = "Untitled Segment";
+                seg.Name = "SEGMENT";
                 seg.Length = 10;
 
                 if (ActiveJob.Segments.Count > 0)
@@ -1878,7 +1913,9 @@ namespace Tango.MachineStudio.Developer.ViewModels
                     newJob.Machine = SelectedMachine;
 
                     SelectedMachine.Jobs.Add(newJob);
-                    newJob.AddSolidSegment();
+                    var segment = newJob.AddSolidSegment();
+                    segment.BrushStops[0].SetAllDispensingStepDivisions(BL.Dispensing.DispenserStepDivisions.D8);
+
                     LogManager.Log("Saving selected machine to database...");
                     await SelectedMachine.SaveAsync(_machineDbContext);
                     SelectedMachineJob = newJob;
@@ -1933,6 +1970,7 @@ namespace Tango.MachineStudio.Developer.ViewModels
                 stop.Segment = SelectedSegment;
                 stop.ColorSpace = ColorSpaces.FirstOrDefault();
                 stop.Color = Colors.Black;
+                stop.SetAllDispensingStepDivisions(BL.Dispensing.DispenserStepDivisions.D8);
                 stop.SetLiquidVolumes(SelectedMachine.Configuration, SelectedRML, SelectedProcessParametersTable);
                 SelectedSegment.BrushStops.Add(stop);
                 SelectedSegment.BrushStops.ToList().ForEach(x => x.RaiseOffsetChanged());