From 00a491d93733d4625ad329b2ba8237f445364b3f Mon Sep 17 00:00:00 2001
From: Mirta <mirta@twine-s.com>
Date: Wed, 30 Dec 2020 16:39:52 +0200
Subject: merge

---
 .../Views/JobView.xaml                             | 227 +++++++++------------
 1 file changed, 93 insertions(+), 134 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 32b7ccd86..3bda86036 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
@@ -28,8 +28,7 @@
              xmlns:d="http://schemas.microsoft.com/expression/blend/2008" 
              xmlns:local="clr-namespace:Tango.MachineStudio.Developer.Views"
              mc:Ignorable="d" 
-             d:DesignHeight="1080" d:DesignWidth="1920" Background="Transparent" d:DataContext="{d:DesignInstance Type=vm:MainViewVM, IsDesignTimeCreatable=False}" 
-             DataContext="{x:Static global:ViewModelLocator.MainViewVM}" x:Name="control">
+             d:DesignHeight="1080" d:DesignWidth="1920" Background="Transparent" d:DataContext="{d:DesignInstance Type=vm:MainViewVM, IsDesignTimeCreatable=False}" DataContext="{x:Static global:ViewModelLocator.MainViewVM}" x:Name="control">
 
     <UserControl.Resources>
 
@@ -242,93 +241,91 @@
         </Style>
 
         <DataTemplate x:Key="Volume_Template">
