Skip to content

SymbolReplacementDialog: Show active symbol replacement strategy #2361

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

SymbolReplacementDialog: Show active symbol replacement strategy #2361

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a44fc73
SymbolReplacementDialog: Show active symbol replacement criteria
dl3sdo Apr 8, 2025
498089b
SymbolReplacementDialog: Clear checkmarks after user editing
dl3sdo Apr 8, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
46 changes: 34 additions & 12 deletions src/gui/symbols/symbol_replacement_dialog.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
/*
* Copyright 2012, 2013 Thomas Schöps
* Copyright 2017-2020, 2024 Kai Pastor
* Copyright 2017-2020, 2024, 2025 Kai Pastor
*
* This file is part of OpenOrienteering.
*
Expand Down Expand Up @@ -31,6 +31,7 @@
#include <QtGlobal>
#include <QAbstractItemView>
#include <QAction>
#include <QActionGroup>
#include <QCheckBox>
#include <QComboBox>
#include <QColor>
Expand All @@ -51,7 +52,6 @@
#include <QPushButton>
#include <QSaveFile>
#include <QSpacerItem>
#include <QString>
#include <QStringList>
#include <QTableWidget>
#include <QTableWidgetItem>
Expand Down Expand Up @@ -103,7 +103,7 @@ SymbolReplacementDialog::SymbolReplacementDialog(QWidget* parent, Map& object_ma
{
setWindowTitle(tr("Replace symbol set"));
form_layout = new QFormLayout();
QLabel* desc_label = new QLabel(tr("Configure how the symbols should be replaced, and which."));
auto* desc_label = new QLabel(tr("Configure how the symbols should be replaced, and which."));
form_layout->addRow(desc_label);
form_layout->addItem(Util::SpacerItem::create(this));
import_all_check = new QCheckBox(tr("Import all new symbols, even if not used as replacement"));
Expand Down Expand Up @@ -132,10 +132,16 @@ SymbolReplacementDialog::SymbolReplacementDialog(QWidget* parent, Map& object_ma

horizontal_headers << tr("Original") << tr("Replacement");

auto action = mapping_menu->addAction(tr("Match replacement symbols by symbol number"));
connect(action, &QAction::triggered, this, &SymbolReplacementDialog::matchByNumber);
action = mapping_menu->addAction(tr("Match by symbol name"));
connect(action, &QAction::triggered, this, &SymbolReplacementDialog::matchByName);
match_by_number_action = mapping_menu->addAction(tr("Match replacement symbols by symbol number"));
match_by_number_action->setCheckable(true);
connect(match_by_number_action, &QAction::triggered, this, &SymbolReplacementDialog::matchByNumber);
match_by_name_action = mapping_menu->addAction(tr("Match by symbol name"));
match_by_name_action->setCheckable(true);
match_by_name_action->setChecked(true);
connect(match_by_name_action, &QAction::triggered, this, &SymbolReplacementDialog::matchByName);
auto* match_by_group = new QActionGroup(this);
match_by_group->addAction(match_by_number_action);
match_by_group->addAction(match_by_name_action);
}
else
{
Expand All @@ -151,6 +157,7 @@ SymbolReplacementDialog::SymbolReplacementDialog(QWidget* parent, Map& object_ma
mapping_table->horizontalHeader()->setSectionResizeMode(0, QHeaderView::Stretch);
mapping_table->horizontalHeader()->setSectionResizeMode(1, QHeaderView::Stretch);
mapping_table->setEditTriggers(QAbstractItemView::AllEditTriggers);
connect(mapping_table, &QTableWidget::cellChanged, this, &SymbolReplacementDialog::clearMatchCheckmarks);

auto action = mapping_menu->addAction(tr("Clear replacements"));
connect(action, &QAction::triggered, this, &SymbolReplacementDialog::resetReplacements);
Expand Down Expand Up @@ -184,40 +191,53 @@ SymbolReplacementDialog::SymbolReplacementDialog(QWidget* parent, Map& object_ma
SymbolReplacementDialog::~SymbolReplacementDialog() = default;



// slot
void SymbolReplacementDialog::showHelp()
{
Util::showHelp(this, "symbol_replace_dialog.html");
}



// slot
void SymbolReplacementDialog::matchByName()
{
symbol_rules.matchQuerySymbolName(symbol_set);
updateMappingTable();
}


// slot
void SymbolReplacementDialog::matchByNumber()
{
symbol_rules.matchQuerySymbolNumber(symbol_set);
updateMappingTable();
}


// slot
void SymbolReplacementDialog::resetReplacements()
{
for (auto& item : symbol_rules)
{
item.symbol = nullptr;
item.type = SymbolRule::NoAssignment;
}
clearMatchCheckmarks();
updateMappingTable();
}

// slot
void SymbolReplacementDialog::clearMatchCheckmarks()
{
if (react_to_changes)
{
if (match_by_number_action)
match_by_number_action->setChecked(false);
if (match_by_name_action)
match_by_name_action->setChecked(false);
}
}


// slot
void SymbolReplacementDialog::openCrtFile()
{
auto const dir = QLatin1String{"data:/symbol sets"};
Expand All @@ -231,7 +251,7 @@ void SymbolReplacementDialog::openCrtFile()
}
}


// slot
bool SymbolReplacementDialog::saveCrtFile()
{
/// \todo Choose user-writable directory.
Expand Down Expand Up @@ -298,6 +318,7 @@ void SymbolReplacementDialog::updateMappingTable()
if (!mapping_table)
return;

react_to_changes = false;
mapping_table->setUpdatesEnabled(false);

mapping_table->clearContents();
Expand Down Expand Up @@ -444,6 +465,7 @@ void SymbolReplacementDialog::updateMappingTable()
}

mapping_table->setUpdatesEnabled(true);
react_to_changes = true;
}


Expand Down
20 changes: 13 additions & 7 deletions src/gui/symbols/symbol_replacement_dialog.h
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
/*
* Copyright 2012, 2013 Thomas Schöps
* Copyright 2017-2019 Kai Pastor
* Copyright 2017-2019, 2025 Kai Pastor
*
* This file is part of OpenOrienteering.
*
Expand Down Expand Up @@ -31,6 +31,7 @@

#include "core/objects/symbol_rule_set.h"

class QAction;
class QCheckBox;
class QComboBox;
class QTableWidget;
Expand Down Expand Up @@ -69,25 +70,29 @@ class SymbolReplacementDialog : public QDialog
QString replacementId() const;

protected:
void done(int r) override;

void updateMappingTable();
void updateMappingFromTable();

private slots:
void showHelp();

void matchByName();
void matchByNumber();
void resetReplacements();
void clearMatchCheckmarks();

void openCrtFile();
bool saveCrtFile();

void done(int r) override;

void updateMappingTable();
void updateMappingFromTable();

private:
Map& object_map;
const Map& symbol_set;
SymbolRuleSet& symbol_rules;

QAction* match_by_name_action = nullptr;
QAction* match_by_number_action = nullptr;
QCheckBox* import_all_check = nullptr;
QCheckBox* delete_unused_symbols_check = nullptr;
QCheckBox* delete_unused_colors_check = nullptr;
Expand All @@ -97,9 +102,10 @@ class SymbolReplacementDialog : public QDialog
std::vector<std::unique_ptr<SymbolDropDownDelegate>> symbol_widget_delegates;

Mode mode;
bool react_to_changes = false;
};


} // namespace OpenOrienteering

#endif
#endif // OPENORIENTEERING_SYMBOL_REPLACEMENT_DIALOG_H