Mercurial > hg > svgui
comparison view/View.cpp @ 1487:c3cc36c014b8
Fix failure to show alignment progress bar
author | Chris Cannam |
---|---|
date | Thu, 18 Jul 2019 13:18:19 +0100 |
parents | 0e971e3d93e2 |
children | c83504eb2649 |
comparison
equal
deleted
inserted
replaced
1486:ac0a8addabcf | 1487:c3cc36c014b8 |
---|---|
1781 int completion = i->first->getCompletion(this); | 1781 int completion = i->first->getCompletion(this); |
1782 QString text = i->first->getPropertyContainerName(); | 1782 QString text = i->first->getPropertyContainerName(); |
1783 QString error = i->first->getError(this); | 1783 QString error = i->first->getError(this); |
1784 | 1784 |
1785 #ifdef DEBUG_PROGRESS_STUFF | 1785 #ifdef DEBUG_PROGRESS_STUFF |
1786 SVCERR << "View[" << this << "]::checkProgress(" << object << "): " | 1786 SVCERR << "View[" << this << "]::checkProgress(" << modelId << "): " |
1787 << "found progress bar " << pb << " for layer at height " << ph | 1787 << "found progress bar " << pb << " for layer at height " << ph |
1788 << ": completion = " << completion << endl; | 1788 << ": completion = " << completion << endl; |
1789 #endif | 1789 #endif |
1790 | 1790 |
1791 if (error != "" && error != m_lastError) { | 1791 if (error != "" && error != m_lastError) { |
1814 // - they aren't usually all that expensive, and | 1814 // - they aren't usually all that expensive, and |
1815 // it would leave things in a very uncertain state | 1815 // it would leave things in a very uncertain state |
1816 showCancelButton = false; | 1816 showCancelButton = false; |
1817 | 1817 |
1818 #ifdef DEBUG_PROGRESS_STUFF | 1818 #ifdef DEBUG_PROGRESS_STUFF |
1819 SVCERR << "View[" << this << "]::checkProgress(" << object << "): " | 1819 SVCERR << "View[" << this << "]::checkProgress(" << modelId << "): " |
1820 << "alignment completion = " << completion << endl; | 1820 << "alignment completion = " << completion << endl; |
1821 #endif | 1821 #endif |
1822 | 1822 |
1823 if (completion < 100) { | 1823 if (completion < 100) { |
1824 text = tr("Alignment"); | 1824 text = tr("Alignment"); |
1873 } | 1873 } |
1874 } | 1874 } |
1875 | 1875 |
1876 if (!found) { | 1876 if (!found) { |
1877 #ifdef DEBUG_PROGRESS_STUFF | 1877 #ifdef DEBUG_PROGRESS_STUFF |
1878 SVCERR << "View[" << this << "]::checkProgress(" << object << "): " | 1878 SVCERR << "View[" << this << "]::checkProgress(" << modelId << "): " |
1879 << "failed to find layer " << object << " in progress map" | 1879 << "failed to find layer for model in progress map" |
1880 << endl; | 1880 << endl; |
1881 #endif | 1881 #endif |
1882 } | 1882 } |
1883 } | 1883 } |
1884 | 1884 |