Mercurial > hg > svgui
comparison view/Overview.cpp @ 842:8432d2551fb2 tonioni
Update subrepos and merge from default branch
author | Chris Cannam |
---|---|
date | Tue, 02 Sep 2014 16:23:48 +0100 |
parents | 7792b7667f74 |
children | c17719e488c9 |
comparison
equal
deleted
inserted
replaced
826:43256b925e15 | 842:8432d2551fb2 |
---|---|
23 #include <iostream> | 23 #include <iostream> |
24 | 24 |
25 //#define DEBUG_OVERVIEW 1 | 25 //#define DEBUG_OVERVIEW 1 |
26 | 26 |
27 | 27 |
28 | |
29 | |
30 Overview::Overview(QWidget *w) : | 28 Overview::Overview(QWidget *w) : |
31 View(w, false), | 29 View(w, false), |
32 m_clickedInRange(false) | 30 m_clickedInRange(false) |
33 { | 31 { |
34 setObjectName(tr("Overview")); | 32 setObjectName(tr("Overview")); |
52 zoomChanged = true; | 50 zoomChanged = true; |
53 } | 51 } |
54 | 52 |
55 if (!zoomChanged) { | 53 if (!zoomChanged) { |
56 if (m_modelTestTime.elapsed() < 1000) { | 54 if (m_modelTestTime.elapsed() < 1000) { |
57 for (LayerList::const_iterator i = m_layers.begin(); | 55 for (LayerList::const_iterator i = m_layerStack.begin(); |
58 i != m_layers.end(); ++i) { | 56 i != m_layerStack.end(); ++i) { |
59 if ((*i)->getModel() && | 57 if ((*i)->getModel() && |
60 (!(*i)->getModel()->isOK() || | 58 (!(*i)->getModel()->isOK() || |
61 !(*i)->getModel()->isReady())) { | 59 !(*i)->getModel()->isReady())) { |
62 return; | 60 return; |
63 } | 61 } |