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

'Config', 'Results' projects added, includes iPerl opto logging bug-fixes, builds OK, cannot open DB, version 2.0.158.

Browse Source
This commit is contained in:
Milan Hanajik
2015-12-05 14:18:36 +01:00
parent 29ece2f91c
commit f6cec9d769
360 changed files with 6406 additions and 4091 deletions
Download Patch File Download Diff File Expand all files Collapse all files
TestBenchFramework/BenchControl/ResultsPrinters/Munich/MunichPrintDocument.cs
+4 -3
View File
@@ -5,6 +5,7 @@ using System;
using System.Collections.Generic;
using System.Drawing;
using System.Drawing.Printing;
using Config.Entities;
using TBF.BenchControl;
namespace TBF.BenchControl.ResultsPrinters.Munich
@@ -46,13 +47,13 @@ namespace TBF.BenchControl.ResultsPrinters.Munich
/// </summary>
/// <param name="textToPrint">Text to be printed</param>
public MunichPrintDocument(Printer printer,
Entities.PageOrientation pageOrientation)
PageOrientation pageOrientation)
{
prn = printer;
combined = (prn.Results[0].MetersKind == Entities.MetersKind.Combined);
combined = (prn.Results[0].MetersKind == MetersKind.Combined);
secondTableOffset = (prn.Results.Count + 2) * SpacingOneAndHalf;
DefaultPageSettings.Landscape = (pageOrientation == Entities.PageOrientation.Landscape);
DefaultPageSettings.Landscape = (pageOrientation == PageOrientation.Landscape);
}
/// <summary>
TestBenchFramework/BenchControl/ResultsPrinters/Munich/Printer.cs
+4 -3
View File
@@ -6,6 +6,7 @@ using System.Collections.Generic;
using System.Drawing;
using System.Drawing.Printing;
using log4net;
using Config.Entities;
using TBF.BenchControl;
namespace TBF.BenchControl.ResultsPrinters.Munich
@@ -22,7 +23,7 @@ namespace TBF.BenchControl.ResultsPrinters.Munich
/// </summary>
public GenericDevices.IBenchInfo BenchId;
public IList<GenericDevices.IWaterMeter> WaterMeters;
public IList<Entities.TestResult> Results;
public IList<TestResult> Results;
public string Title;
public string Version { get { return printerCfg. ProcParams.Version; } }
public string Zaehlertyp { get { return printerCfg. ProcParams.Zaehlertyp; } }
@@ -49,8 +50,8 @@ namespace TBF.BenchControl.ResultsPrinters.Munich
/// <returns>Reference to the operation</returns>
public IOperation PrintResultsOp(GenericDevices.IBenchInfo benchId,
IList<GenericDevices.IWaterMeter> waterMeters,
Entities.Procedure procedure,
IList<Entities.TestResult> results,
Procedure procedure,
IList<TestResult> results,
string title)
{
this.BenchId = benchId;
TestBenchFramework/BenchControl/ResultsPrinters/Munich/PrinterCfg.cs
+4 -3
View File
@@ -5,6 +5,7 @@ using System;
using System.Collections.Generic;
using System.IO;
using System.Xml.Serialization;
using Config.Entities;
using TBF.BenchControl.Generic;
namespace TBF.BenchControl.ResultsPrinters.Munich
@@ -17,14 +18,14 @@ namespace TBF.BenchControl.ResultsPrinters.Munich
///
/// Serialized parameters
///
public Entities.PageOrientation PageOrientation;
public PageOrientation PageOrientation;
public bool SupressPrinting; /// Bypass printing when true
/// <summary> Procedure parameters </summary>
[XmlIgnore]
public ProcParams ProcParams;
public override IParamsProvider GetProcedureParams() { return ProcParams; }
public override IParamsProvider CreateProcedureParams(Entities.Procedure procedure)
public override IParamsProvider CreateProcedureParams(Procedure procedure)
{
ProcParams procParams = new ProcParams();
procParams.UpdateProcedureParams(Name, procedure);
@@ -36,7 +37,7 @@ namespace TBF.BenchControl.ResultsPrinters.Munich
{
Name = "PrintedProtocol";
ParentName = string.Empty;
PageOrientation = Entities.PageOrientation.Portrait;
PageOrientation = PageOrientation.Portrait;
SupressPrinting = false;
ProcParams = new ProcParams();
}
TestBenchFramework/BenchControl/ResultsPrinters/Munich/PrinterCfgCtrl.cs
+7 -6
View File
@@ -4,6 +4,7 @@
using System;
using System.Windows.Forms;
using log4net;
using Config.Entities;
using TBF.BenchControl.Generic;
namespace TBF.BenchControl.ResultsPrinters.Munich
@@ -29,8 +30,8 @@ namespace TBF.BenchControl.ResultsPrinters.Munich
{
InitializeComponent();
orientationComboBox.Items.Add(Entities.PageOrientation.Portrait.ToString());
orientationComboBox.Items.Add(Entities.PageOrientation.Landscape.ToString());
orientationComboBox.Items.Add(PageOrientation.Portrait.ToString());
orientationComboBox.Items.Add(PageOrientation.Landscape.ToString());
}
private void PrinterCfgCtrl_Load(object sender, EventArgs e)
@@ -42,11 +43,11 @@ namespace TBF.BenchControl.ResultsPrinters.Munich
{
}
Entities.PageOrientation GetOrientation(string str)
PageOrientation GetOrientation(string str)
{
if (str.Equals(Entities.PageOrientation.Landscape.ToString())) return Entities.PageOrientation.Landscape;
if (str.Equals(Entities.PageOrientation.Portrait.ToString())) return Entities.PageOrientation.Portrait;
return (Entities.PageOrientation)(-1);
if (str.Equals(PageOrientation.Landscape.ToString())) return PageOrientation.Landscape;
if (str.Equals(PageOrientation.Portrait.ToString())) return PageOrientation.Portrait;
return (PageOrientation)(-1);
}
void Redraw()
TestBenchFramework/BenchControl/ResultsPrinters/Munich/PrinterFactory.cs
+1 -1
View File
@@ -15,7 +15,7 @@ namespace TBF.BenchControl.ResultsPrinters.Munich
public IComponentCfg DefaultConfig() { return new PrinterCfg(this); }
public IComponentCfg CmpntCfgFromCmpntEntity(Entities.Component component)
public IComponentCfg CmpntCfgFromCmpntEntity(Config.Entities.Component component)
{
return ComponentCfgBase.CreateFromDbEntity(typeof(PrinterCfg), component, this);
}
TestBenchFramework/BenchControl/ResultsPrinters/Munich/ProcParams.cs
+3 -2
View File
@@ -4,6 +4,7 @@
using System.IO;
using System.Text;
using System.Xml.Serialization;
using Config.Entities;
using TBF.BenchControl.Generic;
using TBF.Resources;
@@ -90,7 +91,7 @@ namespace TBF.BenchControl.ResultsPrinters.Munich
return pars;
}
public override void UpdateProcedureParams(Entities.ComponentProcedure dbEntity)
public override void UpdateProcedureParams(ComponentProcedure dbEntity)
{
if (dbEntity == null) return;
try
@@ -114,7 +115,7 @@ namespace TBF.BenchControl.ResultsPrinters.Munich
{
}
public ProcParams(Entities.ComponentProcedure procParamsEntity, string componentName, Entities.Procedure procedure)
public ProcParams(ComponentProcedure procParamsEntity, string componentName, Procedure procedure)
{
this.procedureParamsEntity = procParamsEntity;
this.componentName = componentName;