Members of the KDE Community are recommended to subscribe to the kde-community mailing list at https://mail.kde.org/mailman/listinfo/kde-community to allow them to participate in important discussions and receive other important announcements

Commit 2e057e7a authored by Wolthera van Hövell's avatar Wolthera van Hövell 🛍

Clean up all the debug messages.

It's... quieter in the terminal now.

Ref T2337
parent 7ff7e60b
...@@ -1606,7 +1606,6 @@ void KisImage::setProofingConfiguration(KisProofingConfiguration *proofingConfig ...@@ -1606,7 +1606,6 @@ void KisImage::setProofingConfiguration(KisProofingConfiguration *proofingConfig
KisProofingConfiguration *KisImage::proofingConfiguration() const KisProofingConfiguration *KisImage::proofingConfiguration() const
{ {
if (!m_d->proofingConfig) { if (!m_d->proofingConfig) {
qDebug()<<"Image: No proofing config found, generating one.";
m_d->proofingConfig = new KisProofingConfiguration(); m_d->proofingConfig = new KisProofingConfiguration();
} }
return m_d->proofingConfig; return m_d->proofingConfig;
......
...@@ -441,7 +441,6 @@ KoColorConversionTransformation * KoColorSpace::createProofingTransform(const Ko ...@@ -441,7 +441,6 @@ KoColorConversionTransformation * KoColorSpace::createProofingTransform(const Ko
{ {
if (!d->iccEngine) { if (!d->iccEngine) {
d->iccEngine = KoColorSpaceEngineRegistry::instance()->get("icc"); d->iccEngine = KoColorSpaceEngineRegistry::instance()->get("icc");
qDebug() << ">>>>>>>>>>>>>>>>>>>> we got a proofing engine";
} }
if (!d->iccEngine) return false; if (!d->iccEngine) return false;
......
...@@ -565,16 +565,13 @@ void KisCanvas2::setProofingOptions(bool softProof, bool gamutCheck) ...@@ -565,16 +565,13 @@ void KisCanvas2::setProofingOptions(bool softProof, bool gamutCheck)
} else { } else {
conversionFlags = conversionFlags & ~KoColorConversionTransformation::SoftProofing; conversionFlags = conversionFlags & ~KoColorConversionTransformation::SoftProofing;
} }
if (gamutCheck && this->image()->colorSpace()->colorDepthId().id().contains("U")) { if (gamutCheck && softProof && this->image()->colorSpace()->colorDepthId().id().contains("U")) {
conversionFlags |= KoColorConversionTransformation::GamutCheck; conversionFlags |= KoColorConversionTransformation::GamutCheck;
} else { } else {
conversionFlags = conversionFlags & ~KoColorConversionTransformation::GamutCheck; conversionFlags = conversionFlags & ~KoColorConversionTransformation::GamutCheck;
} }
m_d->proofingConfig->conversionFlags = conversionFlags; m_d->proofingConfig->conversionFlags = conversionFlags;
qDebug()<<"setting softproofing in canvas: "<<softProof <<", "<<gamutCheck;
qDebug()<<conversionFlags.testFlag(KoColorConversionTransformation::SoftProofing);
qDebug()<<conversionFlags.testFlag(KoColorConversionTransformation::GamutCheck);
m_d->proofingConfigUpdated = true; m_d->proofingConfigUpdated = true;
startUpdateInPatches(this->image()->bounds()); startUpdateInPatches(this->image()->bounds());
...@@ -610,8 +607,11 @@ bool KisCanvas2::proofingConfigUpdated() ...@@ -610,8 +607,11 @@ bool KisCanvas2::proofingConfigUpdated()
KisProofingConfiguration *KisCanvas2::proofingConfiguration() const KisProofingConfiguration *KisCanvas2::proofingConfiguration() const
{ {
if (!m_d->proofingConfig) { if (!m_d->proofingConfig) {
qDebug()<<"No proofing config found, generating one"; m_d->proofingConfig = this->image()->proofingConfiguration();
m_d->proofingConfig = new KisProofingConfiguration(); if (!m_d->proofingConfig) {
qDebug()<<"Canvas: No proofing config found, generating one.";
m_d->proofingConfig = new KisProofingConfiguration();
}
} }
return m_d->proofingConfig; return m_d->proofingConfig;
} }
......
...@@ -265,9 +265,7 @@ KisImageWSP KisKraLoader::loadXML(const KoXmlElement& element) ...@@ -265,9 +265,7 @@ KisImageWSP KisKraLoader::loadXML(const KoXmlElement& element)
return KisImageWSP(0); return KisImageWSP(0);
} }
} }
qDebug()<<"start loading proofing data";
KisProofingConfiguration *proofingConfig = new KisProofingConfiguration(); KisProofingConfiguration *proofingConfig = new KisProofingConfiguration();
qDebug()<<"start loading the name";
if (!(attr = element.attribute(PROOFINGPROFILENAME)).isNull()) { if (!(attr = element.attribute(PROOFINGPROFILENAME)).isNull()) {
proofingConfig->proofingProfile = attr; proofingConfig->proofingProfile = attr;
} }
...@@ -307,7 +305,6 @@ KisImageWSP KisKraLoader::loadXML(const KoXmlElement& element) ...@@ -307,7 +305,6 @@ KisImageWSP KisKraLoader::loadXML(const KoXmlElement& element)
KoXml::asQDomElement(dom, e); KoXml::asQDomElement(dom, e);
QDomElement eq = dom.firstChildElement(); QDomElement eq = dom.firstChildElement();
proofingConfig->warningColor = KoColor::fromXML(eq.firstChildElement(), Integer8BitsColorDepthID.id(), QHash<QString, QString>()); proofingConfig->warningColor = KoColor::fromXML(eq.firstChildElement(), Integer8BitsColorDepthID.id(), QHash<QString, QString>());
qDebug()<<KoColor::toQString(proofingConfig->warningColor);
} }
if (e.tagName().toLower() == "animation") { if (e.tagName().toLower() == "animation") {
......
...@@ -51,6 +51,9 @@ KisOpenGLImageTextures::ImageTexturesMap KisOpenGLImageTextures::imageTexturesMa ...@@ -51,6 +51,9 @@ KisOpenGLImageTextures::ImageTexturesMap KisOpenGLImageTextures::imageTexturesMa
KisOpenGLImageTextures::KisOpenGLImageTextures() KisOpenGLImageTextures::KisOpenGLImageTextures()
: m_image(0) : m_image(0)
, m_monitorProfile(0) , m_monitorProfile(0)
, m_proofingConfig(0)
, m_proofingTransform(0)
, m_createNewProofingTransform(true)
, m_tilesDestinationColorSpace(0) , m_tilesDestinationColorSpace(0)
, m_internalColorManagementActive(true) , m_internalColorManagementActive(true)
, m_checkerTexture(0) , m_checkerTexture(0)
...@@ -58,9 +61,6 @@ KisOpenGLImageTextures::KisOpenGLImageTextures() ...@@ -58,9 +61,6 @@ KisOpenGLImageTextures::KisOpenGLImageTextures()
, m_allChannelsSelected(true) , m_allChannelsSelected(true)
, m_useOcio(false) , m_useOcio(false)
, m_initialized(false) , m_initialized(false)
, m_proofingConfig(0)
, m_proofingTransform(0)
, m_createNewProofingTransform(true)
{ {
KisConfig cfg; KisConfig cfg;
m_renderingIntent = (KoColorConversionTransformation::Intent)cfg.monitorRenderIntent(); m_renderingIntent = (KoColorConversionTransformation::Intent)cfg.monitorRenderIntent();
...@@ -79,7 +79,10 @@ KisOpenGLImageTextures::KisOpenGLImageTextures(KisImageWSP image, ...@@ -79,7 +79,10 @@ KisOpenGLImageTextures::KisOpenGLImageTextures(KisImageWSP image,
, m_monitorProfile(monitorProfile) , m_monitorProfile(monitorProfile)
, m_renderingIntent(renderingIntent) , m_renderingIntent(renderingIntent)
, m_conversionFlags(conversionFlags) , m_conversionFlags(conversionFlags)
, m_proofingConfig(0)
, m_proofingTransform(0)
, m_tilesDestinationColorSpace(0) , m_tilesDestinationColorSpace(0)
, m_createNewProofingTransform(true)
, m_internalColorManagementActive(true) , m_internalColorManagementActive(true)
, m_checkerTexture(0) , m_checkerTexture(0)
, m_glFuncs(0) , m_glFuncs(0)
...@@ -465,7 +468,6 @@ void KisOpenGLImageTextures::setChannelFlags(const QBitArray &channelFlags) ...@@ -465,7 +468,6 @@ void KisOpenGLImageTextures::setChannelFlags(const QBitArray &channelFlags)
void KisOpenGLImageTextures::setProofingConfig(KisProofingConfiguration *proofingConfig) void KisOpenGLImageTextures::setProofingConfig(KisProofingConfiguration *proofingConfig)
{ {
m_proofingConfig = proofingConfig; m_proofingConfig = proofingConfig;
qDebug()<<"set";
m_createNewProofingTransform = true; m_createNewProofingTransform = true;
} }
......
...@@ -128,11 +128,6 @@ public: ...@@ -128,11 +128,6 @@ public:
alarm[2] = (cmsUInt16Number)gamutWarning[0]*256; alarm[2] = (cmsUInt16Number)gamutWarning[0]*256;
cmsSetAlarmCodes(alarm); cmsSetAlarmCodes(alarm);
qDebug()<<"Test gamut check";
qDebug()<<conversionFlags.testFlag(KoColorConversionTransformation::GamutCheck);
qDebug()<<conversionFlags.testFlag(KoColorConversionTransformation::SoftProofing);
qDebug()<<alarm[0]<<", "<< alarm[1]<<", "<< alarm[2];
m_transform = cmsCreateProofingTransform(srcProfile->lcmsProfile(), m_transform = cmsCreateProofingTransform(srcProfile->lcmsProfile(),
srcColorSpaceType, srcColorSpaceType,
dstProfile->lcmsProfile(), dstProfile->lcmsProfile(),
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment