diff --git a/VECTO3GUI2020/Model/Multistage/JSONJob.cs b/VECTO3GUI2020/Model/Multistage/JSONJob.cs
index 733d512b0379bedb18f71bf5028bfc84144ba989..fd1068f01b00d4b6ce5be9218614d45650a611b1 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 f74411547dde3270acf96b09e3b687e0c5980eee..94c2788ab53714d7fa8ccca3b8868a6fa2903590 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 83aedfdca1f14e78787968998ca8023b5790811c..1c7efec51284650d1a3e1bffde0d229fbacb5e9b 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 3d1e8d30338f8267b324690789ea237c0079f387..06b905665181ae15cbe949ef3c7b7963b3986a69 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 635a01d099148c151fe468f853a4a73ab3068b0a..6e6af76ed1e2ccfdbc8a9af7216d10b68c011ee3 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 1a022153c6a6bf665f169cca44aec55a52a2a441..bb4fdb88ba958319e22aff7b7e272c21af4177b6 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 e96721c11b45053511438a5e64cf352725d6225d..be4ceb42d37eb04f62eb9373c40150ef55456ba3 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 49c6d51187423cc6592cef42a9aee71e63aa7626..1adf195f59c2f98083e5995353bfe05865af1851 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 906a8003787def9742f0a7fe0443f4fd35baca16..bad751aeaaef7a9ff48c2225fc1ff02703a3deac 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 baf8d681f85f84d824e46cc129762f7781206d9e..f3ffdc2526bb8cb58342dc22efa9c48b684a65db 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 468b4b632561e0376a9c82f101938d0d29c3827c..89ced880a30a9412580ba5817f28a9a264e4a225 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 be9a0cf0a3d0c029edfaafb3710334b42fd929a4..c313011d65c07e5999bdaaa947539020c87d383e 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 270185d989f00df1f9c3f3b673a1132a46e72971..e5b5465e5571b618e14d6721274cac60a3964faa 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>