From 5cda8b0a3ab579dd6f33b1cb19a1d295dc661d28 Mon Sep 17 00:00:00 2001 From: Roy Ben-Shabat Date: Mon, 29 Jan 2018 18:45:10 +0200 Subject: Added gradient display of color Brush Stops. --- .../Views/MainView.xaml | 514 ++++++++++++--------- 1 file changed, 290 insertions(+), 224 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 73c00fea8..9c761309c 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 @@ -19,7 +19,7 @@ xmlns:shapes="clr-namespace:Tango.SharedUI.Shapes;assembly=Tango.SharedUI" xmlns:local="clr-namespace:Tango.MachineStudio.Developer.Views" mc:Ignorable="d" - d:DesignHeight="1080" d:DesignWidth="1920" Background="White" d:DataContext="{d:DesignInstance Type=vm:MainViewVM, IsDesignTimeCreatable=True}" DataContext="{x:Static global:ViewModelLocator.MainViewVM}"> + d:DesignHeight="1080" d:DesignWidth="1920" Background="White" d:DataContext="{d:DesignInstance Type=vm:MainViewVM, IsDesignTimeCreatable=False}" DataContext="{x:Static global:ViewModelLocator.MainViewVM}"> + + + + @@ -295,7 +342,7 @@ - + @@ -448,7 +495,7 @@ - + @@ -503,10 +550,18 @@ - - - SEGMENT BRUSH - + + + + SEGMENT BRUSH + + + + + + + + @@ -516,224 +571,203 @@ - - - - - - - - - - - - - - - - - - Color Space + + + + + + + + + + + + + + + + + + + Color Space + + - + + + + + + - - - - - - - - - - - + + + + + @@ -821,6 +855,7 @@ + @@ -940,7 +975,37 @@ Show Graphs - + + + + + + + MONITORING @@ -1113,5 +1178,6 @@ + -- cgit v1.3.1