Differential D3258 Diff 7888 libs/ui/KisDocument.cpp

Changeset View

Standalone View

libs/ui/KisDocument.cpp

Context not available.
360	qint32 macroNestDepth;	360		qint32 macroNestDepth;
361		361
362	KisImageSP image;	362		KisImageSP image;
		363		KisImageSP savingImage;
		364
363	KisNodeSP preActivatedNode;	365		KisNodeSP preActivatedNode;
364	KisShapeController* shapeController;	366		KisShapeController* shapeController;
365	KoShapeController* koShapeController;	367		KoShapeController* koShapeController;
Context not available.
437	class SafeSavingLocker;	439		class SafeSavingLocker;
			gladhornUnsubmitted Not Done I guess this forward declaration can also be removed? gladhorn: I guess this forward declaration can also be removed?
438	};	440		};
439		441
440	class KisDocument::Private::SafeSavingLocker {
441	public:
442	SafeSavingLocker(KisDocument::Private *_d)
443	: d(_d),
444	m_locked(false),
445	m_imageLock(d->image, true),
446	m_savingLock(&d->savingMutex)
447	{
448	const int realAutoSaveInterval = KisConfig().autoSaveInterval();
449	const int emergencyAutoSaveInterval = 10; // sec
450
451	/**
452	* Initial try to lock both objects. Locking the image guards
453	* us from any image composition threads running in the
454	* background, while savingMutex guards us from entering the
455	* saving code twice by autosave and main threads.
456	*
457	* Since we are trying to lock multiple objects, so we should
458	* do it in a safe manner.
459	*/
460	m_locked = std::try_lock(m_imageLock, m_savingLock) < 0;
461
462	if (!m_locked) {
463	if (d->isAutosaving) {
464	d->disregardAutosaveFailure = true;
465	if (realAutoSaveInterval) {
466	d->document->setAutoSave(emergencyAutoSaveInterval);
467	}
468	} else {
469	d->image->requestStrokeEnd();
470	QApplication::processEvents();
471
472	// one more try...
473	m_locked = std::try_lock(m_imageLock, m_savingLock) < 0;
474	}
475	}
476
477	if (m_locked) {
478	d->disregardAutosaveFailure = false;
479	}
480	}
481
482	~SafeSavingLocker() {
483	if (m_locked) {
484	m_imageLock.unlock();
485	m_savingLock.unlock();
486
487	const int realAutoSaveInterval = KisConfig().autoSaveInterval();
488	d->document->setAutoSave(realAutoSaveInterval);
489	}
490	}
491
492	bool successfullyLocked() const {
493	return m_locked;
494	}
495
496	private:
497	KisDocument::Private *d;
498	bool m_locked;
499
500	KisImageBarrierLockAdapter m_imageLock;
501	StdLockableWrapper<QMutex> m_savingLock;
502	};
503
504	KisDocument::KisDocument()	442		KisDocument::KisDocument()
505	: d(new Private(this))	443		: d(new Private(this))
506	{	444		{
Context not available.
528	d->firstMod = QDateTime::currentDateTime();	466		d->firstMod = QDateTime::currentDateTime();
529	d->lastMod = QDateTime::currentDateTime();	467		d->lastMod = QDateTime::currentDateTime();
530		468
531
532	// preload the krita resources	469		// preload the krita resources
533	KisResourceServerProvider::instance();	470		KisResourceServerProvider::instance();
534		471
Context not available.
698	Q_ASSERT(!tempororaryFileName.isEmpty());	635		Q_ASSERT(!tempororaryFileName.isEmpty());
699		636
700	if (!isNativeFormat(outputMimeType)) {	637		if (!isNativeFormat(outputMimeType)) {
701	Private::SafeSavingLocker locker(d);	638
702	if (locker.successfullyLocked()) {	639		d->savingImage = d->image->clone(true);
703	status = d->importExportManager->exportDocument(tempororaryFileName, outputMimeType, exportConfiguration);	640		status = d->importExportManager->exportDocument(tempororaryFileName, outputMimeType, exportConfiguration);
704	} else {	641		d->savingImage.clear();
705	status = KisImportExportFilter::UsageError;
706	}
707		642
708	ret = status == KisImportExportFilter::OK;	643		ret = status == KisImportExportFilter::OK;
709	suppressErrorDialog = (status == KisImportExportFilter::UserCancelled \|\| status == KisImportExportFilter::BadConversionGraph);	644		suppressErrorDialog = (status == KisImportExportFilter::UserCancelled \|\| status == KisImportExportFilter::BadConversionGraph);
Context not available.
882		817
883	void KisDocument::slotAutoSave()	818		void KisDocument::slotAutoSave()
884	{	819		{
885	if (d->modified && d->modifiedAfterAutosave && !d->isLoading) {	820		if (!d->isAutosaving && d->modified && d->modifiedAfterAutosave && !d->isLoading) {
886	// Give a warning when trying to autosave an encrypted file when no password is known (should not happen)	821		// Give a warning when trying to autosave an encrypted file when no password is known (should not happen)
887	if (d->specialOutputFlag == SaveEncrypted && d->password.isNull()) {	822		if (d->specialOutputFlag == SaveEncrypted && d->password.isNull()) {
888	// That advice should also fix this error from occurring again	823		// That advice should also fix this error from occurring again
Context not available.
939		874
940	bool KisDocument::saveNativeFormat(const QString & file)	875		bool KisDocument::saveNativeFormat(const QString & file)
941	{	876		{
942	Private::SafeSavingLocker locker(d);	877		d->savingImage = d->image->clone(true);
943	if (!locker.successfullyLocked()) return false;
944
945	d->lastErrorMessage.clear();	878		d->lastErrorMessage.clear();
946	//dbgUI <<"Saving to store";	879		//dbgUI <<"Saving to store";
947		880
Context not available.
956	if (f.open(QIODevice::WriteOnly \| QIODevice::Text)) {	889		if (f.open(QIODevice::WriteOnly \| QIODevice::Text)) {
957	bool success = saveToStream(&f);	890		bool success = saveToStream(&f);
958	f.close();	891		f.close();
		892		d->savingImage = 0;
959	return success;	893		return success;
960	} else	894		} else {
		895		d->savingImage = 0;
961	return false;	896		return false;
		897		}
962	}	898		}
963		899
964	dbgUI << "KisDocument::saveNativeFormat nativeFormatMimeType=" << nativeFormatMimeType();	900		dbgUI << "KisDocument::saveNativeFormat nativeFormatMimeType=" << nativeFormatMimeType();
Context not available.
971	}	907		}
972	if (store->bad()) {	908		if (store->bad()) {
973	d->lastErrorMessage = i18n("Could not create the file for saving"); // more details needed?	909		d->lastErrorMessage = i18n("Could not create the file for saving"); // more details needed?
		910		d->savingImage = 0;
974	delete store;	911		delete store;
975	return false;	912		return false;
976	}	913		}
Context not available.
983	} else {	920		} else {
984	result = saveNativeFormatCalligra(store);	921		result = saveNativeFormatCalligra(store);
985	}	922		}
		923		d->savingImage = 0;
986	return result;	924		return result;
987	}	925		}
988		926
Context not available.
1784		1722
1785	bool KisDocument::completeSaving(KoStore* store)	1723		bool KisDocument::completeSaving(KoStore* store)
1786	{	1724		{
		1725		Q_ASSERT(!d->savingImage.isNull());
1787	d->kraSaver->saveKeyframes(store, url().url(), isStoredExtern());	1726		d->kraSaver->saveKeyframes(store, url().url(), isStoredExtern());
1788	d->kraSaver->saveBinaryData(store, d->image, url().url(), isStoredExtern(), d->isAutosaving);	1727		d->kraSaver->saveBinaryData(store, d->savingImage, url().url(), isStoredExtern(), d->isAutosaving);
1789	bool retval = true;	1728		bool retval = true;
1790	if (!d->kraSaver->errorMessages().isEmpty()) {	1729		if (!d->kraSaver->errorMessages().isEmpty()) {
1791	setErrorMessage(d->kraSaver->errorMessages().join(".\n"));	1730		setErrorMessage(d->kraSaver->errorMessages().join(".\n"));
Context not available.
1899	if (d->kraSaver) delete d->kraSaver;	1838		if (d->kraSaver) delete d->kraSaver;
1900	d->kraSaver = new KisKraSaver(this);	1839		d->kraSaver = new KisKraSaver(this);
1901		1840
1902	root.appendChild(d->kraSaver->saveXML(doc, d->image));	1841		Q_ASSERT(!d->savingImage.isNull());
		1842
		1843		root.appendChild(d->kraSaver->saveXML(doc, d->savingImage));
1903	if (!d->kraSaver->errorMessages().isEmpty()) {	1844		if (!d->kraSaver->errorMessages().isEmpty()) {
1904	setErrorMessage(d->kraSaver->errorMessages().join(".\n"));	1845		setErrorMessage(d->kraSaver->errorMessages().join(".\n"));
1905	}	1846		}
Context not available.
2478	return d->image;	2419		return d->image;
2479	}	2420		}
2480		2421
		2422		KisImageSP KisDocument::savingImage() const
		2423		{
		2424		return d->savingImage;
		2425		}
		2426
2481		2427
2482	void KisDocument::setCurrentImage(KisImageSP image)	2428		void KisDocument::setCurrentImage(KisImageSP image)
2483	{	2429		{
Context not available.