[prev in list] [next in list] [prev in thread] [next in thread]
List: kde-commits
Subject: [digikam] utilities: Adapt to ImageInfo semantic changes and thumbnail API changes
From: Marcel Wiesweg <marcel.wiesweg () gmx ! de>
Date: 2014-11-16 18:04:47
Message-ID: E1Xq4Br-0007Vt-Pr () scm ! kde ! org
[Download RAW message or body]
Git commit 05bf314736f0a970cf083d6cd53cbe4dc4bf6071 by Marcel Wiesweg.
Committed on 16/11/2014 at 15:40.
Pushed by mwiesweg into branch 'master'.
Adapt to ImageInfo semantic changes and thumbnail API changes
M +1 -1 utilities/advancedrename/advancedrenameprocessdialog.cpp
M +1 -1 utilities/advancedrename/parser/options/cameranameoption.cpp
M +1 -1 utilities/advancedrename/parser/options/database/keys/commonkeys.cpp
M +1 -1 utilities/advancedrename/parser/options/database/keys/metadatakeys.cpp
M +1 -1 utilities/advancedrename/parser/options/database/keys/positionkeys.cpp
M +1 -1 utilities/advancedrename/parser/options/dateoption.cpp
M +1 -1 utilities/baloo/baloowrap.cpp
M +2 -1 utilities/facemanagement/facepipeline.cpp
M +1 -1 utilities/fuzzysearch/findduplicatesalbum.cpp
M +1 -1 utilities/fuzzysearch/fuzzysearchview.cpp
M +4 -5 utilities/gpssearch/gpsmarkertiler.cpp
M +6 -6 utilities/imageeditor/main/imagewindow.cpp
M +1 -1 utilities/kipiiface/kipiimageinfo.cpp
M +4 -4 utilities/kipiiface/kipiinterface.cpp
M +4 -4 utilities/lighttable/lighttablethumbbar.cpp
M +1 -1 utilities/maintenance/imagequalitytask.cpp
M +1 -1 utilities/maintenance/thumbsgenerator.cpp
M +1 -1 utilities/maintenance/thumbstask.cpp
M +1 -1 utilities/queuemanager/manager/task.cpp
M +2 -2 utilities/queuemanager/views/queuelist.cpp
http://commits.kde.org/digikam/05bf314736f0a970cf083d6cd53cbe4dc4bf6071
diff --git a/utilities/advancedrename/advancedrenameprocessdialog.cpp \
b/utilities/advancedrename/advancedrenameprocessdialog.cpp index c070175..c4e85da \
100644
--- a/utilities/advancedrename/advancedrenameprocessdialog.cpp
+++ b/utilities/advancedrename/advancedrenameprocessdialog.cpp
@@ -113,7 +113,7 @@ void AdvancedRenameProcessDialog::processOne()
return;
}
- d->thumbLoadThread->find(d->newNameList.first().first.toLocalFile());
+ d->thumbLoadThread->find(ThumbnailIdentifier(d->newNameList.first().first.toLocalFile()));
}
void AdvancedRenameProcessDialog::complete()
diff --git a/utilities/advancedrename/parser/options/cameranameoption.cpp \
b/utilities/advancedrename/parser/options/cameranameoption.cpp index e01aa3a..fc49bf7 \
100644
--- a/utilities/advancedrename/parser/options/cameranameoption.cpp
+++ b/utilities/advancedrename/parser/options/cameranameoption.cpp
@@ -50,7 +50,7 @@ QString CameraNameOption::parseOperation(ParseSettings& settings)
{
QString result;
- ImageInfo info(settings.fileUrl);
+ ImageInfo info = ImageInfo::fromUrl(settings.fileUrl);
if (!info.isNull())
{
diff --git a/utilities/advancedrename/parser/options/database/keys/commonkeys.cpp \
b/utilities/advancedrename/parser/options/database/keys/commonkeys.cpp index \
1c07429..c41d68e 100644
--- a/utilities/advancedrename/parser/options/database/keys/commonkeys.cpp
+++ b/utilities/advancedrename/parser/options/database/keys/commonkeys.cpp
@@ -73,7 +73,7 @@ CommonKeys::CommonKeys()
QString CommonKeys::getDbValue(const QString& key, ParseSettings& settings)
{
- ImageInfo info(settings.fileUrl);
+ ImageInfo info = ImageInfo::fromUrl(settings.fileUrl);
ImageCommonContainer container = info.imageCommonContainer();
ImageCopyright copyright = info.imageCopyright();
QString result;
diff --git a/utilities/advancedrename/parser/options/database/keys/metadatakeys.cpp \
b/utilities/advancedrename/parser/options/database/keys/metadatakeys.cpp index \
7a1792a..1624c47 100644
--- a/utilities/advancedrename/parser/options/database/keys/metadatakeys.cpp
+++ b/utilities/advancedrename/parser/options/database/keys/metadatakeys.cpp
@@ -94,7 +94,7 @@ MetadataKeys::MetadataKeys()
QString MetadataKeys::getDbValue(const QString& key, ParseSettings& settings)
{
- ImageInfo info(settings.fileUrl);
+ ImageInfo info = ImageInfo::fromUrl(settings.fileUrl);
ImageMetadataContainer container = info.imageMetadataContainer();
VideoMetadataContainer videoContainer = info.videoMetadataContainer();
QString result;
diff --git a/utilities/advancedrename/parser/options/database/keys/positionkeys.cpp \
b/utilities/advancedrename/parser/options/database/keys/positionkeys.cpp index \
13bbb9f..353113a 100644
--- a/utilities/advancedrename/parser/options/database/keys/positionkeys.cpp
+++ b/utilities/advancedrename/parser/options/database/keys/positionkeys.cpp
@@ -73,7 +73,7 @@ PositionKeys::PositionKeys()
QString PositionKeys::getDbValue(const QString& key, ParseSettings& settings)
{
- ImageInfo info(settings.fileUrl);
+ ImageInfo info = ImageInfo::fromUrl(settings.fileUrl);
ImagePosition position = info.imagePosition();
QString result;
diff --git a/utilities/advancedrename/parser/options/dateoption.cpp \
b/utilities/advancedrename/parser/options/dateoption.cpp index be7499b..a1e89a4 \
100644
--- a/utilities/advancedrename/parser/options/dateoption.cpp
+++ b/utilities/advancedrename/parser/options/dateoption.cpp
@@ -291,7 +291,7 @@ QString DateOption::parseOperation(ParseSettings& settings)
else
{
// lets try to re-read the file information
- ImageInfo info(settings.fileUrl);
+ ImageInfo info = ImageInfo::fromUrl(settings.fileUrl);
if (!info.isNull())
{
diff --git a/utilities/baloo/baloowrap.cpp b/utilities/baloo/baloowrap.cpp
index 7a24316..b88ed35 100644
--- a/utilities/baloo/baloowrap.cpp
+++ b/utilities/baloo/baloowrap.cpp
@@ -244,7 +244,7 @@ void BalooWrap::addInfoToDigikam(const BalooInfo& bInfo, const \
KUrl& fileUrl) {
QStringList tags = bInfo.tags;
QList<int> tagIdsForInfo;
- ImageInfo info(fileUrl);
+ ImageInfo info = ImageInfo::fromUrl(fileUrl);
// If the path is not in digikam collections, info will be null.
// It does the same check first that we would be doing here
diff --git a/utilities/facemanagement/facepipeline.cpp \
b/utilities/facemanagement/facepipeline.cpp index d512a92..1ba210b 100644
--- a/utilities/facemanagement/facepipeline.cpp
+++ b/utilities/facemanagement/facepipeline.cpp
@@ -558,12 +558,13 @@ QList<QImage> FaceImageRetriever::getDetails(const DImg& src, \
const QList<Databa
QList<QImage> FaceImageRetriever::getThumbnails(const QString& filePath, const \
QList<DatabaseFace>& faces) {
+ Q_UNUSED(filePath)
thumbnailCatcher()->setActive(true);
foreach (const DatabaseFace& face, faces)
{
QRect rect = face.region().toRect();
- catcher->thread()->find(filePath, rect);
+ catcher->thread()->find(ImageInfo::thumbnailIdentifier(face.imageId()), \
rect); catcher->enqueue();
}
diff --git a/utilities/fuzzysearch/findduplicatesalbum.cpp \
b/utilities/fuzzysearch/findduplicatesalbum.cpp index 57c5323..8d1066b 100644
--- a/utilities/fuzzysearch/findduplicatesalbum.cpp
+++ b/utilities/fuzzysearch/findduplicatesalbum.cpp
@@ -109,7 +109,7 @@ void FindDuplicatesAlbum::drawRow(QPainter* p, const \
QStyleOptionViewItem& opt,
if (item && !item->hasValidThumbnail())
{
- d->thumbLoadThread->find(item->refUrl().toLocalFile());
+ d->thumbLoadThread->find(ThumbnailIdentifier(item->refUrl().toLocalFile()));
}
QTreeWidget::drawRow(p, opt, index);
diff --git a/utilities/fuzzysearch/fuzzysearchview.cpp \
b/utilities/fuzzysearch/fuzzysearchview.cpp index faa2496..e30d0e8 100644
--- a/utilities/fuzzysearch/fuzzysearchview.cpp
+++ b/utilities/fuzzysearch/fuzzysearchview.cpp
@@ -904,7 +904,7 @@ void FuzzySearchView::setCurrentImage(const ImageInfo& info)
d->imageInfo = info;
d->labelFile->setText(d->imageInfo.name());
d->labelFolder->setText(d->imageInfo.fileUrl().directory());
- d->thumbLoadThread->find(d->imageInfo.fileUrl().toLocalFile());
+ d->thumbLoadThread->find(d->imageInfo.thumbnailIdentifier());
}
void FuzzySearchView::setImageInfo(const ImageInfo& info)
diff --git a/utilities/gpssearch/gpsmarkertiler.cpp \
b/utilities/gpssearch/gpsmarkertiler.cpp index 6a8af8f..72c8d46 100644
--- a/utilities/gpssearch/gpsmarkertiler.cpp
+++ b/utilities/gpssearch/gpsmarkertiler.cpp
@@ -111,7 +111,7 @@ public:
QList<InternalJobs> jobs;
ThumbnailLoadThread* thumbnailLoadThread;
- QHash<QString, QVariant> thumbnailMap;
+ QHash<qlonglong, QVariant> thumbnailMap;
QList<QRectF> rectList;
QList<int> rectLevel;
bool activeState;
@@ -443,10 +443,9 @@ QPixmap GPSMarkerTiler::pixmapFromRepresentativeIndex(const \
QVariant& index, con
QPixmap thumbnail;
ImageInfo info(indexForPixmap.second);
- QString path = info.filePath();
- d->thumbnailMap.insert(path, index);
+ d->thumbnailMap.insert(info.id(), index);
- if (d->thumbnailLoadThread->find(path, thumbnail, qMax(size.width() + 2, \
size.height() + 2))) + if \
(d->thumbnailLoadThread->find(info.thumbnailIdentifier(), thumbnail, \
qMax(size.width() + 2, size.height() + 2))) {
// digikam returns thumbnails with a border around them, but libkgeomap \
expects them without a border
return thumbnail.copy(1, 1, thumbnail.size().width() - 2, \
thumbnail.size().height() - 2); @@ -630,7 +629,7 @@ void \
GPSMarkerTiler::slotMapImagesJobResult(KJob* job)
*/
void GPSMarkerTiler::slotThumbnailLoaded(const LoadingDescription& \
loadingDescription, const QPixmap& thumbnail) {
- QVariant index = d->thumbnailMap.value(loadingDescription.filePath);
+ QVariant index = \
d->thumbnailMap.value(loadingDescription.thumbnailIdentifier().id); // \
QPair<KGeoMap::TileIndex, int> indexForPixmap = // \
index.value<QPair<KGeoMap::TileIndex, int> >();
emit signalThumbnailAvailableForIndex(index, thumbnail.copy(1, 1, \
thumbnail.size().width() - 2, thumbnail.size().height() - 2));
diff --git a/utilities/imageeditor/main/imagewindow.cpp \
b/utilities/imageeditor/main/imagewindow.cpp index 2e64df6..2cf234d 100644
--- a/utilities/imageeditor/main/imagewindow.cpp
+++ b/utilities/imageeditor/main/imagewindow.cpp
@@ -639,7 +639,7 @@ void ImageWindow::slotFileOriginChanged(const QString& filePath)
{
// By redo or undo, we have virtually switched to a new image.
// So we do _not_ load anything!
- ImageInfo newCurrent(filePath);
+ ImageInfo newCurrent = ImageInfo::fromLocalFile(filePath);
if (newCurrent.isNull() || !d->imageInfoModel->hasImage(newCurrent))
{
@@ -800,7 +800,7 @@ void ImageWindow::slotChanged()
void ImageWindow::slotToggleTag(const KUrl& url, int tagID)
{
- toggleTag(ImageInfo(url), tagID);
+ toggleTag(ImageInfo::fromUrl(url), tagID);
}
void ImageWindow::toggleTag(int tagID)
@@ -882,17 +882,17 @@ void ImageWindow::assignRating(const ImageInfo& info, int \
rating)
void ImageWindow::slotRatingChanged(const KUrl& url, int rating)
{
- assignRating(ImageInfo(url), rating);
+ assignRating(ImageInfo::fromUrl(url), rating);
}
void ImageWindow::slotColorLabelChanged(const KUrl& url, int color)
{
- assignColorLabel(ImageInfo(url), color);
+ assignColorLabel(ImageInfo::fromUrl(url), color);
}
void ImageWindow::slotPickLabelChanged(const KUrl& url, int pick)
{
- assignPickLabel(ImageInfo(url), pick);
+ assignPickLabel(ImageInfo::fromUrl(url), pick);
}
void ImageWindow::slotUpdateItemInfo()
@@ -1604,7 +1604,7 @@ void ImageWindow::slotOpenOriginal()
KUrl url;
url.addPath(id.m_filePath);
url.addPath(id.m_fileName);
- imageInfos << ImageInfo(url);
+ imageInfos << ImageInfo::fromUrl(url);
}
ImageScanner::sortByProximity(imageInfos, d->currentImageInfo);
diff --git a/utilities/kipiiface/kipiimageinfo.cpp \
b/utilities/kipiiface/kipiimageinfo.cpp index 0869ce9..8490d0a 100644
--- a/utilities/kipiiface/kipiimageinfo.cpp
+++ b/utilities/kipiiface/kipiimageinfo.cpp
@@ -99,7 +99,7 @@ void KipiImageInfo::cloneData(ImageInfoShared* const other)
{
KUrl otherUrl = other->url();
- ImageInfo parentInf(otherUrl.toLocalFile());
+ ImageInfo parentInf = ImageInfo::fromUrl(otherUrl);
kDebug() << "Clone DB Info from" << parentInf.fileUrl().path() << "to" << \
_url.path();
FileActionMngr::instance()->copyAttributes(parentInf, _url.toLocalFile());
}
diff --git a/utilities/kipiiface/kipiinterface.cpp \
b/utilities/kipiiface/kipiinterface.cpp index c4f4190..c9c1309 100644
--- a/utilities/kipiiface/kipiinterface.cpp
+++ b/utilities/kipiiface/kipiinterface.cpp
@@ -185,7 +185,7 @@ void KipiInterface::refreshImages(const KUrl::List& urls)
foreach(const KUrl& url, urls)
{
- ImageInfo info(url);
+ ImageInfo info = ImageInfo::fromUrl(url);
if (!info.isNull())
{
@@ -286,7 +286,7 @@ void KipiInterface::slotCurrentAlbumChanged(QList<Album*> albums)
void KipiInterface::thumbnail(const KUrl& url, int /*size*/)
{
// NOTE: size is not used here. Cache use the max pixmap size to store thumbs \
(256).
- d->thumbLoadThread->find(url.toLocalFile());
+ d->thumbLoadThread->find(ImageInfo::fromUrl(url).thumbnailIdentifier());
}
void KipiInterface::thumbnails(const KUrl::List& list, int size)
@@ -440,7 +440,7 @@ void KipiInterface::aboutToEdit(const KUrl& url, KIPI::EditHints \
hints) {
if (hints == KIPI::HintMetadataOnlyChange)
{
- ImageInfo info(url.toLocalFile());
+ ImageInfo info = ImageInfo::fromUrl(url);
ScanController::instance()->beginFileMetadataWrite(info);
}
}
@@ -449,7 +449,7 @@ void KipiInterface::editingFinished(const KUrl& url, \
KIPI::EditHints hints) {
if ((hints & ~KIPI::HintEditAborted) == KIPI::HintMetadataOnlyChange)
{
- ImageInfo info(url.toLocalFile());
+ ImageInfo info = ImageInfo::fromUrl(url);
ScanController::instance()->finishFileMetadataWrite(info, !(hints & \
KIPI::HintEditAborted)); }
}
diff --git a/utilities/lighttable/lighttablethumbbar.cpp \
b/utilities/lighttable/lighttablethumbbar.cpp index a120435..b60f11f 100644
--- a/utilities/lighttable/lighttablethumbbar.cpp
+++ b/utilities/lighttable/lighttablethumbbar.cpp
@@ -321,12 +321,12 @@ void \
LightTableThumbBar::showContextMenuOnInfo(QContextMenuEvent* e, const Image
void LightTableThumbBar::slotColorLabelChanged(const KUrl& url, int color)
{
- assignColorLabel(ImageInfo(url), color);
+ assignColorLabel(ImageInfo::fromUrl(url), color);
}
void LightTableThumbBar::slotPickLabelChanged(const KUrl& url, int pick)
{
- assignPickLabel(ImageInfo(url), pick);
+ assignPickLabel(ImageInfo::fromUrl(url), pick);
}
void LightTableThumbBar::slotAssignPickLabel(int pickId)
@@ -341,7 +341,7 @@ void LightTableThumbBar::slotAssignColorLabel(int colorId)
void LightTableThumbBar::slotRatingChanged(const KUrl& url, int rating)
{
- assignRating(ImageInfo(url), rating);
+ assignRating(ImageInfo::fromUrl(url), rating);
}
void LightTableThumbBar::slotAssignRating(int rating)
@@ -367,7 +367,7 @@ void LightTableThumbBar::assignColorLabel(const ImageInfo& info, \
int colorId)
void LightTableThumbBar::slotToggleTag(const KUrl& url, int tagID)
{
- toggleTag(ImageInfo(url), tagID);
+ toggleTag(ImageInfo::fromUrl(url), tagID);
}
void LightTableThumbBar::toggleTag(int tagID)
diff --git a/utilities/maintenance/imagequalitytask.cpp \
b/utilities/maintenance/imagequalitytask.cpp index 3cccecc..16df5de 100644
--- a/utilities/maintenance/imagequalitytask.cpp
+++ b/utilities/maintenance/imagequalitytask.cpp
@@ -107,7 +107,7 @@ void ImageQualityTask::run()
PickLabel pick;
d->imgqsort = new ImgQSort(dimg, d->quality, &pick);
- ImageInfo info(d->path);
+ ImageInfo info = ImageInfo::fromLocalFile(d->path);
info.setPickLabel(pick);
if(d->imgqsort)
delete d->imgqsort; //delete image data after \
setting label
diff --git a/utilities/maintenance/thumbsgenerator.cpp \
b/utilities/maintenance/thumbsgenerator.cpp index 08754f5..9dd310a 100644
--- a/utilities/maintenance/thumbsgenerator.cpp
+++ b/utilities/maintenance/thumbsgenerator.cpp
@@ -162,7 +162,7 @@ void ThumbsGenerator::slotStart()
while (it != d->allPicturesPath.end())
{
- ImageInfo info((*it));
+ ImageInfo info = ImageInfo::fromLocalFile(*it);
if (info.category() != DatabaseItem::Image)
{
diff --git a/utilities/maintenance/thumbstask.cpp \
b/utilities/maintenance/thumbstask.cpp index 7cb36cc..886b8d4 100644
--- a/utilities/maintenance/thumbstask.cpp
+++ b/utilities/maintenance/thumbstask.cpp
@@ -82,7 +82,7 @@ void ThumbsTask::run()
{
d->catcher->setActive(true);
- d->catcher->thread()->find(d->path);
+ d->catcher->thread()->find(ThumbnailIdentifier(d->path));
d->catcher->enqueue();
QList<QImage> images = d->catcher->waitForThumbnails();
emit signalFinished(images.first());
diff --git a/utilities/queuemanager/manager/task.cpp \
b/utilities/queuemanager/manager/task.cpp index aac3169..41c4b0a 100644
--- a/utilities/queuemanager/manager/task.cpp
+++ b/utilities/queuemanager/manager/task.cpp
@@ -254,7 +254,7 @@ void Task::run()
// -- Now copy the digiKam attributes from original file to the new file \
------------
// ImageInfo must be tread-safe.
- ImageInfo source(d->tools.m_itemUrl.toLocalFile());
+ ImageInfo source = ImageInfo::fromUrl(d->tools.m_itemUrl);
FileActionMngr::instance()->copyAttributes(source, dest.toLocalFile());
emitActionData(ActionData::BatchDone, i18n("Item processed successfully \
%1", renameMess), dest);
diff --git a/utilities/queuemanager/views/queuelist.cpp \
b/utilities/queuemanager/views/queuelist.cpp index ac8a990..34ecff7 100644
--- a/utilities/queuemanager/views/queuelist.cpp
+++ b/utilities/queuemanager/views/queuelist.cpp
@@ -725,7 +725,7 @@ void QueueListView::drawRow(QPainter* p, const \
QStyleOptionViewItem& opt, const if (item && !item->hasValidThumbnail())
{
ImageInfo info = item->info();
- d->thumbLoadThread->find(info.fileUrl().toLocalFile());
+ d->thumbLoadThread->find(ThumbnailIdentifier(info.fileUrl().toLocalFile()));
}
QTreeWidget::drawRow(p, opt, index);
@@ -1159,7 +1159,7 @@ void QueueListView::slotCollectionImageChange(const \
CollectionImageChangeset& ch
void QueueListView::reloadThumbs(const KUrl& url)
{
- d->thumbLoadThread->find(url.toLocalFile());
+ d->thumbLoadThread->find(ThumbnailIdentifier(url.toLocalFile()));
}
void QueueListView::setItemBusy(qlonglong id)
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic