diff --git a/VECTO3GUI2020/ViewModel/MultiStage/Implementation/CreateVifViewModel.cs b/VECTO3GUI2020/ViewModel/MultiStage/Implementation/CreateVifViewModel.cs index dd06e836f98b1b79622c37e977baa94b5a2936dd..f0a24bc9d1271906dfb3ac3748a45d46d1b6bde8 100644 --- a/VECTO3GUI2020/ViewModel/MultiStage/Implementation/CreateVifViewModel.cs +++ b/VECTO3GUI2020/ViewModel/MultiStage/Implementation/CreateVifViewModel.cs @@ -293,8 +293,8 @@ namespace VECTO3GUI2020.ViewModel.MultiStage.Implementation FileVersion = JSONJobHeader.PrimaryAndInterimVersion }, Body = new JSONJobBody() { - PrimaryVehicle = PrimaryInputPath, - InterimStage = StageInputPath + PrimaryVehicle = PathHelper.GetRelativePath(path, PrimaryInputPath), + InterimStage = PathHelper.GetRelativePath(path, StageInputPath) } }; diff --git a/Vecto3GUI2020Test/TestData/newVifCompletedDiesel.json b/Vecto3GUI2020Test/TestData/newVifCompletedDiesel.json index 704b90bd69c10f18d9be3379244c0042128d772e..7ff2aec68630faff1b478faf1fd8c695b7f58adf 100644 --- a/Vecto3GUI2020Test/TestData/newVifCompletedDiesel.json +++ b/Vecto3GUI2020Test/TestData/newVifCompletedDiesel.json @@ -1,13 +1,13 @@ { "Header": { "CreatedBy": "Harry", - "Date": "2021-08-02T00:00:00+02:00", + "Date": "2021-08-03T00:00:00+02:00", "AppVersion": "Vecto3GUI2020", "FileVersion": 10 }, "Body": { - "PrimaryVehicle": "C:\\Users\\Harry\\source\\repos\\vecto-dev\\VectoCore\\VectoCoreTest\\TestData\\XML\\XMLReaderDeclaration\\SchemaVersion2.6_Buses\\vecto_vehicle-primary_heavyBus-sample_Diesel.xml", - "InterimStage": "C:\\Users\\Harry\\source\\repos\\vecto-dev\\VectoCore\\VectoCoreTest\\TestData\\XML\\XMLReaderDeclaration\\SchemaVersion2.8\\vecto_vehicle-stage_input_full-sample_final_noNG.xml", + "PrimaryVehicle": "..\\..\\VectoCore\\VectoCoreTest\\TestData\\XML\\XMLReaderDeclaration\\SchemaVersion2.6_Buses\\vecto_vehicle-primary_heavyBus-sample_Diesel.xml", + "InterimStage": "..\\..\\VectoCore\\VectoCoreTest\\TestData\\XML\\XMLReaderDeclaration\\SchemaVersion2.8\\vecto_vehicle-stage_input_full-sample_final_noNG.xml", "Completed": false } } \ No newline at end of file diff --git a/Vecto3GUI2020Test/TestData/newVifCompletedStage.json b/Vecto3GUI2020Test/TestData/newVifCompletedStage.json index 8d6c8877ccaa1eb3d749719b7626c59a907d7b47..7e0e1d061a71adb190a88e0a3584ed14c6487118 100644 --- a/Vecto3GUI2020Test/TestData/newVifCompletedStage.json +++ b/Vecto3GUI2020Test/TestData/newVifCompletedStage.json @@ -1,13 +1,13 @@ { "Header": { "CreatedBy": "Harry", - "Date": "2021-08-02T00:00:00+02:00", + "Date": "2021-08-03T00:00:00+02:00", "AppVersion": "Vecto3GUI2020", "FileVersion": 10 }, "Body": { - "PrimaryVehicle": "C:\\Users\\Harry\\source\\repos\\vecto-dev\\VectoCore\\VectoCoreTest\\TestData\\XML\\XMLReaderDeclaration\\SchemaVersion2.6_Buses\\vecto_vehicle-primary_heavyBus-sample.xml", - "InterimStage": "C:\\Users\\Harry\\source\\repos\\vecto-dev\\VectoCore\\VectoCoreTest\\TestData\\XML\\XMLReaderDeclaration\\SchemaVersion2.8\\vecto_vehicle-stage_input_full-sample_final.xml", + "PrimaryVehicle": "..\\..\\VectoCore\\VectoCoreTest\\TestData\\XML\\XMLReaderDeclaration\\SchemaVersion2.6_Buses\\vecto_vehicle-primary_heavyBus-sample.xml", + "InterimStage": "..\\..\\VectoCore\\VectoCoreTest\\TestData\\XML\\XMLReaderDeclaration\\SchemaVersion2.8\\vecto_vehicle-stage_input_full-sample_final.xml", "Completed": false } } \ No newline at end of file diff --git a/Vecto3GUI2020Test/TestData/newVifExempted.json b/Vecto3GUI2020Test/TestData/newVifExempted.json index b97de228e0aceb282dfa6e4d3b3b9af3220cf58c..4eb332ae983f7e9b6c5840bb4bc4b601e8793a42 100644 --- a/Vecto3GUI2020Test/TestData/newVifExempted.json +++ b/Vecto3GUI2020Test/TestData/newVifExempted.json @@ -1,13 +1,13 @@ { "Header": { "CreatedBy": "Harry", - "Date": "2021-07-28T00:00:00+02:00", + "Date": "2021-08-03T00:00:00+02:00", "AppVersion": "Vecto3GUI2020", "FileVersion": 10 }, "Body": { - "PrimaryVehicle": "C:\\Users\\Harry\\source\\repos\\vecto-dev\\VectoCore\\VectoCoreTest\\TestData\\XML\\XMLReaderDeclaration\\SchemaVersion2.6_Buses\\exempted_primary_heavyBus.xml", - "InterimStage": "C:\\Users\\Harry\\source\\repos\\vecto-dev\\VectoCore\\VectoCoreTest\\TestData\\XML\\XMLReaderDeclaration\\SchemaVersion2.8\\vecto_vehicle-exempted_input_full-sample.xml", + "PrimaryVehicle": "..\\..\\VectoCore\\VectoCoreTest\\TestData\\XML\\XMLReaderDeclaration\\SchemaVersion2.6_Buses\\exempted_primary_heavyBus.xml", + "InterimStage": "..\\..\\VectoCore\\VectoCoreTest\\TestData\\XML\\XMLReaderDeclaration\\SchemaVersion2.8\\vecto_vehicle-exempted_input_full-sample.xml", "Completed": false } } \ No newline at end of file diff --git a/Vecto3GUI2020Test/TestData/newVifInterimStage.json b/Vecto3GUI2020Test/TestData/newVifInterimStage.json index 7f64bef871f18c99ec84c396e8b6e2c2bd8f1a48..d31e1007086fab294d9b7ed002d8bdb1cbcd3a2e 100644 --- a/Vecto3GUI2020Test/TestData/newVifInterimStage.json +++ b/Vecto3GUI2020Test/TestData/newVifInterimStage.json @@ -1,13 +1,13 @@ { "Header": { "CreatedBy": "Harry", - "Date": "2021-07-15T00:00:00+02:00", + "Date": "2021-08-03T00:00:00+02:00", "AppVersion": "Vecto3GUI2020", "FileVersion": 10 }, "Body": { - "PrimaryVehicle": "C:\\Users\\Harry\\source\\repos\\vecto-dev\\VectoCore\\VectoCoreTest\\TestData\\XML\\XMLReaderDeclaration\\SchemaVersion2.6_Buses\\vecto_vehicle-primary_heavyBus-sample.xml", - "InterimStage": "C:\\Users\\Harry\\source\\repos\\vecto-dev\\VectoCore\\VectoCoreTest\\TestData\\XML\\XMLReaderDeclaration\\SchemaVersion2.8\\vecto_vehicle-stage_input_full-sample.xml", + "PrimaryVehicle": "..\\..\\VectoCore\\VectoCoreTest\\TestData\\XML\\XMLReaderDeclaration\\SchemaVersion2.6_Buses\\vecto_vehicle-primary_heavyBus-sample_Diesel.xml", + "InterimStage": "..\\..\\VectoCore\\VectoCoreTest\\TestData\\XML\\XMLReaderDeclaration\\SchemaVersion2.8\\vecto_vehicle-stage_input_full-sample.xml", "Completed": false } } \ No newline at end of file diff --git a/VectoCore/VectoCore/InputData/FileIO/JSON/JSONInputData.cs b/VectoCore/VectoCore/InputData/FileIO/JSON/JSONInputData.cs index 6e60303119a4e6d452b34de1058a8e24031f94ff..2c4b040ad5bf71af4869db58c8b9a05cca065ca7 100644 --- a/VectoCore/VectoCore/InputData/FileIO/JSON/JSONInputData.cs +++ b/VectoCore/VectoCore/InputData/FileIO/JSON/JSONInputData.cs @@ -1164,7 +1164,9 @@ namespace TUGraz.VectoCore.InputData.FileIO.JSON _primaryVehicleInputDataPath = Body.GetEx<string>(JsonKeys.PrimaryVehicle); + _primaryVehicleInputDataPath = PathHelper.GetAbsolutePath(filename, _primaryVehicleInputDataPath); _stageInputDataPath = Body.GetEx<string>(JsonKeys.InterimStage); + _stageInputDataPath = PathHelper.GetAbsolutePath(filename, _stageInputDataPath); _completed = Body.GetValueOrDefault<bool>(JsonKeys.Completed); }