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 ++++++++++++----------
 .../Properties/AssemblyInfo.cs                     |  2 +-
 .../Properties/AssemblyInfo.cs                     |  2 +-
 .../Properties/AssemblyInfo.cs                     |  2 +-
 .../Properties/AssemblyInfo.cs                     |  2 +-
 .../Editors/ControllerElementEditor.xaml           |  2 +-
 .../Editors/MultiGraphElementEditor.xaml           | 10 +---
 .../Editors/SingleGraphElementEditor.xaml          | 10 +---
 .../Properties/AssemblyInfo.cs                     |  2 +-
 .../PropertiesTemplates/ControllerTemplate.xaml    |  4 +-
 .../PropertiesTemplates/MultiGraphTemplate.xaml    |  2 +-
 .../PropertiesTemplates/SingleGraphTemplate.xaml   |  2 +-
 .../TechItems/MultiGraphItem.cs                    | 35 +++++++++----
 .../TechItems/SingleGraphItem.cs                   | 37 +++++++++----
 16 files changed, 101 insertions(+), 75 deletions(-)

(limited to 'Software/Visual_Studio/MachineStudio/Modules')

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>
diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.HardwareDesigner/Properties/AssemblyInfo.cs b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.HardwareDesigner/Properties/AssemblyInfo.cs
index a77506fd7..f6d950a60 100644
--- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.HardwareDesigner/Properties/AssemblyInfo.cs
+++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.HardwareDesigner/Properties/AssemblyInfo.cs
@@ -5,7 +5,7 @@ using System.Runtime.InteropServices;
 using System.Windows;
 
 [assembly: AssemblyTitle("Tango - Machine Studio Hardware Designer Module")]
-[assembly: AssemblyVersion("2.0.6.1407")]
+[assembly: AssemblyVersion("2.0.7.1034")]
 
 [assembly: ComVisible(false)]
 
diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Logging/Properties/AssemblyInfo.cs b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Logging/Properties/AssemblyInfo.cs
index 7c1a4b38b..e02b63000 100644
--- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Logging/Properties/AssemblyInfo.cs
+++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Logging/Properties/AssemblyInfo.cs
@@ -5,7 +5,7 @@ using System.Runtime.InteropServices;
 using System.Windows;
 
 [assembly: AssemblyTitle("Tango - Machine Studio Logging Module")]
-[assembly: AssemblyVersion("2.0.11.1933")]
+[assembly: AssemblyVersion("2.0.12.1034")]
 
 [assembly: ComVisible(false)]
 
diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.MachineDesigner/Properties/AssemblyInfo.cs b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.MachineDesigner/Properties/AssemblyInfo.cs
index ec4ca0566..c930f533e 100644
--- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.MachineDesigner/Properties/AssemblyInfo.cs
+++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.MachineDesigner/Properties/AssemblyInfo.cs
@@ -5,7 +5,7 @@ using System.Runtime.InteropServices;
 using System.Windows;
 
 [assembly: AssemblyTitle("Tango - Machine Studio Machine Designer Module")]
-[assembly: AssemblyVersion("2.0.6.1407")]
+[assembly: AssemblyVersion("2.0.7.1034")]
 
 [assembly: ComVisible(false)]
 
diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Synchronization/Properties/AssemblyInfo.cs b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Synchronization/Properties/AssemblyInfo.cs
index 6a34bd5ad..884170a37 100644
--- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Synchronization/Properties/AssemblyInfo.cs
+++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Synchronization/Properties/AssemblyInfo.cs
@@ -5,7 +5,7 @@ using System.Runtime.InteropServices;
 using System.Windows;
 
 [assembly: AssemblyTitle("Tango - Machine Studio Synchronization Module")]
-[assembly: AssemblyVersion("2.0.7.1304")]
+[assembly: AssemblyVersion("2.0.8.1034")]
 
 [assembly: ComVisible(false)]
 
diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Technician/Editors/ControllerElementEditor.xaml b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Technician/Editors/ControllerElementEditor.xaml
index 5cffffc90..346c0067b 100644
--- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Technician/Editors/ControllerElementEditor.xaml
+++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Technician/Editors/ControllerElementEditor.xaml
@@ -82,7 +82,7 @@
                                 
                             </visuals:Fader>
 
-                            <TextBlock HorizontalAlignment="Left" VerticalAlignment="Top" FontFamily="../Fonts/#digital-7" TextAlignment="Right" Margin="-50 10 0 0" FontSize="30" Text="{Binding ElementName=fader,Path=Value,StringFormat=0.0,FallbackValue=100}">
+                            <TextBlock HorizontalAlignment="Left" VerticalAlignment="Top" FontFamily="../Fonts/#digital-7" TextAlignment="Right" Margin="-80 10 0 0" FontSize="30" Text="{Binding ElementName=fader,Path=Value,StringFormat=0.0,FallbackValue=100}">
                                 <TextBlock.Foreground>
                                     <SolidColorBrush Color="{Binding Color,FallbackValue=White}" />
                                 </TextBlock.Foreground>
diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Technician/Editors/MultiGraphElementEditor.xaml b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Technician/Editors/MultiGraphElementEditor.xaml
index 8e064e30c..9bc22d0f6 100644
--- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Technician/Editors/MultiGraphElementEditor.xaml
+++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Technician/Editors/MultiGraphElementEditor.xaml
@@ -33,14 +33,8 @@
             <controls:RealTimeGraphMultiControl x:Name="InnerGraph" UseAutoRange="{Binding UseAutoRange}" IsHitTestVisible="{Binding RelativeSource={RelativeSource AncestorType=local:ElementsEditor},Path=IsEditable,Converter={StaticResource BooleanInverseConverter}}" x:FieldModifier="public" EnableToolBar="False" SensorName="{Binding TechMonitor.Description}" SensorUnits="{Binding TechMonitor.Units}">
                 <controls:RealTimeGraphMultiControl.Style>
                     <Style TargetType="controls:RealTimeGraphMultiControl">
-                        <Setter Property="Minimum" Value="{Binding TechMonitor.Min,Mode=TwoWay}"></Setter>
-                        <Setter Property="Maximum" Value="{Binding TechMonitor.Max,Mode=TwoWay}"></Setter>
-                        <Style.Triggers>
-                            <DataTrigger Binding="{Binding UseMinMax}" Value="True">
-                                <Setter Property="Minimum" Value="{Binding Min,Mode=TwoWay}"></Setter>
-                                <Setter Property="Maximum" Value="{Binding Max,Mode=TwoWay}"></Setter>
-                            </DataTrigger>
-                        </Style.Triggers>
+                        <Setter Property="Minimum" Value="{Binding Min,Mode=TwoWay}"></Setter>
+                        <Setter Property="Maximum" Value="{Binding Max,Mode=TwoWay}"></Setter>
                     </Style>
                 </controls:RealTimeGraphMultiControl.Style>
             </controls:RealTimeGraphMultiControl>
diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Technician/Editors/SingleGraphElementEditor.xaml b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Technician/Editors/SingleGraphElementEditor.xaml
index 89da5be7c..16f94b251 100644
--- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Technician/Editors/SingleGraphElementEditor.xaml
+++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Technician/Editors/SingleGraphElementEditor.xaml
@@ -33,14 +33,8 @@
             <controls:RealTimeGraphControl x:Name="InnerGraph" UseAutoRange="{Binding UseAutoRange}" IsHitTestVisible="{Binding RelativeSource={RelativeSource AncestorType=local:ElementsEditor},Path=IsEditable,Converter={StaticResource BooleanInverseConverter}}" x:FieldModifier="public" EnableToolBar="False" SensorName="{Binding TechMonitor.Description}" Color="{Binding Color,Mode=OneWay}" SensorUnits="{Binding TechMonitor.Units}">
                 <controls:RealTimeGraphControl.Style>
                     <Style TargetType="controls:RealTimeGraphControl">
-                        <Setter Property="Minimum" Value="{Binding TechMonitor.Min,Mode=TwoWay}"></Setter>
-                        <Setter Property="Maximum" Value="{Binding TechMonitor.Max,Mode=TwoWay}"></Setter>
-                        <Style.Triggers>
-                            <DataTrigger Binding="{Binding UseMinMax}" Value="True">
-                                <Setter Property="Minimum" Value="{Binding Min,Mode=TwoWay}"></Setter>
-                                <Setter Property="Maximum" Value="{Binding Max,Mode=TwoWay}"></Setter>
-                            </DataTrigger>
-                        </Style.Triggers>
+                        <Setter Property="Minimum" Value="{Binding Min,Mode=TwoWay}"></Setter>
+                        <Setter Property="Maximum" Value="{Binding Max,Mode=TwoWay}"></Setter>
                     </Style>
                 </controls:RealTimeGraphControl.Style>
             </controls:RealTimeGraphControl>
diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Technician/Properties/AssemblyInfo.cs b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Technician/Properties/AssemblyInfo.cs
index f19848756..0a28fdd26 100644
--- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Technician/Properties/AssemblyInfo.cs
+++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Technician/Properties/AssemblyInfo.cs
@@ -5,7 +5,7 @@ using System.Runtime.InteropServices;
 using System.Windows;
 
 [assembly: AssemblyTitle("Tango - Machine Studio Technician Module")]
-[assembly: AssemblyVersion("2.0.8.1304")]
+[assembly: AssemblyVersion("2.0.10.1347")]
 
 [assembly: ComVisible(false)]
 
diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Technician/PropertiesTemplates/ControllerTemplate.xaml b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Technician/PropertiesTemplates/ControllerTemplate.xaml
index ffc726abf..2f5934a76 100644
--- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Technician/PropertiesTemplates/ControllerTemplate.xaml
+++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Technician/PropertiesTemplates/ControllerTemplate.xaml
@@ -35,7 +35,9 @@
                         <colorPicker:ColorCanvas SelectedColor="{Binding Color,Mode=TwoWay}" Background="Transparent" />
                     </Viewbox>
 
-                    <TextBlock FontSize="10" Margin="0 20 0 0"><Run>Optimal Range:</Run> <Run Text="{Binding OptimalRangeMinimum,StringFormat=0.0}"></Run><Run> to </Run><Run Text="{Binding OptimalRangeMaximum,StringFormat=0.0}"></Run></TextBlock>
+                    <TextBlock FontSize="10" Margin="0 20 0 0"><Run>Optimal Range:</Run> <Run Text="{Binding OptimalRangeMinimum,StringFormat=0.0}"></Run>
+                        <Run>to</Run>
+                        <Run Text="{Binding OptimalRangeMaximum,StringFormat=0.0}"></Run></TextBlock>
                     <mahapps:RangeSlider Margin="0 5 0 0" Minimum="{Binding TechController.Min}" Maximum="{Binding TechController.Max}" LowerValue="{Binding OptimalRangeMinimum}" UpperValue="{Binding OptimalRangeMaximum}"></mahapps:RangeSlider>
                 </StackPanel>
             </GroupBox>
diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Technician/PropertiesTemplates/MultiGraphTemplate.xaml b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Technician/PropertiesTemplates/MultiGraphTemplate.xaml
index 0e2afcf53..2f5e677c4 100644
--- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Technician/PropertiesTemplates/MultiGraphTemplate.xaml
+++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Technician/PropertiesTemplates/MultiGraphTemplate.xaml
@@ -45,7 +45,7 @@
                                 <mahapps:NumericUpDown HasDecimals="True" HorizontalContentAlignment="Center" BorderBrush="Gainsboro" Foreground="Gray" Margin="0 5 0 0" Minimum="{Binding Min}" Maximum="1000000" Value="{Binding Max,Mode=TwoWay}"></mahapps:NumericUpDown>
                             </StackPanel>
                         </UniformGrid>
-                        <CheckBox Margin="0 10 0 0" IsChecked="{Binding UseMinMax,Converter={StaticResource BooleanInverseConverter}}">Use default ranges</CheckBox>
+                        <Button Margin="0 10 0 0" Command="{Binding ResetMinMaxToDefaultCommand}" Style="{StaticResource MaterialDesignFlatButton}">Set To Default</Button>
                     </StackPanel>
 
                     <CheckBox IsChecked="{Binding UseAutoRange}">Use auto ranges</CheckBox>
diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Technician/PropertiesTemplates/SingleGraphTemplate.xaml b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Technician/PropertiesTemplates/SingleGraphTemplate.xaml
index 5c090d4b5..4acbd2fc1 100644
--- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Technician/PropertiesTemplates/SingleGraphTemplate.xaml
+++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Technician/PropertiesTemplates/SingleGraphTemplate.xaml
@@ -45,7 +45,7 @@
                                 <mahapps:NumericUpDown HasDecimals="True" HorizontalContentAlignment="Center" BorderBrush="Gainsboro" Foreground="Gray" Margin="0 5 0 0" Minimum="{Binding Min}" Maximum="1000000" Value="{Binding Max,Mode=TwoWay}"></mahapps:NumericUpDown>
                             </StackPanel>
                         </UniformGrid>
-                        <CheckBox Margin="0 10 0 0" IsChecked="{Binding UseMinMax,Converter={StaticResource BooleanInverseConverter}}">Use default ranges</CheckBox>
+                        <Button Margin="0 10 0 0" Command="{Binding ResetMinMaxToDefaultCommand}" Style="{StaticResource MaterialDesignFlatButton}">Set To Default</Button>
                     </StackPanel>
 
                     <CheckBox IsChecked="{Binding UseAutoRange}">Use auto ranges</CheckBox>
diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Technician/TechItems/MultiGraphItem.cs b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Technician/TechItems/MultiGraphItem.cs
index d4bdfb7b2..5a3bd0327 100644
--- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Technician/TechItems/MultiGraphItem.cs
+++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Technician/TechItems/MultiGraphItem.cs
@@ -79,16 +79,6 @@ namespace Tango.MachineStudio.Technician.TechItems
             set { _max = value; RaisePropertyChangedAuto(); }
         }
 
-        private bool _useMinMax;
-        /// <summary>
-        /// Gets or sets a value indicating whether [use minimum maximum].
-        /// </summary>
-        public bool UseMinMax
-        {
-            get { return _useMinMax; }
-            set { _useMinMax = value; RaisePropertyChangedAuto(); }
-        }
-
         private bool _useAutoRange;
         /// <summary>
         /// Gets or sets a value indicating whether [use automatic range].
