From 60a2692fd4acadfdf8724bb198e38a2689a866fd Mon Sep 17 00:00:00 2001
From: Roy Ben Shabat <Roy.mail.net@gmail.com>
Date: Thu, 23 Jan 2020 14:34:55 +0200
Subject: Added new staple spun process parameters to database, BL and PMR.
 Implemented process params index via db. Added new process params in MS.
 Added JOB_RUN => Upload time, Heating Time, IsGradient...

---
 .../Tango.MachineStudio.Developer/Views/JobView.xaml | 20 +++++++++++---------
 1 file changed, 11 insertions(+), 9 deletions(-)

(limited to 'Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/Views/JobView.xaml')

diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/Views/JobView.xaml b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/Views/JobView.xaml
index b49f1407c..47cb41522 100644
--- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/Views/JobView.xaml
+++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/Views/JobView.xaml
@@ -791,9 +791,9 @@
 
                                                         </StackPanel>
 
-                                                        <StackPanel Orientation="Horizontal" VerticalAlignment="Center" HorizontalAlignment="Center" Margin="0 40 180 0">
+                                                        <StackPanel Orientation="Horizontal" VerticalAlignment="Center" HorizontalAlignment="Center" Margin="60 40 180 0">
                                                             <materialDesign:PackIcon Kind="ChevronLeft" Width="24" Height="24" />
-                                                            <TextBlock  Margin="0 -2 0 0" VerticalAlignment="Center"><Run>SUPPORTED MEDIA LIQUID</Run> <Run FontSize="10"  Foreground="{StaticResource DimGrayBrush}">( Max Nanolitter/CM )</Run></TextBlock>
+                                                            <TextBlock  Margin="0 -2 0 0" VerticalAlignment="Center"><Run>MEDIA LIQUIDS</Run> <Run FontSize="10"  Foreground="{StaticResource DimGrayBrush}">( Max Nanolitter/CM )</Run></TextBlock>
                                                             <materialDesign:PackIcon Kind="ChevronRight" Width="24" Height="24" />
                                                         </StackPanel>
 
@@ -1403,7 +1403,7 @@
                 <Grid Background="{StaticResource TransparentBackgroundBrush100}">
                     <Grid.Style>
                         <Style TargetType="Grid">
-                            <Setter Property="Width" Value="520"></Setter>
+                            <Setter Property="Width" Value="640"></Setter>
                             <Setter Property="LayoutTransform">
                                 <Setter.Value>
                                     <ScaleTransform ScaleY="1" ScaleX="0"></ScaleTransform>
@@ -1541,7 +1541,7 @@
 
 
                                                                             </WrapPanel.Resources>
-                                                                            <editors:ParameterizedEditor ParameterizedObject="{Binding}" GeneratingItems="ParameterizedEditor_GeneratingItems">
+                                                                            <editors:ParameterizedEditor ParameterizedObject="{Binding}">
                                                                                 <editors:ParameterizedEditor.ItemsPanel>
                                                                                     <ItemsPanelTemplate>
                                                                                         <WrapPanel IsItemsHost="True" Orientation="Horizontal" />
@@ -1549,7 +1549,7 @@
                                                                                 </editors:ParameterizedEditor.ItemsPanel>
                                                                                 <editors:ParameterizedEditor.DoubleTemplate>
                                                                                     <DataTemplate>
-                                                                                        <Grid Background="Transparent" Style="{StaticResource draggableDroppableGrid}" dragAndDrop:DragAndDropService.Drop="OnProcessParameterDropped" dragAndDrop:DragAndDropService.DraggingSurface="{Binding RelativeSource={RelativeSource AncestorType=editors:ParameterizedEditor},Path=DraggingSurface}">
+                                                                                        <Grid Background="Transparent">
                                                                                             <ContentControl>
                                                                                                 <StackPanel>
                                                                                                     <TextBlock IsHitTestVisible="False" Margin="0 5 0 5" Text="{Binding Name}" FontSize="11" Foreground="{StaticResource MainWindow.Foreground}"></TextBlock>
@@ -1609,16 +1609,17 @@
 
                                                 <StackPanel Orientation="Horizontal">
                                                     <ToggleButton IsChecked="{Binding AutoProcessSelection}" />
-                                                    <TextBlock Margin="5 0 0 0">Use Recommended Process Parameters (auto)</TextBlock>
+                                                    <TextBlock Margin="5 3 0 0">Use Recommended Process Parameters (auto)</TextBlock>
                                                 </StackPanel>
 
-                                                <StackPanel Margin="0 40 0 0" Orientation="Horizontal" HorizontalAlignment="Right">
-                                                    <Button Height="40" Width="105" Command="{Binding ResetProcessParametersCommand}" Background="Transparent" BorderBrush="{StaticResource DarkGrayBrush200}" Foreground="{StaticResource DarkGrayBrush200}" Margin="0 2 10 0" ToolTip="Resets the current process parameters in the embedded device">
+                                                <Grid Margin="0 40 0 0" >
+                                                    <Button HorizontalAlignment="Left" Height="40" Width="105" Command="{Binding ResetProcessParametersCommand}" Background="Transparent" BorderBrush="{StaticResource DarkGrayBrush200}" Foreground="{StaticResource DarkGrayBrush200}" Margin="0 2 10 0" ToolTip="Resets the current process parameters in the embedded device">
                                                         <TextBlock TextWrapping="Wrap" TextAlignment="Center">
                                                         TEMP OFF
                                                         </TextBlock>
                                                     </Button>
-                                                    <Button Height="40" Command="{Binding SaveProcessParametersCommand}" HorizontalAlignment="Left" IsEnabled="{Binding AuthenticationProvider.CurrentUser,Converter={StaticResource UserRoleToBooleanConverter},ConverterParameter='Researcher'}">
+                                                    <StackPanel Orientation="Horizontal" HorizontalAlignment="Right">
+                                                        <Button Height="40" Command="{Binding SaveProcessParametersCommand}" HorizontalAlignment="Left" IsEnabled="{Binding AuthenticationProvider.CurrentUser,Converter={StaticResource UserRoleToBooleanConverter},ConverterParameter='Researcher'}">
                                                         <StackPanel Orientation="Horizontal">
                                                             <materialDesign:PackIcon VerticalAlignment="Center" Kind="ContentSave"></materialDesign:PackIcon>
                                                             <TextBlock Margin="10 0 0 0">SAVE PARAMETERS</TextBlock>
@@ -1631,6 +1632,7 @@
                                                         </StackPanel>
                                                     </Button>
                                                 </StackPanel>
+                                                </Grid>
                                             </StackPanel>
                                         </StackPanel>
                                     </Grid>
-- 
cgit v1.3.1