diff options
| author | Roy Ben Shabat <Roy.mail.net@gmail.com> | 2018-12-30 01:27:53 +0200 |
|---|---|---|
| committer | Roy Ben Shabat <Roy.mail.net@gmail.com> | 2018-12-30 01:27:53 +0200 |
| commit | cc3480d4aac4175b1072060dd2d6d398d3451ae8 (patch) | |
| tree | 0c416705eca9d499a3118d83d84b5143f3cee262 /Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI | |
| parent | 7b69f9a96ab82e3a6e2345092600edf5854f5f4f (diff) | |
| download | Tango-cc3480d4aac4175b1072060dd2d6d398d3451ae8.tar.gz Tango-cc3480d4aac4175b1072060dd2d6d398d3451ae8.zip | |
Working on dispenserssssssss
Diffstat (limited to 'Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI')
2 files changed, 6 insertions, 25 deletions
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 edce9d3c1..2192483c9 100644 --- a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/TFS/TeamFoundationServiceExtendedClient.cs +++ b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/TFS/TeamFoundationServiceExtendedClient.cs @@ -226,30 +226,7 @@ namespace Tango.MachineStudio.UI.TFS sysModel.Machine = machine; sysModel.EmbeddedVersion = app.ConnectedMachine.DeviceInformation.Version; - MachineDesigner.Views.MainView machineView = new MachineDesigner.Views.MainView(); - machineView.Width = 1280; - machineView.Height = 1100; - machineView.PanelColumnDefinition.Width = new GridLength(0); - machineView.stackHeader.Visibility = Visibility.Collapsed; - machineView.Background = System.Windows.Media.Brushes.White; - - - 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); - - item.Attachments.Add(new Attachment() - { - Description = "Machine Configuration", - FilePath = configImageFile.Path, - Name = "Machine Configuration.jpg" - }); - - sysModel.ConfigurationString = machine.Configuration.Clone().ToJsonString(nameof(Configuration.MachinesConfigurations), nameof(Configuration.MachineVersions)); + sysModel.ConfigurationString = machine.Configuration.Clone().ToJsonString(nameof(Configuration.MachineVersions)); if (app.ConnectedMachine.CurrentProcessParameters != null) { 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 d3c22341d..d162f3dd6 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 @@ -423,6 +423,10 @@ <Project>{74e700b0-1156-4126-be40-ee450d3c3026}</Project> <Name>Tango.Transport</Name> </ProjectReference> + <ProjectReference Include="..\Modules\MachineStudio.Dispensers\Tango.MachineStudio.Dispensers.csproj"> + <Project>{f69da3a8-f823-461e-87cf-a9275abc0b15}</Project> + <Name>Tango.MachineStudio.Dispensers</Name> + </ProjectReference> <ProjectReference Include="..\Modules\Tango.MachineStudio.ColorLab\Tango.MachineStudio.ColorLab.csproj"> <Project>{4d183aca-552b-4135-ae81-7c5a8e5fc3b1}</Project> <Name>Tango.MachineStudio.ColorLab</Name> @@ -610,7 +614,7 @@ copy /Y "$(SolutionDir)Referenced Assemblies\Microsoft.WITDataStore32.dll" "$(Ta </Target> <ProjectExtensions> <VisualStudio> - <UserProperties BuildVersion_StartDate="2000/1/1" BuildVersion_UpdateAssemblyVersion="True" BuildVersion_AssemblyInfoFilename="Properties\AssemblyInfo.cs" BuildVersion_BuildVersioningStyle="None.None.Increment.DeltaBaseYearDayOfYear" BuildVersion_UpdateFileVersion="True" BuildVersion_DetectChanges="True" BuildVersion_UseGlobalSettings="False" /> + <UserProperties BuildVersion_UseGlobalSettings="False" BuildVersion_DetectChanges="True" BuildVersion_UpdateFileVersion="True" BuildVersion_BuildVersioningStyle="None.None.Increment.DeltaBaseYearDayOfYear" BuildVersion_AssemblyInfoFilename="Properties\AssemblyInfo.cs" BuildVersion_UpdateAssemblyVersion="True" BuildVersion_StartDate="2000/1/1" /> </VisualStudio> </ProjectExtensions> </Project>
\ No newline at end of file |