aboutsummaryrefslogtreecommitdiffstats
path: root/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Technician
diff options
context:
space:
mode:
authorRoy Ben-Shabat <Roy@Twine-s.com>2018-10-11 12:56:58 +0300
committerRoy Ben-Shabat <Roy@Twine-s.com>2018-10-11 12:56:58 +0300
commit59f9474345812250ee62cd8ce5d6405821706feb (patch)
treea1dcdfaaf8e1b3e40192f6c07d061023b3185aa6 /Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Technician
parent469ba6f2c0fdeeb942578084c3c6c1d76d040c2d (diff)
downloadTango-59f9474345812250ee62cd8ce5d6405821706feb.tar.gz
Tango-59f9474345812250ee62cd8ce5d6405821706feb.zip
Attempt to resolve issue with multiple active process group for RML.
Added "enable color calibration" option for research module. Some minor changes..
Diffstat (limited to 'Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Technician')
-rw-r--r--Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Technician/PropertiesTemplates/MultiGraphTemplate.xaml2
-rw-r--r--Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Technician/PropertiesTemplates/SingleGraphTemplate.xaml2
2 files changed, 2 insertions, 2 deletions
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 8a3c7c25f..e70619a4f 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
@@ -59,7 +59,7 @@
<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>
+ <CheckBox IsChecked="{Binding UseAutoRange}">Auto Range</CheckBox>
<CheckBox Margin="0 10 0 0" IsChecked="{Binding IsPaused}">Pause</CheckBox>
<Button Margin="0 10" Command="{Binding ClearCommand}">CLEAR</Button>
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 a9d341b01..541467fe9 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
@@ -59,7 +59,7 @@
<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>
+ <CheckBox IsChecked="{Binding UseAutoRange}">Auto Range</CheckBox>
<CheckBox Margin="0 10 0 0" IsChecked="{Binding IsPaused}">Pause</CheckBox>
<Button Margin="0 10" Command="{Binding ClearCommand}">CLEAR</Button>