From 8ebe0236287d5eb8c5acd27fb2c385f63aeebcbb Mon Sep 17 00:00:00 2001
From: "harald.martini@student.tugraz.at" <harald.martini@student.tugraz.at>
Date: Mon, 4 Oct 2021 11:52:05 +0200
Subject: [PATCH] Renamed InterimStage to InterimStep
---
VECTO3GUI2020/Model/Multistage/JSONJob.cs | 8 ++++----
.../MultiStage/Implementation/CreateVifViewModel.cs | 2 +-
Vecto3GUI2020Test/ViewModelTests/JsonTests.cs | 2 +-
.../VectoCore/InputData/FileIO/JSON/JSONInputData.cs | 2 +-
VectoCore/VectoCore/JsonKeys.Designer.cs | 6 +++---
VectoCore/VectoCore/JsonKeys.resx | 4 ++--
.../Multistage/newVifCompletedConventional-noADAS.vecto | 2 +-
.../Multistage/newVifCompletedConventional.vecto | 2 +-
.../Integration/Multistage/newVifExempted-noTPMLM.vecto | 2 +-
.../TestData/Integration/Multistage/newVifExempted.vecto | 2 +-
.../Integration/Multistage/newVifExemptedIncomplete.vecto | 2 +-
.../Integration/Multistage/newVifInterimDiesel.vecto | 2 +-
.../FactorMethod/CompletedHeavyBus_33b1.RSLT_VIF.xml | 2 +-
13 files changed, 19 insertions(+), 19 deletions(-)
diff --git a/VECTO3GUI2020/Model/Multistage/JSONJob.cs b/VECTO3GUI2020/Model/Multistage/JSONJob.cs
index 733d512b03..fd1068f01b 100644
--- a/VECTO3GUI2020/Model/Multistage/JSONJob.cs
+++ b/VECTO3GUI2020/Model/Multistage/JSONJob.cs
@@ -70,7 +70,7 @@ namespace VECTO3GUI2020.Model.Multistage
public class JSONJobBody : ObservableObject
{
- private string _interimStage;
+ private string _interimStep;
private string _primaryVehicle;
private bool _completed;
@@ -80,10 +80,10 @@ namespace VECTO3GUI2020.Model.Multistage
set { SetProperty(ref _primaryVehicle, value); }
}
- public string InterimStage
+ public string InterimStep
{
- get { return _interimStage; }
- set { SetProperty(ref _interimStage, value); }
+ get { return _interimStep; }
+ set { SetProperty(ref _interimStep, value); }
}
public bool Completed
diff --git a/VECTO3GUI2020/ViewModel/MultiStage/Implementation/CreateVifViewModel.cs b/VECTO3GUI2020/ViewModel/MultiStage/Implementation/CreateVifViewModel.cs
index f74411547d..94c2788ab5 100644
--- a/VECTO3GUI2020/ViewModel/MultiStage/Implementation/CreateVifViewModel.cs
+++ b/VECTO3GUI2020/ViewModel/MultiStage/Implementation/CreateVifViewModel.cs
@@ -298,7 +298,7 @@ namespace VECTO3GUI2020.ViewModel.MultiStage.Implementation
},
Body = new JSONJobBody() {
PrimaryVehicle = PathHelper.GetRelativePath(path, PrimaryInputPath),
- InterimStage = PathHelper.GetRelativePath(path, StageInputPath)
+ InterimStep = PathHelper.GetRelativePath(path, StageInputPath)
}
};
diff --git a/Vecto3GUI2020Test/ViewModelTests/JsonTests.cs b/Vecto3GUI2020Test/ViewModelTests/JsonTests.cs
index 83aedfdca1..1c7efec512 100644
--- a/Vecto3GUI2020Test/ViewModelTests/JsonTests.cs
+++ b/Vecto3GUI2020Test/ViewModelTests/JsonTests.cs
@@ -16,7 +16,7 @@ namespace Vecto3GUI2020Test.ViewModelTests
Assert.AreEqual(JsonKeys.JsonBody, nameof(JSONJob.Body));
Assert.AreEqual(JsonKeys.PrimaryVehicle, nameof(JSONJob.Body.PrimaryVehicle));
- Assert.AreEqual(JsonKeys.InterimStage, nameof(JSONJob.Body.InterimStage));
+ Assert.AreEqual(JsonKeys.InterimStep, nameof(JSONJob.Body.InterimStep));
Assert.AreEqual(JsonKeys.Completed, nameof(JSONJob.Body.Completed));
}
}
diff --git a/VectoCore/VectoCore/InputData/FileIO/JSON/JSONInputData.cs b/VectoCore/VectoCore/InputData/FileIO/JSON/JSONInputData.cs
index 3d1e8d3033..06b9056651 100644
--- a/VectoCore/VectoCore/InputData/FileIO/JSON/JSONInputData.cs
+++ b/VectoCore/VectoCore/InputData/FileIO/JSON/JSONInputData.cs
@@ -1166,7 +1166,7 @@ namespace TUGraz.VectoCore.InputData.FileIO.JSON
_primaryVehicleInputDataPath = Body.GetEx<string>(JsonKeys.PrimaryVehicle);
_primaryVehicleInputDataPath = PathHelper.GetAbsolutePath(filename, _primaryVehicleInputDataPath);
- _stageInputDataPath = Body.GetEx<string>(JsonKeys.InterimStage);
+ _stageInputDataPath = Body.GetEx<string>(JsonKeys.InterimStep);
_stageInputDataPath = PathHelper.GetAbsolutePath(filename, _stageInputDataPath);
_completed = Body.GetValueOrDefault<bool>(JsonKeys.Completed);
diff --git a/VectoCore/VectoCore/JsonKeys.Designer.cs b/VectoCore/VectoCore/JsonKeys.Designer.cs
index 635a01d099..6e6af76ed1 100644
--- a/VectoCore/VectoCore/JsonKeys.Designer.cs
+++ b/VectoCore/VectoCore/JsonKeys.Designer.cs
@@ -493,11 +493,11 @@ namespace TUGraz.VectoCore {
}
/// <summary>
- /// Looks up a localized string similar to InterimStage.
+ /// Looks up a localized string similar to InterimStep.
/// </summary>
- internal static string InterimStage {
+ internal static string InterimStep {
get {
- return ResourceManager.GetString("InterimStage", resourceCulture);
+ return ResourceManager.GetString("InterimStep", resourceCulture);
}
}
diff --git a/VectoCore/VectoCore/JsonKeys.resx b/VectoCore/VectoCore/JsonKeys.resx
index 1a022153c6..bb4fdb88ba 100644
--- a/VectoCore/VectoCore/JsonKeys.resx
+++ b/VectoCore/VectoCore/JsonKeys.resx
@@ -381,8 +381,8 @@
<data name="PrimaryVehicle" xml:space="preserve">
<value>PrimaryVehicle</value>
</data>
- <data name="InterimStage" xml:space="preserve">
- <value>InterimStage</value>
+ <data name="InterimStep" xml:space="preserve">
+ <value>InterimStep</value>
</data>
<data name="Completed" xml:space="preserve">
<value>Completed</value>
diff --git a/VectoCore/VectoCoreTest/TestData/Integration/Multistage/newVifCompletedConventional-noADAS.vecto b/VectoCore/VectoCoreTest/TestData/Integration/Multistage/newVifCompletedConventional-noADAS.vecto
index e96721c11b..be4ceb42d3 100644
--- a/VectoCore/VectoCoreTest/TestData/Integration/Multistage/newVifCompletedConventional-noADAS.vecto
+++ b/VectoCore/VectoCoreTest/TestData/Integration/Multistage/newVifCompletedConventional-noADAS.vecto
@@ -7,7 +7,7 @@
},
"Body": {
"PrimaryVehicle": "..\\..\\XML\\XMLReaderDeclaration\\SchemaVersion2.10\\vecto_vehicle-primary_heavyBus-sample.xml",
- "InterimStage": "..\\..\\XML\\XMLReaderDeclaration\\SchemaVersion2.10\\vecto_vehicle-stage_input_full-sample-final-noADAS.xml",
+ "InterimStep": "..\\..\\XML\\XMLReaderDeclaration\\SchemaVersion2.10\\vecto_vehicle-stage_input_full-sample-final-noADAS.xml",
"Completed": false
}
}
\ No newline at end of file
diff --git a/VectoCore/VectoCoreTest/TestData/Integration/Multistage/newVifCompletedConventional.vecto b/VectoCore/VectoCoreTest/TestData/Integration/Multistage/newVifCompletedConventional.vecto
index 49c6d51187..1adf195f59 100644
--- a/VectoCore/VectoCoreTest/TestData/Integration/Multistage/newVifCompletedConventional.vecto
+++ b/VectoCore/VectoCoreTest/TestData/Integration/Multistage/newVifCompletedConventional.vecto
@@ -7,7 +7,7 @@
},
"Body": {
"PrimaryVehicle": "..\\..\\XML\\XMLReaderDeclaration\\SchemaVersion2.10\\vecto_vehicle-primary_heavyBus-sample.xml",
- "InterimStage": "..\\..\\XML\\XMLReaderDeclaration\\SchemaVersion2.10\\vecto_vehicle-stage_input_full-sample-final.xml",
+ "InterimStep": "..\\..\\XML\\XMLReaderDeclaration\\SchemaVersion2.10\\vecto_vehicle-stage_input_full-sample-final.xml",
"Completed": false
}
}
\ No newline at end of file
diff --git a/VectoCore/VectoCoreTest/TestData/Integration/Multistage/newVifExempted-noTPMLM.vecto b/VectoCore/VectoCoreTest/TestData/Integration/Multistage/newVifExempted-noTPMLM.vecto
index 906a800378..bad751aeaa 100644
--- a/VectoCore/VectoCoreTest/TestData/Integration/Multistage/newVifExempted-noTPMLM.vecto
+++ b/VectoCore/VectoCoreTest/TestData/Integration/Multistage/newVifExempted-noTPMLM.vecto
@@ -7,7 +7,7 @@
},
"Body": {
"PrimaryVehicle": "..\\..\\XML\\XMLReaderDeclaration\\SchemaVersion2.10\\exempted_primary_heavyBus.xml",
- "InterimStage": "..\\..\\XML\\XMLReaderDeclaration\\SchemaVersion2.10\\vecto_vehicle-exempted_input_completewithoutTMPLM.xml",
+ "InterimStep": "..\\..\\XML\\XMLReaderDeclaration\\SchemaVersion2.10\\vecto_vehicle-exempted_input_completewithoutTMPLM.xml",
"Completed": false
}
}
\ No newline at end of file
diff --git a/VectoCore/VectoCoreTest/TestData/Integration/Multistage/newVifExempted.vecto b/VectoCore/VectoCoreTest/TestData/Integration/Multistage/newVifExempted.vecto
index baf8d681f8..f3ffdc2526 100644
--- a/VectoCore/VectoCoreTest/TestData/Integration/Multistage/newVifExempted.vecto
+++ b/VectoCore/VectoCoreTest/TestData/Integration/Multistage/newVifExempted.vecto
@@ -7,7 +7,7 @@
},
"Body": {
"PrimaryVehicle": "..\\..\\XML\\XMLReaderDeclaration\\SchemaVersion2.10\\exempted_primary_heavyBus.xml",
- "InterimStage": "..\\..\\XML\\XMLReaderDeclaration\\SchemaVersion2.10\\vecto_vehicle-exempted_input_full-sample.xml",
+ "InterimStep": "..\\..\\XML\\XMLReaderDeclaration\\SchemaVersion2.10\\vecto_vehicle-exempted_input_full-sample.xml",
"Completed": false
}
}
\ No newline at end of file
diff --git a/VectoCore/VectoCoreTest/TestData/Integration/Multistage/newVifExemptedIncomplete.vecto b/VectoCore/VectoCoreTest/TestData/Integration/Multistage/newVifExemptedIncomplete.vecto
index 468b4b6325..89ced880a3 100644
--- a/VectoCore/VectoCoreTest/TestData/Integration/Multistage/newVifExemptedIncomplete.vecto
+++ b/VectoCore/VectoCoreTest/TestData/Integration/Multistage/newVifExemptedIncomplete.vecto
@@ -7,7 +7,7 @@
},
"Body": {
"PrimaryVehicle": "..\\..\\XML\\XMLReaderDeclaration\\SchemaVersion2.10\\exempted_primary_heavyBus.xml",
- "InterimStage": "..\\..\\XML\\XMLReaderDeclaration\\SchemaVersion2.10\\vecto_vehicle-exempted_input_interim-sample.xml",
+ "InterimStep": "..\\..\\XML\\XMLReaderDeclaration\\SchemaVersion2.10\\vecto_vehicle-exempted_input_interim-sample.xml",
"Completed": false
}
}
\ No newline at end of file
diff --git a/VectoCore/VectoCoreTest/TestData/Integration/Multistage/newVifInterimDiesel.vecto b/VectoCore/VectoCoreTest/TestData/Integration/Multistage/newVifInterimDiesel.vecto
index be9a0cf0a3..c313011d65 100644
--- a/VectoCore/VectoCoreTest/TestData/Integration/Multistage/newVifInterimDiesel.vecto
+++ b/VectoCore/VectoCoreTest/TestData/Integration/Multistage/newVifInterimDiesel.vecto
@@ -7,7 +7,7 @@
},
"Body": {
"PrimaryVehicle": "..\\..\\XML\\XMLReaderDeclaration\\SchemaVersion2.10\\vecto_vehicle-primary_heavyBus-sample.xml",
- "InterimStage": "..\\..\\XML\\XMLReaderDeclaration\\SchemaVersion2.10\\vecto_vehicle-stage_input_full-sample.xml",
+ "InterimStep": "..\\..\\XML\\XMLReaderDeclaration\\SchemaVersion2.10\\vecto_vehicle-stage_input_full-sample.xml",
"Completed": false
}
}
\ No newline at end of file
diff --git a/VectoCore/VectoCoreTest/bin/Debug/TestData/Integration/Buses/FactorMethod/CompletedHeavyBus_33b1.RSLT_VIF.xml b/VectoCore/VectoCoreTest/bin/Debug/TestData/Integration/Buses/FactorMethod/CompletedHeavyBus_33b1.RSLT_VIF.xml
index 270185d989..e5b5465e55 100644
--- a/VectoCore/VectoCoreTest/bin/Debug/TestData/Integration/Buses/FactorMethod/CompletedHeavyBus_33b1.RSLT_VIF.xml
+++ b/VectoCore/VectoCoreTest/bin/Debug/TestData/Integration/Buses/FactorMethod/CompletedHeavyBus_33b1.RSLT_VIF.xml
@@ -579,7 +579,7 @@ xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile
</Signature>
</PrimaryVehicle>
<ManufacturingStep stepCount="2">
- <Data xsi:type="vif0.1:BusManufacturingStageDataType" id="asdf">
+ <Data xsi:type="vif0.1:BusManufacturingStepDataType" id="asdf">
<HashPreviousStage>
<di:Reference>
<di:DigestMethod Algorithm=""></di:DigestMethod>
--
GitLab