From 1b0bdf6f8148e9cc4e7e07e41e9e2d75039c1349 Mon Sep 17 00:00:00 2001
From: Roy Ben-Shabat <Roy@Twine-s.com>
Date: Tue, 3 Mar 2020 13:31:43 +0200
Subject: Added Bypass Rockers to Thread Parameters. Added RML Spools to DTO
 Action Logs.

---
 .../Views/ThreadParametersView.xaml                | 94 +++++++++++++---------
 1 file changed, 55 insertions(+), 39 deletions(-)

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

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 ef2923303..7f1ca2262 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
@@ -29,53 +29,69 @@
             </Border>
 
             <Grid>
-                <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">FEEDER</TextBlock>
-                                <controls:TableGrid RowHeight="25" Margin="20 0">
-                                    <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>
+                <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">FEEDER</TextBlock>
+                                    <controls:TableGrid RowHeight="25" Margin="20 0">
+                                        <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>
 
-                                    <TextBlock Text="Feeder I:" ></TextBlock>
-                                    <mahapps:NumericUpDown Value="{Binding ActiveRML.FeederI,Mode=TwoWay}" Minimum="-100000" Maximum="1000000" InterceptArrowKeys="True" Background="Transparent" BorderThickness="0" InterceptMouseWheel="True" HasDecimals="False" HorizontalContentAlignment="Left"></mahapps:NumericUpDown>
+                                        <TextBlock Text="Feeder I:" ></TextBlock>
+                                        <mahapps:NumericUpDown Value="{Binding ActiveRML.FeederI,Mode=TwoWay}" Minimum="-100000" Maximum="1000000" InterceptArrowKeys="True" Background="Transparent" BorderThickness="0" InterceptMouseWheel="True" HasDecimals="False" HorizontalContentAlignment="Left"></mahapps:NumericUpDown>
 
-                                    <TextBlock Text="Feeder D:" ></TextBlock>
-                                    <mahapps:NumericUpDown Value="{Binding ActiveRML.FeederD,Mode=TwoWay}" Minimum="-100000" Maximum="1000000" InterceptArrowKeys="True" Background="Transparent" BorderThickness="0" InterceptMouseWheel="True" HasDecimals="False" HorizontalContentAlignment="Left"></mahapps:NumericUpDown>
-                                </controls:TableGrid>
-                            </DockPanel>
+                                        <TextBlock Text="Feeder D:" ></TextBlock>
+                                        <mahapps:NumericUpDown Value="{Binding ActiveRML.FeederD,Mode=TwoWay}" Minimum="-100000" Maximum="1000000" InterceptArrowKeys="True" Background="Transparent" BorderThickness="0" InterceptMouseWheel="True" HasDecimals="False" HorizontalContentAlignment="Left"></mahapps:NumericUpDown>
+                                    </controls:TableGrid>
+                                </DockPanel>
 
-                            <DockPanel>
-                                <TextBlock DockPanel.Dock="Top" Margin="20 10 0 10" FontSize="16">PULLER</TextBlock>
-                                <controls:TableGrid RowHeight="25" Margin="20 0">
-                                    <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>
+                                <DockPanel>
+                                    <TextBlock DockPanel.Dock="Top" Margin="20 10 0 10" FontSize="16">PULLER</TextBlock>
+                                    <controls:TableGrid RowHeight="25" Margin="20 0">
+                                        <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>
 
-                                    <TextBlock Text="Puller I:" ></TextBlock>
-                                    <mahapps:NumericUpDown Value="{Binding ActiveRML.PullerI,Mode=TwoWay}" Minimum="-100000" Maximum="1000000" InterceptArrowKeys="True" Background="Transparent" BorderThickness="0" InterceptMouseWheel="True" HasDecimals="False" HorizontalContentAlignment="Left"></mahapps:NumericUpDown>
+                                        <TextBlock Text="Puller I:" ></TextBlock>
+                                        <mahapps:NumericUpDown Value="{Binding ActiveRML.PullerI,Mode=TwoWay}" Minimum="-100000" Maximum="1000000" InterceptArrowKeys="True" Background="Transparent" BorderThickness="0" InterceptMouseWheel="True" HasDecimals="False" HorizontalContentAlignment="Left"></mahapps:NumericUpDown>
 
