From 9c858b7b51be2eb5b2f515912d436224d7e6483c Mon Sep 17 00:00:00 2001
From: Roy Ben Shabat <roy.mail.net@gmail.com>
Date: Mon, 29 Sep 2025 05:46:38 +0300
Subject: Process Parameters Visual Representation. Filter RML by machine type
 on Research module.

---
 .../ViewModels/MainViewVM.cs                       |  3 +-
 .../Views/JobView.xaml                             | 49 +++++++++++++++++++---
 2 files changed, 45 insertions(+), 7 deletions(-)

(limited to 'Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer')

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 d262e154e..ab74433a6 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
@@ -1902,7 +1902,8 @@ namespace Tango.MachineStudio.Developer.ViewModels
                             //var processParams = _activeJobDbContext.ProcessParametersTables.ToList();
 
                             ColorSpaces = _activeJobDbContext.ColorSpaces.ToObservableCollection();
-                            Rmls = _activeJobDbContext.Rmls.OrderBy(i => i.Name).ToObservableCollection();
+
+                            Rmls = _activeJobDbContext.Rmls.Where(x => x.MachineType == SelectedMachine.MachineType || x.MachineType == null).ToList().OrderBy(i => i.FinalName).ToObservableCollection();
                             WindingMethods = _activeJobDbContext.WindingMethods.ToObservableCollection();
                             SpoolTypes = _activeJobDbContext.SpoolTypes.ToObservableCollection();
 
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 a1cda2249..45c2d54cb 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
@@ -78,6 +78,7 @@
         <localConverters:LiquidVolumesToLubricantLiquidVolume x:Key="LiquidVolumesToLubricantLiquidVolume" />
         <commonConverters:UserRoleToVisibilityConverter x:Key="UserRoleToVisibilityConverter" />
         <commonConverters:UserRoleToBooleanConverter x:Key="UserRoleToBooleanConverter" />
+        <commonConverters:ProcessParameterToVisibilityConverter x:Key="ProcessParameterToVisibilityConverter"></commonConverters:ProcessParameterToVisibilityConverter>
 
 
         <ObjectDataProvider x:Key="dispenserDivisions" MethodName="GetValues" ObjectType="{x:Type sys:Enum}">
@@ -757,7 +758,7 @@
                                                                 <StackPanel>
                                                                     <TextBlock>MEDIA</TextBlock>
                                                                     <StackPanel Orientation="Horizontal" DockPanel.Dock="Left">
-                                                                        <controls:SearchComboBox Width="250"  ItemsSource="{Binding Rmls}" SelectedItem="{Binding SelectedRML}"  HorizontalContentAlignment="Stretch" SearchProperty="Name">
+                                                                        <controls:SearchComboBox Width="250"  ItemsSource="{Binding Rmls}" SelectedItem="{Binding SelectedRML}"  HorizontalContentAlignment="Stretch" SearchProperty="FinalName">
                                                                             <ComboBox.ItemTemplate>
                                                                                 <DataTemplate>
                                                                                     <DockPanel>
@@ -838,7 +839,7 @@
                                                                             </Viewbox>
                                                                             <TextBlock Margin="5 0 0 0" FontSize="10">Use Preferred Index</TextBlock>
                                                                         </StackPanel>
-                                                                        <Button  Command="{Binding SaveLiquidFactorsCommand}" HorizontalAlignment="Right" Style="{StaticResource MaterialDesignFlatButton}" IsEnabled="{Binding AuthenticationProvider.CurrentUser,Converter={StaticResource UserRoleToBooleanConverter},ConverterParameter='Researcher'}">
+                                                                        <Button Visibility="Collapsed"  Command="{Binding SaveLiquidFactorsCommand}" HorizontalAlignment="Right" Style="{StaticResource MaterialDesignFlatButton}" IsEnabled="{Binding AuthenticationProvider.CurrentUser,Converter={StaticResource UserRoleToBooleanConverter},ConverterParameter='Researcher'}">
                                                                             <StackPanel Orientation="Horizontal">
                                                                                 <materialDesign:PackIcon VerticalAlignment="Center" Kind="Harddisk"></materialDesign:PackIcon>
                                                                                 <TextBlock Margin="10 0 0 0" Foreground="{StaticResource CheckmarkFill}">SAVE FACTORS</TextBlock>
@@ -1460,7 +1461,7 @@
                                                                                                             <Style TargetType="Border">
                                                                                                                 <Setter Property="BorderBrush" Value="{StaticResource BorderBrushGainsboro}"></Setter>
                                                                                                                 <Setter Property="BorderThickness" Value="1"></Setter>
