diff options
Diffstat (limited to 'Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI')
8 files changed, 110 insertions, 37 deletions
diff --git a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/App.xaml.cs b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/App.xaml.cs index 8d5981322..ed2cbdbd7 100644 --- a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/App.xaml.cs +++ b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/App.xaml.cs @@ -174,6 +174,7 @@ namespace Tango.MachineStudio.UI catch (Exception ex) { LogManager.Log(ex, "Error in global exception trapper!"); + MessageBox.Show(ex.ToStringSafe()); } } 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 121d4ab07..5c08c868b 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("2.1.12.18210")] +[assembly: AssemblyVersion("2.1.14.18213")] [assembly: ComVisible(false)]
\ No newline at end of file diff --git a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/ViewModels/ConnectedMachineViewVM.cs b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/ViewModels/ConnectedMachineViewVM.cs index 35a4b0e9d..5467c53a0 100644 --- a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/ViewModels/ConnectedMachineViewVM.cs +++ b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/ViewModels/ConnectedMachineViewVM.cs @@ -20,6 +20,7 @@ namespace Tango.MachineStudio.UI.ViewModels Disconnect, UploadHardwareConfig, Reset, + TurnOffHeaters } private IStudioApplicationManager _applicationManager; @@ -45,31 +46,22 @@ namespace Tango.MachineStudio.UI.ViewModels public RelayCommand ResetCommand { get; set; } + public RelayCommand TurnOffHeatersCommand { get; set; } + public ConnectedMachineViewVM(IStudioApplicationManager application, IDiagnosticsFrameProvider frameProvider) { ApplicationManager = application; - DisconnectCommand = new RelayCommand(Disconnect); - UploadHardwareConfigurationCommand = new RelayCommand(UploadHardwareConfiguration); - ResetCommand = new RelayCommand(Reset); + DisconnectCommand = new RelayCommand(() => AcceptResult(ConnectedMachineVMResult.Disconnect)); + UploadHardwareConfigurationCommand = new RelayCommand(() => AcceptResult(ConnectedMachineVMResult.UploadHardwareConfig)); + ResetCommand = new RelayCommand(() => AcceptResult(ConnectedMachineVMResult.Reset)); + TurnOffHeatersCommand = new RelayCommand(() => AcceptResult(ConnectedMachineVMResult.TurnOffHeaters)); DiagnosticsFrameProvider = frameProvider; } - private void Reset() - { - Result = ConnectedMachineVMResult.Reset; - Accept(); - } - - private void UploadHardwareConfiguration() - { - Result = ConnectedMachineVMResult.UploadHardwareConfig; - Accept(); - } - - private void Disconnect() + private void AcceptResult(ConnectedMachineVMResult result) { - Result = ConnectedMachineVMResult.Disconnect; + Result = result; Accept(); } } 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 d0bddf3f2..df1ea5f7e 100644 --- a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/ViewModels/MainViewVM.cs +++ b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/ViewModels/MainViewVM.cs @@ -554,8 +554,8 @@ namespace Tango.MachineStudio.UI.ViewModels } catch (Exception ex) { - LogManager.Log(ex, "Error upload hardware configuration."); - NotificationProvider.ShowError("Error upload hardware configuration." + Environment.NewLine + ex.Message); + LogManager.Log(ex, "Error uploading hardware configuration."); + NotificationProvider.ShowError("Error uploading hardware configuration." + Environment.NewLine + ex.Message); } } } @@ -564,7 +564,7 @@ namespace Tango.MachineStudio.UI.ViewModels { if (NotificationProvider.ShowQuestion("This will reset the embedded device. Are you sure?")) { - using (NotificationProvider.PushTaskItem("Uploading hardware configuration...")) + using (NotificationProvider.PushTaskItem("Resetting the embedded device...")) { try { @@ -579,6 +579,25 @@ namespace Tango.MachineStudio.UI.ViewModels } } } + else if (x.Result == ConnectedMachineViewVM.ConnectedMachineVMResult.TurnOffHeaters) + { + if (NotificationProvider.ShowQuestion("This will reset the process parameters. Are you sure?")) + { + using (NotificationProvider.PushTaskItem("Resetting process parameters...")) + { + try + { + await ApplicationManager.ConnectedMachine.UploadProcessParameters(new ProcessParametersTable()); + NotificationProvider.ShowInfo("Heaters are turned off."); + } + catch (Exception ex) + { + LogManager.Log(ex, "Error resetting process parameters."); + NotificationProvider.ShowError("Error resetting process parameters." + Environment.NewLine + ex.Message); + } + } + } + } }); } @@ -744,7 +763,9 @@ namespace Tango.MachineStudio.UI.ViewModels private void ReportIssue() { - _notificationProvider.ShowModalDialog<ReportIssueViewVM, ReportIssueView>(new ReportIssueViewVM(TFSClient.Project, TFSClient.CreateBug()), async (vm) => + var bug = TFSClient.CreateBug(); + + _notificationProvider.ShowModalDialog<ReportIssueViewVM, ReportIssueView>(new ReportIssueViewVM(TFSClient.Project, bug), async (vm) => { using (_notificationProvider.PushTaskItem("Uploading bug report...")) { diff --git a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/ViewModels/ReportIssueViewVM.cs b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/ViewModels/ReportIssueViewVM.cs index 2935ff81b..96800d9cf 100644 --- a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/ViewModels/ReportIssueViewVM.cs +++ b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/ViewModels/ReportIssueViewVM.cs @@ -3,8 +3,10 @@ using System.Collections.Generic; using System.Linq; using System.Text; using System.Threading.Tasks; +using Tango.MachineStudio.Common; using Tango.MachineStudio.Common.Notifications; using Tango.MachineStudio.UI.TFS; +using Tango.Settings; using Tango.SharedUI; using Tango.SharedUI.Components; using Tango.TFS; @@ -13,6 +15,8 @@ namespace Tango.MachineStudio.UI.ViewModels { public class ReportIssueViewVM : DialogViewVM { + private MachineStudioSettings _settings; + public SelectedObjectCollection<Tag> SelectedTags { get; set; } public Project Project { get; set; } @@ -22,14 +26,33 @@ namespace Tango.MachineStudio.UI.ViewModels public ReportIssueViewVM() : base() { - + _settings = SettingsManager.Default.GetOrCreate<MachineStudioSettings>(); } public ReportIssueViewVM(Project project, WorkItem workItem) : this() { Project = project; WorkItem = workItem; - SelectedTags = new SelectedObjectCollection<Tag>(Project.Tags.ToObservableCollection(), new System.Collections.ObjectModel.ObservableCollection<Tag>()); + + var area = project.Areas.FirstOrDefault(x => x.Name == _settings.DefaultIssueReportArea); + if (area != null) + { + workItem.Area = area; + } + + var assignedTo = project.Members.FirstOrDefault(x => x.Email == _settings.DefaultIssueReportAssignTo); + if (assignedTo != null) + { + workItem.AssignedTo = assignedTo; + } + + var tags = project.Tags.Where(x => _settings.DefaultIssueReportTags.Contains(x.Name)).ToList(); + if (tags != null) + { + workItem.Tags = tags; + } + + SelectedTags = new SelectedObjectCollection<Tag>(Project.Tags.ToObservableCollection(), workItem.Tags.ToObservableCollection()); } protected override void Accept() @@ -37,6 +60,16 @@ namespace Tango.MachineStudio.UI.ViewModels if (Validate()) { WorkItem.Tags = SelectedTags.SynchedSource.ToList(); + + try + { + _settings.DefaultIssueReportArea = WorkItem.Area.Name; + _settings.DefaultIssueReportAssignTo = WorkItem.AssignedTo.Email; + _settings.DefaultIssueReportTags = WorkItem.Tags.Select(x => x.Name).ToList(); + _settings.Save(); + } + catch { } + base.Accept(); } } 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 aa2b014fe..995ac4575 100644 --- a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Views/ConnectedMachineView.xaml +++ b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Views/ConnectedMachineView.xaml @@ -46,11 +46,17 @@ </Grid> <Grid Grid.Row="1" Margin="10 0 10 10"> + <Grid.RowDefinitions> - <RowDefinition Height="1*"/> - <RowDefinition Height="50"/> + <RowDefinition Height="1*"></RowDefinition> + <RowDefinition Height="Auto"></RowDefinition> </Grid.RowDefinitions> + <Grid.ColumnDefinitions> + <ColumnDefinition Width="1*"></ColumnDefinition> + <ColumnDefinition Width="Auto"></ColumnDefinition> + </Grid.ColumnDefinitions> + <Grid d:DataContext="{d:DesignInstance Type=integ:MachineOperator, IsDesignTimeCreatable=False}"> <ContentControl Content="{Binding ApplicationManager.ConnectedMachine}"> <ContentControl.Resources> @@ -125,18 +131,31 @@ </ContentControl> </Grid> - <Grid Grid.Row="1"> + <Grid Grid.Row="1" Grid.ColumnSpan="2"> <StackPanel Orientation="Horizontal" HorizontalAlignment="Right" Height="40" VerticalAlignment="Bottom"> - <Button Height="Auto" Width="140" Command="{Binding ResetCommand}" Background="#FF5454" BorderBrush="#FF5454" Margin="0 0 10 0" ToolTip="Reset the embedded device">RESET</Button> - <Button Height="Auto" Command="{Binding UploadHardwareConfigurationCommand}" ToolTip="Upload the current hardware configuration stored for this machine"> - <StackPanel Orientation="Horizontal"> - <TextBlock VerticalAlignment="Center">UPLOAD HW CONFIG</TextBlock> - <materialDesign:PackIcon Margin="10 0 0 0" Width="16" Height="16" VerticalAlignment="Center" Kind="ArrowRightBold"/> - </StackPanel> - </Button> - <Button Height="Auto" Width="140" Command="{Binding DisconnectCommand}" Margin="10 0 0 0">DISCONNECT</Button> + + </StackPanel> + </Grid> + + <Grid Grid.Row="1" Grid.ColumnSpan="2"> + <StackPanel HorizontalAlignment="Right" Orientation="Horizontal"> + <Button DockPanel.Dock="Bottom" Height="40" Width="170" Command="{Binding UploadHardwareConfigurationCommand}" ToolTip="Upload the current hardware configuration stored for this machine">UPLOAD HW CONFIG</Button> + <Button DockPanel.Dock="Bottom" Height="40" Width="140" Command="{Binding DisconnectCommand}" Margin="10 0 0 0">DISCONNECT</Button> </StackPanel> </Grid> + + <Grid Grid.Column="1"> + <DockPanel> + <StackPanel> + <Button FontSize="11" Height="40" Width="140" Command="{Binding ResetCommand}" Background="Transparent" BorderBrush="#202020" Foreground="#202020" Margin="0 2" ToolTip="Reset the embedded device">RESET</Button> + <Button FontSize="11" Height="40" Width="140" Command="{Binding TurnOffHeatersCommand}" Background="Transparent" BorderBrush="#202020" Foreground="#202020" Margin="0 2" ToolTip="Resets the current process parameters in the embedded device"> + <TextBlock TextWrapping="Wrap" TextAlignment="Center"> + TURN OFF HEATERS + </TextBlock> + </Button> + </StackPanel> + </DockPanel> + </Grid> </Grid> </Grid> </Grid> 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 2a6228eda..aa2a70a5f 100644 --- a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Views/ReportIssueView.xaml +++ b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Views/ReportIssueView.xaml @@ -40,7 +40,7 @@ <StackPanel DockPanel.Dock="Top"> <DockPanel> <materialDesign:PackIcon Kind="Pencil" Width="24" Height="24" VerticalAlignment="Center" Margin="0 0 10 0" /> - <TextBox materialDesign:HintAssist.Hint="Title" materialDesign:HintAssist.IsFloating="True" FontSize="16" Text="{Binding WorkItem.Title}"></TextBox> + <TextBox x:Name="txt_title" materialDesign:HintAssist.Hint="Title" materialDesign:HintAssist.IsFloating="True" FontSize="16" Text="{Binding WorkItem.Title}"></TextBox> </DockPanel> <DockPanel Margin="0 10 0 0"> @@ -114,7 +114,7 @@ <ItemsControl ItemsSource="{Binding ValidationErrors}" HorizontalAlignment="Left" Margin="5" VerticalAlignment="Center" Visibility="Visible"> <ItemsControl.ItemTemplate> <DataTemplate> - <TextBlock Foreground="#FF4C4C" Margin="0 2 0 0"><Run>*</Run> <Run Text="{Binding Path=*,Mode=OneWay}"></Run></TextBlock> + <TextBlock Foreground="#FF4C4C" Margin="0 2 0 0"><Run>*</Run> <Run Text="{Binding Path=.,Mode=OneWay}"></Run></TextBlock> </DataTemplate> </ItemsControl.ItemTemplate> </ItemsControl> diff --git a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Views/ReportIssueView.xaml.cs b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Views/ReportIssueView.xaml.cs index 91a288d3e..72bef1205 100644 --- a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Views/ReportIssueView.xaml.cs +++ b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Views/ReportIssueView.xaml.cs @@ -23,6 +23,13 @@ namespace Tango.MachineStudio.UI.Views public ReportIssueView() { InitializeComponent(); + + this.Loaded += ReportIssueView_Loaded; + } + + private void ReportIssueView_Loaded(object sender, RoutedEventArgs e) + { + txt_title.Focus(); } } } |