From 37d47dd053e02118c5b314a3ec5e8f1f2b0fc8e6 Mon Sep 17 00:00:00 2001
From: Roy Ben Shabat <Roy.mail.net@gmail.com>
Date: Sun, 22 Mar 2020 18:34:00 +0200
Subject: Added new head cleaning parameters support. Added build up pressure
 to process parameters.

---
 .../Tango.MachineStudio.RML.csproj                 |  7 +++
 .../Views/HeadCleaningParametersView.xaml          | 56 ++++++++++++++++++++++
 .../Views/HeadCleaningParametersView.xaml.cs       | 28 +++++++++++
 .../Tango.MachineStudio.RML/Views/RmlView.xaml     | 19 ++++++--
 .../Views/ThreadParametersView.xaml                | 31 ++++++++++--
 5 files changed, 132 insertions(+), 9 deletions(-)
 create mode 100644 Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.RML/Views/HeadCleaningParametersView.xaml
 create mode 100644 Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.RML/Views/HeadCleaningParametersView.xaml.cs

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

diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.RML/Tango.MachineStudio.RML.csproj b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.RML/Tango.MachineStudio.RML.csproj
index f448932a0..a413223c3 100644
--- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.RML/Tango.MachineStudio.RML.csproj
+++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.RML/Tango.MachineStudio.RML.csproj
@@ -118,6 +118,9 @@
     <Compile Include="Views\RmlView.xaml.cs">
       <DependentUpon>RmlView.xaml</DependentUpon>
     </Compile>
+    <Compile Include="Views\HeadCleaningParametersView.xaml.cs">
+      <DependentUpon>HeadCleaningParametersView.xaml</DependentUpon>
+    </Compile>
     <Compile Include="Views\ThreadParametersView.xaml.cs">
       <DependentUpon>ThreadParametersView.xaml</DependentUpon>
     </Compile>
@@ -229,6 +232,10 @@
       <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>
     </Page>
+    <Page Include="Views\HeadCleaningParametersView.xaml">
+      <Generator>MSBuild:Compile</Generator>
+      <SubType>Designer</SubType>
+    </Page>
     <Page Include="Views\ThreadParametersView.xaml">
       <Generator>MSBuild:Compile</Generator>
       <SubType>Designer</SubType>
diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.RML/Views/HeadCleaningParametersView.xaml b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.RML/Views/HeadCleaningParametersView.xaml
new file mode 100644
index 000000000..72e377c34
--- /dev/null
+++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.RML/Views/HeadCleaningParametersView.xaml
@@ -0,0 +1,56 @@
+<UserControl x:Class="Tango.MachineStudio.RML.Views.HeadCleaningParametersView"
+             xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+             xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" 
+             xmlns:d="http://schemas.microsoft.com/expression/blend/2008" 
+             xmlns:vm="clr-namespace:Tango.MachineStudio.RML.ViewModels"
+             xmlns:global="clr-namespace:Tango.MachineStudio.RML"
+              xmlns:mahapps="http://metro.mahapps.com/winfx/xaml/controls"
+             xmlns:controls="clr-namespace:Tango.SharedUI.Controls;assembly=Tango.SharedUI"
+             xmlns:materialDesign="http://materialdesigninxaml.net/winfx/xaml/themes"
+             xmlns:local="clr-namespace:Tango.MachineStudio.RML.Views"
+             xmlns:converters="clr-namespace:Tango.SharedUI.Converters;assembly=Tango.SharedUI"
+             mc:Ignorable="d" 
+             d:DesignHeight="720" d:DesignWidth="1280" Background="Transparent" d:DataContext="{d:DesignInstance Type=vm:MainViewVM, IsDesignTimeCreatable=False}" DataContext="{x:Static global:ViewModelLocator.MainViewVM}">
+
+    <UserControl.Resources>
+        <converters:EmptyStringToNullConverter x:Key="EmptyStringToNullConverter" />
+    </UserControl.Resources>
+
+    <Grid>
+        <DockPanel>
+            <Border DockPanel.Dock="Top" Background="{StaticResource TransparentBackgroundBrush200}" Margin="20 0" Padding="5" CornerRadius="5">
+                <Border.Effect>
+                    <DropShadowEffect Opacity="0.4" />
+                </Border.Effect>
+                <Grid>
+                    <TextBlock  VerticalAlignment="Center" HorizontalAlignment="Left" Margin="20 0 0 0" FontSize="16" Padding="2">HEAD CLEANING PARAMETERS</TextBlock>
+                </Grid>
+            </Border>
+
+            <Grid>
+                <StackPanel Orientation="Horizontal">
+                    <DockPanel Grid.Column="1" Margin="25" HorizontalAlignment="Left" Width="400">
+                        <materialDesign:Card>
+                            <StackPanel>
+                                <DockPanel>
+                                    <TextBlock DockPanel.Dock="Top" Margin="20 10 0 10" FontSize="16">CLEANER</TextBlock>
+                                    <controls:TableGrid RowHeight="25" Margin="20 0" MakeFirstColumnVerticalAlignmentBottom="False">
+                                        <controls:TableGrid.Resources>
+                                            <Style TargetType="TextBlock">
+                                                <Setter Property="VerticalAlignment" Value="Center"></Setter>
+                                                <Setter Property="Margin" Value="0 3 0 0"></Setter>
+                                            </Style>
+                                        </controls:TableGrid.Resources>
+                                        <TextBlock Text="Cleaner Flow:" VerticalAlignment="Center"></TextBlock>
+                                        <mahapps:NumericUpDown Value="{Binding ActiveRML.CleanerFlow,Mode=TwoWay}" Minimum="0" Maximum="10000" InterceptArrowKeys="True" Background="Transparent" BorderThickness="0" InterceptMouseWheel="True" HasDecimals="False" HorizontalContentAlignment="Left"></mahapps:NumericUpDown>
+                                    </controls:TableGrid>
+                                </DockPanel>
+                            </StackPanel>
+                        </materialDesign:Card>
+                    </DockPanel>
+                </StackPanel>
+            </Grid>
+        </DockPanel>
+    </Grid>
+</UserControl>
diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.RML/Views/HeadCleaningParametersView.xaml.cs b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.RML/Views/HeadCleaningParametersView.xaml.cs
new file mode 100644
index 000000000..8d036efa5
--- /dev/null
+++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.RML/Views/HeadCleaningParametersView.xaml.cs
@@ -0,0 +1,28 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using System.Windows;
+using System.Windows.Controls;
+using System.Windows.Data;
+using System.Windows.Documents;
+using System.Windows.Input;
+using System.Windows.Media;
+using System.Windows.Media.Imaging;
+using System.Windows.Navigation;
+using System.Windows.Shapes;
+
+namespace Tango.MachineStudio.RML.Views
+{
+    /// <summary>
+    /// Interaction logic for SpoolsView.xaml
+    /// </summary>
+    public partial class HeadCleaningParametersView : UserControl
+    {
+        public HeadCleaningParametersView()
+        {
+            InitializeComponent();
+        }
+    }
+}
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 e967c7d83..f425f2003 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
@@ -56,7 +56,13 @@
                         <Grid>
                             <DockPanel>
                                 <TextBlock DockPanel.Dock="Top" Margin="20 10 0 10" FontSize="16">PROPERTIES</TextBlock>
