From dbe2e256a3c5b5c1640d6cc55a051d26ce7432d9 Mon Sep 17 00:00:00 2001
From: Roy Ben-Shabat <Roy@Twine-s.com>
Date: Thu, 18 Oct 2018 11:17:03 +0300
Subject: Fixed Segments name editing.

---
 .../Modules/Tango.MachineStudio.Developer/Views/JobView.xaml        | 6 +++---
 1 file changed, 3 insertions(+), 3 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 dec815020..8094e6f94 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
@@ -311,10 +311,10 @@
                                 </StackPanel>
                             </Border>
 
-                            <controls:MultiSelectListBox AutomationProperties.AutomationId="{x:Static automation:Developer.SegmentsListBox}" Style="{StaticResource {x:Type ListBox}}" SelectionMode="Extended" SelectionChanged="ListBox_SelectionChanged" ItemsSource="{Binding SegmentsCollectionView}" SelectedItem="{Binding SelectedSegment}" SelectedItemsList="{Binding SelectedSegments,Mode=TwoWay}" HorizontalContentAlignment="Stretch">
+                            <controls:MultiSelectListBox x:Name="listBoxSegments" AutomationProperties.AutomationId="{x:Static automation:Developer.SegmentsListBox}" Style="{StaticResource {x:Type ListBox}}" SelectionMode="Extended" SelectionChanged="ListBox_SelectionChanged" ItemsSource="{Binding SegmentsCollectionView}" SelectedItem="{Binding SelectedSegment}" SelectedItemsList="{Binding SelectedSegments,Mode=TwoWay}" HorizontalContentAlignment="Stretch">
                                 <ListBox.ItemContainerStyle>
                                     <Style TargetType="ListBoxItem" BasedOn="{StaticResource basicListBoxItem}">
-
+                                        <EventSetter Event="PreviewMouseDown" Handler="ListBoxItem_PreviewMouseDown"></EventSetter>
                                     </Style>
                                 </ListBox.ItemContainerStyle>
                                 <ListBox.ItemTemplate>
@@ -378,7 +378,7 @@
                                                 </StackPanel>
 
 
-                                                <TextBox Grid.Column="1" VerticalAlignment="Center" Width="200" HorizontalContentAlignment="Center" Style="{x:Null}" BorderThickness="0" Background="Transparent" Text="{Binding Name}"></TextBox>
+                                                <TextBox Grid.Column="1" CaretBrush="Transparent" Cursor="Arrow" VerticalAlignment="Center" Width="200" HorizontalContentAlignment="Center" Style="{x:Null}" BorderThickness="0" Background="Transparent" Text="{Binding Name}"></TextBox>
                                             </Grid>
 
                                         </Grid>
-- 
cgit v1.3.1


From 931523a95e4b34558c6537a04fa239671fb13c84 Mon Sep 17 00:00:00 2001
From: Roy Ben-Shabat <Roy@Twine-s.com>
Date: Thu, 18 Oct 2018 11:53:48 +0300
Subject: Fixed issue with liquid volume display on research module.

---
 Software/DB/PPC/Tango.mdf                          | Bin 75497472 -> 75497472 bytes
 Software/DB/PPC/Tango_log.ldf                      | Bin 20578304 -> 20578304 bytes
 Software/DB/Tango.mdf                              | Bin 75497472 -> 75497472 bytes
 Software/DB/Tango_log.ldf                          | Bin 15400960 -> 15400960 bytes
 .../Views/JobView.xaml                             |   8 ++++----
 Software/Visual_Studio/Tango.BL/LiquidVolume.cs    |   2 +-
 6 files changed, 5 insertions(+), 5 deletions(-)

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