@@ -143,6 +133,12 @@ namespace Tango.MachineStudio.Technician.TechItems
         [XmlIgnore]
         public RelayCommand ToggleRecordingCommand { get; set; }
 
+        /// <summary>
+        /// Gets or sets the reset minimum maximum to default command.
+        /// </summary>
+        [XmlIgnore]
+        public RelayCommand ResetMinMaxToDefaultCommand { get; set; }
+
         /// <summary>
         /// Initializes a new instance of the <see cref="MultiGraphItem"/> class.
         /// </summary>
@@ -166,6 +162,24 @@ namespace Tango.MachineStudio.Technician.TechItems
             });
 
             ToggleRecordingCommand = new RelayCommand(ToggleRecording);
+
+            ResetMinMaxToDefaultCommand = new RelayCommand(() =>
+            {
+                if (TechMonitor != null)
+                {
+                    Min = TechMonitor.Min;
+                    Max = TechMonitor.Max;
+                }
+            });
+        }
+
+        private void OnTechMonitorChanged()
+        {
+            if (TechMonitor != null)
+            {
+                Min = TechMonitor.Min;
+                Max = TechMonitor.Max;
+            }
         }
 
         private void _timer_Tick(object sender, EventArgs e)
@@ -210,7 +224,6 @@ namespace Tango.MachineStudio.Technician.TechItems
             cloned.TechMonitor = TechMonitor;
             cloned.Min = Min;
             cloned.Max = Max;
-            cloned.UseMinMax = UseMinMax;
             cloned.UseAutoRange = UseAutoRange;
             return cloned;
         }
diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Technician/TechItems/SingleGraphItem.cs b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Technician/TechItems/SingleGraphItem.cs
index c175f1138..aa404b215 100644
--- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Technician/TechItems/SingleGraphItem.cs
+++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Technician/TechItems/SingleGraphItem.cs
@@ -50,6 +50,8 @@ namespace Tango.MachineStudio.Technician.TechItems
 
                 ItemGuid = value != null ? value.Guid : null;
                 TechName = _techMonitor != null ? _techMonitor.Description : null;
+
+                OnTechMonitorChanged();
             }
         }
 
@@ -79,16 +81,6 @@ namespace Tango.MachineStudio.Technician.TechItems
             set { _max = value; RaisePropertyChangedAuto(); }
         }
 
-        private bool _useMinMax;
-        /// <summary>
-        /// Gets or sets a value indicating whether [use minimum maximum].
-        /// </summary>
-        public bool UseMinMax
-        {
-            get { return _useMinMax; }
-            set { _useMinMax = value; RaisePropertyChangedAuto(); }
-        }
-
         private bool _useAutoRange;
         /// <summary>
         /// Gets or sets a value indicating whether [use automatic range].
@@ -143,6 +135,12 @@ namespace Tango.MachineStudio.Technician.TechItems
         [XmlIgnore]
         public RelayCommand ToggleRecordingCommand { get; set; }
 
+        /// <summary>
+        /// Gets or sets the reset minimum maximum to default command.
+        /// </summary>
+        [XmlIgnore]
+        public RelayCommand ResetMinMaxToDefaultCommand { get; set; }
+
         /// <summary>
         /// Initializes a new instance of the <see cref="SingleGraphItem"/> class.
         /// </summary>
@@ -166,6 +164,15 @@ namespace Tango.MachineStudio.Technician.TechItems
             });
 
             ToggleRecordingCommand = new RelayCommand(ToggleRecording);
+
+            ResetMinMaxToDefaultCommand = new RelayCommand(() => 
+            {
+                if (TechMonitor != null)
+                {
+                    Min = TechMonitor.Min;
+                    Max = TechMonitor.Max;
+                }
+            });
         }
 
         private void _timer_Tick(object sender, EventArgs e)
@@ -200,6 +207,15 @@ namespace Tango.MachineStudio.Technician.TechItems
             TechMonitor = techMonitor;
         }
 
+        private void OnTechMonitorChanged()
+        {
+            if (TechMonitor != null)
+            {
+                Min = TechMonitor.Min;
+                Max = TechMonitor.Max;
+            }
+        }
+
         /// <summary>
         /// Clones this instance.
         /// </summary>
@@ -210,7 +226,6 @@ namespace Tango.MachineStudio.Technician.TechItems
             cloned.TechMonitor = TechMonitor;
             cloned.Min = Min;
             cloned.Max = Max;
-            cloned.UseMinMax = UseMinMax;
             cloned.UseAutoRange = UseAutoRange;
             return cloned;
         }
-- 
cgit v1.3.1