-            <StackPanel>
-                <StackPanel Orientation="Horizontal" HorizontalAlignment="Left">
-                    <StackPanel VerticalAlignment="Center">
-                        <ItemsControl VerticalAlignment="Center">
-                            <ItemsControl.Style>
-                                <Style TargetType="ItemsControl">
-                                    <Setter Property="ItemsSource" Value="{Binding LiquidVolumes}"></Setter>
-                                    <Style.Triggers>
-                                        <DataTrigger Binding="{Binding RelativeSource={RelativeSource AncestorType=UserControl},Path=DataContext.Settings.UsePreferredLiquidVolumeIndex}" Value="True">
-                                            <Setter Property="ItemsSource" Value="{Binding LiquidVolumesOrdered}"></Setter>
-                                        </DataTrigger>
-                                    </Style.Triggers>
-                                </Style>
-                            </ItemsControl.Style>
-                            <ItemsControl.ItemsPanel>
-                                <ItemsPanelTemplate>
-                                    <StackPanel VerticalAlignment="Center" Orientation="Horizontal" IsItemsHost="True"></StackPanel>
-                                </ItemsPanelTemplate>
-                            </ItemsControl.ItemsPanel>
-                            <ItemsControl.ItemTemplate>
-                                <DataTemplate>
-                                    <Border>
-                                        <Border.Style>
-                                            <Style TargetType="Border">
-                                                <Setter Property="Visibility" Value="Visible"></Setter>
-                                                <Style.Triggers>
-                                                    <DataTrigger Binding="{Binding IdsPack.IdsPackFormula.Name}" Value="Lubricant">
-                                                        <Setter Property="Visibility" Value="Collapsed"></Setter>
-                                                    </DataTrigger>
-                                                </Style.Triggers>
-                                            </Style>
-                                        </Border.Style>
-                                        <ContentControl Focusable="False" Style="{StaticResource numberBorder}" Margin="10 0 0 0" Width="60" Height="60">
-                                            <ContentControl.Foreground>
-                                                <SolidColorBrush Color="{Binding IdsPack.LiquidType.Color,Converter={StaticResource ColorToIntegerConverter}}"></SolidColorBrush>
-                                            </ContentControl.Foreground>
-                                            <mahapps:NumericUpDown ValueChanged="OnBrushStopFieldValueChanged" FontSize="{StaticResource NumbersFontSize}" ScrollViewer.HorizontalScrollBarVisibility="Disabled" FontFamily="{StaticResource digital-7}" HorizontalAlignment="Center" Value="{Binding Volume, Mode=TwoWay}" Background="Transparent" Width="40" HideUpDownButtons="True" Minimum="0" Maximum="1000" InterceptArrowKeys="True" BorderThickness="0" InterceptMouseWheel="True" HasDecimals="True" HorizontalContentAlignment="Center">
-                                                <mahapps:NumericUpDown.Resources>
-                                                    <StaticResource ResourceKey="SelectAllTextBoxResource"></StaticResource>
-                                                </mahapps:NumericUpDown.Resources>
-                                            </mahapps:NumericUpDown>
-                                        </ContentControl>
-                                    </Border>
-                                </DataTemplate>
-                            </ItemsControl.ItemTemplate>
-                        </ItemsControl>
+            <StackPanel Orientation="Horizontal" HorizontalAlignment="Left">
+                <StackPanel VerticalAlignment="Center">
+                    <ItemsControl VerticalAlignment="Center">
+                        <ItemsControl.Style>
+                            <Style TargetType="ItemsControl">
+                                <Setter Property="ItemsSource" Value="{Binding LiquidVolumes}"></Setter>
+                                <Style.Triggers>
+                                    <DataTrigger Binding="{Binding RelativeSource={RelativeSource AncestorType=UserControl},Path=DataContext.Settings.UsePreferredLiquidVolumeIndex}" Value="True">
+                                        <Setter Property="ItemsSource" Value="{Binding LiquidVolumesOrdered}"></Setter>
+                                    </DataTrigger>
+                                </Style.Triggers>
+                            </Style>
+                        </ItemsControl.Style>
+                        <ItemsControl.ItemsPanel>
+                            <ItemsPanelTemplate>
+                                <StackPanel VerticalAlignment="Center" Orientation="Horizontal" IsItemsHost="True"></StackPanel>
+                            </ItemsPanelTemplate>
+                        </ItemsControl.ItemsPanel>
+                        <ItemsControl.ItemTemplate>
+                            <DataTemplate>
+                                <Border>
+                                    <Border.Style>
+                                        <Style TargetType="Border">
+                                            <Setter Property="Visibility" Value="Visible"></Setter>
+                                            <Style.Triggers>
+                                                <DataTrigger Binding="{Binding IdsPack.IdsPackFormula.Name}" Value="Lubricant">
+                                                    <Setter Property="Visibility" Value="Collapsed"></Setter>
+                                                </DataTrigger>
+                                            </Style.Triggers>
+                                        </Style>
+                                    </Border.Style>
+                                    <ContentControl Focusable="False" Style="{StaticResource numberBorder}" Margin="10 0 0 0" Width="60" Height="60">
+                                        <ContentControl.Foreground>
+                                            <SolidColorBrush Color="{Binding IdsPack.LiquidType.Color,Converter={StaticResource ColorToIntegerConverter}}"></SolidColorBrush>
+                                        </ContentControl.Foreground>
+                                        <mahapps:NumericUpDown ValueChanged="OnBrushStopFieldValueChanged" FontSize="{StaticResource NumbersFontSize}" ScrollViewer.HorizontalScrollBarVisibility="Disabled" FontFamily="{StaticResource digital-7}" HorizontalAlignment="Center" Value="{Binding Volume, Mode=TwoWay}" Background="Transparent" Width="40" HideUpDownButtons="True" Minimum="0" Maximum="1000" InterceptArrowKeys="True" BorderThickness="0" InterceptMouseWheel="True" HasDecimals="True" HorizontalContentAlignment="Center">
+                                            <mahapps:NumericUpDown.Resources>
+                                                <StaticResource ResourceKey="SelectAllTextBoxResource"></StaticResource>
+                                            </mahapps:NumericUpDown.Resources>
+                                        </mahapps:NumericUpDown>
+                                    </ContentControl>
+                                </Border>
+                            </DataTemplate>
+                        </ItemsControl.ItemTemplate>
+                    </ItemsControl>
+
+                    <StackPanel Orientation="Horizontal" Margin="30 10 0 0" Height="16" Visibility="{Binding IsLiquidVolumesOutOfRange,Converter={StaticResource BooleanToVisibilityConverter}}">
+                        <materialDesign:PackIcon Kind="Alert" Foreground="{StaticResource OrangeBrush}" />
+                        <TextBlock Margin="5 0 0 0" Foreground="{StaticResource OrangeBrush}">Liquid volumes exceeds the maximum range for color conversion!</TextBlock>
                     </StackPanel>
