merge

1 files changed, 0 insertions, 121 deletions

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
deleted file mode 100644
index c083e9b02..000000000
--- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.RML/Views/ThreadParametersView.xaml
+++ /dev/null
@@ -1,121 +0,0 @@
-<UserControl x:Class="Tango.MachineStudio.RML.Views.ThreadParametersView"
-             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">THREAD 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">FEEDER</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="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 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" 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>
-
-                                        <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>
-
-                                <DockPanel>
-                                    <TextBlock DockPanel.Dock="Top" Margin="20 10 0 10" FontSize="16">WINDER</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="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 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" 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>
-                                </DockPanel>
-                            </StackPanel>
-                        </materialDesign:Card>
-                    </DockPanel>
-                </StackPanel>
-            </Grid>
-        </DockPanel>
-    </Grid>
-</UserControl>