-                                <controls:TableGrid RowHeight="35" Margin="20 0">
+                                <controls:TableGrid RowHeight="35" Margin="20 0" MakeFirstColumnVerticalAlignmentBottom="False">
+                                    <controls:TableGrid.Resources>
+                                        <Style TargetType="TextBlock">
+                                            <Setter Property="VerticalAlignment" Value="Center"></Setter>
+                                            <Setter Property="Margin" Value="0 3 0 0"></Setter>
+                                        </Style>
+                                    </controls:TableGrid.Resources>
                                     <TextBlock Text="Name:" ></TextBlock>
                                     <TextBox Text="{Binding ActiveRML.Name,UpdateSourceTrigger=PropertyChanged}"></TextBox>
 
@@ -149,13 +155,16 @@
                                     <Setter Property="Padding" Value="20,2"></Setter>
                                 </Style>
                             </TabControl.Resources>
-                            <TabItem Header="PROCESS PARAMETERS" Margin="-100 0 0 0">
+                            <TabItem Header="PROCESS PARAMETERS" Margin="-100 0 0 0" mahapps:ControlsHelper.HeaderFontSize="20">
                                 <local:ProcessParametersView x:Name="processParametersView" WidthLilquidFactors="{Binding ElementName=calibrationDataView,Path=ActualWidth}"/>
                             </TabItem>
-                            <TabItem Header="THREAD PARAMETERS" Margin="-100 0 0 0">
+                            <TabItem Header="THREAD PARAMETERS" Margin="-100 0 0 0" mahapps:ControlsHelper.HeaderFontSize="20">
                                 <local:ThreadParametersView/>
                             </TabItem>
-                            <TabItem Header="COLOR CONVERSION" Margin="-100 0 0 0 ">
+                            <TabItem Header="HEAD CLEANING" Margin="-100 0 0 0" mahapps:ControlsHelper.HeaderFontSize="20">
+                                <local:HeadCleaningParametersView/>
+                            </TabItem>
+                            <TabItem Header="COLOR CONVERSION" Margin="-100 0 0 0 " mahapps:ControlsHelper.HeaderFontSize="20">
                                 <Grid>
                                     <Grid.ColumnDefinitions>
                                         <ColumnDefinition Width="*"></ColumnDefinition>
@@ -214,7 +223,7 @@
                                     </DockPanel>
                                 </Grid>
                             </TabItem>
-                            <TabItem Header="SPOOLS" Margin="-100 0 0 0">
+                            <TabItem Header="SPOOLS" Margin="-100 0 0 0" mahapps:ControlsHelper.HeaderFontSize="20">
                                 <local:SpoolsView/>
                             </TabItem>
                         </TabControl>
diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.RML/Views/ThreadParametersView.xaml b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.RML/Views/ThreadParametersView.xaml
index 7f1ca2262..c083e9b02 100644
--- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.RML/Views/ThreadParametersView.xaml
+++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.RML/Views/ThreadParametersView.xaml
@@ -35,7 +35,13 @@
                             <StackPanel>
                                 <DockPanel>
                                     <TextBlock DockPanel.Dock="Top" Margin="20 10 0 10" FontSize="16">FEEDER</TextBlock>
-                                    <controls:TableGrid RowHeight="25" Margin="20 0">
+                                    <controls:TableGrid RowHeight="25" Margin="20 0" MakeFirstColumnVerticalAlignmentBottom="False">
+                                        <controls:TableGrid.Resources>
+                                            <Style TargetType="TextBlock">
+                                                <Setter Property="VerticalAlignment" Value="Center"></Setter>
+                                                <Setter Property="Margin" Value="0 3 0 0"></Setter>
+                                            </Style>
+                                        </controls:TableGrid.Resources>
                                         <TextBlock Text="Feeder P:" ></TextBlock>
                                         <mahapps:NumericUpDown Value="{Binding ActiveRML.FeederP,Mode=TwoWay}" Minimum="-100000" Maximum="1000000" InterceptArrowKeys="True" Background="Transparent" BorderThickness="0" InterceptMouseWheel="True" HasDecimals="False" HorizontalContentAlignment="Left"></mahapps:NumericUpDown>
 
@@ -49,7 +55,13 @@
 
                                 <DockPanel>
                                     <TextBlock DockPanel.Dock="Top" Margin="20 10 0 10" FontSize="16">PULLER</TextBlock>
-                                    <controls:TableGrid RowHeight="25" Margin="20 0">
+                                    <controls:TableGrid RowHeight="25" Margin="20 0" MakeFirstColumnVerticalAlignmentBottom="False">
+                                        <controls:TableGrid.Resources>
+                                            <Style TargetType="TextBlock">
+                                                <Setter Property="VerticalAlignment" Value="Center"></Setter>
+                                                <Setter Property="Margin" Value="0 3 0 0"></Setter>
+                                            </Style>
+                                        </controls:TableGrid.Resources>
                                         <TextBlock Text="Puller P:" ></TextBlock>
                                         <mahapps:NumericUpDown Value="{Binding ActiveRML.PullerP,Mode=TwoWay}" Minimum="-100000" Maximum="1000000" InterceptArrowKeys="True" Background="Transparent" BorderThickness="0" InterceptMouseWheel="True" HasDecimals="False" HorizontalContentAlignment="Left"></mahapps:NumericUpDown>
 
@@ -63,7 +75,13 @@
 
                                 <DockPanel>
                                     <TextBlock DockPanel.Dock="Top" Margin="20 10 0 10" FontSize="16">WINDER</TextBlock>
-                                    <controls:TableGrid RowHeight="25" Margin="20 0">
+                                    <controls:TableGrid RowHeight="25" Margin="20 0" MakeFirstColumnVerticalAlignmentBottom="False">
+                                        <controls:TableGrid.Resources>
+                                            <Style TargetType="TextBlock">
+                                                <Setter Property="VerticalAlignment" Value="Center"></Setter>
+                                                <Setter Property="Margin" Value="0 3 0 0"></Setter>
+                                            </Style>
+                                        </controls:TableGrid.Resources>
                                         <TextBlock Text="Winder P:" ></TextBlock>
                                         <mahapps:NumericUpDown Value="{Binding ActiveRML.WinderP,Mode=TwoWay}" Minimum="-100000" Maximum="1000000" InterceptArrowKeys="True" Background="Transparent" BorderThickness="0" InterceptMouseWheel="True" HasDecimals="False" HorizontalContentAlignment="Left"></mahapps:NumericUpDown>
 
@@ -83,7 +101,12 @@
                             <StackPanel>
                                 <DockPanel>
                                     <TextBlock DockPanel.Dock="Top" Margin="20 10 0 10" FontSize="16">ROCKERS</TextBlock>
-                                    <controls:TableGrid RowHeight="25" Margin="20 0">
+                                    <controls:TableGrid RowHeight="25" Margin="20 0" MakeFirstColumnVerticalAlignmentBottom="False">
+                                        <controls:TableGrid.Resources>
+                                            <Style TargetType="TextBlock">
+                                                <Setter Property="VerticalAlignment" Value="Center"></Setter>
+                                            </Style>
+                                        </controls:TableGrid.Resources>
                                         <TextBlock Text="Bypass Rockers:" ></TextBlock>
                                         <ToggleButton IsChecked="{Binding ActiveRML.BypassRockers,Mode=TwoWay}" HorizontalAlignment="Right" ></ToggleButton>
                                     </controls:TableGrid>
-- 
cgit v1.3.1