Renamed InterimStage to InterimStep

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

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)
 				}
 			};
 

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));
 		}
 	}

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);
 

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);
             }
         }
         

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>

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

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

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

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

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

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

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>