"Fossies" - the Fresh Open Source Software Archive  

Source code changes of the file "core/dplugins/generic/tools/panorama/wizard/panopreprocesspage.cpp" between
digikam-6.2.0.tar.xz and digikam-6.3.0.tar.xz

About: digiKam is an advanced digital photo management application.

panopreprocesspage.cpp  (digikam-6.2.0.tar.xz):panopreprocesspage.cpp  (digikam-6.3.0.tar.xz)
skipping to change at line 171 skipping to change at line 171
d->title->setText(i18n("<qt>" d->title->setText(i18n("<qt>"
"<p>Pre-processing is in progress, please wait.</p>" "<p>Pre-processing is in progress, please wait.</p>"
"<p>This can take a while...</p>" "<p>This can take a while...</p>"
"</qt>")); "</qt>"));
d->celesteCheckBox->hide(); d->celesteCheckBox->hide();
d->progressTimer->start(300); d->progressTimer->start(300);
connect(d->mngr->thread(), SIGNAL(stepFinished(DigikamGenericPanoramaPlugin: :PanoActionData)), connect(d->mngr->thread(), SIGNAL(stepFinished(DigikamGenericPanoramaPlugin: :PanoActionData)),
this, SLOT(slotPanoAction(DigikamGenericPanoramaPlugin::PanoActionDa ta))); this, SLOT(slotPanoAction(DigikamGenericPanoramaPlugin::PanoActionDa ta)));
connect(d->mngr->thread(), SIGNAL(jobCollectionFinished(DigikamGenericPanora maPlugin::PanoActionData)), connect(d->mngr->thread(), SIGNAL(jobCollectionFinished(DigikamGenericPanora maPlugin::PanoActionData)),
this, SLOT(slotPanoAction(DigikamGenericPanoramaPlugin::PanoActionDa ta))); this, SLOT(slotPanoAction(DigikamGenericPanoramaPlugin::PanoActionDa ta)));
// d->nbFilesProcessed = 0; // d->nbFilesProcessed = 0;
d->mngr->resetBasePto(); d->mngr->resetBasePto();
d->mngr->resetCpFindPto(); d->mngr->resetCpFindPto();
d->mngr->resetCpCleanPto(); d->mngr->resetCpCleanPto();
d->mngr->preProcessedMap().clear(); d->mngr->preProcessedMap().clear();
d->mngr->thread()->preProcessFiles(d->mngr->itemsList(), d->mngr->thread()->preProcessFiles(d->mngr->itemsList(),
skipping to change at line 236 skipping to change at line 237
return false; return false;
} }
void PanoPreProcessPage::cleanupPage() void PanoPreProcessPage::cleanupPage()
{ {
d->canceled = true; d->canceled = true;
disconnect(d->mngr->thread(), SIGNAL(stepFinished(DigikamGenericPanoramaPlug in::PanoActionData)), disconnect(d->mngr->thread(), SIGNAL(stepFinished(DigikamGenericPanoramaPlug in::PanoActionData)),
this, SLOT(slotPanoAction(DigikamGenericPanoramaPlugin::PanoActio nData))); this, SLOT(slotPanoAction(DigikamGenericPanoramaPlugin::PanoActio nData)));
disconnect(d->mngr->thread(), SIGNAL(jobCollectionFinished(DigikamGenericPan oramaPlugin::PanoActionData)), disconnect(d->mngr->thread(), SIGNAL(jobCollectionFinished(DigikamGenericPan oramaPlugin::PanoActionData)),
this, SLOT(slotPanoAction(DigikamGenericPanoramaPlugin::PanoActio nData))); this, SLOT(slotPanoAction(DigikamGenericPanoramaPlugin::PanoActio nData)));
d->mngr->thread()->cancel(); d->mngr->thread()->cancel();
QMutexLocker lock(&d->progressMutex); QMutexLocker lock(&d->progressMutex);
if (d->progressTimer->isActive()) if (d->progressTimer->isActive())
{ {
d->progressTimer->stop(); d->progressTimer->stop();
d->progressLabel->clear(); d->progressLabel->clear();
} }
} }
void PanoPreProcessPage::slotProgressTimerDone() void PanoPreProcessPage::slotProgressTimerDone()
{ {
d->progressLabel->setPixmap(d->progressPix.frameAt(d->progressCount)); d->progressLabel->setPixmap(d->progressPix.frameAt(d->progressCount));
if (d->progressPix.frameCount()) if (d->progressPix.frameCount())
{ {
d->progressCount = (d->progressCount + 1) % d->progressPix.frameCount(); d->progressCount = (d->progressCount + 1) % d->progressPix.frameCount();
} }
d->progressTimer->start(300); d->progressTimer->start(300);
} }
void PanoPreProcessPage::slotPanoAction(const DigikamGenericPanoramaPlugin::Pano ActionData& ad) void PanoPreProcessPage::slotPanoAction(const DigikamGenericPanoramaPlugin::Pano ActionData& ad)
{ {
qCDebug(DIGIKAM_DPLUGIN_GENERIC_LOG) << "SlotPanoAction (preprocessing)"; qCDebug(DIGIKAM_DPLUGIN_GENERIC_LOG) << "SlotPanoAction (preprocessing)";
qCDebug(DIGIKAM_DPLUGIN_GENERIC_LOG) << "starting, success, canceled, action : " << ad.starting << ad.success << d->canceled << ad.action; qCDebug(DIGIKAM_DPLUGIN_GENERIC_LOG) << "starting, success, canceled, action : " << ad.starting << ad.success << d->canceled << ad.action;
QString text; QString text;
QMutexLocker lock(&d->progressMutex); QMutexLocker lock(&d->progressMutex);
skipping to change at line 286 skipping to change at line 290
switch (ad.action) switch (ad.action)
{ {
case PANO_PREPROCESS_INPUT: case PANO_PREPROCESS_INPUT:
case PANO_CREATEPTO: case PANO_CREATEPTO:
case PANO_CPFIND: case PANO_CPFIND:
case PANO_CPCLEAN: case PANO_CPCLEAN:
{ {
disconnect(d->mngr->thread(), SIGNAL(stepFinished(DigikamGen ericPanoramaPlugin::PanoActionData)), disconnect(d->mngr->thread(), SIGNAL(stepFinished(DigikamGen ericPanoramaPlugin::PanoActionData)),
this, SLOT(slotPanoAction(DigikamGenericPanoramaP lugin::PanoActionData))); this, SLOT(slotPanoAction(DigikamGenericPanoramaP lugin::PanoActionData)));
disconnect(d->mngr->thread(), SIGNAL(jobCollectionFinished(D igikamGenericPanoramaPlugin::PanoActionData)), disconnect(d->mngr->thread(), SIGNAL(jobCollectionFinished(D igikamGenericPanoramaPlugin::PanoActionData)),
this, SLOT(slotPanoAction(DigikamGenericPanoramaP lugin::PanoActionData))); this, SLOT(slotPanoAction(DigikamGenericPanoramaP lugin::PanoActionData)));
qCWarning(DIGIKAM_DPLUGIN_GENERIC_LOG) << "Job failed (prepr ocessing): " << ad.action; qCWarning(DIGIKAM_DPLUGIN_GENERIC_LOG) << "Job failed (prepr ocessing): " << ad.action;
if (d->detailsText->isHidden()) // Ensures only the first f ailed task is shown if (d->detailsText->isHidden()) // Ensures only the first f ailed task is shown
{ {
d->title->setText(i18n("<qt>" d->title->setText(i18n("<qt>"
"<h1>Pre-processing has failed.< /h1>" "<h1>Pre-processing has failed.< /h1>"
"<p>See processing messages belo w.</p>" "<p>See processing messages belo w.</p>"
skipping to change at line 337 skipping to change at line 342
} }
case PANO_CREATEPTO: case PANO_CREATEPTO:
case PANO_CPFIND: case PANO_CPFIND:
{ {
// Nothing to do, that just another step towards the end // Nothing to do, that just another step towards the end
break; break;
} }
case PANO_CPCLEAN: case PANO_CPCLEAN:
{ {
disconnect(d->mngr->thread(), SIGNAL(stepFinished(DigikamGen ericPanoramaPlugin::PanoActionData)), disconnect(d->mngr->thread(), SIGNAL(stepFinished(DigikamGen ericPanoramaPlugin::PanoActionData)),
this, SLOT(slotPanoAction(DigikamGenericPanoramaPlug this, SLOT(slotPanoAction(DigikamGenericPanoramaP
in::PanoActionData))); lugin::PanoActionData)));
disconnect(d->mngr->thread(), SIGNAL(jobCollectionFinished(D igikamGenericPanoramaPlugin::PanoActionData)), disconnect(d->mngr->thread(), SIGNAL(jobCollectionFinished(D igikamGenericPanoramaPlugin::PanoActionData)),
this, SLOT(slotPanoAction(DigikamGenericPanoramaPlug in::PanoActionData))); this, SLOT(slotPanoAction(DigikamGenericPanoramaP lugin::PanoActionData)));
d->progressTimer->stop(); d->progressTimer->stop();
d->progressLabel->clear(); d->progressLabel->clear();
d->preprocessingDone = true; d->preprocessingDone = true;
emit signalPreProcessed(); emit signalPreProcessed();
initializePage(); initializePage();
break; break;
} }
 End of changes. 7 change blocks. 
3 lines changed or deleted 9 lines changed or added

Home  |  About  |  Features  |  All  |  Newest  |  Dox  |  Diffs  |  RSS Feeds  |  Screenshots  |  Comments  |  Imprint  |  Privacy  |  HTTP(S)