MERGE

1 files changed, 107 insertions, 97 deletions

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 fd1c5d9a8..333cf9394 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
@@ -131,110 +131,120 @@
                     </Grid.RowDefinitions>
 
                     <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 HorizontalAlignment="Left" Margin="20 0 0 0" FontSize="16">COLOR CONVERSION TABLE (CCT)</TextBlock>
-                                </Grid>
-                            </Border>
-                            <Grid DockPanel.Dock="Top" Margin="20 10">
-                                <StackPanel HorizontalAlignment="Left" Margin="20 0 0 0">
-                                    <Grid>
-                                        <StackPanel Orientation="Horizontal" Margin="0 5 0 0">
-                                            <materialDesign:PackIcon Kind="ArrowLeftBoldHexagonOutline" VerticalAlignment="Center" Width="40" Height="40" />
-                                            <Image Source="../Images/data-table.png" Height="80" Opacity="0.8"></Image>
-                                            <StackPanel VerticalAlignment="Center" Width="300" Margin="10 0 0 0">
+                        <Grid>
+                            <Grid.ColumnDefinitions>
+                                <ColumnDefinition Width="1*" />
+                                <ColumnDefinition Width="510" />
+                            </Grid.ColumnDefinitions>
 
-                                                <TextBox IsReadOnly="False" Margin="0 5 0 0" Text="{Binding ActiveRML.Cct.FileName}" HorizontalContentAlignment="Center"></TextBox>
-                                                <UniformGrid Columns="2" Margin="0 5 0 0" HorizontalAlignment="Right">
-                                                    <Button Style="{StaticResource MaterialDesignFlatButton}" Padding="0" Command="{Binding ImportForwardDataCommand}">
-                                                        <StackPanel Orientation="Horizontal" Margin="0 0 20 0">
-                                                            <materialDesign:PackIcon Kind="Upload" VerticalAlignment="Center" />
-                                                            <TextBlock Margin="5 0 0 0">IMPORT</TextBlock>
-                                                        </StackPanel>
-                                                    </Button>
-                                                    <Button Style="{StaticResource MaterialDesignFlatButton}" Padding="0" Command="{Binding ExportForwardDataCommand}">
-                                                        <StackPanel Orientation="Horizontal">
-                                                            <materialDesign:PackIcon Kind="Download" VerticalAlignment="Center" />
-                                                            <TextBlock Margin="5 0 0 0">EXPORT</TextBlock>
-                                                        </StackPanel>
-                                                    </Button>
-                                                </UniformGrid>
-                                            </StackPanel>
-                                        </StackPanel>
+                            <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 HorizontalAlignment="Left" Margin="20 0 0 0" FontSize="16">ACTIVE PROCESS GROUP</TextBlock>
+                                        <Button ToolTip="Add new table" Style="{StaticResource MaterialDesignFlatButton}" Height="Auto" Width="30" HorizontalAlignment="Right" Padding="0" Command="{Binding AddProcessParametersTableCommand}">
+                                            <materialDesign:PackIcon Kind="Plus" Foreground="#0AC30A" Width="24" Height="24" />
+                                        </Button>
                                     </Grid>
-                                </StackPanel>
-                            </Grid>
-
-                            <Border DockPanel.Dock="Top" Background="{StaticResource TransparentBackgroundBrush200}" Margin="20 0" Padding="5" CornerRadius="5">
-                                <Border.Effect>
-                                    <DropShadowEffect Opacity="0.4" />
-                                </Border.Effect>
+                                </Border>
                                 <Grid>
-                                    <TextBlock HorizontalAlignment="Left" Margin="20 0 0 0" FontSize="16">ACTIVE PROCESS GROUP</TextBlock>
-                                    <Button ToolTip="Add new table" Style="{StaticResource MaterialDesignFlatButton}" Height="Auto" Width="30" HorizontalAlignment="Right" Padding="0" Command="{Binding AddProcessParametersTableCommand}">
-                                        <materialDesign:PackIcon Kind="Plus" Foreground="#0AC30A" Width="24" Height="24" />
-                                    </Button>
-                                </Grid>
-                            </Border>
-                            <Grid>
-                                <StackPanel Orientation="Horizontal" HorizontalAlignment="Left" Margin="0 20">
-                                    <ItemsControl ItemsSource="{Binding ActiveProcessParametersTableView}">
-                                        <ItemsControl.ItemsPanel>
-                                            <ItemsPanelTemplate>
-                                                <StackPanel HorizontalAlignment="Left" Orientation="Horizontal" />
-                                            </ItemsPanelTemplate>
-                                        </ItemsControl.ItemsPanel>
-                                        <ItemsControl.ItemTemplate>
-                                            <DataTemplate>
-                                                <DockPanel>
-                                                    <Button DockPanel.Dock="Right" Style="{StaticResource MaterialDesignFlatButton}" Padding="0" VerticalAlignment="Bottom" ToolTip="Remove table" Width="30" Margin="10 0 0 10" Command="{Binding RelativeSource={RelativeSource AncestorType=UserControl},Path=DataContext.RemoveProcessParametersTableCommand}" CommandParameter="{Binding}">
-                                                        <materialDesign:PackIcon Kind="Delete" Width="24" Height="24" Foreground="#FF7D7D" />
-                                                    </Button>
+                                    <StackPanel Orientation="Horizontal" HorizontalAlignment="Left" Margin="0 20">
+                                        <ItemsControl ItemsSource="{Binding ActiveProcessParametersTableView}">
+                                            <ItemsControl.ItemsPanel>
+                                                <ItemsPanelTemplate>
+                                                    <StackPanel HorizontalAlignment="Left" Orientation="Horizontal" />
+                                                </ItemsPanelTemplate>
+                                            </ItemsControl.ItemsPanel>
+                                            <ItemsControl.ItemTemplate>
+                                                <DataTemplate>
+                                                    <DockPanel>
+                                                        <Button DockPanel.Dock="Right" Style="{StaticResource MaterialDesignFlatButton}" Padding="0" VerticalAlignment="Bottom" ToolTip="Remove table" Width="30" Margin="10 0 0 10" Command="{Binding RelativeSource={RelativeSource AncestorType=UserControl},Path=DataContext.RemoveProcessParametersTableCommand}" CommandParameter="{Binding}">
+                                                            <materialDesign:PackIcon Kind="Delete" Width="24" Height="24" Foreground="#FF7D7D" />
+                                                        </Button>
 
