From 2bf80f7f391e08ccb11ab339cdf7e40a21e9b859 Mon Sep 17 00:00:00 2001
From: Markus Quaritsch <quaritsch@ivt.tugraz.at>
Date: Wed, 8 Mar 2023 20:42:50 +0100
Subject: [PATCH] resolve merge conflicts
---
.../XMLElectricMotorDeclarationInputDataProvider.cs | 5 +++--
.../PrimaryComponents/VIFAngleDriveType.cs | 2 +-
2 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/VectoCore/VectoCore/InputData/FileIO/XML/Declaration/DataProvider/XMLElectricMotorDeclarationInputDataProvider.cs b/VectoCore/VectoCore/InputData/FileIO/XML/Declaration/DataProvider/XMLElectricMotorDeclarationInputDataProvider.cs
index 109bd6d0f9..ab5a24e25b 100644
--- a/VectoCore/VectoCore/InputData/FileIO/XML/Declaration/DataProvider/XMLElectricMotorDeclarationInputDataProvider.cs
+++ b/VectoCore/VectoCore/InputData/FileIO/XML/Declaration/DataProvider/XMLElectricMotorDeclarationInputDataProvider.cs
@@ -11,6 +11,7 @@ using TUGraz.VectoCommon.Models;
using TUGraz.VectoCommon.Resources;
using TUGraz.VectoCommon.Utils;
using TUGraz.VectoCore.InputData.FileIO.XML.Common;
+using TUGraz.VectoCore.InputData.FileIO.XML.Declaration.DataProvider;
using TUGraz.VectoCore.InputData.FileIO.XML.Declaration.Interfaces;
using TUGraz.VectoCore.Utils;
@@ -255,7 +256,7 @@ namespace TUGraz.VectoCore.InputData.FileIO.XML.Declaration.DataProvider
: base(componentNode, sourceFile)
{
_vehicle = vehicle;
- SourceType = DataSourceType.XMLEmbedded;
+ //SourceType = DataSourceType.XMLEmbedded;
ValidateGearCount();
}
@@ -350,7 +351,7 @@ namespace TUGraz.VectoCore.InputData.FileIO.XML.Declaration.DataProvider
}
}
- if (DragCurves.Count > 1 && AnyMissingGear(currentGears))
+ if (DragCurves.Count > 1 && AnyMissingGear(currentGears)) {
throw new ArgumentException("The DragCurve contains a gear which was not specified under gears");
}
}
diff --git a/VectoCore/VectoCore/OutputData/XML/DeclarationReports/VehicleInformationFile/VehicleInformationFile_0_1/PrimaryComponents/VIFAngleDriveType.cs b/VectoCore/VectoCore/OutputData/XML/DeclarationReports/VehicleInformationFile/VehicleInformationFile_0_1/PrimaryComponents/VIFAngleDriveType.cs
index d47e814470..c76cc5e37e 100644
--- a/VectoCore/VectoCore/OutputData/XML/DeclarationReports/VehicleInformationFile/VehicleInformationFile_0_1/PrimaryComponents/VIFAngleDriveType.cs
+++ b/VectoCore/VectoCore/OutputData/XML/DeclarationReports/VehicleInformationFile/VehicleInformationFile_0_1/PrimaryComponents/VIFAngleDriveType.cs
@@ -17,7 +17,7 @@ namespace TUGraz.VectoCore.OutputData.XML.DeclarationReports.VehicleInformationF
public XElement GetElement(IDeclarationInputDataProvider inputData)
{
var angelDrive = inputData.JobInputData.Vehicle.Components.AngledriveInputData;
- if (angelDrive == null || angelDrive.Type != AngledriveType.SeparateAngledrive)
+ if (angelDrive == null || angelDrive.Type != AngledriveType.SeparateAngledrive) {
return null;
}
--
GitLab