+                </StackPanel>
 
-                    <materialDesign:PackIcon Kind="ChevronDoubleLeft" Margin="40 2 0 0" VerticalAlignment="Center" Foreground="Gray" />
+                <materialDesign:PackIcon Kind="ChevronDoubleLeft" Margin="40 2 0 0" VerticalAlignment="Center" Foreground="Gray" />
 
-                    <TextBlock VerticalAlignment="Center" FontSize="16" Margin="5 0 0 0" FontStyle="Italic" Foreground="Gray">
+                <TextBlock VerticalAlignment="Center" FontSize="16" Margin="5 0 0 0" FontStyle="Italic" Foreground="Gray">
                                                                                                                             <Run>Total:</Run>
                                                                                                                             <Run Text="{Binding TotalLiquidVolume,Mode=OneWay,StringFormat=0}"></Run><Run>%</Run>
                                                                                                                             <Run>(</Run>
                                                                                                                             <Run FontSize="10" Text="{Binding TotalLiquidNanoliterPerCentimeter,Mode=OneWay,StringFormat=0.00}"></Run>
                                                                                                                             <Run FontSize="12">nl</Run>
                                                                                                                             <Run>)</Run>
-                    </TextBlock>
+                </TextBlock>
 
-                    <Border Margin="60 0 0 0" DataContext="{Binding LiquidVolumes,Converter={StaticResource LiquidVolumesToLubricantLiquidVolume}}" BorderBrush="{StaticResource WhiteBrush100}" BorderThickness="1 0 0 0">
-                        <Border.Style>
-                            <Style TargetType="Border">
-                                <Setter Property="Visibility" Value="Collapsed"></Setter>
-                                <Style.Triggers>
-                                    <DataTrigger Binding="{Binding Converter={StaticResource NullObjectToBooleanConverter}}" Value="True">
-                                        <Setter Property="Visibility" Value="Visible"></Setter>
-                                    </DataTrigger>
-                                </Style.Triggers>
-                            </Style>
-                        </Border.Style>
-                        <ContentControl Focusable="False" Style="{StaticResource numberBorder}" Margin="10 0 0 0" Width="55" Height="55">
-                            <ContentControl.Foreground>
-                                <SolidColorBrush Color="{Binding IdsPack.LiquidType.Color,Converter={StaticResource ColorToIntegerConverter}}"></SolidColorBrush>
-                            </ContentControl.Foreground>
-                            <mahapps:NumericUpDown Foreground="{StaticResource GrayBrush250}" ScrollViewer.HorizontalScrollBarVisibility="Disabled" FontSize="20" FontFamily="{StaticResource digital-7}" HorizontalAlignment="Center" Value="{Binding Volume, Mode=TwoWay}" Background="Transparent" Width="40" HideUpDownButtons="True" Minimum="0" Maximum="1000" InterceptArrowKeys="True" BorderThickness="0" InterceptMouseWheel="True" HasDecimals="True" HorizontalContentAlignment="Center">
-                                <mahapps:NumericUpDown.Resources>
-                                    <StaticResource ResourceKey="SelectAllTextBoxResource"></StaticResource>
-                                </mahapps:NumericUpDown.Resources>
-                            </mahapps:NumericUpDown>
-                        </ContentControl>
-                    </Border>
-                </StackPanel>
-
-                <StackPanel Orientation="Horizontal" Margin="30 10 0 0" Height="16" Visibility="{Binding IsLiquidVolumesOutOfRange,Converter={StaticResource BooleanToVisibilityConverter}}">
-                    <materialDesign:PackIcon Kind="Alert" Foreground="{StaticResource OrangeBrush}" />
-                    <TextBlock Margin="5 0 0 0" Foreground="{StaticResource OrangeBrush}">Liquid volumes exceeds the maximum range for color conversion!</TextBlock>
-                </StackPanel>
+                <Border Margin="60 0 0 0" DataContext="{Binding LiquidVolumes,Converter={StaticResource LiquidVolumesToLubricantLiquidVolume}}" BorderBrush="{StaticResource WhiteBrush100}" BorderThickness="1 0 0 0">
+                    <Border.Style>
+                        <Style TargetType="Border">
+                            <Setter Property="Visibility" Value="Collapsed"></Setter>
+                            <Style.Triggers>
+                                <DataTrigger Binding="{Binding Converter={StaticResource NullObjectToBooleanConverter}}" Value="True">
+                                    <Setter Property="Visibility" Value="Visible"></Setter>
+                                </DataTrigger>
+                            </Style.Triggers>
+                        </Style>
+                    </Border.Style>
+                    <ContentControl Focusable="False" Style="{StaticResource numberBorder}" Margin="10 0 0 0" Width="55" Height="55">
+                        <ContentControl.Foreground>
+                            <SolidColorBrush Color="{Binding IdsPack.LiquidType.Color,Converter={StaticResource ColorToIntegerConverter}}"></SolidColorBrush>
+                        </ContentControl.Foreground>
+                        <mahapps:NumericUpDown Foreground="{StaticResource GrayBrush250}" ScrollViewer.HorizontalScrollBarVisibility="Disabled" FontSize="20" FontFamily="{StaticResource digital-7}" HorizontalAlignment="Center" Value="{Binding Volume, Mode=TwoWay}" Background="Transparent" Width="40" HideUpDownButtons="True" Minimum="0" Maximum="1000" InterceptArrowKeys="True" BorderThickness="0" InterceptMouseWheel="True" HasDecimals="True" HorizontalContentAlignment="Center">
+                            <mahapps:NumericUpDown.Resources>
+                                <StaticResource ResourceKey="SelectAllTextBoxResource"></StaticResource>
+                            </mahapps:NumericUpDown.Resources>
+                        </mahapps:NumericUpDown>
+                    </ContentControl>
+                </Border>
             </StackPanel>
         </DataTemplate>
 
