connect(this, SIGNAL(processNextThumbnail()), this, SLOT(slotProcessNextThumbnail()));
connect(m_listView, SIGNAL(projectModified()), this, SIGNAL(projectModified()));
connect(m_listView, SIGNAL(itemSelectionChanged()), this, SLOT(slotClipSelected()));
- connect(m_listView, SIGNAL(focusMonitor()), this, SIGNAL(raiseClipMonitor()));
+ connect(m_listView, SIGNAL(focusMonitor(bool)), this, SIGNAL(raiseClipMonitor(bool)));
connect(m_listView, SIGNAL(pauseMonitor()), this, SIGNAL(pauseMonitor()));
connect(m_listView, SIGNAL(requestMenu(const QPoint &, QTreeWidgetItem *)), this, SLOT(slotContextMenu(const QPoint &, QTreeWidgetItem *)));
connect(m_listView, SIGNAL(addClip()), this, SIGNAL(pauseMonitor()));
kDebug() << "Result: " << p.key() << " = " << p.value();
}*/
if (clipList.isEmpty()) {
- emit displayMessage(i18n("No available clip selected"), -2);
+ emit displayMessage(i18n("No available clip selected"), -2, ErrorMessage);
}
else emit showClipProperties(clipList, commonproperties);
}
} else {
pixmap = KIcon("view-refresh").pixmap(m_listView->iconSize());
}
- item->setData(0, Qt::DecorationRole, pixmap);
+ item->setPixmap(pixmap);
}
}
QPainter p(&pixmap);
p.drawPixmap(3, 3, icon.pixmap(width - 6, height - 6));
p.end();
- item->setData(0, Qt::DecorationRole, pixmap);
+ item->setPixmap(pixmap);
if (item->referencedClip()) {
item->referencedClip()->setPlaceHolder(true);
Mlt::Producer *newProd = m_render->invalidProducer(id);
}
}
update();
- emit displayMessage(i18n("Check missing clips"), -2);
+ emit displayMessage(i18n("Check missing clips"), -2, ErrorMessage);
emit updateRenderStatus();
}
properties.contains("xmldata") ||
properties.contains("force_aspect_num") ||
properties.contains("force_aspect_den") ||
+ properties.contains("full_luma") ||
properties.contains("templatetext")) {
slotRefreshClipThumbnail(item);
emit refreshClip(id, true);
- } else if (properties.contains("full_luma") || properties.contains("force_colorspace") || properties.contains("loop")) {
+ } else if (properties.contains("force_colorspace") || properties.contains("loop")) {
emit refreshClip(id, false);
}
}
//m_listView->setEnabled(false);
const QString parent = clip->getProperty("groupid");
QString groupName = clip->getProperty("groupname");
+ QSize pixelSize((int)(m_listView->iconSize().height() * m_render->dar()), m_listView->iconSize().height());
ProjectItem *item = NULL;
monitorItemEditing(false);
if (!parent.isEmpty()) {
}
if (parentitem)
- item = new ProjectItem(parentitem, clip);
+ item = new ProjectItem(parentitem, clip, pixelSize);
}
if (item == NULL) {
- item = new ProjectItem(m_listView, clip);
+ item = new ProjectItem(m_listView, clip, pixelSize);
}
if (item->data(0, DurationRole).isNull()) item->setData(0, DurationRole, i18n("Loading"));
connect(clip, SIGNAL(createProxy(const QString &)), this, SLOT(slotCreateProxy(const QString &)));
connect(clip, SIGNAL(abortProxy(const QString &, const QString &)), this, SLOT(slotAbortProxy(const QString, const QString)));
+
if (getProperties) {
- int height = m_listView->iconSize().height();
- int width = (int)(height * m_render->dar());
- QPixmap pix = KIcon("video-x-generic").pixmap(QSize(width, height));
- item->setData(0, Qt::DecorationRole, pix);
//item->setFlags(Qt::ItemIsSelectable);
m_listView->processLayout();
QDomElement e = clip->toXML().cloneNode().toElement();
requestClipThumbnail(item->clipId());
}
else {
- processThumbOverlays(item, pix);
- item->setData(0, Qt::DecorationRole, pix);
+ QPixmap result = roundedPixmap(pix);
+ processThumbOverlays(item, result);
+ item->setPixmap(result);
}
}
else {
}
}
+QPixmap ProjectList::roundedPixmap(QImage img)
+{
+ QPixmap pix(img.width(), img.height());
+ pix.fill(Qt::transparent);
+ QPainter p(&pix);
+ p.setRenderHint(QPainter::Antialiasing, true);
+ QPainterPath path;
+ path.addRoundedRect(0.5, 0.5, pix.width() - 1, pix.height() - 1, 2, 2);
+ p.setClipPath(path);
+ p.drawImage(0, 0, img);
+ p.end();
+ return pix;
+}
+
+QPixmap ProjectList::roundedPixmap(QPixmap source)
+{
+ QPixmap pix(source.width(), source.height());
+ pix.fill(Qt::transparent);
+ QPainter p(&pix);
+ p.setRenderHint(QPainter::Antialiasing, true);
+ QPainterPath path;
+ path.addRoundedRect(0.5, 0.5, pix.width() - 1, pix.height() - 1, 2, 2);
+ p.setClipPath(path);
+ p.drawPixmap(0, 0, source);
+ p.end();
+ return pix;
+}
+
void ProjectList::getCachedThumbnail(SubProjectItem *item)
{
if (!item) return;
}
else if (clip->isPlaceHolder()) {
item->setFlags(Qt::ItemIsSelectable | Qt::ItemIsEnabled | Qt::ItemIsDropEnabled);
- if (item->data(0, Qt::DecorationRole).isNull()) {
- item->setData(0, Qt::DecorationRole, missingPixmap);
+ if (!item->hasPixmap()) {
+ item->setPixmap(missingPixmap);
}
else {
QPixmap pixmap = qVariantValue<QPixmap>(item->data(0, Qt::DecorationRole));
QPainter p(&pixmap);
p.drawPixmap(3, 3, KIcon("dialog-close").pixmap(pixmap.width() - 6, pixmap.height() - 6));
p.end();
- item->setData(0, Qt::DecorationRole, pixmap);
+ item->setPixmap(pixmap);
}
}
} else {
if (displayRatioChanged) {
requestClipThumbnail(clip->getId());
}
- else if (item->data(0, Qt::DecorationRole).isNull()) {
+ else if (!item->hasPixmap()) {
getCachedThumbnail(item);
}
if (item->data(0, DurationRole).toString().isEmpty()) {
QPainter p(&pixmap);
p.drawPixmap(3, 3, KIcon("dialog-close").pixmap(pixmap.width() - 6, pixmap.height() - 6));
p.end();
- item->setData(0, Qt::DecorationRole, pixmap);
+ item->setPixmap(pixmap);
}
else if (clip->getProperty("_replaceproxy") == "1") {
clip->setProperty("_replaceproxy", QString());
item->setFlags(Qt::ItemIsSelectable | Qt::ItemIsDragEnabled | Qt::ItemIsEnabled | Qt::ItemIsEditable | Qt::ItemIsDropEnabled);
if (durationError) {
kDebug() << "Proxy duration is wrong, try changing transcoding parameters.";
- emit displayMessage(i18n("Proxy clip unusable (duration is different from original)."), -2);
+ emit displayMessage(i18n("Proxy clip unusable (duration is different from original)."), -2, ErrorMessage);
}
slotUpdateJobStatus(item, PROXYJOB, JOBCRASHED, i18n("Failed to create proxy for %1. check parameters", item->text(0)), "project_settings");
QString path = item->referencedClip()->getProperty("proxy");
if (item && item->parent()) pItem = static_cast <ProjectItem *>(item->parent());
if (!item && framePos == 0) pItem = getItemById(id);
if (!item && !pItem) return;
- if (item) item->setData(0, Qt::DecorationRole, QPixmap::fromImage(img));
- else if (pItem) pItem->setData(0, Qt::DecorationRole, QPixmap::fromImage(img));
+ if (item) {
+ if (item->type() == PROJECTCLIPTYPE) static_cast<ProjectItem*>(item)->setPixmap(QPixmap::fromImage(img));
+ else item->setData(0, Qt::DecorationRole, QPixmap::fromImage(img));
+ }
+ else if (pItem) pItem->setPixmap(QPixmap::fromImage(img));
if (pItem) {
QString hash = pItem->getClipHash();
if (!hash.isEmpty()) m_doc->cacheImage(hash + '#' + QString::number(framePos), img);
slotProcessNextThumbnail();
return;
}
- QPixmap pix;
QImage img;
int height = m_listView->iconSize().height();
int swidth = (int)(height * m_render->frameRenderWidth() / m_render->renderHeight()+ 0.5);
int dwidth = (int)(height * m_render->dar() + 0.5);
- if (clip->clipType() == AUDIO)
- pix = KIcon("audio-x-generic").pixmap(QSize(dwidth, height));
- else if (clip->clipType() == IMAGE) {
+ if (clip->clipType() == IMAGE) {
img = KThumb::getFrame(item->referencedClip()->getProducer(), 0, swidth, dwidth, height);
}
- else {
+ else if (clip->clipType() != AUDIO) {
img = item->referencedClip()->extractImage(frame, dwidth, height);
}
- if (!pix.isNull() || !img.isNull()) {
+ if (!img.isNull()) {
monitorItemEditing(false);
- if (!img.isNull()) {
- pix = QPixmap::fromImage(img);
- processThumbOverlays(item, pix);
- }
- it->setData(0, Qt::DecorationRole, pix);
+ QPixmap pix = roundedPixmap(img);
+ processThumbOverlays(item, pix);
+ if (isSubItem) it->setData(0, Qt::DecorationRole, pix);
+ else item->setPixmap(pix);
monitorItemEditing(true);
QString hash = item->getClipHash();
}
}
- if (!replace && m_allClipsProcessed && item->data(0, Qt::DecorationRole).isNull()) {
+ if (!replace && m_allClipsProcessed && !item->hasPixmap()) {
getCachedThumbnail(item);
}
if (!toReload.isEmpty())
{
ProjectItem *item = getItemById(clipId);
if (item && !img.isNull()) {
- QPixmap pix(img.width(), img.height());
- pix.fill(Qt::transparent);
- QPainter p(&pix);
- p.setRenderHint(QPainter::Antialiasing, true);
- QPainterPath path;
- path.addRoundedRect(0.5, 0.5, pix.width() - 1, pix.height() - 1, 2, 2);
- p.setClipPath(path);
- p.drawImage(0, 0, img);
- p.end();
+ QPixmap pix = roundedPixmap(img);
processThumbOverlays(item, pix);
monitorItemEditing(false);
- item->setData(0, Qt::DecorationRole, pix);
+ item->setPixmap(pix);
monitorItemEditing(true);
QString hash = item->getClipHash();
if (!hash.isEmpty()) m_doc->cacheImage(hash, img);
m_doc->slotCreateSlideshowClipFile(properties, groupInfo.at(0), groupInfo.at(1));
}
- } else emit displayMessage(i18n("Sequence not found"), -2);
+ } else emit displayMessage(i18n("Sequence not found"), -2, ErrorMessage);
}
QMap <QString, QString> ProjectList::getProxies()
QString destination;
ProjectItem *item = getItemById(ids.at(0));
if (!item) {
- emit displayMessage(i18n("Cannot find clip to process filter %1", filterName), -2);
+ emit displayMessage(i18n("Cannot find clip to process filter %1", filterName), -2, ErrorMessage);
return;
}
if (ids.count() == 1) {
// Producer params
jobParams << QString();
// Filter params, use a smaller region of the image to speed up operation
- jobParams << filterName << "bounding=\"25%x25%:25%x25\" shot_change_list=0";
+ jobParams << filterName << "bounding=\"25%x25%:15%x15\" shot_change_list=0 denoise=0";
// Consumer
jobParams << "null" << "all=1 terminate_on_pause=1 real_time=-1";
QMap <QString, QString> extraParams;
extraParams.insert("key", "shot_change_list");
extraParams.insert("projecttreefilter", "1");
+ QString keyword("%count");
+ extraParams.insert("resultmessage", i18n("Found %1 scenes.", keyword));
if (ui.add_markers->isChecked()) {
// We want to create markers
extraParams.insert("addmarkers", QString::number(ui.marker_type->currentIndex()));
int markersType = -1;
if (filterInfo.contains("addmarkers")) markersType = filterInfo.value("addmarkers").toInt();
if (results.isEmpty()) {
- emit displayMessage(i18n("No data returned from clip analysis"), ErrorMessage);
+ emit displayMessage(i18n("No data returned from clip analysis"), 0, ErrorMessage);
return;
}
- emit displayMessage(i18n("Processing data analysis"), InformationMessage);
bool dataProcessed = false;
QString key = filterInfo.value("key");
QStringList value = results.value(key).split(';', QString::SkipEmptyParts);
kDebug()<<"// RESULT; "<<key<<" = "<<value;
+ if (filterInfo.contains("resultmessage")) {
+ QString mess = filterInfo.value("resultmessage");
+ mess.replace("%count", QString::number(value.count()));
+ emit displayMessage(mess, 0, InformationMessage);
+ }
+ else emit displayMessage(i18n("Processing data analysis"), 0, InformationMessage);
if (filterInfo.contains("cutscenes")) {
// Check if we want to cut scenes from returned data
dataProcessed = true;
}
if (!dataProcessed || filterInfo.contains("storedata")) {
// Store returned data as clip extra data
- clip->referencedClip()->setAnalysisData(filterInfo.contains("displaydataname") ? filterInfo.value("displaydataname") : key, results.value(key));
+ clip->referencedClip()->setAnalysisData(filterInfo.contains("displaydataname") ? filterInfo.value("displaydataname") : key, results.value(key), filterInfo.value("offset").toInt());
emit updateAnalysisData(clip->referencedClip());
}
}
projects / kdenlive / blobdiff