-                                                    <Grid Style="{StaticResource draggableDroppableGrid}" dragAndDrop:DragAndDropService.Drop="OnProcessTableDropped">
-                                                        <Border Padding="5" BorderThickness="1" Margin="20 5 0 5" BorderBrush="{StaticResource DarkGrayBrush}" Background="{StaticResource TransparentBackgroundBrush100}">
-                                                            <Grid>
-                                                                <DockPanel Width="300">
-                                                                    <TextBox materialDesign:HintAssist.Hint="Table Name" DockPanel.Dock="Top" Text="{Binding Name}"></TextBox>
+                                                        <Grid Style="{StaticResource draggableDroppableGrid}" dragAndDrop:DragAndDropService.Drop="OnProcessTableDropped">
+                                                            <Border Padding="5" BorderThickness="1" Margin="20 5 0 5" BorderBrush="{StaticResource DarkGrayBrush}" Background="{StaticResource TransparentBackgroundBrush100}">
+                                                                <Grid>
+                                                                    <DockPanel Width="300">
+                                                                        <TextBox materialDesign:HintAssist.Hint="Table Name" DockPanel.Dock="Top" Text="{Binding Name}"></TextBox>
 
-                                                                    <ScrollViewer HorizontalScrollBarVisibility="Disabled" VerticalScrollBarVisibility="Auto" Padding="5">
-                                                                        <editors:ParameterizedEditor ParameterizedObject="{Binding}">
-                                                                            <editors:ParameterizedEditor.ItemsPanel>
-                                                                                <ItemsPanelTemplate>
-                                                                                    <StackPanel IsItemsHost="True" />
-                                                                                </ItemsPanelTemplate>
-                                                                            </editors:ParameterizedEditor.ItemsPanel>
-                                                                            <editors:ParameterizedEditor.DoubleTemplate>
-                                                                                <DataTemplate>
-                                                                                    <DockPanel>
-                                                                                        <TextBlock IsHitTestVisible="False" Margin="0 5 0 5" Text="{Binding Name}" FontSize="11"></TextBlock>
-                                                                                        <mahapps:NumericUpDown HorizontalAlignment="Right" Minimum="0" Margin="0 0 5 0" HideUpDownButtons="True" HorizontalContentAlignment="Right" Maximum="10000" StringFormat="0.0" InterceptArrowKeys="True" Background="Transparent" BorderThickness="0" InterceptMouseWheel="True" HasDecimals="True" Value="{Binding Value,Mode=TwoWay}"></mahapps:NumericUpDown>
-                                                                                    </DockPanel>
-                                                                                </DataTemplate>
-                                                                            </editors:ParameterizedEditor.DoubleTemplate>
-                                                                        </editors:ParameterizedEditor>
-                                                                    </ScrollViewer>
-                                                                </DockPanel>
-                                                            </Grid>
-                                                        </Border>
+                                                                        <ScrollViewer HorizontalScrollBarVisibility="Disabled" VerticalScrollBarVisibility="Auto" Padding="5">
+                                                                            <editors:ParameterizedEditor ParameterizedObject="{Binding}">
+                                                                                <editors:ParameterizedEditor.ItemsPanel>
+                                                                                    <ItemsPanelTemplate>
+                                                                                        <StackPanel IsItemsHost="True" />
+                                                                                    </ItemsPanelTemplate>
+                                                                                </editors:ParameterizedEditor.ItemsPanel>
+                                                                                <editors:ParameterizedEditor.DoubleTemplate>
+                                                                                    <DataTemplate>
+                                                                                        <DockPanel>
+                                                                                            <TextBlock IsHitTestVisible="False" Margin="0 5 0 5" Text="{Binding Name}" FontSize="11"></TextBlock>
+                                                                                            <mahapps:NumericUpDown HorizontalAlignment="Right" Minimum="0" Margin="0 0 5 0" HideUpDownButtons="True" HorizontalContentAlignment="Right" Maximum="10000" StringFormat="0.0" InterceptArrowKeys="True" Background="Transparent" BorderThickness="0" InterceptMouseWheel="True" HasDecimals="True" Value="{Binding Value,Mode=TwoWay}"></mahapps:NumericUpDown>
+                                                                                        </DockPanel>
+                                                                                    </DataTemplate>
+                                                                                </editors:ParameterizedEditor.DoubleTemplate>
+                                                                            </editors:ParameterizedEditor>
+                                                                        </ScrollViewer>
+                                                                    </DockPanel>
+                                                                </Grid>
+                                                            </Border>
 