@@ -680,7 +677,7 @@
                                         </StackPanel>
                                     </Border>
 
-                                    <Border Style="{StaticResource JobFieldBorder}" Visibility="{Binding IsSideBarOpened,Converter={StaticResource BooleanToVisibilityInverseConverter}}">
+                                    <Border Style="{StaticResource JobFieldBorder}">
                                         <StackPanel Margin="20 5 5 5"  Width="140">
                                             <StackPanel Orientation="Horizontal">
                                                 <Image Source="../Images/repeat.png" Width="32"></Image>
@@ -756,7 +753,7 @@
                                                                 <StackPanel>
                                                                     <TextBlock>MEDIA</TextBlock>
                                                                     <StackPanel Orientation="Horizontal" DockPanel.Dock="Left">
-                                                                        <controls:SearchComboBox Width="250"  ItemsSource="{Binding Rmls}" SelectedItem="{Binding SelectedRML}"  HorizontalContentAlignment="Stretch" SearchProperty="Name">
+                                                                        <ComboBox Width="250" ItemsSource="{Binding Rmls}" SelectedItem="{Binding SelectedRML}" Style="{StaticResource TransparentComboBoxStyle}" HorizontalContentAlignment="Stretch">
                                                                             <ComboBox.ItemTemplate>
                                                                                 <DataTemplate>
                                                                                     <DockPanel>
@@ -771,7 +768,7 @@
                                                                                     </DockPanel>
                                                                                 </DataTemplate>
                                                                             </ComboBox.ItemTemplate>
-                                                                        </controls:SearchComboBox>
+                                                                        </ComboBox>
 
                                                                         <!--<Button  Margin="20 30 0 0" Command="{Binding EditRMLCommand}" HorizontalAlignment="Right" Style="{StaticResource MaterialDesignFlatButton}">
                                                                             <StackPanel Orientation="Horizontal">
@@ -792,9 +789,9 @@
 
                                                         </StackPanel>
 
