flightsimulatorplatfrom/pilotclient
1
0
Fork 0
mirror of https://github.com/swift-project/pilotclient.git synced 2026-04-23 13:55:36 +08:00
Code Issues Packages Projects Releases Wiki Activity

Ref T472, heap issue follow up + minor clean ups

Browse Source 
* unfortunately the issue did still persist
* reason still unknown
* not expanding all seems to solve it

Maybe using the high level API without own model would be better
https://www.bogotobogo.com/Qt/Qt5_QTreeWidget.php
This commit is contained in:
Klaus Basan
2019-02-08 19:05:01 +01:00
committed by Mat Sutcliffe
parent d4ddcab84a
commit 474207eeab
3 changed files with 13 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/blackgui/views/aircraftcategorytreeview.cpp
View File

@@ -32,14 +32,18 @@ namespace BlackGui
this->setModel(new CAircraftCategoryTreeModel(this));
this->setContextMenuPolicy(Qt::CustomContextMenu);
connect(this, &CAircraftCategoryTreeView::customContextMenuRequested, this, &CAircraftCategoryTreeView::customMenu);
connect(this, &CAircraftCategoryTreeView::expanded, this, &CAircraftCategoryTreeView::onExpanded);
connect(this, &CAircraftCategoryTreeView::expanded, this, &CAircraftCategoryTreeView::onExpanded, Qt::QueuedConnection);
}
void CAircraftCategoryTreeView::updateContainer(const CAircraftCategoryList &categories)
{
if (!this->categoryModel()) { return; }
this->categoryModel()->updateContainer(categories);
if (!this->isEmpty()) { this->expandAll(); }
//! \fixme 2019-02 workaround for HEAP: Free Heap block 000001AB439BFFF0 modified at 000001AB439C00BC after it was freed
// using Qt::QueuedConnection seems to fix for expand all
// also this->expandToDepth(0) seems to work
this->expandAll();
}
void CAircraftCategoryTreeView::clear()
@@ -86,18 +90,12 @@ namespace BlackGui
CAircraftCategory CAircraftCategoryTreeView::selectedObject() const
{
const QModelIndex index = this->currentIndex();
const QVariant data = this->model()->data(index.siblingAtColumn(0)); // supposed to be the callsign
const QVariant data = this->model()->data(index.siblingAtColumn(0));
const CAircraftCategoryTreeModel *model = this->categoryModel();
if (!model) { return CAircraftCategory(); }
return model->container().frontOrDefault();
}
QString CAircraftCategoryTreeView::suffixForIndex(const QModelIndex &index)
{
const QVariant data = this->model()->data(index); // supposed to be the suffix
return data.toString();
}
void CAircraftCategoryTreeView::onExpanded(const QModelIndex &index)
{
Q_UNUSED(index);

3
src/blackgui/views/aircraftcategorytreeview.h
View File

@@ -69,9 +69,6 @@ namespace BlackGui
//! The selected object
BlackMisc::Aviation::CAircraftCategory selectedObject() const;
//! Suffix for index
QString suffixForIndex(const QModelIndex &index);
//! Expanded
void onExpanded(const QModelIndex &index);