SHS/qad
4
1
Fork 0
Code Issues 5 Pull Requests Releases Wiki Activity

refactoring qad widgets part 2

Browse Source 
c++ cast, nullptr, forward declaration, agregate ui, connect to member functions, order and clear includes
This commit is contained in:
Бычков Андрей
2022-12-12 10:18:34 +03:00
parent 728c132f2b
commit 4497123421
23 changed files with 837 additions and 500 deletions
Download Patch File Download Diff File Expand all files Collapse all files

281
libs/widgets/qpiconfigwidget.cpp
View File

@@ -1,15 +1,22 @@
#include "qpiconfigwidget.h"
#include "qalgorithms.h"
#include "qpiconfigvaluewidget.h"
#include <QMouseEvent>
#include <QApplication>
#include <QVariant>
QPIConfigWidget::QPIConfigWidget(QWidget * parent, QPIConfig * c, bool on): QTreeWidget(parent), actionAddItem(this), actionAddNode(this),
actionToItem(this), actionToNode(this), actionRemove(this),
actionExpandAll(this), actionCollapseAll(this) {
actionToItem(this), actionToNode(this), actionRemove(this),
actionExpandAll(this), actionCollapseAll(this) {
active = on;
if (active) {
setColumnCount(4);
setColumnWidth(0, 150);
setColumnWidth(1, 200);
} else setColumnCount(0);
} else {
setColumnCount(0);
}
setSelectionMode(ExtendedSelection);
setVerticalScrollMode(ScrollPerPixel);
actionAddItem.setIcon(QIcon(":/icons/item-add.png"));
@@ -20,9 +27,6 @@ QPIConfigWidget::QPIConfigWidget(QWidget * parent, QPIConfig * c, bool on): QTre
popupMenu.addAction(&actionAddItem);
popupMenu.addAction(&actionAddNode);
popupMenu.addSeparator();
/*popupMenu.addAction(&actionToItem);
popupMenu.addAction(&actionToNode);
popupMenu.addSeparator();*/
popupMenu.addAction(&actionRemove);
popupMenu.addSeparator();
popupMenu.addAction(&actionExpandAll);
@@ -40,8 +44,6 @@ QPIConfigWidget::QPIConfigWidget(QWidget * parent, QPIConfig * c, bool on): QTre
pi = c_pi = 0;
translate();
setQPIConfig(c);
//resize(600, 400);
//show();
}
@@ -62,12 +64,12 @@ bool QPIConfigWidget::eventFilter(QObject * o, QEvent * e) {
qApp->processEvents();
itemClicked(pi, 1);
popupMenu.popup(
#if QT_VERSION_MAJOR <= 5
#if QT_VERSION_MAJOR <= 5
((QMouseEvent * )e)->globalPos()
#else
#else
((QMouseEvent * )e)->globalPosition().toPoint()
#endif
);
#endif
);
}
}
}
@@ -76,15 +78,21 @@ bool QPIConfigWidget::eventFilter(QObject * o, QEvent * e) {
void QPIConfigWidget::itemClicked(QTreeWidgetItem * item, int column) {
if (item != 0) {
if ((column == 0 && !read_only_name) || (column == 3 && !read_only_comment)) item->setFlags(Qt::ItemIsSelectable | Qt::ItemIsEnabled | Qt::ItemIsEditable);
else item->setFlags(Qt::ItemIsSelectable | Qt::ItemIsEnabled);
if (item) {
if ((column == 0 && !read_only_name) || (column == 3 && !read_only_comment)) {
item->setFlags(Qt::ItemIsSelectable | Qt::ItemIsEnabled | Qt::ItemIsEditable);
} else {
item->setFlags(Qt::ItemIsSelectable | Qt::ItemIsEnabled);
}
}
bool node = true, ro = read_only_name || read_only_type || read_only_value;
if (item != 0)
if (itemTWidget(item) != 0)
if (itemTWidget(item)->isEnabled())
if (item) {
if (itemTWidget(item)) {
if (itemTWidget(item)->isEnabled()) {
node = false;
}
}
}
actionAddItem.setVisible(node && !ro);
actionAddNode.setVisible(node && !ro);
actionRemove.setVisible(!ro && !selectedItems().isEmpty());
@@ -94,24 +102,32 @@ void QPIConfigWidget::itemClicked(QTreeWidgetItem * item, int column) {
void QPIConfigWidget::itemChanged(QTreeWidgetItem * item, int column) {
if (item != c_pi) {
c_pi = item;
if (item != 0) {
if (item) {
c_name = item->text(0);
c_comment = item->text(3);
}
return;
}
if (item == 0) return;
if (c_name == item->text(0) && c_comment == item->text(3)) return;
if (item == nullptr) {
return;
}
if (c_name == item->text(0) && c_comment == item->text(3)) {
return;
}
//qDebug() << "change" << item->text(0);
QPIConfig::Entry * e = itemEntry(item);
if (e == 0) return;
if (e == nullptr) {
return;
}
if (column == 0) {
buildFullNames(item);
e->setName(item->text(column));
conf->buildFullNames(e->parent());
//qDebug() << itemCWidget(item)->full_name;
}
if (column == 3) e->setComment(item->text(column));
if (column == 3) {
e->setComment(item->text(column));
}
c_name = item->text(0);
c_comment = item->text(3);
emit changed();
@@ -119,7 +135,7 @@ void QPIConfigWidget::itemChanged(QTreeWidgetItem * item, int column) {
void QPIConfigWidget::typeChange(int t, UComboBox * c) {
ConfigValueWidget * cw = (ConfigValueWidget * )c->property("qpic_widget").toLongLong();
auto cw = reinterpret_cast<ConfigValueWidget *>(c->property("qpic_widget").toLongLong());
cw->setType(types.key(s_types[t]));
conf->getValue(cw->full_name).setType(types.key(s_types[t]));
emit changed();
@@ -133,12 +149,19 @@ void QPIConfigWidget::valueChange(ConfigValueWidget * w, QString v) {
void QPIConfigWidget::on_actionAddItem_triggered() {
if (conf == 0 || !active) return;
if (conf == nullptr || !active) {
return;
}
QString fp;
if (pi == 0) pi = invisibleRootItem();
else fp = itemCWidget(pi)->full_name + conf->delim;
if (pi == nullptr) {
pi = invisibleRootItem();
} else {
fp = itemCWidget(pi)->full_name + conf->delim;
}
new_dialog.reset();
if (new_dialog.exec() == QDialog::Rejected) return;
if (new_dialog.exec() == QDialog::Rejected) {
return;
}
QPIConfig::Entry * e;
if (pi->childCount() == 0) {
//qDebug() << "pi empty, remove " << itemCWidget(pi)->full_name;
@@ -151,40 +174,50 @@ void QPIConfigWidget::on_actionAddItem_triggered() {
pi->setText(0, new_dialog.name());
pi->setText(3, new_dialog.comment());
int ind = s_types.indexOf(types[new_dialog.type()]);
if (ind < 0) w_types.back()->setCurrentIndex(0);
else w_types.back()->setCurrentIndex(ind);
if (ind < 0) {
w_types.back()->setCurrentIndex(0);
} else {
w_types.back()->setCurrentIndex(ind);
}
emit changed();
}
void QPIConfigWidget::on_actionAddNode_triggered() {
if (conf == 0 || !active) return;
if (conf == nullptr || !active) {
return;
}
QString fp;
if (pi == 0) pi = invisibleRootItem();
else fp = itemCWidget(pi)->full_name + conf->delim;
if (pi == nullptr) {
pi = invisibleRootItem();
} else {
fp = itemCWidget(pi)->full_name + conf->delim;
}
new_dialog.reset(true);
if (new_dialog.exec() == QDialog::Rejected) return;
if (new_dialog.exec() == QDialog::Rejected) {
return;
}
QPIConfig::Entry e;
//e = &(conf->addEntry(fp + new_dialog.name(), "", "", false));
e._full_name = fp + new_dialog.name();
expandItem(pi);
pi = addEntry(pi, &e, true);
pi->setText(0, new_dialog.name());
pi->setText(3, new_dialog.comment());
setItemWidget(pi, 2, 0);
setItemWidget(pi, 2, nullptr);
emit changed();
}
void QPIConfigWidget::on_actionRemove_triggered() {
//hide();
if (conf == 0 || !active) return;
if (conf == nullptr || !active) {
return;
}
QList<QTreeWidgetItem * > si = selectedItems();
conf->buildFullNames(&(conf->root));
QPIConfig::Entry * e;
foreach (QTreeWidgetItem * i, si) {
for (QTreeWidgetItem * i : si) {
e = itemEntry(i);
if (e == 0) continue;
if (e == nullptr) continue;
//qDebug() << "remove " + e->_full_name;
conf->removeEntry(e->_full_name, false);
deleteEntry(i);
@@ -199,10 +232,8 @@ void QPIConfigWidget::clear() {
bool hidden = isHidden();
hide();
QTreeWidget::clear();
foreach (ConfigValueWidget * i, w_values)
delete i;
foreach (QComboBox * i, w_types)
delete i;
qDeleteAll(w_values);
qDeleteAll(w_types);
w_values.clear();
w_types.clear();
if (!hidden) show();
@@ -211,7 +242,7 @@ void QPIConfigWidget::clear() {
void QPIConfigWidget::buildTree() {
if (!active) return;
if (conf == 0) return;
if (conf == nullptr) return;
bool hidden = isHidden();
hide();
clear();
@@ -223,14 +254,15 @@ void QPIConfigWidget::buildTree() {
void QPIConfigWidget::setReadOnlyValue(bool yes) {
read_only_value = yes;
foreach (ConfigValueWidget * i, w_values)
for (ConfigValueWidget * i : w_values) {
i->setEnabled(!yes);
}
}
void QPIConfigWidget::setReadOnlyType(bool yes) {
read_only_type = yes;
foreach (QComboBox * i, w_types) {
for (QComboBox * i : w_types) {
i->setEnabled(!yes);
i->setFrame(!yes);
}
@@ -238,32 +270,36 @@ void QPIConfigWidget::setReadOnlyType(bool yes) {
void QPIConfigWidget::buildEntry(QTreeWidgetItem * i, QPIConfig::Entry * e) {
foreach (QPIConfig::Entry * j, e->children())
for (QPIConfig::Entry * j : e->children()) {
buildEntry(addEntry(i, j, !j->isLeaf()), j);
}
}
void QPIConfigWidget::buildFullNames(QTreeWidgetItem * i) {
ConfigValueWidget * cw, * pw;
cw = itemCWidget(i);
if (i->parent() != 0) {
if (i->parent()) {
pw = itemCWidget(i->parent());
cw->full_name = pw->full_name + conf->delim + i->text(0);
} else cw->full_name = i->text(0);
for (int j = 0; j < i->childCount(); ++j)
} else {
cw->full_name = i->text(0);
}
for (int j = 0; j < i->childCount(); ++j) {
buildFullNames(i->child(j));
}
}
QPIConfig::Entry * QPIConfigWidget::itemEntry(QTreeWidgetItem * i) {
ConfigValueWidget * cfw = itemCWidget(i);
if (cfw == 0) return 0;
if (!cfw) return nullptr;
return &(conf->getValue(cfw->full_name));
}
QTreeWidgetItem * QPIConfigWidget::addEntry(QTreeWidgetItem * i, QPIConfig::Entry * e, bool node) {
if (conf == 0) return 0;
if (conf == nullptr) return nullptr;
ti = new QTreeWidgetItem();
ti->setFlags(Qt::ItemIsSelectable | Qt::ItemIsEnabled);
ti->setSizeHint(0, QSize(26, 26));
@@ -276,7 +312,7 @@ QTreeWidgetItem * QPIConfigWidget::addEntry(QTreeWidgetItem * i, QPIConfig::Entr
w_types.push_back(new UComboBox());
w_types.back()->addItems(s_types);
w_types.back()->setCurrentIndex(s_types.indexOf(types[e->type().leftJustified(1).left(1)]));
w_types.back()->setProperty("qpic_widget", QVariant((qlonglong)w_values.back()));
w_types.back()->setProperty("qpic_widget", QVariant(reinterpret_cast<qlonglong>(w_values.back())));
w_types.back()->setEnabled(!read_only_type);
w_types.back()->setFrame(!read_only_type);
connect(w_types.back(), SIGNAL(currentIndexChanged(int, UComboBox * )), this, SLOT(typeChange(int,UComboBox * )));
@@ -286,9 +322,9 @@ QTreeWidgetItem * QPIConfigWidget::addEntry(QTreeWidgetItem * i, QPIConfig::Entr
setItemWidget(ti, 1, w_values.back());
if (!node) {
setItemWidget(ti, 2, w_types.back());
if (itemTWidget(i) != 0) { //itemTWidget(i)->setEnabled(false);
if (itemTWidget(i)) {
w_types.remove(w_types.indexOf(itemTWidget(i)));
setItemWidget(i, 2, 0);
setItemWidget(i, 2, nullptr);
}
}
return ti;
@@ -299,15 +335,16 @@ void QPIConfigWidget::deleteEntry(QTreeWidgetItem * i) {
ConfigValueWidget * vw;
UComboBox * cb;
int cc = i->childCount();
for (int j = 0; j < cc; ++j)
for (int j = 0; j < cc; ++j) {
deleteEntry(i->child(0));
}
vw = qobject_cast<ConfigValueWidget * >(itemWidget(i, 1));
cb = qobject_cast<UComboBox * >(itemWidget(i, 2));
if (vw != 0) {
if (vw) {
w_values.remove(w_values.indexOf(vw));
delete vw;
}
if (cb != 0) {
if (cb) {
w_types.remove(w_types.indexOf(cb));
delete cb;
}
@@ -316,10 +353,15 @@ void QPIConfigWidget::deleteEntry(QTreeWidgetItem * i) {
bool QPIConfigWidget::filter(const QString & f, QTreeWidgetItem * i) {
if (i->childCount() == 0) return filterItem(f, i);
if (i->childCount() == 0) {
return filterItem(f, i);
}
bool found = false;
for (int j = 0; j < i->childCount(); ++j)
if (filter(f, i->child(j))) found = true;
for (int j = 0; j < i->childCount(); ++j) {
if (filter(f, i->child(j))) {
found = true;
}
}
i->setHidden(!found);
return found;
}
@@ -331,10 +373,11 @@ bool QPIConfigWidget::filterItem(const QString & f, QTreeWidgetItem * i) {
return true;
}
bool ret = (!isColumnHidden(0) && i->text(0).indexOf(f, 0, Qt::CaseInsensitive) >= 0) ||
(!isColumnHidden(1) && itemCWidget(i)->value.indexOf(f, 0, Qt::CaseInsensitive) >= 0) ||
(!isColumnHidden(3) && i->text(3).indexOf(f, 0, Qt::CaseInsensitive) >= 0);
if (itemTWidget(i) != 0)
(!isColumnHidden(1) && itemCWidget(i)->value.indexOf(f, 0, Qt::CaseInsensitive) >= 0) ||
(!isColumnHidden(3) && i->text(3).indexOf(f, 0, Qt::CaseInsensitive) >= 0);
if (itemTWidget(i)) {
ret = ret || (!isColumnHidden(2) && itemTWidget(i)->currentText().indexOf(f, 0, Qt::CaseInsensitive) >= 0);
}
i->setHidden(!ret);
return ret;
}
@@ -364,21 +407,121 @@ void QPIConfigWidget::translate() {
actionRemove.setText(tr("Remove"));
actionExpandAll.setText(tr("Expand all"));
actionCollapseAll.setText(tr("Collapse all"));
if (!active) return;
for (int i = 0; i < 4; ++i)
if (!active) {
return;
}
for (int i = 0; i < 4; ++i) {
setColumnHidden(i, c_hidden[i]);
}
}
QString QPIConfigWidget::writeToString() {
if (conf == 0) return QString();
if (conf == nullptr) {
return QString();
}
conf->buildFullNames(&(conf->root));
return conf->writeAllToString();
}
void QPIConfigWidget::readFromString(QString str) {
if (conf == 0) return;
if (conf == nullptr) {
return;
}
conf->readAllFromString(str);
buildTree();
}
UComboBox::UComboBox(QWidget *parent) : QComboBox(parent) {
connect(this, SIGNAL(currentIndexChanged(int)), this, SLOT(indexChange(int)));
}
void QPIConfigWidget::filter(const QString &f) {
if (!active) {
return;
}
filter(f, invisibleRootItem());
}
void QPIConfigWidget::write() {
if (conf == nullptr) {
return;
}
conf->buildFullNames(&(conf->root));
conf->writeAll();
}
void QPIConfigWidget::parse() {
if (conf == nullptr) {
clear();
} else {
conf->readAll();
}
}
void QPIConfigWidget::setColumnNameVisible(bool yes) {
setColumnHidden(0, !yes);
c_hidden[0] = !yes;
}
void QPIConfigWidget::setColumnValueVisible(bool yes) {
setColumnHidden(1, !yes);
c_hidden[1] = !yes;
}
void QPIConfigWidget::setColumnCommentVisible(bool yes) {
setColumnHidden(3, !yes);
c_hidden[3] = !yes;
}
void QPIConfigWidget::setColumnTypeVisible(bool yes) {
setColumnHidden(2, !yes);
c_hidden[2] = !yes;
}
void QPIConfigWidget::setReadOnlyComment(bool yes) {
read_only_comment = yes;
}
void QPIConfigWidget::setReadOnlyName(bool yes) {
read_only_name = yes;
}
ConfigValueWidget *QPIConfigWidget::itemCWidget(QTreeWidgetItem *i) {
return qobject_cast<ConfigValueWidget *>(itemWidget(i, 1));
}
UComboBox *QPIConfigWidget::itemTWidget(QTreeWidgetItem *i) {
return qobject_cast<UComboBox *>(itemWidget(i, 2));
}
void QPIConfigWidget::addTrEntry(const QString &s, const QString &f) {
types.insert(s, f);
s_types << f;
}
void QPIConfigWidget::setQPIConfig(QPIConfig *c) {
conf = c;
buildTree();
}
void UComboBox::indexChange(int i) {
emit currentIndexChanged(i, this);
}