Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Use the real track length to scale waveforms #11162

Merged
merged 11 commits into from
Feb 20, 2023
Merged
Prev Previous commit
Next Next commit
Use WaveformWidgetRenderer::getWaveform() to remove some repetitions
daschuer committed Dec 28, 2022
commit 5ad1d7a86da93083bed934c02dafb8a1f761a3af
23 changes: 7 additions & 16 deletions src/waveform/renderers/glslwaveformrenderersignal.cpp
Original file line number Diff line number Diff line change
@@ -78,18 +78,14 @@ bool GLSLWaveformRendererSignal::loadShaders() {
}

bool GLSLWaveformRendererSignal::loadTexture() {
TrackPointer trackInfo = m_waveformRenderer->getTrackInfo();
ConstWaveformPointer pWaveform;
int dataSize = 0;
const WaveformData* data = nullptr;

if (trackInfo) {
pWaveform = trackInfo->getWaveform();
if (pWaveform) {
dataSize = pWaveform->getDataSize();
if (dataSize > 1) {
data = pWaveform->data();
}
ConstWaveformPointer pWaveform = m_waveformRenderer->getWaveform();
if (pWaveform) {
dataSize = pWaveform->getDataSize();
if (dataSize > 1) {
data = pWaveform->data();
}
}

@@ -222,7 +218,7 @@ void GLSLWaveformRendererSignal::onSetTrack() {

slotWaveformUpdated();

TrackPointer pTrack = m_waveformRenderer->getTrackInfo();
const TrackPointer pTrack = m_waveformRenderer->getTrackInfo();
if (!pTrack) {
return;
}
@@ -256,12 +252,7 @@ void GLSLWaveformRendererSignal::slotWaveformUpdated() {
}

void GLSLWaveformRendererSignal::draw(QPainter* painter, QPaintEvent* /*event*/) {
TrackPointer trackInfo = m_waveformRenderer->getTrackInfo();
if (!trackInfo) {
return;
}

ConstWaveformPointer pWaveform = trackInfo->getWaveform();
ConstWaveformPointer pWaveform = m_waveformRenderer->getWaveform();
if (pWaveform.isNull()) {
return;
}
7 changes: 1 addition & 6 deletions src/waveform/renderers/glvsynctestrenderer.cpp
Original file line number Diff line number Diff line change
@@ -34,12 +34,7 @@ void GLVSyncTestRenderer::draw(QPainter* painter, QPaintEvent* /*event*/) {

timer.start();

TrackPointer pTrack = m_waveformRenderer->getTrackInfo();
if (!pTrack) {
return;
}

ConstWaveformPointer pWaveform = pTrack->getWaveform();
ConstWaveformPointer pWaveform = m_waveformRenderer->getWaveform();
if (pWaveform.isNull()) {
return;
}
7 changes: 1 addition & 6 deletions src/waveform/renderers/glwaveformrendererfilteredsignal.cpp
Original file line number Diff line number Diff line change
@@ -25,12 +25,7 @@ void GLWaveformRendererFilteredSignal::onSetup(const QDomNode& /*node*/) {
void GLWaveformRendererFilteredSignal::draw(QPainter* painter, QPaintEvent* /*event*/) {
maybeInitializeGL();

TrackPointer pTrack = m_waveformRenderer->getTrackInfo();
if (!pTrack) {
return;
}

ConstWaveformPointer pWaveform = pTrack->getWaveform();
ConstWaveformPointer pWaveform = m_waveformRenderer->getWaveform();
if (pWaveform.isNull()) {
return;
}
7 changes: 1 addition & 6 deletions src/waveform/renderers/glwaveformrendererrgb.cpp
Original file line number Diff line number Diff line change
@@ -27,12 +27,7 @@ void GLWaveformRendererRGB::onSetup(const QDomNode& /* node */) {
void GLWaveformRendererRGB::draw(QPainter* painter, QPaintEvent* /*event*/) {
maybeInitializeGL();

TrackPointer pTrack = m_waveformRenderer->getTrackInfo();
if (!pTrack) {
return;
}

ConstWaveformPointer pWaveform = pTrack->getWaveform();
ConstWaveformPointer pWaveform = m_waveformRenderer->getWaveform();
if (pWaveform.isNull()) {
return;
}
7 changes: 1 addition & 6 deletions src/waveform/renderers/glwaveformrenderersimplesignal.cpp
Original file line number Diff line number Diff line change
@@ -27,12 +27,7 @@ inline void setPoint(QPointF& point, qreal x, qreal y) {
void GLWaveformRendererSimpleSignal::draw(QPainter* painter, QPaintEvent* /*event*/) {
maybeInitializeGL();

TrackPointer pTrack = m_waveformRenderer->getTrackInfo();
if (!pTrack) {
return;
}

ConstWaveformPointer pWaveform = pTrack->getWaveform();
ConstWaveformPointer pWaveform = m_waveformRenderer->getWaveform();
if (pWaveform.isNull()) {
return;
}
7 changes: 1 addition & 6 deletions src/waveform/renderers/qtvsynctestrenderer.cpp
Original file line number Diff line number Diff line change
@@ -33,12 +33,7 @@ void QtVSyncTestRenderer::draw(QPainter* pPainter, QPaintEvent* /*event*/) {

timer.start();

TrackPointer pTrack = m_waveformRenderer->getTrackInfo();
if (!pTrack) {
return;
}

ConstWaveformPointer pWaveform = pTrack->getWaveform();
ConstWaveformPointer pWaveform = m_waveformRenderer->getWaveform();
if (pWaveform.isNull()) {
return;
}
7 changes: 1 addition & 6 deletions src/waveform/renderers/qtwaveformrendererfilteredsignal.cpp
Original file line number Diff line number Diff line change
@@ -97,12 +97,7 @@ inline void setPoint(QPointF& point, qreal x, qreal y) {
int QtWaveformRendererFilteredSignal::buildPolygon() {
// We have to check the track is present because it might have been unloaded
// between the call to draw and the call to buildPolygon
TrackPointer pTrack = m_waveformRenderer->getTrackInfo();
if (!pTrack) {
return 0;
}

ConstWaveformPointer pWaveform = pTrack->getWaveform();
ConstWaveformPointer pWaveform = m_waveformRenderer->getWaveform();
if (pWaveform.isNull()) {
return 0;
}
8 changes: 1 addition & 7 deletions src/waveform/renderers/qtwaveformrenderersimplesignal.cpp
Original file line number Diff line number Diff line change
@@ -38,13 +38,7 @@ inline void setPoint(QPointF& point, qreal x, qreal y) {
}

void QtWaveformRendererSimpleSignal::draw(QPainter* painter, QPaintEvent* /*event*/) {

TrackPointer pTrack = m_waveformRenderer->getTrackInfo();
if (!pTrack) {
return;
}

ConstWaveformPointer pWaveform = pTrack->getWaveform();
ConstWaveformPointer pWaveform = m_waveformRenderer->getWaveform();
if (pWaveform.isNull()) {
return;
}
7 changes: 1 addition & 6 deletions src/waveform/renderers/waveformrendererfilteredsignal.cpp
Original file line number Diff line number Diff line change
@@ -30,12 +30,7 @@ void WaveformRendererFilteredSignal::onSetup(const QDomNode& node) {

void WaveformRendererFilteredSignal::draw(QPainter* painter,
QPaintEvent* /*event*/) {
const TrackPointer pTrackInfo = m_waveformRenderer->getTrackInfo();
if (!pTrackInfo) {
return;
}

ConstWaveformPointer pWaveform = pTrackInfo->getWaveform();
ConstWaveformPointer pWaveform = m_waveformRenderer->getWaveform();
if (pWaveform.isNull()) {
return;
}
12 changes: 4 additions & 8 deletions src/waveform/renderers/waveformrendererhsv.cpp
Original file line number Diff line number Diff line change
@@ -21,14 +21,10 @@ void WaveformRendererHSV::onSetup(const QDomNode& node) {
Q_UNUSED(node);
}

void WaveformRendererHSV::draw(QPainter* painter,
QPaintEvent* /*event*/) {
const TrackPointer pTrackInfo = m_waveformRenderer->getTrackInfo();
if (!pTrackInfo) {
return;
}

ConstWaveformPointer pWaveform = pTrackInfo->getWaveform();
void WaveformRendererHSV::draw(
QPainter* painter,
QPaintEvent* /*event*/) {
ConstWaveformPointer pWaveform = m_waveformRenderer->getWaveform();
if (pWaveform.isNull()) {
return;
}
12 changes: 4 additions & 8 deletions src/waveform/renderers/waveformrendererrgb.cpp
Original file line number Diff line number Diff line change
@@ -20,14 +20,10 @@ WaveformRendererRGB::~WaveformRendererRGB() {
void WaveformRendererRGB::onSetup(const QDomNode& /* node */) {
}

void WaveformRendererRGB::draw(QPainter* painter,
QPaintEvent* /*event*/) {
const TrackPointer pTrackInfo = m_waveformRenderer->getTrackInfo();
if (!pTrackInfo) {
return;
}

ConstWaveformPointer pWaveform = pTrackInfo->getWaveform();
void WaveformRendererRGB::draw(
QPainter* painter,
QPaintEvent* /*event*/) {
ConstWaveformPointer pWaveform = m_waveformRenderer->getWaveform();
if (pWaveform.isNull()) {
return;
}