aboutsummaryrefslogtreecommitdiffstats
path: root/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.RML/ViewModels
diff options
context:
space:
mode:
authorRoy Ben-Shabat <Roy@Twine-s.com>2018-10-07 13:05:29 +0300
committerRoy Ben-Shabat <Roy@Twine-s.com>2018-10-07 13:05:29 +0300
commita2fcd642758c9506188160856a0f9cc0dc48be38 (patch)
tree10ad2cd62dff0d96e70a56e484b54498aaa2d7d9 /Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.RML/ViewModels
parent613be9fa6348139fd00ab8144885356ba36f5595 (diff)
downloadTango-a2fcd642758c9506188160856a0f9cc0dc48be38.tar.gz
Tango-a2fcd642758c9506188160856a0f9cc0dc48be38.zip
Working on RML module.
Diffstat (limited to 'Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.RML/ViewModels')
-rw-r--r--Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.RML/ViewModels/MainViewVM.cs11
1 files changed, 3 insertions, 8 deletions
diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.RML/ViewModels/MainViewVM.cs b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.RML/ViewModels/MainViewVM.cs
index be46e2148..9e8286fa5 100644
--- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.RML/ViewModels/MainViewVM.cs
+++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.RML/ViewModels/MainViewVM.cs
@@ -210,15 +210,12 @@ namespace Tango.MachineStudio.RML.ViewModels
ActiveProcessParametersTableView = CollectionViewSource.GetDefaultView(ActiveProcessParametersGroup.ProcessParametersTables);
ActiveProcessParametersTableView.SortDescriptions.Add(new SortDescription(nameof(ProcessParametersTable.TableIndex), ListSortDirection.Ascending));
- CalibrationDataViewVM = new CalibrationDataViewVM();
+ CalibrationDataViewVM = new CalibrationDataViewVM(_notification);
LiquidTypesRmls = ActiveRML.LiquidTypesRmls;
foreach (var liquidTypeRml in LiquidTypesRmls)
{
- CalibrationDataVM catVM = new CalibrationDataVM();
- catVM.Name = liquidTypeRml.LiquidType.Name;
- catVM.Color = liquidTypeRml.LiquidType.Color;
- catVM.LiquidType = liquidTypeRml.LiquidType;
+ CalibrationDataVM catVM = new CalibrationDataVM(liquidTypeRml.LiquidType);
if (liquidTypeRml.DefaultCatData != null)
{
@@ -359,9 +356,7 @@ namespace Tango.MachineStudio.RML.ViewModels
_active_context.LiquidTypesRmls.Add(liquidFactor);
- CalibrationDataVM catVM = new CalibrationDataVM();
- catVM.Name = liquidFactor.LiquidType.Name;
- catVM.Color = liquidFactor.LiquidType.Color;
+ CalibrationDataVM catVM = new CalibrationDataVM(liquidFactor.LiquidType);
CalibrationDataViewVM.LiquidsCalibrationData.Add(catVM);