diff options
| author | Shlomo Hecht <shlomo@twine-s.com> | 2018-11-08 15:24:15 +0200 |
|---|---|---|
| committer | Shlomo Hecht <shlomo@twine-s.com> | 2018-11-08 15:24:15 +0200 |
| commit | 3c3b0d089f9b4fec79ed2ef773833ca4cf74f137 (patch) | |
| tree | 632757f41e33dad37c5b803fb482818534c769b2 /Software/Visual_Studio/PPC/Tango.PPC.UI | |
| parent | bb32f6ccf42158bef6921b141efb48d63d8b1c18 (diff) | |
| parent | f49846e7a3ca4f95bdf1479e8c84da34955dc17c (diff) | |
| download | Tango-3c3b0d089f9b4fec79ed2ef773833ca4cf74f137.tar.gz Tango-3c3b0d089f9b4fec79ed2ef773833ca4cf74f137.zip | |
Merge branch 'master' of https://twinetfs.visualstudio.com/Tango/_git/Tango
Diffstat (limited to 'Software/Visual_Studio/PPC/Tango.PPC.UI')
| -rw-r--r-- | Software/Visual_Studio/PPC/Tango.PPC.UI/Printing/DefaultPrintingManager.cs | 7 | ||||
| -rw-r--r-- | Software/Visual_Studio/PPC/Tango.PPC.UI/Tango.PPC.UI.csproj | 4 |
2 files changed, 8 insertions, 3 deletions
diff --git a/Software/Visual_Studio/PPC/Tango.PPC.UI/Printing/DefaultPrintingManager.cs b/Software/Visual_Studio/PPC/Tango.PPC.UI/Printing/DefaultPrintingManager.cs index 1c7d39e73..1a509f78b 100644 --- a/Software/Visual_Studio/PPC/Tango.PPC.UI/Printing/DefaultPrintingManager.cs +++ b/Software/Visual_Studio/PPC/Tango.PPC.UI/Printing/DefaultPrintingManager.cs @@ -44,7 +44,12 @@ namespace Tango.PPC.UI.Printing /// <returns></returns> public JobHandler Print(Job job, ObservablesContext context) { - var handler = _machineProvider.MachineOperator.Print(job); + +#if STUBPRINT + var handler = _machineProvider.MachineOperator.PrintStub(job); +#else + var handler = _machineProvider.MachineOperator.Print(job); +#endif handler.Completed += async (x, e) => { diff --git a/Software/Visual_Studio/PPC/Tango.PPC.UI/Tango.PPC.UI.csproj b/Software/Visual_Studio/PPC/Tango.PPC.UI/Tango.PPC.UI.csproj index f0adee724..e29ee0e02 100644 --- a/Software/Visual_Studio/PPC/Tango.PPC.UI/Tango.PPC.UI.csproj +++ b/Software/Visual_Studio/PPC/Tango.PPC.UI/Tango.PPC.UI.csproj @@ -37,7 +37,7 @@ <DebugType>full</DebugType> <Optimize>false</Optimize> <OutputPath>..\..\Build\PPC\Debug\</OutputPath> - <DefineConstants>TRACE;DEBUG</DefineConstants> + <DefineConstants>TRACE;DEBUG;STUBPRINT</DefineConstants> <ErrorReport>prompt</ErrorReport> <WarningLevel>4</WarningLevel> </PropertyGroup> @@ -432,7 +432,7 @@ copy /Y "$(SolutionDir)Referenced Assemblies\vcruntime140d.dll" "$(TargetDir)"</ </PropertyGroup> <ProjectExtensions> <VisualStudio> - <UserProperties BuildVersion_AssemblyInfoFilename="Properties\AssemblyInfo.cs" BuildVersion_UpdateAssemblyVersion="True" BuildVersion_BuildVersioningStyle="None.None.Increment.TimeStamp" BuildVersion_UseGlobalSettings="False" BuildVersion_StartDate="2000/1/1" /> + <UserProperties BuildVersion_StartDate="2000/1/1" BuildVersion_UseGlobalSettings="False" BuildVersion_BuildVersioningStyle="None.None.Increment.TimeStamp" BuildVersion_UpdateAssemblyVersion="True" BuildVersion_AssemblyInfoFilename="Properties\AssemblyInfo.cs" /> </VisualStudio> </ProjectExtensions> </Project>
\ No newline at end of file |