From e852b5a6bf11f8bf85a8f59986da170364a3319f Mon Sep 17 00:00:00 2001
From: Roy Ben-Shabat <Roy@Twine-s.com>
Date: Mon, 6 Aug 2018 13:59:21 +0300
Subject: Machine Studio v2.4

---
 .../Properties/AssemblyInfo.cs                     |  2 +-
 .../ViewModels/MainViewVM.cs                       |  1 +
 .../Views/JobView.xaml                             | 61 ++++++++++++----------
 3 files changed, 36 insertions(+), 28 deletions(-)

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

diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/Properties/AssemblyInfo.cs b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/Properties/AssemblyInfo.cs
index da66a79d8..104fe419e 100644
--- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/Properties/AssemblyInfo.cs
+++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/Properties/AssemblyInfo.cs
@@ -5,7 +5,7 @@ using System.Runtime.InteropServices;
 using System.Windows;
 
 [assembly: AssemblyTitle("Tango - Machine Studio Developer Module")]
-[assembly: AssemblyVersion("2.0.10.1828")]
+[assembly: AssemblyVersion("2.0.12.1347")]
 
 [assembly: ComVisible(false)]
 
diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/ViewModels/MainViewVM.cs b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/ViewModels/MainViewVM.cs
index 85480a4b8..1edbce641 100644
--- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/ViewModels/MainViewVM.cs
+++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/ViewModels/MainViewVM.cs
@@ -1647,6 +1647,7 @@ namespace Tango.MachineStudio.Developer.ViewModels
             {
                 LogManager.LogFormat("Adding new segment to job {0}...", ActiveJob.Name);
                 Segment seg = new Segment();
+                seg.Job = ActiveJob;
                 seg.Name = "Untitled Segment";
                 seg.Length = 10;
 
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 d6652b38d..6d10e910e 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
@@ -550,7 +550,7 @@
                                                                 <StackPanel Margin="5" Width="140">
                                                                     <StackPanel Orientation="Horizontal">
                                                                         <Image Source="../Images/ruler.png" Width="32"></Image>
-                                                                        <TextBlock VerticalAlignment="Center" Margin="5 0 0 0" FontSize="10">Length</TextBlock>
+                                                                        <TextBlock VerticalAlignment="Center" Margin="5 0 0 0" FontSize="10">Segment Length</TextBlock>
                                                                     </StackPanel>
                                                                     <mahapps:NumericUpDown FontSize="{StaticResource NumbersFontSize}" HideUpDownButtons="True" Width="90" HorizontalAlignment="Left" FontFamily="{StaticResource digital-7}" StringFormat="{}{0:N1} m" Margin="0 2 0 0" Minimum="1" Maximum="10000" InterceptArrowKeys="True" Background="Transparent" BorderThickness="0 0 0 1" BorderBrush="DimGray" InterceptMouseWheel="True" HasDecimals="True" HorizontalContentAlignment="Left" Value="{Binding SelectedSegment.Length,Mode=TwoWay}"></mahapps:NumericUpDown>
                                                                 </StackPanel>
@@ -721,33 +721,40 @@
                                                                                                         <DataTrigger Binding="{Binding ColorSpace.Name}" Value="Volume">
                                                                                                             <Setter Property="Content">
                                                                                                                 <Setter.Value>
-                                                                                                                    <StackPanel VerticalAlignment="Center">
-                                                                                                                        <ItemsControl ItemsSource="{Binding LiquidVolumes}" VerticalAlignment="Center">
-                                                                                                                            <ItemsControl.ItemsPanel>
-                                                                                                                                <ItemsPanelTemplate>
-                                                                                                                                    <StackPanel VerticalAlignment="Center" Orientation="Horizontal" IsItemsHost="True"></StackPanel>
-                                                                                                                                </ItemsPanelTemplate>
-                                                                                                                            </ItemsControl.ItemsPanel>
-                                                                                                                            <ItemsControl.ItemTemplate>
-                                                                                                                                <DataTemplate>
-                                                                                                                                    <ContentControl Focusable="False" Style="{StaticResource numberBorder}" Width="60" Height="60" Margin="10 0 0 0">
-                                                                                                                                        <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.Resources>
-                                                                                                                                                <StaticResource ResourceKey="SelectAllTextBoxResource"></StaticResource>
-                                                                                                                                            </mahapps:NumericUpDown.Resources>
-                                                                                                                                        </mahapps:NumericUpDown>
-                                                                                                                                    </ContentControl>
-                                                                                                                                </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="#FFAC3C" />
-                                                                                                                            <TextBlock Margin="5 0 0 0" Foreground="#FFAC3C">Liquid volumes exceeds the maximum range for color conversion!</TextBlock>
+                                                                                                                    <StackPanel Orientation="Horizontal" HorizontalAlignment="Left">
+                                                                                                                        <StackPanel VerticalAlignment="Center">
+                                                                                                                            <ItemsControl ItemsSource="{Binding LiquidVolumes}" VerticalAlignment="Center">
+                                                                                                                                <ItemsControl.ItemsPanel>
+                                                                                                                                    <ItemsPanelTemplate>
+                                                                                                                                        <StackPanel VerticalAlignment="Center" Orientation="Horizontal" IsItemsHost="True"></StackPanel>
+                                                                                                                                    </ItemsPanelTemplate>
+                                                                                                                                </ItemsControl.ItemsPanel>
+                                                                                                                                <ItemsControl.ItemTemplate>
+                                                                                                                                    <DataTemplate>
+                                                                                                                                        <ContentControl Focusable="False" Style="{StaticResource numberBorder}" Width="60" Height="60" Margin="10 0 0 0">
+                                                                                                                                            <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.Resources>
+                                                                                                                                                    <StaticResource ResourceKey="SelectAllTextBoxResource"></StaticResource>
+                                                                                                                                                </mahapps:NumericUpDown.Resources>
+                                                                                                                                            </mahapps:NumericUpDown>
+                                                                                                                                        </ContentControl>
+                                                                                                                                    </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="#FFAC3C" />
+                                                                                                                                <TextBlock Margin="5 0 0 0" Foreground="#FFAC3C">Liquid volumes exceeds the maximum range for color conversion!</TextBlock>
+                                                                                                                            </StackPanel>
                                                                                                                         </StackPanel>
+
+                                                                                                                        <TextBlock VerticalAlignment="Center" Margin="40 0 0 0" FontSize="16" FontStyle="Italic" Foreground="Gray">
+                                                                                                                            <Run>Total:</Run>
+                                                                                                                            <Run Text="{Binding LiquidVolumesSum,Mode=OneWay,StringFormat=0}"></Run>
+                                                                                                                        </TextBlock>
                                                                                                                     </StackPanel>
                                                                                                                 </Setter.Value>
                                                                                                             </Setter>
-- 
cgit v1.3.1