GitHub-Mirror/qt-openzwave
2
0
Fork 0
mirror of https://github.com/Fishwaldo/qt-openzwave.git synced 2025-07-23 05:28:27 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

redo the Delegate with normal paint events rather than painting a full widget and start working on the editor widget

Browse source
This commit is contained in:
Justin Hammond 2019-05-25 01:48:37 +08:00
parent 4f38d3d9e2
commit d8c375c8ca
5 changed files with 98 additions and 41 deletions
Download patch file Download diff file Expand all files Collapse all files

3
qt-openzwave/qtozwmanager.cpp
View file

@ -513,7 +513,8 @@ bool QTOZWManager_Internal::convertValueID(uint64_t vidKey) {
{
uint8_t value;
this->m_manager->GetValueAsByte(vid, &value);
this->m_valueModel->setValueData(vidKey, QTOZW_ValueIds::ValueIdColumns::Value, QVariant::fromValue(value));
/* QT has a habbit of treating uint8_t as char... so cast it to 32 to get around that */
this->m_valueModel->setValueData(vidKey, QTOZW_ValueIds::ValueIdColumns::Value, QVariant::fromValue(static_cast<uint32_t>(value)));
this->m_valueModel->setValueData(vidKey, QTOZW_ValueIds::ValueIdColumns::Type, QTOZW_ValueIds::ValueIdTypes::Byte);
return true;
}

6
qt-openzwave/qtozwvalueidmodel.cpp
View file

@ -51,12 +51,12 @@ QVariant QTOZW_ValueIds::data(const QModelIndex &index, int role) const {
return QVariant();
if (role == Qt::DisplayRole) {
QMap<ValueIdColumns, QVariant> node = this->m_valueData[index.row()];
if (node.size() == 0) {
QMap<ValueIdColumns, QVariant> value = this->m_valueData[index.row()];
if (value.size() == 0) {
qWarning() << "data: Cant find any Node on Row " << index.row();
return QVariant();
}
return node[static_cast<ValueIdColumns>(index.column())];
return value[static_cast<ValueIdColumns>(index.column())];
}
return QVariant();

1
simpleclient/mainwindow.cpp
View file

@ -73,6 +73,7 @@ void MainWindow::QTOZW_Ready() {
this->ui->userView->verticalHeader()->hide();
this->ui->userView->setSelectionBehavior(QAbstractItemView::SelectRows);
this->ui->userView->setSelectionMode(QAbstractItemView::SingleSelection);
this->ui->userView->setEditTriggers(QAbstractItemView::AllEditTriggers);
QTOZW_proxyValueModel *proxyConfigValueModel = new QTOZW_proxyValueModel(this);
proxyConfigValueModel->setSourceModel(this->m_qtozwmanager->getValueModel());

114
simpleclient/qtozw_itemdelegate.cpp
View file

@ -1,13 +1,11 @@
#include <QPainter>
#include <QDebug>
#include <QApplication>
#include "qtozw_itemdelegate.h"
#include "qtozwvalueidmodel.h"
QTOZW_ItemDelegate::QTOZW_ItemDelegate(QObject *parent) : QStyledItemDelegate(parent)
{
this->m_comboBox = new QComboBox();
this->m_checkBox = new QCheckBox();
this->m_spinBox = new QSpinBox();
}
void QTOZW_ItemDelegate::paint(QPainter *painter, const QStyleOptionViewItem &option, const QModelIndex &index) const
@ -20,30 +18,40 @@ void QTOZW_ItemDelegate::paint(QPainter *painter, const QStyleOptionViewItem &op
switch (typeIndex.data().value<QTOZW_ValueIds::ValueIdTypes>()) {
case QTOZW_ValueIds::ValueIdTypes::List: {
QTOZW_ValueIDList val = index.data().value<QTOZW_ValueIDList>();
this->m_comboBox->setFrame(false);
this->m_comboBox->addItems(val.labels);
this->m_comboBox->setCurrentText(val.selectedItem);
this->m_comboBox->resize(option.rect.size());
this->m_comboBox->setEnabled(!readOnly);
painter->save();
painter->translate(option.rect.topLeft());
this->m_comboBox->render(painter, QPoint(), QRegion(), QWidget::DrawChildren);
painter->restore();
QStyleOptionComboBox comboBoxOption;
comboBoxOption.rect = option.rect;
comboBoxOption.state = option.state;
if (readOnly) {
comboBoxOption.state |= QStyle::State_ReadOnly;
}
comboBoxOption.currentText = val.selectedItem;
QApplication::style()->drawComplexControl(QStyle::CC_ComboBox, &comboBoxOption, painter);
QApplication::style()->drawControl(QStyle::CE_ComboBoxLabel, &comboBoxOption, painter);
break;
}
case QTOZW_ValueIds::ValueIdTypes::Bool: {
this->m_checkBox->setChecked(index.data().value<bool>());
this->m_checkBox->setEnabled(!readOnly);
this->m_checkBox->resize(option.rect.size());
painter->save();
painter->translate(option.rect.topLeft());
this->m_checkBox->render(painter, QPoint(), QRegion(), QWidget::DrawChildren);
painter->restore();
QStyleOptionButton cbOption;
cbOption.rect = option.rect;
cbOption.state |= index.data().value<bool>() ? QStyle::State_On : QStyle::State_Off;
cbOption.state |= QStyle::State_Enabled;
if (readOnly)
cbOption.state |= QStyle::State_ReadOnly;
QApplication::style()->drawControl(QStyle::CE_CheckBox, &cbOption, painter);
break;
}
#if 0
case QTOZW_ValueIds::ValueIdTypes::Int:
case QTOZW_ValueIds::ValueIdTypes::Byte:
case QTOZW_ValueIds::ValueIdTypes::Short: {
QSpinBox sb;
sb.setValue(index.data().toInt());
sb.resize(option.rect.size());
this->m_spinBox->render(painter, QPoint(), QRegion(), QWidget::DrawChildren);
this->m_spinBox->setValue(index.data().toInt());
this->m_spinBox->setEnabled(!readOnly);
this->m_spinBox->resize(option.rect.size());
@ -63,7 +71,8 @@ void QTOZW_ItemDelegate::paint(QPainter *painter, const QStyleOptionViewItem &op
painter->restore();
break;
}
default: {
#endif
default: {
return QStyledItemDelegate::paint(painter, option, index);
}
@ -77,17 +86,68 @@ QSize QTOZW_ItemDelegate::sizeHint(const QStyleOptionViewItem &option, const QMo
QModelIndex typeIndex = index.sibling(index.row(), QTOZW_ValueIds::ValueIdColumns::Type);
switch (typeIndex.data().value<QTOZW_ValueIds::ValueIdTypes>()) {
case QTOZW_ValueIds::ValueIdTypes::List: {
return this->m_comboBox->minimumSizeHint();
QTOZW_ValueIDList val = index.data().value<QTOZW_ValueIDList>();
QStyleOptionComboBox comboBoxOption;
comboBoxOption.rect = option.rect;
comboBoxOption.state = option.state;
comboBoxOption.currentText = val.selectedItem;
return QSize(QFontMetrics(option.font).width(val.selectedItem), comboBoxOption.rect.height());
}
case QTOZW_ValueIds::ValueIdTypes::Bool: {
return this->m_checkBox->minimumSizeHint();
}
case QTOZW_ValueIds::ValueIdTypes::Int:
case QTOZW_ValueIds::ValueIdTypes::Byte:
case QTOZW_ValueIds::ValueIdTypes::Short: {
return this->m_spinBox->minimumSize();
QStyleOptionButton cbOption;
cbOption.rect = option.rect;
cbOption.state |= index.data().value<bool>() ? QStyle::State_On : QStyle::State_Off;
cbOption.state |= QStyle::State_Enabled;
return cbOption.rect.size();
}
default:
return QStyledItemDelegate::sizeHint(option, index);
}
}
QWidget *QTOZW_ItemDelegate::createEditor(QWidget *parent, const QStyleOptionViewItem &option, const QModelIndex &index) const
{
QModelIndex typeIndex = index.sibling(index.row(), QTOZW_ValueIds::ValueIdColumns::Type);
switch (typeIndex.data().value<QTOZW_ValueIds::ValueIdTypes>()) {
case QTOZW_ValueIds::ValueIdTypes::List: {
QComboBox *editor = new QComboBox(parent);
editor->setAutoFillBackground(true);
connect(editor, &QComboBox::currentTextChanged, this, &QTOZW_ItemDelegate::commitAndCloseEditor);
return editor;
}
default:
return QStyledItemDelegate::createEditor(parent, option, index);
}
}
void QTOZW_ItemDelegate::updateEditorGeometry(QWidget *editor, const QStyleOptionViewItem &option, const QModelIndex &index) const
{
Q_UNUSED(index);
editor->setGeometry(option.rect);
}
void QTOZW_ItemDelegate::setEditorData(QWidget *editor, const QModelIndex &index) const
{
QModelIndex typeIndex = index.sibling(index.row(), QTOZW_ValueIds::ValueIdColumns::Type);
switch (typeIndex.data().value<QTOZW_ValueIds::ValueIdTypes>()) {
case QTOZW_ValueIds::ValueIdTypes::List: {
QComboBox *cb = static_cast<QComboBox*>(editor);
QTOZW_ValueIDList val = index.data().value<QTOZW_ValueIDList>();
cb->addItems(val.labels);
cb->setCurrentText(val.selectedItem);
cb->showPopup();
break;
}
default:
QStyledItemDelegate::setEditorData(editor, index);
}
}
void QTOZW_ItemDelegate::commitAndCloseEditor() {
QWidget *editor = qobject_cast<QWidget *>(sender());
emit commitData(editor);
emit closeEditor(editor);
}

15
simpleclient/qtozw_itemdelegate.h
View file

@ -12,18 +12,13 @@ class QTOZW_ItemDelegate : public QStyledItemDelegate
public:
explicit QTOZW_ItemDelegate(QObject *parent = nullptr);
virtual void paint(QPainter *painter, const QStyleOptionViewItem &option, const QModelIndex &index) const override;
virtual QSize sizeHint(const QStyleOptionViewItem &option, const QModelIndex &index) const override;
QWidget *createEditor(QWidget *parent, const QStyleOptionViewItem &option, const QModelIndex &index) const override;
void updateEditorGeometry(QWidget *editor, const QStyleOptionViewItem &option, const QModelIndex &index) const override;
void setEditorData(QWidget *editor, const QModelIndex &index) const override;
signals:
public slots:
private:
QComboBox *m_comboBox;
QCheckBox *m_checkBox;
QSpinBox *m_spinBox;
private slots:
void commitAndCloseEditor();
};
#endif // QTOZW_ITEMDELEGATE_H