From 6a0fde2afefb5fb1d06b530ecd2a50f410fe4cd5 Mon Sep 17 00:00:00 2001
From: Markus Quaritsch <markus.quaritsch@tugraz.at>
Date: Tue, 10 May 2016 10:44:28 +0200
Subject: [PATCH] simulatorFactory: re-added parameter to pass custom
declaration report writer.
---
.../VectoCore/Models/Simulation/Impl/SimulatorFactory.cs | 8 +++++---
1 file changed, 5 insertions(+), 3 deletions(-)
diff --git a/VectoCore/VectoCore/Models/Simulation/Impl/SimulatorFactory.cs b/VectoCore/VectoCore/Models/Simulation/Impl/SimulatorFactory.cs
index c7c8fe3af0..c5a091d0eb 100644
--- a/VectoCore/VectoCore/Models/Simulation/Impl/SimulatorFactory.cs
+++ b/VectoCore/VectoCore/Models/Simulation/Impl/SimulatorFactory.cs
@@ -56,7 +56,8 @@ namespace TUGraz.VectoCore.Models.Simulation.Impl
private readonly ExecutionMode _mode;
- public SimulatorFactory(ExecutionMode mode, IInputDataProvider dataProvider, IOutputDataWriter writer)
+ public SimulatorFactory(ExecutionMode mode, IInputDataProvider dataProvider, IOutputDataWriter writer,
+ DeclarationReport declarationReport = null)
{
Log.Fatal("########## VectoCore Version {0} ##########", Assembly.GetExecutingAssembly().GetName().Version);
JobNumber = Interlocked.Increment(ref _jobNumberCounter);
@@ -69,7 +70,7 @@ namespace TUGraz.VectoCore.Models.Simulation.Impl
if (declDataProvider == null) {
throw new VectoException("InputDataProvider does not implement DeclarationData interface");
}
- var report = new PDFDeclarationReport(writer);
+ var report = declarationReport ?? new PDFDeclarationReport(writer);
var windowsIdentity = WindowsIdentity.GetCurrent();
report.Creator = windowsIdentity != null ? windowsIdentity.Name : "N/A";
report.JobName = declDataProvider.JobInputData().JobName;
@@ -147,7 +148,8 @@ namespace TUGraz.VectoCore.Models.Simulation.Impl
var validationErrors = run.Validate();
if (validationErrors.Any()) {
- throw new VectoException("Validation of Run-Data Failed: " + "\n".Join(validationErrors.Select(r => r.ErrorMessage)));
+ throw new VectoException("Validation of Run-Data Failed: " +
+ "\n".Join(validationErrors.Select(r => r.ErrorMessage)));
}
--
GitLab