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

Jump to bottom

Bug fix to 4:3 PNG save in ld-analyse #538

Merged
merged 1 commit into from
Aug 14, 2020
Merged

Bug fix to 4:3 PNG save in ld-analyse #538

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
31 changes: 14 additions & 17 deletions tools/ld-analyse/mainwindow.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -482,31 +482,28 @@ void MainWindow::on_actionSave_frame_as_PNG_triggered()
filenameSuggestion,
tr("PNG image (*.png);;All Files (*)"));

// Get the required width and height taking into account the designed aspect ratio
qint32 adjustment = 0;
if (aspect43On) {
if (tbcSource.getIsSourcePal()) adjustment = 196; // PAL
else adjustment = 150; // NTSC
}

// Was a filename specified?
if (!pngFilename.isEmpty() && !pngFilename.isNull()) {
// Save the current frame as a PNG
qDebug() << "MainWindow::on_actionSave_frame_as_PNG_triggered(): Saving current frame as" << pngFilename;

// Generate the current frame and save it
bool result = false;
// Generate QImage for the current frame
QImage imageToSave = tbcSource.getFrameImage(currentFrameNumber);

// Change to 4:3 aspect ratio?
if (aspect43On) {
// Save in 4:3 aspect
result = tbcSource.getFrameImage(currentFrameNumber).scaled((ui->frameViewerLabel->pixmap()->size().width() - adjustment),
(ui->frameViewerLabel->pixmap()->size().height()),
Qt::IgnoreAspectRatio, Qt::SmoothTransformation).save(pngFilename);
} else {
// Save in 1:1 aspect
result = tbcSource.getFrameImage(currentFrameNumber).save(pngFilename);
// Scale to 4:3 aspect
qint32 adjustment = 0;
if (tbcSource.getIsSourcePal()) adjustment = 196; // PAL
else adjustment = 150; // NTSC

imageToSave = imageToSave.scaled((imageToSave.size().width() - adjustment),
(imageToSave.size().height()),
Qt::IgnoreAspectRatio, Qt::SmoothTransformation);
}

if (!result) {
// Save the QImage as PNG
if (!imageToSave.save(pngFilename)) {
qDebug() << "MainWindow::on_actionSave_frame_as_PNG_triggered(): Failed to save file as" << pngFilename;

QMessageBox messageBox;
Expand Down