From e7f3955b7e0c8988cabceabb0ad984c236e2f23d Mon Sep 17 00:00:00 2001
From: "VKMTHD\\haraldmartini" <harald.martini@student.tugraz.at>
Date: Mon, 13 Mar 2023 10:12:02 +0100
Subject: [PATCH] add override folder to <Vecto>\Declaration
---
Directory.Build.targets | 1 +
VectoCore/VectoCore/Models/Declaration/LookupData.cs | 2 +-
VectoCore/VectoCore/Resources/Declaration/Override/Readme.md | 3 +++
3 files changed, 5 insertions(+), 1 deletion(-)
create mode 100644 VectoCore/VectoCore/Resources/Declaration/Override/Readme.md
diff --git a/Directory.Build.targets b/Directory.Build.targets
index 2d116d444d..dad9cc6320 100644
--- a/Directory.Build.targets
+++ b/Directory.Build.targets
@@ -185,6 +185,7 @@
<GenericVehicles Include="$(SolutionDir)Generic Vehicles\**\*.*" Exclude="$(SolutionDir)**\*.vmod;$(SolutionDir)**\*.vsum;$(SolutionDir)**\*RSLT_*.xml;$(SolutionDir)**\*.pdf"/>
<MissionProfiles Include="$(SolutionDir)VectoCore\VectoCore\Resources\Declaration\MissionCycles\**\*.*"/>
<DeclarationData Include="$(SolutionDir)VectoCore\VectoCore\Resources\Declaration\**\*.csv" Exclude="$(SolutionDir)**\MissionCycles\**\*.*"/>
+ <DeclarationData Include="$(SolutionDir)VectoCore\VectoCore\Resources\Declaration\**\*.md" Exclude="$(SolutionDir)**\MissionCycles\**\*.*"/>
<DeclarationData Include="$(SolutionDir)VectoCore\VectoCore\Resources\Declaration\**\*.vacc" Exclude="$(SolutionDir)**\MissionCycles\**\*.*"/>
<DeclarationData Include="$(SolutionDir)VectoCore\VectoCore\Resources\Declaration\**\*.apac" Exclude="$(SolutionDir)**\MissionCycles\**\*.*"/>
<DeclarationData Include="$(SolutionDir)VectoCore\VectoCore\Resources\Declaration\**\*.aenv" Exclude="$(SolutionDir)**\MissionCycles\**\*.*"/>
diff --git a/VectoCore/VectoCore/Models/Declaration/LookupData.cs b/VectoCore/VectoCore/Models/Declaration/LookupData.cs
index 85dcc5f2da..b90b1ceaac 100644
--- a/VectoCore/VectoCore/Models/Declaration/LookupData.cs
+++ b/VectoCore/VectoCore/Models/Declaration/LookupData.cs
@@ -70,7 +70,7 @@ namespace TUGraz.VectoCore.Models.Declaration
#if USE_EXTERNAL_DECLARATION_DATA
var tmp = resourceId.Replace(DeclarationData.DeclarationDataResourcePrefix + ".", "");
var parts = tmp.Split('.');
- var fileName = Path.Combine("Declaration", string.Join(".", parts[parts.Length-2], parts[parts.Length-1]));
+ var fileName = Path.GetFullPath(Path.Combine(@"Declaration\Override", string.Join(".", parts[parts.Length-2], parts[parts.Length-1])));
if (File.Exists(fileName)) {
if (overrideWarning != null) {
overrideWarning($"{resourceId} overridden by {fileName}");
diff --git a/VectoCore/VectoCore/Resources/Declaration/Override/Readme.md b/VectoCore/VectoCore/Resources/Declaration/Override/Readme.md
new file mode 100644
index 0000000000..d66a505cf5
--- /dev/null
+++ b/VectoCore/VectoCore/Resources/Declaration/Override/Readme.md
@@ -0,0 +1,3 @@
+Add .csv files here to override values.
+
+Note: just copy the .csv file - without directories
\ No newline at end of file
--
GitLab