Skip to content

move attribution key #110

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: develop
Choose a base branch
from
Open

move attribution key #110

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Cognitive3DTest/Plugins/Cognitive3D/Source/Cognitive3D/Private/Cognitive3D.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -400,7 +400,7 @@ bool FAnalyticsProviderCognitive3D::StartSession(const TArray<FAnalyticsEventAtt
FString EngineIni = FPaths::Combine(*(FPaths::ProjectDir()), TEXT("Config/DefaultEngine.ini"));
//ApplicationKey = FAnalytics::Get().GetConfigValueFromIni(GEngineIni, "Analytics", "ApiKey", false);
ApplicationKey = FAnalytics::Get().GetConfigValueFromIni(EngineIni, "Analytics", "ApiKey", false);
AttributionKey = FAnalytics::Get().GetConfigValueFromIni(GEngineIni, "Analytics", "AttributionKey", false);
AttributionKey = FAnalytics::Get().GetConfigValueFromIni(GEngineIni, "/Script/Cognitive3D.Cognitive3DSettings", "AttributionKey", false);

FString ValueReceived;

Expand Down
3 changes: 3 additions & 0 deletions Cognitive3DTest/Plugins/Cognitive3D/Source/Cognitive3D/Public/Cognitive3DSettings.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,9 @@ class UCognitive3DSettings : public UAnalyticsSettingsBase
UPROPERTY(config, EditAnywhere, Category = Cognitive3D)
bool AutomaticallySetTrackingScene = true;

UPROPERTY(config, EditAnywhere, Category = Cognitive3D)
FString AttributionKey = "";

/** The number of player snapshots that will be collected together before being sent to analytics server and scene explorer*/
UPROPERTY(config, EditAnywhere, Category = "Cognitive_3D_Data")
int32 GazeBatchSize = 256;
Expand Down
4 changes: 2 additions & 2 deletions ...ve3DTest/Plugins/Cognitive3D/Source/Cognitive3DEditor/Private/Cognitive3DEditorModule.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,12 +65,12 @@ void FCognitive3DEditorModule::StartupModule()
const FString NormalizedEditorIni = GConfig->NormalizeConfigIniPath(EditorIni);

GConfig->GetString(TEXT("Analytics"), TEXT("ApiKey"), FCognitiveEditorTools::GetInstance()->ApplicationKey, NormalizedEngineIni);
GConfig->GetString(TEXT("Analytics"), TEXT("AttributionKey"), FCognitiveEditorTools::GetInstance()->AttributionKey, NormalizedEngineIni);
GConfig->GetString(TEXT("/Script/Cognitive3D.Cognitive3DSettings"), TEXT("AttributionKey"), FCognitiveEditorTools::GetInstance()->AttributionKey, NormalizedEngineIni);
GConfig->GetString(TEXT("Analytics"), TEXT("DeveloperKey"), FCognitiveEditorTools::GetInstance()->DeveloperKey, NormalizedEditorIni);
GConfig->GetString(TEXT("Analytics"), TEXT("ExportPath"), FCognitiveEditorTools::GetInstance()->BaseExportDirectory, NormalizedEditorIni);
#else
GConfig->GetString(TEXT("Analytics"), TEXT("ApiKey"), FCognitiveEditorTools::GetInstance()->ApplicationKey, EngineIni);
GConfig->GetString(TEXT("Analytics"), TEXT("AttributionKey"), FCognitiveEditorTools::GetInstance()->AttributionKey, EngineIni);
GConfig->GetString(TEXT("/Script/Cognitive3D.Cognitive3DSettings"), TEXT("AttributionKey"), FCognitiveEditorTools::GetInstance()->AttributionKey, EngineIni);
GConfig->GetString(TEXT("Analytics"), TEXT("DeveloperKey"), FCognitiveEditorTools::GetInstance()->DeveloperKey, EditorIni);
GConfig->GetString(TEXT("Analytics"), TEXT("ExportPath"), FCognitiveEditorTools::GetInstance()->BaseExportDirectory, EditorIni);
#endif // ENGINE_MAJOR_VERSION == 4
Expand Down
4 changes: 2 additions & 2 deletions ...itive3DTest/Plugins/Cognitive3D/Source/Cognitive3DEditor/Private/CognitiveEditorTools.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3568,14 +3568,14 @@ FReply FCognitiveEditorTools::SaveAPIDeveloperKeysToFile()
const FString NormalizedEditorIni = GConfig->NormalizeConfigIniPath(EditorIni);

GConfig->SetString(TEXT("Analytics"), TEXT("ApiKey"), *ApplicationKey, NormalizedEngineIni);
GConfig->SetString(TEXT("Analytics"), TEXT("AttributionKey"), *AttributionKey, NormalizedEngineIni);
GConfig->SetString(TEXT("/Script/Cognitive3D.Cognitive3DSettings"), TEXT("AttributionKey"), *AttributionKey, NormalizedEngineIni);
GConfig->SetString(TEXT("Analytics"), TEXT("DeveloperKey"), *DeveloperKey, NormalizedEditorIni);

GConfig->Flush(false, NormalizedEngineIni);
GConfig->Flush(false, NormalizedEditorIni);
#else
GConfig->SetString(TEXT("Analytics"), TEXT("ApiKey"), *ApplicationKey, EngineIni);
GConfig->SetString(TEXT("Analytics"), TEXT("AttributionKey"), *AttributionKey, EngineIni);
GConfig->SetString(TEXT("/Script/Cognitive3D.Cognitive3DSettings"), TEXT("AttributionKey"), *AttributionKey, EngineIni);
GConfig->SetString(TEXT("Analytics"), TEXT("DeveloperKey"), *DeveloperKey, EditorIni);

GConfig->Flush(false, EngineIni);
Expand Down
8 changes: 4 additions & 4 deletions ...t/Plugins/Cognitive3D/Source/Cognitive3DEditor/Private/CognitiveSettingsCustomization.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,7 @@ void ICognitiveSettingsCustomization::CustomizeDetails(IDetailLayoutBuilder& Det
.OnTextChanged_Raw(FCognitiveEditorTools::GetInstance(),&FCognitiveEditorTools::OnApplicationKeyChanged)
]
];

