Mercurial > hg > tony
comparison src/MainWindow.cpp @ 120:8ed567d30e34
Use a "shadow layer" for waveform in main pane -- not sure this is an improvement actually, but it does give us options
author | Chris Cannam |
---|---|
date | Wed, 08 Jan 2014 17:48:09 +0000 |
parents | 291381b0340c |
children | f2b8cff703ed |
comparison
equal
deleted
inserted
replaced
119:925fa585e9e4 | 120:8ed567d30e34 |
---|---|
105 cdb->addColour(Qt::darkRed, tr("Red")); | 105 cdb->addColour(Qt::darkRed, tr("Red")); |
106 cdb->addColour(Qt::darkBlue, tr("Blue")); | 106 cdb->addColour(Qt::darkBlue, tr("Blue")); |
107 cdb->addColour(Qt::darkGreen, tr("Green")); | 107 cdb->addColour(Qt::darkGreen, tr("Green")); |
108 cdb->addColour(QColor(200, 50, 255), tr("Purple")); | 108 cdb->addColour(QColor(200, 50, 255), tr("Purple")); |
109 cdb->addColour(QColor(255, 150, 50), tr("Orange")); | 109 cdb->addColour(QColor(255, 150, 50), tr("Orange")); |
110 cdb->addColour(QColor(180, 180, 180), tr("Grey")); | |
110 cdb->setUseDarkBackground(cdb->addColour(Qt::white, tr("White")), true); | 111 cdb->setUseDarkBackground(cdb->addColour(Qt::white, tr("White")), true); |
111 cdb->setUseDarkBackground(cdb->addColour(Qt::red, tr("Bright Red")), true); | 112 cdb->setUseDarkBackground(cdb->addColour(Qt::red, tr("Bright Red")), true); |
112 cdb->setUseDarkBackground(cdb->addColour(QColor(30, 150, 255), tr("Bright Blue")), true); | 113 cdb->setUseDarkBackground(cdb->addColour(QColor(30, 150, 255), tr("Bright Blue")), true); |
113 cdb->setUseDarkBackground(cdb->addColour(Qt::green, tr("Bright Green")), true); | 114 cdb->setUseDarkBackground(cdb->addColour(Qt::green, tr("Bright Green")), true); |
114 cdb->setUseDarkBackground(cdb->addColour(QColor(225, 74, 255), tr("Bright Purple")), true); | 115 cdb->setUseDarkBackground(cdb->addColour(QColor(225, 74, 255), tr("Bright Purple")), true); |
153 scroll->setWidgetResizable(true); | 154 scroll->setWidgetResizable(true); |
154 scroll->setHorizontalScrollBarPolicy(Qt::ScrollBarAlwaysOff); | 155 scroll->setHorizontalScrollBarPolicy(Qt::ScrollBarAlwaysOff); |
155 scroll->setFrameShape(QFrame::NoFrame); | 156 scroll->setFrameShape(QFrame::NoFrame); |
156 | 157 |
157 // We have a pane stack: it comes with the territory. However, we | 158 // We have a pane stack: it comes with the territory. However, we |
158 // have a fixed and known number of panes in it (e.g. 1) -- it | 159 // have a fixed and known number of panes in it -- it isn't |
159 // isn't variable | 160 // variable |
160 m_paneStack->setLayoutStyle(PaneStack::NoPropertyStacks); | 161 m_paneStack->setLayoutStyle(PaneStack::NoPropertyStacks); |
161 scroll->setWidget(m_paneStack); | 162 scroll->setWidget(m_paneStack); |
162 | 163 |
163 m_overview = new Overview(frame); | 164 m_overview = new Overview(frame); |
164 m_overview->setViewManager(m_viewManager); | 165 m_overview->setViewManager(m_viewManager); |
1497 if (model) { | 1498 if (model) { |
1498 if (m_paneStack) { | 1499 if (m_paneStack) { |
1499 Pane *pane = m_paneStack->getCurrentPane(); | 1500 Pane *pane = m_paneStack->getCurrentPane(); |
1500 if (!pane) { | 1501 if (!pane) { |
1501 pane = m_paneStack->addPane(); | 1502 pane = m_paneStack->addPane(); |
1502 | |
1503 //!!! ugly. a waveform "shadow layer" might be nicer | |
1504 Pane *p2 = m_paneStack->addPane(); | |
1505 p2->setFixedHeight(60); | |
1506 m_document->addLayerToView | |
1507 (p2, | |
1508 m_document->createMainModelLayer(LayerFactory::TimeRuler)); | |
1509 m_document->addLayerToView | |
1510 (p2, | |
1511 m_document->createMainModelLayer(LayerFactory::Waveform)); | |
1512 m_paneStack->sizePanesEqually(); | |
1513 } | 1503 } |
1514 if (pane) { | 1504 if (pane) { |
1515 m_analyser->newFileLoaded | 1505 m_analyser->newFileLoaded |
1516 (m_document, getMainModel(), m_paneStack, pane); | 1506 (m_document, getMainModel(), m_paneStack, pane); |
1517 } | 1507 } |