Ange/DTFluxAPI
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Modification Split-Sensor-Response

Browse Source
This commit is contained in:
Ange-Marie MAURIN
2024-07-17 19:27:47 +02:00
parent dd40f7fc02
commit 281ac4bdd6
6 changed files with 61 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
Source/DTFluxAPI/Private/DTFluxDataStorage/DTFluxDataStorage.cpp
View File

@ -240,6 +240,22 @@ EDTFluxSplitType UDTFluxDataStorage::GetSplitStatus(int ContestID, int StageID,
return EDTFluxSplitType::UnknownSplitType; return EDTFluxSplitType::UnknownSplitType;
} }
bool UDTFluxDataStorage::GetStageRankingForBib(int ContestID, int StageID, int Bib,
FDTFluxStageRanking& OutStageRanking)
{
FDTFluxStage Stage;
GetStage(ContestID, StageID, Stage);
for(auto& StageRanking : Stage.StageRanking)
{
if(StageRanking.Bib == Bib )
{
OutStageRanking = StageRanking;
return true;
}
}
return false;
}
TArray<FDTFluxParticipant> UDTFluxDataStorage::GetParticipants(const int ContestId) TArray<FDTFluxParticipant> UDTFluxDataStorage::GetParticipants(const int ContestId)
{ {

11
Source/DTFluxAPI/Private/DTFluxSubsystem/DTFluxSubsystem.cpp
View File

@ -500,17 +500,24 @@ void UDTFluxSubsystem::ProcessSplitSensor(const FDTFluxSplitSensorResponse& Spli
UE_LOG(LogDTFluxAPI, Log, TEXT("Checking SplitStatus ...")) UE_LOG(LogDTFluxAPI, Log, TEXT("Checking SplitStatus ..."))
EDTFluxSplitType SplitType = DataStorage->GetSplitStatus(SplitSensorItem.ContestID, EDTFluxSplitType SplitType = DataStorage->GetSplitStatus(SplitSensorItem.ContestID,
SplitSensorItem.StageID, SplitSensorItem.SplitID); SplitSensorItem.StageID, SplitSensorItem.SplitID);
FDTFluxFinisherData Data;
Data.Bib = SplitSensorItem.Bib;
Data.ContestId = SplitSensorItem.ContestID;
Data.StageId = SplitSensorItem.StageID;
Data.SplitRanking = NewRanking;
switch(SplitType) switch(SplitType)
{ {
case PreFinnishSplit: case PreFinnishSplit:
UE_LOG(LogDTFluxAPI, Warning, TEXT("SplitSensor %d for Stage%02d in Contest%02d is a Prefinish Sensor"), UE_LOG(LogDTFluxAPI, Warning, TEXT("SplitSensor %d for Stage%02d in Contest%02d is a Prefinish Sensor"),
SplitSensorItem.SplitID, SplitSensorItem.StageID, SplitSensorItem.ContestID); SplitSensorItem.SplitID, SplitSensorItem.StageID, SplitSensorItem.ContestID);
OnSpotter.Broadcast(NewRanking); OnSpotter.Broadcast(Data);
break; break;
case FinishSplit: case FinishSplit:
UE_LOG(LogDTFluxAPI, Warning, TEXT("SplitSensor %d for Stage%02d in Contest%02d is a Finish Sensor"), UE_LOG(LogDTFluxAPI, Warning, TEXT("SplitSensor %d for Stage%02d in Contest%02d is a Finish Sensor"),
SplitSensorItem.SplitID, SplitSensorItem.StageID, SplitSensorItem.ContestID); SplitSensorItem.SplitID, SplitSensorItem.StageID, SplitSensorItem.ContestID);
OnFinisher.Broadcast(NewRanking); DataStorage->GetStageRankingForBib(SplitSensorItem.ContestID, SplitSensorItem.StageID, SplitSensorItem.Bib, Data.StageRanking);
OnFinisher.Broadcast(Data);
break; break;
case NormalSplit: case NormalSplit:
UE_LOG(LogDTFluxAPI, Warning, TEXT("SplitSensor %d for Stage%02d in Contest%02d is a Normal Split"), UE_LOG(LogDTFluxAPI, Warning, TEXT("SplitSensor %d for Stage%02d in Contest%02d is a Normal Split"),

2
Source/DTFluxAPI/Public/DTFluxDataStorage/DTFluxDataStorage.h
View File

@ -121,4 +121,6 @@ public:
FDTFluxSplitRanking AddSplitRanking(const FDTFluxSplitSensorItemResponse& SplitSensorItem); FDTFluxSplitRanking AddSplitRanking(const FDTFluxSplitSensorItemResponse& SplitSensorItem);
UFUNCTION() UFUNCTION()
EDTFluxSplitType GetSplitStatus(int ContestID, int StageID, int SplitID); EDTFluxSplitType GetSplitStatus(int ContestID, int StageID, int SplitID);
bool GetStageRankingForBib(int ContestID, int StageID, int Bib, FDTFluxStageRanking& OutStageRanking);
}; };

29
Source/DTFluxAPI/Public/DTFluxModel/DTFluxModel.h
View File

@ -211,6 +211,24 @@ public:
} }
}; };
USTRUCT(BlueprintType, Category="DTFlux|Model")
// ReSharper disable once IdentifierTypo
struct DTFLUXAPI_API FDTFluxFinisherData
{
GENERATED_BODY()
public:
UPROPERTY(BlueprintReadWrite, Category="DTFlux|Model")
int ContestId;
UPROPERTY(BlueprintReadWrite, Category="DTFlux|Model")
int StageId;
UPROPERTY(BlueprintReadWrite, Category="DTFlux|Model")
int Bib = -1;
UPROPERTY(BlueprintReadWrite, Category="DTFlux|Model")
FDTFluxSplitRanking SplitRanking;
UPROPERTY(BlueprintReadWrite, Category="DTFlux|Model")
FDTFluxStageRanking StageRanking;
};
USTRUCT(BlueprintType, Category="DTFlux|Model") USTRUCT(BlueprintType, Category="DTFlux|Model")
struct DTFLUXAPI_API FDTFluxSplit struct DTFLUXAPI_API FDTFluxSplit
{ {
@ -526,17 +544,6 @@ struct DTFLUXAPI_API FDTFluxFinisher
FDTFluxStageRanking CurrentRanking; FDTFluxStageRanking CurrentRanking;
}; };
USTRUCT(BlueprintType, Category="DTFlux|Subsystem|Events")
struct DTFLUXAPI_API FDTFluxWsResponseEvent
{
GENERATED_BODY()
UPROPERTY(BlueprintReadOnly, Category="DTFlux|Subsystem|Events")
TEnumAsByte<EDTFluxResponseType> WsResponseType;
UPROPERTY(BlueprintReadOnly, Category="DTFlux|Subsystem|Events")
FString RawData;
};
USTRUCT(BlueprintType, Category="DTFlux|Subsystem|Events") USTRUCT(BlueprintType, Category="DTFlux|Subsystem|Events")
struct DTFLUXAPI_API FDTFluxStageFinished struct DTFLUXAPI_API FDTFluxStageFinished
{ {

19
Source/DTFluxAPI/Public/DTFluxModel/DTFluxModelResponse.h
View File

@ -4,6 +4,7 @@
#include "CoreMinimal.h" #include "CoreMinimal.h"
#include "UObject/Object.h" #include "UObject/Object.h"
#include "DTFluxUtils/DTFluxEnums.h"
#include "DTFluxModelResponse.generated.h" #include "DTFluxModelResponse.generated.h"
/** /**
@ -23,7 +24,6 @@ public:
FString Name; FString Name;
}; };
USTRUCT(BlueprintType, Category="DTFlux|Model") USTRUCT(BlueprintType, Category="DTFlux|Model")
struct DTFLUXAPI_API FStageResponse struct DTFLUXAPI_API FStageResponse
{ {
@ -133,7 +133,6 @@ public:
float SpeedTotal; float SpeedTotal;
}; };
USTRUCT() USTRUCT()
struct DTFLUXAPI_API FDTFluxStageRankingResponse struct DTFLUXAPI_API FDTFluxStageRankingResponse
{ {
@ -192,7 +191,6 @@ struct DTFLUXAPI_API FDTFluxStatusUpdateResponse
}; };
USTRUCT(BlueprintType, Category="DTFlux|Model") USTRUCT(BlueprintType, Category="DTFlux|Model")
struct DTFLUXAPI_API FDTFluxSplitSensorItemResponse struct DTFLUXAPI_API FDTFluxSplitSensorItemResponse
{ {
@ -215,7 +213,6 @@ struct DTFLUXAPI_API FDTFluxSplitSensorItemResponse
int Rank; int Rank;
}; };
USTRUCT(BlueprintType, Category="DTFlux|Model") USTRUCT(BlueprintType, Category="DTFlux|Model")
struct DTFLUXAPI_API FDTFluxSplitSensorResponse struct DTFLUXAPI_API FDTFluxSplitSensorResponse
{ {
@ -227,7 +224,6 @@ struct DTFLUXAPI_API FDTFluxSplitSensorResponse
TArray<FDTFluxSplitSensorItemResponse> Datas; TArray<FDTFluxSplitSensorItemResponse> Datas;
}; };
USTRUCT(BlueprintType, Category="DTFlux|Model") USTRUCT(BlueprintType, Category="DTFlux|Model")
struct DTFLUXAPI_API FDTFluxTeamListItemResponse struct DTFLUXAPI_API FDTFluxTeamListItemResponse
{ {
@ -276,7 +272,6 @@ public:
}; };
USTRUCT() USTRUCT()
struct DTFLUXAPI_API FDTFluxTeamUpdateResponse struct DTFLUXAPI_API FDTFluxTeamUpdateResponse
{ {
@ -288,6 +283,7 @@ struct DTFLUXAPI_API FDTFluxTeamUpdateResponse
TArray<FDTFluxTeamListItemResponse> Datas; TArray<FDTFluxTeamListItemResponse> Datas;
}; };
USTRUCT() USTRUCT()
struct DTFLUXAPI_API FDTFluxArchSelectResponseItem struct DTFLUXAPI_API FDTFluxArchSelectResponseItem
{ {
@ -312,3 +308,14 @@ struct DTFLUXAPI_API FDTFluxArchSelectResponse
}; };
USTRUCT(BlueprintType, Category="DTFlux|Subsystem|Events")
struct DTFLUXAPI_API FDTFluxWsResponseEvent
{
GENERATED_BODY()
UPROPERTY(BlueprintReadOnly, Category="DTFlux|Subsystem|Events")
TEnumAsByte<EDTFluxResponseType> WsResponseType;
UPROPERTY(BlueprintReadOnly, Category="DTFlux|Subsystem|Events")
FString RawData;
};

4
Source/DTFluxAPI/Public/DTFluxSubsystem/DTFluxSubsystem.h
View File

@ -29,8 +29,8 @@ DECLARE_DYNAMIC_MULTICAST_DELEGATE(FOnTimerTriggered);
DECLARE_DYNAMIC_MULTICAST_DELEGATE(FOnRaceDataReceived); DECLARE_DYNAMIC_MULTICAST_DELEGATE(FOnRaceDataReceived);
DECLARE_DYNAMIC_DELEGATE_OneParam(FOnTimer, FString, TimerName); DECLARE_DYNAMIC_DELEGATE_OneParam(FOnTimer, FString, TimerName);
DECLARE_DYNAMIC_MULTICAST_DELEGATE_OneParam(FOnWsEvent, FDTFluxWsResponseEvent, WsResponseEvent); DECLARE_DYNAMIC_MULTICAST_DELEGATE_OneParam(FOnWsEvent, FDTFluxWsResponseEvent, WsResponseEvent);
DECLARE_DYNAMIC_MULTICAST_DELEGATE_OneParam(FOnFinisher, FDTFluxSplitRanking, FinisherData); DECLARE_DYNAMIC_MULTICAST_DELEGATE_OneParam(FOnFinisher, FDTFluxFinisherData, FinisherData);
DECLARE_DYNAMIC_MULTICAST_DELEGATE_OneParam(FOnSpotter, FDTFluxSplitRanking, SpotterData); DECLARE_DYNAMIC_MULTICAST_DELEGATE_OneParam(FOnSpotter, FDTFluxFinisherData, SpotterData);
DECLARE_DYNAMIC_MULTICAST_DELEGATE_OneParam(FOnSplitSensor, FDTFluxSplitRanking, ParticipantSplitData); DECLARE_DYNAMIC_MULTICAST_DELEGATE_OneParam(FOnSplitSensor, FDTFluxSplitRanking, ParticipantSplitData);
DECLARE_DYNAMIC_MULTICAST_DELEGATE_OneParam(FOnContestBegin, int, ContestId); DECLARE_DYNAMIC_MULTICAST_DELEGATE_OneParam(FOnContestBegin, int, ContestId);
DECLARE_DYNAMIC_MULTICAST_DELEGATE_TwoParams(FOnStageBegin, int, ContestId, int, StageId); DECLARE_DYNAMIC_MULTICAST_DELEGATE_TwoParams(FOnStageBegin, int, ContestId, int, StageId);