/*
LoginCategory.AddCustomRow(FText::FromString("Attribution Key"))
.ValueContent()
.HAlign(HAlign_Fill)
Expand All @@ -99,7 +99,7 @@ void ICognitiveSettingsCustomization::CustomizeDetails(IDetailLayoutBuilder& Det
.OnTextChanged_Raw(FCognitiveEditorTools::GetInstance(),&FCognitiveEditorTools::OnAttributionKeyChanged)
]
];

*/
LoginCategory.AddCustomRow(FText::FromString("Save"))
.ValueContent()
.MinDesiredWidth(256)
Expand Down Expand Up @@ -237,11 +237,11 @@ void ICognitiveSettingsCustomization::CustomizeDetails(IDetailLayoutBuilder& Det
const FString NormalizedEngineIni = GConfig->NormalizeConfigIniPath(EngineIni);
const FString NormalizedEditorIni = GConfig->NormalizeConfigIniPath(EditorIni);

GConfig->GetString(TEXT("Analytics"), TEXT("AttributionKey"), FCognitiveEditorTools::GetInstance()->AttributionKey, NormalizedEngineIni);
GConfig->GetString(TEXT("/Script/Cognitive3D.Cognitive3DSettings"), TEXT("AttributionKey"), FCognitiveEditorTools::GetInstance()->AttributionKey, NormalizedEngineIni);
GConfig->GetString(TEXT("Analytics"), TEXT("ApiKey"), FCognitiveEditorTools::GetInstance()->ApplicationKey, NormalizedEngineIni);
GConfig->GetString(TEXT("Analytics"), TEXT("DeveloperKey"), FCognitiveEditorTools::GetInstance()->DeveloperKey, NormalizedEditorIni);
#else
GConfig->GetString(TEXT("Analytics"), TEXT("AttributionKey"), FCognitiveEditorTools::GetInstance()->AttributionKey, EngineIni);
GConfig->GetString(TEXT("/Script/Cognitive3D.Cognitive3DSettings"), TEXT("AttributionKey"), FCognitiveEditorTools::GetInstance()->AttributionKey, EngineIni);
GConfig->GetString(TEXT("Analytics"), TEXT("ApiKey"), FCognitiveEditorTools::GetInstance()->ApplicationKey, EngineIni);
GConfig->GetString(TEXT("Analytics"), TEXT("DeveloperKey"), FCognitiveEditorTools::GetInstance()->DeveloperKey, EditorIni);
#endif
Expand Down