aboutsummaryrefslogtreecommitdiffstats
path: root/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/ViewModels/MainViewVM.cs
diff options
context:
space:
mode:
authorRoy Ben-Shabat <Roy@Twine-s.com>2018-10-24 17:07:50 +0300
committerRoy Ben-Shabat <Roy@Twine-s.com>2018-10-24 17:07:50 +0300
commit750df33d864df271c96939d3c12ee246f0e743c1 (patch)
treef334d77becb0d4af03181bf272d2b0d1bca51995 /Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/ViewModels/MainViewVM.cs
parent1e24679bf65e42e5df96113bd1eef371036f0940 (diff)
downloadTango-750df33d864df271c96939d3c12ee246f0e743c1.tar.gz
Tango-750df33d864df271c96939d3c12ee246f0e743c1.zip
Fixed issue with rml selection (no color conversion message..) and brush stops liquid volume not invalidating.
Diffstat (limited to 'Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/ViewModels/MainViewVM.cs')
-rw-r--r--Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/ViewModels/MainViewVM.cs12
1 files changed, 8 insertions, 4 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 efdb8982d..f55ece6a1 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
@@ -1040,7 +1040,11 @@ namespace Tango.MachineStudio.Developer.ViewModels
SelectedProcessParametersTable.DyeingSpeedMinInkUptakeChanged -= SelectedProcessParametersTable_DyeingSpeedMinInkUptakeChanged;
SelectedProcessParametersTable.DyeingSpeedMinInkUptakeChanged += SelectedProcessParametersTable_DyeingSpeedMinInkUptakeChanged;
- SetSegmentBrushStopsLiquidVolumes(SelectedSegment);
+ foreach (var segment in ActiveJob.Segments)
+ {
+ SetSegmentBrushStopsLiquidVolumes(segment);
+ }
+
UpdateEstimatedDuration();
}
}
@@ -1414,9 +1418,9 @@ namespace Tango.MachineStudio.Developer.ViewModels
await SelectedRML.SaveAsync(_activeJobDbContext);
LiquidTypesRmls = ActiveJob.Machine.Configuration.NoneEmptyIdsPacks.Where(x => !x.IsEmpty).OrderBy(x => x.PackIndex).Select(x => x.LiquidType).SelectMany(x => x.LiquidTypesRmls).Where(x => x.Rml.Guid == SelectedRML.Guid).ToList();
- if (SelectedSegment != null)
+ foreach (var segment in ActiveJob.Segments)
{
- SetSegmentBrushStopsLiquidVolumes(SelectedSegment);
+ SetSegmentBrushStopsLiquidVolumes(segment);
}
}
@@ -1443,7 +1447,7 @@ namespace Tango.MachineStudio.Developer.ViewModels
_selectedRML = new RmlBuilder(_activeJobDbContext).Set(SelectedRML).WithAllParametersGroup().WithCAT(SelectedMachine.Guid).WithCCT().WithLiquidFactors().WithMediaProperties().Build();
- if (_selectedRML.Cats.Count == 0)
+ if (_selectedRML.Ccts.Count == 0)
{
InvokeUI(() =>
{