Update to experimental state in master :D #2

Merged
neuron303 merged 24 commits from master into master 2019-09-23 15:19:47 +02:00
9 changed files with 33 additions and 81 deletions
Showing only changes of commit 86b99ab8d2 - Show all commits

View File

@@ -56,11 +56,16 @@ void OsciWidget::paintEvent(QPaintEvent *event)
m_statsTimer.restart();
}
QPainter painter(this);
painter.drawPixmap(0, 0, m_pixmap);
}
void OsciWidget::updateFrameBuffer()
{
if (m_pixmap.size() != size())
m_pixmap = QPixmap(size());
QPainter painter;
painter.begin(&m_pixmap);
QPainter painter(&m_pixmap);
// darkening last frame
painter.setCompositionMode(QPainter::CompositionMode_Multiply);
@@ -100,21 +105,14 @@ void OsciWidget::paintEvent(QPaintEvent *event)
m_lastPoint = p;
}
painter.setOpacity(1);
painter.resetTransform();
painter.end();
painter.begin(this);
painter.drawPixmap(0, 0, m_pixmap);
painter.end();
m_buffer.clear();
}
void OsciWidget::timerEvent(QTimerEvent *event)
{
QWidget::timerEvent(event);
if (event->timerId() == m_redrawTimerId)
if (event->timerId() == m_redrawTimerId){
updateFrameBuffer();
repaint();
}
}

View File

@@ -39,6 +39,9 @@ protected:
void paintEvent(QPaintEvent *event) override;
void timerEvent(QTimerEvent *event) override;
private:
void updateFrameBuffer();
private:
float m_factor{2.f};
int m_fps{30}, m_afterglow{175};