From d7080c93350b96e49d80450d5e1a76fd6f3ad64e Mon Sep 17 00:00:00 2001
From: Roy Ben Shabat <roy.mail.net@gmail.com>
Date: Tue, 9 Sep 2025 11:37:36 +0300
Subject: New Extra Inks and Default LiquidTypesRml * DefaultFactor Handling.

---
 .../Views/JobView.xaml                             |  2 +-
 .../ViewModels/MainViewVM.cs                       | 63 +++++++++++-----------
 .../Tango.MachineStudio.RML/Views/RmlView.xaml     |  4 +-
 3 files changed, 35 insertions(+), 34 deletions(-)

(limited to 'Software/Visual_Studio/MachineStudio/Modules')

diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/Views/JobView.xaml b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/Views/JobView.xaml
index 5d9325145..a1cda2249 100644
--- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/Views/JobView.xaml
+++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/Views/JobView.xaml
@@ -795,7 +795,7 @@
 
                                                         <StackPanel Orientation="Horizontal" VerticalAlignment="Center" HorizontalAlignment="Center" Margin="60 25 350 0" Visibility="{Binding IsSideBarOpened,Converter={StaticResource BooleanToVisibilityInverseConverter}}">
                                                             <materialDesign:PackIcon Kind="ChevronLeft" Width="24" Height="24" />
-                                                            <TextBlock  Margin="0 -2 0 0" VerticalAlignment="Center"><Run>MEDIA LIQUIDS</Run> <Run FontSize="10"  Foreground="{StaticResource DimGrayBrush}">( Max Nanolitter/CM )</Run></TextBlock>
+                                                            <TextBlock  Margin="0 -2 0 0" VerticalAlignment="Center"><Run>MEDIA LIQUIDS</Run> <Run FontSize="10"  Foreground="{StaticResource DimGrayBrush}">( Max Nanolitter/CM )</Run> | <Run Text="{Binding SelectedRML.DefaultLiquidFactor}"></Run> nl</TextBlock>
                                                             <materialDesign:PackIcon Kind="ChevronRight" Width="24" Height="24" />
                                                         </StackPanel>
 
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.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(),
-                    };
+                    //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));
+                    //}
+
+                    //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">
-- 
cgit v1.3.1