From 7e8ff4c3ca798d426eb6f381c5312a747f1bb800 Mon Sep 17 00:00:00 2001 From: Roy Ben-Shabat Date: Sun, 28 Jan 2018 19:40:35 +0200 Subject: Implemented all color spaces on segment brushes (simple conversion). Embedded ColorMine library as a SideChain. --- .../Views/MainView.xaml | 229 ++++++++++++++++++--- 1 file changed, 198 insertions(+), 31 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 e7aa85fb8..73c00fea8 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 @@ -7,6 +7,7 @@ xmlns:global="clr-namespace:Tango.MachineStudio.Developer" 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: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,7 +23,7 @@ @@ -31,6 +32,9 @@ + + + @@ -291,7 +295,7 @@ - + @@ -311,10 +315,10 @@ - - @@ -488,10 +492,10 @@ - - @@ -527,31 +531,189 @@ - - - - - - - - - - - - - - - - - - - - - - - + + + + + + @@ -772,6 +934,11 @@ + + + + Show Graphs + -- cgit v1.3.1