From c6f648cfb49372508fc4f2c6281d7752074397d7 Mon Sep 17 00:00:00 2001 From: Loic Guegan Date: Fri, 25 Feb 2022 11:42:46 +0100 Subject: Improve pgn save performance --- src/game_tab/Game.cpp | 6 ++++++ src/game_tab/Game.hpp | 1 + src/game_tab/GameTab.cpp | 1 + src/game_tab/HalfMove.cpp | 39 +++++++++++++++++++++++++-------------- src/game_tab/HalfMove.hpp | 6 ++++-- 5 files changed, 37 insertions(+), 16 deletions(-) (limited to 'src/game_tab') diff --git a/src/game_tab/Game.cpp b/src/game_tab/Game.cpp index 2b2955a..dab67b8 100644 --- a/src/game_tab/Game.cpp +++ b/src/game_tab/Game.cpp @@ -144,3 +144,9 @@ std::string Game::GetPGN() { } void Game::SetResult(std::string result) { this->result = result; } + +void Game::BuildAndVerify() { + if (moves != NULL) { + moves->BuildAndVerify(GetFen()); + } +} diff --git a/src/game_tab/Game.hpp b/src/game_tab/Game.hpp index 348bff9..37b6f77 100644 --- a/src/game_tab/Game.hpp +++ b/src/game_tab/Game.hpp @@ -37,4 +37,5 @@ public: std::vector ListTags(); std::string GetPGN(); void SetResult(std::string result); + void BuildAndVerify(); }; \ No newline at end of file diff --git a/src/game_tab/GameTab.cpp b/src/game_tab/GameTab.cpp index 3e32b4e..5a3e6b8 100644 --- a/src/game_tab/GameTab.cpp +++ b/src/game_tab/GameTab.cpp @@ -10,6 +10,7 @@ GameTab::GameTab(wxFrame *parent, Game *game) splitter->SetMinimumPaneSize(100); // Panels + game->BuildAndVerify(); board_panel = new BoardPanel((wxFrame *)splitter, game); editor_panel = new EditorPanel((wxFrame *)splitter, game); splitter->SplitVertically(board_panel, editor_panel); diff --git a/src/game_tab/HalfMove.cpp b/src/game_tab/HalfMove.cpp index 2b84382..f43b7f2 100644 --- a/src/game_tab/HalfMove.cpp +++ b/src/game_tab/HalfMove.cpp @@ -115,27 +115,16 @@ void HalfMove::SetAsMainline() { HalfMove *HalfMove::GetMainline() { return (mainline); } -HalfMove::HalfMove(pgnp::HalfMove *m, std::string initial_fen) : capture(' ') { - chessarbiter::ChessArbiter arbiter; - arbiter.Setup(initial_fen); - bool work = arbiter.Play(arbiter.ParseSAN(m->move)); - if (!work) { - wxLogDebug("Bug! %s", m->move); - } - char capture = arbiter.GetCapture(); - if (capture != ' ') { - this->capture = capture; - } - this->fen = arbiter.GetFEN(); +HalfMove::HalfMove(pgnp::HalfMove *m) : capture(' ') { this->move = m->move; this->IsBlack = m->isBlack; this->SetComment(m->comment); this->Number = m->count; if (m->MainLine != NULL) { - this->SetMainline(new HalfMove(m->MainLine, arbiter.GetFEN())); + this->SetMainline(new HalfMove(m->MainLine)); } for (pgnp::HalfMove *v : m->variations) { - this->AddVariation(new HalfMove(v, initial_fen)); + this->AddVariation(new HalfMove(v)); } } @@ -216,3 +205,25 @@ std::string HalfMove::GetPGN(bool needDots) { return (part); } + +void HalfMove::BuildAndVerify(HalfMove *m, std::string fen) { + arbiter.Setup(fen); + bool work = arbiter.Play(arbiter.ParseSAN(m->move)); + if (!work) { + wxLogDebug("Bug! %s", m->move); + } + char capture = arbiter.GetCapture(); + if (capture != ' ') { + m->capture = capture; + } + m->fen = arbiter.GetFEN(); + if (m->mainline != NULL) { + BuildAndVerify(m->mainline, arbiter.GetFEN()); + } + for (HalfMove *v : m->variations) { + BuildAndVerify(v,fen); + } +} +void HalfMove::BuildAndVerify(std::string initial_fen) { + BuildAndVerify(this, initial_fen); +} \ No newline at end of file diff --git a/src/game_tab/HalfMove.hpp b/src/game_tab/HalfMove.hpp index c8ef8c0..07be4d0 100644 --- a/src/game_tab/HalfMove.hpp +++ b/src/game_tab/HalfMove.hpp @@ -16,15 +16,17 @@ class HalfMove : public cgeditor::CGEHalfMove { HalfMove *parent = NULL; HalfMove *mainline = NULL; + chessarbiter::ChessArbiter arbiter; std::vector variations; std::string fen; char capture; std::string GetPGN(bool needDots); + void BuildAndVerify(HalfMove *m, std::string fen); public: HalfMove(std::string move); HalfMove(std::string move, std::string fen); - HalfMove(pgnp::HalfMove *m, std::string initial_fen); + HalfMove(pgnp::HalfMove *m); ~HalfMove(); /// @brief Add variation to current move @@ -53,5 +55,5 @@ public: void SetFen(std::string fen); void SetCapture(char c); std::string GetPGN(); + void BuildAndVerify(std::string initial_fen); }; - -- cgit v1.2.3