X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=src%2Fprofilesdialog.cpp;h=3b2d72e86db6cc63a6752d004658e9b566db5651;hb=56aee6aedeeed3efd10ada8fe3c229eddc01ef05;hp=9710e12c857e7da5bce2fb1ef97a9a77bc10aaa8;hpb=ad714e626d37b94307a43df649cc800e8dac9045;p=kdenlive diff --git a/src/profilesdialog.cpp b/src/profilesdialog.cpp index 9710e12c..3b2d72e8 100644 --- a/src/profilesdialog.cpp +++ b/src/profilesdialog.cpp @@ -26,7 +26,9 @@ #include #include +#include #include +#include ProfilesDialog::ProfilesDialog(QWidget * parent) : QDialog(parent), @@ -35,6 +37,12 @@ ProfilesDialog::ProfilesDialog(QWidget * parent) : { m_view.setupUi(this); + // Fill colorspace list (see mlt_profile.h) + m_view.colorspace->addItem(getColorspaceDescription(601), 601); + m_view.colorspace->addItem(getColorspaceDescription(709), 709); + m_view.colorspace->addItem(getColorspaceDescription(240), 240); + m_view.colorspace->addItem(getColorspaceDescription(0), 0); + QStringList profilesFilter; profilesFilter << "*"; @@ -53,7 +61,48 @@ ProfilesDialog::ProfilesDialog(QWidget * parent) : connect(m_view.button_delete, SIGNAL(clicked()), this, SLOT(slotDeleteProfile())); connect(m_view.button_default, SIGNAL(clicked()), this, SLOT(slotSetDefaultProfile())); - connect(m_view.description, SIGNAL(textChanged(const QString &)), this, SLOT(slotProfileEdited())); + connect(m_view.description, SIGNAL(textChanged(QString)), this, SLOT(slotProfileEdited())); + connect(m_view.frame_num, SIGNAL(valueChanged(int)), this, SLOT(slotProfileEdited())); + connect(m_view.frame_den, SIGNAL(valueChanged(int)), this, SLOT(slotProfileEdited())); + connect(m_view.aspect_num, SIGNAL(valueChanged(int)), this, SLOT(slotProfileEdited())); + connect(m_view.aspect_den, SIGNAL(valueChanged(int)), this, SLOT(slotProfileEdited())); + connect(m_view.display_num, SIGNAL(valueChanged(int)), this, SLOT(slotProfileEdited())); + connect(m_view.display_den, SIGNAL(valueChanged(int)), this, SLOT(slotProfileEdited())); + connect(m_view.progressive, SIGNAL(stateChanged(int)), this, SLOT(slotProfileEdited())); + connect(m_view.size_h, SIGNAL(valueChanged(int)), this, SLOT(slotProfileEdited())); + connect(m_view.size_w, SIGNAL(valueChanged(int)), this, SLOT(slotProfileEdited())); +} + + +ProfilesDialog::ProfilesDialog(QString profilePath, QWidget * parent) : + QDialog(parent), + m_profileIsModified(false), + m_isCustomProfile(true), + m_customProfilePath(profilePath) +{ + m_view.setupUi(this); + + // Fill colorspace list (see mlt_profile.h) + m_view.colorspace->addItem(getColorspaceDescription(601), 601); + m_view.colorspace->addItem(getColorspaceDescription(709), 709); + m_view.colorspace->addItem(getColorspaceDescription(240), 240); + m_view.colorspace->addItem(getColorspaceDescription(0), 0); + + QStringList profilesFilter; + profilesFilter << "*"; + + m_view.button_save->setIcon(KIcon("document-save")); + m_view.button_save->setToolTip(i18n("Save profile")); + m_view.button_create->setHidden(true); + m_view.profiles_list->setHidden(true); + m_view.button_delete->setHidden(true); + m_view.button_default->setHidden(true); + m_view.description->setEnabled(false); + + slotUpdateDisplay(profilePath); + connect(m_view.button_save, SIGNAL(clicked()), this, SLOT(slotSaveProfile())); + + connect(m_view.description, SIGNAL(textChanged(QString)), this, SLOT(slotProfileEdited())); connect(m_view.frame_num, SIGNAL(valueChanged(int)), this, SLOT(slotProfileEdited())); connect(m_view.frame_den, SIGNAL(valueChanged(int)), this, SLOT(slotProfileEdited())); connect(m_view.aspect_num, SIGNAL(valueChanged(int)), this, SLOT(slotProfileEdited())); @@ -70,7 +119,7 @@ void ProfilesDialog::slotProfileEdited() m_profileIsModified = true; } -void ProfilesDialog::fillList(const QString selectedProfile) +void ProfilesDialog::fillList(const QString &selectedProfile) { // List the Mlt profiles m_view.profiles_list->clear(); @@ -82,7 +131,7 @@ void ProfilesDialog::fillList(const QString selectedProfile) } if (!KdenliveSettings::default_profile().isEmpty()) { - for (int i = 0; i < m_view.profiles_list->count(); i++) { + for (int i = 0; i < m_view.profiles_list->count(); ++i) { if (m_view.profiles_list->itemData(i).toString() == KdenliveSettings::default_profile()) { m_view.profiles_list->setCurrentIndex(i); break; @@ -132,6 +181,10 @@ void ProfilesDialog::slotSetDefaultProfile() bool ProfilesDialog::slotSaveProfile() { + if (!m_customProfilePath.isEmpty()) { + saveProfile(m_customProfilePath); + return true; + } const QString profileDesc = m_view.description->text(); int ix = m_view.profiles_list->findText(profileDesc); if (ix != -1) { @@ -148,7 +201,7 @@ bool ProfilesDialog::slotSaveProfile() QString profilePath = KStandardDirs::locateLocal("appdata", customName + QString::number(i)); kDebug() << " TYING PROFILE FILE: " << profilePath; while (KIO::NetAccess::exists(KUrl(profilePath), KIO::NetAccess::SourceSide, this)) { - i++; + ++i; profilePath = KStandardDirs::locateLocal("appdata", customName + QString::number(i)); } saveProfile(profilePath); @@ -159,7 +212,7 @@ bool ProfilesDialog::slotSaveProfile() return true; } -void ProfilesDialog::saveProfile(const QString path) +void ProfilesDialog::saveProfile(QString path) { QFile file(path); if (!file.open(QIODevice::WriteOnly)) { @@ -167,7 +220,7 @@ void ProfilesDialog::saveProfile(const QString path) return; } QTextStream out(&file); - out << "description=" << m_view.description->text() << "\n" << "frame_rate_num=" << m_view.frame_num->value() << "\n" << "frame_rate_den=" << m_view.frame_den->value() << "\n" << "width=" << m_view.size_w->value() << "\n" << "height=" << m_view.size_h->value() << "\n" << "progressive=" << m_view.progressive->isChecked() << "\n" << "sample_aspect_num=" << m_view.aspect_num->value() << "\n" << "sample_aspect_den=" << m_view.aspect_den->value() << "\n" << "display_aspect_num=" << m_view.display_num->value() << "\n" << "display_aspect_den=" << m_view.display_den->value() << "\n"; + out << "description=" << m_view.description->text() << "\n" << "frame_rate_num=" << m_view.frame_num->value() << "\n" << "frame_rate_den=" << m_view.frame_den->value() << "\n" << "width=" << m_view.size_w->value() << "\n" << "height=" << m_view.size_h->value() << "\n" << "progressive=" << m_view.progressive->isChecked() << "\n" << "sample_aspect_num=" << m_view.aspect_num->value() << "\n" << "sample_aspect_den=" << m_view.aspect_den->value() << "\n" << "display_aspect_num=" << m_view.display_num->value() << "\n" << "display_aspect_den=" << m_view.display_den->value() << "\n" << "colorspace=" << m_view.colorspace->itemData(m_view.colorspace->currentIndex()).toInt() << "\n"; if (file.error() != QFile::NoError) { KMessageBox::error(this, i18n("Cannot write to file %1", path)); } @@ -184,7 +237,7 @@ void ProfilesDialog::slotDeleteProfile() } // static -MltVideoProfile ProfilesDialog::getVideoProfile(QString name) +MltVideoProfile ProfilesDialog::getVideoProfile(const QString &name) { MltVideoProfile result; QStringList profilesNames; @@ -225,21 +278,19 @@ MltVideoProfile ProfilesDialog::getVideoProfile(QString name) result.sample_aspect_den = confFile.entryMap().value("sample_aspect_den").toInt(); result.display_aspect_num = confFile.entryMap().value("display_aspect_num").toInt(); result.display_aspect_den = confFile.entryMap().value("display_aspect_den").toInt(); + result.colorspace = confFile.entryMap().value("colorspace").toInt(); return result; } // static -double ProfilesDialog::getStringEval(const MltVideoProfile &profile, QString eval) +double ProfilesDialog::getStringEval(const MltVideoProfile &profile, QString eval, const QPoint& frameSize) { - double result; - eval.replace("%width", QString::number(profile.width)); - eval.replace("%height", QString::number(profile.height)); - if (eval.contains('/')) result = (double) eval.section('/', 0, 0).toInt() / eval.section('/', 1, 1).toInt(); - else if (eval.contains('*')) result = (double) eval.section('*', 0, 0).toInt() * eval.section('*', 1, 1).toInt(); - else if (eval.contains('+')) result = (double) eval.section('+', 0, 0).toInt() + eval.section('+', 1, 1).toInt(); - else if (eval.contains('-')) result = (double) eval.section('-', 0, 0).toInt() - eval.section('-', 1, 1).toInt(); - else result = eval.toDouble(); - return result; + QScriptEngine sEngine; + sEngine.globalObject().setProperty("maxWidth", profile.width > frameSize.x() ? profile.width : frameSize.x()); + sEngine.globalObject().setProperty("maxHeight", profile.height > frameSize.y() ? profile.height : frameSize.y()); + sEngine.globalObject().setProperty("width", profile.width); + sEngine.globalObject().setProperty("height", profile.height); + return sEngine.evaluate(eval.remove('%')).toNumber(); } @@ -269,7 +320,7 @@ bool ProfilesDialog::existingProfileDescription(const QString &desc) } // static -QString ProfilesDialog::existingProfile(MltVideoProfile profile) +QString ProfilesDialog::existingProfile(const MltVideoProfile &profile) { // Check if the profile has a matching entry in existing ones QStringList profilesFilter; @@ -288,6 +339,7 @@ QString ProfilesDialog::existingProfile(MltVideoProfile profile) if (profile.frame_rate_den != confFile.entryMap().value("frame_rate_den").toInt()) continue; if (profile.frame_rate_num != confFile.entryMap().value("frame_rate_num").toInt()) continue; if (profile.progressive != confFile.entryMap().value("progressive").toInt()) continue; + if (profile.colorspace != confFile.entryMap().value("colorspace").toInt()) continue; return profilesFiles.at(i); } @@ -306,6 +358,7 @@ QString ProfilesDialog::existingProfile(MltVideoProfile profile) if (profile.frame_rate_den != confFile.entryMap().value("frame_rate_den").toInt()) continue; if (profile.frame_rate_num != confFile.entryMap().value("frame_rate_num").toInt()) continue; if (profile.progressive != confFile.entryMap().value("progressive").toInt()) continue; + if (profile.colorspace != confFile.entryMap().value("colorspace").toInt()) continue; return customProfiles.at(i) + profilesFiles.at(j); } } @@ -341,7 +394,7 @@ QMap ProfilesDialog::getProfilesInfo() } // static -QMap< QString, QString > ProfilesDialog::getSettingsFromFile(const QString path) +QMap< QString, QString > ProfilesDialog::getSettingsFromFile(const QString& path) { QStringList profilesNames; QStringList profilesFiles; @@ -360,7 +413,7 @@ QMap< QString, QString > ProfilesDialog::getSettingsFromFile(const QString path) } // static -QMap< QString, QString > ProfilesDialog::getSettingsForProfile(const QString profileName) +QMap< QString, QString > ProfilesDialog::getSettingsForProfile(const QString& profileName) { QStringList profilesNames; QStringList profilesFiles; @@ -395,11 +448,24 @@ QMap< QString, QString > ProfilesDialog::getSettingsForProfile(const QString pro } // static -QString ProfilesDialog::getPathFromProperties(int width, int height, double fps, bool useDisplayWidth) +bool ProfilesDialog::matchProfile(int width, int height, double fps, double par, bool isImage, const MltVideoProfile &profile) +{ + int profileWidth; + if (isImage) { + // when using image, compare with display width + profileWidth = profile.height * profile.display_aspect_num / profile.display_aspect_den + 0.5; + } else profileWidth = profile.width; + if (width != profileWidth || height != profile.height || (fps > 0 && qAbs((double) profile.frame_rate_num / profile.frame_rate_den - fps) > 0.4) || (!isImage && par > 0 && qAbs((double) profile.sample_aspect_num / profile.sample_aspect_den - par) > 0.1)) return false; + return true; +} + +// static +QMap ProfilesDialog::getProfilesFromProperties(int width, int height, double fps, double par, bool useDisplayWidth) { QStringList profilesNames; QStringList profilesFiles; QStringList profilesFilter; + QMap result; profilesFilter << "*"; // List the Mlt profiles profilesFiles = QDir(KdenliveSettings::mltpath()).entryList(profilesFilter, QDir::Files); @@ -411,8 +477,9 @@ QString ProfilesDialog::getPathFromProperties(int width, int height, double fps, else profileWidth = values.value("width").toInt(); if (profileWidth == width && values.value("height").toInt() == height) { double profile_fps = values.value("frame_rate_num").toDouble() / values.value("frame_rate_den").toDouble(); - if (fps <= 0 || qAbs(profile_fps - fps) < 0.5) - return profilesFiles.at(i); + double profile_par = values.value("sample_aspect_num").toDouble() / values.value("sample_aspect_den").toDouble(); + if ((fps <= 0 || qAbs(profile_fps - fps) < 0.5) && (par <= 0 || qAbs(profile_par - par) < 0.1)) + result.insert(profilesFiles.at(i), values.value("description")); } } @@ -428,16 +495,17 @@ QString ProfilesDialog::getPathFromProperties(int width, int height, double fps, else profileWidth = values.value("width").toInt(); if (profileWidth == width && values.value("height").toInt() == height) { double profile_fps = values.value("frame_rate_num").toDouble() / values.value("frame_rate_den").toDouble(); - if (fps <= 0 || qAbs(profile_fps - fps) < 0.5) - return customProfiles.at(i) + profiles.at(j); + double profile_par = values.value("sample_aspect_num").toDouble() / values.value("sample_aspect_den").toDouble(); + if ((fps <= 0 || qAbs(profile_fps - fps) < 0.5) && (par <= 0 || qAbs(profile_par - par) < 0.1)) + result.insert(customProfiles.at(i) + profiles.at(j), values.value("description")); } } } - return QString(); + return result; } // static -QString ProfilesDialog::getPathFromDescription(const QString profileDesc) +QString ProfilesDialog::getPathFromDescription(const QString& profileDesc) { QStringList profilesNames; QStringList profilesFiles; @@ -466,15 +534,17 @@ QString ProfilesDialog::getPathFromDescription(const QString profileDesc) } // static -void ProfilesDialog::saveProfile(MltVideoProfile &profile) +void ProfilesDialog::saveProfile(MltVideoProfile &profile, QString profilePath) { - int i = 0; - QString customName = "profiles/customprofile"; - QString profilePath = KStandardDirs::locateLocal("appdata", customName + QString::number(i)); - kDebug() << " TYING PROFILE FILE: " << profilePath; - while (KIO::NetAccess::exists(KUrl(profilePath), KIO::NetAccess::SourceSide, 0)) { - i++; + if (profilePath.isEmpty()) { + int i = 0; + QString customName = "profiles/customprofile"; profilePath = KStandardDirs::locateLocal("appdata", customName + QString::number(i)); + kDebug() << " TYING PROFILE FILE: " << profilePath; + while (KIO::NetAccess::exists(KUrl(profilePath), KIO::NetAccess::SourceSide, 0)) { + ++i; + profilePath = KStandardDirs::locateLocal("appdata", customName + QString::number(i)); + } } QFile file(profilePath); if (!file.open(QIODevice::WriteOnly)) { @@ -482,7 +552,7 @@ void ProfilesDialog::saveProfile(MltVideoProfile &profile) return; } QTextStream out(&file); - out << "description=" << profile.description << "\n" << "frame_rate_num=" << profile.frame_rate_num << "\n" << "frame_rate_den=" << profile.frame_rate_den << "\n" << "width=" << profile.width << "\n" << "height=" << profile.height << "\n" << "progressive=" << profile.progressive << "\n" << "sample_aspect_num=" << profile.sample_aspect_num << "\n" << "sample_aspect_den=" << profile.sample_aspect_den << "\n" << "display_aspect_num=" << profile.display_aspect_num << "\n" << "display_aspect_den=" << profile.display_aspect_den << "\n"; + out << "description=" << profile.description << "\n" << "frame_rate_num=" << profile.frame_rate_num << "\n" << "frame_rate_den=" << profile.frame_rate_den << "\n" << "width=" << profile.width << "\n" << "height=" << profile.height << "\n" << "progressive=" << profile.progressive << "\n" << "sample_aspect_num=" << profile.sample_aspect_num << "\n" << "sample_aspect_den=" << profile.sample_aspect_den << "\n" << "display_aspect_num=" << profile.display_aspect_num << "\n" << "display_aspect_den=" << profile.display_aspect_den << "\n" << "colorspace=" << profile.colorspace << "\n"; if (file.error() != QFile::NoError) { KMessageBox::error(0, i18n("Cannot write to file %1", profilePath)); } @@ -491,7 +561,7 @@ void ProfilesDialog::saveProfile(MltVideoProfile &profile) } -void ProfilesDialog::slotUpdateDisplay() +void ProfilesDialog::slotUpdateDisplay(QString currentProfile) { if (askForSave() == false) { m_view.profiles_list->blockSignals(true); @@ -499,9 +569,10 @@ void ProfilesDialog::slotUpdateDisplay() m_view.profiles_list->blockSignals(false); return; } - + QLocale locale; m_selectedProfileIndex = m_view.profiles_list->currentIndex(); - QString currentProfile = m_view.profiles_list->itemData(m_view.profiles_list->currentIndex()).toString(); + if (currentProfile.isEmpty()) + currentProfile = m_view.profiles_list->itemData(m_view.profiles_list->currentIndex()).toString(); m_isCustomProfile = currentProfile.contains('/'); m_view.button_create->setEnabled(true); m_view.button_delete->setEnabled(m_isCustomProfile); @@ -519,13 +590,40 @@ void ProfilesDialog::slotUpdateDisplay() m_view.frame_den->setValue(values.value("frame_rate_den").toInt()); m_view.progressive->setChecked(values.value("progressive").toInt()); if (values.value("progressive").toInt()) { - m_view.fields->setText(QString::number((double) values.value("frame_rate_num").toInt() / values.value("frame_rate_den").toInt(), 'f', 2)); + m_view.fields->setText(locale.toString((double) values.value("frame_rate_num").toInt() / values.value("frame_rate_den").toInt(), 'f', 2)); } else { - m_view.fields->setText(QString::number((double) 2 * values.value("frame_rate_num").toInt() / values.value("frame_rate_den").toInt(), 'f', 2)); + m_view.fields->setText(locale.toString((double) 2 * values.value("frame_rate_num").toInt() / values.value("frame_rate_den").toInt(), 'f', 2)); } + + int colorix = m_view.colorspace->findData(values.value("colorspace").toInt()); + if (colorix > -1) m_view.colorspace->setCurrentIndex(colorix); m_profileIsModified = false; } +//static +QString ProfilesDialog::getColorspaceDescription(int colorspace) +{ + //TODO: should the descriptions be translated? + switch (colorspace) { + case 601: + return QString("ITU-R 601"); + case 709: + return QString("ITU-R 709"); + case 240: + return QString("SMPTE240M"); + default: + return i18n("Unknown"); + } +} + +//static +int ProfilesDialog::getColorspaceFromDescription(const QString &description) +{ + //TODO: should the descriptions be translated? + if (description == "SMPTE240M") return 240; + if (description == "ITU-R 709") return 709; + return 601; +} #include "profilesdialog.moc"