From 679c735596168228ad0df4e42a3768c61c809a40 Mon Sep 17 00:00:00 2001 From: Loic Guegan Date: Sun, 1 Jan 2023 14:12:57 +0100 Subject: Improve game tab --- src/game_tab/right_panel/GameTabRightPanel.cpp | 54 +------------------------- 1 file changed, 1 insertion(+), 53 deletions(-) (limited to 'src/game_tab/right_panel/GameTabRightPanel.cpp') diff --git a/src/game_tab/right_panel/GameTabRightPanel.cpp b/src/game_tab/right_panel/GameTabRightPanel.cpp index c88202b..3a46f59 100644 --- a/src/game_tab/right_panel/GameTabRightPanel.cpp +++ b/src/game_tab/right_panel/GameTabRightPanel.cpp @@ -10,7 +10,7 @@ wxDEFINE_EVENT(NEXT_MOVE_EVENT, wxCommandEvent); GameTabRightPanel::GameTabRightPanel(wxFrame *parent, std::shared_ptr game) : TabGameRightPanel(parent), game(game), selected_item(-1), live_engine(nullptr) { - editor_canvas = new EditorCanvas((wxFrame *)editor_page); + editor_canvas = new EditorCanvas((wxFrame *)editor_page,game); editor_canvas_sizer->Add(editor_canvas, 1, wxEXPAND); tags_list->InsertColumn(0, L"Name", wxLIST_FORMAT_LEFT, 200); tags_list->InsertColumn(1, L"Value", wxLIST_FORMAT_LEFT, 500); @@ -22,16 +22,6 @@ GameTabRightPanel::GameTabRightPanel(wxFrame *parent, std::shared_ptr game // Bind events this->Bind(wxEVT_TEXT, &GameTabRightPanel::OnCommentChange, this, COMMENT_INPUT_BOX); - this->Bind(GOTO_MOVE_EVENT, &GameTabRightPanel::OnGotoMove, this, wxID_ANY); - this->Bind(DELETE_MOVE_EVENT, &GameTabRightPanel::OnMoveDelete, this, - wxID_ANY); - this->Bind(PROMOTE_MOVE_EVENT, &GameTabRightPanel::OnMovePromote, this, - wxID_ANY); - this->Bind(SET_AS_MAINLINE_EVENT, &GameTabRightPanel::OnMoveSetAsMainline, - this, wxID_ANY); - /*this->Bind(NEXT_MOVE_EVENT, &GameTabRightPanel::OnNextMove, this, wxID_ANY); - this->Bind(PREVIOUS_MOVE_EVENT, &GameTabRightPanel::OnPreviousMove, this, - wxID_ANY);*/ this->Bind(wxEVT_LIST_ITEM_SELECTED, &GameTabRightPanel::OnTagSelected, this, wxID_ANY); this->Bind(wxEVT_LIST_ITEM_DESELECTED, &GameTabRightPanel::OnTagDeselected, @@ -90,12 +80,6 @@ void GameTabRightPanel::OnTagDeselected(wxListEvent &event) { delete_button->Enable(false); } -void GameTabRightPanel::NotifyBoard() { - wxCommandEvent previousEvent(GAME_CHANGE, GetId()); - previousEvent.SetEventObject(this); - ProcessEvent(previousEvent); -} - void GameTabRightPanel::OnLiveEngineClose(wxCloseEvent &e) { live_engine = nullptr; e.Skip(); @@ -143,29 +127,6 @@ void GameTabRightPanel::OnDelete(wxCommandEvent &event) { } } -void GameTabRightPanel::OnGotoMove(wxCommandEvent &event) { - wxLogDebug("GameTabRightPanel: received GOTO_MOVE_EVENT"); - game->SetCurrent((HalfMove *)event.GetClientData()); - Notify(); -} - -void GameTabRightPanel::OnMoveDelete(wxCommandEvent &event) { - game->DeleteMove((HalfMove *)event.GetClientData()); - Notify(); -} - -void GameTabRightPanel::OnMovePromote(wxCommandEvent &event) { - wxLogDebug("GameTabRightPanel: promote move called"); - game->PromoteMove((HalfMove *)event.GetClientData()); - Notify(); -} - -void GameTabRightPanel::OnMoveSetAsMainline(wxCommandEvent &event) { - wxLogDebug("GameTabRightPanel: set move as mainline called"); - game->SetMoveAsMainline((HalfMove *)event.GetClientData()); - Notify(); -} - void GameTabRightPanel::Notify() { HalfMove *m = game->GetCurrentMove(); if (m != nullptr) { @@ -177,7 +138,6 @@ void GameTabRightPanel::Notify() { if (live_engine != nullptr) { live_engine->SetFEN(game->GetFen()); } - NotifyBoard(); } void GameTabRightPanel::ApplyPreferences() { @@ -206,18 +166,6 @@ void GameTabRightPanel::RefreshTagsList() { } } -void GameTabRightPanel::OnPreviousMove(wxCommandEvent &event) { - game->Previous(); - Notify(); - NotifyBoard(); -} - -void GameTabRightPanel::OnNextMove(wxCommandEvent &event) { - game->Next(); - Notify(); - NotifyBoard(); -} - std::string GameTabRightPanel::GetNagFromStr(std::string str){ // TODO: Bind more NAG! if(str=="!") -- cgit v1.2.3 From 042f6ca17012414d13235d3e04ea9012ff49f79c Mon Sep 17 00:00:00 2001 From: Loic Guegan Date: Mon, 2 Jan 2023 11:58:40 +0100 Subject: Debug comments --- src/game_tab/right_panel/GameTabRightPanel.cpp | 7 ++++++- src/game_tab/right_panel/GameTabRightPanel.hpp | 2 ++ 2 files changed, 8 insertions(+), 1 deletion(-) (limited to 'src/game_tab/right_panel/GameTabRightPanel.cpp') diff --git a/src/game_tab/right_panel/GameTabRightPanel.cpp b/src/game_tab/right_panel/GameTabRightPanel.cpp index 3a46f59..dd0ebca 100644 --- a/src/game_tab/right_panel/GameTabRightPanel.cpp +++ b/src/game_tab/right_panel/GameTabRightPanel.cpp @@ -89,7 +89,12 @@ void GameTabRightPanel::OnCommentChange(wxCommandEvent &event) { wxLogDebug("GameTabRightPanel: comment input change"); HalfMove *m = game->GetCurrentMove(); if (m != nullptr) { - m->comment=event.GetString().ToStdString(); + m->comment=event.GetString().Trim().ToStdString(); + // Remove newlines: + for(char &c:m->comment){ + if(c=='\n') + c=' '; + } } editor_canvas->Refresh(); } diff --git a/src/game_tab/right_panel/GameTabRightPanel.hpp b/src/game_tab/right_panel/GameTabRightPanel.hpp index aa28f17..6f3aaaa 100644 --- a/src/game_tab/right_panel/GameTabRightPanel.hpp +++ b/src/game_tab/right_panel/GameTabRightPanel.hpp @@ -1,3 +1,5 @@ +#include + #include "../Game.hpp" #include "LiveEngineDialog.hpp" #include "editor/EditorCanvas.hpp" -- cgit v1.2.3