Mike-Solar
bb40b4923e
Automated with clang-tidy readability-identifier-naming (config added to .clang-tidy) plus scripted passes, per the updated rules now documented in CONTRIBUTING.md: - types (class/struct/enum/alias/template params): PascalCase - functions, variables, members: snake_case (incl. rational -> Rational) - private/protected members: trailing underscore; static member variables likewise (instance_, available_themes_) - constants and enum values: snake_case (kLinear -> k_linear, F32P -> f32p); ALL_CAPS reserved for macros - macros: OAK_ prefix (OLIVE_ADD_TEST/OLIVE_ASSERT/OLIVE_CONFIG -> OAK_ADD_TEST/OAK_ASSERT/OAK_CONFIG, GL_PREAMBLE -> OAK_GL_PREAMBLE, include guards -> OAK_*) - file names: all lowercase (Current/Plugin/OliveHost/OliveClip/ OlivePluginInstance -> current/plugin/olivehost/oliveclip/ oliveplugininstance) - getters share the member name sans underscore, setters set_foo() - Qt and third-party (OpenFX) virtual overrides and framework callbacks keep their original names (exempt in .clang-tidy) Manual follow-ups required where automation could not reach: - string-based QMetaObject/SIGNAL/SLOT references updated to renamed methods (AddTask, CreatedFile, DeleteSpecificFile, moveSelectionUp, ...) - macro bodies referencing renamed methods (OLIVE_CONFIG, NODE_DEFAULT_DESTRUCTOR, MANAGEDDISPLAYWIDGET_*) - self-shadowing locals renamed where signals/methods became same-named (size_changed, worker_count, selected_items, import param, filters) - third_party OFX member/namespace usages restored (OFX::Host::*, _created, _clipPrefsDirty, createInstance, clearPersistentMessage) - STL protocol aliases restored (const_iterator) with .clang-tidy ignore rules; qHash overloads restored Full build and test suite pass: ctest 4/4, ~1960 gtest cases green.
109 lines
2.5 KiB
C++
109 lines
2.5 KiB
C++
/***
|
|
|
|
Olive - Non-Linear Video Editor
|
|
Copyright (C) 2022 Olive Team
|
|
Modifications Copyright (C) 2025 mikesolar
|
|
|
|
This program is free software: you can redistribute it and/or modify
|
|
it under the terms of the GNU General Public License as published by
|
|
the Free Software Foundation, either version 3 of the License, or
|
|
(at your option) any later version.
|
|
|
|
This program is distributed in the hope that it will be useful,
|
|
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
GNU General Public License for more details.
|
|
|
|
You should have received a copy of the GNU General Public License
|
|
along with this program. If not, see <http://www.gnu.org/licenses/>.
|
|
|
|
***/
|
|
|
|
#include "viewerwindow.h"
|
|
|
|
#include <QKeyEvent>
|
|
#include <QVBoxLayout>
|
|
|
|
namespace olive
|
|
{
|
|
|
|
ViewerWindow::ViewerWindow(QWidget *parent)
|
|
: QWidget(parent, Qt::Window | Qt::WindowStaysOnTopHint)
|
|
, pixel_aspect_(1)
|
|
{
|
|
QVBoxLayout *layout = new QVBoxLayout(this);
|
|
layout->setContentsMargins(0, 0, 0, 0);
|
|
layout->setSpacing(0);
|
|
|
|
display_widget_ = new ViewerDisplayWidget();
|
|
layout->addWidget(display_widget_);
|
|
}
|
|
|
|
ViewerDisplayWidget *ViewerWindow::display_widget() const
|
|
{
|
|
return display_widget_;
|
|
}
|
|
|
|
void ViewerWindow::set_video_params(const VideoParams ¶ms)
|
|
{
|
|
width_ = params.width();
|
|
height_ = params.height();
|
|
pixel_aspect_ = params.pixel_aspect_ratio();
|
|
|
|
update_matrix();
|
|
}
|
|
|
|
void ViewerWindow::set_resolution(int width, int height)
|
|
{
|
|
width_ = width;
|
|
height_ = height;
|
|
|
|
update_matrix();
|
|
}
|
|
|
|
void ViewerWindow::set_pixel_aspect_ratio(const Rational &pixel_aspect)
|
|
{
|
|
pixel_aspect_ = pixel_aspect;
|
|
|
|
update_matrix();
|
|
}
|
|
|
|
void ViewerWindow::keyPressEvent(QKeyEvent *e)
|
|
{
|
|
QWidget::keyPressEvent(e);
|
|
|
|
if (e->key() == Qt::Key_Escape) {
|
|
close();
|
|
}
|
|
}
|
|
|
|
void ViewerWindow::closeEvent(QCloseEvent *e)
|
|
{
|
|
QWidget::closeEvent(e);
|
|
|
|
deleteLater();
|
|
}
|
|
|
|
void ViewerWindow::update_matrix()
|
|
{
|
|
// Set GL widget matrix to maintain this texture's aspect ratio
|
|
double window_ar = static_cast<double>(this->width()) /
|
|
static_cast<double>(this->height());
|
|
double image_ar = static_cast<double>(width_) /
|
|
static_cast<double>(height_) * pixel_aspect_.to_double();
|
|
|
|
QMatrix4x4 mat;
|
|
|
|
if (window_ar > image_ar) {
|
|
// Window is wider than image, adjust X scale
|
|
mat.scale(image_ar / window_ar, 1.0f, 1.0f);
|
|
} else if (window_ar < image_ar) {
|
|
// Window is taller than image, adjust Y scale
|
|
mat.scale(1.0f, window_ar / image_ar, 1.0f);
|
|
}
|
|
|
|
display_widget_->set_matrix_zoom(mat);
|
|
}
|
|
|
|
}
|