diff options
| author | Shlomo Hecht <shlomo@twine-s.com> | 2018-11-13 10:46:15 +0200 |
|---|---|---|
| committer | Shlomo Hecht <shlomo@twine-s.com> | 2018-11-13 10:46:15 +0200 |
| commit | 00525cc261ec117e2eb78ac2a4525fa3da92d399 (patch) | |
| tree | 9f4c311d915b0305f31925bab4d87a97cf82d790 /Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI | |
| parent | 8d4920307ed4bbb6760245728934b91e249fe6c4 (diff) | |
| parent | 996422d12e0a40aa408757989232f0225dc29a28 (diff) | |
| download | Tango-00525cc261ec117e2eb78ac2a4525fa3da92d399.tar.gz Tango-00525cc261ec117e2eb78ac2a4525fa3da92d399.zip | |
Merge branch 'master' of https://twinetfs.visualstudio.com/Tango/_git/Tango
Diffstat (limited to 'Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI')
2 files changed, 7 insertions, 2 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 de819a61f..1bbeea6c0 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.61.18305")] +[assembly: AssemblyVersion("3.5.65.18305")] [assembly: ComVisible(false)]
\ No newline at end of file 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 8f67a21c2..6753fec73 100644 --- a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/TFS/TeamFoundationServiceExtendedClient.cs +++ b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/TFS/TeamFoundationServiceExtendedClient.cs @@ -207,7 +207,12 @@ namespace Tango.MachineStudio.UI.TFS machineView.PanelColumnDefinition.Width = new GridLength(0); machineView.stackHeader.Visibility = Visibility.Collapsed; machineView.Background = System.Windows.Media.Brushes.White; - machineView.DataContext = new MachineDesigner.ViewModels.MainViewVM() { SelectedMachine = machine, Configuration = machine.Configuration }; + + + var machineDesignerVM = new MachineDesigner.ViewModels.MainViewVM(); + machineDesignerVM.SetSelectedMachine(machine); + machineDesignerVM.Configuration = machine.Configuration; + machineView.DataContext = machineDesignerVM; var configImageFile = _tempFolder.CreateImaginaryFile(); machineView.RenderToFile(configImageFile.Path, System.Drawing.Imaging.ImageFormat.Jpeg, new Size(machineView.Width, machineView.Height), 100); |