Skip to content
Snippets Groups Projects
Commit 4ae15537 authored by Konstantin Kühlem's avatar Konstantin Kühlem
Browse files

Fixed warnings related to using ANSI strings with JSON get/set methods as they...

Fixed warnings related to using ANSI strings with JSON get/set methods as they will result in errors in future versions
parent a18ba078
Branches
No related tags found
1 merge request!12Ported to 5.4
Showing with 115 additions and 115 deletions
......@@ -11,24 +11,24 @@
TSharedPtr<FJsonObject> FExperimenterViewConfig::GetAsJson() const
{
TSharedPtr<FJsonObject> Json = MakeShareable(new FJsonObject());
Json->SetBoolField("ShowHUD", bShowHUD);
Json->SetBoolField("ShowConditionsPanelByDefault", bShowConditionsPanelByDefault);
Json->SetBoolField("ShowExperimenterViewInSecondWindow", bShowExperimenterViewInSecondWindow);
Json->SetNumberField("SecondWindowSizeX", SecondWindowSize.X);
Json->SetNumberField("SecondWindowSizeY", SecondWindowSize.Y);
Json->SetNumberField("SecondWindowPosX", SecondWindowPos.X);
Json->SetNumberField("SecondWindowPosY", SecondWindowPos.Y);
Json->SetBoolField(TEXT("ShowHUD"), bShowHUD);
Json->SetBoolField(TEXT("ShowConditionsPanelByDefault"), bShowConditionsPanelByDefault);
Json->SetBoolField(TEXT("ShowExperimenterViewInSecondWindow"), bShowExperimenterViewInSecondWindow);
Json->SetNumberField(TEXT("SecondWindowSizeX"), SecondWindowSize.X);
Json->SetNumberField(TEXT("SecondWindowSizeY"), SecondWindowSize.Y);
Json->SetNumberField(TEXT("SecondWindowPosX"), SecondWindowPos.X);
Json->SetNumberField(TEXT("SecondWindowPosY"), SecondWindowPos.Y);
return Json;
}
void FExperimenterViewConfig::FromJson(TSharedPtr<FJsonObject> Json)
{
bShowHUD = Json->GetBoolField("ShowHUD");
bShowConditionsPanelByDefault = Json->GetBoolField("ShowConditionsPanelByDefault");
bShowExperimenterViewInSecondWindow = Json->GetBoolField("ShowExperimenterViewInSecondWindow");
SecondWindowSize = FVector2D(Json->GetNumberField("SecondWindowSizeX"), Json->GetNumberField("SecondWindowSizeY"));
SecondWindowPos = FVector2D(Json->GetNumberField("SecondWindowPosX"), Json->GetNumberField("SecondWindowPosY"));
bShowHUD = Json->GetBoolField(TEXT("ShowHUD"));
bShowConditionsPanelByDefault = Json->GetBoolField(TEXT("ShowConditionsPanelByDefault"));
bShowExperimenterViewInSecondWindow = Json->GetBoolField(TEXT("ShowExperimenterViewInSecondWindow"));
SecondWindowSize = FVector2D(Json->GetNumberField(TEXT("SecondWindowSizeX")), Json->GetNumberField(TEXT("SecondWindowSizeY")));
SecondWindowPos = FVector2D(Json->GetNumberField(TEXT("SecondWindowPosX")), Json->GetNumberField(TEXT("SecondWindowPosY")));
}
void USFExperimenterWindow::CreateWindow(FExperimenterViewConfig Config)
......
......@@ -18,19 +18,19 @@
TSharedPtr<FJsonObject> FFadeConfig::GetAsJson() const
{
TSharedPtr<FJsonObject> Json = MakeShareable(new FJsonObject());
Json->SetBoolField("StartFadedOut", bStartFadedOut);
Json->SetNumberField("FadeDuration", FadeDuration);
Json->SetNumberField("FadeOutDuration", FadedOutDuration);
Json->SetStringField("FadeColor", FadeColor.ToString());
Json->SetBoolField(TEXT("StartFadedOut"), bStartFadedOut);
Json->SetNumberField(TEXT("FadeDuration"), FadeDuration);
Json->SetNumberField(TEXT("FadeOutDuration"), FadedOutDuration);
Json->SetStringField(TEXT("FadeColor"), FadeColor.ToString());
return Json;
}
void FFadeConfig::FromJson(TSharedPtr<FJsonObject> Json)
{
bStartFadedOut = Json->GetBoolField("StartFadedOut");
FadeDuration = Json->GetNumberField("FadeDuration");
FadedOutDuration = Json->GetNumberField("FadeOutDuration");
FadeColor.InitFromString(Json->GetStringField("FadeColor"));
bStartFadedOut = Json->GetBoolField(TEXT("StartFadedOut"));
FadeDuration = Json->GetNumberField(TEXT("FadeDuration"));
FadedOutDuration = Json->GetNumberField(TEXT("FadeOutDuration"));
FadeColor.InitFromString(Json->GetStringField(TEXT("FadeColor")));
}
void USFFadeHandler::Tick()
......
......@@ -42,15 +42,15 @@ TSharedPtr<FJsonObject> USFCondition::GetAsJson() const
{
TSharedPtr<FJsonObject> Json = MakeShared<FJsonObject>();
Json->SetStringField("PhaseName", PhaseName);
Json->SetStringField("Map", Map);
Json->SetStringField(TEXT("PhaseName"), PhaseName);
Json->SetStringField(TEXT("Map"), Map);
TSharedPtr<FJsonObject> FactorLevelsJson = MakeShared<FJsonObject>();
for (auto FactorLevel : FactorLevels)
{
FactorLevelsJson->SetStringField(FactorLevel.Key, FactorLevel.Value);
}
Json->SetObjectField("FactorLevels", FactorLevelsJson);
Json->SetObjectField(TEXT("FactorLevels"), FactorLevelsJson);
TArray<TSharedPtr<FJsonValue>> DependentVariablesArray;
for (auto Var : DependentVariables)
......@@ -58,22 +58,22 @@ TSharedPtr<FJsonObject> USFCondition::GetAsJson() const
TSharedRef<FJsonValueObject> JsonValue = MakeShared<FJsonValueObject>(Var->GetAsJson());
DependentVariablesArray.Add(JsonValue);
}
Json->SetArrayField("DependentVariables", DependentVariablesArray);
Json->SetArrayField(TEXT("DependentVariables"), DependentVariablesArray);
return Json;
}
void USFCondition::FromJson(TSharedPtr<FJsonObject> Json)
{
PhaseName = Json->GetStringField("PhaseName");
Map = Json->GetStringField("Map");
PhaseName = Json->GetStringField(TEXT("PhaseName"));
Map = Json->GetStringField(TEXT("Map"));
TSharedPtr<FJsonObject> FactorLevelsJson = Json->GetObjectField("FactorLevels");
TSharedPtr<FJsonObject> FactorLevelsJson = Json->GetObjectField(TEXT("FactorLevels"));
for (auto FactorLevel : FactorLevelsJson->Values)
{
FactorLevels.Add(FactorLevel.Key, FactorLevel.Value->AsString());
}
TArray<TSharedPtr<FJsonValue>> DependentVariablesArray = Json->GetArrayField("DependentVariables");
TArray<TSharedPtr<FJsonValue>> DependentVariablesArray = Json->GetArrayField(TEXT("DependentVariables"));
for (auto Var : DependentVariablesArray)
{
USFDependentVariable* DependentVariable = USFDependentVariable::FromJson(Var->AsObject(), this);
......
......@@ -12,9 +12,9 @@ USFDependentVariable::USFDependentVariable()
TSharedPtr<FJsonObject> USFDependentVariable::GetAsJson() const
{
TSharedPtr<FJsonObject> Json = MakeShared<FJsonObject>();
Json->SetStringField("Name", Name);
Json->SetBoolField("Required", bRequired);
Json->SetStringField("Type", "USFDependentVariable");
Json->SetStringField(TEXT("Name"), Name);
Json->SetBoolField(TEXT("Required"), bRequired);
Json->SetStringField(TEXT("Type"), "USFDependentVariable");
return Json;
}
......@@ -22,7 +22,7 @@ TSharedPtr<FJsonObject> USFDependentVariable::GetAsJson() const
USFDependentVariable* USFDependentVariable::FromJson(TSharedPtr<FJsonObject> Json, UObject* Outer)
{
USFDependentVariable* DependentVariable = nullptr;
FString Type = Json->GetStringField("Type");
FString Type = Json->GetStringField(TEXT("Type"));
if (Type == "USFDependentVariable" || Type.IsEmpty())
{
DependentVariable = NewObject<USFDependentVariable>(Outer);
......@@ -42,7 +42,7 @@ USFDependentVariable* USFDependentVariable::FromJson(TSharedPtr<FJsonObject> Jso
void USFDependentVariable::FromJsonInternal(TSharedPtr<FJsonObject> Json)
{
Name = Json->GetStringField("Name");
bRequired = Json->GetBoolField("Required");
Name = Json->GetStringField(TEXT("Name"));
bRequired = Json->GetBoolField(TEXT("Required"));
}
......@@ -11,10 +11,10 @@ USFIndependentVariable::USFIndependentVariable()
TSharedPtr<FJsonObject> USFIndependentVariable::GetAsJson() const
{
TSharedPtr<FJsonObject> Json = MakeShared<FJsonObject>();
Json->SetStringField("Name", Name);
Json->SetStringField("ValType", GetValTypeAsString());
Json->SetBoolField("AskedAtBeginning", bAskedAtBeginning);
Json->SetStringField("Prompt", Prompt);
Json->SetStringField(TEXT("Name"), Name);
Json->SetStringField(TEXT("ValType"), GetValTypeAsString());
Json->SetBoolField(TEXT("AskedAtBeginning"), bAskedAtBeginning);
Json->SetStringField(TEXT("Prompt"), Prompt);
TArray<TSharedPtr<FJsonValue>> OptionsJson;
for (const FString& Option : Options)
......@@ -29,13 +29,13 @@ TSharedPtr<FJsonObject> USFIndependentVariable::GetAsJson() const
void USFIndependentVariable::FromJson(TSharedPtr<FJsonObject> Json)
{
Name = Json->GetStringField("Name");
SetValTypeFromString(Json->GetStringField("ValType"));
bAskedAtBeginning = Json->GetBoolField("AskedAtBeginning");
Prompt = Json->GetStringField("Prompt");
Name = Json->GetStringField(TEXT("Name"));
SetValTypeFromString(Json->GetStringField(TEXT("ValType")));
bAskedAtBeginning = Json->GetBoolField(TEXT("AskedAtBeginning"));
Prompt = Json->GetStringField(TEXT("Prompt"));
Options.Empty();
TArray<TSharedPtr<FJsonValue>> OptionsJson = Json->GetArrayField("Options");
TArray<TSharedPtr<FJsonValue>> OptionsJson = Json->GetArrayField(TEXT("Options"));
for (auto Option : OptionsJson) {
Options.Add(Option->AsString());
}
......
......@@ -18,8 +18,8 @@ TSharedPtr<FJsonObject> USFMultipleTrialDependentVariable::GetAsJson() const
TSharedRef<FJsonValue> JsonValue = MakeShared<FJsonValueString>(SubName);
SubNamesArray.Add(JsonValue);
}
Json->SetArrayField("SubVariableNames", SubNamesArray);
Json->SetStringField("Type", "USFMultipleTrialDependentVariable");
Json->SetArrayField(TEXT("SubVariableNames"), SubNamesArray);
Json->SetStringField(TEXT("Type"), "USFMultipleTrialDependentVariable");
return Json;
}
......@@ -28,7 +28,7 @@ void USFMultipleTrialDependentVariable::FromJsonInternal(TSharedPtr<FJsonObject>
{
Super::FromJsonInternal(Json);
SubVariableNames.Empty();
for(TSharedPtr<FJsonValue> SubNameJson : Json->GetArrayField("SubVariableNames"))
for(TSharedPtr<FJsonValue> SubNameJson : Json->GetArrayField(TEXT("SubVariableNames")))
{
SubVariableNames.Add(SubNameJson->AsString());
}
......
......@@ -51,8 +51,8 @@ void USFParticipant::GenerateExecutionJsonFile() const
{
TSharedPtr<FJsonObject> Json = MakeShared<FJsonObject>();
Json->SetStringField("ParticipantID", ParticipantID);
Json->SetNumberField("ParticipantSequenceNumber", ParticipantSequenceNumber);
Json->SetStringField(TEXT("ParticipantID"), ParticipantID);
Json->SetNumberField(TEXT("ParticipantSequenceNumber"), ParticipantSequenceNumber);
TArray<TSharedPtr<FJsonValue>> ConditionsArray;
for (auto Condition : Conditions)
......@@ -60,16 +60,16 @@ void USFParticipant::GenerateExecutionJsonFile() const
TSharedRef<FJsonValueObject> JsonValue = MakeShared<FJsonValueObject>(Condition->GetAsJson());
ConditionsArray.Add(JsonValue);
}
Json->SetArrayField("Conditions", ConditionsArray);
Json->SetArrayField(TEXT("Conditions"), ConditionsArray);
TArray<TSharedPtr<FJsonValue>> IndependentArray;
for (auto Entry : IndependentVariablesValues)
{
TSharedPtr<FJsonObject> JsonVar = Entry.Key->GetAsJson();
JsonVar->SetStringField("Value", Entry.Value);
JsonVar->SetStringField(TEXT("Value"), Entry.Value);
IndependentArray.Add(MakeShared<FJsonValueObject>(JsonVar));
}
Json->SetArrayField("Independent Variables", IndependentArray);
Json->SetArrayField(TEXT("Independent Variables"), IndependentArray);
FSFUtils::WriteJsonToFile(Json, "StudyRuns/Participant_" + ParticipantID + ".txt");
}
......@@ -99,11 +99,11 @@ void USFParticipant::UpdateIndependentVarsExecutionJsonFile() const
for (auto Entry : IndependentVariablesValues)
{
TSharedPtr<FJsonObject> JsonVar = Entry.Key->GetAsJson();
JsonVar->SetStringField("Value", Entry.Value);
JsonVar->SetStringField(TEXT("Value"), Entry.Value);
IndependentArray.Add(MakeShared<FJsonValueObject>(JsonVar));
}
Json->RemoveField("Independent Variables");
Json->SetArrayField("Independent Variables", IndependentArray);
Json->RemoveField(TEXT("Independent Variables"));
Json->SetArrayField(TEXT("Independent Variables"), IndependentArray);
FSFUtils::WriteJsonToFile(Json, "StudyRuns/Participant_" + ParticipantID + ".txt");
}
......@@ -129,7 +129,7 @@ void USFParticipant::ReadExecutionJsonFile(FString ParticipantID, TArray<USFCond
return;
}
TArray<TSharedPtr<FJsonValue>> ConditionsArray = Json->GetArrayField("Conditions");
TArray<TSharedPtr<FJsonValue>> ConditionsArray = Json->GetArrayField(TEXT("Conditions"));
for (TSharedPtr<FJsonValue> ConditionJson : ConditionsArray)
{
USFCondition* Condition = NewObject<USFCondition>();
......@@ -139,12 +139,12 @@ void USFParticipant::ReadExecutionJsonFile(FString ParticipantID, TArray<USFCond
Conditions_Out = LoadedConditions;
IndependentVariablesValues_Out.Empty();
TArray<TSharedPtr<FJsonValue>> IndependentArray = Json->GetArrayField("Independent Variables");
TArray<TSharedPtr<FJsonValue>> IndependentArray = Json->GetArrayField(TEXT("Independent Variables"));
for (TSharedPtr<FJsonValue> VarJson : IndependentArray)
{
USFIndependentVariable* Var = NewObject<USFIndependentVariable>();
Var->FromJson(VarJson->AsObject());
FString Val = VarJson->AsObject()->GetStringField("Value");
FString Val = VarJson->AsObject()->GetStringField(TEXT("Value"));
IndependentVariablesValues_Out.Add(Var, Val);
}
}
......@@ -500,7 +500,7 @@ int USFParticipant::GetLastParticipantSequenceNumber()
//file does not exist or something else went wrong
return -1;
}
return ParticipantJson->GetNumberField("ParticipantSequenceNumber");
return ParticipantJson->GetNumberField(TEXT("ParticipantSequenceNumber"));
}
FString USFParticipant::GetLastParticipantID()
......@@ -511,7 +511,7 @@ FString USFParticipant::GetLastParticipantID()
//file does not exist or something else went wrong
return "";
}
return ParticipantJson->GetStringField("ParticipantID");
return ParticipantJson->GetStringField(TEXT("ParticipantID"));
}
int USFParticipant::GetLastParticipantLastConditionStarted()
......@@ -522,7 +522,7 @@ int USFParticipant::GetLastParticipantLastConditionStarted()
//file does not exist or something else went wrong
return -1;
}
return ParticipantJson->GetNumberField("CurrentConditionIdx");
return ParticipantJson->GetNumberField(TEXT("CurrentConditionIdx"));
}
TArray<int> USFParticipant::GetLastParticipantsStartedConditionIndices()
......@@ -531,13 +531,13 @@ TArray<int> USFParticipant::GetLastParticipantsStartedConditionIndices()
TSharedPtr<FJsonObject> ParticipantJson = FSFUtils::ReadJsonFromFile("StudyRuns/LastParticipant.txt");
if (ParticipantJson != nullptr)
{
TArray<TSharedPtr<FJsonValue>> StartedConditionsArray = ParticipantJson->GetArrayField("StartedConditions");
TArray<TSharedPtr<FJsonValue>> StartedConditionsArray = ParticipantJson->GetArrayField(TEXT("StartedConditions"));
for (auto& JsonValue : StartedConditionsArray)
{
TSharedPtr<FJsonObject> Entry = JsonValue->AsObject();
if (Entry.IsValid() && Entry->GetBoolField("WasStarted"))
if (Entry.IsValid() && Entry->GetBoolField(TEXT("WasStarted")))
{
StartedConditonIndices.Add(static_cast<int>(Entry->GetNumberField("ConditionIndex")));
StartedConditonIndices.Add(static_cast<int>(Entry->GetNumberField(TEXT("ConditionIndex"))));
}
}
}
......@@ -552,18 +552,18 @@ bool USFParticipant::GetLastParticipantFinished()
//file does not exist or something else went wrong
return true;
}
return ParticipantJson->GetBoolField("Finished");
return ParticipantJson->GetBoolField(TEXT("Finished"));
}
ASFStudySetup* USFParticipant::GetLastParticipantSetup()
{
TSharedPtr<FJsonObject> ParticipantJson = FSFUtils::ReadJsonFromFile("StudyRuns/LastParticipant.txt");
if (ParticipantJson == nullptr || !ParticipantJson->HasField("StudySetup"))
if (ParticipantJson == nullptr || !ParticipantJson->HasField(TEXT("StudySetup")))
{
//file does not exist or something else went wrong
return nullptr;
}
FString SetupFile = ParticipantJson->GetStringField("StudySetup");
FString SetupFile = ParticipantJson->GetStringField(TEXT("StudySetup"));
ASFStudySetup* Setup = NewObject<ASFStudySetup>();
Setup->JsonFile = SetupFile;
Setup->LoadFromJson();
......
......@@ -13,7 +13,7 @@ USFStudyFactor::USFStudyFactor()
TSharedPtr<FJsonObject> USFStudyFactor::GetAsJson() const
{
TSharedPtr<FJsonObject> Json = MakeShared<FJsonObject>();
Json->SetStringField("FactorName", FactorName);
Json->SetStringField(TEXT("FactorName"), FactorName);
TArray<TSharedPtr<FJsonValue>> LevelsArray;
......@@ -22,18 +22,18 @@ TSharedPtr<FJsonObject> USFStudyFactor::GetAsJson() const
TSharedPtr<FJsonValueString> JsonValue = MakeShared<FJsonValueString>(Level);
LevelsArray.Add(JsonValue);
}
Json->SetArrayField("Levels", LevelsArray);
Json->SetArrayField(TEXT("Levels"), LevelsArray);
switch (MixingOrder)
{
case EFactorMixingOrder::EnBlock:
Json->SetStringField("MixingOrder", "EnBlock");
Json->SetStringField(TEXT("MixingOrder"), "EnBlock");
break;
case EFactorMixingOrder::RandomOrder:
Json->SetStringField("MixingOrder", "RandomOrder");
Json->SetStringField(TEXT("MixingOrder"), "RandomOrder");
break;
case EFactorMixingOrder::InOrder:
Json->SetStringField("MixingOrder", "InOrder");
Json->SetStringField(TEXT("MixingOrder"), "InOrder");
break;
default:
FSFLoggingUtils::Log("[USFStudyFactor::GetAsJson] unknown MixingOrder!", true);
......@@ -54,10 +54,10 @@ TSharedPtr<FJsonObject> USFStudyFactor::GetAsJson() const
switch (Type)
{
case EFactorType::Within:
Json->SetStringField("Type", "Within");
Json->SetStringField(TEXT("Type"), "Within");
break;
case EFactorType::Between:
Json->SetStringField("Type", "Between");
Json->SetStringField(TEXT("Type"), "Between");
break;
default:
FSFLoggingUtils::Log("[USFStudyFactor::GetAsJson] unknown FactorType!", true);
......@@ -70,16 +70,16 @@ TSharedPtr<FJsonObject> USFStudyFactor::GetAsJson() const
void USFStudyFactor::FromJson(TSharedPtr<FJsonObject> Json)
{
FactorName = Json->GetStringField("FactorName");
FactorName = Json->GetStringField(TEXT("FactorName"));
TArray<TSharedPtr<FJsonValue>> LevelsArray = Json->GetArrayField("Levels");
TArray<TSharedPtr<FJsonValue>> LevelsArray = Json->GetArrayField(TEXT("Levels"));
Levels.Empty();
for (auto Level : LevelsArray)
{
Levels.Add(Level->AsString());
}
FString MixingOrderStr = Json->GetStringField("MixingOrder");
FString MixingOrderStr = Json->GetStringField(TEXT("MixingOrder"));
if (MixingOrderStr == "EnBlock")
{
MixingOrder = EFactorMixingOrder::EnBlock;
......@@ -97,7 +97,7 @@ void USFStudyFactor::FromJson(TSharedPtr<FJsonObject> Json)
FSFLoggingUtils::Log("[USFStudyFactor::FromJson] unknown MixingOrder: " + MixingOrderStr, true);
}
FString NonCombinedMixingOrderStr = Json->GetStringField("NonCombinedMixingOrder");
FString NonCombinedMixingOrderStr = Json->GetStringField(TEXT("NonCombinedMixingOrder"));
if (NonCombinedMixingOrderStr == "RandomOrder")
{
NonCombinedMixingOrder = ENonCombinedFactorMixingOrder::RandomOrder;
......@@ -111,7 +111,7 @@ void USFStudyFactor::FromJson(TSharedPtr<FJsonObject> Json)
FSFLoggingUtils::Log("[USFStudyFactor::FromJson] unknown NonCombinedMixingOrder: " + NonCombinedMixingOrderStr, true);
}
FString TypeStr = Json->GetStringField("Type");
FString TypeStr = Json->GetStringField(TEXT("Type"));
if (TypeStr == "Within")
{
Type = EFactorType::Within;
......@@ -125,7 +125,7 @@ void USFStudyFactor::FromJson(TSharedPtr<FJsonObject> Json)
FSFLoggingUtils::Log("[USFStudyFactor::FromJson] unknown Type: " + TypeStr, true);
}
bNonCombined = Json->GetBoolField("NonCombined");
bNonCombined = Json->GetBoolField(TEXT("NonCombined"));
}
#if WITH_EDITOR
......
......@@ -319,15 +319,15 @@ TSharedPtr<FJsonObject> USFStudyPhase::GetAsJson() const
void USFStudyPhase::FromJson(TSharedPtr<FJsonObject> Json)
{
PhaseName = Json->GetStringField("Name");
PhaseName = Json->GetStringField(TEXT("Name"));
// Factors
TArray<TSharedPtr<FJsonValue>> FactorsArray = Json->GetArrayField("Factors");
TArray<TSharedPtr<FJsonValue>> FactorsArray = Json->GetArrayField(TEXT("Factors"));
for (auto JsonFactor : FactorsArray)
{
TSharedPtr<FJsonObject> FactorObj = JsonFactor->AsObject();
USFStudyFactor* Factor = nullptr;
if (FactorObj->HasField("MapFactor") && FactorObj->GetBoolField("MapFactor"))
if (FactorObj->HasField(TEXT("MapFactor")) && FactorObj->GetBoolField(TEXT("MapFactor")))
{
Factor = NewObject<USFMapFactor>(this);
}
......@@ -340,7 +340,7 @@ void USFStudyPhase::FromJson(TSharedPtr<FJsonObject> Json)
}
// DependentVariables
TArray<TSharedPtr<FJsonValue>> DependentVarsArray = Json->GetArrayField("Dependent Variables");;
TArray<TSharedPtr<FJsonValue>> DependentVarsArray = Json->GetArrayField(TEXT("Dependent Variables"));;
for (auto Var : DependentVarsArray)
{
USFDependentVariable* DependentVariable = USFDependentVariable::FromJson(Var->AsObject(), this);
......
......@@ -300,45 +300,45 @@ TSharedPtr<FJsonObject> ASFStudySetup::GetAsJson() const
TSharedRef<FJsonValueObject> JsonValue = MakeShared<FJsonValueObject>(Var->GetAsJson());
IndependentVarsArray.Add(JsonValue);
}
Json->SetArrayField("Independent Variables", IndependentVarsArray);
Json->SetArrayField(TEXT("Independent Variables"), IndependentVarsArray);
Json->SetObjectField("FadeConfig", FadeConfig.GetAsJson());
Json->SetObjectField("ExperimenterViewConfig", ExperimenterViewConfig.GetAsJson());
Json->SetObjectField(TEXT("FadeConfig"), FadeConfig.GetAsJson());
Json->SetObjectField(TEXT("ExperimenterViewConfig"), ExperimenterViewConfig.GetAsJson());
if (UseGazeTracker == EGazeTrackerMode::NotTracking)
{
Json->SetStringField("UseGazeTracker", "NotTracking");
Json->SetStringField(TEXT("UseGazeTracker"), "NotTracking");
}
else if (UseGazeTracker == EGazeTrackerMode::HeadRotationOnly)
{
Json->SetStringField("UseGazeTracker", "HeadRotationOnly");
Json->SetStringField(TEXT("UseGazeTracker"), "HeadRotationOnly");
}
else if (UseGazeTracker == EGazeTrackerMode::EyeTracking)
{
Json->SetStringField("UseGazeTracker", "EyeTracking");
Json->SetStringField(TEXT("UseGazeTracker"), "EyeTracking");
}
else
{
FSFUtils::OpenMessageBox("Unknown GazeTrackerMode when converting study setup to json!", true);
}
Json->SetNumberField("EyeTrackingFrameRate", EyeTrackingFrameRate);
Json->SetNumberField(TEXT("EyeTrackingFrameRate"), EyeTrackingFrameRate);
if (GazeTrackingBackend == EGazeTrackingBackend::OpenXREyeTracker)
{
Json->SetStringField("GazeTrackingBackend", "OpenXREyeTracker");
Json->SetStringField(TEXT("GazeTrackingBackend"), "OpenXREyeTracker");
}
else if (GazeTrackingBackend == EGazeTrackingBackend::SRanipal)
{
Json->SetStringField("GazeTrackingBackend", "SRanipal");
Json->SetStringField(TEXT("GazeTrackingBackend"), "SRanipal");
}
else
{
FSFUtils::OpenMessageBox("Unknown GazeTrackingBackend when converting study setup to json!", true);
}
Json->SetBoolField("bIgnoreNonGazeTargetActors", bIgnoreNonGazeTargetActors);
Json->SetBoolField("bNoFadingOnSameMap", bNoFadingOnSameMap);
Json->SetBoolField("bPreloadAllMapsOnStart", bPreloadAllMapsOnStart);
Json->SetBoolField("bUseCustomParticipantIDs", bUseCustomParticipantIDs);
Json->SetBoolField(TEXT("bIgnoreNonGazeTargetActors"), bIgnoreNonGazeTargetActors);
Json->SetBoolField(TEXT("bNoFadingOnSameMap"), bNoFadingOnSameMap);
Json->SetBoolField(TEXT("bPreloadAllMapsOnStart"), bPreloadAllMapsOnStart);
Json->SetBoolField(TEXT("bUseCustomParticipantIDs"), bUseCustomParticipantIDs);
return Json;
}
......@@ -346,7 +346,7 @@ TSharedPtr<FJsonObject> ASFStudySetup::GetAsJson() const
void ASFStudySetup::FromJson(TSharedPtr<FJsonObject> Json)
{
Phases.Empty();
TArray<TSharedPtr<FJsonValue>> PhasesArray = Json->GetArrayField("Phases");
TArray<TSharedPtr<FJsonValue>> PhasesArray = Json->GetArrayField(TEXT("Phases"));
for (auto PhaseJson : PhasesArray)
{
USFStudyPhase* Phase = NewObject<USFStudyPhase>(this);
......@@ -355,14 +355,14 @@ void ASFStudySetup::FromJson(TSharedPtr<FJsonObject> Json)
}
PhasesToOrderRandomize.Empty();
TArray<TSharedPtr<FJsonValue>> PhasesToRandomize = Json->GetArrayField("PhasesToOrderRandomize");
TArray<TSharedPtr<FJsonValue>> PhasesToRandomize = Json->GetArrayField(TEXT("PhasesToOrderRandomize"));
for (TSharedPtr<FJsonValue> PhaseJson : PhasesToRandomize)
{
PhasesToOrderRandomize.Add(PhaseJson->AsString());
}
IndependentVariables.Empty();
TArray<TSharedPtr<FJsonValue>> IndependentVarsArray = Json->GetArrayField("Independent Variables");
TArray<TSharedPtr<FJsonValue>> IndependentVarsArray = Json->GetArrayField(TEXT("Independent Variables"));
for (auto Var : IndependentVarsArray)
{
USFIndependentVariable* IndependentVariable = NewObject<USFIndependentVariable>(this);
......@@ -370,48 +370,48 @@ void ASFStudySetup::FromJson(TSharedPtr<FJsonObject> Json)
IndependentVariables.Add(IndependentVariable);
}
FadeConfig.FromJson(Json->GetObjectField("FadeConfig"));
ExperimenterViewConfig.FromJson(Json->GetObjectField("ExperimenterViewConfig"));
if (Json->GetStringField("UseGazeTracker") == "NotTracking")
FadeConfig.FromJson(Json->GetObjectField(TEXT("FadeConfig")));
ExperimenterViewConfig.FromJson(Json->GetObjectField(TEXT("ExperimenterViewConfig")));
if (Json->GetStringField(TEXT("UseGazeTracker")) == "NotTracking")
{
UseGazeTracker = EGazeTrackerMode::NotTracking;
}
else if (Json->GetStringField("UseGazeTracker") == "HeadRotationOnly")
else if (Json->GetStringField(TEXT("UseGazeTracker")) == "HeadRotationOnly")
{
UseGazeTracker = EGazeTrackerMode::HeadRotationOnly;
}
else if (Json->GetStringField("UseGazeTracker") == "EyeTracking")
else if (Json->GetStringField(TEXT("UseGazeTracker")) == "EyeTracking")
{
UseGazeTracker = EGazeTrackerMode::EyeTracking;
}
else if (Json->HasField("GazeTrackingBackend"))
else if (Json->HasField(TEXT("GazeTrackingBackend")))
{
FSFUtils::OpenMessageBox(
"Unknown UseGazeTracker value: " + Json->GetStringField("UseGazeTracker") +
"Unknown UseGazeTracker value: " + Json->GetStringField(TEXT("UseGazeTracker")) +
" when parsing StudySetup json");
}
if (Json->GetStringField("GazeTrackingBackend") == "OpenXREyeTracker")
if (Json->GetStringField(TEXT("GazeTrackingBackend")) == "OpenXREyeTracker")
{
GazeTrackingBackend = EGazeTrackingBackend::OpenXREyeTracker;
}
else if (Json->GetStringField("GazeTrackingBackend") == "SRanipal")
else if (Json->GetStringField(TEXT("GazeTrackingBackend")) == "SRanipal")
{
GazeTrackingBackend = EGazeTrackingBackend::SRanipal;
}
else if (Json->HasField("GazeTrackingBackend"))
else if (Json->HasField(TEXT("GazeTrackingBackend")))
{
FSFUtils::OpenMessageBox(
"Unknown GazeTrackingBackend value: " + Json->GetStringField("GazeTrackingBackend") +
"Unknown GazeTrackingBackend value: " + Json->GetStringField(TEXT("GazeTrackingBackend")) +
" when parsing StudySetup json");
}
Json->TryGetNumberField("EyeTrackingFrameRate", EyeTrackingFrameRate);
Json->TryGetNumberField(TEXT("EyeTrackingFrameRate"), EyeTrackingFrameRate);
Json->TryGetBoolField("bIgnoreNonGazeTargetActors", bIgnoreNonGazeTargetActors);
Json->TryGetBoolField("bNoFadingOnSameMap", bNoFadingOnSameMap);
Json->TryGetBoolField("bPreloadAllMapsOnStart", bPreloadAllMapsOnStart);
Json->TryGetBoolField("bUseCustomParticipantIDs", bUseCustomParticipantIDs);
Json->TryGetBoolField(TEXT("bIgnoreNonGazeTargetActors"), bIgnoreNonGazeTargetActors);
Json->TryGetBoolField(TEXT("bNoFadingOnSameMap"), bNoFadingOnSameMap);
Json->TryGetBoolField(TEXT("bPreloadAllMapsOnStart"), bPreloadAllMapsOnStart);
Json->TryGetBoolField(TEXT("bUseCustomParticipantIDs"), bUseCustomParticipantIDs);
}
void ASFStudySetup::LoadSetupFile()
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment