Mercurial > hg > svgui
comparison view/Overview.cpp @ 1566:1f80a514ce29
Merge from branch spectrogram-export
| author | Chris Cannam |
|---|---|
| date | Fri, 10 Jan 2020 14:54:27 +0000 |
| parents | a0b2f3b4dd2f |
| children | a6e37c28d762 |
comparison
equal
deleted
inserted
replaced
| 1553:76e4302a3fc2 | 1566:1f80a514ce29 |
|---|---|
| 32 { | 32 { |
| 33 setObjectName(tr("Overview")); | 33 setObjectName(tr("Overview")); |
| 34 m_followPan = false; | 34 m_followPan = false; |
| 35 m_followZoom = false; | 35 m_followZoom = false; |
| 36 setPlaybackFollow(PlaybackIgnore); | 36 setPlaybackFollow(PlaybackIgnore); |
| 37 m_modelTestTime.start(); | 37 m_modelTestTimer.start(); |
| 38 | 38 |
| 39 bool light = hasLightBackground(); | 39 bool light = hasLightBackground(); |
| 40 if (light) m_boxColour = Qt::darkGray; | 40 if (light) m_boxColour = Qt::darkGray; |
| 41 else m_boxColour = Qt::lightGray; | 41 else m_boxColour = Qt::lightGray; |
| 42 } | 42 } |
| 55 if (zoomLevel != m_zoomLevel) { | 55 if (zoomLevel != m_zoomLevel) { |
| 56 zoomChanged = true; | 56 zoomChanged = true; |
| 57 } | 57 } |
| 58 | 58 |
| 59 if (!zoomChanged) { | 59 if (!zoomChanged) { |
| 60 if (m_modelTestTime.elapsed() < 1000) { | 60 if (m_modelTestTimer.elapsed() < 1000) { |
| 61 for (LayerList::const_iterator i = m_layerStack.begin(); | 61 for (LayerList::const_iterator i = m_layerStack.begin(); |
| 62 i != m_layerStack.end(); ++i) { | 62 i != m_layerStack.end(); ++i) { |
| 63 auto model = ModelById::get((*i)->getModel()); | 63 auto model = ModelById::get((*i)->getModel()); |
| 64 if (model && (!model->isOK() || !model->isReady())) { | 64 if (model && (!model->isOK() || !model->isReady())) { |
| 65 return; | 65 return; |
| 66 } | 66 } |
| 67 } | 67 } |
| 68 } else { | 68 } else { |
| 69 m_modelTestTime.restart(); | 69 m_modelTestTimer.restart(); |
| 70 } | 70 } |
| 71 } | 71 } |
| 72 | 72 |
| 73 View::modelChangedWithin(modelId, startFrame, endFrame); | 73 View::modelChangedWithin(modelId, startFrame, endFrame); |
| 74 } | 74 } |
