diff options
Diffstat (limited to 'Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.RML')
2 files changed, 32 insertions, 31 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 c0318e17b..1da3723d1 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 @@ -498,21 +498,21 @@ namespace Tango.MachineStudio.RML.ViewModels CCTS.Where(x => String.IsNullOrWhiteSpace(x.FileName)).ToList().ForEach(x => x.FileName = x.Guid); - GBDS = _active_context.Gbds - .Select(x => new DataFileModel() - { - Guid = x.Guid, - FileName = x.FileName, + //GBDS = _active_context.Gbds + // .Select(x => new DataFileModel() + // { + // Guid = x.Guid, + // FileName = x.FileName, - }).ToObservableCollection(); + // }).ToObservableCollection(); - LUBS = _active_context.Lubs - .Select(x => new DataFileModel() - { - Guid = x.Guid, - FileName = x.FileName, + //LUBS = _active_context.Lubs + // .Select(x => new DataFileModel() + // { + // Guid = x.Guid, + // FileName = x.FileName, - }).ToObservableCollection(); + // }).ToObservableCollection(); LoadRmlProperties(); @@ -603,25 +603,25 @@ namespace Tango.MachineStudio.RML.ViewModels RaisePropertyChanged(nameof(SelectedCCT)); } - if (ActiveRML.Gbd != null) - { - _selectedGBD = GBDS.SingleOrDefault(x => x.Guid == ActiveRML.Gbd.Guid); - await OnSelectedGBDChanged(); - RaisePropertyChanged(nameof(SelectedGBD)); - } + //if (ActiveRML.Gbd != null) + //{ + // _selectedGBD = GBDS.SingleOrDefault(x => x.Guid == ActiveRML.Gbd.Guid); + // await OnSelectedGBDChanged(); + // RaisePropertyChanged(nameof(SelectedGBD)); + //} - if (ActiveRML.Lub != null) - { - _selectedLUB = LUBS.SingleOrDefault(x => x.Guid == ActiveRML.Lub.Guid); - await OnSelectedLUBChanged(); - RaisePropertyChanged(nameof(SelectedLUB)); - } + //if (ActiveRML.Lub != null) + //{ + // _selectedLUB = LUBS.SingleOrDefault(x => x.Guid == ActiveRML.Lub.Guid); + // await OnSelectedLUBChanged(); + // RaisePropertyChanged(nameof(SelectedLUB)); + //} - ColorCalibrationVM = new ColorCalibrationViewVM(_notification) - { - RML = ActiveRML, - LiquidTypes = LiquidTypesRmls.Where(x => x.LiquidType.HasPigment).ToList().Select(y => y.LiquidType).ToList(), - }; + //ColorCalibrationVM = new ColorCalibrationViewVM(_notification) + //{ + // RML = ActiveRML, + // LiquidTypes = LiquidTypesRmls.Where(x => x.LiquidType.HasPigment).ToList().Select(y => y.LiquidType).ToList(), + //}; _rmlBeforeSave = RmlDTO.FromObservable(ActiveRML); @@ -1019,6 +1019,7 @@ namespace Tango.MachineStudio.RML.ViewModels { LiquidType = vm.SelectedLiquidType, Rml = ActiveRML, + MaxNlPerCm = ActiveRML.DefaultLiquidFactor, }; _active_context.LiquidTypesRmls.Add(liquidFactor); diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.RML/Views/RmlView.xaml b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.RML/Views/RmlView.xaml index acd83cee2..7f6ebcbb6 100644 --- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.RML/Views/RmlView.xaml +++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.RML/Views/RmlView.xaml @@ -319,9 +319,9 @@ <TabItem Header="BTSR" Margin="-100 0 0 0" mahapps:ControlsHelper.HeaderFontSize="20"> <local:BTSRView HorizontalContentAlignment="Stretch" VerticalContentAlignment="Stretch"/> </TabItem> - <TabItem Header="COLOR CALIBRATION" Margin="-100 0 0 0" mahapps:ControlsHelper.HeaderFontSize="20"> + <!--<TabItem Header="COLOR CALIBRATION" Margin="-100 0 0 0" mahapps:ControlsHelper.HeaderFontSize="20"> <local:ColorCalibrationView DataContext="{Binding ColorCalibrationVM}" HorizontalContentAlignment="Stretch" VerticalContentAlignment="Stretch"/> - </TabItem> + </TabItem>--> </TabControl> </Grid> <Grid Grid.Row="1"> |