-                                                        <dragAndDrop:DragThumb Background="Transparent" Cursor="SizeAll" ToolTip="Drag and drop" Margin="0 3 -1 0" HorizontalAlignment="Right" VerticalAlignment="Top">
-                                                        <materialDesign:PackIcon HorizontalAlignment="Right" VerticalAlignment="Top" IsHitTestVisible="False" Kind="Drag" Width="32" Height="32" Background="Transparent" />
-                                                        </dragAndDrop:DragThumb>
-                                                    </Grid>
-                                                </DockPanel>
-                                            </DataTemplate>
-                                        </ItemsControl.ItemTemplate>
-                                    </ItemsControl>
-                                </StackPanel>
+                                                            <dragAndDrop:DragThumb Background="Transparent" Cursor="SizeAll" ToolTip="Drag and drop" Margin="0 3 -1 0" HorizontalAlignment="Right" VerticalAlignment="Top">
+                                                                <materialDesign:PackIcon HorizontalAlignment="Right" VerticalAlignment="Top" IsHitTestVisible="False" Kind="Drag" Width="32" Height="32" Background="Transparent" />
+                                                            </dragAndDrop:DragThumb>
+                                                        </Grid>
+                                                    </DockPanel>
+                                                </DataTemplate>
+                                            </ItemsControl.ItemTemplate>
+                                        </ItemsControl>
+                                    </StackPanel>
+
+                                    <dragAndDrop:DraggingSurface x:Name="draggingSurface" ClipToBounds="True" />
+                                </Grid>
+                            </DockPanel>
+
+                            <DockPanel Grid.Column="1">
+                                <Border DockPanel.Dock="Top" Background="{StaticResource TransparentBackgroundBrush200}" Margin="20 0" Padding="5" CornerRadius="5">
+                                    <Border.Effect>
+                                        <DropShadowEffect Opacity="0.4" />
+                                    </Border.Effect>
+                                    <Grid>
+                                        <TextBlock HorizontalAlignment="Left" Margin="20 0 0 0" FontSize="16">COLOR CONVERSION TABLE (CCT)</TextBlock>
+                                    </Grid>
+                                </Border>
+                                <Grid DockPanel.Dock="Top" Background="#35B5B5B5" Margin="24 0">
+                                    <StackPanel HorizontalAlignment="Center" VerticalAlignment="Center">
+                                        <Grid>
+                                            <StackPanel Orientation="Horizontal">
+                                                <materialDesign:PackIcon Kind="ArrowLeftBoldHexagonOutline" VerticalAlignment="Center" Width="40" Height="40" />
+                                                <Image Source="../Images/data-table.png" Height="80" Opacity="0.8"></Image>
+                                                <StackPanel VerticalAlignment="Center" Width="300" Margin="10 0 0 0">
+
+                                                    <TextBox IsReadOnly="False" Margin="0 5 0 0" Text="{Binding ActiveRML.Cct.FileName}" HorizontalContentAlignment="Center"></TextBox>
+                                                    <UniformGrid Columns="2" Margin="0 5 0 0" HorizontalAlignment="Right">
+                                                        <Button Style="{StaticResource MaterialDesignFlatButton}" Padding="0" Command="{Binding ImportForwardDataCommand}">
+                                                            <StackPanel Orientation="Horizontal" Margin="0 0 20 0">
+                                                                <materialDesign:PackIcon Kind="Upload" VerticalAlignment="Center" />
+                                                                <TextBlock Margin="5 0 0 0">IMPORT</TextBlock>
+                                                            </StackPanel>
+                                                        </Button>
+                                                        <Button Style="{StaticResource MaterialDesignFlatButton}" Padding="0" Command="{Binding ExportForwardDataCommand}">
+                                                            <StackPanel Orientation="Horizontal">
+                                                                <materialDesign:PackIcon Kind="Download" VerticalAlignment="Center" />
+                                                                <TextBlock Margin="5 0 0 0">EXPORT</TextBlock>
+                                                            </StackPanel>
+                                                        </Button>
+                                                    </UniformGrid>
+                                                </StackPanel>
+                                            </StackPanel>
+                                        </Grid>
+                                    </StackPanel>
+                                </Grid>
+                            </DockPanel>
+                        </Grid>
 
-                                <dragAndDrop:DraggingSurface x:Name="draggingSurface" ClipToBounds="True" />
-                            </Grid>
-                        </DockPanel>
                     </Grid>