-                                                        <StackPanel Orientation="Horizontal" VerticalAlignment="Center" HorizontalAlignment="Center" Margin="60 40 180 0" Visibility="{Binding IsSideBarOpened,Converter={StaticResource BooleanToVisibilityInverseConverter}}">
+                                                        <StackPanel Orientation="Horizontal" VerticalAlignment="Center" HorizontalAlignment="Center" Margin="0 40 180 0">
                                                             <materialDesign:PackIcon Kind="ChevronLeft" Width="24" Height="24" />
-                                                            <TextBlock  Margin="0 -2 0 0" VerticalAlignment="Center"><Run>MEDIA LIQUIDS</Run> <Run FontSize="10"  Foreground="{StaticResource DimGrayBrush}">( Max Nanolitter/CM )</Run></TextBlock>
+                                                            <TextBlock  Margin="0 -2 0 0" VerticalAlignment="Center"><Run>SUPPORTED MEDIA LIQUID</Run> <Run FontSize="10"  Foreground="{StaticResource DimGrayBrush}">( Max Nanolitter/CM )</Run></TextBlock>
                                                             <materialDesign:PackIcon Kind="ChevronRight" Width="24" Height="24" />
                                                         </StackPanel>
 
@@ -898,7 +895,7 @@
                                                             </DockPanel>
                                                         </Grid>
                                                         <Grid Margin="0 10 10 0">
-                                                            <controls:MultiSelectListBox x:Name="listStops" ScrollViewer.HorizontalScrollBarVisibility="Disabled" AutomationProperties.AutomationId="{x:Static automation:Developer.BrushStopsListBox}" SelectionMode="Extended" Style="{x:Null}" Background="Transparent" ScrollViewer.CanContentScroll="False" BorderThickness="0" ItemsSource="{Binding BrushStopsCollectionView}" SelectedItem="{Binding SelectedBrushStop}" SelectedItemsList="{Binding SelectedBrushStops,Mode=TwoWay}" HorizontalContentAlignment="Stretch">
+                                                            <controls:MultiSelectListBox x:Name="listStops" AutomationProperties.AutomationId="{x:Static automation:Developer.BrushStopsListBox}" SelectionMode="Extended" Style="{x:Null}" Background="Transparent" ScrollViewer.CanContentScroll="False" BorderThickness="0" ItemsSource="{Binding BrushStopsCollectionView}" SelectedItem="{Binding SelectedBrushStop}" SelectedItemsList="{Binding SelectedBrushStops,Mode=TwoWay}" HorizontalContentAlignment="Stretch">
                                                                 <ListBox.Template>
                                                                     <ControlTemplate TargetType="{x:Type ListBox}">
                                                                         <Border x:Name="Bd" SnapsToDevicePixels="true" Background="{TemplateBinding Background}" BorderBrush="{TemplateBinding BorderBrush}"
@@ -976,8 +973,7 @@
                                                                                                         <Image Source="../Images/colorspace.png" Width="24"></Image>
                                                                                                         <TextBlock VerticalAlignment="Center" Margin="5 0 0 0" FontSize="10">Color Space</TextBlock>
                                                                                                     </StackPanel>
-                                                                                                    <ComboBox SelectionChanged="OnBrushStopColorSpace_SelectionChanged" ItemsSource="{Binding RelativeSource={RelativeSource AncestorType=UserControl},Path=DataContext.ColorSpaces}" SelectedItem="{Binding ColorSpace}" DisplayMemberPath="Name" Width="100" HorizontalAlignment="Left"
-                                                                                                              Style="{StaticResource TransparentComboBoxStyle}" >
+                                                                                                    <ComboBox ItemsSource="{Binding RelativeSource={RelativeSource AncestorType=UserControl},Path=DataContext.ColorSpaces}" SelectedItem="{Binding ColorSpace}" DisplayMemberPath="Name" Width="100" HorizontalAlignment="Left">
                                                                                                         <ComboBox.ItemContainerStyle>
                                                                                                             <Style TargetType="ComboBoxItem" BasedOn="{StaticResource {x:Type ComboBoxItem}}">
                                                                                                                 <Setter Property="Background" Value="{StaticResource WhiteBrush100}"></Setter>