diff --git a/Software/DB/PPC/Tango.mdf b/Software/DB/PPC/Tango.mdf
index fec74938d..30050883e 100644
Binary files a/Software/DB/PPC/Tango.mdf and b/Software/DB/PPC/Tango.mdf differ
diff --git a/Software/DB/PPC/Tango_log.ldf b/Software/DB/PPC/Tango_log.ldf
index e38998bab..bfcb2afcd 100644
Binary files a/Software/DB/PPC/Tango_log.ldf and b/Software/DB/PPC/Tango_log.ldf differ
diff --git a/Software/DB/Tango.mdf b/Software/DB/Tango.mdf
index c3c64c089..cb57919ad 100644
Binary files a/Software/DB/Tango.mdf and b/Software/DB/Tango.mdf differ
diff --git a/Software/DB/Tango_log.ldf b/Software/DB/Tango_log.ldf
index 76459b263..02e6010cd 100644
Binary files a/Software/DB/Tango_log.ldf and b/Software/DB/Tango_log.ldf differ
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 8094e6f94..1c0bc515b 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
@@ -762,7 +762,7 @@
                                                                                                                                                 <ContentControl.Foreground>
                                                                                                                                                     <SolidColorBrush Color="{Binding IdsPack.LiquidType.Color,Converter={StaticResource ColorToIntegerConverter}}"></SolidColorBrush>
                                                                                                                                                 </ContentControl.Foreground>
-                                                                                                                                                <mahapps:NumericUpDown FontSize="{StaticResource NumbersFontSize}" FontFamily="{StaticResource digital-7}" HorizontalAlignment="Center" Value="{Binding Volume, Mode=TwoWay}" Background="Transparent" Width="40" StringFormat="0" HideUpDownButtons="True" Minimum="0" Maximum="1000" InterceptArrowKeys="True" BorderThickness="0" InterceptMouseWheel="True" HasDecimals="True" HorizontalContentAlignment="Center">
+                                                                                                                                                <mahapps:NumericUpDown 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>
@@ -805,7 +805,7 @@
                                                                                                                                 <ContentControl.Foreground>
                                                                                                                                     <SolidColorBrush Color="{Binding IdsPack.LiquidType.Color,Converter={StaticResource ColorToIntegerConverter}}"></SolidColorBrush>
                                                                                                                                 </ContentControl.Foreground>
-                                                                                                                                <mahapps:NumericUpDown Foreground="#515151"  FontSize="20" FontFamily="{StaticResource digital-7}" HorizontalAlignment="Center" Value="{Binding Volume, Mode=TwoWay}" Background="Transparent" Width="40" StringFormat="0" HideUpDownButtons="True" Minimum="0" Maximum="1000" InterceptArrowKeys="True" BorderThickness="0" InterceptMouseWheel="True" HasDecimals="True" HorizontalContentAlignment="Center">
+                                                                                                                                <mahapps:NumericUpDown Foreground="#515151" 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>
@@ -1102,7 +1102,7 @@
                                                                                                                             <DataGridTemplateColumn.CellTemplate>
                                                                                                                                 <DataTemplate>
                                                                                                                                     <TextBlock VerticalAlignment="Center">
-                                                                                                                        <Run Text="{Binding Volume,StringFormat='0.0'}"></Run>
+                                                                                                                        <Run Text="{Binding Volume}"></Run>
                                                                                                                         <Run Text="%" Foreground="Gray"></Run>
                                                                                                                                     </TextBlock>
                                                                                                                                 </DataTemplate>
@@ -1528,7 +1528,7 @@
                                             <StackPanel Margin="10 20" VerticalAlignment="Bottom" Orientation="Horizontal" HorizontalAlignment="Right">
                                                 <Button Height="40" Width="105" Command="{Binding ResetProcessParametersCommand}" Background="Transparent" BorderBrush="#202020" Foreground="#202020" Margin="0 2 10 0" ToolTip="Resets the current process parameters in the embedded device">
                                                     <TextBlock TextWrapping="Wrap" TextAlignment="Center">
-                                                        RESET
+                                                        TEMP OFF
                                                     </TextBlock>
                                                 </Button>
                                                 <Button Height="40" Command="{Binding SaveProcessParametersCommand}" HorizontalAlignment="Left">
diff --git a/Software/Visual_Studio/Tango.BL/LiquidVolume.cs b/Software/Visual_Studio/Tango.BL/LiquidVolume.cs
index b44c5c554..df3cd4130 100644
--- a/Software/Visual_Studio/Tango.BL/LiquidVolume.cs
+++ b/Software/Visual_Studio/Tango.BL/LiquidVolume.cs
@@ -60,7 +60,7 @@ namespace Tango.BL
             get { return _volume; }
             set
             {
-                _volume = value;
+                _volume = Math.Round(value, 2);
                 RaisePropertyChangedAuto();
                 OnVolumeChanged();
             }
-- 
cgit v1.3.1