diff options
| author | Roy Ben-Shabat <Roy@Twine-s.com> | 2019-01-14 12:48:33 +0200 |
|---|---|---|
| committer | Roy Ben-Shabat <Roy@Twine-s.com> | 2019-01-14 12:48:33 +0200 |
| commit | 4ca2cb29d8bf2b93c35ac12e6d629a3537bb4a0b (patch) | |
| tree | 6d5188c6b353632dda0bbe3a0751c3dec454ad6a /Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI | |
| parent | f61363eb0a1f2237e7185118badf586889465064 (diff) | |
| download | Tango-4ca2cb29d8bf2b93c35ac12e6d629a3537bb4a0b.tar.gz Tango-4ca2cb29d8bf2b93c35ac12e6d629a3537bb4a0b.zip | |
Machine Studio v4.0.0.0
Added reset all graphs to tech board.
Diffstat (limited to 'Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI')
2 files changed, 15 insertions, 11 deletions
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 c311df44b..96b1290b0 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("3.5.79.18305")] +[assembly: AssemblyVersion("4.0.0.0")] [assembly: ComVisible(false)]
\ No newline at end of file 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 90a2e34e7..6146d8f45 100644 --- a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/StudioApplication/DefaultStudioApplicationManager.cs +++ b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/StudioApplication/DefaultStudioApplicationManager.cs @@ -89,18 +89,22 @@ namespace Tango.MachineStudio.UI.StudioApplication get { return _connectedMachine; } private set { - _connectedMachine = value; - RaisePropertyChangedAuto(); - RaisePropertyChanged(nameof(IsMachineConnected)); - RaisePropertyChanged(nameof(IsMachineConnectedViaTCP)); - - if (_connectedMachine != null) + if (_connectedMachine != value) { - _connectedMachine.StateChanged -= ConnectedMachine_StateChanged; - _connectedMachine.StateChanged += ConnectedMachine_StateChanged; - } + _connectedMachine = value; + RaisePropertyChangedAuto(); + RaisePropertyChanged(nameof(IsMachineConnected)); + RaisePropertyChanged(nameof(IsMachineConnectedViaTCP)); - ConnectedMachineChanged?.Invoke(this, _connectedMachine); + if (_connectedMachine != null) + { + _connectedMachine.StateChanged -= ConnectedMachine_StateChanged; + _connectedMachine.StateChanged += ConnectedMachine_StateChanged; + } + + + ConnectedMachineChanged?.Invoke(this, _connectedMachine); + } } } |