@@ -1183,41 +1179,6 @@
                                                                                                                             </DataGridTemplateColumn.CellTemplate>
                                                                                                                         </DataGridTemplateColumn>
                                                                                                                         <DataGridTemplateColumn Header="PULSE / SEC">
-                                                                                                                            <DataGridTemplateColumn.CellTemplate>
-                                                                                                                                <DataTemplate>
-                                                                                                                                    <Label VerticalAlignment="Center">
-                                                                                                                                        <Label.Style>
-                                                                                                                                            <Style TargetType="Label">
-                                                                                                                                                <Setter Property="Content">
-                                                                                                                                                    <Setter.Value>
-                                                                                                                                                        <TextBlock>
-                                                                                                                                                 <Run Text="{Binding PulsePerSecondFull,Mode=OneWay,StringFormat='0.0'}"></Run>
-                                                                                                                                                 <Run Text="(pulse)" FontSize="9" Foreground="{StaticResource GrayBrush250}"></Run>
-                                                                                                                                                        </TextBlock>
-                                                                                                                                                    </Setter.Value>
-                                                                                                                                                </Setter>
-                                                                                                                                                <Style.Triggers>
-                                                                                                                                                    <DataTrigger Binding="{Binding DispenserStepDivision}" Value="{x:Static dispensing:DispenserStepDivisions.Auto}">
-                                                                                                                                                        <Setter Property="Content" Value="Auto"></Setter>
-                                                                                                                                                    </DataTrigger>
-                                                                                                                                                    <DataTrigger Binding="{Binding DispenserStepDivision,Converter={StaticResource IsNotConverter},ConverterParameter={x:Static dispensing:DispenserStepDivisions.Auto}}" Value="True">
-                                                                                                                                                        <Setter Property="Content">
-                                                                                                                                                            <Setter.Value>
-                                                                                                                                                                <TextBlock>
-                                                                                                                                                 <Run Text="{Binding PulsePerSecondFull,Mode=OneWay,StringFormat='0.0'}"></Run>
-                                                                                                                                                 <Run Text="(pulse)" FontSize="9" Foreground="{StaticResource GrayBrush250}"></Run>
-                                                                                                                                                                </TextBlock>
-                                                                                                                                                            </Setter.Value>
-                                                                                                                                                        </Setter>
-                                                                                                                                                    </DataTrigger>
-                                                                                                                                                </Style.Triggers>
-                                                                                                                                            </Style>
-                                                                                                                                        </Label.Style>
-                                                                                                                                    </Label>
-                                                                                                                                </DataTemplate>
-                                                                                                                            </DataGridTemplateColumn.CellTemplate>
-                                                                                                                        </DataGridTemplateColumn>
-                                                                                                                        <DataGridTemplateColumn Header="PULSE / SEC (full step)">
                                                                                                                             <DataGridTemplateColumn.CellTemplate>
                                                                                                                                 <DataTemplate>
                                                                                                                                     <Label VerticalAlignment="Center">
@@ -1405,7 +1366,7 @@
                 <Grid Background="{StaticResource TransparentBackgroundBrush100}">
                     <Grid.Style>
                         <Style TargetType="Grid">
-                            <Setter Property="Width" Value="640"></Setter>
+                            <Setter Property="Width" Value="520"></Setter>
                             <Setter Property="LayoutTransform">
                                 <Setter.Value>
                                     <ScaleTransform ScaleY="1" ScaleX="0"></ScaleTransform>
@@ -1520,7 +1481,7 @@
                                                                                     <Setter Property="Template">
                                                                                         <Setter.Value>
                                                                                             <ControlTemplate TargetType="ContentControl">
-                                                                                                <Grid Width="97" ToolTip="{Binding Name}" Background="Transparent" ToolTipService.InitialShowDelay="1000" ToolTipService.BetweenShowDelay="1000">
+                                                                                                <Grid Width="97">
                                                                                                     <Border>
                                                                                                         <Border.Style>
                                                                                                             <Style TargetType="Border">
@@ -1543,7 +1504,7 @@
 
 
                                                                             </WrapPanel.Resources>
