onbcode/meos-2024
1
0
Fork 0
Code Issues 1 Pull Requests Wiki Activity

Do not process Rank widget (don't use RankScoreFormatter); Plus other minimal changes to compile without '/std17++'

Browse Source
This commit is contained in:
ONBcode 2024-04-09 15:50:10 -03:00
parent 539a1a0fbb
commit c5ddfd83ad
3 changed files with 60 additions and 44 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

81
code/TabRunner.cpp
View File

@ -53,7 +53,7 @@
#include "RunnerDB.h" #include "RunnerDB.h"
int SportIdentCB(gdioutput *gdi, GuiEventType type, BaseInfo *data); int SportIdentCB(gdioutput *gdi, GuiEventType type, BaseInfo *data);
shared_ptr<RankScoreFormatter> TabRunner::rankFormatter; //shared_ptr<RankScoreFormatter> TabRunner::rankFormatter;
TabRunner::TabRunner(oEvent *poe):TabBase(poe) { TabRunner::TabRunner(oEvent *poe):TabBase(poe) {
clearCompetitionData(); clearCompetitionData();
@ -111,7 +111,8 @@ void TabRunner::enableControlButtons(gdioutput &gdi, bool enable, bool vacant)
} }
void TabRunner::selectRunner(gdioutput &gdi, pRunner r) { void TabRunner::selectRunner(gdioutput &gdi, pRunner r) {
if (gdioutput* gdi_comments = getExtraWindow("comments", false); gdi_comments) gdioutput* gdi_comments = getExtraWindow("comments", false);
if ( gdi_comments)
gdi_comments->closeWindow(); gdi_comments->closeWindow();
if (!r) { if (!r) {
@ -1426,10 +1427,12 @@ int TabRunner::runnerCB(gdioutput &gdi, GuiEventType type, BaseInfo* data) {
} }
} }
else if (type==GUI_CLEAR) { else if (type==GUI_CLEAR) {
if (gdioutput* gdi_settings = getExtraWindow("ecosettings", false); gdi_settings) gdioutput* gdi_settings = getExtraWindow("ecosettings", false);
if ( gdi_settings)
gdi_settings->closeWindow(); gdi_settings->closeWindow();
if (gdioutput* gdi_settings = getExtraWindow("comments", false); gdi_settings) /*gdioutput**/ gdi_settings = getExtraWindow("comments", false);
if ( gdi_settings)
gdi_settings->closeWindow(); gdi_settings->closeWindow();
if (runnerId>0 && currentMode == 0) if (runnerId>0 && currentMode == 0)
@ -3261,20 +3264,26 @@ int TabRunner::addExtraFields(const oEvent &oe, gdioutput& gdi, oEvent::ExtraFie
newLine(); newLine();
} }
if (auto res = extraFields.find(oEvent::ExtraFields::DataA); res != extraFields.end()) { {
addLabel(L"#" + ensureEndingColon(res->second)); auto res = extraFields.find(oEvent::ExtraFields::DataA);
gdi.addInput("DataA", L"", 8); if (res != extraFields.end()) {
colCount++; addLabel(L"#" + ensureEndingColon(res->second));
newLine(); gdi.addInput("DataA", L"", 8);
colCount++;
newLine();
}
} }
if (auto res = extraFields.find(oEvent::ExtraFields::DataB); res != extraFields.end()) { {
addLabel(L"#" + ensureEndingColon(res->second)); auto res = extraFields.find(oEvent::ExtraFields::DataB);
gdi.addInput("DataB", L"", 8, nullptr); if ( res != extraFields.end()) {
colCount++; addLabel(L"#" + ensureEndingColon(res->second));
newLine(); gdi.addInput("DataB", L"", 8, nullptr);
colCount++;
newLine();
}
} }
if (extraFields.count(oEvent::ExtraFields::Nationality)) { if (extraFields.count(oEvent::ExtraFields::Nationality)) {
addLabel(L"Nationalitet:"); addLabel(L"Nationalitet:");
gdi.addInput("Nationality", L"", 8); gdi.addInput("Nationality", L"", 8);
@ -3289,15 +3298,19 @@ int TabRunner::addExtraFields(const oEvent &oe, gdioutput& gdi, oEvent::ExtraFie
newLine(); newLine();
} }
if (auto res = extraFields.find(oEvent::ExtraFields::TextA); res != extraFields.end()) {
if (colCount > 0)
colCount++;
newLine(); {
auto res = extraFields.find(oEvent::ExtraFields::TextA);
if (res != extraFields.end()) {
if (colCount > 0)
colCount++;
addLabel(L"#" + ensureEndingColon(res->second)); newLine();
gdi.addInput("TextA", L"", 20);
colCount = 2; addLabel(L"#" + ensureEndingColon(res->second));
gdi.addInput("TextA", L"", 20);
colCount = 2;
}
} }
if (colCount > 0) if (colCount > 0)
@ -3329,12 +3342,12 @@ void TabRunner::loadExtraFields(gdioutput& gdi, const oBase* r) {
if (gdi.hasWidget("Phone")) if (gdi.hasWidget("Phone"))
gdi.setText("Phone", r ? r->getDCI().getString("Phone") : L""); gdi.setText("Phone", r ? r->getDCI().getString("Phone") : L"");
if (gdi.hasWidget("Rank")) { //if (gdi.hasWidget("Rank")) {
wstring out; // wstring out;
if (r) // if (r)
out = rankFormatter->formatData(r); // out = rankFormatter->formatData(r);
gdi.setText("Rank", out); // gdi.setText("Rank", out);
} //}
} }
void TabRunner::saveExtraFields(gdioutput& gdi, oBase &r) { void TabRunner::saveExtraFields(gdioutput& gdi, oBase &r) {
@ -3361,10 +3374,10 @@ void TabRunner::saveExtraFields(gdioutput& gdi, oBase &r) {
if (gdi.hasWidget("Phone")) if (gdi.hasWidget("Phone"))
di.setString("Phone", gdi.getText("Phone")); di.setString("Phone", gdi.getText("Phone"));
if (gdi.hasWidget("Rank")) { //if (gdi.hasWidget("Rank")) {
wstring out; // wstring out;
rankFormatter->setData(&r, gdi.getText("Rank"), out, 0); // rankFormatter->setData(&r, gdi.getText("Rank"), out, 0);
} //}
// di.setInt("Rank", gdi.getTextNo("Rank")); // di.setInt("Rank", gdi.getTextNo("Rank"));
} }
@ -3552,7 +3565,7 @@ void TabRunner::clearCompetitionData() {
timeToFill = 0; timeToFill = 0;
ownWindow = false; ownWindow = false;
listenToPunches = false; listenToPunches = false;
rankFormatter = make_shared<RankScoreFormatter>(); //rankFormatter = make_shared<RankScoreFormatter>();
} }
void TabRunner::autoGrowCourse(gdioutput &gdi) { void TabRunner::autoGrowCourse(gdioutput &gdi) {

4
code/TabRunner.h
View File

@ -27,7 +27,7 @@
class Table; class Table;
struct AutoCompleteRecord; struct AutoCompleteRecord;
class RankScoreFormatter; //class RankScoreFormatter;
class TabRunner : class TabRunner :
public TabBase, AutoCompleteHandler public TabBase, AutoCompleteHandler
@ -88,7 +88,7 @@ private:
bool savePunchTime(pRunner r, gdioutput &gdi); bool savePunchTime(pRunner r, gdioutput &gdi);
PrinterObject splitPrinter; PrinterObject splitPrinter;
static shared_ptr<RankScoreFormatter> rankFormatter; //static shared_ptr<RankScoreFormatter> rankFormatter;
void showRunnerReport(gdioutput &gdi); void showRunnerReport(gdioutput &gdi);

19
code/oEvent.cpp
View File

@ -263,7 +263,7 @@ oEvent::oEvent(gdioutput &gdi):oBase(0), gdibase(gdi)
oRunnerData->addVariableCurrency("Taxable", "Skattad avgift"); oRunnerData->addVariableCurrency("Taxable", "Skattad avgift");
oRunnerData->addVariableInt("BirthYear", oDataContainer::oISDateOrYear, "RunnerBirthDate"); oRunnerData->addVariableInt("BirthYear", oDataContainer::oISDateOrYear, "RunnerBirthDate");
oRunnerData->addVariableString("Bib", 8, "Nummerlapp").zeroSortPadding = 5; oRunnerData->addVariableString("Bib", 8, "Nummerlapp").zeroSortPadding = 5;
oRunnerData->addVariableInt("Rank", oDataContainer::oIS32, "Ranking", make_shared<RankScoreFormatter>()); //oRunnerData->addVariableInt("Rank", oDataContainer::oIS32, "Ranking", make_shared<RankScoreFormatter>());
oRunnerData->addVariableDate("EntryDate", "Anm. datum"); oRunnerData->addVariableDate("EntryDate", "Anm. datum");
oRunnerData->addVariableInt("EntryTime", oDataContainer::oISTime, "Anm. tid", make_shared<AbsoluteTimeFormatter>("EntryTime")); oRunnerData->addVariableInt("EntryTime", oDataContainer::oISTime, "Anm. tid", make_shared<AbsoluteTimeFormatter>("EntryTime"));
@ -6801,13 +6801,16 @@ void oEvent::updateExtraFields(ExtraFieldContext context, const map<ExtraFields,
continue; continue;
if (cc.first != context) if (cc.first != context)
spOut.push_back(w); // Not touched spOut.push_back(w); // Not touched
else if (auto res = fields.find(cc.second); res != fields.end()) { else {
// Update definition auto res = fields.find(cc.second);
wstring w2 = itow(encodeExtra(cc.first, cc.second)); if (res != fields.end()) {
if (!res->second.empty()) // Update definition
w2 += L";" + res->second; wstring w2 = itow(encodeExtra(cc.first, cc.second));
spOut.push_back(w2); if (!res->second.empty())
used.insert(cc.second); w2 += L";" + res->second;
spOut.push_back(w2);
used.insert(cc.second);
}
} }
} }