-                                    <TextBlock Text="Puller D:" ></TextBlock>
-                                    <mahapps:NumericUpDown Value="{Binding ActiveRML.PullerD,Mode=TwoWay}" Minimum="-100000" Maximum="1000000" InterceptArrowKeys="True" Background="Transparent" BorderThickness="0" InterceptMouseWheel="True" HasDecimals="False" HorizontalContentAlignment="Left"></mahapps:NumericUpDown>
-                                </controls:TableGrid>
-                            </DockPanel>
+                                        <TextBlock Text="Puller D:" ></TextBlock>
+                                        <mahapps:NumericUpDown Value="{Binding ActiveRML.PullerD,Mode=TwoWay}" Minimum="-100000" Maximum="1000000" InterceptArrowKeys="True" Background="Transparent" BorderThickness="0" InterceptMouseWheel="True" HasDecimals="False" HorizontalContentAlignment="Left"></mahapps:NumericUpDown>
+                                    </controls:TableGrid>
+                                </DockPanel>
 
-                            <DockPanel>
-                                <TextBlock DockPanel.Dock="Top" Margin="20 10 0 10" FontSize="16">WINDER</TextBlock>
-                                <controls:TableGrid RowHeight="25" Margin="20 0">
-                                    <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>
+                                <DockPanel>
+                                    <TextBlock DockPanel.Dock="Top" Margin="20 10 0 10" FontSize="16">WINDER</TextBlock>
+                                    <controls:TableGrid RowHeight="25" Margin="20 0">
+                                        <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>
 
-                                    <TextBlock Text="Winder I:" ></TextBlock>
-                                    <mahapps:NumericUpDown Value="{Binding ActiveRML.WinderI,Mode=TwoWay}" Minimum="-100000" Maximum="1000000" InterceptArrowKeys="True" Background="Transparent" BorderThickness="0" InterceptMouseWheel="True" HasDecimals="False" HorizontalContentAlignment="Left"></mahapps:NumericUpDown>
+                                        <TextBlock Text="Winder I:" ></TextBlock>
+                                        <mahapps:NumericUpDown Value="{Binding ActiveRML.WinderI,Mode=TwoWay}" Minimum="-100000" Maximum="1000000" InterceptArrowKeys="True" Background="Transparent" BorderThickness="0" InterceptMouseWheel="True" HasDecimals="False" HorizontalContentAlignment="Left"></mahapps:NumericUpDown>
 
-                                    <TextBlock Text="Winder D:" ></TextBlock>
-                                    <mahapps:NumericUpDown Value="{Binding ActiveRML.WinderD,Mode=TwoWay}" Minimum="-100000" Maximum="1000000" InterceptArrowKeys="True" Background="Transparent" BorderThickness="0" InterceptMouseWheel="True" HasDecimals="False" HorizontalContentAlignment="Left"></mahapps:NumericUpDown>
-                                </controls:TableGrid>
-                            </DockPanel>
-                        </StackPanel>
-                    </materialDesign:Card>
-                </DockPanel>
+                                        <TextBlock Text="Winder D:" ></TextBlock>
+                                        <mahapps:NumericUpDown Value="{Binding ActiveRML.WinderD,Mode=TwoWay}" Minimum="-100000" Maximum="1000000" InterceptArrowKeys="True" Background="Transparent" BorderThickness="0" InterceptMouseWheel="True" HasDecimals="False" HorizontalContentAlignment="Left"></mahapps:NumericUpDown>
+                                    </controls:TableGrid>
+                                </DockPanel>
+                            </StackPanel>
+                        </materialDesign:Card>
+                    </DockPanel>
+
+                    <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">ROCKERS</TextBlock>
+                                    <controls:TableGrid RowHeight="25" Margin="20 0">
+                                        <TextBlock Text="Bypass Rockers:" ></TextBlock>
+                                        <ToggleButton IsChecked="{Binding ActiveRML.BypassRockers,Mode=TwoWay}" HorizontalAlignment="Right" ></ToggleButton>
+                                    </controls:TableGrid>
+                                </DockPanel>
+                            </StackPanel>
+                        </materialDesign:Card>
+                    </DockPanel>
+                </StackPanel>
             </Grid>
         </DockPanel>
     </Grid>
-- 
cgit v1.3.1