kotschak/qelectrotech-source-mirror
0
0
Fork 0
mirror of https://github.com/qelectrotech/qelectrotech-source-mirror.git synced 2026-01-06 05:10:52 +01:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Fix bug 244

Browse Source 
I was thinking that the commit 5a51f6bace
fix the bug 244, but not they only fix this bug :
https://qelectrotech.org/forum/viewtopic.php?pid=16022#p16022

This commit really fix the bug 244
This commit is contained in:
joshua
2022-04-01 20:04:17 +02:00
parent 5a51f6bace
commit ce21a812c0
4 changed files with 17 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
sources/qetgraphicsitem/ViewItem/qetgraphicsheaderitem.h
View File

@@ -84,7 +84,7 @@ class QetGraphicsHeaderItem : public QGraphicsObject
QRect m_current_rect;
QRectF m_bounding_rect;
QAbstractItemModel *m_model = nullptr;
QPointer<QAbstractItemModel> m_model;
QVector<int>
m_sections_minimum_width,

6
sources/qetgraphicsitem/ViewItem/qetgraphicstableitem.cpp
View File

@@ -185,7 +185,7 @@ void QetGraphicsTableItem::setModel(QAbstractItemModel *model)
this, &QetGraphicsTableItem::modelReseted);
}
m_model = model;
m_header_item->setModel(model);
m_header_item->setModel(m_model);
setUpColumnAndRowMinimumSize();
adjustSize();
@@ -210,7 +210,7 @@ void QetGraphicsTableItem::setModel(QAbstractItemModel *model)
*/
QAbstractItemModel *QetGraphicsTableItem::model() const
{
return m_model;
return m_model.data();
}
/**
@@ -599,7 +599,7 @@ QDomElement QetGraphicsTableItem::toXml(QDomDocument &dom_document) const
{
//Add model
auto dom_model = dom_document.createElement("model");
auto project_db_model = static_cast<ProjectDBModel *>(m_model);
auto project_db_model = static_cast<ProjectDBModel *>(m_model.data());
dom_model.appendChild(project_db_model->toXml(dom_document));
dom_table.appendChild(dom_model);

2
sources/qetgraphicsitem/ViewItem/qetgraphicstableitem.h
View File

@@ -123,7 +123,7 @@ class QetGraphicsTableItem : public QetGraphicsItem
void previousTableDisplayRowChanged();
void removeUselessNextTable(bool recursive = true);
QAbstractItemModel *m_model= nullptr;
QPointer<QAbstractItemModel> m_model;
QVector<int> m_minimum_column_width;
int