Replaces blend pixmap with fillRect

This commit is contained in:
Gitea
2019-08-30 12:38:15 +02:00
parent 8d402dd86c
commit 41d557743a
2 changed files with 5 additions and 11 deletions

View File

@@ -22,7 +22,6 @@ OsciWidget::OsciWidget(QWidget *parent) :
{ {
restartTimer(); restartTimer();
resizePixmap(); resizePixmap();
createBlendPixmap();
} }
int OsciWidget::framerate() const int OsciWidget::framerate() const
@@ -60,7 +59,6 @@ void OsciWidget::setBlend(int blend)
qDebug() << "change blend to" << blend; qDebug() << "change blend to" << blend;
m_blend = blend; m_blend = blend;
createBlendPixmap();
} }
void OsciWidget::setFactor(float factor) void OsciWidget::setFactor(float factor)
@@ -109,10 +107,11 @@ void OsciWidget::paintEvent(QPaintEvent *event)
painter.begin(this); painter.begin(this);
painter.drawPixmap(0, 0, m_pixmap); painter.drawPixmap(0, 0, m_pixmap);
painter.end(); painter.end();
// Fade pixmap by multiplying all pixels by m_blend
painter.begin(&m_pixmap); painter.begin(&m_pixmap);
painter.setCompositionMode(QPainter::CompositionMode_Multiply); painter.setCompositionMode(QPainter::CompositionMode_Multiply);
painter.drawPixmap(0, 0, m_fadeoutPixmap); painter.fillRect(m_pixmap.rect(), QColor(m_blend,m_blend,m_blend));
painter.end(); painter.end();
} }
@@ -131,7 +130,6 @@ void OsciWidget::resizeEvent(QResizeEvent *event)
Q_UNUSED(event) Q_UNUSED(event)
resizePixmap(); resizePixmap();
createBlendPixmap();
} }
void OsciWidget::restartTimer() void OsciWidget::restartTimer()
@@ -142,14 +140,11 @@ void OsciWidget::restartTimer()
m_timerId = startTimer(1000/m_framerate); m_timerId = startTimer(1000/m_framerate);
} }
{
}
void OsciWidget::resizePixmap() void OsciWidget::resizePixmap()
{ {
m_pixmap = QPixmap(size()); m_pixmap = QPixmap(size());
m_pixmap.fill(QColor()); m_pixmap.fill(QColor());
} }
void OsciWidget::createBlendPixmap()
{
m_fadeoutPixmap = QPixmap(size());
m_fadeoutPixmap.fill(QColor(m_blend, m_blend, m_blend));
}

View File

@@ -46,7 +46,6 @@ private:
float m_factor{4.f}; float m_factor{4.f};
QPixmap m_pixmap; QPixmap m_pixmap;
QPixmap m_fadeoutPixmap;
std::optional<QPoint> m_lastPoint; std::optional<QPoint> m_lastPoint;
}; };