From 3212cb57407a9f35aae8d74d9e293ffe47df50f1 Mon Sep 17 00:00:00 2001
From: jehret <ehret@vr.rwth-aachen.de>
Date: Mon, 15 Jan 2024 20:44:33 +0100
Subject: [PATCH] formatting
---
.../Private/HUD/SFConditionListEntry.cpp | 10 ++--
.../Private/SFGameInstance.cpp | 56 +++++++++----------
.../Public/SFGameInstance.h | 8 +--
3 files changed, 37 insertions(+), 37 deletions(-)
diff --git a/Source/StudyFrameworkPlugin/Private/HUD/SFConditionListEntry.cpp b/Source/StudyFrameworkPlugin/Private/HUD/SFConditionListEntry.cpp
index 0569bb9..e14d0b9 100644
--- a/Source/StudyFrameworkPlugin/Private/HUD/SFConditionListEntry.cpp
+++ b/Source/StudyFrameworkPlugin/Private/HUD/SFConditionListEntry.cpp
@@ -22,7 +22,7 @@ void USFConditionListEntry::FillWithCondition(const USFCondition* InCondition)
{
TextBlockIdToDependentVar.Add(Data.Num() - 2, DependentVar);
//-2 since the first two elements of Data or not mapped to the text fields
- if(auto MultiTrialVar = Cast<USFMultipleTrialDependentVariable>(DependentVar))
+ if (auto MultiTrialVar = Cast<USFMultipleTrialDependentVariable>(DependentVar))
{
Data.Add("# Trials: " + FString::FromInt(MultiTrialVar->Values.size()));
}
@@ -61,14 +61,14 @@ void USFConditionListEntry::FillTextsHelper(const TArray<FString>& Data)
EceteraText->SetVisibility(ESlateVisibility::Collapsed);
int UsedTexts = 0;
- TArray<UTextBlock*> Texts = {Text0, Text1, Text2, Text3, Text4, Text5, Text6, Text7};
+ TArray<UTextBlock*> Texts = { Text0, Text1, Text2, Text3, Text4, Text5, Text6, Text7 };
for (int i = 2; i < Data.Num(); ++i)
{
if (UsedTexts >= Texts.Num())
{
FString MissingTexts = "{ ";
- for(int j=i; j < Data.Num(); ++j)
+ for (int j = i; j < Data.Num(); ++j)
{
MissingTexts += Data[j] + " ";
}
@@ -120,7 +120,7 @@ void USFConditionListEntry::UpdateData()
BackgroundColor->SetBrushColor(DefaultColor);
}
- TArray<UTextBlock*> Texts = {Text0, Text1, Text2, Text3, Text4, Text5, Text6, Text7, Time};
+ TArray<UTextBlock*> Texts = { Text0, Text1, Text2, Text3, Text4, Text5, Text6, Text7, Time };
for (int i = 0; i < Texts.Num(); ++i)
{
FString NewValue = "";
@@ -135,7 +135,7 @@ void USFConditionListEntry::UpdateData()
}
else
{
- if(!TextBlockIdToDependentVar.Contains(i))
+ if (!TextBlockIdToDependentVar.Contains(i))
{
continue;
}
diff --git a/Source/StudyFrameworkPlugin/Private/SFGameInstance.cpp b/Source/StudyFrameworkPlugin/Private/SFGameInstance.cpp
index aa3efe4..6110a10 100644
--- a/Source/StudyFrameworkPlugin/Private/SFGameInstance.cpp
+++ b/Source/StudyFrameworkPlugin/Private/SFGameInstance.cpp
@@ -67,7 +67,7 @@ void USFGameInstance::Shutdown()
}
- if(ExperimenterWindow)
+ if (ExperimenterWindow)
{
ExperimenterWindow->DestroyWindow();
}
@@ -117,7 +117,7 @@ void USFGameInstance::OnWorldStart()
FSFLoggingUtils::Log(
"[USFGameInstance::OnWorldChanged] Started on a map that was part of the last study, so start the study run for debug reasons.");
RestoreLastParticipantForDebugStart(FirstMapCondition);
- LogToHUD("Start map "+NewWorld->GetName()+" for debugging!");
+ LogToHUD("Start map " + NewWorld->GetName() + " for debugging!");
}
return;
}
@@ -150,7 +150,7 @@ void USFGameInstance::RestoreLastParticipantForDebugStart(USFCondition* InStartC
const int ParticipantSequenceNumber = USFParticipant::GetLastParticipantSequenceNumber();
const FString ParticipantID = USFParticipant::GetLastParticipantID();
Participant = NewObject<USFParticipant>(this,
- FName(TEXT("Participant_") + ParticipantID));
+ FName(TEXT("Participant_") + ParticipantID));
StudySetup = USFParticipant::GetLastParticipantSetup();
StartCondition = InStartCondition;
Participant->Initialize(ParticipantSequenceNumber, ParticipantID);
@@ -205,16 +205,16 @@ void USFGameInstance::InitFadeHandler(FFadeConfig FadeConfig)
}
FadeHandler->SetFadeConfig(FadeConfig);
- if(bStartedOnUnrelatedMap)
+ if (bStartedOnUnrelatedMap)
{
- StudySetup->ExperimenterViewConfig.bShowHUD=false;
+ StudySetup->ExperimenterViewConfig.bShowHUD = false;
}
- if(StudySetup->ExperimenterViewConfig.bShowExperimenterViewInSecondWindow)
+ if (StudySetup->ExperimenterViewConfig.bShowExperimenterViewInSecondWindow)
{
ExperimenterWindow = NewObject<USFExperimenterWindow>(GetTransientPackage(), "ExperimenterWindow");
ExperimenterWindow->CreateWindow(StudySetup->ExperimenterViewConfig);
}
-
+
}
// When starting on the setup map, i.e. not for debugging purposes
@@ -247,7 +247,7 @@ void USFGameInstance::PrepareWithStudySetup(ASFStudySetup* Setup)
"Restart Study"
};
int Answer = FSFUtils::OpenCustomDialog(MessageTitle, MessageText, Buttons);
-
+
switch (Answer)
{
case 2:
@@ -268,7 +268,7 @@ void USFGameInstance::PrepareWithStudySetup(ASFStudySetup* Setup)
ParticipantSequenceNumber++;
Conditions = StudySetup->GetAllConditionsForRun(ParticipantSequenceNumber);
break;
- default: ;
+ default:;
}
}
@@ -280,7 +280,7 @@ void USFGameInstance::PrepareWithStudySetup(ASFStudySetup* Setup)
// Participant
FString ParticipantID = "";
- if(Setup->bUseCustomParticipantIDs)
+ if (Setup->bUseCustomParticipantIDs)
{
//if we arerecovering, restore it:
if (bRecoverParticipantData) {
@@ -353,15 +353,15 @@ void USFGameInstance::PrepareWithStudySetup(ASFStudySetup* Setup)
void USFGameInstance::PreloadAllMaps(const TArray<USFCondition*>& Conditions)
{
TArray<FString> Maps;
- for(const USFCondition* Condition : Conditions)
+ for (const USFCondition* Condition : Conditions)
{
- if(!Maps.Contains(Condition->Map))
+ if (!Maps.Contains(Condition->Map))
{
Maps.Add(Condition->Map);
}
}
- for(FString Map : Maps)
+ for (FString Map : Maps)
{
LoadPackage(nullptr, *Map, ELoadFlags::LOAD_None);
}
@@ -408,7 +408,7 @@ bool USFGameInstance::StartStudy()
}
//check whether we want to use the eye tracker
- if(StudySetup && StudySetup->UseGazeTracker != EGazeTrackerMode::NotTracking)
+ if (StudySetup && StudySetup->UseGazeTracker != EGazeTrackerMode::NotTracking)
{
GazeTracker = NewObject<USFGazeTracker>(this, TEXT("GazeTracker"));
GazeTracker->Init(StudySetup->UseGazeTracker, StudySetup->bIgnoreNonGazeTargetActors, StudySetup->EyeTrackingFrameRate);
@@ -423,7 +423,7 @@ void USFGameInstance::EndStudy()
USFCondition* LastCondition = Participant->GetCurrentCondition();
if (!LastCondition || !LastCondition->WasStarted() || LastCondition->IsFinished())
return;
-
+
LastCondition->End();
Participant->EndStudy();
@@ -498,7 +498,7 @@ void USFGameInstance::GoToConditionSynced(FString ConditionName, bool bForced, E
ClusterEvent.Name = "GoToConditionSynced";
TMap<FString, FString> Params;
Params.Add("ConditionName", ConditionName);
- Params.Add("bForced", bForced ?"true":"false");
+ Params.Add("bForced", bForced ? "true" : "false");
Params.Add("Fade", (Fade == EFadeBetweenCondition::AsDefault ? "AsDefault" : (Fade == EFadeBetweenCondition::ForceNoFade ? "ForceNoFade" : "ForceFade")));
ClusterEvent.Parameters = Params;
ClusterEvent.bShouldDiscardOnRepeat = true;
@@ -510,7 +510,7 @@ void USFGameInstance::GoToConditionSynced(FString ConditionName, bool bForced, E
void USFGameInstance::HandleClusterEvent(const FDisplayClusterClusterEventJson& Event) {
if (Event.Type == "SFGameInstanceEvent") {
//now we actually react on all cluster nodes:
- if(Event.Name == "GoToConditionSynced")
+ if (Event.Name == "GoToConditionSynced")
{
EFadeBetweenCondition Fade = EFadeBetweenCondition::AsDefault;
if (Event.Parameters["Fade"] != "AsDefault")
@@ -547,7 +547,7 @@ void USFGameInstance::HandleGoToConditionSynced(FString ConditionName, bool bFor
USFCondition* LastCondition = Participant->GetCurrentCondition();
- if(NextCondition->WasStarted() && bForced)
+ if (NextCondition->WasStarted() && bForced)
{
LogComment("Restarting Condition " + NextCondition->UniqueName + ", so we delete all gathered data for that condition.");
@@ -557,7 +557,7 @@ void USFGameInstance::HandleGoToConditionSynced(FString ConditionName, bool bFor
Participant->DeleteStoredDataForConditionFromLongTable(NextCondition);
for (USFDependentVariable* DV : NextCondition->DependentVariables)
{
- if(USFMultipleTrialDependentVariable* MTDV = Cast<USFMultipleTrialDependentVariable>(DV))
+ if (USFMultipleTrialDependentVariable* MTDV = Cast<USFMultipleTrialDependentVariable>(DV))
{
Participant->DeleteStoredTrialDataForCondition(NextCondition, MTDV);
}
@@ -570,7 +570,7 @@ void USFGameInstance::HandleGoToConditionSynced(FString ConditionName, bool bFor
if (UnfinishedVars.Num() != 0)
{
FString Missing = "Missing data for: {";
- for(FString UnfinishedVar : UnfinishedVars)
+ for (FString UnfinishedVar : UnfinishedVars)
{
Missing += UnfinishedVar + " ";
}
@@ -601,7 +601,7 @@ void USFGameInstance::HandleGoToConditionSynced(FString ConditionName, bool bFor
// Fade to next Level
if (IsInitialized())
{
- if(FadeHandler->GetIsFadedOutWaitingForLevel())
+ if (FadeHandler->GetIsFadedOutWaitingForLevel())
{
FadeHandler->SetLevelToLoad(NextCondition->Map);
}
@@ -637,7 +637,7 @@ bool USFGameInstance::HasEnded() const
float USFGameInstance::GetCurrentTime() const
{
- if(GetParticipant() && IsStarted())
+ if (GetParticipant() && IsStarted())
{
return GetParticipant()->GetCurrentTime();
}
@@ -646,7 +646,7 @@ float USFGameInstance::GetCurrentTime() const
FString USFGameInstance::GetFactorLevel(FString FactorName) const
{
- if(!Participant)
+ if (!Participant)
{
return "ParticipantNotSet";
}
@@ -670,7 +670,7 @@ bool USFGameInstance::HasFactor(FString FactorName) const
FString USFGameInstance::GetIndependentVariableValue(FString VariableName) const
{
- if(!GetParticipant())
+ if (!GetParticipant())
{
return "";
}
@@ -742,7 +742,7 @@ USFGazeTracker* USFGameInstance::GetGazeTracker() const
FExperimenterViewConfig USFGameInstance::GetExperimenterViewConfig() const
{
- if(StudySetup)
+ if (StudySetup)
return StudySetup->ExperimenterViewConfig;
FSFLoggingUtils::Log("[USFGameInstance::GetExperimenterViewConfig] No StudySetup present, returning default ExperimenterViewConfig.", true);
return FExperimenterViewConfig();
@@ -795,7 +795,7 @@ void USFGameInstance::OnFadedIn()
OnFadedInDelegate.Broadcast();
- if(bStartedOnUnrelatedMap)
+ if (bStartedOnUnrelatedMap)
{
return;
}
@@ -816,10 +816,10 @@ USFParticipant* USFGameInstance::GetParticipant() const
bool USFGameInstance::LogTick(float DeltaSeconds)
{
- if (LogObject->GetLoggingLoopsActive()){
+ if (LogObject->GetLoggingLoopsActive()) {
LogObject->WritePositionLogToFile();
LogObject->WriteGazeTrackingLogToFile();
- }
+ }
return true;
}
diff --git a/Source/StudyFrameworkPlugin/Public/SFGameInstance.h b/Source/StudyFrameworkPlugin/Public/SFGameInstance.h
index 051d561..5cd93e7 100644
--- a/Source/StudyFrameworkPlugin/Public/SFGameInstance.h
+++ b/Source/StudyFrameworkPlugin/Public/SFGameInstance.h
@@ -28,7 +28,7 @@ class STUDYFRAMEWORKPLUGIN_API USFGameInstance : public UGameInstance
GENERATED_BODY()
-public:
+public:
//override UGameInstance methods
virtual void Init() override;
@@ -36,7 +36,7 @@ public:
// getter for the GameInstance itself
- UFUNCTION(BlueprintCallable, meta = (DisplayName="Get SFGameInstance"))
+ UFUNCTION(BlueprintCallable, meta = (DisplayName = "Get SFGameInstance"))
static USFGameInstance* Get();
// a check method whether Init was called by the UE system, otherwise Get() cannot be called
static bool IsInitialized();
@@ -205,7 +205,7 @@ protected:
void PrepareWithStudySetup(ASFStudySetup* Setup);
- void PreloadAllMaps(const TArray<USFCondition*> &Conditions);
+ void PreloadAllMaps(const TArray<USFCondition*>& Conditions);
UFUNCTION(BlueprintCallable)
void OnWorldStart();
@@ -241,7 +241,7 @@ protected:
// this is only needed if a map should be started for debugging, but Init wasn't called
UPROPERTY()
- USFCondition* ConditionToStartAtInit=nullptr;
+ USFCondition* ConditionToStartAtInit = nullptr;
bool bStartedOnUnrelatedMap = false;
bool bInDebugMode = false;
--
GitLab