From a6edf645eb82c754209106593018b410c9422431 Mon Sep 17 00:00:00 2001 From: AL <26797547+Al12rs@users.noreply.github.com> Date: Fri, 30 Oct 2020 01:52:27 +0100 Subject: Add advanced counters as tooltip to general conflicts tab. Loose, archive, totals, percentages. --- src/modinfodialogconflicts.cpp | 96 +++++++++++++++++++++++++++++++++++++----- 1 file changed, 85 insertions(+), 11 deletions(-) (limited to 'src/modinfodialogconflicts.cpp') diff --git a/src/modinfodialogconflicts.cpp b/src/modinfodialogconflicts.cpp index 06f0a31c..358571d6 100644 --- a/src/modinfodialogconflicts.cpp +++ b/src/modinfodialogconflicts.cpp @@ -625,10 +625,7 @@ void GeneralConflictsTab::restoreState(const Settings& s) bool GeneralConflictsTab::update() { clear(); - - int numNonConflicting = 0; - int numOverwrite = 0; - int numOverwritten = 0; + m_counts.clear(); if (m_tab->origin() != nullptr) { const auto rootPath = m_tab->mod().absolutePath(); @@ -640,29 +637,46 @@ bool GeneralConflictsTab::update() bool archive = false; const int fileOrigin = file->getOrigin(archive); + + ++m_counts.numTotalFiles; + const auto& alternatives = file->getAlternatives(); if (fileOrigin == m_tab->origin()->getID()) { + // current mod is primary origin, the winner + (archive) ? ++m_counts.numTotalArchive : ++m_counts.numTotalLoose; + if (!alternatives.empty()) { m_overwriteModel->add(createOverwriteItem( file->getIndex(), archive, std::move(fileName), std::move(relativeName), alternatives)); - ++numOverwrite; + ++m_counts.numOverwrite; + (archive) ? ++m_counts.numOverwriteArchive : ++m_counts.numOverwriteLoose; } else { // otherwise, put the file in the noconflict tree m_noConflictModel->add(createNoConflictItem( file->getIndex(), archive, std::move(fileName), std::move(relativeName))); - ++numNonConflicting; + ++m_counts.numNonConflicting; + (archive) ? ++m_counts.numNonConflictingArchive : ++m_counts.numNonConflictingLoose; } } else { + auto currId = m_tab->origin()->getID(); + auto currModAlt = std::find_if(alternatives.begin(), alternatives.end(), + [&currId](auto const& alt) { + return currId == alt.first; + }); + bool currModFileArchive = currModAlt->second.first.size() > 0; + m_overwrittenModel->add(createOverwrittenItem( file->getIndex(), fileOrigin, archive, std::move(fileName), std::move(relativeName))); - ++numOverwritten; + ++m_counts.numOverwritten; + (currModFileArchive) ? ++m_counts.numOverwrittenArchive : ++m_counts.numOverwrittenLoose; + (currModFileArchive) ? ++m_counts.numTotalArchive : ++m_counts.numTotalLoose; } } @@ -671,11 +685,9 @@ bool GeneralConflictsTab::update() m_noConflictModel->finished(); } - ui->overwriteCount->display(numOverwrite); - ui->overwrittenCount->display(numOverwritten); - ui->noConflictCount->display(numNonConflicting); + updateUICounters(); - return (numOverwrite > 0 || numOverwritten > 0); + return (m_counts.numOverwrite > 0 || m_counts.numOverwritten > 0); } ConflictItem GeneralConflictsTab::createOverwriteItem( @@ -723,6 +735,68 @@ ConflictItem GeneralConflictsTab::createOverwrittenItem( index, std::move(fileName), true, std::move(altOrigin), archive); } +QString percent(int a, int b) { + if (b == 0) { + return QString::number(0, 'f', 2); + } + return QString::number((((float)a / (float)b) * 100), 'f', 2); +} + +void GeneralConflictsTab::updateUICounters() +{ + ui->overwriteCount->display(m_counts.numOverwrite); + ui->overwrittenCount->display(m_counts.numOverwritten); + ui->noConflictCount->display(m_counts.numNonConflicting); + + QString tooltipBase = tr("
| Type | %1 | Total | Percent |
|---|---|---|---|
| Loose files: | " + "%2 | %3 | %4% |
| Archive files: | " + "%5 | %6 | %7% |
| Combined: | " + "%8 | %9 | %10% |