diff options
| author | Roy Ben-Shabat <Roy@Twine-s.com> | 2018-11-12 18:50:00 +0200 |
|---|---|---|
| committer | Roy Ben-Shabat <Roy@Twine-s.com> | 2018-11-12 18:50:00 +0200 |
| commit | 32e58dfd83a96add18a89f40add3c3883d4ac004 (patch) | |
| tree | df672485b4f4735b030410eebc8e5f5d4e7bbb14 /Software/Visual_Studio | |
| parent | 529d8938db258e7162b7776a5b5180a9675a7f70 (diff) | |
| download | Tango-32e58dfd83a96add18a89f40add3c3883d4ac004.tar.gz Tango-32e58dfd83a96add18a89f40add3c3883d4ac004.zip | |
Machine Studio v3.5.64
Diffstat (limited to 'Software/Visual_Studio')
4 files changed, 21 insertions, 2 deletions
diff --git a/Software/Visual_Studio/Build/Shortcuts/Machine Studio.lnk b/Software/Visual_Studio/Build/Shortcuts/Machine Studio.lnk Binary files differindex a7935df17..3b408cedd 100644 --- a/Software/Visual_Studio/Build/Shortcuts/Machine Studio.lnk +++ b/Software/Visual_Studio/Build/Shortcuts/Machine Studio.lnk diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.MachineDesigner/ViewModels/MainViewVM.cs b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.MachineDesigner/ViewModels/MainViewVM.cs index de9a8de4a..5ae5c531c 100644 --- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.MachineDesigner/ViewModels/MainViewVM.cs +++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.MachineDesigner/ViewModels/MainViewVM.cs @@ -349,6 +349,20 @@ namespace Tango.MachineStudio.MachineDesigner.ViewModels #endregion + #region Public Methods + + /// <summary> + /// Sets the selected machine without any further processing. + /// </summary> + /// <param name="machine">The machine.</param> + public void SetSelectedMachine(Machine machine) + { + _machine = machine; + RaisePropertyChanged(nameof(Machine)); + } + + #endregion + #region Drag Drop Handlers /// <summary> 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 d4f5c4c48..ac17165ca 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.63.18305")] +[assembly: AssemblyVersion("3.5.64.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); |