From 453565753c012a087f402fc55eee528c132b7c8c Mon Sep 17 00:00:00 2001 From: Roy Ben-Shabat Date: Mon, 7 May 2018 14:45:31 +0300 Subject: New Hardware designer module. --- .../Views/MainView.xaml | 374 ++++----------------- 1 file changed, 68 insertions(+), 306 deletions(-) (limited to 'Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.HardwareDesigner/Views/MainView.xaml') diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.HardwareDesigner/Views/MainView.xaml b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.HardwareDesigner/Views/MainView.xaml index 55b3580fe..335ce809e 100644 --- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.HardwareDesigner/Views/MainView.xaml +++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.HardwareDesigner/Views/MainView.xaml @@ -8,12 +8,13 @@ xmlns:mahApps="http://metro.mahapps.com/winfx/xaml/controls" xmlns:editors="clr-namespace:Tango.SharedUI.Editors;assembly=Tango.SharedUI" xmlns:converters="clr-namespace:Tango.SharedUI.Converters;assembly=Tango.SharedUI" + xmlns:entities="clr-namespace:Tango.BL.Entities;assembly=Tango.BL" xmlns:local="clr-namespace:Tango.MachineStudio.HardwareDesigner.Views" xmlns:vm="clr-namespace:Tango.MachineStudio.HardwareDesigner.ViewModels" xmlns:observables="clr-namespace:Tango.BL.Entities;assembly=Tango.BL" xmlns:global="clr-namespace:Tango.MachineStudio.HardwareDesigner" mc:Ignorable="d" - d:DesignHeight="720" Background="Transparent" d:DesignWidth="1280" d:DataContext="{d:DesignInstance Type=vm:MainViewVM, IsDesignTimeCreatable=False}" DataContext="{x:Static global:ViewModelLocator.MainViewVM}"> + d:DesignHeight="720" d:DesignWidth="1280" d:DataContext="{d:DesignInstance Type=vm:MainViewVM, IsDesignTimeCreatable=False}" DataContext="{x:Static global:ViewModelLocator.MainViewVM}"> @@ -25,22 +26,17 @@ - + - - - - - - + HARDWARE DESIGNER @@ -56,202 +52,76 @@ - - - - - - - + - - - - DRAG & DROP DANCERS - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - DRAG & DROP MOTORS - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + MOTORS + + + + + + + + + + + - - - DRAG & DROP PID CONTROLS - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + DANCERS + + + + + + + + + + + - - - DRAG & DROP WINDERS - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + PID CONTROLS + + + + + + + + + + + + + + + WINDERS + + + + + + + + + + + + + - - - - - DROP HERE TO DELETE - - - - + @@ -261,7 +131,7 @@ - + @@ -276,114 +146,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -- cgit v1.3.1