From 714e616fb11c52500e5516175454df31122b172e Mon Sep 17 00:00:00 2001 From: Ange-Marie MAURIN Date: Tue, 15 Jul 2025 14:28:17 +0200 Subject: [PATCH] Real Commit --- .../DTFluxCore/Private/Assets/DTFluxModelAsset.cpp | 7 ------- .../Private/DTFluxCoreSubsystem.cpp | 5 +++++ .../Private/Struct/DTFluxServerResponseStruct.cpp | 6 ++++-- .../Public/Struct/DTFluxSplitSensorServerResponse.h | 12 ++++++++---- 4 files changed, 17 insertions(+), 13 deletions(-) diff --git a/Source/DTFluxCore/Private/Assets/DTFluxModelAsset.cpp b/Source/DTFluxCore/Private/Assets/DTFluxModelAsset.cpp index b8a5c98..abcb7b1 100644 --- a/Source/DTFluxCore/Private/Assets/DTFluxModelAsset.cpp +++ b/Source/DTFluxCore/Private/Assets/DTFluxModelAsset.cpp @@ -17,13 +17,6 @@ void UDTFluxModelAsset::AddContest(const FDTFluxContest& Contest) for (const auto& Stage : Contest.Stages) { FinishedStagesCache.Add(FDTFluxStageKey(Contest.ContestId, Stage.StageId), Stage.IsFinished()); - for (const auto&Split : Contest.Splits) - { - // init Cached SplitSensorInfo - SplitSensorInfoCache.Add(FDTFluxSplitSensorKey(Contest.ContestId, Stage.StageId, Split.SplitId, -1), - FDTFluxSplitSensorInfo(Split.Name)); - } - } TArray Splits = Contest.Splits; Splits.Sort([](const FDTFluxSplit& A, const FDTFluxSplit& B) diff --git a/Source/DTFluxCoreSubsystem/Private/DTFluxCoreSubsystem.cpp b/Source/DTFluxCoreSubsystem/Private/DTFluxCoreSubsystem.cpp index 1287b42..d6ead8a 100644 --- a/Source/DTFluxCoreSubsystem/Private/DTFluxCoreSubsystem.cpp +++ b/Source/DTFluxCoreSubsystem/Private/DTFluxCoreSubsystem.cpp @@ -335,6 +335,11 @@ void UDTFluxCoreSubsystem::ProcessSplitSensor(const FDTFluxSplitSensorInfo& Spli if (DataStorage != nullptr) { + FString DebugString = FString::Printf(TEXT("Received SplitSensorInfo for Bib %i"), SplitSensorInfo.Bib); + DebugString += FString::Printf(TEXT("ContestId[%i] StageId[%i] SplitId[%i] Time[%s], Gap[%s] Rank[%i]"), + SplitSensorInfo.ContestId, SplitSensorInfo.StageId, SplitSensorInfo.SplitId, *SplitSensorInfo.Time, + *SplitSensorInfo.Gap, SplitSensorInfo.Rank); + UE_LOG(logDTFluxCoreSubsystem, Warning, TEXT("Received SplitSensorInfo :\n%s"), *DebugString) // Gestion Cache Split Sensor FDTFluxSplitSensorKey SplitSensorKey(SplitSensorInfo.ContestId, SplitSensorInfo.StageId, SplitSensorInfo.SplitId, -1); FDTFluxSplitSensorInfo NewSplitSensorInfo = SplitSensorInfo; diff --git a/Source/DTFluxNetwork/Private/Struct/DTFluxServerResponseStruct.cpp b/Source/DTFluxNetwork/Private/Struct/DTFluxServerResponseStruct.cpp index 9796048..71e5db7 100644 --- a/Source/DTFluxNetwork/Private/Struct/DTFluxServerResponseStruct.cpp +++ b/Source/DTFluxNetwork/Private/Struct/DTFluxServerResponseStruct.cpp @@ -475,12 +475,14 @@ bool FDTFluxServerResponse::ParseSplitSensor(TArray& Out NewSplitSensorInfo.StageId = SplitSensorInfoResponse.StageID; NewSplitSensorInfo.SplitId = SplitSensorInfoResponse.SplitID; NewSplitSensorInfo.Time = SplitSensorInfoResponse.Time; + NewSplitSensorInfo.Gap = SplitSensorInfoResponse.Gap; + NewSplitSensorInfo.Rank = SplitSensorInfoResponse.Rank; OutSplitSensorInfos.Add(NewSplitSensorInfo); - UE_LOG(logDTFluxNetwork, Verbose, TEXT("Split sensor info for bib %d in Contest %d, Stage %d, Split %d"), + UE_LOG(logDTFluxNetwork, Verbose, TEXT("Split sensor info for bib %d in Contest %d, Stage %d, Split %d Rank [%i] Gap [%s] Time [%s]"), NewSplitSensorInfo.Bib, NewSplitSensorInfo.ContestId, NewSplitSensorInfo.StageId, - NewSplitSensorInfo.SplitId); + NewSplitSensorInfo.SplitId, NewSplitSensorInfo.Rank, *NewSplitSensorInfo.Gap,*NewSplitSensorInfo.Time); } UE_LOG(logDTFluxNetwork, Log, TEXT("Successfully parsed %d split sensor entries"), OutSplitSensorInfos.Num()); diff --git a/Source/DTFluxNetwork/Public/Struct/DTFluxSplitSensorServerResponse.h b/Source/DTFluxNetwork/Public/Struct/DTFluxSplitSensorServerResponse.h index b319fe2..4ef0c64 100644 --- a/Source/DTFluxNetwork/Public/Struct/DTFluxSplitSensorServerResponse.h +++ b/Source/DTFluxNetwork/Public/Struct/DTFluxSplitSensorServerResponse.h @@ -14,17 +14,21 @@ struct DTFLUXNETWORK_API FDTFluxSplitSensorItemResponse public: UPROPERTY() - int Bib; + int Bib = -1; UPROPERTY() FString Type = "split-sensor-item"; UPROPERTY() - int ContestID; + int ContestID =-1; UPROPERTY() - int StageID; + int StageID =-1; UPROPERTY() - int SplitID; + int SplitID = -1; UPROPERTY() FString Time = "-"; + UPROPERTY() + int Rank = -1; + UPROPERTY() + FString Gap = ""; };