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.

Sign up for GitHub

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

Fixes for issue 673 #674

Merged
merged 2 commits into from
Dec 7, 2021
Merged

Fixes for issue 673 #674

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
0cd597f
Fixed QVector overflow in both white and black SNR graphing functions
simoninns Dec 7, 2021
2709683
Fixed issue #673 by checking for valid pixmap before scaling for display
simoninns Dec 7, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion tools/ld-analyse/blacksnranalysisdialog.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,7 @@ void BlackSnrAnalysisDialog::startUpdate(qint32 _numberOfFrames)
{
removeChartContents();
numberOfFrames = _numberOfFrames;
tlPoint.resize(numberOfFrames);
tlPoint.resize(numberOfFrames + 1);
blackPoints->reserve(numberOfFrames);
}

Expand Down
10 changes: 6 additions & 4 deletions tools/ld-analyse/mainwindow.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -377,10 +377,12 @@ void MainWindow::updateFrameViewer()
else adjustment = Aspect::DAR_169_ADJ_525; // NTSC 16:9
}

// Scale and apply the pixmap
ui->frameViewerLabel->setPixmap(pixmap.scaled((scaleFactor * (pixmap.size().width() + adjustment)),
(scaleFactor * pixmap.size().height()),
Qt::IgnoreAspectRatio, Qt::SmoothTransformation));
// Scale and apply the pixmap (only if it's valid)
if (!pixmap.isNull()) {
ui->frameViewerLabel->setPixmap(pixmap.scaled((scaleFactor * (pixmap.size().width() + adjustment)),
(scaleFactor * pixmap.size().height()),
Qt::IgnoreAspectRatio, Qt::SmoothTransformation));
}

// Update the current frame markers on the graphs
blackSnrAnalysisDialog->updateFrameMarker(currentFrameNumber);
Expand Down
2 changes: 1 addition & 1 deletion tools/ld-analyse/whitesnranalysisdialog.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,7 @@ void WhiteSnrAnalysisDialog::startUpdate(qint32 _numberOfFrames)
{
removeChartContents();
numberOfFrames = _numberOfFrames;
tlPoint.resize(numberOfFrames);
tlPoint.resize(numberOfFrames + 1);
whitePoints->reserve(numberOfFrames);
}

Expand Down