38 bool read (
const QString &file_path);
45 static std::shared_ptr<ehm_dal::saved_game::SavedGameData>
data ();
48 static std::shared_ptr<ehm_dal::saved_game::SavedGameData> data_;
44 bool read (
const QString &file_path);
51 static std::shared_ptr<ehm_dal::saved_game::SavedGameData>
data ();
54 static std::shared_ptr<ehm_dal::saved_game::SavedGameData> data_;
The SavedGame class parses uncompressed EHM .sav saved games.
Definition: saved_game.h:21
SavedGame()
Default constructor.
bool read(const QString &file_path)
Reads the .sav file at file_path and parses the saved game and the Database within.
void clearAll()
Clear all of the saved game tables.
static std::shared_ptr< ehm_dal::saved_game::SavedGameData > data()
Returns the saved game data comprising saved game sub-files.
~SavedGame()
Default destructor.
namespace ehm_dal::saved_game
Definition: saved_game_data.h:13
EHM DAL: C:/Users/colin/QT Projects/Eastside Hockey Manager 1/EHM_Editor/lib/ehm_dal/include/saved_game/file_io/saved_game_file_manager.h Source File
+
+
+
+
+
+
+ EHM DAL 1.0.0
+
+ Data abstraction layer for Eastside Hockey Manager
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
Loading...
+
Searching...
+
No Matches
+
+
+
+
+
+
+
+
+
+
+
4 #include "include/file_io/abstract_file_manager.h"
+
+
6 namespace ehm_dal::file_io {
+
+
+
+
+
+
+
+
14 inline QString
descriptor ()
const override {
return QStringLiteral(
"saved_game" ); }
+
+
+
17 return QStringLiteral(
"EHM 1 Saved Game (*.sav)" );
+
+
+
+
+
22 void closeAll()
override ;
+
+
+
25 bool read(
const QString &path)
override ;
+
+
+
28 bool write(
const QString &path)
override ;
+
+
+
The AbstractFileManager class is a base class providing simple read and write file access to database...
Definition: abstract_file_manager.h:18
+
Definition: saved_game_file_manager.h:9
+
QString fileFilterString() const override
Returns a list of supported file type filters for QFileDialog.
Definition: saved_game_file_manager.h:15
+
QString descriptor() const override
Returns the file manager descriptor. E.g. This will return "database" for a database file manager.
Definition: saved_game_file_manager.h:14
+
+
58 std::vector<std::shared_ptr<ehm_dal::tools::schedule_template_generator::ScheduleClub>> clubs_;
Definition: spreadsheet.h:23
Definition: spreadsheet.h:26
92 qint32 generate_iteration_limit_{2000};
Definition: spreadsheet.h:23
Definition: spreadsheet.h:26
8 namespace ehm_dal::settings {
13 class QAbstractTableModel;
19 namespace ehm_dal::spreadsheet {
31 inline void add() { add(QVariant()); }
32 inline void add(
const QString &text) { add(QVariant(text)); }
33 void add(
const QVariant &data);
34 void add(
const QVariant &data,
const qint32 row);
35 void add(
const QVariant &data,
const qint32 start_row,
const qint32 row_count);
44 void add (QAbstractTableModel *model,
const Qt::ItemDataRole role = Qt::DisplayRole);
52 void add (QAbstractTableModel *model,
53 const std::vector<qint32> &column_index_list,
54 const Qt::ItemDataRole role = Qt::DisplayRole);
62 void add (QAbstractTableModel *model,
64 const Qt::ItemDataRole role = Qt::DisplayRole);
73 void add (QAbstractTableModel *model,
75 const std::vector<qint32> &column_index_list,
76 const Qt::ItemDataRole role = Qt::DisplayRole);
90 const std::vector<qint32> &column_index_list,
91 const Qt::ItemDataRole role = Qt::DisplayRole);
97 void add (
const std::vector<ehm_dal::data_types::Pointer> &pointer_list,
16 class QAbstractTableModel;
22 namespace ehm_dal::spreadsheet {
34 inline void add() { add(QVariant()); }
35 inline void add(
const QString &text) { add(QVariant(text)); }
36 void add(
const QVariant &data);
37 void add(
const QVariant &data,
const qint32
row );
38 void add(
const QVariant &data,
const qint32 start_row,
const qint32 row_count);
56 const std::vector<qint32> &column_index_list,
57 const Qt::ItemDataRole role = Qt::DisplayRole);
67 const Qt::ItemDataRole role = Qt::DisplayRole);
78 const std::vector<qint32> &column_index_list,
79 const Qt::ItemDataRole role = Qt::DisplayRole);
88 void add (QAbstractTableModel *model,
const Qt::ItemDataRole role = Qt::DisplayRole);
96 void add (QAbstractTableModel *model,
97 const std::vector<qint32> &column_index_list,
98 const Qt::ItemDataRole role = Qt::DisplayRole);
105 void add (
const std::vector<ehm_dal::data_types::Pointer> &pointer_list,
106 const std::vector<qint32> &column_index_list,
107 const Qt::ItemDataRole role = Qt::DisplayRole);
110 inline void addPrefix() { addPrefix(QVariant()); }
111 inline void addPrefix(
const QVariant &data) { prefix_cell_data_.push_back(data); }
114 inline void addHeader() { add(QVariant()); }
115 inline void addHeader(
const QString &text) { addHeader(QVariant(text)); }
116 void addHeader(
const QStringList &text_list);
117 void addHeader(
const QVariant &data);
132 void addHeader (QAbstractTableModel *model,
const std::vector<qint32> &column_index_list);
135 inline void addHeaderPrefix() { addHeaderPrefix(QVariant()); }
136 inline void addHeaderPrefix(
const QVariant &data) { prefix_header_data_.push_back(data); }
139 void printDiagnosticData()
const ;
153 inline QString identifier() {
return headerCell(0,0).toString().replace(
" " ,
"_" ).toLower(); }
106 void add (QAbstractTableModel *model,
108 const Qt::ItemDataRole role = Qt::DisplayRole);
117 void add (QAbstractTableModel *model,
119 const std::vector<qint32> &column_index_list,
120 const Qt::ItemDataRole role = Qt::DisplayRole);
136 const std::vector<qint32> &column_index_list,
137 const Qt::ItemDataRole role = Qt::DisplayRole);
143 void add (
const std::vector<ehm_dal::data_types::Pointer> &pointer_list,
144 const Qt::ItemDataRole role = Qt::DisplayRole);
151 void add (
const std::vector<ehm_dal::data_types::Pointer> &pointer_list,
152 const std::vector<qint32> &column_index_list,
153 const Qt::ItemDataRole role = Qt::DisplayRole);
156 void addFileNameSuffix(
const QString &suffix);
157 bool setFile(
const QString &path);
160 static qint32 defaultFileExtension();
161 static QString fileExtensionListAsString(
const bool merged_list =
true );
162 static QStringList fileExtensionListAsStringList();
163 static void setDefaultFileExtension(
const qint32 i);
166 bool open(
const QString &file_path);
167 bool open(
const QString &folder,
const QString &file_name);
169 bool save(
const QString &folder,
const QString &file_name);
177 bool showOpenDialog(QString file_path = QString(),
const bool read_data =
true );
179 bool showSaveDialog(
const QString &file_name =
"output.csv" , QString file_path = QString());
183 QVariant cell(
const qint32 row,
const qint32 col)
const ;
184 std::span<const QVariant> cells(
const qint32 row,
186 const qint32 col_count)
const ;
187 bool columnContainsData(
const qint32 column)
const ;
188 qint32 columnCount(
const qint32 row)
const ;
189 std::span<const QVariant> row(
const qint32 row)
const ;
190 inline qint32 rowCount()
const {
return static_cast< qint32
> (cell_data_.size()); }
193 QVariant prefix(
const qint32 row)
const ;
194 inline bool hasPrefixData()
const {
return prefixCount() > 0; }
195 inline qint32 prefixCount()
const {
return static_cast< qint32
> (prefix_cell_data_.size()); }
198 std::span<const QVariant> header(
const qint32 row)
const ;
199 QVariant headerCell(
const qint32 row,
const quint16 col)
const ;
200 inline qint32 headerCount()
const 202 return std::max(
static_cast< qint32
> (header_data_.size()), header_count_);
206 QVariant prefixHeader(
const qint32 row)
const ;
207 inline bool hasPrefixHeaderData()
const {
return prefixHeaderCount() > 0; }
208 inline qint32 prefixHeaderCount()
const 210 return static_cast< qint32
> (prefix_header_data_.size());
164 inline void addPrefix (
const QVariant &data) { prefix_cell_data_.push_back(data); }
200 void addHeader (QAbstractTableModel *model,
const std::vector<qint32> &column_index_list);
211 inline void addHeaderPrefix (
const QVariant &data) { prefix_header_data_.push_back(data); }
214 static QString exportPath();
215 static QString importPath();
218 void addNewHeaderRow();
222 void setHeaderCount(
const qint32 header_row_count);
225 std::unique_ptr<SpreadsheetFile> newSpreadsheet(QFile &f);
229 std::vector<std::vector<QVariant>> cell_data_;
230 std::vector<std::vector<QVariant>> header_data_;
231 std::vector<QVariant> prefix_cell_data_;
232 std::vector<QVariant> prefix_header_data_;
235 std::vector<qint32> columnList(
const qint32 column_count)
const ;
238 quint8 file_extension_;
243 static QHash<QString, quint8> fileExtensions();
244 static QString filterText(
const qint32 type);
247 enum ENUM_FILE_EXTENSIONS {
254 qint32 header_count_{2};
257 bool hide_progress_{
false };
260 std::vector<QVariant> *currentHeaderRow();
261 std::vector<QVariant> *currentRow();
236 inline QString
identifier () {
return headerCell(0,0).toString().replace(
" " ,
"_" ).toLower(); }
277 bool open (
const QString &file_path);
284 bool open (
const QString &folder,
const QString &file_name);
296 bool save (
const QString &folder,
const QString &file_name);
324 bool showSaveDialog (
const QString &file_name =
"output.csv" , QString file_path = QString());
338 QVariant
cell (
const qint32
row ,
const qint32 col)
const ;
347 const qint32 col_count)
const ;
364 std::span<const QVariant>
row (
const qint32
row )
const ;
369 inline qint32
rowCount ()
const {
return static_cast< qint32
> (cell_data_.size()); }
372 QVariant prefix(
const qint32
row )
const ;
373 inline bool hasPrefixData()
const {
return prefixCount() > 0; }
374 inline qint32 prefixCount()
const {
return static_cast< qint32
> (prefix_cell_data_.size()); }
377 std::span<const QVariant> header(
const qint32
row )
const ;
378 QVariant headerCell(
const qint32
row ,
const quint16 col)
const ;
379 inline qint32 headerCount()
const 381 return std::max(
static_cast< qint32
> (header_data_.size()), header_count_);
385 QVariant prefixHeader(
const qint32
row )
const ;
386 inline bool hasPrefixHeaderData()
const {
return prefixHeaderCount() > 0; }
387 inline qint32 prefixHeaderCount()
const 389 return static_cast< qint32
> (prefix_header_data_.size());
429 std::vector<std::vector<QVariant>> cell_data_;
430 std::vector<std::vector<QVariant>> header_data_;
431 std::vector<QVariant> prefix_cell_data_;
432 std::vector<QVariant> prefix_header_data_;
435 void addFromTableModel(QAbstractTableModel *model,
436 const std::vector<qint32> &column_index_list,
437 const Qt::ItemDataRole role = Qt::DisplayRole);
438 void addFromTableModel(QAbstractTableModel *model,
440 const std::vector<qint32> &column_index_list,
441 const Qt::ItemDataRole role = Qt::DisplayRole);
442 void addFromTreeModel(QAbstractTableModel *model,
443 const std::vector<qint32> &column_index_list,
444 const Qt::ItemDataRole role = Qt::DisplayRole);
445 void addFromTreeModel(QAbstractTableModel *model,
446 const qint32 parent_row,
447 const std::vector<qint32> &column_index_list,
448 const Qt::ItemDataRole role = Qt::DisplayRole);
451 std::vector<qint32> columnList(
const qint32 column_count)
const ;
454 quint8 file_extension_;
459 static QHash<QString, quint8> fileExtensions();
460 static QString filterText(
const qint32 type);
463 enum ENUM_FILE_EXTENSIONS {
470 qint32 header_count_{2};
473 bool hide_progress_{
false };
476 std::vector<QVariant> *currentHeaderRow();
477 std::vector<QVariant> *currentRow();
The Pointer class represents a pointer to a table item.
Definition: pointer.h:21
Definition: folder_path.h:11
Definition: spreadsheet.h:23
Definition: spreadsheet.h:26
qint32 rowCount() const
Returns the data row count.
Definition: spreadsheet.h:369
std::span< const QVariant > cells(const qint32 row, const qint32 col, const qint32 col_count) const
Returns the data for the chosen number of columns commencing from row and col.
void add(const ehm_dal::data_types::Pointer &pointer, const Qt::ItemDataRole role=Qt::DisplayRole)
Adds all columns of the selected Pointer to the spreadsheet.
QString fileName()
Returns the file path and name of the output spreadsheet.
Definition: spreadsheet.h:147
void add(QAbstractTableModel *model, const Qt::ItemDataRole role=Qt::DisplayRole)
Adds all rows and columns from model to the spreadsheet. This is generally used to export a Table usi...
void addNewHeaderRow()
Adds a new header row.
void addHeader(const QStringList &text_list)
Adds the text_list to the current header row.
QString identifier()
Returns the identifier text string located at the top left cell (i.e. Cell A1).
Definition: spreadsheet.h:236
QString file()
Returns the file path, file base name and file extension.
QString fileName()
Returns the file path and name of the output spreadsheet.
Definition: spreadsheet.h:227
void add(ehm_dal::tables::AbstractTable *model, const qint32 row, const std::vector< qint32 > &column_index_list, const Qt::ItemDataRole role=Qt::DisplayRole)
Adds the selected row and selected columns from model to the spreadsheet. This is generally used to e...
bool showSaveDialog(const QString &file_name="output.csv", QString file_path=QString())
Displays a dialog window allowing the user to save the spreadsheet.
QVariant cell(const qint32 row, const qint32 col) const
Returns the data at located at row and col.
void add(QAbstractTableModel *model, const Qt::ItemDataRole role=Qt::DisplayRole)
Adds all rows and columns from model to the spreadsheet. This is generally used to export a QAbstract...
static void setDefaultFileExtension(const qint32 i)
Set the default file extension to i.
void addHeaderPrefix(const QVariant &data)
Adds data to the current prefix header row.
Definition: spreadsheet.h:211
qint32 columnCount(const qint32 row) const
Returns the column count for the selected row.
void add(const std::vector< ehm_dal::data_types::Pointer > &pointer_list, const Qt::ItemDataRole role=Qt::DisplayRole)
Adds all columns of the selected Pointers to the spreadsheet.
static QStringList fileExtensionListAsStringList()
Returns a list of supported file extensions.
void addPrefix(const QVariant &data)
Adds data to the current prefix row.
Definition: spreadsheet.h:164
bool showSaveDialog(settings::FolderPath &path)
Displays a dialog window allowing the user to save the spreadsheet.
void addPrefix()
Adds a blank cell to the current prefix row.
Definition: spreadsheet.h:159
bool save(const QString &folder, const QString &file_name)
Saves the spreadsheet to the selected folder path and file name.
bool read()
Reads the current file.
bool columnContainsData(const qint32 column) const
Returns whether a column contains any data.
static QString fileExtensionListAsString(const bool merged_list=true)
Returns a list of supported file extensions.
bool showOpenDialog(QString file_path=QString(), const bool read_data=true)
Displays a dialog window allowing the user to select a spreadsheet to open.
static QString importPath()
Returns the default file path used for importing data.
void addHeader()
Adds a blank cell to the current header row.
Definition: spreadsheet.h:170
bool setFile(const QString &path)
Set the file path, name and extension from path.
void add(QAbstractTableModel *model, const qint32 row, const std::vector< qint32 > &column_index_list, const Qt::ItemDataRole role=Qt::DisplayRole)
Adds the selected row and selected columns from model to the spreadsheet. This is generally used to e...
bool write()
Writes/saves the spreadsheet to the output file.
void setHeaderCount(const qint32 header_row_count)
Sets the number of header rows to header_row_count.
void add(ehm_dal::tables::AbstractTable *model, const Qt::ItemDataRole role=Qt::DisplayRole)
Adds all rows and columns from model to the spreadsheet. This is generally used to export a ehm_dal::...
void add(QAbstractTableModel *model, const std::vector< qint32 > &column_index_list, const Qt::ItemDataRole role=Qt::DisplayRole)
Adds all rows and the selected columns from model to the spreadsheet. This is generally used to expor...
void addHeader(const QString &text)
Adds text to the current header row.
Definition: spreadsheet.h:175
static qint32 defaultFileExtension()
Returns the default file extension.
void add(const std::vector< ehm_dal::data_types::Pointer > &pointer_list, const std::vector< qint32 > &column_index_list, const Qt::ItemDataRole role=Qt::DisplayRole)
Adds the selected columns of the selected Pointers to the spreadsheet.
std::span< const QVariant > row(const qint32 row) const
Returns the data of the entirety of the selected row.
void add(QAbstractTableModel *model, const qint32 row, const Qt::ItemDataRole role=Qt::DisplayRole)
Adds the selected row and all columns from model to the spreadsheet. This is generally used to export...
void addHeader(QAbstractTableModel *model)
Adds a header row of column names of all columns from the 'model'. This is typically used to add the ...
void addHeader(QAbstractTableModel *model, const std::vector< qint32 > &column_index_list)
Adds a header row of column names of the selected columnd from the 'model'. This is typically used to...
std::unique_ptr< SpreadsheetFile > newSpreadsheet(QFile &f)
Creates a new spreadsheet from f and returns a pointer to the created ehm_dal::spreadsheet::Spreadshe...
void addNewRow()
Adds a new data row.
void addHeaderPrefix()
Adds a blank cell to the current prefix header row.
Definition: spreadsheet.h:206
void printDiagnosticData() const
Prints various diagnostic data to the console.
bool open(const QString &folder, const QString &file_name)
Opens a file without showing a dialog window.
static QString exportPath()
Returns the default file path used for exporting data.
void addFileNameSuffix(const QString &suffix)
Adds suffix to the end of the file name.
void add(ehm_dal::tables::AbstractTable *model, const qint32 row, const Qt::ItemDataRole role=Qt::DisplayRole)
Adds the selected row and all columns from model to the spreadsheet. This is generally used to export...
void add(const ehm_dal::data_types::Pointer &pointer, const std::vector< qint32 > &column_index_list, const Qt::ItemDataRole role=Qt::DisplayRole)
Adds the selected columns of the selected Pointer to the spreadsheet.
void add(ehm_dal::tables::AbstractTable *model, const std::vector< qint32 > &column_index_list, const Qt::ItemDataRole role=Qt::DisplayRole)
Adds all rows and the selected columns from model to the spreadsheet. This is generally used to expor...
bool showOpenDialog(settings::FolderPath &path, const bool read_data=true)
Displays a dialog window allowing the user to select a spreadsheet to open.
QString fileType() const
Returns the file type of the output spreadsheet.
bool open(const QString &file_path)
Opens a file without showing a dialog window.
void addHeader(const QVariant &data)
Adds data to the current header row.
The Table class represents a database table and provides access to rows of data.
Definition: abstract_table.h:29
namespace ehm_dal::data_types
Definition: attribute.h:6
namespace ehm_dal::tables
Definition: column.h:4
+#include
+
+int main(int argc, char *argv[])
+{
+ // Application
+ QApplication a(argc, argv);
+
+ // Use Fusion style if Windows dark mode is enabled (Fusion is dark mode compatible)
+ QSettings settings(
+ "HKEY_CURRENT_USER\\Software\\Microsoft\\Windows\\CurrentVersion\\Themes\\Personalize",
+ QSettings::NativeFormat);
+ if (settings.value("AppsUseLightTheme") == 0)
+ a.setStyle("fusion");
+
+ // Main window
+ MainWindow w;
+ w.show();
+ return a.exec();
+}
diff --git a/examples/01-02_Simple_Tree_View/mainwindow.cpp b/examples/01-02_Simple_Tree_View/mainwindow.cpp
new file mode 100644
index 0000000..8c4fd48
--- /dev/null
+++ b/examples/01-02_Simple_Tree_View/mainwindow.cpp
@@ -0,0 +1,178 @@
+#include "mainwindow.h"
+
+#include "lib/ehm_dal/include/database/column_data/club_competition/club_competition_history_columns.h"
+#include "lib/ehm_dal/include/database/database.h"
+#include "lib/ehm_dal/include/database/file_io/database_file_manager.h"
+#include "lib/ehm_dal/include/library_info.h"
+#include "lib/ehm_dal/include/saved_game/file_io/saved_game_file_manager.h"
+#include "lib/ehm_dal/include/spreadsheet/spreadsheet.h"
+#include "lib/ehm_dal/include/tables/abstract_table.h"
+#include "lib/ehm_dal/include/tables/table_index.h"
+
+#include
+#include
+
+/* MAIN WINDOW CONSTRUCTOR
+ * This function constructs the main window and adds the following to the window:
+ * 1. A menu bar with a drop-down menu allowing users to (i) open a database or saved game and (ii) export table data to a spreadsheet; and
+ * 2. A QTreeView widget which will show the selected database table (as a tree structure) within the window.
+ */
+MainWindow::MainWindow(QWidget *parent)
+ : QMainWindow(parent)
+{
+ /// Window attributes ///
+ setMinimumSize(1200, 600);
+ setWindowTitle(QString("Simple Tree Viewer - %1 %2")
+ .arg(ehm_dal::library_info::libraryShortName(),
+ ehm_dal::library_info::libraryVersion()));
+
+ /// Menu bar ///
+ menu_bar_ = new QMenuBar(this);
+ setMenuBar(menu_bar_);
+
+ /// Menu bar -> File menu ///
+ auto file_menu{menu_bar_->addMenu("&File")};
+
+ // Create a new QAction which will be shown in the File menu.
+ // Clicking on this QAction will trigger the openDatabase() function.
+ open_database_action_ = new QAction("Open &database...", this);
+ QObject::connect(open_database_action_, &QAction::triggered, this, &MainWindow::openDatabase);
+ file_menu->addAction(open_database_action_);
+
+ // Create a new QAction which will be shown in the File menu.
+ // Clicking on this QAction will trigger the openSavedGame() function.
+ open_saved_game_action_ = new QAction("Open saved &game...", this);
+ QObject::connect(open_saved_game_action_, &QAction::triggered, this, &MainWindow::openSavedGame);
+ file_menu->addAction(open_saved_game_action_);
+
+ /// Menu bar -> Tools menu ///
+ auto tools_menu{menu_bar_->addMenu("&Tools")};
+
+ // Create a new QAction which will be shown in the Tools menu.
+ // Clicking on this QAction will trigger the exportSpreadsheet() function.
+ spreadsheet_export_all_columns_action_ = new QAction("&Export to spreadsheet...", this);
+ QObject::connect(spreadsheet_export_all_columns_action_,
+ &QAction::triggered,
+ this,
+ &MainWindow::exportSpreadsheet);
+ tools_menu->addAction(spreadsheet_export_all_columns_action_);
+
+ // Create a new QAction which will be shown in the Tools menu.
+ // Clicking on this QAction will trigger the exportSpreadsheetSelectedColumns() function.
+ spreadsheet_export_selected_columns_action_
+ = new QAction("Export to spreadsheet (selected &columns)...", this);
+ QObject::connect(spreadsheet_export_selected_columns_action_,
+ &QAction::triggered,
+ this,
+ &MainWindow::exportSpreadsheetSelectedColumns);
+ tools_menu->addAction(spreadsheet_export_selected_columns_action_);
+
+ /// Tree view ///
+ tree_view_ = new QTreeView(this);
+ setCentralWidget(tree_view_);
+
+ // Assign the selected tree table below to the tree_view_.
+ // Let's use the Club Competition History table for the purposes of this example.
+ ehm_dal::Database db;
+ tree_view_->setModel(db.table(ehm_dal::tables::TableIndex::CLUB_COMPETITION_HISTORY).get());
+}
+
+/* MAIN WINDOW CONSTRUCTOR
+ * Nothing to see here.
+ * The various class members will be auto-deleted as part of Qt's garbage collection. Hence no explicit `delete` calls here.
+ */
+MainWindow::~MainWindow() {}
+
+/* FUNCTION: EXPORT SPREADSHEET (all columns)
+ * Generates a new spreadsheet and populates it with the entirety of the Club Competition History data table.
+ */
+void MainWindow::exportSpreadsheet()
+{
+ ehm_dal::spreadsheet::Spreadsheet spreadsheet;
+
+ // Let's use the Club Competitions table
+ ehm_dal::Database db;
+ auto table{db.table(ehm_dal::tables::TableIndex::CLUB_COMPETITION_HISTORY)};
+
+ // Show a window dialog prompting the user to select the destination for saving the spreadsheet.
+ // The `table->attributes()->name()` function takes the name of the table and this is then used as default file name for saving.
+ // Abort if the user clicks `Cancel` (`showSaveDialog()` will return false if cancelled).
+ // By adding the data to the spreadsheet only after this function, we avoid wasting time populating the spreadsheet with data
+ // in the event the user has clicked `Cancel`.
+ if (!spreadsheet.showSaveDialog(QString("%1.xlsx").arg(table->attributes()->name())))
+ return;
+
+ // Add a header row to the spreadsheet based on the table's column names
+ spreadsheet.addHeader(table.get());
+ // Add the entirety of the table data to the spreadsheet
+ spreadsheet.add(table.get());
+
+ // Save the spreadsheet data to the file.
+ if (spreadsheet.write())
+ qInfo() << "Spreadsheet successfully saved";
+ else
+ qInfo() << "Unable to save the spreadsheet";
+}
+
+/* FUNCTION: EXPORT SPREADSHEET (selected columns)
+ * Generates a new spreadsheet and populates it with just a few columns of data of the Club Competition History data table.
+ */
+void MainWindow::exportSpreadsheetSelectedColumns()
+{
+ // This is a very similar function to `exportSpreadsheet()` but with the key difference that here we generate a list of
+ // columns we want to export. This will result in just those selected columns being exported.
+ ehm_dal::spreadsheet::Spreadsheet spreadsheet;
+
+ ehm_dal::Database db;
+ auto table{db.table(ehm_dal::tables::TableIndex::CLUB_COMPETITION_HISTORY)};
+
+ if (!spreadsheet.showSaveDialog(QString("%1.xlsx").arg(table->attributes()->name())))
+ return;
+
+ // Here's where the function is different to `exportSpreadsheet()` above:
+ // First we create a list of what columns we want to export.
+ // We then pass this list to the same `addHeader()` and `add()` functions as before.
+ std::vector
+ column_list{ehm_dal::column_data::ClubCompetitionHistoryColumns::Year,
+ ehm_dal::column_data::ClubCompetitionHistoryColumns::ClubCompetition,
+ ehm_dal::column_data::ClubCompetitionHistoryColumns::RegularSeasonChampions,
+ ehm_dal::column_data::ClubCompetitionHistoryColumns::Winners};
+
+ spreadsheet.addHeader(table.get(), column_list);
+ spreadsheet.add(table.get(), column_list);
+
+ if (spreadsheet.write())
+ qInfo() << "Spreadsheet successfully saved";
+ else
+ qInfo() << "Unable to save the spreadsheet";
+}
+
+/* FUNCTION: OPEN DATABASE
+ * This function uses the DatabaseFileManager to display a dialog window allowing the user to select a database file to open.
+ * The DatabaseFileManager will then proceed to open and process the database file.
+ */
+void MainWindow::openDatabase()
+{
+ ehm_dal::file_io::DatabaseFileManager db_file_manager;
+
+ // Display the file selection dialog window and process the selected database file
+ if (db_file_manager.open(this))
+ qInfo() << "Database successfully opened";
+ else
+ qInfo() << "Unable to open the database";
+}
+
+/* FUNCTION: OPEN SAVED GAME
+ * This function uses the SavedGameFileManager to display a dialog window allowing the user to select a saved game file to open.
+ * The SavedGameFileManager will then proceed to open and process the saved game file.
+ */
+void MainWindow::openSavedGame()
+{
+ ehm_dal::file_io::SavedGameFileManager sg_file_manager;
+
+ // Display the file selection dialog window and process the selected saved game file
+ if (sg_file_manager.open(this))
+ qInfo() << "Saved game successfully opened";
+ else
+ qInfo() << "Unable to open the saved game";
+}
diff --git a/examples/01-02_Simple_Tree_View/mainwindow.h b/examples/01-02_Simple_Tree_View/mainwindow.h
new file mode 100644
index 0000000..11ba7ea
--- /dev/null
+++ b/examples/01-02_Simple_Tree_View/mainwindow.h
@@ -0,0 +1,45 @@
+#pragma once
+
+/* ***************************************
+ * EHM Data Abstraction Layer
+ * by Archibalduk
+ *
+ * https://github.com/archibalduk/EHM_DAL
+ *
+ * Example 01.02 - Simple Tree View
+ *
+ * ***************************************/
+
+#include
+#include
+#include
+#include
+
+/// The purpose of this example is to show how easily a database tree table can be displayed using a QTreeView widget.
+/// This example additionally shows how table data can be exported to a csv/xlsx spreadsheet file.
+class MainWindow : public QMainWindow
+{
+ Q_OBJECT
+
+public:
+ MainWindow(QWidget *parent = nullptr);
+ ~MainWindow();
+
+private:
+ // Menu
+ QMenuBar *menu_bar_;
+ QAction *open_database_action_;
+ QAction *open_saved_game_action_;
+ QAction *spreadsheet_export_all_columns_action_;
+ QAction *spreadsheet_export_selected_columns_action_;
+
+ // Table
+ QTreeView *tree_view_;
+
+private slots:
+ // Slot functions for connecting to signal functions
+ void exportSpreadsheet();
+ void exportSpreadsheetSelectedColumns();
+ void openDatabase();
+ void openSavedGame();
+};
diff --git a/examples/01-02_Simple_Tree_View/screenshot.png b/examples/01-02_Simple_Tree_View/screenshot.png
new file mode 100644
index 0000000..bf73e3e
Binary files /dev/null and b/examples/01-02_Simple_Tree_View/screenshot.png differ
diff --git a/examples/README.md b/examples/README.md
new file mode 100644
index 0000000..0a72b3e
--- /dev/null
+++ b/examples/README.md
@@ -0,0 +1,47 @@
+# EHM DAL: Example projects/code
+The sub-folders within this `examples` folder contain various example Qt projects incorporating EHM DAL. Each example includes readme.md file explaining the purpose of the example.
+
+## How to compile a project
+1. Download the source code from [here](https://github.com/archibalduk/EHM_DAL/archive/refs/heads/main.zip).
+1. Open the downloaded `.zip` file and navigate to the `examples` sub-folder.
+1. Extract the desired project sub-folder to a location of your choice.
+1. Create a new sub-folder named `lib` within the downloaded project folder.
+1. Download the latest version of EHM DAL from the [Releases page](https://github.com/archibalduk/EHM_DAL/releases) and extract the contents of the downloaded EHM DAL `.zip` into your `lib` folder.
+1. Open the `.pro` file in Qt Creator.
+1. Press `Ctrl + R` in Qt Creator to build and run the application.
+
+## Project folder structure
+If you have followed the steps above correctly then your project folder will look a bit like this:
+
+```
+├── 01-01_Simple_Table_View [or whichever project sub-folder you extracted]
+│ ├── lib
+│ │ ├── ehm_dal
+│ │ │ ├── include
+│ │ │ ├── ehm_dal.lib
+│ │ │ ├── ehm_dal.pri
+│ │ │ ├── ehm_dal_debug.lib
+│ │ ├── qxlsx
+│ │ │ ├── include
+│ │ │ ├── QXlsx.lib
+│ │ │ ├── qxlsx.pri
+│ │ │ ├── QXlsx_debug.lib
+├── .gitignore
+├── 01-01_Simple_Table_View.pro
+├── readme.md
+├── main.cpp
+├── [various other .h and .cpp files]
+```
+
+**Visit the [EHM DAL documentation](https://archibalduk.github.io/EHM_DAL/annotated.html) for details of the various classes and functions.**
+
+**Visit the [EHM DAL wiki](https://github.com/archibalduk/EHM_DAL/wiki) for guides and tutorials.**
+
+## Author
+[@archibalduk](https://www.github.com/archibalduk)
+
+## Credits
+EHM DAL uses [QXlsx by j2doll](https://github.com/QtExcel/QXlsx). QXlsx is licensed under the MIT license.
+
+## License
+[GNU General Public License v3.0](https://choosealicense.com/licenses/gpl-3.0/)
diff --git a/include/saved_game/file_io/saved_game_file_manager.h b/include/saved_game/file_io/saved_game_file_manager.h
new file mode 100644
index 0000000..dc0e5e9
--- /dev/null
+++ b/include/saved_game/file_io/saved_game_file_manager.h
@@ -0,0 +1,30 @@
+#pragma once
+
+// Application headers
+#include "include/file_io/abstract_file_manager.h"
+
+namespace ehm_dal::file_io {
+
+class SavedGameFileManager : public ehm_dal::file_io::AbstractFileManager
+{
+public:
+ SavedGameFileManager();
+
+ // Descriptor
+ inline QString descriptor() const override { return QStringLiteral("saved_game"); }
+ inline QString fileFilterString() const override
+ {
+ return QStringLiteral("EHM 1 Saved Game (*.sav)");
+ }
+
+private:
+ // Close saved game/database/tables
+ void closeAll() override;
+
+ // File i/o - read
+ bool read(const QString &path) override;
+
+ // File i/o - write
+ bool write(const QString &path) override;
+};
+} // namespace ehm_dal::file_io
diff --git a/include/saved_game/saved_game.h b/include/saved_game/saved_game.h
index 6652075..aa4052e 100644
--- a/include/saved_game/saved_game.h
+++ b/include/saved_game/saved_game.h
@@ -29,6 +29,12 @@ class SavedGame
*/
~SavedGame();
+ // Close saved game
+ /*!
+ * \brief Clear all of the saved game tables
+ */
+ void clearAll();
+
// File i/o
/*!
* \brief Reads the .sav file at `file_path` and parses the saved game and the Database within.
diff --git a/include/spreadsheet/spreadsheet.h b/include/spreadsheet/spreadsheet.h
index 22fc3a5..5e355e1 100644
--- a/include/spreadsheet/spreadsheet.h
+++ b/include/spreadsheet/spreadsheet.h
@@ -8,6 +8,9 @@ class Pointer;
namespace ehm_dal::settings {
class FolderPath;
}
+namespace ehm_dal::tables {
+class AbstractTable;
+}
// Qt headers
class QAbstractTableModel;
@@ -34,18 +37,59 @@ class Spreadsheet
void add(const QVariant &data, const qint32 row);
void add(const QVariant &data, const qint32 start_row, const qint32 row_count);
- // Add data - cells/rows: model data
+ // Add data - cells/rows: AbstractTable data
/*!
- * \brief Adds all rows and columns from `model` to the spreadsheet. This is generally used to export a Table using
- * `Qt::DisplayRole` or `Qt::EditRole`.
- * \param model Source `QAbstractTableModel` or Table
+ * \brief Adds all rows and columns from `model` to the spreadsheet. This is generally used to export a
+ * `ehm_dal::tables::AbstractTable` using `Qt::DisplayRole` or `Qt::EditRole`.
+ * \param model Source `ehm_dal::tables::AbstractTable`
+ * \param role Source data role
+ */
+ void add(ehm_dal::tables::AbstractTable *model, const Qt::ItemDataRole role = Qt::DisplayRole);
+ /*!
+ * \brief Adds all rows and the selected columns from `model` to the spreadsheet. This is generally used to export
+ * a `ehm_dal::tables::AbstractTable` using `Qt::DisplayRole` or `Qt::EditRole`.
+ * \param model Source `ehm_dal::tables::AbstractTable`
+ * \param column_index_list Column indexes to be added
+ * \param role Source data role
+ */
+ void add(ehm_dal::tables::AbstractTable *model,
+ const std::vector &column_index_list,
+ const Qt::ItemDataRole role = Qt::DisplayRole);
+ /*!
+ * \brief Adds the selected row and all columns from `model` to the spreadsheet. This is generally used to export
+ * a `ehm_dal::tables::AbstractTable` using `Qt::DisplayRole` or `Qt::EditRole`.
+ * \param model Source `ehm_dal::tables::AbstractTable`
+ * \param row Source row
+ * \param role Source data role
+ */
+ void add(ehm_dal::tables::AbstractTable *model,
+ const qint32 row,
+ const Qt::ItemDataRole role = Qt::DisplayRole);
+ /*!
+ * \brief Adds the selected row and selected columns from `model` to the spreadsheet. This is generally used to
+ * export a `ehm_dal::tables::AbstractTable` using `Qt::DisplayRole` or `Qt::EditRole`.
+ * \param model Source `ehm_dal::tables::AbstractTable`
+ * \param row Source row
+ * \param column_index_list Column indexes to be added
+ * \param role Source data role
+ */
+ void add(ehm_dal::tables::AbstractTable *model,
+ const qint32 row,
+ const std::vector &column_index_list,
+ const Qt::ItemDataRole role = Qt::DisplayRole);
+
+ // Add data - cells/rows: QAbstractTableModel data
+ /*!
+ * \brief Adds all rows and columns from `model` to the spreadsheet. This is generally used to export
+ * a `QAbstractTableModel` using `Qt::DisplayRole` or `Qt::EditRole`.
+ * \param model Source `QAbstractTableModel`
* \param role Source data role
*/
void add(QAbstractTableModel *model, const Qt::ItemDataRole role = Qt::DisplayRole);
/*!
* \brief Adds all rows and the selected columns from `model` to the spreadsheet. This is generally used to export
- * a Table using `Qt::DisplayRole` or `Qt::EditRole`.
- * \param model Source `QAbstractTableModel` or Table
+ * a `QAbstractTableModel` using `Qt::DisplayRole` or `Qt::EditRole`.
+ * \param model Source `QAbstractTableModel`
* \param column_index_list Column indexes to be added
* \param role Source data role
*/
@@ -54,8 +98,8 @@ class Spreadsheet
const Qt::ItemDataRole role = Qt::DisplayRole);
/*!
* \brief Adds the selected row and all columns from `model` to the spreadsheet. This is generally used to export
- * a Table using `Qt::DisplayRole` or `Qt::EditRole`.
- * \param model Source `QAbstractTableModel` or Table
+ * a `QAbstractTableModel` using `Qt::DisplayRole` or `Qt::EditRole`.
+ * \param model Source `QAbstractTableModel`
* \param row Source row
* \param role Source data role
*/
@@ -64,8 +108,8 @@ class Spreadsheet
const Qt::ItemDataRole role = Qt::DisplayRole);
/*!
* \brief Adds the selected row and selected columns from `model` to the spreadsheet. This is generally used to
- * export a Table using `Qt::DisplayRole` or `Qt::EditRole`.
- * \param model Source `QAbstractTableModel` or Table
+ * export a `QAbstractTableModel` using `Qt::DisplayRole` or `Qt::EditRole`.
+ * \param model Source `QAbstractTableModel`
* \param row Source row
* \param column_index_list Column indexes to be added
* \param role Source data role
@@ -74,6 +118,8 @@ class Spreadsheet
const qint32 row,
const std::vector &column_index_list,
const Qt::ItemDataRole role = Qt::DisplayRole);
+
+ // Add data - cells/rows: Pointer data
/*!
* \brief Adds all columns of the selected Pointer to the spreadsheet.
* \param pointer Source pointer
@@ -107,13 +153,35 @@ class Spreadsheet
const Qt::ItemDataRole role = Qt::DisplayRole);
// Add data - prefix cells
+ /*!
+ * \brief Adds a blank cell to the current prefix row.
+ */
inline void addPrefix() { addPrefix(QVariant()); }
+ /*!
+ * \brief Adds `data` to the current prefix row.
+ * \param data Data to be added
+ */
inline void addPrefix(const QVariant &data) { prefix_cell_data_.push_back(data); }
// Add data - header: basic
+ /*!
+ * \brief Adds a blank cell to the current header row.
+ */
inline void addHeader() { add(QVariant()); }
+ /*!
+ * \brief Adds `text` to the current header row.
+ * \param text Text to be added
+ */
inline void addHeader(const QString &text) { addHeader(QVariant(text)); }
+ /*!
+ * \brief Adds the `text_list` to the current header row.
+ * \param text_list `QStringList` to be added
+ */
void addHeader(const QStringList &text_list);
+ /*!
+ * \brief Adds `data` to the current header row.
+ * \param data Data to be added
+ */
void addHeader(const QVariant &data);
// Add data - header: model data
@@ -132,17 +200,29 @@ class Spreadsheet
void addHeader(QAbstractTableModel *model, const std::vector &column_index_list);
// Add data - prefix header
+ /*!
+ * \brief Adds a blank cell to the current prefix header row.
+ */
inline void addHeaderPrefix() { addHeaderPrefix(QVariant()); }
+ /*!
+ * \brief Adds `data` to the current prefix header row.
+ * \param data Data to be added
+ */
inline void addHeaderPrefix(const QVariant &data) { prefix_header_data_.push_back(data); }
// Debugging / diagnostics
+ /*!
+ * \brief Prints various diagnostic data to the console.
+ */
void printDiagnosticData() const;
// File details - get data
+ /*!
+ * \brief Returns the file path, file base name and file extension.
+ */
QString file();
/*!
* \brief Returns the file path and name of the output spreadsheet.
- * \return the file path and name
*/
inline QString fileName() { return file_name_; }
/*!
@@ -150,22 +230,69 @@ class Spreadsheet
* \return the file type
*/
QString fileType() const;
+ /*!
+ * \brief Returns the identifier text string located at the top left cell (i.e. Cell A1).
+ */
inline QString identifier() { return headerCell(0,0).toString().replace(" ", "_").toLower(); }
// File details - set data
+ /*!
+ * \brief Adds `suffix` to the end of the file name.
+ * \param suffix
+ */
void addFileNameSuffix(const QString &suffix);
+ /*!
+ * \brief Set the file path, name and extension from `path`.
+ * \param path
+ * \return Returns whether `path` contains any text.
+ */
bool setFile(const QString &path);
// File extensions
+ /*!
+ * \brief Returns the default file extension.
+ */
static qint32 defaultFileExtension();
+ /*!
+ * \brief Returns a list of supported file extensions.
+ * \param merged_list If `true`, the list will include ";;" separators for use as individual file filters.
+ */
static QString fileExtensionListAsString(const bool merged_list = true);
+ /*!
+ * \brief Returns a list of supported file extensions.
+ */
static QStringList fileExtensionListAsStringList();
+ /*!
+ * \brief Set the default file extension to `i`.
+ * \param i `Spreadsheet::ENUM_FILE_EXTENSIONS`
+ */
static void setDefaultFileExtension(const qint32 i);
// File I/O
+ /*!
+ * \brief Opens a file without showing a dialog window.
+ * \param file_path Folder path and file name to be opened
+ * \return whether or not the file was successfully read
+ */
bool open(const QString &file_path);
+ /*!
+ * \brief Opens a file without showing a dialog window.
+ * \param folder Folder path
+ * \param file_name File name
+ * \return whether or not the file was successfully read
+ */
bool open(const QString &folder, const QString &file_name);
+ /*!
+ * \brief Reads the current file.
+ * \return whether or not the file was successfully read
+ */
bool read();
+ /*!
+ * \brief Saves the spreadsheet to the selected folder path and file name.
+ * \param folder Folder path
+ * \param file_name File name
+ * \return whether or not the file was successfully saved
+ */
bool save(const QString &folder, const QString &file_name);
/*!
* \brief Writes/saves the spreadsheet to the output file.
@@ -174,19 +301,71 @@ class Spreadsheet
bool write();
// File I/O dialog windows
+ /*!
+ * \brief Displays a dialog window allowing the user to select a spreadsheet to open.
+ * \param file_path Initial file path to show in the dialog
+ * \param read_data `True` = read the file. `False` = do not read the file.
+ * \return whether the file was successfully read and/or selected. Returns `false` if the user has clicked `cancel`.
+ */
bool showOpenDialog(QString file_path = QString(), const bool read_data = true);
+ /*!
+ * \brief Displays a dialog window allowing the user to select a spreadsheet to open.
+ * \param path Initial file path to show in the dialog
+ * \param read_data `True` = read the file. `False` = do not read the file.
+ * \return whether the file was successfully read and/or selected. Returns `false` if the user has clicked `cancel`.
+ */
bool showOpenDialog(settings::FolderPath &path, const bool read_data = true);
+ /*!
+ * \brief Displays a dialog window allowing the user to save the spreadsheet.
+ * \param file_name Initial file name to show in the dialog
+ * \param file_path Initial file path to show in the dialog
+ * \return whether the file was successfully saved. Returns `false` if the user has clicked `cancel`.
+ */
bool showSaveDialog(const QString &file_name = "output.csv", QString file_path = QString());
+ /*!
+ * \brief Displays a dialog window allowing the user to save the spreadsheet.
+ * \param Initial file path to show in the dialog
+ * \return whether the file was successfully saved. Returns `false` if the user has clicked `cancel`.
+ */
bool showSaveDialog(settings::FolderPath &path);
// Get data - cells
+ /*!
+ * \brief Returns the data at located at `row` and `col`.
+ * \param row Row index
+ * \param col Column index
+ */
QVariant cell(const qint32 row, const qint32 col) const;
+ /*!
+ * \brief Returns the data for the chosen number of columns commencing from `row` and `col`.
+ * \param row Row index
+ * \param col First column index
+ * \param col_count Number of columns
+ */
std::span cells(const qint32 row,
const qint32 col,
const qint32 col_count) const;
+ /*!
+ * \brief Returns whether a column contains any data
+ * \param column Column index
+ */
bool columnContainsData(const qint32 column) const;
+ /*!
+ * \brief Returns the column count for the selected row.
+ * \param row Row index
+ * \return column count
+ */
qint32 columnCount(const qint32 row) const;
+ /*!
+ * \brief Returns the data of the entirety of the selected `row`.
+ * \param row Row index
+ * \return Column data
+ */
std::span row(const qint32 row) const;
+ /*!
+ * \brief Returns the data row count.
+ * \return row count
+ */
inline qint32 rowCount() const { return static_cast(cell_data_.size()); }
// Get data - prefix cells
@@ -211,17 +390,38 @@ class Spreadsheet
}
// Get settings
+ /*!
+ * \brief Returns the default file path used for exporting data.
+ */
static QString exportPath();
+ /*!
+ * \brief Returns the default file path used for importing data.
+ */
static QString importPath();
// Row data: add data
+ /*!
+ * \brief Adds a new header row.
+ */
void addNewHeaderRow();
+ /*!
+ * \brief Adds a new data row.
+ */
void addNewRow();
// Set header data
+ /*!
+ * \brief Sets the number of header rows to `header_row_count`.
+ * \param header_row_count
+ */
void setHeaderCount(const qint32 header_row_count);
// Spreadsheet file
+ /*!
+ * \brief Creates a new spreadsheet from `f` and returns a pointer to the created `ehm_dal::spreadsheet::SpreadsheetFile`.
+ * \param f Source `QFile`
+ * \return pointer to the created `ehm_dal::spreadsheet::SpreadsheetFile`
+ */
std::unique_ptr newSpreadsheet(QFile &f);
private:
@@ -231,6 +431,22 @@ class Spreadsheet
std::vector prefix_cell_data_;
std::vector prefix_header_data_;
+ // Add data - cells/rows: Private model data methods
+ void addFromTableModel(QAbstractTableModel *model,
+ const std::vector &column_index_list,
+ const Qt::ItemDataRole role = Qt::DisplayRole);
+ void addFromTableModel(QAbstractTableModel *model,
+ const qint32 row,
+ const std::vector &column_index_list,
+ const Qt::ItemDataRole role = Qt::DisplayRole);
+ void addFromTreeModel(QAbstractTableModel *model,
+ const std::vector &column_index_list,
+ const Qt::ItemDataRole role = Qt::DisplayRole);
+ void addFromTreeModel(QAbstractTableModel *model,
+ const qint32 parent_row,
+ const std::vector &column_index_list,
+ const Qt::ItemDataRole role = Qt::DisplayRole);
+
// Column data
std::vector columnList(const qint32 column_count) const;
Public Member Functions inherited from 
1.9.6 
@@ -214,8 +214,9 @@
diff --git a/docs/navtreedata.js b/docs/navtreedata.js
index aaf9a5c..1e79574 100644
--- a/docs/navtreedata.js
+++ b/docs/navtreedata.js
@@ -51,8 +51,8 @@ var NAVTREE =
var NAVTREEINDEX =
[
"annotated.html",
-"classehm__dal_1_1data__types_1_1_string.html#aff7b8837b56b12089a2f699c0ef36d03",
-"classehm__dal_1_1schema_1_1_staff_award_history.html#aaadba4b1cefd05cfb0acfabf9e026aa6"
+"classehm__dal_1_1data__types_1_1_string.html#ae5ee99dc52e9297760916fd0b7978ef0",
+"classehm__dal_1_1schema_1_1_staff_award.html#ad06a3ecd2b53843fabdafd81ed5c27e8"
];
var SYNCONMSG = 'click to disable panel synchronisation';
diff --git a/docs/navtreeindex0.js b/docs/navtreeindex0.js
index 9561f20..d555bf5 100644
--- a/docs/navtreeindex0.js
+++ b/docs/navtreeindex0.js
@@ -11,8 +11,9 @@ var NAVTREEINDEX0 =
"classehm__dal_1_1_database.html#ad9200aad9c639e6e82fbe6f7b98a7066":[2,0,0,13,6],
"classehm__dal_1_1_saved_game.html":[2,0,0,14],
"classehm__dal_1_1_saved_game.html#a08b047bbf3ecb95f8aac9e6a93044e65":[2,0,0,14,0],
-"classehm__dal_1_1_saved_game.html#a155a1f76185f19fc60cc50fbb9451582":[2,0,0,14,3],
-"classehm__dal_1_1_saved_game.html#a8b9b7d58e754b8dfc81d4989018d5dfc":[2,0,0,14,2],
+"classehm__dal_1_1_saved_game.html#a155a1f76185f19fc60cc50fbb9451582":[2,0,0,14,4],
+"classehm__dal_1_1_saved_game.html#a6e6873e437990371b3d6c493f73e12f0":[2,0,0,14,2],
+"classehm__dal_1_1_saved_game.html#a8b9b7d58e754b8dfc81d4989018d5dfc":[2,0,0,14,3],
"classehm__dal_1_1_saved_game.html#aa43dfcf7aae0a5c538b7a8ecd151eb3a":[2,0,0,14,1],
"classehm__dal_1_1column__data_1_1_affiliation_columns.html":[2,0,0,0,0],
"classehm__dal_1_1column__data_1_1_arena_columns.html":[2,0,0,0,1],
@@ -248,6 +249,5 @@ var NAVTREEINDEX0 =
"classehm__dal_1_1data__types_1_1_string.html#a8f046802f9eaea8d7d28c1739a8a58b8":[2,0,0,1,12,11],
"classehm__dal_1_1data__types_1_1_string.html#ab9b7fd6887f8e1eafa4963c8cee7c95f":[2,0,0,1,12,2],
"classehm__dal_1_1data__types_1_1_string.html#ada8a49f852b874f92ab8e7dfc132216d":[2,0,0,1,12,7],
-"classehm__dal_1_1data__types_1_1_string.html#ae40743cfaf3aa49b62ea0f99e9767558":[2,0,0,1,12,1],
-"classehm__dal_1_1data__types_1_1_string.html#ae5ee99dc52e9297760916fd0b7978ef0":[2,0,0,1,12,0]
+"classehm__dal_1_1data__types_1_1_string.html#ae40743cfaf3aa49b62ea0f99e9767558":[2,0,0,1,12,1]
};
diff --git a/docs/navtreeindex1.js b/docs/navtreeindex1.js
index df1aa24..e8ff944 100644
--- a/docs/navtreeindex1.js
+++ b/docs/navtreeindex1.js
@@ -1,5 +1,6 @@
var NAVTREEINDEX1 =
{
+"classehm__dal_1_1data__types_1_1_string.html#ae5ee99dc52e9297760916fd0b7978ef0":[2,0,0,1,12,0],
"classehm__dal_1_1data__types_1_1_string.html#aff7b8837b56b12089a2f699c0ef36d03":[2,0,0,1,12,3],
"classehm__dal_1_1data__types_1_1_weight.html":[2,0,0,1,13],
"classehm__dal_1_1data__types_1_1_year.html":[2,0,0,1,14],
@@ -34,6 +35,9 @@ var NAVTREEINDEX1 =
"classehm__dal_1_1file__io_1_1_database_file_manager.html":[2,0,0,4,1],
"classehm__dal_1_1file__io_1_1_database_file_manager.html#a8546901b3efc822af68451756f869819":[2,0,0,4,1,1],
"classehm__dal_1_1file__io_1_1_database_file_manager.html#af4de3105686b08b44e1765654b13715c":[2,0,0,4,1,0],
+"classehm__dal_1_1file__io_1_1_saved_game_file_manager.html":[2,0,0,4,2],
+"classehm__dal_1_1file__io_1_1_saved_game_file_manager.html#a1810a7ca435099e88625f2e9187406e3":[2,0,0,4,2,1],
+"classehm__dal_1_1file__io_1_1_saved_game_file_manager.html#a2a7cc73dc8c71360c5e701143ca47bdc":[2,0,0,4,2,0],
"classehm__dal_1_1flags_1_1_flag.html":[2,0,0,5,0],
"classehm__dal_1_1flags_1_1_flag_database.html":[2,0,0,5,1],
"classehm__dal_1_1flags_1_1_flag_table.html":[2,0,0,5,2],
@@ -245,9 +249,5 @@ var NAVTREEINDEX1 =
"classehm__dal_1_1schema_1_1_staff_award.html#aa66b30512dc51a1083eb7a153b1bb7c0":[2,0,0,7,33,4],
"classehm__dal_1_1schema_1_1_staff_award.html#aa94c1557938a14c898d231903a0f4d7f":[2,0,0,7,33,6],
"classehm__dal_1_1schema_1_1_staff_award.html#aac5c2ffe9420617442a46b7eabb35adc":[2,0,0,7,33,1],
-"classehm__dal_1_1schema_1_1_staff_award.html#ac75bfdc7e83096b773c95f10bbe8a0d0":[2,0,0,7,33,3],
-"classehm__dal_1_1schema_1_1_staff_award.html#ad06a3ecd2b53843fabdafd81ed5c27e8":[2,0,0,7,33,5],
-"classehm__dal_1_1schema_1_1_staff_award_history.html":[2,0,0,7,34],
-"classehm__dal_1_1schema_1_1_staff_award_history.html#a74fe4204d24d52fa6aad421ba58ff07c":[2,0,0,7,34,0],
-"classehm__dal_1_1schema_1_1_staff_award_history.html#a95104a583a3c435380e23658bc91f729":[2,0,0,7,34,2]
+"classehm__dal_1_1schema_1_1_staff_award.html#ac75bfdc7e83096b773c95f10bbe8a0d0":[2,0,0,7,33,3]
};
diff --git a/docs/navtreeindex2.js b/docs/navtreeindex2.js
index 135d394..11793d6 100644
--- a/docs/navtreeindex2.js
+++ b/docs/navtreeindex2.js
@@ -1,5 +1,9 @@
var NAVTREEINDEX2 =
{
+"classehm__dal_1_1schema_1_1_staff_award.html#ad06a3ecd2b53843fabdafd81ed5c27e8":[2,0,0,7,33,5],
+"classehm__dal_1_1schema_1_1_staff_award_history.html":[2,0,0,7,34],
+"classehm__dal_1_1schema_1_1_staff_award_history.html#a74fe4204d24d52fa6aad421ba58ff07c":[2,0,0,7,34,0],
+"classehm__dal_1_1schema_1_1_staff_award_history.html#a95104a583a3c435380e23658bc91f729":[2,0,0,7,34,2],
"classehm__dal_1_1schema_1_1_staff_award_history.html#aaadba4b1cefd05cfb0acfabf9e026aa6":[2,0,0,7,34,4],
"classehm__dal_1_1schema_1_1_staff_award_history.html#ac6840f6cbaeb84b372c106126832a71b":[2,0,0,7,34,1],
"classehm__dal_1_1schema_1_1_staff_award_history.html#ae3bc352f5ecefdb5da831c90d817a2a7":[2,0,0,7,34,3],
@@ -33,19 +37,60 @@ var NAVTREEINDEX2 =
"classehm__dal_1_1settings_1_1_folder_path.html":[2,0,0,8,0],
"classehm__dal_1_1settings_1_1_settings.html":[2,0,0,8,1],
"classehm__dal_1_1spreadsheet_1_1_spreadsheet.html":[2,0,0,9,0],
+"classehm__dal_1_1spreadsheet_1_1_spreadsheet.html#a09c399aab7c9b758f8541b4a34ad17ba":[2,0,0,9,0,44],
+"classehm__dal_1_1spreadsheet_1_1_spreadsheet.html#a108b8f50b8d53d0984acc6b1c2ddee5e":[2,0,0,9,0,26],
"classehm__dal_1_1spreadsheet_1_1_spreadsheet.html#a1870a89ddfadf6fee555eace128e2608":[2,0,0,9,0,0],
-"classehm__dal_1_1spreadsheet_1_1_spreadsheet.html#a32450ee50742a818911d377084f39d41":[2,0,0,9,0,10],
-"classehm__dal_1_1spreadsheet_1_1_spreadsheet.html#a38faa238bc3faba8ed3ced0bfbed7b28":[2,0,0,9,0,6],
+"classehm__dal_1_1spreadsheet_1_1_spreadsheet.html#a18abaf99132780f43677db73e76540dd":[2,0,0,9,0,21],
+"classehm__dal_1_1spreadsheet_1_1_spreadsheet.html#a190763b9b2567897283382994f041c95":[2,0,0,9,0,15],
+"classehm__dal_1_1spreadsheet_1_1_spreadsheet.html#a1bcf058f06086df9f9785aa8e6123104":[2,0,0,9,0,36],
+"classehm__dal_1_1spreadsheet_1_1_spreadsheet.html#a25c16bb23cca09f307dee41fe737305c":[2,0,0,9,0,31],
+"classehm__dal_1_1spreadsheet_1_1_spreadsheet.html#a32450ee50742a818911d377084f39d41":[2,0,0,9,0,34],
+"classehm__dal_1_1spreadsheet_1_1_spreadsheet.html#a33e87ac5adcdbc82103ba6a3f612c86c":[2,0,0,9,0,5],
+"classehm__dal_1_1spreadsheet_1_1_spreadsheet.html#a34dda677bc080c30db6c9b4489447715":[2,0,0,9,0,51],
+"classehm__dal_1_1spreadsheet_1_1_spreadsheet.html#a37a871b8ad1b0bb89a5f2dde41ac83a6":[2,0,0,9,0,25],
+"classehm__dal_1_1spreadsheet_1_1_spreadsheet.html#a38faa238bc3faba8ed3ced0bfbed7b28":[2,0,0,9,0,10],
+"classehm__dal_1_1spreadsheet_1_1_spreadsheet.html#a45f06f79bd6509a1efd1cbc9d6133429":[2,0,0,9,0,46],
+"classehm__dal_1_1spreadsheet_1_1_spreadsheet.html#a47c4f3ee618a3b541997ffad7d09af40":[2,0,0,9,0,20],
+"classehm__dal_1_1spreadsheet_1_1_spreadsheet.html#a4ab3046be7e56645c29d8f896c8c7c41":[2,0,0,9,0,28],
"classehm__dal_1_1spreadsheet_1_1_spreadsheet.html#a562521337a397e1b7624fd97745fb427":[2,0,0,9,0,2],
-"classehm__dal_1_1spreadsheet_1_1_spreadsheet.html#a8b201abb1ce19173990ec5bf271f4fe4":[2,0,0,9,0,5],
-"classehm__dal_1_1spreadsheet_1_1_spreadsheet.html#a8f7852ef9508075a338b9d1c546b463f":[2,0,0,9,0,12],
-"classehm__dal_1_1spreadsheet_1_1_spreadsheet.html#a9d00960e4b442ec89ab06ffa95670060":[2,0,0,9,0,7],
+"classehm__dal_1_1spreadsheet_1_1_spreadsheet.html#a59a0b37b9fce42b949974519eba1cc65":[2,0,0,9,0,33],
+"classehm__dal_1_1spreadsheet_1_1_spreadsheet.html#a656f8750a70ef9672ac62000cdb229ff":[2,0,0,9,0,24],
+"classehm__dal_1_1spreadsheet_1_1_spreadsheet.html#a6877aa5c090853ab977b5e346f0e377d":[2,0,0,9,0,52],
+"classehm__dal_1_1spreadsheet_1_1_spreadsheet.html#a6a2d33ec32e82dbeb70f06e18addfa95":[2,0,0,9,0,23],
+"classehm__dal_1_1spreadsheet_1_1_spreadsheet.html#a6f976d76532f0eb547ab4e440a306f15":[2,0,0,9,0,45],
+"classehm__dal_1_1spreadsheet_1_1_spreadsheet.html#a74c8abd84600dd606738ec251358dbba":[2,0,0,9,0,42],
+"classehm__dal_1_1spreadsheet_1_1_spreadsheet.html#a74cbcb0934ea4c674a03658832651a4f":[2,0,0,9,0,27],
+"classehm__dal_1_1spreadsheet_1_1_spreadsheet.html#a766f09738864d07bc49fdc662991ee26":[2,0,0,9,0,32],
+"classehm__dal_1_1spreadsheet_1_1_spreadsheet.html#a775a493ff6b72a72ff231a17e03e11cc":[2,0,0,9,0,49],
+"classehm__dal_1_1spreadsheet_1_1_spreadsheet.html#a7826eeae47dd16ff2a43bd419d7ded8e":[2,0,0,9,0,37],
+"classehm__dal_1_1spreadsheet_1_1_spreadsheet.html#a7da6ad9c555a6325f46bf5cee2bd8829":[2,0,0,9,0,13],
+"classehm__dal_1_1spreadsheet_1_1_spreadsheet.html#a88b4203ec0d5c202a98e12aef1ede281":[2,0,0,9,0,47],
+"classehm__dal_1_1spreadsheet_1_1_spreadsheet.html#a8b201abb1ce19173990ec5bf271f4fe4":[2,0,0,9,0,9],
+"classehm__dal_1_1spreadsheet_1_1_spreadsheet.html#a8f7852ef9508075a338b9d1c546b463f":[2,0,0,9,0,53],
+"classehm__dal_1_1spreadsheet_1_1_spreadsheet.html#a95e7e52a13395c4232acbe036da57df2":[2,0,0,9,0,48],
+"classehm__dal_1_1spreadsheet_1_1_spreadsheet.html#a9c7a640b16a389b19b1c891c9f3d2e95":[2,0,0,9,0,6],
+"classehm__dal_1_1spreadsheet_1_1_spreadsheet.html#a9d00960e4b442ec89ab06ffa95670060":[2,0,0,9,0,11],
+"classehm__dal_1_1spreadsheet_1_1_spreadsheet.html#aa29d87c626c65fc6053dac21b31c401f":[2,0,0,9,0,14],
+"classehm__dal_1_1spreadsheet_1_1_spreadsheet.html#aa43792574fe22a3944bf6558cec81fa5":[2,0,0,9,0,29],
"classehm__dal_1_1spreadsheet_1_1_spreadsheet.html#aa646b53c2f39a7c593f94bec7d2e74b7":[2,0,0,9,0,3],
-"classehm__dal_1_1spreadsheet_1_1_spreadsheet.html#ab02261471052d0c5bb5db89b270caabd":[2,0,0,9,0,4],
-"classehm__dal_1_1spreadsheet_1_1_spreadsheet.html#abbe567a20cacd1b736b47f6b81c59e27":[2,0,0,9,0,8],
-"classehm__dal_1_1spreadsheet_1_1_spreadsheet.html#abed045a1087d3f474cf535eb41b4de7d":[2,0,0,9,0,9],
+"classehm__dal_1_1spreadsheet_1_1_spreadsheet.html#aaf816e56b59790686f0f03f5faa84d5a":[2,0,0,9,0,43],
+"classehm__dal_1_1spreadsheet_1_1_spreadsheet.html#ab02261471052d0c5bb5db89b270caabd":[2,0,0,9,0,8],
+"classehm__dal_1_1spreadsheet_1_1_spreadsheet.html#abbe567a20cacd1b736b47f6b81c59e27":[2,0,0,9,0,17],
+"classehm__dal_1_1spreadsheet_1_1_spreadsheet.html#abed045a1087d3f474cf535eb41b4de7d":[2,0,0,9,0,18],
+"classehm__dal_1_1spreadsheet_1_1_spreadsheet.html#abf2158dbb4aef3d3cf57541d919c030f":[2,0,0,9,0,38],
+"classehm__dal_1_1spreadsheet_1_1_spreadsheet.html#abf4bdbc536f7cdbe8b4903584a85d7a4":[2,0,0,9,0,22],
+"classehm__dal_1_1spreadsheet_1_1_spreadsheet.html#ac49f7333ff8aed23c82cac7c6107df31":[2,0,0,9,0,19],
+"classehm__dal_1_1spreadsheet_1_1_spreadsheet.html#acc7007fc094de7a45e327be4367ad1ab":[2,0,0,9,0,41],
+"classehm__dal_1_1spreadsheet_1_1_spreadsheet.html#ad0197013e0b271d5bb7c93e2564e1989":[2,0,0,9,0,40],
+"classehm__dal_1_1spreadsheet_1_1_spreadsheet.html#ad3ec8823d95deeea1fc00b5f01523979":[2,0,0,9,0,30],
+"classehm__dal_1_1spreadsheet_1_1_spreadsheet.html#ad6183f01d6260a1aa034af0072f0c412":[2,0,0,9,0,12],
+"classehm__dal_1_1spreadsheet_1_1_spreadsheet.html#ad6225201da43f876ab534ac46ccc460e":[2,0,0,9,0,4],
"classehm__dal_1_1spreadsheet_1_1_spreadsheet.html#ad654fe9d88b43b04c971a78f6a59d26a":[2,0,0,9,0,1],
-"classehm__dal_1_1spreadsheet_1_1_spreadsheet.html#aedb4a30f7cb4ab627d606f1a44f26779":[2,0,0,9,0,11],
+"classehm__dal_1_1spreadsheet_1_1_spreadsheet.html#ad7d14dc9e62032120f1fcb7b4ab46b65":[2,0,0,9,0,7],
+"classehm__dal_1_1spreadsheet_1_1_spreadsheet.html#aedb3e27e7b1d22440660a559223047f8":[2,0,0,9,0,50],
+"classehm__dal_1_1spreadsheet_1_1_spreadsheet.html#aedb4a30f7cb4ab627d606f1a44f26779":[2,0,0,9,0,35],
+"classehm__dal_1_1spreadsheet_1_1_spreadsheet.html#af386628bfcc5f24009c3068680170948":[2,0,0,9,0,39],
+"classehm__dal_1_1spreadsheet_1_1_spreadsheet.html#afa0ded0494eca327f993a3b548625e51":[2,0,0,9,0,16],
"classehm__dal_1_1spreadsheet_1_1_spreadsheet_file.html":[2,0,0,9,1],
"classehm__dal_1_1spreadsheet_1_1_spreadsheet_file_csv.html":[2,0,0,9,2],
"classehm__dal_1_1spreadsheet_1_1_spreadsheet_file_xlsx.html":[2,0,0,9,3],
@@ -93,16 +138,16 @@ var NAVTREEINDEX2 =
"conceptehm__dal_1_1schema_1_1_integral_number.html":[1,0,1,0],
"conceptehm__dal_1_1tables_1_1_column_data.html":[1,0,2,0],
"concepts.html":[1],
-"functions.html":[2,3,0],
"functions.html":[2,3,0,0],
+"functions.html":[2,3,0],
"functions_c.html":[2,3,0,1],
"functions_d.html":[2,3,0,2],
"functions_e.html":[2,3,0,3],
"functions_enum.html":[2,3,2],
"functions_eval.html":[2,3,3],
"functions_f.html":[2,3,0,4],
-"functions_func.html":[2,3,1],
"functions_func.html":[2,3,1,0],
+"functions_func.html":[2,3,1],
"functions_func_c.html":[2,3,1,1],
"functions_func_d.html":[2,3,1,2],
"functions_func_e.html":[2,3,1,3],
diff --git a/docs/saved__game_8h_source.html b/docs/saved__game_8h_source.html
index d7b7a2a..4423700 100644
--- a/docs/saved__game_8h_source.html
+++ b/docs/saved__game_8h_source.html
@@ -113,25 +113,29 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
-
+
+
+
+
+
+
+