Download-Tools/mkvtoolnix
1
0
Fork 0
mirror of https://gitlab.com/mbunkus/mkvtoolnix.git synced 2024-12-28 13:57:22 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

GUI: headers: calculate top level pages on the fly, no caching

Browse Source 
Part of the implementation of #3227.
This commit is contained in:
Moritz Bunkus 2021-11-13 20:30:55 +01:00
parent a726913c45
commit d815f46156
No known key found for this signature in database
GPG Key ID: 74AF00ADF2E32C85
3 changed files with 23 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
src/mkvtoolnix-gui/header_editor/page_model.cpp
View File

@ -53,8 +53,6 @@ PageModel::appendPage(PageBase *page,
page->setItems(newItems);
m_pages[pageId] = page;
if (!parentIdx.isValid())
m_topLevelPages << page;
}
bool
@ -66,10 +64,6 @@ PageModel::deletePage(PageBase *page) {
m_pages.remove(pageId);
delete page;
auto idx = m_topLevelPages.indexOf(page);
if (-1 != idx)
m_topLevelPages.removeAt(idx);
return true;
}
@ -83,23 +77,36 @@ PageModel::pages()
return pages;
}
QList<PageBase *> const &
QList<PageBase *>
PageModel::topLevelPages()
const {
return m_topLevelPages;
auto rootItem = invisibleRootItem();
QList<PageBase *> pages;
pages.reserve(rootItem->rowCount());
for (int row = 0, numRows = rootItem->rowCount(); row < numRows; ++row) {
auto topLevelItem = rootItem->child(row);
auto pageId = topLevelItem->data(Util::HeaderEditorPageIdRole).value<int>();
pages << m_pages[pageId];
}
return pages;
}
QList<PageBase *>
PageModel::allExpandablePages()
const {
auto pages = m_topLevelPages;
auto allTopLevelPages = topLevelPages();
auto expandablePages = allTopLevelPages;
for (auto const &page : m_topLevelPages)
for (auto const &page : allTopLevelPages)
for (auto const &subPage : page->m_children)
if (dynamic_cast<TopLevelPage *>(subPage))
pages << static_cast<TopLevelPage *>(subPage);
expandablePages << static_cast<TopLevelPage *>(subPage);
return pages;
return expandablePages;
}
void
@ -110,7 +117,6 @@ PageModel::reset() {
delete page;
m_pages.clear();
m_topLevelPages.clear();
removeRows(0, rowCount());
@ -120,7 +126,7 @@ PageModel::reset() {
QModelIndex
PageModel::validate()
const {
for (auto page : m_topLevelPages) {
for (auto page : topLevelPages()) {
auto result = page->validate();
if (result.isValid())
return result;

3
src/mkvtoolnix-gui/header_editor/page_model.h
View File

@ -16,7 +16,6 @@ class PageModel: public QStandardItemModel {
Q_OBJECT
protected:
QHash<int, PageBase *> m_pages;
QList<PageBase *> m_topLevelPages;
int m_pageId{};
QModelIndex m_lastSelectedIdx;
@ -30,7 +29,7 @@ public:
bool deletePage(PageBase *page);
QList<PageBase *> pages() const;
QList<PageBase *> const &topLevelPages() const;
QList<PageBase *> topLevelPages() const;
QList<PageBase *> allExpandablePages() const;
void reset();

6
src/mkvtoolnix-gui/header_editor/tab.cpp
View File

@ -407,8 +407,7 @@ Tab::title()
PageBase *
Tab::hasBeenModified() {
auto &pages = m_model->topLevelPages();
for (auto const &page : pages) {
for (auto const &page : m_model->topLevelPages()) {
auto modifiedPage = page->hasBeenModified();
if (modifiedPage)
return modifiedPage;
@ -476,8 +475,7 @@ Tab::determineTrackUIDChanges() {
void
Tab::doModifications() {
auto &pages = m_model->topLevelPages();
for (auto const &page : pages)
for (auto const &page : m_model->topLevelPages())
page->doModifications();
pruneEmptyMastersForAllTracks();