From 99023f22d9ce7234d2add275436205229e4555fc Mon Sep 17 00:00:00 2001
From: Markus Quaritsch <markus.quaritsch@tugraz.at>
Date: Mon, 25 Sep 2017 10:03:58 +0200
Subject: [PATCH] declarationdataadapter: write wheels dimenstion string to
axle data
---
.../Reader/DataObjectAdapter/DeclarationDataAdapter.cs | 5 +++--
VectoCore/VectoCore/OutputData/XML/XMLDeclarationWriter.cs | 2 +-
2 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/VectoCore/VectoCore/InputData/Reader/DataObjectAdapter/DeclarationDataAdapter.cs b/VectoCore/VectoCore/InputData/Reader/DataObjectAdapter/DeclarationDataAdapter.cs
index 35faf312e2..c3696d9f0b 100644
--- a/VectoCore/VectoCore/InputData/Reader/DataObjectAdapter/DeclarationDataAdapter.cs
+++ b/VectoCore/VectoCore/InputData/Reader/DataObjectAdapter/DeclarationDataAdapter.cs
@@ -133,7 +133,8 @@ namespace TUGraz.VectoCore.InputData.Reader.DataObjectAdapter
TwinTyres = DeclarationData.Trailer.TwinTyres,
RollResistanceCoefficient = DeclarationData.Trailer.RollResistanceCoefficient,
TyreTestLoad = DeclarationData.Trailer.TyreTestLoad.SI<Newton>(),
- Inertia = trailerWheel.Inertia
+ Inertia = trailerWheel.Inertia,
+ WheelsDimension = trailerWheel.WheelType
}));
}
retVal.AxleData = axleData;
@@ -473,4 +474,4 @@ namespace TUGraz.VectoCore.InputData.Reader.DataObjectAdapter
};
}
}
-}
\ No newline at end of file
+}
diff --git a/VectoCore/VectoCore/OutputData/XML/XMLDeclarationWriter.cs b/VectoCore/VectoCore/OutputData/XML/XMLDeclarationWriter.cs
index 6de5fdc8d3..917ed39bcf 100644
--- a/VectoCore/VectoCore/OutputData/XML/XMLDeclarationWriter.cs
+++ b/VectoCore/VectoCore/OutputData/XML/XMLDeclarationWriter.cs
@@ -419,7 +419,7 @@ namespace TUGraz.VectoCore.OutputData.XML
private string CreateIdString(string id)
{
- var regexp = new Regex("[^a-zA-Z0-9_-]");
+ var regexp = new Regex("[^a-zA-Z0-9_.-]");
return regexp.Replace(id, "");
}
}
--
GitLab