Skip to content

Commit 62c3e8c

Browse files
ldraconusldraconus
committed
Adding code for saving and loading multiple characters
1 parent 8aa7a6f commit 62c3e8c

7 files changed

+80
-24
lines changed

‎HSC.pro

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ QT += core gui xml printsupport
22

33
greaterThan(QT_MAJOR_VERSION, 4): QT += widgets
44

5-
CONFIG += c++20
5+
CONFIG += c++21
66

77
RC_ICONS = HeroSystem.ico
88

‎HSC.pro.user

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<!DOCTYPE QtCreatorProject>
3-
<!-- Written by QtCreator 9.0.84, 2023-03-27T15:25:31. -->
3+
<!-- Written by QtCreator 9.0.84, 2023-03-27T18:26:40. -->
44
<qtcreator>
55
<data>
66
<variable>EnvironmentId</variable>
@@ -90,7 +90,7 @@
9090
<value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Desktop Qt 6.6.0 MSVC2019 64bit</value>
9191
<value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName">Desktop Qt 6.6.0 MSVC2019 64bit</value>
9292
<value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">qt.qt6.dev.win64_msvc2019_64_kit</value>
93-
<value type="qlonglong" key="ProjectExplorer.Target.ActiveBuildConfiguration">3</value>
93+
<value type="qlonglong" key="ProjectExplorer.Target.ActiveBuildConfiguration">1</value>
9494
<value type="qlonglong" key="ProjectExplorer.Target.ActiveDeployConfiguration">0</value>
9595
<value type="qlonglong" key="ProjectExplorer.Target.ActiveRunConfiguration">0</value>
9696
<valuemap type="QVariantMap" key="ProjectExplorer.Target.BuildConfiguration.0">
@@ -337,7 +337,7 @@
337337
<value type="bool" key="RunConfiguration.UseLibrarySearchPath">true</value>
338338
<value type="bool" key="RunConfiguration.UseQmlDebugger">false</value>
339339
<value type="bool" key="RunConfiguration.UseQmlDebuggerAuto">true</value>
340-
<value type="QString" key="RunConfiguration.WorkingDirectory.default">C:/Users/chris/Documents/QtSource/HSC/build-HSC-Desktop_Qt_6_6_0_MSVC2019_64bit-Install</value>
340+
<value type="QString" key="RunConfiguration.WorkingDirectory.default">C:/Users/chris/Documents/QtSource/HSC/build-HSC-Desktop_Qt_6_6_0_MSVC2019_64bit-Release</value>
341341
</valuemap>
342342
<value type="qlonglong" key="ProjectExplorer.Target.RunConfigurationCount">1</value>
343343
</valuemap>

‎mainwindow.cpp

+58-15
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@
1414
#include <QKeyEvent>
1515
#include <QMessageBox>
1616
#include <QScrollArea>
17+
#include <QStandardPaths>
1718
#include <QToolBar>
1819
#include <QVBoxLayout>
1920

