From 631e31df4c7d0474207e11b54885c1de6f9e80c7 Mon Sep 17 00:00:00 2001 From: Roy Ben-Shabat Date: Sun, 17 Feb 2019 16:36:40 +0200 Subject: Added firmware package generator in machine studio. --- .../Tango.MachineStudio.Storage.csproj | 4 ++++ .../ViewModels/MainViewVM.cs | 18 ++++++++++++++++++ .../Tango.MachineStudio.Storage/Views/MainView.xaml | 6 ++++++ 3 files changed, 28 insertions(+) (limited to 'Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Storage') diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Storage/Tango.MachineStudio.Storage.csproj b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Storage/Tango.MachineStudio.Storage.csproj index a1bb0055e..15958f019 100644 --- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Storage/Tango.MachineStudio.Storage.csproj +++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Storage/Tango.MachineStudio.Storage.csproj @@ -132,6 +132,10 @@ {74e700b0-1156-4126-be40-ee450d3c3026} Tango.Transport + + {43135fb9-41db-4f87-9771-cf2c762027c0} + Tango.FirmwarePackageGenerator + {cb0b0aa2-bb24-4bca-a720-45e397684e12} Tango.MachineStudio.Common diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Storage/ViewModels/MainViewVM.cs b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Storage/ViewModels/MainViewVM.cs index 3df46ba6f..90644cf1a 100644 --- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Storage/ViewModels/MainViewVM.cs +++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Storage/ViewModels/MainViewVM.cs @@ -8,6 +8,7 @@ using System.Linq; using System.Text; using System.Threading.Tasks; using Tango.Core.Commands; +using Tango.Core.DI; using Tango.Core.IO; using Tango.Integration.ExternalBridge; using Tango.Integration.Storage; @@ -79,6 +80,14 @@ namespace Tango.MachineStudio.Storage.ViewModels public RelayCommand ActivateVersionCommand { get; set; } + public RelayCommand GenerateTfpCommand { get; set; } + + public MainViewVM() + { + + } + + [TangoInject] public MainViewVM(IStudioApplicationManager applicationManager, INotificationProvider notificationProvider, IFirmwareUpgrader firmwareUpgrader) { _applicationManager = applicationManager; @@ -102,6 +111,7 @@ namespace Tango.MachineStudio.Storage.ViewModels UploadVersionCommand = new RelayCommand(UploadVersion, () => StorageManager != null && StorageManager.CurrentFolder != null); ValidateVersionCommand = new RelayCommand(ValidateVersion, () => StorageManager != null && StorageManager.CurrentFolder != null); ActivateVersionCommand = new RelayCommand(ActivateVersion, () => StorageManager != null && StorageManager.CurrentFolder != null); + GenerateTfpCommand = new RelayCommand(GenerateTFP); } private void UploadFile() @@ -398,5 +408,13 @@ namespace Tango.MachineStudio.Storage.ViewModels } } } + + private void GenerateTFP() + { + Tango.FirmwarePackageGenerator.MainWindow fWindow = new FirmwarePackageGenerator.MainWindow(); + fWindow.Topmost = true; + fWindow.Show(); + _applicationManager.RegisterOpenedWindow(fWindow); + } } } diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Storage/Views/MainView.xaml b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Storage/Views/MainView.xaml index e59837d49..840e18523 100644 --- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Storage/Views/MainView.xaml +++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Storage/Views/MainView.xaml @@ -80,6 +80,12 @@ ACTIVATE VERSION +