diff options
| author | Victoria Plitt <Victoria.Plitt@twine-s.com> | 2021-11-17 14:48:25 +0200 |
|---|---|---|
| committer | Victoria Plitt <Victoria.Plitt@twine-s.com> | 2021-11-17 14:48:25 +0200 |
| commit | 854f883509443230cc0360ea45c7d8085dd52882 (patch) | |
| tree | 800752e61652c23a668a6b2f6b7b50548db3f74e /Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.ThreadExtensions/ViewModels/MainViewVM.cs | |
| parent | eaedfecb6b08008649bb79a9767adbe6132da536 (diff) | |
| download | Tango-854f883509443230cc0360ea45c7d8085dd52882.tar.gz Tango-854f883509443230cc0360ea45c7d8085dd52882.zip | |
RML EXTANSION- item 5745, 5909, 5823. DataBase changes:
table Rubbing results , remove GS 100 min and GS 100 max and add GS 100, remove GS 200 min and GS 200 max and add GS 200. Created new table COLOR_PROCESS_INK_UPTAKE
Diffstat (limited to 'Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.ThreadExtensions/ViewModels/MainViewVM.cs')
| -rw-r--r-- | Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.ThreadExtensions/ViewModels/MainViewVM.cs | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.ThreadExtensions/ViewModels/MainViewVM.cs b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.ThreadExtensions/ViewModels/MainViewVM.cs index fc07a5903..12ae1aa89 100644 --- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.ThreadExtensions/ViewModels/MainViewVM.cs +++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.ThreadExtensions/ViewModels/MainViewVM.cs @@ -794,10 +794,10 @@ namespace Tango.MachineStudio.ThreadExtensions.ViewModels AddManufacturerItemCommand = new RelayCommand(AddManufacturerItem); - EditManufacturerItemCommand = new RelayCommand(EditManufacturerItem, () => ActiveRML.Manufacturer != ""); + EditManufacturerItemCommand = new RelayCommand(EditManufacturerItem, () => ActiveRML !=null && ActiveRML.Manufacturer != ""); AddBrandItemCommand = new RelayCommand(AddBrandItem); - EditBrandItemCommand = new RelayCommand(EditBrandItem, () => ActiveRMLExtension.YarnBrand != null); + EditBrandItemCommand = new RelayCommand(EditBrandItem, () => ActiveRMLExtension != null && ActiveRMLExtension.YarnBrand != null); AddEndUseItemCommand = new RelayCommand(AddEndUseItem); EditEndUseItemCommand = new RelayCommand(EditEndUseItem); |