@@ -65,6 +66,7 @@ static QString replace(QString str, QString var, QString val) {
6566
class hscChar: public Char {
6667
private:
6768
hscCharacter character;
69+
QString _path;
6870

6971
void capture(int, QDomNode);
7072
void captureAttr(int, QDomAttr);
@@ -112,12 +114,13 @@ class hscChar: public Char {
112114

113115

114116
public:
115-
int getPrimary(const QString& s) { return character.getPrimary(s); }
116-
int getPrimaryResistant(const QString s) { return character.getPrimaryResistant(s); }
117-
int getSecondary(const QString& s) { return character.getSecondary(s); }
118-
int getSecondaryResistant(const QString s) { return character.getSecondaryResistant(s); }
119-
QByteArray image() { return character.image.image; }
120-
QString name() { return character.characterInfo.characterName; }
117+
int getPrimary(const QString& s) { return character.getPrimary(s); }
118+
int getPrimaryResistant(const QString s) { return character.getPrimaryResistant(s); }
119+
int getSecondary(const QString& s) { return character.getSecondary(s); }
120+
int getSecondaryResistant(const QString s) { return character.getSecondaryResistant(s); }
121+
QByteArray image() { return character.image.image; }
122+
QString name() { return character.characterInfo.characterName; }
123+
QString path() { return _path; }
121124

122125
QStringList disadvantages() {
123126
QStringList disad;
@@ -135,6 +138,7 @@ class hscChar: public Char {
135138
}
136139

137140
void load(QString f) {
141+
_path = f;
138142
QDomDocument chr(f);
139143
QFile file(f);
140144
if (!file.open(QIODevice::ReadOnly)) return;
@@ -240,6 +244,7 @@ class hscChar: public Char {
240244
class hsccuChar: public Char {
241245
private:
242246
Character character;
247+
QString _path;
243248
Option opt;
244249

245250
int str2idx(QString s) {
@@ -250,8 +255,9 @@ class hsccuChar: public Char {
250255
}
251256

252257
public:
253-
QByteArray image() { return character.imageData(); }
254-
QString name() { return character.characterName(); }
258+
QByteArray image() { return character.imageData(); }
259+
QString name() { return character.characterName(); }
260+
QString path() { return _path; }
255261

256262
QStringList disadvantages() {
257263
QStringList disad;
@@ -286,6 +292,7 @@ class hsccuChar: public Char {
286292
}
287293

288294
void load(QString f) {
295+
_path = f;
289296
character.load(opt, f);
290297
rebuildCharacter(character);
291298
}
@@ -525,8 +532,13 @@ MainWindow::MainWindow(QWidget *parent)
525532

526533
ref = this;
527534

535+
_dir = QStandardPaths::writableLocation(QStandardPaths::DocumentsLocation);
536+
528537
QAction* newAction = new QAction("New");
529538
QAction* loadAction = new QAction("Open");
539+
#ifndef __wasm__
540+
QAction* saveAction = new QAction("Save");
541+
#endif
530542
QAction* removeAction = new QAction("Delete");
531543
QAction* startAction = new QAction("Start");
532544
QAction* nextAction = new QAction("Next");
@@ -535,6 +547,9 @@ MainWindow::MainWindow(QWidget *parent)
535547

536548
ui->toolBar->addAction(newAction);
537549
ui->toolBar->addAction(loadAction);
550+
#ifndef __wasm__
551+
ui->toolBar->addAction(saveAction);
552+
#endif
538553
ui->toolBar->addAction(removeAction);
539554
ui->toolBar->addAction(startAction);
540555
ui->toolBar->addAction(nextAction);
@@ -543,6 +558,9 @@ MainWindow::MainWindow(QWidget *parent)
543558

544559
connect(newAction, SIGNAL(triggered()), this, SLOT(doNew()));
545560
connect(loadAction, SIGNAL(triggered()), this, SLOT(load()));
561+
#ifndef __wasm__
562+
connect(saveAction, SIGNAL(triggered()), this, SLOT(save()));
563+
#endif
546564
connect(removeAction, SIGNAL(triggered()), this, SLOT(remove()));
547565
connect(startAction, SIGNAL(triggered()), this, SLOT(start()));
548566
connect(nextAction, SIGNAL(triggered()), this, SLOT(next()));
@@ -1363,13 +1381,7 @@ void MainWindow::itemSelected() {
13631381
displayCharacter(name);
13641382
}
13651383

1366-
void MainWindow::load() {
1367-
QString filename = QFileDialog::getOpenFileName(nullptr, tr("Import Character file"), QString(), tr("Hero System Characters (*.hdc *.hsccu)"));
1368-
if (filename.isEmpty()) return;
1369-
1370-
std::shared_ptr<Char> character;
1371-
if (filename.endsWith(".hsc")) character = make_shared<hscChar>();
1372-
else character = make_shared<hsccuChar>();
1384+
void MainWindow::load(std::shared_ptr<Char>& character, QString filename) {
13731385
character->load(filename);
13741386

13751387
QString name = character->name();
@@ -1380,6 +1392,27 @@ void MainWindow::load() {
13801392
displayCharacter(name);
13811393
}
13821394

1395+
void MainWindow::load() {
1396+
#ifdef __wasm__
1397+
QString filename = QFileDialog::getOpenFileName(this, tr("Import Character file"), QString(), tr("Hero System Characters (*.hdc *.hsccu)"));
1398+
if (filename.isEmpty()) return;
1399+
#else
1400+
QStringList files = QFileDialog::getOpenFileNames(this, "Import Character file(s)", _dir, "Hero System Character(s) (*.hdc *.hsccu *.hsc)");
1401+
if (files.isEmpty()) return;
1402+
for (const auto& filename: files) {
1403+
#endif
1404+
std::shared_ptr<Char> character;
1405+
if (filename.endsWith(".hdc")) character = make_shared<hscChar>();
1406+
else if (filename.endsWith(".hsscu")) character = make_shared<hsccuChar>();
1407+
else {
1408+
continue;
1409+
}
1410+
load(character, filename);
1411+
#ifndef __wasm__
1412+
}
1413+
#endif
1414+
}
1415+
13831416
void MainWindow::next() {
13841417
if (_characters.isEmpty()) {
13851418
OK("You need to load some characters\nbefore combat can continue!", "Whoops!");
@@ -1425,6 +1458,16 @@ void MainWindow::remove() {
14251458
removeChart(character);
14261459
}
14271460

1461+
#ifndef __wasm__
1462+
void MainWindow::save() {
1463+
// get a save file from the user
1464+
// go through all of the characters:
1465+
// write the path for characters that have a non-empty one
1466+
// else write the simple character to the save-file
1467+
// success!!
1468+
}
1469+
#endif
1470+
14281471
void MainWindow::setup() {
14291472
_font = ui->BODYLabel->font().pointSize();
14301473
SetupDialog dlg(_font);

‎mainwindow.h

+6
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@ class Char {
2121
virtual int getSecondaryResistant(const QString s) = 0;
2222
virtual QByteArray image() = 0;
2323
virtual void load(QString) = 0;
24+
virtual QString path() = 0;
2425
virtual QStringList martialArts() = 0;
2526
virtual QString name() = 0;
2627
virtual QStringList perks() = 0;
@@ -68,6 +69,7 @@ class MainWindow : public QMainWindow
6869
void updateTalents(std::shared_ptr<Char>&);
6970

7071
void keyReleaseEvent(QKeyEvent* e) override;
72+
void load(std::shared_ptr<Char>&, QString);
7173

7274
public slots:
7375
void delay();
@@ -76,11 +78,15 @@ public slots:
7678
void load();
7779
void next();
7880
void remove();
81+
#ifndef __wasm__
82+
void save();
83+
#endif
7984
void setup();
8085
void start();
8186

8287
private:
8388
Ui::MainWindow *ui;
89+
QString _dir;
8490

8591
QRect _ok { -1, -1, 0, 0 };
8692
QRect _okcancel { -1, -1, 0, 0 };

‎setupdialog.h

+1
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@ class SetupDialog : public QDialog
1616
~SetupDialog();
1717

1818
int size();
19+
1920
private:
2021
Ui::SetupDialog *ui;
2122
};

‎simpledialog.cpp

+8-5
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,7 @@ class simpleChar: public Char {
3030
virtual QStringList powers() { return empty; }
3131
virtual QStringList skills() { return empty; }
3232
virtual QStringList talents() { return empty; }
33+
virtual QString path() { return ""; }
3334

3435
virtual int getPrimary(const QString& s) {
3536
if (s == "DCV") return dcv;
@@ -48,7 +49,7 @@ class simpleChar: public Char {
4849
return 0;
4950
};
5051
virtual void load(QString s) {
51-
QStringList data = s.split('\t');
52+
QStringList data = s.split(',');
5253
charName = data[0];
5354
dcv = data[1].toInt();
5455
dex = data[2].toInt();
@@ -80,10 +81,10 @@ SimpleDialog::~SimpleDialog()
8081
void SimpleDialog::ok() {
8182
std::shared_ptr<Char> character;
8283
character = std::make_shared<simpleChar>();
83-
QString description = ui->name->text() + "\t" + ui->dcv->text() + "\t" + ui->dex->text() + "\t" +
84-
ui->dmcv->text() + "\t" + ui->ed->text() + "\t" + ui->ocv->text() + "\t" +
85-
ui->omcv->text() + "\t" + ui->pd->text() + "\t" + ui->rEd->text() + "\t" +
86-
ui->rPd->text() + "\t" + ui->spd->text();
84+
QString description = ui->name->text() + "," + ui->dcv->text() + "," + ui->dex->text() + "," +
85+
ui->dmcv->text() + "," + ui->ed->text() + "," + ui->ocv->text() + "," +
86+
ui->omcv->text() + "," + ui->pd->text() + "," + ui->rEd->text() + "," +
87+
ui->rPd->text() + "," + ui->spd->text();
8788
character->load(description);
8889

8990
QString name = character->name();
@@ -94,3 +95,5 @@ void SimpleDialog::ok() {
9495
MainWindow::ref->updateChart(character);
9596
MainWindow::ref->displayCharacter(name);
9697
}
98+
99+
std::shared_ptr<class Char> Sinpleload(QJsonObject&);

‎simpledialog.h

+3
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22
#define SIMPLEDIALOG_H
33

44
#include <QDialog>
5+
#include <QJsonObject>
56

67
namespace Ui {
78
class SimpleDialog;
@@ -15,6 +16,8 @@ class SimpleDialog : public QDialog
1516
explicit SimpleDialog(QWidget *parent = nullptr);
1617
~SimpleDialog();
1718

19+
static std::shared_ptr<class Char> load(QJsonObject&);
20+
1821
private:
1922
Ui::SimpleDialog *ui;
2023

0 commit comments

Comments
 (0)