-                                                                            <editors:ParameterizedEditor ParameterizedObject="{Binding}">
+                                                                            <editors:ParameterizedEditor ParameterizedObject="{Binding}" GeneratingItems="ParameterizedEditor_GeneratingItems">
                                                                                 <editors:ParameterizedEditor.ItemsPanel>
                                                                                     <ItemsPanelTemplate>
                                                                                         <WrapPanel IsItemsHost="True" Orientation="Horizontal" />
@@ -1551,11 +1512,11 @@
                                                                                 </editors:ParameterizedEditor.ItemsPanel>
                                                                                 <editors:ParameterizedEditor.DoubleTemplate>
                                                                                     <DataTemplate>
-                                                                                        <Grid Background="Transparent">
+                                                                                        <Grid Background="Transparent" Style="{StaticResource draggableDroppableGrid}" dragAndDrop:DragAndDropService.Drop="OnProcessParameterDropped" dragAndDrop:DragAndDropService.DraggingSurface="{Binding RelativeSource={RelativeSource AncestorType=editors:ParameterizedEditor},Path=DraggingSurface}">
                                                                                             <ContentControl>
                                                                                                 <StackPanel>
-                                                                                                    <TextBlock ToolTip="{Binding Name}" IsHitTestVisible="False" Margin="0 5 0 5" Text="{Binding Name}" FontSize="11" Foreground="{StaticResource MainWindow.Foreground}"></TextBlock>
-                                                                                                    <mahapps:NumericUpDown FontSize="20" Minimum="0" Margin="0 0 5 0" HideUpDownButtons="True" HorizontalContentAlignment="Center" Maximum="10000" StringFormat="{Binding StringFormat}" InterceptArrowKeys="True" Background="Transparent" BorderThickness="0" InterceptMouseWheel="True" HasDecimals="True" Value="{Binding Value,Mode=TwoWay}" Foreground="{StaticResource MainWindow.Foreground}"></mahapps:NumericUpDown>
+                                                                                                    <TextBlock IsHitTestVisible="False" Margin="0 5 0 5" Text="{Binding Name}" FontSize="11" Foreground="{StaticResource MainWindow.Foreground}"></TextBlock>
+                                                                                                    <mahapps:NumericUpDown FontSize="20" Minimum="0" Margin="0 0 5 0" HideUpDownButtons="True" HorizontalContentAlignment="Center" Maximum="10000" StringFormat="0.0" InterceptArrowKeys="True" Background="Transparent" BorderThickness="0" InterceptMouseWheel="True" HasDecimals="True" Value="{Binding Value,Mode=TwoWay}" Foreground="{StaticResource MainWindow.Foreground}"></mahapps:NumericUpDown>
                                                                                                 </StackPanel>
                                                                                             </ContentControl>
                                                                                         </Grid>
@@ -1611,17 +1572,16 @@
 
                                                 <StackPanel Orientation="Horizontal">
                                                     <ToggleButton IsChecked="{Binding AutoProcessSelection}" />
-                                                    <TextBlock Margin="5 3 0 0">Use Recommended Process Parameters (auto)</TextBlock>
+                                                    <TextBlock Margin="5 0 0 0">Use Recommended Process Parameters (auto)</TextBlock>
                                                 </StackPanel>
 
-                                                <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">
+                                                <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">
                                                         <TextBlock TextWrapping="Wrap" TextAlignment="Center">
                                                         TEMP OFF
                                                         </TextBlock>
                                                     </Button>
-                                                    <StackPanel Orientation="Horizontal" HorizontalAlignment="Right">
-                                                        <Button Height="40" Command="{Binding SaveProcessParametersCommand}" HorizontalAlignment="Left" IsEnabled="{Binding AuthenticationProvider.CurrentUser,Converter={StaticResource UserRoleToBooleanConverter},ConverterParameter='Researcher'}">
+                                                    <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>
@@ -1634,7 +1594,6 @@
                                                         </StackPanel>
                                                     </Button>
                                                 </StackPanel>
-                                                </Grid>
                                             </StackPanel>
                                         </StackPanel>
                                     </Grid>
-- 
cgit v1.3.1