From 73368810c9f0e426d66bf88d8b36c3225a51a217 Mon Sep 17 00:00:00 2001
From: Roy Ben Shabat <Roy.mail.net@gmail.com>
Date: Mon, 15 Feb 2021 17:56:37 +0200
Subject: BTSR RML Section + Drop Downs. BTSR Machine Operator Mapping. BTSR
 Job Outline. BTSR Spool Tension on RMLS_SPOOLS. Added BTSR Tension Error to
 RML.

---
 .../Tango.MachineStudio.RML/Views/BTSRView.xaml    | 55 ++++++++++++++++++++++
 .../Tango.MachineStudio.RML/Views/BTSRView.xaml.cs | 28 +++++++++++
 .../Tango.MachineStudio.RML/Views/RmlView.xaml     |  3 ++
 .../Tango.MachineStudio.RML/Views/SpoolsView.xaml  |  1 +
 4 files changed, 87 insertions(+)
 create mode 100644 Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.RML/Views/BTSRView.xaml
 create mode 100644 Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.RML/Views/BTSRView.xaml.cs

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

diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.RML/Views/BTSRView.xaml b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.RML/Views/BTSRView.xaml
new file mode 100644
index 000000000..2afef9ed5
--- /dev/null
+++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.RML/Views/BTSRView.xaml
@@ -0,0 +1,55 @@
+<UserControl x:Class="Tango.MachineStudio.RML.Views.BTSRView"
+             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}">
+    <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">BTSR</TextBlock>
+                </Grid>
+            </Border>
+
+            <Grid>
+                <DockPanel Grid.Column="1" Margin="25">
+                    <Grid DockPanel.Dock="Bottom">
+
+                    </Grid>
+                    <Grid>
+                        <!--HERE-->
+                        <StackPanel>
+                            <StackPanel HorizontalAlignment="Left" Width="400">
+                                <TextBlock>Application Type</TextBlock>
+                                <ComboBox Margin="0 2 0 0" ItemsSource="{Binding BtsrApplicationTypes}" SelectedItem="{Binding ActiveRML.BtsrApplicationType}" DisplayMemberPath="Description"></ComboBox>
+                            </StackPanel>
+
+                            <StackPanel Margin="0 20 0 0" HorizontalAlignment="Left" Width="400">
+                                <TextBlock>Yarn Type</TextBlock>
+                                <ComboBox Margin="0 2 0 0" ItemsSource="{Binding BtsrYarnTypes}" SelectedItem="{Binding ActiveRML.BtsrYarnType}" DisplayMemberPath="Description"></ComboBox>
+                            </StackPanel>
+
+                            <StackPanel Margin="0 20 0 0" HorizontalAlignment="Left" Width="400">
+                                <TextBlock>Tension Error</TextBlock>
+                                <mahapps:NumericUpDown Margin="0 2 0 0" HasDecimals="True" Minimum="0" Maximum="1000" Value="{Binding ActiveRML.BtsrTensionError}" ></mahapps:NumericUpDown>
+                            </StackPanel>
+                        </StackPanel>
+                        <!--HERE-->
+                    </Grid>
+                </DockPanel>
+            </Grid>
+        </DockPanel>
+    </Grid>
+</UserControl>
diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.RML/Views/BTSRView.xaml.cs b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.RML/Views/BTSRView.xaml.cs
new file mode 100644
index 000000000..8545749fd
--- /dev/null
+++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.RML/Views/BTSRView.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 BTSRView.xaml
+    /// </summary>
+    public partial class BTSRView : UserControl
+    {
+        public BTSRView()
+        {
+            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 62b6dc335..a2fce41d1 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
@@ -234,6 +234,9 @@
                             <TabItem Header="SPOOLS" Margin="-100 0 0 0" mahapps:ControlsHelper.HeaderFontSize="20">
                                 <local:SpoolsView/>
                             </TabItem>
+                            <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">
                                 <local:ColorCalibrationView DataContext="{Binding ColorCalibrationVM}" HorizontalContentAlignment="Stretch" VerticalContentAlignment="Stretch"/>
                             </TabItem>
diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.RML/Views/SpoolsView.xaml b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.RML/Views/SpoolsView.xaml
index 6eae05c76..9cab8ed02 100644
--- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.RML/Views/SpoolsView.xaml
+++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.RML/Views/SpoolsView.xaml
@@ -75,6 +75,7 @@
                                 <DataGridTextColumn Header="MAX LENGTH" Binding="{Binding Length,Converter={StaticResource EmptyStringToNullConverter}}" Width="Auto" />
                                 <DataGridTextColumn Header="BACKING RATE" Binding="{Binding BackingRate,Converter={StaticResource EmptyStringToNullConverter}}" Width="Auto" />
                                 <DataGridTextColumn Header="BOTTOM BACKING RATE" Binding="{Binding BottomBackingRate,Converter={StaticResource EmptyStringToNullConverter}}" Width="Auto" />
+                                <DataGridTextColumn Header="BTSR SPOOL TENSION" Binding="{Binding BtsrSpoolTension,Converter={StaticResource EmptyStringToNullConverter}}" Width="Auto" />
                             </DataGrid.Columns>
                         </DataGrid>
                     </Grid>
-- 
cgit v1.3.1


From 6e7ee481279d9d0982fbf925e183cb93b46fcfa8 Mon Sep 17 00:00:00 2001
From: Roy Ben Shabat <Roy.mail.net@gmail.com>
Date: Tue, 16 Feb 2021 14:13:51 +0200
Subject: Fixed OverrideData for BTSR.

---
 .../Tango.MachineStudio.RML/Views/BTSRView.xaml     |   2 +-
 .../SQLExaminer/Configurations/OverrideData.xml     | Bin 86932 -> 89974 bytes
 2 files changed, 1 insertion(+), 1 deletion(-)

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

diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.RML/Views/BTSRView.xaml b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.RML/Views/BTSRView.xaml
index 2afef9ed5..662ca6a75 100644
--- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.RML/Views/BTSRView.xaml
+++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.RML/Views/BTSRView.xaml
@@ -43,7 +43,7 @@
 
                             <StackPanel Margin="0 20 0 0" HorizontalAlignment="Left" Width="400">
                                 <TextBlock>Tension Error</TextBlock>
-                                <mahapps:NumericUpDown Margin="0 2 0 0" HasDecimals="True" Minimum="0" Maximum="1000" Value="{Binding ActiveRML.BtsrTensionError}" ></mahapps:NumericUpDown>
+                                <mahapps:NumericUpDown HorizontalContentAlignment="Left" Padding="5 0 0 0" Margin="0 2 0 0" HasDecimals="True" Minimum="0" Maximum="1000" Value="{Binding ActiveRML.BtsrTensionError}" ></mahapps:NumericUpDown>
                             </StackPanel>
                         </StackPanel>
                         <!--HERE-->
diff --git a/Software/Visual_Studio/Tango.SQLExaminer/SQLExaminer/Configurations/OverrideData.xml b/Software/Visual_Studio/Tango.SQLExaminer/SQLExaminer/Configurations/OverrideData.xml
index ad3ebaab3..0baa964be 100644
Binary files a/Software/Visual_Studio/Tango.SQLExaminer/SQLExaminer/Configurations/OverrideData.xml and b/Software/Visual_Studio/Tango.SQLExaminer/SQLExaminer/Configurations/OverrideData.xml differ
-- 
cgit v1.3.1