← Back to branch summary

~oberling/mixxx/feature_first-beat-in-bar

« back to all changes in this revision

Viewing changes to mixxx/src/waveform/renderers/waveformrenderbeat.cpp

  • Committer: Stephan Bergemann
  • Date: 2013-03-24 00:02:06 UTC
  • Revision ID: stephan@deroberling.de-20130324000206-t79atghrs3e65vny
made first beat bar less bold; added a little efficiency;

Show diffs side-by-side

added added

removed removed

Lines of Context:
mixxx/src/waveform/renderers/waveformrenderbeat.cpp
93
93
    QPen highBeatPen(m_highBeatColor);
94
94
    highBeatPen.setWidth(1.5);
95
95
    QPen firstBeatInBarPen(m_firstBeatInBarColor);
96
 
    firstBeatInBarPen.setWidth(4);
 
96
    firstBeatInBarPen.setWidth(2.5);
97
97
 
98
98
    while (it->hasNext()) {
99
99
        int beatPosition = it->next();
100
100
        m_waveformRenderer->regulateVisualSample(beatPosition);
101
101
        double xBeatPoint = m_waveformRenderer->transformSampleIndexInRendererWorld(beatPosition);
102
102
 
 
103
        if (it->isFirstInBar()) {
 
104
            painter->setPen(firstBeatInBarPen);
 
105
        }
103
106
        //NOTE: (vRince) RJ should we keep this ?
104
 
        if (m_beatActive && m_beatActive->get() > 0.0 &&
105
 
            abs(xBeatPoint - m_waveformRenderer->getWidth()/2) < 20)
 
107
        else if (m_beatActive && m_beatActive->get() > 0.0 &&
 
108
            abs(xBeatPoint - m_waveformRenderer->getWidth()/2) < 20) {
106
109
            painter->setPen(highBeatPen);
107
 
        else
 
110
        } else {
108
111
            painter->setPen(beatPen);
109
 
 
110
 
        if(it->isFirstInBar()) {
111
 
            painter->setPen(firstBeatInBarPen);
112
112
        }
113
113
        
114
114
        painter->drawLine(QPointF(xBeatPoint, 0.f),