diff options
| author | Roy Ben-Shabat <Roy@Twine-s.com> | 2018-01-08 12:35:07 +0200 |
|---|---|---|
| committer | Roy Ben-Shabat <Roy@Twine-s.com> | 2018-01-08 12:35:07 +0200 |
| commit | d1799765af79003be5f30053134a12158ce98d82 (patch) | |
| tree | 55daeb06f2280bbdbfa418f3aec786febab030b9 /Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI | |
| parent | e7a30d51c85b2d9be2f675769506c1faa8667c89 (diff) | |
| download | Tango-d1799765af79003be5f30053134a12158ce98d82.tar.gz Tango-d1799765af79003be5f30053134a12158ce98d82.zip | |
Added Tango USB Drivers.
Modified Machine Connection Icons on Machine Studio.
Diffstat (limited to 'Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI')
5 files changed, 15 insertions, 2 deletions
diff --git a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Images/external-bridge-tcp.png b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Images/external-bridge-tcp.png Binary files differnew file mode 100644 index 000000000..2d8c684b7 --- /dev/null +++ b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Images/external-bridge-tcp.png diff --git a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Images/external-bridge-usb.png b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Images/external-bridge-usb.png Binary files differnew file mode 100644 index 000000000..62fab6225 --- /dev/null +++ b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Images/external-bridge-usb.png 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 886014be9..df8b65fda 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 @@ -314,6 +314,10 @@ <ItemGroup> <Folder Include="Controls\" /> </ItemGroup> + <ItemGroup> + <Resource Include="Images\external-bridge-tcp.png" /> + <Resource Include="Images\external-bridge-usb.png" /> + </ItemGroup> <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" /> <PropertyGroup> <PostBuildEvent>$(TargetDir)linkgen.exe -s "$(TargetPath)" -d "$(TargetDir)Utilities\Machine Studio.lnk" 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 f2beb7113..b21b23935 100644 --- a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/ViewModels/MainViewVM.cs +++ b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/ViewModels/MainViewVM.cs @@ -143,6 +143,15 @@ namespace Tango.MachineStudio.UI.ViewModels { if (x.SelectedMachine != null) { + if (ApplicationManager.IsMachineConnected) + { + using (_notificationProvider.PushTaskItem("Disconnecting...")) + { + await ApplicationManager.ConnectedMachine.Disconnect(); + await Task.Delay(1000); + } + } + if (x.SelectedMachine.Type != Integration.Services.ExternalBridgeClientType.USB) { _notificationProvider.ShowModalDialog<MachineLoginViewVM>(async (login) => 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 8f03202a1..4208c2878 100644 --- a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Views/MachineConnectionView.xaml +++ b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Views/MachineConnectionView.xaml @@ -66,7 +66,7 @@ </Style.Triggers> </Style> </StackPanel.Style> - <Image Source="/Images/machine-trans.png" Width="38" Height="38" RenderOptions.BitmapScalingMode="Fant"></Image> + <Image Source="/Images/external-bridge-tcp.png" Width="38" Height="38" RenderOptions.BitmapScalingMode="Fant"></Image> <StackPanel Margin="10 0 0 0"> <TextBlock FontSize="11"> <Run FontWeight="Bold">S/N:</Run> <Run Text="{Binding SerialNumber,Mode=OneWay}"></Run> @@ -91,7 +91,7 @@ </Style.Triggers> </Style> </StackPanel.Style> - <Image Source="/Images/machine-trans.png" Width="38" Height="38" RenderOptions.BitmapScalingMode="Fant"></Image> + <Image Source="/Images/external-bridge-usb.png" Width="38" Height="38" RenderOptions.BitmapScalingMode="Fant"></Image> <StackPanel Margin="10 0 0 0"> <TextBlock FontSize="11"> <Run FontWeight="Bold">Port:</Run> <Run Text="{Binding ComPort,Mode=OneWay}"></Run> |
