From 11942302fa11a3d999208d9b57f134112052b1fc Mon Sep 17 00:00:00 2001 From: Erik Melin Date: Tue, 19 Mar 2024 08:51:20 +0100 Subject: [PATCH] MeOS, version 4.0 BETA 1 --- code/HTMLWriter.cpp | 22 +- code/HTMLWriter.h | 16 +- code/MeOS.sln | 31 + code/MeOS.vcxproj | 379 +++++ code/MeOSFeatures.cpp | 2 +- code/MeOSFeatures.h | 2 +- code/MeosSQL.cpp | 14 +- code/MeosSQL.h | 2 +- code/Printer.h | 2 +- code/RestService.cpp | 8 +- code/RestService.h | 2 +- code/RunnerDB.cpp | 8 +- code/RunnerDB.h | 4 +- code/SportIdent.cpp | 6 +- code/SportIdent.h | 5 +- code/StdAfx.h | 34 +- code/TabAuto.cpp | 129 +- code/TabAuto.h | 15 +- code/TabBase.cpp | 15 +- code/TabBase.h | 39 +- code/TabClass.cpp | 553 +++++-- code/TabClass.h | 25 +- code/TabClub.cpp | 10 +- code/TabClub.h | 6 +- code/TabCompetition.cpp | 437 ++++-- code/TabCompetition.h | 25 +- code/TabControl.cpp | 16 +- code/TabControl.h | 6 +- code/TabCourse.cpp | 40 +- code/TabCourse.h | 6 +- code/TabList.cpp | 109 +- code/TabList.h | 6 +- code/TabMulti.cpp | 2 +- code/TabMulti.h | 2 +- code/TabRunner.cpp | 1119 ++++++++++---- code/TabRunner.h | 80 +- code/TabSI.cpp | 1463 +++++++++++++++---- code/TabSI.h | 50 +- code/TabSpeaker.cpp | 19 +- code/TabSpeaker.h | 2 +- code/TabTeam.cpp | 135 +- code/TabTeam.h | 8 +- code/Table.cpp | 8 +- code/Table.h | 5 +- code/TimeStamp.cpp | 2 +- code/TimeStamp.h | 2 +- code/animationdata.cpp | 2 +- code/animationdata.h | 6 +- code/announcer24.png | Bin 0 -> 1212 bytes code/autocomplete.cpp | 2 +- code/autocomplete.h | 2 +- code/autocompletehandler.h | 2 +- code/autotask.cpp | 2 +- code/autotask.h | 2 +- code/binencoder.cpp | 4 +- code/binencoder.h | 2 +- code/class24.png | Bin 0 -> 862 bytes code/classconfiginfo.cpp | 2 +- code/classconfiginfo.h | 2 +- code/clubs24.png | Bin 0 -> 965 bytes code/competition24.png | Bin 0 -> 696 bytes code/course24.png | Bin 0 -> 823 bytes code/csvparser.cpp | 18 +- code/csvparser.h | 6 +- code/ctrl24.png | Bin 0 -> 565 bytes code/download.cpp | 18 +- code/download.h | 2 +- code/edit.png | Bin 0 -> 677 bytes code/english.lng | 157 +- code/french.lng | 18 +- code/gdiconstants.h | 2 +- code/gdifonts.h | 3 +- code/gdiimpl.h | 6 +- code/gdioutput.cpp | 434 +++--- code/gdioutput.h | 71 +- code/gdistructures.h | 190 +-- code/generalresult.cpp | 33 +- code/generalresult.h | 2 +- code/guihandler.h | 8 +- code/image.cpp | 10 +- code/image.h | 2 +- code/importformats.cpp | 4 +- code/infoserver.cpp | 2 +- code/infoserver.h | 4 +- code/inthashmap.h | 2 +- code/intkeymap.hpp | 2 +- code/intkeymapimpl.hpp | 2 +- code/iof30interface.cpp | 127 +- code/iof30interface.h | 11 +- code/lib/mysqlpp_vc15.lib | Bin 737200 -> 0 bytes code/lib64_db/RestBed.lib | Bin 0 -> 47881350 bytes code/lib64_db/libharu.lib | Bin 0 -> 68932 bytes code/lib64_db/libmysql.lib | Bin 0 -> 29444 bytes code/lib64_db/libpng.lib | Bin 0 -> 1400928 bytes code/lib64_db/zlibstat.lib | Bin 0 -> 750512 bytes code/lib_db/mysqlpp_vc15.lib | Bin 737200 -> 0 bytes code/license.txt | 2 +- code/listeditor.cpp | 37 +- code/listeditor.h | 6 +- code/lists24.png | Bin 0 -> 988 bytes code/liveresult.cpp | 2 +- code/liveresult.h | 2 +- code/localizer.cpp | 12 +- code/localizer.h | 2 +- code/machinecontainer.cpp | 22 + code/machinecontainer.h | 21 + code/meos.cpp | 138 +- code/meos.rc | 54 +- code/meos_dpi_manifest.xml | 29 + code/meos_util.cpp | 115 +- code/meos_util.h | 28 +- code/meos_vc15.sln | 34 - code/meosexception.h | 2 +- code/meoslang.rc | 2 + code/meosvc15.vcxproj | 785 ---------- code/meosversion.cpp | 34 +- code/metalist.cpp | 34 +- code/metalist.h | 8 +- code/methodeditor.cpp | 10 +- code/methodeditor.h | 7 +- code/mysqldaemon.cpp | 4 +- code/mysqlwrapper.cpp | 23 +- code/mysqlwrapper.h | 22 + code/newcompetition.cpp | 13 +- code/oBase.cpp | 22 +- code/oBase.h | 18 +- code/oCard.cpp | 41 +- code/oCard.h | 14 +- code/oClass.cpp | 503 +++++-- code/oClass.h | 35 +- code/oClub.cpp | 14 +- code/oClub.h | 4 +- code/oControl.cpp | 42 +- code/oControl.h | 4 +- code/oCourse.cpp | 15 +- code/oCourse.h | 4 +- code/oDataContainer.cpp | 89 +- code/oDataContainer.h | 12 +- code/oEvent.cpp | 380 ++++- code/oEvent.h | 96 +- code/oEventDraw.cpp | 168 ++- code/oEventDraw.h | 2 +- code/oEventResult.cpp | 110 +- code/oEventSQL.cpp | 4 +- code/oEventSpeaker.cpp | 43 +- code/oFreeImport.cpp | 2 +- code/oFreeImport.h | 2 +- code/oFreePunch.cpp | 14 +- code/oFreePunch.h | 2 +- code/oImportExport.cpp | 18 +- code/oListInfo.cpp | 211 ++- code/oListInfo.h | 27 +- code/oPunch.cpp | 106 +- code/oPunch.h | 20 +- code/oReport.cpp | 2 +- code/oRunner.cpp | 577 +++++--- code/oRunner.h | 124 +- code/oTeam.cpp | 63 +- code/oTeam.h | 14 +- code/oTeamEvent.cpp | 17 +- code/oevent_transfer.cpp | 4 +- code/onlineinput.cpp | 39 +- code/onlineinput.h | 2 +- code/onlineresults.cpp | 12 +- code/onlineresults.h | 2 +- code/ospeaker.h | 2 +- code/parser.cpp | 2 +- code/parser.h | 2 +- code/pdfwriter.cpp | 3 +- code/pdfwriter.h | 2 +- code/portuguese.lng | 2676 ++++++++++++++++++++++++++++++++++ code/prefseditor.cpp | 4 +- code/prefseditor.h | 2 +- code/printer.cpp | 6 +- code/progress.cpp | 2 +- code/progress.h | 2 +- code/qf_editor.cpp | 796 ++++++++++ code/qf_editor.h | 116 ++ code/qualification_final.cpp | 563 +++++-- code/qualification_final.h | 103 +- code/random.cpp | 2 +- code/random.h | 2 +- code/readout24.png | Bin 0 -> 669 bytes code/recorder.cpp | 16 +- code/recorder.h | 2 +- code/resource.h | 13 + code/restserver.cpp | 20 +- code/restserver.h | 18 +- code/runner24.png | Bin 0 -> 739 bytes code/services24.png | Bin 0 -> 1381 bytes code/socket.cpp | 2 +- code/socket.h | 2 +- code/speakermonitor.cpp | 2 +- code/speakermonitor.h | 2 +- code/subcommand.h | 2 +- code/swedish.lng | 146 +- code/team24.png | Bin 0 -> 1488 bytes code/testmeos.cpp | 10 +- code/testmeos.h | 2 +- code/timeconstants.hpp | 22 + code/toolbar.cpp | 2 +- code/toolbar.h | 2 +- code/warn24.png | Bin 0 -> 904 bytes code/xmlparser.cpp | 20 +- code/xmlparser.h | 12 +- 205 files changed, 11350 insertions(+), 3589 deletions(-) create mode 100644 code/MeOS.sln create mode 100644 code/MeOS.vcxproj create mode 100644 code/announcer24.png create mode 100644 code/class24.png create mode 100644 code/clubs24.png create mode 100644 code/competition24.png create mode 100644 code/course24.png create mode 100644 code/ctrl24.png create mode 100644 code/edit.png delete mode 100644 code/lib/mysqlpp_vc15.lib create mode 100644 code/lib64_db/RestBed.lib create mode 100644 code/lib64_db/libharu.lib create mode 100644 code/lib64_db/libmysql.lib create mode 100644 code/lib64_db/libpng.lib create mode 100644 code/lib64_db/zlibstat.lib delete mode 100644 code/lib_db/mysqlpp_vc15.lib create mode 100644 code/lists24.png create mode 100644 code/meos_dpi_manifest.xml delete mode 100644 code/meos_vc15.sln delete mode 100644 code/meosvc15.vcxproj create mode 100644 code/portuguese.lng create mode 100644 code/qf_editor.cpp create mode 100644 code/qf_editor.h create mode 100644 code/readout24.png create mode 100644 code/runner24.png create mode 100644 code/services24.png create mode 100644 code/team24.png create mode 100644 code/warn24.png diff --git a/code/HTMLWriter.cpp b/code/HTMLWriter.cpp index 91b1cbf..7e2a363 100644 --- a/code/HTMLWriter.cpp +++ b/code/HTMLWriter.cpp @@ -1,6 +1,6 @@ /************************************************************************ MeOS - Orienteering Software - Copyright (C) 2009-2023 Melin Software HB + Copyright (C) 2009-2024 Melin Software HB This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -41,28 +41,30 @@ extern Image image; #include #include +using namespace std; + double getLocalScale(const wstring &fontName, wstring &faceName); wstring getMeosCompectVersion(); map > HTMLWriter::tCache; extern wchar_t exePath[MAX_PATH]; -static void generateStyles(const gdioutput &gdi, ostream &fout, double scale, bool withTbl, const list &TL, +static void generateStyles(const gdioutput &gdi, std::ostream &fout, double scale, bool withTbl, const list &TL, map< pair, pair > &styles) { fout << "