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

Merge pull request #73 from erict-powersoft/master

Browse Source 
Add zerotime attribute to competition info
This commit is contained in:
Erik Melin 2024-04-07 08:30:56 +02:00 committed by GitHub
commit d06f4cbd7b
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
7 changed files with 5844 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3023
code/English_spellcheck.txt Normal file
View File

File diff suppressed because it is too large Load Diff

2800
code/English_translated.txt Normal file
View File

File diff suppressed because it is too large Load Diff

2
code/html1.htm
View File

@ -12,7 +12,7 @@
<b>Example:</b> <b>Example:</b>
<pre> <pre>
*MOPComplete> *MOPComplete>
*competition date="2015-09-06" organizer="Orienteringsklubben Linn&eacute;" homepage="http://www.oklinne.nu">Stafett-DM, Uppland*/competition> *competition date="2015-09-06" organizer="Orienteringsklubben Linn&eacute;" homepage="http://www.oklinne.nu" zerotime="216000">Stafett-DM, Uppland*/competition>
*/MOPComplete> */MOPComplete>
</pre> </pre>

8
code/infoserver.cpp
View File

@ -130,7 +130,12 @@ bool InfoCompetition::synchronize(oEvent &oe, bool onlyCmp, const set<int> &incl
homepage = oe.getDCI().getString("Homepage"); homepage = oe.getDCI().getString("Homepage");
changed = true; changed = true;
} }
if (oe.getZeroTimeNum() != zerotime) {
zerotime = oe.getZeroTimeNum();
changed = true;
}
if (changed) if (changed)
needCommit(*this); needCommit(*this);
@ -452,6 +457,7 @@ void InfoCompetition::serialize(xmlbuffer &xml, bool diffOnly) const {
prop.push_back(make_pair("date", date)); prop.push_back(make_pair("date", date));
prop.push_back(make_pair("organizer", organizer)); prop.push_back(make_pair("organizer", organizer));
prop.push_back(make_pair("homepage", homepage)); prop.push_back(make_pair("homepage", homepage));
prop.emplace_back("zerotime", itow(zerotime));
xml.write("competition", prop, name); xml.write("competition", prop, name);
} }

1
code/infoserver.h
View File

@ -221,6 +221,7 @@ private:
wstring date; wstring date;
wstring organizer; wstring organizer;
wstring homepage; wstring homepage;
int zerotime;
protected: protected:
bool forceComplete; bool forceComplete;

11
code/meos.cpp
View File

@ -788,6 +788,17 @@ BOOL InitInstance(HINSTANCE hInstance, int nCmdShow)
int xs = gEvent->getPropertyInt("xsize", max(850, min<int>(int(rc.right)-yp, (rc.right*9)/10))); int xs = gEvent->getPropertyInt("xsize", max(850, min<int>(int(rc.right)-yp, (rc.right*9)/10)));
int ys = gEvent->getPropertyInt("ysize", max(650, min<int>(int(rc.bottom)-yp-40, (rc.bottom*8)/10))); int ys = gEvent->getPropertyInt("ysize", max(650, min<int>(int(rc.bottom)-yp-40, (rc.bottom*8)/10)));
if ((xp + xs > rc.right)
|| xp < rc.left
|| yp + ys > rc.bottom
|| yp < rc.top)
{
// out of bounds, just use default position and size
xp = 50;
yp = 20;
xs = max(850, min<int>(int(rc.right) - yp, (rc.right * 9) / 10));
ys = max(650, min<int>(int(rc.bottom) - yp - 40, (rc.bottom * 8) / 10));
}
gEvent->setProperty("ypos", yp + 16); gEvent->setProperty("ypos", yp + 16);
gEvent->setProperty("xpos", xp + 32); gEvent->setProperty("xpos", xp + 32);
gEvent->saveProperties(settings); // For other instance starting while running gEvent->saveProperties(settings); // For other instance starting while running

1
code/untranslated.txt Normal file
View File

@ -0,0 +1 @@
Patrol result = Patrol result