-                                                                                                                <Setter Property="Padding" Value="2"></Setter>
+                                                                                                                <Setter Property="Padding" Value="2 2 0 2"></Setter>
                                                                                                                 <Setter Property="Margin" Value="4"></Setter>
                                                                                                                 <Setter Property="CornerRadius" Value="3"></Setter>
                                                                                                             </Style>
@@ -1474,10 +1475,46 @@
                                                                                         </Setter.Value>
                                                                                     </Setter>
                                                                                 </Style>
+                                                                            </WrapPanel.Resources>
 
+                                                                            <ItemsControl ItemsSource="{Binding ParametersGroups}">
+                                                                                <ItemsControl.ItemTemplate>
+                                                                                    <DataTemplate>
+                                                                                        <StackPanel>
+                                                                                            <TextBlock Margin="0 10 0 0" Text="{Binding Name}" FontWeight="SemiBold" FontSize="10" Foreground="{StaticResource AccentColorBrush}"></TextBlock>
+                                                                                            <ItemsControl ItemsSource="{Binding Parameters}">
+                                                                                                <ItemsControl.ItemsPanel>
+                                                                                                    <ItemsPanelTemplate>
+                                                                                                        <WrapPanel IsItemsHost="True" Orientation="Horizontal" />
+                                                                                                    </ItemsPanelTemplate>
+                                                                                                </ItemsControl.ItemsPanel>
+                                                                                                <ItemsControl.ItemTemplate>
+                                                                                                    <DataTemplate>
+                                                                                                        <DockPanel>
+                                                                                                            <Grid Background="Transparent">
+                                                                                                                <Grid.Visibility>
+                                                                                                                    <MultiBinding Converter="{StaticResource ProcessParameterToVisibilityConverter}">
+                                                                                                                        <Binding RelativeSource="{RelativeSource AncestorType=UserControl}" Path="DataContext.SelectedRML.ForMachineType" />
+                                                                                                                        <Binding Path="MachineTypes" />
+                                                                                                                    </MultiBinding>
+                                                                                                                </Grid.Visibility>
+                                                                                                                <ContentControl>
+                                                                                                                    <DockPanel>
+                                                                                                                        <TextBlock DockPanel.Dock="Top" ToolTip="{Binding Name}" IsHitTestVisible="False" Margin="0 5 0 5" Text="{Binding Name}" FontSize="11" Foreground="{StaticResource MainWindow.Foreground}" TextWrapping="Wrap" TextAlignment="Center"></TextBlock>
+                                                                                                                        <mahapps:NumericUpDown VerticalAlignment="Bottom" FontSize="20" Minimum="0" Margin="0 0 5 0" HideUpDownButtons="True" HorizontalContentAlignment="Center" Maximum="10000" StringFormat="{Binding StringFormat}" InterceptArrowKeys="True" Background="Transparent" BorderThickness="0" InterceptMouseWheel="True" HasDecimals="True" Value="{Binding Value,Mode=TwoWay}" Foreground="{StaticResource MainWindow.Foreground}"></mahapps:NumericUpDown>
+                                                                                                                    </DockPanel>
+                                                                                                                </ContentControl>
+                                                                                                            </Grid>
+                                                                                                        </DockPanel>
+                                                                                                    </DataTemplate>
+                                                                                                </ItemsControl.ItemTemplate>
+                                                                                            </ItemsControl>
+                                                                                        </StackPanel>
+                                                                                    </DataTemplate>
+                                                                                </ItemsControl.ItemTemplate>
+                                                                            </ItemsControl>
 
-                                                                            </WrapPanel.Resources>
-                                                                            <editors:ParameterizedEditor ParameterizedObject="{Binding}">
+                                                                            <!--<editors:ParameterizedEditor ParameterizedObject="{Binding}">
                                                                                 <editors:ParameterizedEditor.ItemsPanel>
                                                                                     <ItemsPanelTemplate>
                                                                                         <WrapPanel IsItemsHost="True" Orientation="Horizontal" />
@@ -1495,7 +1532,7 @@
                                                                                         </Grid>
                                                                                     </DataTemplate>
                                                                                 </editors:ParameterizedEditor.DoubleTemplate>
-                                                                            </editors:ParameterizedEditor>
+                                                                            </editors:ParameterizedEditor>-->
                                                                         </WrapPanel>
                                                                     </DockPanel>
 
-- 
cgit v1.3.1