From 5ed883227020212c8c9faac1f43bc22b9be7dd30 Mon Sep 17 00:00:00 2001 From: Roy Date: Wed, 23 Nov 2022 23:12:46 +0200 Subject: Working on ExternalBridge TCP Firmware. --- .../ViewModels/MachineConnectionViewVM.cs | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) (limited to 'Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI') diff --git a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/ViewModels/MachineConnectionViewVM.cs b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/ViewModels/MachineConnectionViewVM.cs index c7c8335f0..1b09e5735 100644 --- a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/ViewModels/MachineConnectionViewVM.cs +++ b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/ViewModels/MachineConnectionViewVM.cs @@ -21,6 +21,8 @@ namespace Tango.MachineStudio.UI.ViewModels /// public class MachineConnectionViewVM : DialogViewVM { + private ExternalBridgeTcpFirmwareClient _firmwareTcpClient; + private static ExternalBridgeScanner _scanner; public ExternalBridgeScanner Scanner { @@ -107,7 +109,7 @@ namespace Tango.MachineStudio.UI.ViewModels /// /// Called when the dialog has been shown. /// - public override void OnShow() + public async override void OnShow() { base.OnShow(); @@ -123,9 +125,17 @@ namespace Tango.MachineStudio.UI.ViewModels _emulator.Disconnect(); } _emulator = new EmulatorExternalBridge(); + _scanner.AvailableMachines.Add(_emulator); + } + + if (_firmwareTcpClient != null) + { + await _firmwareTcpClient.Disconnect(); + + _firmwareTcpClient = new ExternalBridgeTcpFirmwareClient(); + _scanner.AvailableMachines.Add(_firmwareTcpClient); } - _scanner.AvailableMachines.Add(_emulator); _scanner.Start(); } catch (Exception ex) -- cgit v1.3.1 From daf4d915f4eb60ac54a6c9b2a680e8cf0b1f948a Mon Sep 17 00:00:00 2001 From: Roy Date: Thu, 5 Jan 2023 03:50:24 +0200 Subject: Implemented TCP Firmware Client. --- .../Images/external-bridge-lan.png | Bin 0 -> 6200 bytes .../Tango.MachineStudio.UI.csproj | 1 + .../ViewModels/MachineConnectionViewVM.cs | 9 +---- .../ViewModels/MainViewVM.cs | 3 +- .../Views/ConnectedMachineView.xaml | 45 +++++++++++++++++++++ .../Views/MachineConnectionView.xaml | 12 ++++++ .../Tango.MachineEM.UI/ViewModels/MainViewVM.cs | 15 +++++-- 7 files changed, 72 insertions(+), 13 deletions(-) create mode 100644 Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Images/external-bridge-lan.png (limited to 'Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI') diff --git a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Images/external-bridge-lan.png b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Images/external-bridge-lan.png new file mode 100644 index 000000000..461b29b75 Binary files /dev/null and b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Images/external-bridge-lan.png differ diff --git a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Tango.MachineStudio.UI.csproj b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Tango.MachineStudio.UI.csproj index eca12dfef..4dbcbf600 100644 --- a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Tango.MachineStudio.UI.csproj +++ b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Tango.MachineStudio.UI.csproj @@ -360,6 +360,7 @@ TCC\template.bmp Always + diff --git a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/ViewModels/MachineConnectionViewVM.cs b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/ViewModels/MachineConnectionViewVM.cs index 1b09e5735..511733984 100644 --- a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/ViewModels/MachineConnectionViewVM.cs +++ b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/ViewModels/MachineConnectionViewVM.cs @@ -128,13 +128,8 @@ namespace Tango.MachineStudio.UI.ViewModels _scanner.AvailableMachines.Add(_emulator); } - if (_firmwareTcpClient != null) - { - await _firmwareTcpClient.Disconnect(); - - _firmwareTcpClient = new ExternalBridgeTcpFirmwareClient(); - _scanner.AvailableMachines.Add(_firmwareTcpClient); - } + _firmwareTcpClient = new ExternalBridgeTcpFirmwareClient(); + _scanner.AvailableMachines.Add(_firmwareTcpClient); _scanner.Start(); } diff --git a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/ViewModels/MainViewVM.cs b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/ViewModels/MainViewVM.cs index 0550383fb..70888564b 100644 --- a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/ViewModels/MainViewVM.cs +++ b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/ViewModels/MainViewVM.cs @@ -478,13 +478,12 @@ namespace Tango.MachineStudio.UI.ViewModels x.SelectedMachine.JobUnitsMethod = _settings.JobUnitsMethod; x.SelectedMachine.JobRunsLogger.JobSource = BL.Enumerations.JobSource.Remote; - if (x.SelectedMachine is ExternalBridgeTcpClient) + if (x.SelectedMachine is ExternalBridgeTcpClient && x.SelectedMachine.GetType() != typeof(ExternalBridgeTcpFirmwareClient)) { x.SelectedMachine.As().EnableApplicationLogs = x.EnableApplicationLogs; x.SelectedMachine.RequestTimeout = _settings.ExternalBridgeRequestTimeout; x.SelectedMachine.ContinuousRequestTimeout = _settings.ExternalBridgeContinuousRequestTimeout; } - if (x.SelectedMachine.Adapter is TcpTransportAdapter) { (x.SelectedMachine.Adapter as TcpTransportAdapter).WriteMode = _settings.TcpTransportAdapterWriteMode; diff --git a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Views/ConnectedMachineView.xaml b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Views/ConnectedMachineView.xaml index 600104095..f7eb512ce 100644 --- a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Views/ConnectedMachineView.xaml +++ b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Views/ConnectedMachineView.xaml @@ -49,6 +49,10 @@ + + + + @@ -222,6 +226,47 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Views/MachineConnectionView.xaml b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Views/MachineConnectionView.xaml index 78557a42e..37af16efe 100644 --- a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Views/MachineConnectionView.xaml +++ b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Views/MachineConnectionView.xaml @@ -106,6 +106,18 @@ + + + + + + + IP Address: + + + + + diff --git a/Software/Visual_Studio/Utilities/Tango.MachineEM.UI/ViewModels/MainViewVM.cs b/Software/Visual_Studio/Utilities/Tango.MachineEM.UI/ViewModels/MainViewVM.cs index c993be2d7..be77ee217 100644 --- a/Software/Visual_Studio/Utilities/Tango.MachineEM.UI/ViewModels/MainViewVM.cs +++ b/Software/Visual_Studio/Utilities/Tango.MachineEM.UI/ViewModels/MainViewVM.cs @@ -210,9 +210,12 @@ namespace Tango.MachineEM.UI.ViewModels /// /// The source of the event. /// The instance containing the event data. - private void TcpServer_ClientConnected(object sender, ClientConnectedEventArgs e) + private async void TcpServer_ClientConnected(object sender, ClientConnectedEventArgs e) { - Emulator.Transporter.Adapter = new TcpTransportAdapter(e.Socket); + Emulator.Transporter = new BasicTransporter(new TcpTransportAdapter(e.Socket)); + await Emulator.Transporter.Connect(); + + InvalidateRelayCommands(); } #endregion @@ -224,17 +227,21 @@ namespace Tango.MachineEM.UI.ViewModels /// private async void Start() { + var settings = SettingsManager.Default.GetOrCreate(); + if (SelectedPort == Ports.First()) { - TcpServer = new TcpServer(9999); + TcpServer = new TcpServer(settings.FirmwarePort); TcpServer.ClientConnected += TcpServer_ClientConnected; TcpServer.Start(); + await Emulator.Start(); } else { Emulator.Transporter.Adapter = new UsbTransportAdapter(SelectedPort); + await Emulator.Start(); } - await Emulator.Start(); + InvalidateRelayCommands(); } -- cgit v1.3.1 From a4cd972fd023425fa9414e56748665cb2821f412 Mon Sep 17 00:00:00 2001 From: Roy Date: Fri, 17 Feb 2023 16:17:10 +0200 Subject: MS Eureka connections --- Software/Graphics/Eureka/eureka-full.png | Bin 0 -> 1399099 bytes Software/Graphics/Eureka/eureka.png | Bin 55317 -> 182972 bytes Software/Graphics/Eureka/machine-eureka.png | Bin 191903 -> 0 bytes Software/Graphics/Eureka/tcp.png | Bin 0 -> 1968 bytes .../Controls/MachineConnectionIcon.xaml | 43 +++++++++++++++++++-- .../Controls/MachineConnectionIcon.xaml.cs | 17 +++++++- .../Images/Connections/emulator.png | Bin 0 -> 1131 bytes .../Images/Connections/eureka.png | Bin 0 -> 182972 bytes .../Images/Connections/signalr.png | Bin 0 -> 2739 bytes .../Images/Connections/tcp.png | Bin 0 -> 1968 bytes .../Images/Connections/ts1800.png | Bin 0 -> 43275 bytes .../Images/Connections/usb.png | Bin 0 -> 560 bytes .../Images/Connections/wifi.png | Bin 0 -> 743 bytes .../Tango.MachineStudio.Common.csproj | 11 +++++- .../Views/MachineConnectionView.xaml | 11 +++--- .../ExternalBridge/ExternalBridgeScanner.cs | 2 +- 16 files changed, 72 insertions(+), 12 deletions(-) create mode 100644 Software/Graphics/Eureka/eureka-full.png delete mode 100644 Software/Graphics/Eureka/machine-eureka.png create mode 100644 Software/Graphics/Eureka/tcp.png create mode 100644 Software/Visual_Studio/MachineStudio/Tango.MachineStudio.Common/Images/Connections/emulator.png create mode 100644 Software/Visual_Studio/MachineStudio/Tango.MachineStudio.Common/Images/Connections/eureka.png create mode 100644 Software/Visual_Studio/MachineStudio/Tango.MachineStudio.Common/Images/Connections/signalr.png create mode 100644 Software/Visual_Studio/MachineStudio/Tango.MachineStudio.Common/Images/Connections/tcp.png create mode 100644 Software/Visual_Studio/MachineStudio/Tango.MachineStudio.Common/Images/Connections/ts1800.png create mode 100644 Software/Visual_Studio/MachineStudio/Tango.MachineStudio.Common/Images/Connections/usb.png create mode 100644 Software/Visual_Studio/MachineStudio/Tango.MachineStudio.Common/Images/Connections/wifi.png (limited to 'Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI') diff --git a/Software/Graphics/Eureka/eureka-full.png b/Software/Graphics/Eureka/eureka-full.png new file mode 100644 index 000000000..0c8d452a8 Binary files /dev/null and b/Software/Graphics/Eureka/eureka-full.png differ diff --git a/Software/Graphics/Eureka/eureka.png b/Software/Graphics/Eureka/eureka.png index c93e262c6..1bab06fce 100644 Binary files a/Software/Graphics/Eureka/eureka.png and b/Software/Graphics/Eureka/eureka.png differ diff --git a/Software/Graphics/Eureka/machine-eureka.png b/Software/Graphics/Eureka/machine-eureka.png deleted file mode 100644 index ff1377a9b..000000000 Binary files a/Software/Graphics/Eureka/machine-eureka.png and /dev/null differ diff --git a/Software/Graphics/Eureka/tcp.png b/Software/Graphics/Eureka/tcp.png new file mode 100644 index 000000000..a19a64fec Binary files /dev/null and b/Software/Graphics/Eureka/tcp.png differ diff --git a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.Common/Controls/MachineConnectionIcon.xaml b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.Common/Controls/MachineConnectionIcon.xaml index e43a30e6d..bfcf221c9 100644 --- a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.Common/Controls/MachineConnectionIcon.xaml +++ b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.Common/Controls/MachineConnectionIcon.xaml @@ -5,9 +5,44 @@ xmlns:d="http://schemas.microsoft.com/expression/blend/2008" xmlns:local="clr-namespace:Tango.MachineStudio.Common.Controls" mc:Ignorable="d" - d:DesignHeight="45" d:DesignWidth="45"> - - - + d:DesignHeight="45" d:DesignWidth="45" d:DataContext="{d:DesignInstance Type=local:MachineConnectionIcon,IsDesignTimeCreatable=False}"> + + + + + + + + + + + + diff --git a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.Common/Controls/MachineConnectionIcon.xaml.cs b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.Common/Controls/MachineConnectionIcon.xaml.cs index 72b9af55f..6f754e306 100644 --- a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.Common/Controls/MachineConnectionIcon.xaml.cs +++ b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.Common/Controls/MachineConnectionIcon.xaml.cs @@ -32,6 +32,14 @@ namespace Tango.MachineStudio.Common.Controls /// public partial class MachineConnectionIcon : UserControl { + public MachineTypes MachineType + { + get { return (MachineTypes)GetValue(MachineTypeProperty); } + set { SetValue(MachineTypeProperty, value); } + } + public static readonly DependencyProperty MachineTypeProperty = + DependencyProperty.Register("MachineType", typeof(MachineTypes), typeof(MachineConnectionIcon), new PropertyMetadata(MachineTypes.TS1800)); + public IExternalBridgeClient ExternalBridgeClient { get { return (IExternalBridgeClient)GetValue(ExternalBridgeClientProperty); } @@ -56,13 +64,20 @@ namespace Tango.MachineStudio.Common.Controls { ExternalBridgeClientType = ExternalBridgeClientType.Usb; } - else if (ExternalBridgeClient.GetType() == typeof(ExternalBridgeTcpClient)) + else if (ExternalBridgeClient.GetType() == typeof(ExternalBridgeTcpFirmwareClient)) { ExternalBridgeClientType = ExternalBridgeClientType.Tcp; + MachineType = MachineTypes.Eureka; + } + else if (ExternalBridgeClient.GetType() == typeof(ExternalBridgeTcpClient)) + { + ExternalBridgeClientType = ExternalBridgeClientType.Wifi; + MachineType = ExternalBridgeClient.MachineType; } else if (ExternalBridgeClient.GetType() == typeof(ExternalBridgeSignalRClient)) { ExternalBridgeClientType = ExternalBridgeClientType.SignalR; + MachineType = ExternalBridgeClient.MachineType; } else if (ExternalBridgeClient.GetType() == typeof(EmulatorExternalBridge)) { diff --git a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.Common/Images/Connections/emulator.png b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.Common/Images/Connections/emulator.png new file mode 100644 index 000000000..cd3478ab2 Binary files /dev/null and b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.Common/Images/Connections/emulator.png differ diff --git a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.Common/Images/Connections/eureka.png b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.Common/Images/Connections/eureka.png new file mode 100644 index 000000000..1bab06fce Binary files /dev/null and b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.Common/Images/Connections/eureka.png differ diff --git a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.Common/Images/Connections/signalr.png b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.Common/Images/Connections/signalr.png new file mode 100644 index 000000000..20d329640 Binary files /dev/null and b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.Common/Images/Connections/signalr.png differ diff --git a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.Common/Images/Connections/tcp.png b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.Common/Images/Connections/tcp.png new file mode 100644 index 000000000..a19a64fec Binary files /dev/null and b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.Common/Images/Connections/tcp.png differ diff --git a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.Common/Images/Connections/ts1800.png b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.Common/Images/Connections/ts1800.png new file mode 100644 index 000000000..116e1e9c7 Binary files /dev/null and b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.Common/Images/Connections/ts1800.png differ diff --git a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.Common/Images/Connections/usb.png b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.Common/Images/Connections/usb.png new file mode 100644 index 000000000..d0b917b44 Binary files /dev/null and b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.Common/Images/Connections/usb.png differ diff --git a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.Common/Images/Connections/wifi.png b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.Common/Images/Connections/wifi.png new file mode 100644 index 000000000..8c4bfebc4 Binary files /dev/null and b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.Common/Images/Connections/wifi.png differ diff --git a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.Common/Tango.MachineStudio.Common.csproj b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.Common/Tango.MachineStudio.Common.csproj index 345c5f627..91a8b5930 100644 --- a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.Common/Tango.MachineStudio.Common.csproj +++ b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.Common/Tango.MachineStudio.Common.csproj @@ -439,10 +439,19 @@ + + + + + + + + + - + diff --git a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Views/MachineConnectionView.xaml b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Views/MachineConnectionView.xaml index 37af16efe..59b9fe67f 100644 --- a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Views/MachineConnectionView.xaml +++ b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Views/MachineConnectionView.xaml @@ -8,6 +8,7 @@ xmlns:integration="clr-namespace:Tango.Integration.ExternalBridge;assembly=Tango.Integration" xmlns:converters="clr-namespace:Tango.SharedUI.Converters;assembly=Tango.SharedUI" xmlns:emulations="clr-namespace:Tango.Emulations.ExternalBridge;assembly=Tango.Emulations" + xmlns:controls="clr-namespace:Tango.MachineStudio.Common.Controls;assembly=Tango.MachineStudio.Common" xmlns:local="clr-namespace:Tango.MachineStudio.UI.Views" mc:Ignorable="d" d:DesignHeight="300" d:DesignWidth="400" Width="700" Height="500" Background="{StaticResource Dialog.Background}" DataContext="{Binding MachineConnectionViewVM, Source={StaticResource Locator}}" Foreground="{StaticResource MainWindow.Foreground}"> @@ -58,7 +59,7 @@ - + S/N: @@ -76,7 +77,7 @@ - + S/N: @@ -94,7 +95,7 @@ - + Port: @@ -109,7 +110,7 @@ - + IP Address: @@ -121,7 +122,7 @@ - + diff --git a/Software/Visual_Studio/Tango.Integration/ExternalBridge/ExternalBridgeScanner.cs b/Software/Visual_Studio/Tango.Integration/ExternalBridge/ExternalBridgeScanner.cs index a2b0d0f5b..8ffe2b86c 100644 --- a/Software/Visual_Studio/Tango.Integration/ExternalBridge/ExternalBridgeScanner.cs +++ b/Software/Visual_Studio/Tango.Integration/ExternalBridge/ExternalBridgeScanner.cs @@ -348,7 +348,7 @@ namespace Tango.Integration.ExternalBridge if (newMachine != null) { - newMachine.MachineType = knownMachine.Type; + newMachine.MachineType = (MachineTypes)machine.MachineType; LogManager.Log("Found a new machine via SignalR " + newMachine.SerialNumber); ThreadsHelper.InvokeUINow(() => -- cgit v1.3.1 From a054f1ab36fe3cbe816f78fa5ea68b30cde1bd43 Mon Sep 17 00:00:00 2001 From: Roy Date: Sun, 19 Feb 2023 00:13:53 +0200 Subject: FSE Eureka Design Support. --- Software/Graphics/Eureka/eureka-full-a.png | Bin 0 -> 538797 bytes Software/Graphics/Eureka/eureka-full-dence.png | Bin 0 -> 1038958 bytes Software/Graphics/Eureka/eureka_dence.png | Bin 0 -> 168692 bytes .../Views/MachineView.xaml | 2 +- .../Views/SelectionView.xaml | 5 +- .../Connection/MachineConnectionTypes.cs | 4 + .../Controls/ConnectedMachineIcon.xaml | 20 +- .../Controls/MachineConnectionIcon.cs | 83 +++ .../Controls/MachineConnectionIcon.xaml | 64 +++ .../FSE/Tango.FSE.Common/Controls/MachineIcon.cs | 54 ++ .../FSE/Tango.FSE.Common/Controls/MachineIcon.xaml | 30 ++ .../Tango.FSE.Common/Controls/MachineIconFull.cs | 25 + .../Tango.FSE.Common/Controls/MachineIconFull.xaml | 30 ++ .../FSE/Tango.FSE.Common/Controls/MachineView.xaml | 561 ++++++++++++++------- .../Images/Connections/emulator.png | Bin 0 -> 1131 bytes .../Tango.FSE.Common/Images/Connections/eureka.png | Bin 0 -> 168692 bytes .../Images/Connections/signalr.png | Bin 0 -> 2739 bytes .../Tango.FSE.Common/Images/Connections/tcp.png | Bin 0 -> 1968 bytes .../Tango.FSE.Common/Images/Connections/ts1800.png | Bin 0 -> 43275 bytes .../Tango.FSE.Common/Images/Connections/usb.png | Bin 0 -> 560 bytes .../Tango.FSE.Common/Images/Connections/wifi.png | Bin 0 -> 743 bytes .../FSE/Tango.FSE.Common/Images/eureka_full.png | Bin 0 -> 1038958 bytes .../FSE/Tango.FSE.Common/Images/eureka_small.png | Bin 0 -> 33703 bytes .../FSE/Tango.FSE.Common/Images/machines.png | Bin 0 -> 394373 bytes .../FSE/Tango.FSE.Common/Resources/Colors.xaml | 2 + .../FSE/Tango.FSE.Common/Resources/Controls.xaml | 3 + .../FSE/Tango.FSE.Common/Resources/Images.xaml | 3 + .../FSE/Tango.FSE.Common/Resources/Styles.xaml | 5 +- .../FSE/Tango.FSE.Common/Tango.FSE.Common.csproj | 46 +- .../FSE/Tango.FSE.Common/Themes/Generic.xaml | 1 + .../Connection/DefaultMachineProvider.cs | 4 +- .../Dialogs/MachineConnectionEmulatorView.xaml | 3 +- .../Dialogs/MachineConnectionLostView.xaml | 9 +- .../Dialogs/MachineConnectionSignalRView.xaml | 3 +- .../Dialogs/MachineConnectionUsbView.xaml | 3 +- .../Dialogs/MachineConnectionUsbViewVM.cs | 3 + .../Dialogs/MachineConnectionWifiView.xaml | 3 +- .../Dialogs/MachineWaitForConnectionView.xaml | 9 +- .../Tango.FSE.UI/Panes/MachineConnectionPane.xaml | 9 +- .../FSE/Tango.FSE.UI/Tiles/Machine/MachineTile.cs | 20 + .../Tiles/Machine/MachineTileView.xaml | 2 +- .../FSE/Tango.FSE.UI/Views/LayoutView.xaml | 2 +- .../FSE/Tango.FSE.UI/Views/LoginView.xaml | 2 +- .../Images/Connections/eureka.png | Bin 182972 -> 168692 bytes .../Views/ConnectedMachineView.xaml | 25 +- .../Properties/AssemblyInfo.cs | 2 +- 46 files changed, 776 insertions(+), 261 deletions(-) create mode 100644 Software/Graphics/Eureka/eureka-full-a.png create mode 100644 Software/Graphics/Eureka/eureka-full-dence.png create mode 100644 Software/Graphics/Eureka/eureka_dence.png create mode 100644 Software/Visual_Studio/FSE/Tango.FSE.Common/Controls/MachineConnectionIcon.cs create mode 100644 Software/Visual_Studio/FSE/Tango.FSE.Common/Controls/MachineConnectionIcon.xaml create mode 100644 Software/Visual_Studio/FSE/Tango.FSE.Common/Controls/MachineIcon.cs create mode 100644 Software/Visual_Studio/FSE/Tango.FSE.Common/Controls/MachineIcon.xaml create mode 100644 Software/Visual_Studio/FSE/Tango.FSE.Common/Controls/MachineIconFull.cs create mode 100644 Software/Visual_Studio/FSE/Tango.FSE.Common/Controls/MachineIconFull.xaml create mode 100644 Software/Visual_Studio/FSE/Tango.FSE.Common/Images/Connections/emulator.png create mode 100644 Software/Visual_Studio/FSE/Tango.FSE.Common/Images/Connections/eureka.png create mode 100644 Software/Visual_Studio/FSE/Tango.FSE.Common/Images/Connections/signalr.png create mode 100644 Software/Visual_Studio/FSE/Tango.FSE.Common/Images/Connections/tcp.png create mode 100644 Software/Visual_Studio/FSE/Tango.FSE.Common/Images/Connections/ts1800.png create mode 100644 Software/Visual_Studio/FSE/Tango.FSE.Common/Images/Connections/usb.png create mode 100644 Software/Visual_Studio/FSE/Tango.FSE.Common/Images/Connections/wifi.png create mode 100644 Software/Visual_Studio/FSE/Tango.FSE.Common/Images/eureka_full.png create mode 100644 Software/Visual_Studio/FSE/Tango.FSE.Common/Images/eureka_small.png create mode 100644 Software/Visual_Studio/FSE/Tango.FSE.Common/Images/machines.png (limited to 'Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI') diff --git a/Software/Graphics/Eureka/eureka-full-a.png b/Software/Graphics/Eureka/eureka-full-a.png new file mode 100644 index 000000000..0609f0a9c Binary files /dev/null and b/Software/Graphics/Eureka/eureka-full-a.png differ diff --git a/Software/Graphics/Eureka/eureka-full-dence.png b/Software/Graphics/Eureka/eureka-full-dence.png new file mode 100644 index 000000000..484bb2ac1 Binary files /dev/null and b/Software/Graphics/Eureka/eureka-full-dence.png differ diff --git a/Software/Graphics/Eureka/eureka_dence.png b/Software/Graphics/Eureka/eureka_dence.png new file mode 100644 index 000000000..212d391d4 Binary files /dev/null and b/Software/Graphics/Eureka/eureka_dence.png differ diff --git a/Software/Visual_Studio/FSE/Modules/Tango.FSE.MachineConfiguration/Views/MachineView.xaml b/Software/Visual_Studio/FSE/Modules/Tango.FSE.MachineConfiguration/Views/MachineView.xaml index d33966e18..3de00198c 100644 --- a/Software/Visual_Studio/FSE/Modules/Tango.FSE.MachineConfiguration/Views/MachineView.xaml +++ b/Software/Visual_Studio/FSE/Modules/Tango.FSE.MachineConfiguration/Views/MachineView.xaml @@ -27,7 +27,7 @@ - + diff --git a/Software/Visual_Studio/FSE/Modules/Tango.FSE.MachineConfiguration/Views/SelectionView.xaml b/Software/Visual_Studio/FSE/Modules/Tango.FSE.MachineConfiguration/Views/SelectionView.xaml index a2aa7240b..ca6d3ca4c 100644 --- a/Software/Visual_Studio/FSE/Modules/Tango.FSE.MachineConfiguration/Views/SelectionView.xaml +++ b/Software/Visual_Studio/FSE/Modules/Tango.FSE.MachineConfiguration/Views/SelectionView.xaml @@ -4,6 +4,7 @@ xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" xmlns:d="http://schemas.microsoft.com/expression/blend/2008" xmlns:local="clr-namespace:Tango.FSE.MachineConfiguration.Views" + xmlns:controls="clr-namespace:Tango.FSE.Common.Controls;assembly=Tango.FSE.Common" xmlns:material="http://materialdesigninxaml.net/winfx/xaml/themes" xmlns:global="clr-namespace:Tango.FSE.MachineConfiguration" xmlns:autoComplete="clr-namespace:Tango.AutoComplete.Editors;assembly=Tango.AutoComplete" @@ -28,7 +29,7 @@ - + @@ -39,7 +40,7 @@ - + diff --git a/Software/Visual_Studio/FSE/Tango.FSE.Common/Connection/MachineConnectionTypes.cs b/Software/Visual_Studio/FSE/Tango.FSE.Common/Connection/MachineConnectionTypes.cs index ef233dda8..5b585533e 100644 --- a/Software/Visual_Studio/FSE/Tango.FSE.Common/Connection/MachineConnectionTypes.cs +++ b/Software/Visual_Studio/FSE/Tango.FSE.Common/Connection/MachineConnectionTypes.cs @@ -17,6 +17,10 @@ namespace Tango.FSE.Common.Connection /// USB, /// + /// Local TCP connection. + /// + TCP, + /// /// Local area network. /// Wifi, diff --git a/Software/Visual_Studio/FSE/Tango.FSE.Common/Controls/ConnectedMachineIcon.xaml b/Software/Visual_Studio/FSE/Tango.FSE.Common/Controls/ConnectedMachineIcon.xaml index f6be93ec9..98d9dc13d 100644 --- a/Software/Visual_Studio/FSE/Tango.FSE.Common/Controls/ConnectedMachineIcon.xaml +++ b/Software/Visual_Studio/FSE/Tango.FSE.Common/Controls/ConnectedMachineIcon.xaml @@ -9,24 +9,6 @@ mc:Ignorable="d" d:DesignHeight="50" d:DesignWidth="50" Height="50"> - - - - - - - - - - - - - - - - - - - + diff --git a/Software/Visual_Studio/FSE/Tango.FSE.Common/Controls/MachineConnectionIcon.cs b/Software/Visual_Studio/FSE/Tango.FSE.Common/Controls/MachineConnectionIcon.cs new file mode 100644 index 000000000..d739ac6e5 --- /dev/null +++ b/Software/Visual_Studio/FSE/Tango.FSE.Common/Controls/MachineConnectionIcon.cs @@ -0,0 +1,83 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; +using System.Windows; +using System.Windows.Controls; +using System.Windows.Data; +using System.Windows.Documents; +using System.Windows.Input; +using System.Windows.Media; +using System.Windows.Media.Imaging; +using System.Windows.Navigation; +using System.Windows.Shapes; +using Tango.BL.Enumerations; +using Tango.Emulations.ExternalBridge; +using Tango.FSE.Common.Connection; +using Tango.Integration.ExternalBridge; + +namespace Tango.FSE.Common.Controls +{ + public class MachineConnectionIcon : Control + { + public MachineTypes MachineType + { + get { return (MachineTypes)GetValue(MachineTypeProperty); } + set { SetValue(MachineTypeProperty, value); } + } + public static readonly DependencyProperty MachineTypeProperty = + DependencyProperty.Register("MachineType", typeof(MachineTypes), typeof(MachineConnectionIcon), new PropertyMetadata(MachineTypes.TS1800)); + + public IExternalBridgeClient ExternalBridgeClient + { + get { return (IExternalBridgeClient)GetValue(ExternalBridgeClientProperty); } + set { SetValue(ExternalBridgeClientProperty, value); } + } + public static readonly DependencyProperty ExternalBridgeClientProperty = + DependencyProperty.Register("ExternalBridgeClient", typeof(IExternalBridgeClient), typeof(MachineConnectionIcon), new PropertyMetadata((d, e) => (d as MachineConnectionIcon).OnExternalBridgeClientChanged())); + + public MachineConnectionTypes ExternalBridgeClientType + { + get { return (MachineConnectionTypes)GetValue(ExternalBridgeClientTypeProperty); } + set { SetValue(ExternalBridgeClientTypeProperty, value); } + } + public static readonly DependencyProperty ExternalBridgeClientTypeProperty = + DependencyProperty.Register("ExternalBridgeClientType", typeof(MachineConnectionTypes), typeof(MachineConnectionIcon), new PropertyMetadata(MachineConnectionTypes.USB)); + + private void OnExternalBridgeClientChanged() + { + if (ExternalBridgeClient != null) + { + if (ExternalBridgeClient.GetType() == typeof(ExternalBridgeUsbClient)) + { + ExternalBridgeClientType = MachineConnectionTypes.USB; + } + else if (ExternalBridgeClient.GetType() == typeof(ExternalBridgeTcpFirmwareClient)) + { + ExternalBridgeClientType = MachineConnectionTypes.TCP; + MachineType = MachineTypes.Eureka; + } + else if (ExternalBridgeClient.GetType() == typeof(ExternalBridgeTcpClient)) + { + ExternalBridgeClientType = MachineConnectionTypes.Wifi; + MachineType = ExternalBridgeClient.MachineType; + } + else if (ExternalBridgeClient.GetType() == typeof(ExternalBridgeSignalRClient)) + { + ExternalBridgeClientType = MachineConnectionTypes.SignalR; + MachineType = ExternalBridgeClient.MachineType; + } + else if (ExternalBridgeClient.GetType() == typeof(EmulatorExternalBridge)) + { + ExternalBridgeClientType = MachineConnectionTypes.Emulator; + } + } + } + + static MachineConnectionIcon() + { + DefaultStyleKeyProperty.OverrideMetadata(typeof(MachineConnectionIcon), new FrameworkPropertyMetadata(typeof(MachineConnectionIcon))); + } + } +} diff --git a/Software/Visual_Studio/FSE/Tango.FSE.Common/Controls/MachineConnectionIcon.xaml b/Software/Visual_Studio/FSE/Tango.FSE.Common/Controls/MachineConnectionIcon.xaml new file mode 100644 index 000000000..c402b2d21 --- /dev/null +++ b/Software/Visual_Studio/FSE/Tango.FSE.Common/Controls/MachineConnectionIcon.xaml @@ -0,0 +1,64 @@ + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/Software/Visual_Studio/FSE/Tango.FSE.Common/Controls/MachineIcon.cs b/Software/Visual_Studio/FSE/Tango.FSE.Common/Controls/MachineIcon.cs new file mode 100644 index 000000000..349328676 --- /dev/null +++ b/Software/Visual_Studio/FSE/Tango.FSE.Common/Controls/MachineIcon.cs @@ -0,0 +1,54 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; +using System.Windows; +using System.Windows.Controls; +using System.Windows.Data; +using System.Windows.Documents; +using System.Windows.Input; +using System.Windows.Media; +using System.Windows.Media.Imaging; +using System.Windows.Navigation; +using System.Windows.Shapes; + +namespace Tango.FSE.Common.Controls +{ + /// + /// Follow steps 1a or 1b and then 2 to use this custom control in a XAML file. + /// + /// Step 1a) Using this custom control in a XAML file that exists in the current project. + /// Add this XmlNamespace attribute to the root element of the markup file where it is + /// to be used: + /// + /// xmlns:MyNamespace="clr-namespace:Tango.FSE.Common.Controls" + /// + /// + /// Step 1b) Using this custom control in a XAML file that exists in a different project. + /// Add this XmlNamespace attribute to the root element of the markup file where it is + /// to be used: + /// + /// xmlns:MyNamespace="clr-namespace:Tango.FSE.Common.Controls;assembly=Tango.FSE.Common.Controls" + /// + /// You will also need to add a project reference from the project where the XAML file lives + /// to this project and Rebuild to avoid compilation errors: + /// + /// Right click on the target project in the Solution Explorer and + /// "Add Reference"->"Projects"->[Browse to and select this project] + /// + /// + /// Step 2) + /// Go ahead and use your control in the XAML file. + /// + /// + /// + /// + public class MachineIcon : Control + { + static MachineIcon() + { + DefaultStyleKeyProperty.OverrideMetadata(typeof(MachineIcon), new FrameworkPropertyMetadata(typeof(MachineIcon))); + } + } +} diff --git a/Software/Visual_Studio/FSE/Tango.FSE.Common/Controls/MachineIcon.xaml b/Software/Visual_Studio/FSE/Tango.FSE.Common/Controls/MachineIcon.xaml new file mode 100644 index 000000000..e4e9e1b48 --- /dev/null +++ b/Software/Visual_Studio/FSE/Tango.FSE.Common/Controls/MachineIcon.xaml @@ -0,0 +1,30 @@ + + + + + + + + + + + + \ No newline at end of file diff --git a/Software/Visual_Studio/FSE/Tango.FSE.Common/Controls/MachineIconFull.cs b/Software/Visual_Studio/FSE/Tango.FSE.Common/Controls/MachineIconFull.cs new file mode 100644 index 000000000..c6f1da030 --- /dev/null +++ b/Software/Visual_Studio/FSE/Tango.FSE.Common/Controls/MachineIconFull.cs @@ -0,0 +1,25 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; +using System.Windows; +using System.Windows.Controls; +using System.Windows.Data; +using System.Windows.Documents; +using System.Windows.Input; +using System.Windows.Media; +using System.Windows.Media.Imaging; +using System.Windows.Navigation; +using System.Windows.Shapes; + +namespace Tango.FSE.Common.Controls +{ + public class MachineIconFull : Control + { + static MachineIconFull() + { + DefaultStyleKeyProperty.OverrideMetadata(typeof(MachineIconFull), new FrameworkPropertyMetadata(typeof(MachineIconFull))); + } + } +} diff --git a/Software/Visual_Studio/FSE/Tango.FSE.Common/Controls/MachineIconFull.xaml b/Software/Visual_Studio/FSE/Tango.FSE.Common/Controls/MachineIconFull.xaml new file mode 100644 index 000000000..10a4d655d --- /dev/null +++ b/Software/Visual_Studio/FSE/Tango.FSE.Common/Controls/MachineIconFull.xaml @@ -0,0 +1,30 @@ + + + + + + + + + + + + \ No newline at end of file diff --git a/Software/Visual_Studio/FSE/Tango.FSE.Common/Controls/MachineView.xaml b/Software/Visual_Studio/FSE/Tango.FSE.Common/Controls/MachineView.xaml index c82b5b460..25fc3f88e 100644 --- a/Software/Visual_Studio/FSE/Tango.FSE.Common/Controls/MachineView.xaml +++ b/Software/Visual_Studio/FSE/Tango.FSE.Common/Controls/MachineView.xaml @@ -24,247 +24,426 @@ - - - - - - + - + - - - - - + + + + + - - - - + + + + - - - 1 - 2 - 3 - 4 - 5 - 6 - 7 - 8 - 9 - 10 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + 1 + 2 + 3 + 4 + 5 + 6 + 7 + 8 + 9 + 10 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - + + + + + + + + + + + + + + + + - - - - - - - - - - + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - NO IDS PACKS - + + + + + + + + + NO IDS PACKS + - - - - + + - - - + + + - - - - + + + + - - - - - + + + + + - Touch Panel - - - - + Touch Panel + + + + - Embedded Firmware - - - - + Embedded Firmware + + + + - Dispensers - - - - + Dispensers + + + + - - - - - - - - + + + + + + - - - + + + - - + + - - - + + + - - + + - - - + + + + + + + + + + + + + + + + + + + + + + + + + + 1 + 2 + 3 + 4 + 5 + 6 + 7 + 8 + 9 + 10 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + NO IDS PACKS + + + + + + + + + + + + + + - - - - + + + + diff --git a/Software/Visual_Studio/FSE/Tango.FSE.Common/Images/Connections/emulator.png b/Software/Visual_Studio/FSE/Tango.FSE.Common/Images/Connections/emulator.png new file mode 100644 index 000000000..cd3478ab2 Binary files /dev/null and b/Software/Visual_Studio/FSE/Tango.FSE.Common/Images/Connections/emulator.png differ diff --git a/Software/Visual_Studio/FSE/Tango.FSE.Common/Images/Connections/eureka.png b/Software/Visual_Studio/FSE/Tango.FSE.Common/Images/Connections/eureka.png new file mode 100644 index 000000000..212d391d4 Binary files /dev/null and b/Software/Visual_Studio/FSE/Tango.FSE.Common/Images/Connections/eureka.png differ diff --git a/Software/Visual_Studio/FSE/Tango.FSE.Common/Images/Connections/signalr.png b/Software/Visual_Studio/FSE/Tango.FSE.Common/Images/Connections/signalr.png new file mode 100644 index 000000000..20d329640 Binary files /dev/null and b/Software/Visual_Studio/FSE/Tango.FSE.Common/Images/Connections/signalr.png differ diff --git a/Software/Visual_Studio/FSE/Tango.FSE.Common/Images/Connections/tcp.png b/Software/Visual_Studio/FSE/Tango.FSE.Common/Images/Connections/tcp.png new file mode 100644 index 000000000..a19a64fec Binary files /dev/null and b/Software/Visual_Studio/FSE/Tango.FSE.Common/Images/Connections/tcp.png differ diff --git a/Software/Visual_Studio/FSE/Tango.FSE.Common/Images/Connections/ts1800.png b/Software/Visual_Studio/FSE/Tango.FSE.Common/Images/Connections/ts1800.png new file mode 100644 index 000000000..116e1e9c7 Binary files /dev/null and b/Software/Visual_Studio/FSE/Tango.FSE.Common/Images/Connections/ts1800.png differ diff --git a/Software/Visual_Studio/FSE/Tango.FSE.Common/Images/Connections/usb.png b/Software/Visual_Studio/FSE/Tango.FSE.Common/Images/Connections/usb.png new file mode 100644 index 000000000..d0b917b44 Binary files /dev/null and b/Software/Visual_Studio/FSE/Tango.FSE.Common/Images/Connections/usb.png differ diff --git a/Software/Visual_Studio/FSE/Tango.FSE.Common/Images/Connections/wifi.png b/Software/Visual_Studio/FSE/Tango.FSE.Common/Images/Connections/wifi.png new file mode 100644 index 000000000..8c4bfebc4 Binary files /dev/null and b/Software/Visual_Studio/FSE/Tango.FSE.Common/Images/Connections/wifi.png differ diff --git a/Software/Visual_Studio/FSE/Tango.FSE.Common/Images/eureka_full.png b/Software/Visual_Studio/FSE/Tango.FSE.Common/Images/eureka_full.png new file mode 100644 index 000000000..484bb2ac1 Binary files /dev/null and b/Software/Visual_Studio/FSE/Tango.FSE.Common/Images/eureka_full.png differ diff --git a/Software/Visual_Studio/FSE/Tango.FSE.Common/Images/eureka_small.png b/Software/Visual_Studio/FSE/Tango.FSE.Common/Images/eureka_small.png new file mode 100644 index 000000000..c9da4ae29 Binary files /dev/null and b/Software/Visual_Studio/FSE/Tango.FSE.Common/Images/eureka_small.png differ diff --git a/Software/Visual_Studio/FSE/Tango.FSE.Common/Images/machines.png b/Software/Visual_Studio/FSE/Tango.FSE.Common/Images/machines.png new file mode 100644 index 000000000..788d1e67b Binary files /dev/null and b/Software/Visual_Studio/FSE/Tango.FSE.Common/Images/machines.png differ diff --git a/Software/Visual_Studio/FSE/Tango.FSE.Common/Resources/Colors.xaml b/Software/Visual_Studio/FSE/Tango.FSE.Common/Resources/Colors.xaml index 792826d31..e10b0678d 100644 --- a/Software/Visual_Studio/FSE/Tango.FSE.Common/Resources/Colors.xaml +++ b/Software/Visual_Studio/FSE/Tango.FSE.Common/Resources/Colors.xaml @@ -22,6 +22,7 @@ #404040 #FF6F6F + #EA6FFF #58C13B #6DDAFF #F3FF6D @@ -66,6 +67,7 @@ + diff --git a/Software/Visual_Studio/FSE/Tango.FSE.Common/Resources/Controls.xaml b/Software/Visual_Studio/FSE/Tango.FSE.Common/Resources/Controls.xaml index e2b01843e..0204be2ea 100644 --- a/Software/Visual_Studio/FSE/Tango.FSE.Common/Resources/Controls.xaml +++ b/Software/Visual_Studio/FSE/Tango.FSE.Common/Resources/Controls.xaml @@ -15,6 +15,9 @@ + + + \ No newline at end of file diff --git a/Software/Visual_Studio/FSE/Tango.FSE.Common/Resources/Images.xaml b/Software/Visual_Studio/FSE/Tango.FSE.Common/Resources/Images.xaml index 91bf1816f..e69b69e44 100644 --- a/Software/Visual_Studio/FSE/Tango.FSE.Common/Resources/Images.xaml +++ b/Software/Visual_Studio/FSE/Tango.FSE.Common/Resources/Images.xaml @@ -4,7 +4,10 @@ + + + diff --git a/Software/Visual_Studio/FSE/Tango.FSE.Common/Resources/Styles.xaml b/Software/Visual_Studio/FSE/Tango.FSE.Common/Resources/Styles.xaml index 4b5d8f8d2..c7e36cafa 100644 --- a/Software/Visual_Studio/FSE/Tango.FSE.Common/Resources/Styles.xaml +++ b/Software/Visual_Studio/FSE/Tango.FSE.Common/Resources/Styles.xaml @@ -4,6 +4,7 @@ xmlns:actions="clr-namespace:Tango.FSE.Common.EventTriggerActions" xmlns:material="http://materialdesigninxaml.net/winfx/xaml/themes" xmlns:controls="clr-namespace:Tango.SharedUI.Controls;assembly=Tango.SharedUI" + xmlns:commonControls="clr-namespace:Tango.FSE.Common.Controls" xmlns:wpf="http://materialdesigninxaml.net/winfx/xaml/themes" xmlns:mahapps="http://metro.mahapps.com/winfx/xaml/controls" xmlns:i="http://schemas.microsoft.com/expression/2010/interactivity" @@ -625,7 +626,7 @@ - + @@ -638,7 +639,7 @@ - + diff --git a/Software/Visual_Studio/FSE/Tango.FSE.Common/Tango.FSE.Common.csproj b/Software/Visual_Studio/FSE/Tango.FSE.Common/Tango.FSE.Common.csproj index 95ee0b2f5..82d62ff14 100644 --- a/Software/Visual_Studio/FSE/Tango.FSE.Common/Tango.FSE.Common.csproj +++ b/Software/Visual_Studio/FSE/Tango.FSE.Common/Tango.FSE.Common.csproj @@ -190,6 +190,9 @@ + + + MachineView.xaml @@ -380,6 +383,18 @@ Designer MSBuild:Compile + + Designer + MSBuild:Compile + + + Designer + MSBuild:Compile + + + Designer + MSBuild:Compile + MSBuild:Compile Designer @@ -670,7 +685,36 @@ - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/Software/Visual_Studio/FSE/Tango.FSE.Common/Themes/Generic.xaml b/Software/Visual_Studio/FSE/Tango.FSE.Common/Themes/Generic.xaml index 9b1bd93cf..994dfc6ba 100644 --- a/Software/Visual_Studio/FSE/Tango.FSE.Common/Themes/Generic.xaml +++ b/Software/Visual_Studio/FSE/Tango.FSE.Common/Themes/Generic.xaml @@ -3,5 +3,6 @@ xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:local="clr-namespace:Tango.FSE.Common"> + diff --git a/Software/Visual_Studio/FSE/Tango.FSE.UI/Connection/DefaultMachineProvider.cs b/Software/Visual_Studio/FSE/Tango.FSE.UI/Connection/DefaultMachineProvider.cs index ffc0e8e60..745211705 100644 --- a/Software/Visual_Studio/FSE/Tango.FSE.UI/Connection/DefaultMachineProvider.cs +++ b/Software/Visual_Studio/FSE/Tango.FSE.UI/Connection/DefaultMachineProvider.cs @@ -200,11 +200,11 @@ namespace Tango.FSE.UI.Connection if (machine.GetType() == typeof(ExternalBridgeUsbClient)) { - vm = await NotificationProvider.ShowDialog(); + vm = await NotificationProvider.ShowDialog(new MachineConnectionUsbViewVM() { Machine = machine }); } else if (machine.GetType() == typeof(EmulatorExternalBridge)) { - vm = await NotificationProvider.ShowDialog(); + vm = await NotificationProvider.ShowDialog(new MachineConnectionEmulatorViewVM() { Machine = machine }); } else if (machine is ExternalBridgeTcpClient) { diff --git a/Software/Visual_Studio/FSE/Tango.FSE.UI/Dialogs/MachineConnectionEmulatorView.xaml b/Software/Visual_Studio/FSE/Tango.FSE.UI/Dialogs/MachineConnectionEmulatorView.xaml index 45be0817b..0e78e8b55 100644 --- a/Software/Visual_Studio/FSE/Tango.FSE.UI/Dialogs/MachineConnectionEmulatorView.xaml +++ b/Software/Visual_Studio/FSE/Tango.FSE.UI/Dialogs/MachineConnectionEmulatorView.xaml @@ -5,13 +5,14 @@ xmlns:d="http://schemas.microsoft.com/expression/blend/2008" xmlns:autoComplete="clr-namespace:Tango.AutoComplete.Editors;assembly=Tango.AutoComplete" xmlns:materialDesign="http://materialdesigninxaml.net/winfx/xaml/themes" + xmlns:controls="clr-namespace:Tango.FSE.Common.Controls;assembly=Tango.FSE.Common" xmlns:local="clr-namespace:Tango.FSE.UI.Dialogs" mc:Ignorable="d" Height="300" Width="700" d:DataContext="{d:DesignInstance Type=local:MachineConnectionEmulatorViewVM, IsDesignTimeCreatable=False}" Background="{StaticResource FSE_PrimaryBackgroundLightBrush}" Foreground="{StaticResource FSE_PrimaryForegroundBrush}"> - + diff --git a/Software/Visual_Studio/FSE/Tango.FSE.UI/Dialogs/MachineConnectionLostView.xaml b/Software/Visual_Studio/FSE/Tango.FSE.UI/Dialogs/MachineConnectionLostView.xaml index 06617885a..26fca9093 100644 --- a/Software/Visual_Studio/FSE/Tango.FSE.UI/Dialogs/MachineConnectionLostView.xaml +++ b/Software/Visual_Studio/FSE/Tango.FSE.UI/Dialogs/MachineConnectionLostView.xaml @@ -5,17 +5,18 @@ xmlns:d="http://schemas.microsoft.com/expression/blend/2008" xmlns:material="http://materialdesigninxaml.net/winfx/xaml/themes" xmlns:local="clr-namespace:Tango.FSE.UI.Dialogs" + xmlns:controls="clr-namespace:Tango.FSE.Common.Controls;assembly=Tango.FSE.Common" mc:Ignorable="d" Height="300" Width="700" d:DataContext="{d:DesignInstance Type=local:MachineConnectionLostViewVM, IsDesignTimeCreatable=False}" Background="{StaticResource FSE_PrimaryBackgroundLightBrush}" Foreground="{StaticResource FSE_PrimaryForegroundBrush}"> - - + + - - + + diff --git a/Software/Visual_Studio/FSE/Tango.FSE.UI/Dialogs/MachineConnectionSignalRView.xaml b/Software/Visual_Studio/FSE/Tango.FSE.UI/Dialogs/MachineConnectionSignalRView.xaml index b091516df..43f32d820 100644 --- a/Software/Visual_Studio/FSE/Tango.FSE.UI/Dialogs/MachineConnectionSignalRView.xaml +++ b/Software/Visual_Studio/FSE/Tango.FSE.UI/Dialogs/MachineConnectionSignalRView.xaml @@ -6,13 +6,14 @@ xmlns:autoComplete="clr-namespace:Tango.AutoComplete.Editors;assembly=Tango.AutoComplete" xmlns:helpers="clr-namespace:Tango.SharedUI.Helpers;assembly=Tango.SharedUI" xmlns:materialDesign="http://materialdesigninxaml.net/winfx/xaml/themes" + xmlns:controls="clr-namespace:Tango.FSE.Common.Controls;assembly=Tango.FSE.Common" xmlns:local="clr-namespace:Tango.FSE.UI.Dialogs" mc:Ignorable="d" Height="300" Width="700" d:DataContext="{d:DesignInstance Type=local:MachineConnectionSignalRViewVM, IsDesignTimeCreatable=False}" Background="{StaticResource FSE_PrimaryBackgroundLightBrush}" Foreground="{StaticResource FSE_PrimaryForegroundBrush}"> - + Connect to '' diff --git a/Software/Visual_Studio/FSE/Tango.FSE.UI/Dialogs/MachineConnectionUsbView.xaml b/Software/Visual_Studio/FSE/Tango.FSE.UI/Dialogs/MachineConnectionUsbView.xaml index 6ab2414f3..c285d2ed6 100644 --- a/Software/Visual_Studio/FSE/Tango.FSE.UI/Dialogs/MachineConnectionUsbView.xaml +++ b/Software/Visual_Studio/FSE/Tango.FSE.UI/Dialogs/MachineConnectionUsbView.xaml @@ -5,13 +5,14 @@ xmlns:d="http://schemas.microsoft.com/expression/blend/2008" xmlns:autoComplete="clr-namespace:Tango.AutoComplete.Editors;assembly=Tango.AutoComplete" xmlns:materialDesign="http://materialdesigninxaml.net/winfx/xaml/themes" + xmlns:controls="clr-namespace:Tango.FSE.Common.Controls;assembly=Tango.FSE.Common" xmlns:local="clr-namespace:Tango.FSE.UI.Dialogs" mc:Ignorable="d" Height="300" Width="700" d:DataContext="{d:DesignInstance Type=local:MachineConnectionUsbViewVM, IsDesignTimeCreatable=False}" Background="{StaticResource FSE_PrimaryBackgroundLightBrush}" Foreground="{StaticResource FSE_PrimaryForegroundBrush}"> - + diff --git a/Software/Visual_Studio/FSE/Tango.FSE.UI/Dialogs/MachineConnectionUsbViewVM.cs b/Software/Visual_Studio/FSE/Tango.FSE.UI/Dialogs/MachineConnectionUsbViewVM.cs index e881da0ac..9056e7f4d 100644 --- a/Software/Visual_Studio/FSE/Tango.FSE.UI/Dialogs/MachineConnectionUsbViewVM.cs +++ b/Software/Visual_Studio/FSE/Tango.FSE.UI/Dialogs/MachineConnectionUsbViewVM.cs @@ -10,6 +10,7 @@ using Tango.Core.DI; using Tango.FSE.BL; using Tango.FSE.Common; using Tango.FSE.Common.AutoComplete; +using Tango.Integration.ExternalBridge; namespace Tango.FSE.UI.Dialogs { @@ -22,6 +23,8 @@ namespace Tango.FSE.UI.Dialogs [TangoInject] protected FSEServicesContainer Services { get; set; } + public IExternalBridgeClient Machine { get; set; } + /// /// Gets or sets the machines completion source. /// diff --git a/Software/Visual_Studio/FSE/Tango.FSE.UI/Dialogs/MachineConnectionWifiView.xaml b/Software/Visual_Studio/FSE/Tango.FSE.UI/Dialogs/MachineConnectionWifiView.xaml index 0d037e939..e20c474b7 100644 --- a/Software/Visual_Studio/FSE/Tango.FSE.UI/Dialogs/MachineConnectionWifiView.xaml +++ b/Software/Visual_Studio/FSE/Tango.FSE.UI/Dialogs/MachineConnectionWifiView.xaml @@ -3,6 +3,7 @@ xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" xmlns:d="http://schemas.microsoft.com/expression/blend/2008" + xmlns:controls="clr-namespace:Tango.FSE.Common.Controls;assembly=Tango.FSE.Common" xmlns:autoComplete="clr-namespace:Tango.AutoComplete.Editors;assembly=Tango.AutoComplete" xmlns:helpers="clr-namespace:Tango.SharedUI.Helpers;assembly=Tango.SharedUI" xmlns:materialDesign="http://materialdesigninxaml.net/winfx/xaml/themes" @@ -12,7 +13,7 @@ - + Connect to '' diff --git a/Software/Visual_Studio/FSE/Tango.FSE.UI/Dialogs/MachineWaitForConnectionView.xaml b/Software/Visual_Studio/FSE/Tango.FSE.UI/Dialogs/MachineWaitForConnectionView.xaml index 946e2bf0d..1d9359b04 100644 --- a/Software/Visual_Studio/FSE/Tango.FSE.UI/Dialogs/MachineWaitForConnectionView.xaml +++ b/Software/Visual_Studio/FSE/Tango.FSE.UI/Dialogs/MachineWaitForConnectionView.xaml @@ -4,6 +4,7 @@ xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" xmlns:d="http://schemas.microsoft.com/expression/blend/2008" xmlns:material="http://materialdesigninxaml.net/winfx/xaml/themes" + xmlns:controls="clr-namespace:Tango.FSE.Common.Controls;assembly=Tango.FSE.Common" xmlns:local="clr-namespace:Tango.FSE.UI.Dialogs" mc:Ignorable="d" Height="300" Width="700" d:DataContext="{d:DesignInstance Type=local:MachineWaitForConnectionViewVM, IsDesignTimeCreatable=False}" Background="{StaticResource FSE_PrimaryBackgroundLightBrush}" Foreground="{StaticResource FSE_PrimaryForegroundBrush}"> @@ -11,11 +12,11 @@ - - + + - - + + diff --git a/Software/Visual_Studio/FSE/Tango.FSE.UI/Panes/MachineConnectionPane.xaml b/Software/Visual_Studio/FSE/Tango.FSE.UI/Panes/MachineConnectionPane.xaml index b4b70cffd..1c6668e2a 100644 --- a/Software/Visual_Studio/FSE/Tango.FSE.UI/Panes/MachineConnectionPane.xaml +++ b/Software/Visual_Studio/FSE/Tango.FSE.UI/Panes/MachineConnectionPane.xaml @@ -5,6 +5,7 @@ xmlns:d="http://schemas.microsoft.com/expression/blend/2008" xmlns:material="http://materialdesigninxaml.net/winfx/xaml/themes" xmlns:local="clr-namespace:Tango.FSE.UI.Panes" + xmlns:controls="clr-namespace:Tango.FSE.Common.Controls;assembly=Tango.FSE.Common" mc:Ignorable="d" d:DesignHeight="600" d:DesignWidth="350" d:DataContext="{d:DesignInstance Type=local:MachineConnectionPaneVM, IsDesignTimeCreatable=False}"> @@ -34,7 +35,7 @@ - + In-Memory Emulator @@ -55,7 +56,7 @@ - + Port: @@ -90,7 +91,7 @@ - + S/N: @@ -117,7 +118,7 @@ - + S/N: diff --git a/Software/Visual_Studio/FSE/Tango.FSE.UI/Tiles/Machine/MachineTile.cs b/Software/Visual_Studio/FSE/Tango.FSE.UI/Tiles/Machine/MachineTile.cs index 611c4d93e..45265c636 100644 --- a/Software/Visual_Studio/FSE/Tango.FSE.UI/Tiles/Machine/MachineTile.cs +++ b/Software/Visual_Studio/FSE/Tango.FSE.UI/Tiles/Machine/MachineTile.cs @@ -5,11 +5,19 @@ using System.Text; using System.Threading.Tasks; using System.Windows; using Tango.FSE.Common; +using Tango.FSE.Common.Connection; namespace Tango.FSE.UI.Tiles.Machine { public class MachineTile : DashboardTile { + private Tango.BL.Entities.Machine _machine; + public Tango.BL.Entities.Machine Machine + { + get { return _machine; } + set { _machine = value; RaisePropertyChangedAuto(); } + } + public MachineTile() { Name = "Machine Configuration"; @@ -21,6 +29,18 @@ namespace Tango.FSE.UI.Tiles.Machine RowSpan = 6; } + public override void OnApplicationReady() + { + base.OnApplicationReady(); + + MachineProvider.MachineConnected += MachineProvider_MachineConnected; + } + + private void MachineProvider_MachineConnected(object sender, MachineConnectedEventArgs e) + { + Machine = MachineProvider.Machine; + } + public override FrameworkElement GetView() { return new MachineTileView(); diff --git a/Software/Visual_Studio/FSE/Tango.FSE.UI/Tiles/Machine/MachineTileView.xaml b/Software/Visual_Studio/FSE/Tango.FSE.UI/Tiles/Machine/MachineTileView.xaml index 625f0df7d..9f1d7bd30 100644 --- a/Software/Visual_Studio/FSE/Tango.FSE.UI/Tiles/Machine/MachineTileView.xaml +++ b/Software/Visual_Studio/FSE/Tango.FSE.UI/Tiles/Machine/MachineTileView.xaml @@ -8,6 +8,6 @@ mc:Ignorable="d" d:DesignHeight="450" d:DesignWidth="800" d:DataContext="{d:DesignInstance Type=local:MachineTile, IsDesignTimeCreatable=False}"> - + diff --git a/Software/Visual_Studio/FSE/Tango.FSE.UI/Views/LayoutView.xaml b/Software/Visual_Studio/FSE/Tango.FSE.UI/Views/LayoutView.xaml index b897851fc..f1ed89aff 100644 --- a/Software/Visual_Studio/FSE/Tango.FSE.UI/Views/LayoutView.xaml +++ b/Software/Visual_Studio/FSE/Tango.FSE.UI/Views/LayoutView.xaml @@ -548,7 +548,7 @@ - + diff --git a/Software/Visual_Studio/FSE/Tango.FSE.UI/Views/LoginView.xaml b/Software/Visual_Studio/FSE/Tango.FSE.UI/Views/LoginView.xaml index 0ab9c5018..ca56e7b05 100644 --- a/Software/Visual_Studio/FSE/Tango.FSE.UI/Views/LoginView.xaml +++ b/Software/Visual_Studio/FSE/Tango.FSE.UI/Views/LoginView.xaml @@ -50,7 +50,7 @@ v - + diff --git a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.Common/Images/Connections/eureka.png b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.Common/Images/Connections/eureka.png index 1bab06fce..212d391d4 100644 Binary files a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.Common/Images/Connections/eureka.png and b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.Common/Images/Connections/eureka.png differ diff --git a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Views/ConnectedMachineView.xaml b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Views/ConnectedMachineView.xaml index f7eb512ce..f7751958a 100644 --- a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Views/ConnectedMachineView.xaml +++ b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Views/ConnectedMachineView.xaml @@ -9,6 +9,7 @@ xmlns:emulations="clr-namespace:Tango.Emulations.ExternalBridge;assembly=Tango.Emulations" xmlns:converters="clr-namespace:Tango.SharedUI.Converters;assembly=Tango.SharedUI" xmlns:controls="clr-namespace:Tango.SharedUI.Controls;assembly=Tango.SharedUI" + xmlns:commonControls="clr-namespace:Tango.MachineStudio.Common.Controls;assembly=Tango.MachineStudio.Common" xmlns:d="http://schemas.microsoft.com/expression/blend/2008" xmlns:local="clr-namespace:Tango.MachineStudio.UI.Views" mc:Ignorable="d" @@ -32,29 +33,7 @@ - - - - - - - - - - - - - - - - - - - - - - - + diff --git a/Software/Visual_Studio/Web/Tango.MachineService/Properties/AssemblyInfo.cs b/Software/Visual_Studio/Web/Tango.MachineService/Properties/AssemblyInfo.cs index 1b038f94b..99a310975 100644 --- a/Software/Visual_Studio/Web/Tango.MachineService/Properties/AssemblyInfo.cs +++ b/Software/Visual_Studio/Web/Tango.MachineService/Properties/AssemblyInfo.cs @@ -24,4 +24,4 @@ using System.Runtime.InteropServices; // // You can specify all the values or you can default the Revision and Build Numbers // by using the '*' as shown below: -[assembly: AssemblyVersion("3.0.17.0")] +[assembly: AssemblyVersion("3.0.18.0")] -- cgit v1.3.1 From 6082dfdb3d8cbffb1c2de651a4800e1b348f638e Mon Sep 17 00:00:00 2001 From: Roy Date: Sat, 4 Mar 2023 14:35:58 +0200 Subject: MS & Major Version. --- Software/Visual_Studio/FSE/Tango.FSE.UI/Properties/AssemblyInfo.cs | 2 +- .../MachineStudio/Tango.MachineStudio.UI/Properties/AssemblyInfo.cs | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI') diff --git a/Software/Visual_Studio/FSE/Tango.FSE.UI/Properties/AssemblyInfo.cs b/Software/Visual_Studio/FSE/Tango.FSE.UI/Properties/AssemblyInfo.cs index 48c32e1b9..afe4677be 100644 --- a/Software/Visual_Studio/FSE/Tango.FSE.UI/Properties/AssemblyInfo.cs +++ b/Software/Visual_Studio/FSE/Tango.FSE.UI/Properties/AssemblyInfo.cs @@ -8,4 +8,4 @@ using System.Windows; // set of attributes. Change these attribute values to modify the information // associated with an assembly. [assembly: AssemblyTitle("Tango FSE")] -[assembly: AssemblyVersion("1.4.6.0")] +[assembly: AssemblyVersion("2.0.0.0")] diff --git a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Properties/AssemblyInfo.cs b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Properties/AssemblyInfo.cs index c87abde49..88e1ee88d 100644 --- a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Properties/AssemblyInfo.cs +++ b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Properties/AssemblyInfo.cs @@ -4,5 +4,5 @@ using System.Runtime.InteropServices; [assembly: System.Windows.ThemeInfo(System.Windows.ResourceDictionaryLocation.None, System.Windows.ResourceDictionaryLocation.SourceAssembly)] [assembly: AssemblyTitle("Tango - Machine Studio")] -[assembly: AssemblyVersion("4.9.6.0")] +[assembly: AssemblyVersion("5.0.0.0")] [assembly: ComVisible(false)] \ No newline at end of file -- cgit v1.3.1 From 74650fb4891617561c4686099938150eb34fdb25 Mon Sep 17 00:00:00 2001 From: Roy Ben-Shabat Date: Sun, 5 Mar 2023 23:37:09 +0200 Subject: Machine_Studio_v5.3.0 --- .../Machine Studio Installer.aip | 6 +++--- .../PMR/ColorLab/RecommendedProcessTableInput.pb-c.c | 19 ++++++++++++++++--- .../PMR/ColorLab/RecommendedProcessTableInput.pb-c.h | 4 +++- .../Tango.MachineStudio.UI/Properties/AssemblyInfo.cs | 2 +- Software/Visual_Studio/Tango.Web/DeploymentSlot.cs | 5 ++++- 5 files changed, 27 insertions(+), 9 deletions(-) (limited to 'Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI') diff --git a/Software/Visual_Studio/Advanced Installer Projects/Machine Studio Installer.aip b/Software/Visual_Studio/Advanced Installer Projects/Machine Studio Installer.aip index d78e37f68..a8b75663a 100644 --- a/Software/Visual_Studio/Advanced Installer Projects/Machine Studio Installer.aip +++ b/Software/Visual_Studio/Advanced Installer Projects/Machine Studio Installer.aip @@ -16,10 +16,10 @@ - + - + @@ -845,7 +845,7 @@ - + diff --git a/Software/Visual_Studio/ColorLib/Tango.ColorLib_v5/PMR/ColorLab/RecommendedProcessTableInput.pb-c.c b/Software/Visual_Studio/ColorLib/Tango.ColorLib_v5/PMR/ColorLab/RecommendedProcessTableInput.pb-c.c index 39c139cda..90164c8b7 100644 --- a/Software/Visual_Studio/ColorLib/Tango.ColorLib_v5/PMR/ColorLab/RecommendedProcessTableInput.pb-c.c +++ b/Software/Visual_Studio/ColorLib/Tango.ColorLib_v5/PMR/ColorLab/RecommendedProcessTableInput.pb-c.c @@ -52,7 +52,7 @@ void recommended_process_table_input__free_unpacked assert(message->base.descriptor == &recommended_process_table_input__descriptor); protobuf_c_message_free_unpacked ((ProtobufCMessage*)message, allocator); } -static const ProtobufCFieldDescriptor recommended_process_table_input__field_descriptors[11] = +static const ProtobufCFieldDescriptor recommended_process_table_input__field_descriptors[12] = { { "ThreadL", @@ -186,6 +186,18 @@ static const ProtobufCFieldDescriptor recommended_process_table_input__field_des 0, /* flags */ 0,NULL,NULL /* reserved1,reserved2, etc */ }, + { + "VMax", + 12, + PROTOBUF_C_LABEL_OPTIONAL, + PROTOBUF_C_TYPE_DOUBLE, + offsetof(RecommendedProcessTableInput, has_vmax), + offsetof(RecommendedProcessTableInput, vmax), + NULL, + NULL, + 0, /* flags */ + 0,NULL,NULL /* reserved1,reserved2, etc */ + }, }; static const unsigned recommended_process_table_input__field_indices_by_name[] = { 3, /* field[3] = ForwardData */ @@ -199,11 +211,12 @@ static const unsigned recommended_process_table_input__field_indices_by_name[] = 0, /* field[0] = ThreadL */ 7, /* field[7] = UseLightInks */ 10, /* field[10] = UseLubricantTransform */ + 11, /* field[11] = VMax */ }; static const ProtobufCIntRange recommended_process_table_input__number_ranges[1 + 1] = { { 1, 0 }, - { 0, 11 } + { 0, 12 } }; const ProtobufCMessageDescriptor recommended_process_table_input__descriptor = { @@ -213,7 +226,7 @@ const ProtobufCMessageDescriptor recommended_process_table_input__descriptor = "RecommendedProcessTableInput", "", sizeof(RecommendedProcessTableInput), - 11, + 12, recommended_process_table_input__field_descriptors, recommended_process_table_input__field_indices_by_name, 1, recommended_process_table_input__number_ranges, diff --git a/Software/Visual_Studio/ColorLib/Tango.ColorLib_v5/PMR/ColorLab/RecommendedProcessTableInput.pb-c.h b/Software/Visual_Studio/ColorLib/Tango.ColorLib_v5/PMR/ColorLab/RecommendedProcessTableInput.pb-c.h index e75ddd39e..df4a26da3 100644 --- a/Software/Visual_Studio/ColorLib/Tango.ColorLib_v5/PMR/ColorLab/RecommendedProcessTableInput.pb-c.h +++ b/Software/Visual_Studio/ColorLib/Tango.ColorLib_v5/PMR/ColorLab/RecommendedProcessTableInput.pb-c.h @@ -51,10 +51,12 @@ struct _RecommendedProcessTableInput ProtobufCBinaryData lubdata; protobuf_c_boolean has_uselubricanttransform; protobuf_c_boolean uselubricanttransform; + protobuf_c_boolean has_vmax; + double vmax; }; #define RECOMMENDED_PROCESS_TABLE_INPUT__INIT \ { PROTOBUF_C_MESSAGE_INIT (&recommended_process_table_input__descriptor) \ - , 0, 0, 0, 0, 0, 0, 0, {0,NULL}, 0,NULL, 0,NULL, 0,NULL, 0, 0, 0, {0,NULL}, 0, {0,NULL}, 0, 0 } + , 0, 0, 0, 0, 0, 0, 0, {0,NULL}, 0,NULL, 0,NULL, 0,NULL, 0, 0, 0, {0,NULL}, 0, {0,NULL}, 0, 0, 0, 0 } /* RecommendedProcessTableInput methods */ diff --git a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Properties/AssemblyInfo.cs b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Properties/AssemblyInfo.cs index 88e1ee88d..5204929c5 100644 --- a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Properties/AssemblyInfo.cs +++ b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Properties/AssemblyInfo.cs @@ -4,5 +4,5 @@ using System.Runtime.InteropServices; [assembly: System.Windows.ThemeInfo(System.Windows.ResourceDictionaryLocation.None, System.Windows.ResourceDictionaryLocation.SourceAssembly)] [assembly: AssemblyTitle("Tango - Machine Studio")] -[assembly: AssemblyVersion("5.0.0.0")] +[assembly: AssemblyVersion("5.3.0.0")] [assembly: ComVisible(false)] \ No newline at end of file diff --git a/Software/Visual_Studio/Tango.Web/DeploymentSlot.cs b/Software/Visual_Studio/Tango.Web/DeploymentSlot.cs index 0e470a735..d8c64363c 100644 --- a/Software/Visual_Studio/Tango.Web/DeploymentSlot.cs +++ b/Software/Visual_Studio/Tango.Web/DeploymentSlot.cs @@ -29,6 +29,9 @@ namespace Tango.Web STAGE, [Description("Production")] [DeploymentSlotAddress("https://machineservice.twine-srv.com")] - PROD + PROD, + [Description("BB")] + [DeploymentSlotAddress("https://machineservice-machineservice-bb.azurewebsites.net")] + BB } } -- cgit v1.3.1 From 059d15ea2de2f5ca5bf3ebde9d3e5223f9e84211 Mon Sep 17 00:00:00 2001 From: Roy Date: Tue, 14 Mar 2023 16:15:16 +0200 Subject: MS Eureka Connection on USB. --- .../MachineStudio/Tango.MachineStudio.UI/ViewModels/MainViewVM.cs | 1 + 1 file changed, 1 insertion(+) (limited to 'Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI') diff --git a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/ViewModels/MainViewVM.cs b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/ViewModels/MainViewVM.cs index 70888564b..293cccec4 100644 --- a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/ViewModels/MainViewVM.cs +++ b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/ViewModels/MainViewVM.cs @@ -580,6 +580,7 @@ namespace Tango.MachineStudio.UI.ViewModels { _reconnectionMachine = client; + client.MachineType = machine.Type; //In case trying to connect to Eureka on USB. await client.Connect(); client.SerialNumber = machine.SerialNumber; ApplicationManager.SetConnectedMachine(client); -- cgit v1.3.1 From 3c12477835db990e2717521397b0a2df6a2aa95e Mon Sep 17 00:00:00 2001 From: Roy Ben-Shabat Date: Tue, 14 Mar 2023 16:18:46 +0200 Subject: Machine_Studio_v5.4.0 --- .../Advanced Installer Projects/Machine Studio Installer.aip | 6 +++--- .../MachineStudio/Tango.MachineStudio.UI/Properties/AssemblyInfo.cs | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) (limited to 'Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI') diff --git a/Software/Visual_Studio/Advanced Installer Projects/Machine Studio Installer.aip b/Software/Visual_Studio/Advanced Installer Projects/Machine Studio Installer.aip index a8b75663a..fcafe6b4a 100644 --- a/Software/Visual_Studio/Advanced Installer Projects/Machine Studio Installer.aip +++ b/Software/Visual_Studio/Advanced Installer Projects/Machine Studio Installer.aip @@ -16,10 +16,10 @@ - + - + @@ -845,7 +845,7 @@ - + diff --git a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Properties/AssemblyInfo.cs b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Properties/AssemblyInfo.cs index 5204929c5..7bfa0571b 100644 --- a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Properties/AssemblyInfo.cs +++ b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Properties/AssemblyInfo.cs @@ -4,5 +4,5 @@ using System.Runtime.InteropServices; [assembly: System.Windows.ThemeInfo(System.Windows.ResourceDictionaryLocation.None, System.Windows.ResourceDictionaryLocation.SourceAssembly)] [assembly: AssemblyTitle("Tango - Machine Studio")] -[assembly: AssemblyVersion("5.3.0.0")] +[assembly: AssemblyVersion("5.4.0.0")] [assembly: ComVisible(false)] \ No newline at end of file -- cgit v1.3.1 From 95fd77f24402e9a643f30e3938a23912770a9a96 Mon Sep 17 00:00:00 2001 From: Roy Ben-Shabat Date: Mon, 1 May 2023 18:46:04 +0300 Subject: Eureka_v2.0.0 --- .../Advanced Installer Projects/Eureka Installer.aip | 19 +++---------------- .../Machine Studio Installer.aip | 6 +++--- .../Tango.MachineStudio.UI/Properties/AssemblyInfo.cs | 2 +- Software/Visual_Studio/PPC/Tango.PPC.UI/app.manifest | 2 +- .../Properties/PublishProfiles/Beta.pubxml | 16 ++++++++++++++++ .../Tango.MachineService/Tango.MachineService.csproj | 3 ++- 6 files changed, 26 insertions(+), 22 deletions(-) (limited to 'Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI') diff --git a/Software/Visual_Studio/Advanced Installer Projects/Eureka Installer.aip b/Software/Visual_Studio/Advanced Installer Projects/Eureka Installer.aip index 5f1048363..e67457871 100644 --- a/Software/Visual_Studio/Advanced Installer Projects/Eureka Installer.aip +++ b/Software/Visual_Studio/Advanced Installer Projects/Eureka Installer.aip @@ -15,10 +15,10 @@ - + - + @@ -64,9 +64,6 @@ - - - @@ -126,7 +123,6 @@ - @@ -229,9 +225,6 @@ - - - @@ -303,7 +296,6 @@ - @@ -447,7 +439,6 @@ - @@ -456,7 +447,7 @@ - + @@ -580,9 +571,6 @@ - - - @@ -645,7 +633,6 @@ - diff --git a/Software/Visual_Studio/Advanced Installer Projects/Machine Studio Installer.aip b/Software/Visual_Studio/Advanced Installer Projects/Machine Studio Installer.aip index fcafe6b4a..53e1c79b1 100644 --- a/Software/Visual_Studio/Advanced Installer Projects/Machine Studio Installer.aip +++ b/Software/Visual_Studio/Advanced Installer Projects/Machine Studio Installer.aip @@ -16,10 +16,10 @@ - + - + @@ -845,7 +845,7 @@ - + diff --git a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Properties/AssemblyInfo.cs b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Properties/AssemblyInfo.cs index 7bfa0571b..e1e952af9 100644 --- a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Properties/AssemblyInfo.cs +++ b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Properties/AssemblyInfo.cs @@ -4,5 +4,5 @@ using System.Runtime.InteropServices; [assembly: System.Windows.ThemeInfo(System.Windows.ResourceDictionaryLocation.None, System.Windows.ResourceDictionaryLocation.SourceAssembly)] [assembly: AssemblyTitle("Tango - Machine Studio")] -[assembly: AssemblyVersion("5.4.0.0")] +[assembly: AssemblyVersion("5.7.0.0")] [assembly: ComVisible(false)] \ No newline at end of file diff --git a/Software/Visual_Studio/PPC/Tango.PPC.UI/app.manifest b/Software/Visual_Studio/PPC/Tango.PPC.UI/app.manifest index efc5f8179..d72e75011 100644 --- a/Software/Visual_Studio/PPC/Tango.PPC.UI/app.manifest +++ b/Software/Visual_Studio/PPC/Tango.PPC.UI/app.manifest @@ -16,7 +16,7 @@ Remove this element if your application requires this virtualization for backwards compatibility. --> - + diff --git a/Software/Visual_Studio/Web/Tango.MachineService/Properties/PublishProfiles/Beta.pubxml b/Software/Visual_Studio/Web/Tango.MachineService/Properties/PublishProfiles/Beta.pubxml index e02abdacc..385d3cfd7 100644 --- a/Software/Visual_Studio/Web/Tango.MachineService/Properties/PublishProfiles/Beta.pubxml +++ b/Software/Visual_Studio/Web/Tango.MachineService/Properties/PublishProfiles/Beta.pubxml @@ -24,5 +24,21 @@ by editing this MSBuild file. In order to learn more about this please visit htt $machineservice-alpha-beta__MachineService-BETA <_SavePWD>True <_DestinationType>AzureWebSite + + + + + + + + + + + + + + + <_ConnectionStringsToInsert Include="Tango.BL.ObservablesContext" /> + \ No newline at end of file diff --git a/Software/Visual_Studio/Web/Tango.MachineService/Tango.MachineService.csproj b/Software/Visual_Studio/Web/Tango.MachineService/Tango.MachineService.csproj index 451706a19..3cb22c5b1 100644 --- a/Software/Visual_Studio/Web/Tango.MachineService/Tango.MachineService.csproj +++ b/Software/Visual_Studio/Web/Tango.MachineService/Tango.MachineService.csproj @@ -345,6 +345,7 @@ + @@ -506,7 +507,7 @@ False - + -- cgit v1.3.1 From 67e50ef4b6714bc1f79e639d031a22a4a4b0ec8b Mon Sep 17 00:00:00 2001 From: Roy Date: Sun, 7 May 2023 14:16:32 +0300 Subject: Fixed issue with dryer buffer length on eureka. --- .../DefaultStudioApplicationManager.cs | 3 +++ .../Connection/DefaultMachineProvider.cs | 4 ++++ .../Tango.BL/Entities/ProcessParametersTable.cs | 17 ++++++++++++++++- 3 files changed, 23 insertions(+), 1 deletion(-) (limited to 'Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI') diff --git a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/StudioApplication/DefaultStudioApplicationManager.cs b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/StudioApplication/DefaultStudioApplicationManager.cs index feed9e193..78230b8a0 100644 --- a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/StudioApplication/DefaultStudioApplicationManager.cs +++ b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/StudioApplication/DefaultStudioApplicationManager.cs @@ -395,6 +395,9 @@ namespace Tango.MachineStudio.UI.StudioApplication throw new NullReferenceException($"The specified machine '{connectedMachine.SerialNumber}' could not be found on the database."); } + //Adjust Dryer Buffer Length Mode + ProcessParametersTable.DryerBufferMode = Machine.Type; + connectedMachine.SetMachine(Machine); ConnectedMachine = connectedMachine; var settings = SettingsManager.Default.GetOrCreate(); diff --git a/Software/Visual_Studio/PPC/Tango.PPC.Common/Connection/DefaultMachineProvider.cs b/Software/Visual_Studio/PPC/Tango.PPC.Common/Connection/DefaultMachineProvider.cs index a5fb92959..93fde75a5 100644 --- a/Software/Visual_Studio/PPC/Tango.PPC.Common/Connection/DefaultMachineProvider.cs +++ b/Software/Visual_Studio/PPC/Tango.PPC.Common/Connection/DefaultMachineProvider.cs @@ -124,6 +124,10 @@ namespace Tango.PPC.Common.Connection MachineOperator.EnableJobLiquidQuantityValidation = settings.EnableJobLiquidQuantityValidation; (MachineOperator.JobRunsLogger as BasicJobRunsLogger).CreateJobRunsFiles = true; + +#if Eureka + ProcessParametersTable.DryerBufferMode = BL.Enumerations.MachineTypes.Eureka; +#endif } private void MachineOperator_StatusChanged(object sender, MachineStatuses status) diff --git a/Software/Visual_Studio/Tango.BL/Entities/ProcessParametersTable.cs b/Software/Visual_Studio/Tango.BL/Entities/ProcessParametersTable.cs index 0a78dbc93..1dadd61c8 100644 --- a/Software/Visual_Studio/Tango.BL/Entities/ProcessParametersTable.cs +++ b/Software/Visual_Studio/Tango.BL/Entities/ProcessParametersTable.cs @@ -5,6 +5,7 @@ using System.ComponentModel.DataAnnotations.Schema; using System.Linq; using System.Text; using System.Threading.Tasks; +using Tango.BL.Enumerations; using Tango.Core.ExtensionMethods; namespace Tango.BL.Entities @@ -13,6 +14,10 @@ namespace Tango.BL.Entities { public event EventHandler DyeingSpeedMinInkUptakeChanged; + [NotMapped] + [JsonIgnore] + public static MachineTypes DryerBufferMode { get; set; } + public const double DRYER_METERS_PER_CYCLE = 0.76; public const double DRYER_TO_SPOOL_LENGTH_METERS = 0.9; @@ -35,7 +40,17 @@ namespace Tango.BL.Entities [JsonIgnore] public double DryerBufferLengthMeters { - get { return (DryerBufferLength * DRYER_METERS_PER_CYCLE) + DRYER_TO_SPOOL_LENGTH_METERS; } + get + { + if (DryerBufferMode == MachineTypes.TS1800) + { + return (DryerBufferLength * DRYER_METERS_PER_CYCLE) + DRYER_TO_SPOOL_LENGTH_METERS; + } + else + { + return DryerBufferLength; + } + } } /// -- cgit v1.3.1 From f1d5de87c0335b5c954eceef94c8c7f72278d7df Mon Sep 17 00:00:00 2001 From: Roy Date: Mon, 8 May 2023 17:11:38 +0300 Subject: Added Machine Type to TFS Lib & MS. --- .../Tango.MachineStudio.Common/MachineStudioSettings.cs | 3 +++ .../DefaultStudioApplicationManager.cs | 1 + .../TFS/TeamFoundationServiceExtendedClient.cs | 5 ++++- .../Tango.MachineStudio.UI/Views/ReportIssueView.xaml | 9 +++++++-- Software/Visual_Studio/Tango.TFS/MachineType.cs | 17 +++++++++++++++++ Software/Visual_Studio/Tango.TFS/Tango.TFS.csproj | 3 ++- .../Tango.TFS/TeamFoundationServiceClient.cs | 13 +++++++++++++ Software/Visual_Studio/Tango.TFS/WorkItem.cs | 7 +++++++ 8 files changed, 54 insertions(+), 4 deletions(-) create mode 100644 Software/Visual_Studio/Tango.TFS/MachineType.cs (limited to 'Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI') diff --git a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.Common/MachineStudioSettings.cs b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.Common/MachineStudioSettings.cs index 25dfc2dc8..6ae71d50d 100644 --- a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.Common/MachineStudioSettings.cs +++ b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.Common/MachineStudioSettings.cs @@ -9,6 +9,7 @@ using Tango.BL; using Tango.Integration.Operation; using Tango.Logging; using Tango.MachineStudio.Common.Web; +using Tango.PMR.Common; using Tango.PMR.Printing; using Tango.Settings; using Tango.Transport.Adapters; @@ -178,6 +179,8 @@ namespace Tango.MachineStudio.Common /// public MachineStudioTheme Theme { get; set; } + public int LastConnectedMachineType { get; set; } + /// /// Initializes a new instance of the class. /// diff --git a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/StudioApplication/DefaultStudioApplicationManager.cs b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/StudioApplication/DefaultStudioApplicationManager.cs index 78230b8a0..2efe4c719 100644 --- a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/StudioApplication/DefaultStudioApplicationManager.cs +++ b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/StudioApplication/DefaultStudioApplicationManager.cs @@ -402,6 +402,7 @@ namespace Tango.MachineStudio.UI.StudioApplication ConnectedMachine = connectedMachine; var settings = SettingsManager.Default.GetOrCreate(); ConnectedMachine.JobUploadStrategy = settings.JobUploadStrategy; + settings.LastConnectedMachineType = Machine.MachineType; } else { diff --git a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/TFS/TeamFoundationServiceExtendedClient.cs b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/TFS/TeamFoundationServiceExtendedClient.cs index b716ed1fb..7a0a9414c 100644 --- a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/TFS/TeamFoundationServiceExtendedClient.cs +++ b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/TFS/TeamFoundationServiceExtendedClient.cs @@ -152,6 +152,8 @@ namespace Tango.MachineStudio.UI.TFS throw LogManager.Default.Log(new AuthenticationException($"User '{user_email}' is not part of the Tango VSTS team. Please contact your administrator.")); } + var settings = SettingsManager.Default.GetOrCreate(); + item.CreatedBy = currentUser; item.ChangedBy = currentUser; item.AuthorizedAs = currentUser; @@ -161,7 +163,8 @@ namespace Tango.MachineStudio.UI.TFS item.Severity = Severity.Medium; item.State = State.New; item.Type = WorkItemType.Bug; - item.Environment = SettingsManager.Default.GetOrCreate().DeploymentSlot.ToDescription(); + item.Environment = settings.DeploymentSlot.ToDescription(); + item.MachineType = (MachineType)settings.LastConnectedMachineType; foreach (var window in Application.Current.Windows.OfType().Where(x => !String.IsNullOrWhiteSpace(x.Title))) { diff --git a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Views/ReportIssueView.xaml b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Views/ReportIssueView.xaml index aac712f59..3eeb5f901 100644 --- a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Views/ReportIssueView.xaml +++ b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Views/ReportIssueView.xaml @@ -12,7 +12,7 @@ xmlns:tfs="clr-namespace:Tango.TFS;assembly=Tango.TFS" xmlns:tfss="clr-namespace:Tango.MachineStudio.UI.TFS" xmlns:local="clr-namespace:Tango.MachineStudio.UI.Views" - mc:Ignorable="d" Width="530" Height="660" Background="{StaticResource Dialog.Background}" d:DataContext="{d:DesignInstance Type=vm:ReportIssueViewVM, IsDesignTimeCreatable=False}" Foreground="{StaticResource MainWindow.Foreground}"> + mc:Ignorable="d" Width="530" Height="700" Background="{StaticResource Dialog.Background}" d:DataContext="{d:DesignInstance Type=vm:ReportIssueViewVM, IsDesignTimeCreatable=False}" Foreground="{StaticResource MainWindow.Foreground}"> @@ -43,6 +43,11 @@ + + + + + @@ -83,7 +88,7 @@ Tags (highlight selected tags) - + diff --git a/Software/Visual_Studio/Tango.TFS/MachineType.cs b/Software/Visual_Studio/Tango.TFS/MachineType.cs new file mode 100644 index 000000000..044155b2b --- /dev/null +++ b/Software/Visual_Studio/Tango.TFS/MachineType.cs @@ -0,0 +1,17 @@ +using System; +using System.Collections.Generic; +using System.ComponentModel; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace Tango.TFS +{ + public enum MachineType + { + [Description("TS 1800")] + TS1800 = 0, + [Description("Twine X4")] + TwineX4 = 1, + } +} diff --git a/Software/Visual_Studio/Tango.TFS/Tango.TFS.csproj b/Software/Visual_Studio/Tango.TFS/Tango.TFS.csproj index 3e3e6f6fd..271491a7e 100644 --- a/Software/Visual_Studio/Tango.TFS/Tango.TFS.csproj +++ b/Software/Visual_Studio/Tango.TFS/Tango.TFS.csproj @@ -207,6 +207,7 @@ + @@ -266,7 +267,7 @@ - + \ No newline at end of file diff --git a/Software/Visual_Studio/Tango.TFS/TeamFoundationServiceClient.cs b/Software/Visual_Studio/Tango.TFS/TeamFoundationServiceClient.cs index 750c5fa58..379dcac2e 100644 --- a/Software/Visual_Studio/Tango.TFS/TeamFoundationServiceClient.cs +++ b/Software/Visual_Studio/Tango.TFS/TeamFoundationServiceClient.cs @@ -40,6 +40,7 @@ namespace Tango.TFS public const String MACHINE_SN = "Custom.MachineSN"; public const String ENVIRONMENT = "Custom.Environment"; public const String LOGGED_IN_USER = "Custom.LoggedInUser"; + public const String MACHINE_TYPE = "Custom.MachineType"; } #endregion @@ -428,6 +429,13 @@ namespace Tango.TFS }); } + patchDocument.Add(new JsonPatchOperation + { + Operation = Operation.Add, + Path = GetExtensionFieldNameForWrite(ExtensionFields.MACHINE_TYPE), + Value = workItem.MachineType.ToDescription(), + }); + var resultWorkItem = witClient.CreateWorkItemAsync(patchDocument, project.Name, workItem.Type.ToString(), bypassRules: true).Result; workItem.ID = resultWorkItem.Id.Value; @@ -944,6 +952,11 @@ namespace Tango.TFS workItem.Environment = TryGetField(item.Fields, ExtensionFields.ENVIRONMENT).ToString(); } + if (item.Fields.ContainsKey(ExtensionFields.MACHINE_TYPE)) + { + workItem.MachineType = ParseEnumByDescription(item.Fields[ExtensionFields.MACHINE_TYPE].ToString()); + } + workItem.Comment = TryGetField(item.Fields, GetFieldNameForRead(CoreField.History)).ToString(); return workItem; diff --git a/Software/Visual_Studio/Tango.TFS/WorkItem.cs b/Software/Visual_Studio/Tango.TFS/WorkItem.cs index 35c2f8669..552a64161 100644 --- a/Software/Visual_Studio/Tango.TFS/WorkItem.cs +++ b/Software/Visual_Studio/Tango.TFS/WorkItem.cs @@ -80,6 +80,13 @@ namespace Tango.TFS set { _priority = value; RaisePropertyChangedAuto(); } } + private MachineType _machineType; + public MachineType MachineType + { + get { return _machineType; } + set { _machineType = value; RaisePropertyChangedAuto(); } + } + private String _stepsToReproduce; public String StepsToReproduce { -- cgit v1.3.1 From adc3cb7ad1fd46a2417c5a0ff1725aa67d04a503 Mon Sep 17 00:00:00 2001 From: Roy Ben-Shabat Date: Thu, 18 May 2023 10:48:24 +0300 Subject: Installers --- .../Eureka Installer.aip | 15 ++++++++++++--- .../Advanced Installer Projects/FSE Installer.aip | 6 +++--- .../Machine Studio Installer.aip | 6 +++--- .../Help/proc-doc.chm | Bin 368013 -> 368011 bytes .../FSE/Tango.FSE.UI/Properties/AssemblyInfo.cs | 2 +- .../Properties/AssemblyInfo.cs | 2 +- .../PPC/Tango.PPC.UI/Properties/AssemblyInfo.cs | 2 +- .../Visual_Studio/PPC/Tango.PPC.UI/app.manifest | 2 +- 8 files changed, 22 insertions(+), 13 deletions(-) (limited to 'Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI') diff --git a/Software/Visual_Studio/Advanced Installer Projects/Eureka Installer.aip b/Software/Visual_Studio/Advanced Installer Projects/Eureka Installer.aip index 0593e501f..c1ff02c34 100644 --- a/Software/Visual_Studio/Advanced Installer Projects/Eureka Installer.aip +++ b/Software/Visual_Studio/Advanced Installer Projects/Eureka Installer.aip @@ -15,10 +15,10 @@ - + - + @@ -47,8 +47,11 @@ + + + @@ -468,6 +471,9 @@ + + + @@ -476,7 +482,7 @@ - + @@ -747,6 +753,9 @@ + + + diff --git a/Software/Visual_Studio/Advanced Installer Projects/FSE Installer.aip b/Software/Visual_Studio/Advanced Installer Projects/FSE Installer.aip index 5442fc1bc..a18abd6ac 100644 --- a/Software/Visual_Studio/Advanced Installer Projects/FSE Installer.aip +++ b/Software/Visual_Studio/Advanced Installer Projects/FSE Installer.aip @@ -29,10 +29,10 @@ - + - + @@ -1201,7 +1201,7 @@ - + diff --git a/Software/Visual_Studio/Advanced Installer Projects/Machine Studio Installer.aip b/Software/Visual_Studio/Advanced Installer Projects/Machine Studio Installer.aip index 53e1c79b1..6cae10041 100644 --- a/Software/Visual_Studio/Advanced Installer Projects/Machine Studio Installer.aip +++ b/Software/Visual_Studio/Advanced Installer Projects/Machine Studio Installer.aip @@ -16,10 +16,10 @@ - + - + @@ -845,7 +845,7 @@ - + diff --git a/Software/Visual_Studio/FSE/Modules/Tango.FSE.Procedures.Documentation/Help/proc-doc.chm b/Software/Visual_Studio/FSE/Modules/Tango.FSE.Procedures.Documentation/Help/proc-doc.chm index 62f67be57..32466caf1 100644 Binary files a/Software/Visual_Studio/FSE/Modules/Tango.FSE.Procedures.Documentation/Help/proc-doc.chm and b/Software/Visual_Studio/FSE/Modules/Tango.FSE.Procedures.Documentation/Help/proc-doc.chm differ diff --git a/Software/Visual_Studio/FSE/Tango.FSE.UI/Properties/AssemblyInfo.cs b/Software/Visual_Studio/FSE/Tango.FSE.UI/Properties/AssemblyInfo.cs index afe4677be..cd4408202 100644 --- a/Software/Visual_Studio/FSE/Tango.FSE.UI/Properties/AssemblyInfo.cs +++ b/Software/Visual_Studio/FSE/Tango.FSE.UI/Properties/AssemblyInfo.cs @@ -8,4 +8,4 @@ using System.Windows; // set of attributes. Change these attribute values to modify the information // associated with an assembly. [assembly: AssemblyTitle("Tango FSE")] -[assembly: AssemblyVersion("2.0.0.0")] +[assembly: AssemblyVersion("2.0.1.0")] diff --git a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Properties/AssemblyInfo.cs b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Properties/AssemblyInfo.cs index e1e952af9..0bbe0ae7a 100644 --- a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Properties/AssemblyInfo.cs +++ b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Properties/AssemblyInfo.cs @@ -4,5 +4,5 @@ using System.Runtime.InteropServices; [assembly: System.Windows.ThemeInfo(System.Windows.ResourceDictionaryLocation.None, System.Windows.ResourceDictionaryLocation.SourceAssembly)] [assembly: AssemblyTitle("Tango - Machine Studio")] -[assembly: AssemblyVersion("5.7.0.0")] +[assembly: AssemblyVersion("5.8.0.0")] [assembly: ComVisible(false)] \ No newline at end of file diff --git a/Software/Visual_Studio/PPC/Tango.PPC.UI/Properties/AssemblyInfo.cs b/Software/Visual_Studio/PPC/Tango.PPC.UI/Properties/AssemblyInfo.cs index 1a21989bc..4940201f0 100644 --- a/Software/Visual_Studio/PPC/Tango.PPC.UI/Properties/AssemblyInfo.cs +++ b/Software/Visual_Studio/PPC/Tango.PPC.UI/Properties/AssemblyInfo.cs @@ -8,4 +8,4 @@ using System.Windows; // set of attributes. Change these attribute values to modify the information // associated with an assembly. [assembly: AssemblyTitle("Tango PPC Application")] -[assembly: AssemblyVersion("2.0.3.0")] +[assembly: AssemblyVersion("2.0.4.0")] diff --git a/Software/Visual_Studio/PPC/Tango.PPC.UI/app.manifest b/Software/Visual_Studio/PPC/Tango.PPC.UI/app.manifest index efc5f8179..d72e75011 100644 --- a/Software/Visual_Studio/PPC/Tango.PPC.UI/app.manifest +++ b/Software/Visual_Studio/PPC/Tango.PPC.UI/app.manifest @@ -16,7 +16,7 @@ Remove this element if your application requires this virtualization for backwards compatibility. --> - + -- cgit v1.3.1 From 9b6c2a3d1bc63d2b61ef4e8e15e87482731d68c7 Mon Sep 17 00:00:00 2001 From: Roy Ben-Shabat Date: Thu, 20 Jul 2023 15:20:24 +0300 Subject: Installers --- .../Eureka Installer.aip | 304 ++++++++++++++++++++- .../Machine Studio Installer.aip | 216 ++++++++++++++- .../Properties/AssemblyInfo.cs | 2 +- .../PPC/Tango.PPC.UI/Properties/AssemblyInfo.cs | 2 +- .../Visual_Studio/PPC/Tango.PPC.UI/app.manifest | 2 +- 5 files changed, 516 insertions(+), 10 deletions(-) (limited to 'Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI') diff --git a/Software/Visual_Studio/Advanced Installer Projects/Eureka Installer.aip b/Software/Visual_Studio/Advanced Installer Projects/Eureka Installer.aip index 1bc2b2ced..1a65cb667 100644 --- a/Software/Visual_Studio/Advanced Installer Projects/Eureka Installer.aip +++ b/Software/Visual_Studio/Advanced Installer Projects/Eureka Installer.aip @@ -15,10 +15,10 @@ - + - + @@ -101,6 +101,7 @@ + @@ -110,6 +111,8 @@ + + @@ -126,21 +129,115 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -204,6 +301,7 @@ + @@ -455,7 +553,6 @@ - @@ -474,6 +571,107 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -482,7 +680,7 @@ - + @@ -756,6 +954,104 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/Software/Visual_Studio/Advanced Installer Projects/Machine Studio Installer.aip b/Software/Visual_Studio/Advanced Installer Projects/Machine Studio Installer.aip index 6cae10041..098af50cf 100644 --- a/Software/Visual_Studio/Advanced Installer Projects/Machine Studio Installer.aip +++ b/Software/Visual_Studio/Advanced Installer Projects/Machine Studio Installer.aip @@ -16,10 +16,10 @@ - + - + @@ -44,7 +44,22 @@ + + + + + + + + + + + + + + + @@ -83,9 +98,17 @@ + + + + + + + + @@ -114,6 +137,7 @@ + @@ -141,7 +165,9 @@ + + @@ -150,6 +176,7 @@ + @@ -157,8 +184,11 @@ + + + @@ -170,13 +200,18 @@ + + + + + @@ -203,6 +238,7 @@ + @@ -219,15 +255,23 @@ + + + + + + + + @@ -235,19 +279,25 @@ + + + + + + @@ -328,6 +378,7 @@ + @@ -336,10 +387,25 @@ + + + + + + + + + + + + + + + @@ -376,6 +442,7 @@ + @@ -834,6 +901,97 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -845,7 +1003,7 @@ - + @@ -1321,6 +1479,58 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Properties/AssemblyInfo.cs b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Properties/AssemblyInfo.cs index 0bbe0ae7a..90fab6ad9 100644 --- a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Properties/AssemblyInfo.cs +++ b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Properties/AssemblyInfo.cs @@ -4,5 +4,5 @@ using System.Runtime.InteropServices; [assembly: System.Windows.ThemeInfo(System.Windows.ResourceDictionaryLocation.None, System.Windows.ResourceDictionaryLocation.SourceAssembly)] [assembly: AssemblyTitle("Tango - Machine Studio")] -[assembly: AssemblyVersion("5.8.0.0")] +[assembly: AssemblyVersion("5.9.0.0")] [assembly: ComVisible(false)] \ No newline at end of file diff --git a/Software/Visual_Studio/PPC/Tango.PPC.UI/Properties/AssemblyInfo.cs b/Software/Visual_Studio/PPC/Tango.PPC.UI/Properties/AssemblyInfo.cs index e8bf50adf..2ebae755a 100644 --- a/Software/Visual_Studio/PPC/Tango.PPC.UI/Properties/AssemblyInfo.cs +++ b/Software/Visual_Studio/PPC/Tango.PPC.UI/Properties/AssemblyInfo.cs @@ -8,4 +8,4 @@ using System.Windows; // set of attributes. Change these attribute values to modify the information // associated with an assembly. [assembly: AssemblyTitle("Tango PPC Application")] -[assembly: AssemblyVersion("2.0.9.0")] +[assembly: AssemblyVersion("2.0.11.0")] diff --git a/Software/Visual_Studio/PPC/Tango.PPC.UI/app.manifest b/Software/Visual_Studio/PPC/Tango.PPC.UI/app.manifest index efc5f8179..d72e75011 100644 --- a/Software/Visual_Studio/PPC/Tango.PPC.UI/app.manifest +++ b/Software/Visual_Studio/PPC/Tango.PPC.UI/app.manifest @@ -16,7 +16,7 @@ Remove this element if your application requires this virtualization for backwards compatibility. --> - + -- cgit v1.3.1