From 0d851b72981e81715f542d53847853a0aaa7dbc3 Mon Sep 17 00:00:00 2001 From: Ange-Marie MAURIN Date: Sat, 12 Jul 2025 09:23:43 +0200 Subject: [PATCH] Added FirstName/LastName Separator for displaying formatted name. --- .../Types/Struct/DTFluxTeamListStruct.cpp | 14 ++++---- .../Types/Struct/DTFluxTeamListStruct.h | 34 +++++++++++++------ 2 files changed, 31 insertions(+), 17 deletions(-) diff --git a/Source/DTFluxCore/Private/Types/Struct/DTFluxTeamListStruct.cpp b/Source/DTFluxCore/Private/Types/Struct/DTFluxTeamListStruct.cpp index b44f04d..2b22295 100644 --- a/Source/DTFluxCore/Private/Types/Struct/DTFluxTeamListStruct.cpp +++ b/Source/DTFluxCore/Private/Types/Struct/DTFluxTeamListStruct.cpp @@ -15,7 +15,8 @@ void FDTFluxParticipant::AddTeammate(const FString LastName, const FString First { } -FString FDTFluxParticipant::GetFormattedName(const int MaxChar, const FString OverflowChars) const +FString FDTFluxParticipant::GetFormattedName(const int MaxChar, const FString Separator, + const FString OverflowChars) const { { if (MaxChar <= 0) @@ -37,13 +38,13 @@ FString FDTFluxParticipant::GetFormattedName(const int MaxChar, const FString Ov FString Initial; if (!FirstName.IsEmpty()) { - Initial = FirstName.Left(1).ToUpper() + " "; + Initial = FirstName.Left(1).ToUpper() + Separator; } FString FormattedLastName = LastName.ToUpper(); FString FullName = Initial + FormattedLastName; - UE_LOG(logDTFluxCore, Error, TEXT("FullName for Bib %i is %s"), Bib, *FullName); + UE_LOG(logDTFluxCore, VeryVerbose, TEXT("FullName for Bib %i is %s"), Bib, *FullName); if (FullName.Len() <= MaxChar) { @@ -80,10 +81,11 @@ FString FDTFluxParticipant::GetFormattedName(const int MaxChar, const FString Ov } } -FString FDTFluxParticipant::GetConcatFormattedName(const int MaxChar, const FString OverflowChar) const +FString FDTFluxParticipant::GetConcatFormattedName(const int MaxChar, const FString Separator, + const FString OverflowChar, const FString BibSeparator) const { - FString BibText = FString::FromInt(Bib) + " "; - FString FormattedName = GetFormattedName(MaxChar - BibText.Len(), OverflowChar); + FString BibText = FString::FromInt(Bib) + BibSeparator; + FString FormattedName = GetFormattedName(MaxChar - BibText.Len(), Separator, OverflowChar); return BibText + FormattedName; } diff --git a/Source/DTFluxCore/Public/Types/Struct/DTFluxTeamListStruct.h b/Source/DTFluxCore/Public/Types/Struct/DTFluxTeamListStruct.h index d93bd3d..30c2673 100644 --- a/Source/DTFluxCore/Public/Types/Struct/DTFluxTeamListStruct.h +++ b/Source/DTFluxCore/Public/Types/Struct/DTFluxTeamListStruct.h @@ -149,40 +149,52 @@ public: void AddTeammate(const FDTFluxPerson& Person); void AddTeammate(const FString LastName, const FString FirstName, const FString Gender); - FText GetFormattedNameText(const int MaxChar = 15, const FString OverflowChar = FString("...")) const + FText GetFormattedNameText(const int MaxChar = 15, const FString Separator = FString(". "), + const FString OverflowChar = FString("...")) const { return FText::FromString(GetFormattedName(MaxChar, OverflowChar)); }; - FText GetConcatFormattedNameText(const int MaxChar = 20, const FString OverflowChar = FString("...")) const + FText GetConcatFormattedNameText(const int MaxChar = 20, const FString Separator = FString(". "), + const FString OverflowChar = FString("..."), + const FString BibSeparator = FString(". ")) const { - return FText::FromString(GetConcatFormattedName(MaxChar, OverflowChar)); + return FText::FromString(GetConcatFormattedName(MaxChar, Separator, OverflowChar, BibSeparator)); }; - FString GetFormattedName(const int MaxChar = 15, const FString OverflowChar = FString("...")) const; - FString GetConcatFormattedName(const int MaxChar = 20, const FString OverflowChar = FString("...")) const; + FString GetFormattedName(const int MaxChar = 15, const FString Separator = FString(". "), + const FString OverflowChar = FString("...")) const; + FString GetConcatFormattedName(const int MaxChar = 20, const FString Separator = FString(". "), + const FString OverflowChar = FString("..."), + const FString BibSeparator = FString(". ")) const; static FString GetFormattedName(const FDTFluxParticipant& Participant, const int MaxChar = 15, + const FString Separator = FString(". "), const FString OverflowChar = FString("...")) { - return Participant.GetFormattedName(MaxChar, OverflowChar); + return Participant.GetFormattedName(MaxChar, Separator, OverflowChar); }; static FString GetConcatFormattedName(const FDTFluxParticipant& Participant, const int MaxChar = 15, - const FString OverflowChar = FString("...")) + const FString Separator = FString(". "), + const FString OverflowChar = FString("..."), + const FString BibSeparator = FString(". ")) { - return Participant.GetConcatFormattedName(MaxChar, OverflowChar); + return Participant.GetConcatFormattedName(MaxChar, Separator, OverflowChar, BibSeparator); }; static FText GetFormattedNameText(const FDTFluxParticipant& Participant, const int MaxChar = 15, + const FString Separator = FString(". "), const FString OverflowChar = FString("...")) { - return Participant.GetFormattedNameText(); + return Participant.GetFormattedNameText(MaxChar, Separator, OverflowChar); }; static FText GetConcatFormattedNameText(const FDTFluxParticipant& Participant, const int MaxChar = 15, - const FString OverflowChar = FString("...")) + const FString Separator = FString(". "), + const FString OverflowChar = FString("..."), + const FString BibSeparator = FString(". ")) { - return Participant.GetConcatFormattedNameText(); + return Participant.GetConcatFormattedNameText(MaxChar, Separator, OverflowChar, BibSeparator); }; const TArray GetTeammate() const { return Teammate; }