aboutsummaryrefslogtreecommitdiffstats
path: root/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.ThreadExtensions/Views/MachineTestResultsView.xaml
diff options
context:
space:
mode:
authorMirta <mirta@twine-s.com>2022-03-28 11:55:13 +0300
committerMirta <mirta@twine-s.com>2022-03-28 11:55:13 +0300
commit06b1cbbbbf5405700b7f01707b3c5ed9b781ca49 (patch)
tree2c8f2fa7eb11acb831d02c651dc8869af58105d5 /Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.ThreadExtensions/Views/MachineTestResultsView.xaml
parent282efeb1b3f943efb58b98dfc9133da2a6e0c9a2 (diff)
parent285a3c332eca02e48e326e6c48498774856a2ccc (diff)
downloadTango-06b1cbbbbf5405700b7f01707b3c5ed9b781ca49.tar.gz
Tango-06b1cbbbbf5405700b7f01707b3c5ed9b781ca49.zip
Merge branch 'software' of https://twinetfs.visualstudio.com/Tango/_git/Tango into software
Diffstat (limited to 'Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.ThreadExtensions/Views/MachineTestResultsView.xaml')
-rw-r--r--Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.ThreadExtensions/Views/MachineTestResultsView.xaml6
1 files changed, 6 insertions, 0 deletions
diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.ThreadExtensions/Views/MachineTestResultsView.xaml b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.ThreadExtensions/Views/MachineTestResultsView.xaml
index bfb8a58d0..820c68715 100644
--- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.ThreadExtensions/Views/MachineTestResultsView.xaml
+++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.ThreadExtensions/Views/MachineTestResultsView.xaml
@@ -58,6 +58,12 @@
<TabItem Header="TEST RESULTS" Margin="20 0 0 0" mahapps:ControlsHelper.HeaderFontSize="20" >
<local:TestResultsView />
</TabItem>
+ <TabItem Header="COLOR CALIBRATION" Margin="20 0 0 0" mahapps:ControlsHelper.HeaderFontSize="20">
+ <local:ColorCalibrationView/>
+ </TabItem>
+ <TabItem Header="COLOR SHADE" Margin="20 0 0 0" mahapps:ControlsHelper.HeaderFontSize="20">
+ <local:ColorShadeView/>
+ </TabItem>
</TabControl>
</Grid>
</DockPanel>