From ffba68ef988743f3b70f3cd85fa16eab2abc7030 Mon Sep 17 00:00:00 2001 From: Roy Date: Sun, 4 Feb 2018 09:04:55 +0200 Subject: Modified video frame. Modified developer module configuration design. Implemented graph full-screen. --- .../Views/MainView.xaml | 212 ++++++++++++++------- 1 file changed, 147 insertions(+), 65 deletions(-) (limited to 'Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/Views/MainView.xaml') diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/Views/MainView.xaml b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/Views/MainView.xaml index 65837bcf1..196b20157 100644 --- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/Views/MainView.xaml +++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/Views/MainView.xaml @@ -8,6 +8,7 @@ xmlns:dragAndDrop="clr-namespace:Tango.DragAndDrop;assembly=Tango.DragAndDrop" xmlns:mahapps="http://metro.mahapps.com/winfx/xaml/controls" xmlns:colorPicker="clr-namespace:Tango;assembly=Tango.ColorPicker" + xmlns:i="http://schemas.microsoft.com/expression/2010/interactivity" xmlns:db="clr-namespace:Tango.MachineStudio.DB.Views.DBViews;assembly=Tango.MachineStudio.DB" xmlns:commonControls="clr-namespace:Tango.MachineStudio.Common.Controls;assembly=Tango.MachineStudio.Common" xmlns:designer="clr-namespace:Tango.MachineStudio.MachineDesigner.Views;assembly=Tango.MachineStudio.MachineDesigner" @@ -22,6 +23,10 @@ mc:Ignorable="d" d:DesignHeight="1080" d:DesignWidth="1920" Background="White" d:DataContext="{d:DesignInstance Type=vm:MainViewVM, IsDesignTimeCreatable=False}" DataContext="{x:Static global:ViewModelLocator.MainViewVM}"> + + + + + + @@ -488,7 +495,7 @@ - + - - - - - - Job Status - - - - - - - - - - - - - - - - - - - - - @@ -1562,7 +1524,7 @@ - + @@ -1741,11 +1703,76 @@ - Show Graphs + Display Graphs + + + + + + + + + + + + + Job Status + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Press + 'Escape' + to exit full screen mode + + + + + + + + -- cgit v1.3.1