loic/ochess
1
0
Fork 0
mirror of https://gitlab.com/manzerbredes/ochess.git synced 2025-04-06 01:56:28 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Improve engine support

Browse source
This commit is contained in:
Loic Guegan 2022-02-26 18:46:06 +01:00
parent 65e9049351
commit f329c5f204
6 changed files with 94 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/MainWindow.cpp
View file

@ -67,9 +67,9 @@ MainWindow::MainWindow()
"/home/loic/hartwig_tests.pgn"); notebook->AddPage(bt, bt->GetLabel());
notebook->SetSelection(notebook->GetPageIndex(bt));*/
/*EngineTab *bt = new EngineTab((wxWindow *)notebook,
EngineTab *bt = new EngineTab((wxWindow *)notebook,
"/home/loic/.local/bin/stockfish"); notebook->AddPage(bt, bt->GetLabel());
notebook->SetSelection(notebook->GetPageIndex(bt));*/
notebook->SetSelection(notebook->GetPageIndex(bt));
}
void MainWindow::OnSettings(wxCommandEvent &event) {

90
src/engine_tab/EngineTab.cpp
View file

@ -1,21 +1,95 @@
#include "EngineTab.hpp"
EngineTab::EngineTab(wxWindow *parent, std::string engine_path_or_name)
: EngineTabBF(parent), TabInfos(TabInfos::ENGINE) {
: EngineTabBF(parent), TabInfos(TabInfos::ENGINE),
enginePath(engine_path_or_name) {
SetLabel("New Engine");
engine = new uciadapter::UCI(engine_path_or_name);
engine_location->SetValue(engine_path_or_name);
confGroup = "engines/bob";
CONFIG_OPEN(conf);
conf->DeleteGroup(confGroup);
bool configExists = conf->HasGroup(confGroup);
conf->Write(confGroup + "/path", wxString(engine_path_or_name));
CONFIG_CLOSE(conf);
if (!configExists) {
InitConfiguration();
}
// Build wxPropertyGrid according to engine configuration
CONFIG_OPEN(conf2);
long index;
std::string optsPath = confGroup + "/options";
conf2->SetPath(optsPath);
wxString opt_name;
if (conf2->GetFirstGroup(opt_name, index)) {
do {
wxString optPath = opt_name + "/";
wxString type = conf2->Read(optPath + "type");
wxString default_value_wxString = conf2->Read(optPath + "value");
std::string default_value = default_value_wxString.ToStdString();
if (type == "check") {
engine_parameters->Append(
new wxBoolProperty(opt_name, wxPG_LABEL, default_value == "true"));
} else if (type == "spin") {
engine_parameters->Append(
new wxIntProperty(opt_name, wxPG_LABEL, std::stoi(default_value)));
} else if (type == "string" || type == "button") {
engine_parameters->Append(
new wxStringProperty(opt_name, wxPG_LABEL, default_value));
}
} while (conf2->GetNextGroup(opt_name, index));
}
CONFIG_CLOSE(conf2);
Bind(wxEVT_BUTTON, &EngineTab::OnSave, this, ENGINE_SAVE_CONF_BUTTON);
}
void EngineTab::OnSave(wxCommandEvent &event) {
CONFIG_OPEN(conf2);
long index;
std::string optsPath = confGroup + "/options";
conf2->SetPath(optsPath);
wxString opt_name;
if (conf2->GetFirstGroup(opt_name, index)) {
do {
wxString optPath = opt_name + "/";
wxString type = conf2->Read(optPath + "type");
wxPGProperty *property = engine_parameters->GetProperty(opt_name);
wxVariant value = property->GetValue();
if (value.IsType(wxPG_VARIANT_TYPE_BOOL)) {
conf2->Write(optPath + "/value", value.GetBool());
} else if (value.IsType(wxPG_VARIANT_TYPE_LONG)) {
conf2->Write(optPath + "/value", value.GetLong());
} else if (value.IsType(wxPG_VARIANT_TYPE_STRING)) {
conf2->Write(optPath + "/value", value.GetString());
}
} while (conf2->GetNextGroup(opt_name, index));
}
CONFIG_CLOSE(conf2);
}
void EngineTab::InitConfiguration() {
wxLogDebug("Called!");
CONFIG_OPEN(conf);
conf->Write(confGroup + "/path", wxString(enginePath));
conf->Write(confGroup + "/name", wxString(engine->GetName()));
conf->Write(confGroup + "/authors", wxString(engine->GetAuthor()));
std::vector<uciadapter::Option> opts = engine->GetOptions();
for (uciadapter::Option &opt : opts) {
std::string optPath = confGroup + "/options/" + opt.name;
conf->Write(wxString(optPath + "/type"), wxString(opt.type));
if (opt.type == "check") {
engine_parameters->Append(new wxBoolProperty(
opt.name, wxPG_LABEL, opt.default_value == "true"));
conf->Write(wxString(optPath + "/value"), opt.default_value == "true");
} else if (opt.type == "spin") {
engine_parameters->Append(new wxIntProperty(
opt.name, wxPG_LABEL, std::stoi(opt.default_value)));
conf->Write(wxString(optPath + "/value"), std::stoi(opt.default_value));
conf->Write(wxString(optPath + "/min"), std::stoi(opt.min));
conf->Write(wxString(optPath + "/max"), std::stoi(opt.max));
} else if (opt.type == "string") {
engine_parameters->Append(
new wxStringProperty(opt.name, wxPG_LABEL, opt.default_value));
conf->Write(wxString(optPath + "/value"), wxString(opt.default_value));
} else if (opt.type == "button") {
conf->Write(wxString(optPath + "/name"), wxString(opt.default_value));
}
}
}
CONFIG_CLOSE(conf);
}

8
src/engine_tab/EngineTab.hpp
View file

@ -1,13 +1,17 @@
#include "EngineTabBF.h"
#include "ochess.hpp"
#include "UCI.hpp"
#include "ochess.hpp"
class EngineTab : public EngineTabBF, public TabInfos {
uciadapter::UCI *engine;
std::string confGroup, enginePath;
void InitConfiguration();
public:
EngineTab(wxWindow *parent, std::string engine_path_or_name);
void ApplyPreferences() {}
void *GetGame() { return (NULL); }
void *GetBase() { return (NULL); };
void *GetBase() { return (NULL); }
void OnSave(wxCommandEvent &event);
};

2
src/engine_tab/EngineTabBF.cpp
View file

@ -50,7 +50,7 @@ EngineTabBF::EngineTabBF( wxWindow* parent, wxWindowID id, const wxPoint& pos, c
engine_parameters = new wxPropertyGrid(this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxPG_DEFAULT_STYLE|wxPG_SPLITTER_AUTO_CENTER);
main_sizer->Add( engine_parameters, 1, wxALL|wxEXPAND, 5 );
save_button = new wxButton( this, wxID_ANY, wxT("Save"), wxDefaultPosition, wxDefaultSize, 0 );
save_button = new wxButton( this, ENGINE_SAVE_CONF_BUTTON, wxT("Save"), wxDefaultPosition, wxDefaultSize, 0 );
main_sizer->Add( save_button, 0, wxALL|wxEXPAND, 5 );

1
src/engine_tab/EngineTabBF.h
View file

@ -28,6 +28,7 @@
///////////////////////////////////////////////////////////////////////////
#define ENGINE_SAVE_CONF_BUTTON 1000
///////////////////////////////////////////////////////////////////////////////
/// Class EngineTabBF

4
tools/wxframebuilder/EngineTab.fbp
View file

@ -500,7 +500,7 @@
<property name="resize">Resizable</property>
<property name="show">1</property>
<property name="size"></property>
<property name="style">wxPG_DEFAULT_STYLE</property>
<property name="style">wxPG_DEFAULT_STYLE|wxPG_SPLITTER_AUTO_CENTER</property>
<property name="subclass">; ; forward_declare</property>
<property name="toolbar_pane">0</property>
<property name="tooltip"></property>
@ -546,7 +546,7 @@
<property name="font"></property>
<property name="gripper">0</property>
<property name="hidden">0</property>
<property name="id">wxID_ANY</property>
<property name="id">ENGINE_SAVE_CONF_BUTTON</property>
<property name="label">Save</property>
<property name="margins"></property>
<property name="markup">0</property>