diff --git a/Config/Properties/AssemblyInfo.cs b/Config/Properties/AssemblyInfo.cs index 682303bb7..79eea6a09 100644 --- a/Config/Properties/AssemblyInfo.cs +++ b/Config/Properties/AssemblyInfo.cs @@ -32,5 +32,5 @@ using System.Runtime.InteropServices; // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -[assembly: AssemblyVersion("2.12.385.0")] -[assembly: AssemblyFileVersion("2.12.385.0")] +[assembly: AssemblyVersion("2.12.387.0")] +[assembly: AssemblyFileVersion("2.12.387.0")] diff --git a/Results/Output/Printers/Munich/MunichPrintDocument.cs b/Results/Output/Printers/Munich/MunichPrintDocument.cs index a88808acd..c7b6fe38c 100644 --- a/Results/Output/Printers/Munich/MunichPrintDocument.cs +++ b/Results/Output/Printers/Munich/MunichPrintDocument.cs @@ -283,7 +283,7 @@ namespace Results.Output.Printers.Munich if (compound) { Results.Entities.MeterTestRslt mainMtr = wm.GetMeterTestRslt(mtr.Name(), CompoundMeterId.CompoundMain); - Results.Entities.MeterTestRslt auxMtr = wm.GetMeterTestRslt(mtr.Name(), CompoundMeterId.CompoundMain); + Results.Entities.MeterTestRslt auxMtr = wm.GetMeterTestRslt(mtr.Name(), CompoundMeterId.CompoundAux); PrintAt(e, FromTest(rowCnt, 2), mainMtr.VolumeMeter.ToString("F2")); PrintAt(e, FromTest(rowCnt, 3), auxMtr.VolumeMeter.ToString("F2")); @@ -301,8 +301,8 @@ namespace Results.Output.Printers.Munich PrintAt(e, FromTest(rowCnt, 7), mtr.TestRslt.TempDownMean.ToString("F2")); PrintAt(e, FromTest(rowCnt, 8), mtr.TestRslt.DensityDiv.ToString("F2")); PrintAt(e, FromTest(rowCnt, 9), mtr.TestTime.ToString("F1")); - PrintAt(e, FromTest(rowCnt, 10), mtr.TestRslt.PressUpMean.ToString("F2")); - PrintAt(e, FromTest(rowCnt, 11), mtr.TestRslt.PressDownMean.ToString("F2")); + PrintAt(e, FromTest(rowCnt, 10), Config.Units.ConvertTo(Config.Unit.bar, mtr.TestRslt.PressUpMean).ToString("F3")); + PrintAt(e, FromTest(rowCnt, 11), Config.Units.ConvertTo(Config.Unit.bar, mtr.TestRslt.PressDownMean).ToString("F3")); rowCnt++; } diff --git a/Results/Properties/AssemblyInfo.cs b/Results/Properties/AssemblyInfo.cs index 4613c9bce..1b59c9065 100644 --- a/Results/Properties/AssemblyInfo.cs +++ b/Results/Properties/AssemblyInfo.cs @@ -32,5 +32,5 @@ using System.Runtime.InteropServices; // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -[assembly: AssemblyVersion("2.12.385.0")] -[assembly: AssemblyFileVersion("2.12.385.0")] +[assembly: AssemblyVersion("2.12.388.0")] +[assembly: AssemblyFileVersion("2.12.388.0")] diff --git a/TestBenchFramework/BenchControl/ResultsPrinters/Munich/MunichPrintDocument.cs b/TestBenchFramework/BenchControl/ResultsPrinters/Munich/MunichPrintDocument.cs index 5212e60f4..51f25d97f 100644 --- a/TestBenchFramework/BenchControl/ResultsPrinters/Munich/MunichPrintDocument.cs +++ b/TestBenchFramework/BenchControl/ResultsPrinters/Munich/MunichPrintDocument.cs @@ -284,7 +284,7 @@ namespace TBF.BenchControl.ResultsPrinters.Munich if (compound) { Results.Entities.MeterTestRslt mainMtr = wm.GetMeterTestRslt(mtr.Name(), CompoundMeterId.CompoundMain); - Results.Entities.MeterTestRslt auxMtr = wm.GetMeterTestRslt(mtr.Name(), CompoundMeterId.CompoundMain); + Results.Entities.MeterTestRslt auxMtr = wm.GetMeterTestRslt(mtr.Name(), CompoundMeterId.CompoundAux); PrintAt(e, FromTest(rowCnt, 2), mainMtr.VolumeMeter.ToString("F2")); PrintAt(e, FromTest(rowCnt, 3), auxMtr.VolumeMeter.ToString("F2")); @@ -302,8 +302,8 @@ namespace TBF.BenchControl.ResultsPrinters.Munich PrintAt(e, FromTest(rowCnt, 7), mtr.TestRslt.TempDownMean.ToString("F2")); PrintAt(e, FromTest(rowCnt, 8), mtr.TestRslt.DensityDiv.ToString("F2")); PrintAt(e, FromTest(rowCnt, 9), mtr.TestTime.ToString("F1")); - PrintAt(e, FromTest(rowCnt, 10), mtr.TestRslt.PressUpMean.ToString("F2")); - PrintAt(e, FromTest(rowCnt, 11), mtr.TestRslt.PressDownMean.ToString("F2")); + PrintAt(e, FromTest(rowCnt, 10), Config.Units.ConvertTo(Config.Unit.bar, mtr.TestRslt.PressUpMean).ToString("F3")); + PrintAt(e, FromTest(rowCnt, 11), Config.Units.ConvertTo(Config.Unit.bar, mtr.TestRslt.PressDownMean).ToString("F3")); rowCnt++; } diff --git a/TestBenchFramework/Properties/AssemblyInfo.cs b/TestBenchFramework/Properties/AssemblyInfo.cs index 164505a0f..0e2f8c153 100644 --- a/TestBenchFramework/Properties/AssemblyInfo.cs +++ b/TestBenchFramework/Properties/AssemblyInfo.cs @@ -29,5 +29,5 @@ using System.Runtime.InteropServices; // Build Number // Revision // -[assembly: AssemblyVersion("2.12.387.1")] -[assembly: AssemblyFileVersion("2.12.387.1")] +[assembly: AssemblyVersion("2.12.388.1")] +[assembly: AssemblyFileVersion("2.12.388.1")] diff --git a/TestBenchFramework/Resources/Strings.de.resx b/TestBenchFramework/Resources/Strings.de.resx index 6f110d93c..6ee54fbc1 100644 --- a/TestBenchFramework/Resources/Strings.de.resx +++ b/TestBenchFramework/Resources/Strings.de.resx @@ -745,7 +745,7 @@ Auswahl Volumen und Fehlergrenzen - Supress trills + Filterschütteln Prüfstand befüllen?