michal/tbf
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

MunichPrintDocument : (1) Water pressure in bar, (2) Aux meter data bug fixed, ver. 2.12.388

Browse Source
This commit is contained in:
Milan Hanajik
2016-11-17 11:12:43 +01:00
parent 0a827e0eb6
commit b75a8105de
6 changed files with 13 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Config/Properties/AssemblyInfo.cs
+2 -2
View File
@@ -32,5 +32,5 @@ using System.Runtime.InteropServices;
// You can specify all the values or you can default the Build and Revision Numbers // You can specify all the values or you can default the Build and Revision Numbers
// by using the '*' as shown below: // by using the '*' as shown below:
// [assembly: AssemblyVersion("1.0.*")] // [assembly: AssemblyVersion("1.0.*")]
[assembly: AssemblyVersion("2.12.385.0")] [assembly: AssemblyVersion("2.12.387.0")]
[assembly: AssemblyFileVersion("2.12.385.0")] [assembly: AssemblyFileVersion("2.12.387.0")]
Results/Output/Printers/Munich/MunichPrintDocument.cs
+3 -3
View File
@@ -283,7 +283,7 @@ namespace Results.Output.Printers.Munich
if (compound) if (compound)
{ {
Results.Entities.MeterTestRslt mainMtr = wm.GetMeterTestRslt(mtr.Name(), CompoundMeterId.CompoundMain); 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, 2), mainMtr.VolumeMeter.ToString("F2"));
PrintAt(e, FromTest(rowCnt, 3), auxMtr.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, 7), mtr.TestRslt.TempDownMean.ToString("F2"));
PrintAt(e, FromTest(rowCnt, 8), mtr.TestRslt.DensityDiv.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, 9), mtr.TestTime.ToString("F1"));
PrintAt(e, FromTest(rowCnt, 10), mtr.TestRslt.PressUpMean.ToString("F2")); PrintAt(e, FromTest(rowCnt, 10), Config.Units.ConvertTo(Config.Unit.bar, mtr.TestRslt.PressUpMean).ToString("F3"));
PrintAt(e, FromTest(rowCnt, 11), mtr.TestRslt.PressDownMean.ToString("F2")); PrintAt(e, FromTest(rowCnt, 11), Config.Units.ConvertTo(Config.Unit.bar, mtr.TestRslt.PressDownMean).ToString("F3"));
rowCnt++; rowCnt++;
} }
Results/Properties/AssemblyInfo.cs
+2 -2
View File
@@ -32,5 +32,5 @@ using System.Runtime.InteropServices;
// You can specify all the values or you can default the Build and Revision Numbers // You can specify all the values or you can default the Build and Revision Numbers
// by using the '*' as shown below: // by using the '*' as shown below:
// [assembly: AssemblyVersion("1.0.*")] // [assembly: AssemblyVersion("1.0.*")]
[assembly: AssemblyVersion("2.12.385.0")] [assembly: AssemblyVersion("2.12.388.0")]
[assembly: AssemblyFileVersion("2.12.385.0")] [assembly: AssemblyFileVersion("2.12.388.0")]
TestBenchFramework/BenchControl/ResultsPrinters/Munich/MunichPrintDocument.cs
+3 -3
View File
@@ -284,7 +284,7 @@ namespace TBF.BenchControl.ResultsPrinters.Munich
if (compound) if (compound)
{ {
Results.Entities.MeterTestRslt mainMtr = wm.GetMeterTestRslt(mtr.Name(), CompoundMeterId.CompoundMain); 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, 2), mainMtr.VolumeMeter.ToString("F2"));
PrintAt(e, FromTest(rowCnt, 3), auxMtr.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, 7), mtr.TestRslt.TempDownMean.ToString("F2"));
PrintAt(e, FromTest(rowCnt, 8), mtr.TestRslt.DensityDiv.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, 9), mtr.TestTime.ToString("F1"));
PrintAt(e, FromTest(rowCnt, 10), mtr.TestRslt.PressUpMean.ToString("F2")); PrintAt(e, FromTest(rowCnt, 10), Config.Units.ConvertTo(Config.Unit.bar, mtr.TestRslt.PressUpMean).ToString("F3"));
PrintAt(e, FromTest(rowCnt, 11), mtr.TestRslt.PressDownMean.ToString("F2")); PrintAt(e, FromTest(rowCnt, 11), Config.Units.ConvertTo(Config.Unit.bar, mtr.TestRslt.PressDownMean).ToString("F3"));
rowCnt++; rowCnt++;
} }
TestBenchFramework/Properties/AssemblyInfo.cs
+2 -2
View File
@@ -29,5 +29,5 @@ using System.Runtime.InteropServices;
// Build Number // Build Number
// Revision // Revision
// //
[assembly: AssemblyVersion("2.12.387.1")] [assembly: AssemblyVersion("2.12.388.1")]
[assembly: AssemblyFileVersion("2.12.387.1")] [assembly: AssemblyFileVersion("2.12.388.1")]
TestBenchFramework/Resources/Strings.de.resx
+1 -1
View File
@@ -745,7 +745,7 @@
<value>Auswahl Volumen und Fehlergrenzen</value> <value>Auswahl Volumen und Fehlergrenzen</value>
</data> </data>
<data name="SupressWMTrills" xml:space="preserve"> <data name="SupressWMTrills" xml:space="preserve">
<value>Supress trills</value> <value>Filterschütteln</value>
</data> </data>
<data name="Purge_bench_qm" xml:space="preserve"> <data name="Purge_bench_qm" xml:space="preserve">
<value>Prüfstand befüllen?</value> <value>Prüfstand befüllen?</value>