From 3dca7174103f1adf30d6d35c1086efffcff7d7be Mon Sep 17 00:00:00 2001 From: onbcode Date: Fri, 12 Apr 2024 23:34:44 -0300 Subject: [PATCH] Set ONB default Splits printout format (Issue #2) --- Lists/split_onb.listdef | 30 ++++++++++++++++++++++++++++++ code/listeditor.cpp | 6 +++--- code/oEvent.cpp | 7 ++++++- code/oRunner.cpp | 12 ++++++------ 4 files changed, 45 insertions(+), 10 deletions(-) create mode 100644 Lists/split_onb.listdef diff --git a/Lists/split_onb.listdef b/Lists/split_onb.listdef new file mode 100644 index 0000000..33dc839 --- /dev/null +++ b/Lists/split_onb.listdef @@ -0,0 +1,30 @@ + + + + +ONB Results Split Print +split_onb + +true +false +false +false +true +3 + +SortNameOnly +Runner +None + + + + + + + + + + + + + diff --git a/code/listeditor.cpp b/code/listeditor.cpp index 638ef77..4f1651e 100644 --- a/code/listeditor.cpp +++ b/code/listeditor.cpp @@ -1943,9 +1943,9 @@ void ListEditor::splitPrintList(gdioutput& gdi) { gdi.dropLine(0.5); gdi.fillRight(); gdi.addCheckbox("Split", "Inkludera sträcktider", nullptr, isSP ? sp->includeSplitTimes : true); - gdi.addCheckbox("Speed", "Inkludera tempo", nullptr, isSP ? sp->withSpeed : true); - gdi.addCheckbox("Result", "Inkludera individuellt resultat", nullptr, isSP ? sp->withResult : true); - gdi.addCheckbox("Analysis", "Inkludera bomanalys", nullptr, isSP ? sp->withAnalysis : true); + gdi.addCheckbox("Speed", "Inkludera tempo", nullptr, isSP ? sp->withSpeed : false); + gdi.addCheckbox("Result", "Inkludera individuellt resultat", nullptr, isSP ? sp->withResult : false); + gdi.addCheckbox("Analysis", "Inkludera bomanalys", nullptr, isSP ? sp->withAnalysis : false); int maxX = gdi.getCX(); diff --git a/code/oEvent.cpp b/code/oEvent.cpp index aca287f..170c114 100644 --- a/code/oEvent.cpp +++ b/code/oEvent.cpp @@ -461,7 +461,12 @@ void oEvent::initProperties() { getPropertyInt("UseEventorUTC", 0); getPropertyInt("UseHourFormat", 1); getPropertyInt("NameMode", LastFirst); - getPropertyInt("PlaySound", 0); + + // Override with ONB Defaults + setProperty("PlaySound", 0); + setProperty("SplitDefaultRogaine", "split_onb"); + setProperty("SplitDefaultIndividual", "split_onb"); + } void oEvent::listProperties(bool userProps, vector< pair > &propNames) const { diff --git a/code/oRunner.cpp b/code/oRunner.cpp index d9c3d6c..9867269 100644 --- a/code/oRunner.cpp +++ b/code/oRunner.cpp @@ -4904,15 +4904,15 @@ void oRunner::printSplits(gdioutput& gdi) const { if (cls1) { if (cls1->getClassType() == ClassType::oClassIndividual) { if (cls1->isRogaining()) - listId = "Tsplit_result_rogaining"; + listId = "T" + oe->getPropertyString("SplitDefaultRogaine", "split_result_rogaining"); else - listId = "Tsplit_result_individual"; + listId = "T" + oe->getPropertyString("SplitDefaultIndividual", "split_result_individual"); } else if (cls1->getClassType() == ClassType::oClassRelay) { - if (cls1->isRogaining()) - listId = "Tsplit_result_team_rogaining"; - else - listId = "Tsplit_result_team"; + if (cls1->isRogaining()) + listId = "T" + oe->getPropertyString("SplitDefaultTeamRogaine", "split_result_team_rogaining"); + else + listId = "T" + oe->getPropertyString("SplitDefaultTeam", "split_result_team"); } } }