diff --git a/TestBenchFramework/BenchControl/ResultsPrinters/Cevak/PrintDocumentCevak.cs b/Results/Output/Printers/Cevak/PrintDocumentCevak.cs
similarity index 89%
rename from TestBenchFramework/BenchControl/ResultsPrinters/Cevak/PrintDocumentCevak.cs
rename to Results/Output/Printers/Cevak/PrintDocumentCevak.cs
index 16b633d64..5edbd1c8c 100644
--- a/TestBenchFramework/BenchControl/ResultsPrinters/Cevak/PrintDocumentCevak.cs
+++ b/Results/Output/Printers/Cevak/PrintDocumentCevak.cs
@@ -1,5 +1,5 @@
///
-/// Copyright (c) 2013-2015 Sensus Metering Systems
+/// Copyright (c) 2013-2016 Sensus Metering Systems
///
using System;
using System.Collections.Generic;
@@ -7,9 +7,9 @@ using System.Drawing;
using System.Drawing.Printing;
using System.IO;
using Config.Entities;
-using TBF.Resources;
+using Results.Resources;
-namespace TBF.BenchControl.ResultsPrinters.Cevak
+namespace Results.Output.Printers.Cevak
{
enum DocumentSection
{
@@ -50,7 +50,10 @@ namespace TBF.BenchControl.ResultsPrinters.Cevak
/// Data to print
///
Results.Entities.Batch batch;
- TBF.BenchControl.BenchInfo.Polska.Component benchInfo;
+
+ string testBenchName;
+ string address1;
+
///
/// Items to print
@@ -75,10 +78,9 @@ namespace TBF.BenchControl.ResultsPrinters.Cevak
public PrintDocumentCevak(Results.Entities.Batch batch,
PageOrientation pageOrientation,
int topMargin, int bottomMargin, int leftMargin,
- TBF.BenchControl.BenchInfo.Polska.Component benchInfo)
+ string testBenchName, string address1)
{
this.batch = batch;
- this.benchInfo = benchInfo;
DefaultPageSettings.Landscape = (pageOrientation == PageOrientation.Landscape);
@@ -86,19 +88,24 @@ namespace TBF.BenchControl.ResultsPrinters.Cevak
this.bottomMargin = bottomMargin;
this.leftMargin = leftMargin;
+ this.testBenchName = testBenchName;
+ this.address1 = address1;
+
TitleX = leftMargin;
TitleY = topMargin; /// Depends on the size of the header
HdrTop = TitleY + 60;
BodyTop = HdrTop + 250;
- if (batch.WaterMeters[0].Compound())
- {
- rsltItems = Results.ItemSpec.FromStrArray(Program.LocalSettings.RsltItems_Printer_CombinedWM);
- }
- else
- {
- rsltItems = Results.ItemSpec.FromStrArray(Program.LocalSettings.RsltItems_Printer_SingleWM);
- }
+ rsltItems = Results.ItemSpec.FromStrArray(new string[] {
+ "Test name",
+ "Volume",
+ "Reference volume",
+ "Test time",
+ "Flow",
+ "Error",
+ "Passed",
+ //"Reference error", // ?
+ });
/// Set print area size and margins (in dots using 100 dpi)
if (DefaultPageSettings.Landscape)
@@ -189,9 +196,9 @@ namespace TBF.BenchControl.ResultsPrinters.Cevak
"Název zkušební stanice: ",
"Zkušební SW, č. verze: ",
"Metodika: ", /// BenchAdresa 1
- "Okolní teplota: ",
- "Okolní tlak: ",
- "Relativní vlhkost: ",
+ //"Okolní teplota: ", // Disabled, see email dated 25.11.2016
+ //"Okolní tlak: ",
+ //"Relativní vlhkost: ",
};
string[] rightColumn = new string[]
@@ -204,16 +211,16 @@ namespace TBF.BenchControl.ResultsPrinters.Cevak
batch.EndTime.Day.ToString("D2"),
batch.EndTime.Hour.ToString("D2"),
batch.EndTime.Minute.ToString("D2")),
- batch.ProcedureName,
- batch.ProcedureDescription,
- batch.WatermetersStr,
- User.CurrentUser.Name,
- benchInfo.TestBenchName,
+ string.IsNullOrEmpty(batch.ProcedureName) ? "" : batch.ProcedureName,
+ string.IsNullOrEmpty(batch.ProcedureDescription) ? "" : batch.ProcedureDescription,
+ string.IsNullOrEmpty(batch.WatermetersStr) ? "" : batch.WatermetersStr,
+ string.IsNullOrEmpty(batch.UserName) ? "" : batch.UserName,
+ string.IsNullOrEmpty(testBenchName) ? "" : testBenchName,
string.Format("Test Bench Framework ver.{0}", batch.ProgramVersion),
- benchInfo.BenchInfoCfg.Address1,
- batch.AmbientTempAve().ToString("F1") + " °C",
- Config.Units.ConvertTo(Config.Unit.mbar, batch.AmbientPressAve()).ToString("F0") + " mbar",
- batch.AmbientHumiAve().ToString("F0") + " %",
+ string.IsNullOrEmpty(address1) ? "" : address1,
+ //batch.AmbientTempAve().ToString("F1") + " °C", // Disabled, see email dated 25.11.2016
+ //Config.Units.ConvertTo(Config.Unit.mbar, batch.AmbientPressAve()).ToString("F0") + " mbar",
+ //batch.AmbientHumiAve().ToString("F0") + " %",
};
/// Determine max. left column width in characters
@@ -260,7 +267,7 @@ namespace TBF.BenchControl.ResultsPrinters.Cevak
///----------
/// Footer
///----------
- string footerText = string.Format("str. {1}/{2}", Strings.Page, pageNr++, nrPages);
+ string footerText = string.Format("{0} {1}/{2}", Strings.Page, pageNr++, nrPages);
int footerWidth = (int)e.Graphics.MeasureString(footerText, font).Width;
PrintAt(e, leftMargin + (printWidth - footerWidth) / 2, topMargin + printHeight - SpacingOne, footerText);
}
diff --git a/Results/Properties/AssemblyInfo.cs b/Results/Properties/AssemblyInfo.cs
index 78b70397f..a46ba60d9 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.392.0")]
-[assembly: AssemblyFileVersion("2.12.392.0")]
+[assembly: AssemblyVersion("2.12.394.0")]
+[assembly: AssemblyFileVersion("2.12.394.0")]
diff --git a/Results/Resources/Strings.Designer.cs b/Results/Resources/Strings.Designer.cs
index 1f9b0d7e2..e5293a252 100644
--- a/Results/Resources/Strings.Designer.cs
+++ b/Results/Resources/Strings.Designer.cs
@@ -456,6 +456,15 @@ namespace Results.Resources {
}
}
+ ///
+ /// Looks up a localized string similar to Page.
+ ///
+ internal static string Page {
+ get {
+ return ResourceManager.GetString("Page", resourceCulture);
+ }
+ }
+
///
/// Looks up a localized string similar to PO.
///
diff --git a/Results/Resources/Strings.cs.resx b/Results/Resources/Strings.cs.resx
index 439983eb1..4dd2fc2c0 100644
--- a/Results/Resources/Strings.cs.resx
+++ b/Results/Resources/Strings.cs.resx
@@ -186,4 +186,7 @@
Montáž
+
+ str.
+
\ No newline at end of file
diff --git a/Results/Resources/Strings.resx b/Results/Resources/Strings.resx
index 1fac2fa2f..0b6060473 100644
--- a/Results/Resources/Strings.resx
+++ b/Results/Resources/Strings.resx
@@ -393,4 +393,7 @@
Single
+
+ Page
+
\ No newline at end of file
diff --git a/Results/Results.csproj b/Results/Results.csproj
index e20f58f03..45678cf1f 100644
--- a/Results/Results.csproj
+++ b/Results/Results.csproj
@@ -90,6 +90,9 @@
+
+ Component
+
Component
diff --git a/TestBenchFramework/BenchControl/ResultsPrinters/Cevak/Printer.cs b/TestBenchFramework/BenchControl/ResultsPrinters/Cevak/Printer.cs
index 5f96a5cfe..e96f7e73f 100644
--- a/TestBenchFramework/BenchControl/ResultsPrinters/Cevak/Printer.cs
+++ b/TestBenchFramework/BenchControl/ResultsPrinters/Cevak/Printer.cs
@@ -47,7 +47,12 @@ namespace TBF.BenchControl.ResultsPrinters.Cevak
{
TBF.BenchControl.BenchInfo.Polska.Component benchInfo =
BenchControl.Sequences.ProcessData.BenchInfo as TBF.BenchControl.BenchInfo.Polska.Component;
- new PrintDocumentCevak(batch, printerCfg.PageOrientation, printerCfg.TopMargin, printerCfg.BottomMargin, printerCfg.LeftMargin, benchInfo).Print();
+ new Results.Output.Printers.Cevak.PrintDocumentCevak(batch, printerCfg.PageOrientation,
+ printerCfg.TopMargin,
+ printerCfg.BottomMargin,
+ printerCfg.LeftMargin,
+ benchInfo.TestBenchName,
+ benchInfo.BenchInfoCfg.Address1).Print();
}
}
diff --git a/TestBenchFramework/Resources/Strings.cs.resx b/TestBenchFramework/Resources/Strings.cs.resx
index be881bc53..837b16002 100644
--- a/TestBenchFramework/Resources/Strings.cs.resx
+++ b/TestBenchFramework/Resources/Strings.cs.resx
@@ -646,7 +646,7 @@
P down start
- Strana
+ str.
Parametry
diff --git a/TestBenchFramework/TBF.csproj b/TestBenchFramework/TBF.csproj
index 1f7cd893f..8d072d3e0 100644
--- a/TestBenchFramework/TBF.csproj
+++ b/TestBenchFramework/TBF.csproj
@@ -511,9 +511,6 @@
WriterCfgCtrl.cs
-
- Component
-