diff --git a/TestBenchFramework/BenchControl/ResultsPrinters/Basic/BasicPrintDocument.cs b/TestBenchFramework/BenchControl/ResultsPrinters/Basic/BasicPrintDocument.cs index 9402f50c6..11e829475 100644 --- a/TestBenchFramework/BenchControl/ResultsPrinters/Basic/BasicPrintDocument.cs +++ b/TestBenchFramework/BenchControl/ResultsPrinters/Basic/BasicPrintDocument.cs @@ -179,7 +179,7 @@ namespace TBF.BenchControl.ResultsPrinters.Basic batch.ProcedureName, User.CurrentUser.Name, batch.AmbientTempAve().ToString("F1") + " °C", - batch.AmbientPressAve().ToString("F0") + " mbar", + Config.Units.ConvertTo(Config.Unit.mbar, batch.AmbientPressAve()).ToString("F0") + " mbar", batch.AmbientHumiAve().ToString("F0") + " %", }; diff --git a/TestBenchFramework/BenchControl/ResultsPrinters/Cevak/PrintDocumentCevak.cs b/TestBenchFramework/BenchControl/ResultsPrinters/Cevak/PrintDocumentCevak.cs index 8cd496a08..16b633d64 100644 --- a/TestBenchFramework/BenchControl/ResultsPrinters/Cevak/PrintDocumentCevak.cs +++ b/TestBenchFramework/BenchControl/ResultsPrinters/Cevak/PrintDocumentCevak.cs @@ -212,7 +212,7 @@ namespace TBF.BenchControl.ResultsPrinters.Cevak string.Format("Test Bench Framework ver.{0}", batch.ProgramVersion), benchInfo.BenchInfoCfg.Address1, batch.AmbientTempAve().ToString("F1") + " °C", - batch.AmbientPressAve().ToString("F0") + " mbar", + Config.Units.ConvertTo(Config.Unit.mbar, batch.AmbientPressAve()).ToString("F0") + " mbar", batch.AmbientHumiAve().ToString("F0") + " %", }; diff --git a/TestBenchFramework/BenchControl/ResultsPrinters/Munich/MunichPrintDocument.cs b/TestBenchFramework/BenchControl/ResultsPrinters/Munich/MunichPrintDocument.cs index fd7253eda..e25602187 100644 --- a/TestBenchFramework/BenchControl/ResultsPrinters/Munich/MunichPrintDocument.cs +++ b/TestBenchFramework/BenchControl/ResultsPrinters/Munich/MunichPrintDocument.cs @@ -241,7 +241,7 @@ namespace TBF.BenchControl.ResultsPrinters.Munich PrintAt(e, Tab2, lineNr * SpacingOne, wm.Batch.AmbientHumiAve().ToString("F0") + " %"); lineNr++; PrintAt(e, Tab1, lineNr * SpacingOne, "Luftdruck"); - PrintAt(e, Tab2, lineNr * SpacingOne, wm.Batch.AmbientPressAve().ToString("F0") + " mbar"); + PrintAt(e, Tab2, lineNr * SpacingOne, Config.Units.ConvertTo(Config.Unit.mbar, wm.Batch.AmbientPressAve()).ToString("F0") + " mbar"); lineNr++; PrintAt(e, Tab3, lineNr * SpacingOne, wm.Batch.EndTime.Date.ToString("d")); diff --git a/TestBenchFramework/BenchControl/ResultsPrinters/Zapiska/MyPrintDocument.cs b/TestBenchFramework/BenchControl/ResultsPrinters/Zapiska/MyPrintDocument.cs index d37a9691c..399a87474 100644 --- a/TestBenchFramework/BenchControl/ResultsPrinters/Zapiska/MyPrintDocument.cs +++ b/TestBenchFramework/BenchControl/ResultsPrinters/Zapiska/MyPrintDocument.cs @@ -228,12 +228,12 @@ namespace TBF.BenchControl.ResultsPrinters.Zapiska string[] rightColumn = new string[] { allResults[0].PurchaseOrder, - string.Format("{0:yyyy.MM.dd HH:mm}", dateTime), + string.Format("{0:dd.MM.yyyy HH:mm}", dateTime), procedure.Name, tester, string.Empty, allResults[0].AmbientTempAve.ToString("F1") + " °C", - allResults[0].AmbientPressAve.ToString("F0") + " mbar", + Config.Units.ConvertTo(Config.Unit.mbar, allResults[0].AmbientPressAve).ToString("F0") + " mbar", allResults[0].AmbientHumiAve.ToString("F0") + " %", };