Differential D13525 Diff 36302 plugins/dockers/artisticcolorselector/kis_color_selector.cpp

Changeset View

Standalone View

View Options

plugins/dockers/artisticcolorselector/kis_color_selector.cpp

Context not available.
30#include <cmath> 30​#include <cmath>
31 31​
32#include <kis_config.h> 32​#include <kis_config.h>
33​#include <kis_arcs_constants.h>
34​#include <resources/KoGamutMask.h>
35​#include <KisGamutMaskViewConverter.h>
33 36​
34#include "kis_color_selector.h" 37​#include "kis_color_selector.h"
35 38​
36static const int MIN_NUM_HUE_PIECES = 1; ​
37static const int MAX_NUM_HUE_PIECES = 48; ​
38static const int MIN_NUM_LIGHT_PIECES = 1; ​
39static const int MAX_NUM_LIGHT_PIECES = 30; ​
40static const int MIN_NUM_SATURATION_RINGS = 1; ​
41static const int MAX_NUM_SATURATION_RINGS = 20; ​
42 ​
43KisColorSelector::KisColorSelector(QWidget* parent, KisColor::Type type): 39​KisColorSelector::KisColorSelector(QWidget* parent, KisColor::Type type):
44 QWidget(parent), 40​ QWidget(parent),
45 m_colorSpace(type), 41​ m_colorSpace(type),
46 m_inverseSaturation(false), 42​ m_inverseSaturation(false),
47 m_relativeLight(false), 43​ m_relativeLight(true),
48 m_light(0.5f), 44​ m_light(0.5f),
49 m_selectedColorRole(Acs::Foreground), 45​ m_selectedColorRole(Acs::Foreground),
50 m_clickedRing(-1) 46​ m_clickedRing(-1),
47​ m_gamutMaskOn(false),
48​ m_widgetUpdatesSelf(false),
49​ m_grayColor(QColor(128,128,128,255)),
50​ m_gamutMaskColor(QColor(128,128,128,255)),
51​ m_currentGamutMask(nullptr)
51{ 52​{
52 recalculateRings(9, 12); 53​ recalculateRings(9, 12);
53 recalculateAreas(9); 54​ recalculateAreas(9);
Context not available.
112 113​
113void KisColorSelector::setFgColor(const KisColor& fgColor) 114​void KisColorSelector::setFgColor(const KisColor& fgColor)
114{ 115​{
115 m_fgColor = KisColor(fgColor, m_colorSpace); 116​ if (!m_widgetUpdatesSelf) {
116 update(); 117​ m_fgColor = KisColor(fgColor, m_colorSpace);
118​ dbgPlugins << "KisColorSelector::setFgColor: m_fgColor set to:"
119​ << "H:" << m_fgColor.getH()
120​ << "S:" << m_fgColor.getS()
121​ << "X:" << m_fgColor.getX();
122​
123​ m_selectedColor = KisColor(fgColor, m_colorSpace);
124​ dbgPlugins << "KisColorSelector::setFgColor: m_selectedColor set to:"
125​ << "H:" << m_selectedColor.getH()
126​ << "S:" << m_selectedColor.getS()
127​ << "X:" << m_selectedColor.getX();
128​ update();
129​ } else {
130​ dbgPlugins << "KisColorSelector::setFgColor: m_widgetUpdatesSelf == true, not updating color";
131​ }
117} 132​}
118 133​
119void KisColorSelector::setBgColor(const KisColor& bgColor) 134​void KisColorSelector::setBgColor(const KisColor& bgColor)
120{ 135​{
121 m_bgColor = KisColor(bgColor, m_colorSpace); 136​ if (!m_widgetUpdatesSelf) {
122 update(); 137​ m_bgColor = KisColor(bgColor, m_colorSpace);
138​ dbgPlugins << "KisColorSelector::setBgColor: m_bgColor set to:"
139​ << "H:" << m_bgColor.getH()
140​ << "S:" << m_bgColor.getS()
141​ << "X:" << m_bgColor.getX();
142​ update();
143​ } else {
144​ dbgPlugins << "KisColorSelector::setBgColor: m_widgetUpdatesSelf == true, not updating color";
145​ }
123} 146​}
124 147​
125void KisColorSelector::resetRings() 148​void KisColorSelector::resetRings()
Context not available.
165 } 188​ }
166} 189​}
167 190​
168QPointF KisColorSelector::mapCoord(const QPointF& pt, const QRectF& rect) const 191​void KisColorSelector::setGamutMask(KoGamutMask* gamutMask)
192​{
193​ m_currentGamutMask = gamutMask;
194​ m_currentGamutMask->setViewSize(m_renderAreaSize);
195​ update();
196​}
197​
198​KoGamutMask* KisColorSelector::gamutMask()
169{ 199​{
170 qreal w = rect.width() / 2.0; 200​ return m_currentGamutMask;
171 qreal h = rect.height() / 2.0; 201​}
172 qreal x = pt.x() - (rect.x() + w); 202​
173 qreal y = pt.y() - (rect.y() + h); 203​bool KisColorSelector::gamutMaskOn()
204​{
205​ return m_gamutMaskOn;
206​}
207​
208​
209​void KisColorSelector::setGamutMaskOn(bool gamutMaskOn)
210​{
211​ // do not allow the mask on, if it is a nullptr
212​ if (m_currentGamutMask) {
213​ m_gamutMaskOn = gamutMaskOn;
214​ update();
215​ }
216​}
217​
218​void KisColorSelector::setEnforceGamutMask(bool enforce)
219​{
220​ m_enforceGamutMask = enforce;
221​ update();
222​}
223​
224​//QPointF KisColorSelector::mapCoord(const QPointF& pt, const QRectF& rect) const
225​//{
226​// qreal w = rect.width() / 2.0;
227​// qreal h = rect.height() / 2.0;
228​// qreal x = pt.x() - (rect.x() + w);
229​// qreal y = pt.y() - (rect.y() + h);
230​// return QPointF(x/w, y/h);
231​//}
232​
233​QPointF KisColorSelector::mapCoordToView(const QPointF& pt, const QRectF& viewRect) const
234​{
235​ qreal w = viewRect.width() / 2.0;
236​ qreal h = viewRect.height() / 2.0;
237​
238​ qreal x = pt.x() + 1.0;
239​ qreal y = (pt.y()) + 1.0;
240​
241​ return QPointF(x*w, y*h);
242​}
243​
244​QPointF KisColorSelector::mapCoordToUnit(const QPointF& pt, const QRectF& viewRect) const
245​{
246​ qreal w = viewRect.width() / 2.0;
247​ qreal h = viewRect.height() / 2.0;
248​ qreal x = pt.x() - (viewRect.x() + w);
249​ qreal y = pt.y() - (viewRect.y() + h);
174 return QPointF(x/w, y/h); 250​ return QPointF(x/w, y/h);
175} 251​}
176 252​
253​QPointF KisColorSelector::mapColorToUnit(const KisColor& color, bool invertSaturation) const
254​{
255​ qreal angle = color.getH() * 2.0 * M_PI;
256​
257​ qreal radius;
258​ if (invertSaturation && m_inverseSaturation) {
259​ radius = 1.0 - color.getS();
260​ } else {
261​ radius = color.getS();
262​ }
263​
264​ qreal x = std::cos(angle)*radius;
265​ qreal y = std::sin(-angle)*radius;
266​
267​ return QPointF(x,y);
268​}
269​
270​
177qint8 KisColorSelector::getLightIndex(const QPointF& pt) const 271​qint8 KisColorSelector::getLightIndex(const QPointF& pt) const
178{ 272​{
179 if (m_lightStripArea.contains(pt.toPoint(), true)) { 273​ if (m_lightStripArea.contains(pt.toPoint(), true)) {
Context not available.
273 int x = (width - size) / 2; 367​ int x = (width - size) / 2;
274 int y = (height - size) / 2; 368​ int y = (height - size) / 2;
275 369​
370​ m_renderAreaSize = size;
371​
276 m_renderArea = QRect(x+stripThick, y, size, size); 372​ m_renderArea = QRect(x+stripThick, y, size, size);
277 m_lightStripArea = QRect(0, 0, stripThick, QWidget::height()); 373​ m_lightStripArea = QRect(0, 0, stripThick, QWidget::height());
278 374​
279 m_renderBuffer = QImage(size, size, QImage::Format_ARGB32); 375​ m_renderBuffer = QImage(size, size, QImage::Format_ARGB32_Premultiplied);
376​ m_maskBuffer = QImage(size, size, QImage::Format_ARGB32_Premultiplied);
280 m_numLightPieces = numLightPieces; 377​ m_numLightPieces = numLightPieces;
378​
379​ if (m_currentGamutMask) {
380​ m_currentGamutMask->setViewSize(size);
381​ }
281} 382​}
282 383​
283void KisColorSelector::recalculateRings(quint8 numRings, quint8 numPieces) 384​void KisColorSelector::recalculateRings(quint8 numRings, quint8 numPieces)
Context not available.
321 } 422​ }
322} 423​}
323 424​
425​bool KisColorSelector::colorIsClear(const KisColor &color)
426​{
427​ if (m_gamutMaskOn && m_currentGamutMask) {
428​
429​ QPointF colorCoord = mapCoordToView(mapColorToUnit(color, false), m_renderArea);
430​ bool isClear = m_currentGamutMask->coordIsClear(colorCoord);
431​
432​ if (isClear) {
433​ return true;
434​ } else {
435​ return false;
436​ }
437​
438​ } else {
439​ return true;
440​ }
441​
442​ return false;
443​}
444​
445​
446​//bool KisColorSelector::colorIsClear(const QPointF& colorPoint)
447​//{
448​// if (m_gamutMaskOn) {
449​// bool isClear = m_currentGamutMask->colorIsClear(colorPoint);
450​
451​// if (isClear) {
452​// return true;
453​// } else {
454​// return false;
455​// }
456​
457​// } else {
458​// return true;
459​// }
460​
461​// return false;
462​//}
463​
324void KisColorSelector::requestUpdateColorAndPreview(const KisColor &color, Acs::ColorRole role) 464​void KisColorSelector::requestUpdateColorAndPreview(const KisColor &color, Acs::ColorRole role)
325{ 465​{
466​ dbgPlugins << "KisColorSelector::requestUpdateColorAndPreview: requesting update to: "
467​ << "H:" << color.getH()
468​ << "S:" << color.getS()
469​ << "X:" << color.getX();
470​
326 m_updateColorCompressor->start(qMakePair(color, role)); 471​ m_updateColorCompressor->start(qMakePair(color, role));
327} 472​}
328 473​
Context not available.
336 m_selectedColor = color.first; 481​ m_selectedColor = color.first;
337 m_selectedColorRole = color.second; 482​ m_selectedColorRole = color.second;
338 483​
484​ dbgPlugins << "KisColorSelector::slotUpdateColorAndPreview: m_selectedColor set to:"
485​ << "H:" << m_selectedColor.getH()
486​ << "S:" << m_selectedColor.getS()
487​ << "X:" << m_selectedColor.getX()
488​ << "role:" << m_selectedColorRole;
489​
490​
339 if (selectAsFgColor) { emit sigFgColorChanged(m_selectedColor); } 491​ if (selectAsFgColor) { emit sigFgColorChanged(m_selectedColor); }
340 else { emit sigBgColorChanged(m_selectedColor); } 492​ else { emit sigBgColorChanged(m_selectedColor); }
341} 493​}
342 494​
343void KisColorSelector::drawRing(QPainter& painter, KisColorSelector::ColorRing& ring, const QRect& rect) 495​void KisColorSelector::drawRing(QPainter& painter, int ringIndex, KisColorSelector::ColorRing& ring, const QRect& rect)
344{ 496​{
345 painter.setRenderHint(QPainter::Antialiasing, false); 497​ painter.save();
498​ painter.setRenderHint(QPainter::Antialiasing, true);
346 painter.resetTransform(); 499​ painter.resetTransform();
347 painter.translate(rect.width()/2, rect.height()/2); 500​ painter.translate(rect.width()/2, rect.height()/2);
348 501​
349 if (ring.pieced.size() > 1) { 502​ if (ring.pieced.size() > 1) {
350 painter.rotate(-ring.getShift().degrees()); 503​ painter.rotate(-ring.getShift().degrees());
351 painter.scale(rect.width()/2, rect.height()/2); 504​ painter.scale(rect.width()/2, rect.height()/2);
352 painter.setPen(Qt::NoPen); 505​// painter.setPen(Qt::NoPen);
353 506​ QPen normalPen = QPen(QBrush(m_grayColor), 0.005);
507​ QPen clearMaskPen = QPen(QBrush(Qt::white), 0.005);
354 QBrush brush(Qt::SolidPattern); 508​ QBrush brush(Qt::SolidPattern);
355 509​
356 for(int i=0; i<ring.pieced.size(); ++i) { 510​ for(int i=0; i<ring.pieced.size(); ++i) {
Context not available.
362 color.setS(ring.saturation); 516​ color.setS(ring.saturation);
363 color.setX(getLight(m_light, hue, m_relativeLight)); 517​ color.setX(getLight(m_light, hue, m_relativeLight));
364 518​
365 brush.setColor(color.getQColor()); 519​ if(m_gamutMaskOn && m_enforceGamutMask && colorIsClear(color)) {
366 painter.fillPath(ring.pieced[i], brush); 520​ painter.setPen(clearMaskPen);
521​ } else {
522​ painter.setPen(normalPen);
523​ }
524​
525​ if ((m_enforceGamutMask) && (!colorIsClear(color))) {
526​ brush.setColor(m_gamutMaskColor);
527​ } else {
528​ brush.setColor(color.getQColor());
529​ }
530​ painter.setBrush(brush);
531​
532​ painter.drawPath(ring.pieced[i]);
367 } 533​ }
368 } 534​ }
369 else { 535​ else {
Context not available.
390 painter.fillPath(ring.pieced[0], QBrush(gradient)); 556​ painter.fillPath(ring.pieced[0], QBrush(gradient));
391 } 557​ }
392 558​
393 painter.resetTransform(); 559​// painter.resetTransform();
560​ painter.restore();
394} 561​}
395 562​
396void KisColorSelector::drawOutline(QPainter& painter, const QRect& rect) 563​void KisColorSelector::drawOutline(QPainter& painter, const QRect& rect)
dkazakovUnsubmitted
Not Done

Is it okay that it is commented-out?

dkazakov: Is it okay that it is commented-out?
Context not available.
399 painter.resetTransform(); 566​ painter.resetTransform();
400 painter.translate(rect.x() + rect.width()/2, rect.y() + rect.height()/2); 567​ painter.translate(rect.x() + rect.width()/2, rect.y() + rect.height()/2);
401 painter.scale(rect.width()/2, rect.height()/2); 568​ painter.scale(rect.width()/2, rect.height()/2);
402 painter.setPen(QPen(QBrush(Qt::gray), 0.005)); 569​
570​ QPen normalPen = QPen(QBrush(m_grayColor), 0.005);
571​ QPen selectedPen = QPen(QBrush(Qt::red), 0.01);
572​
573​ painter.setPen(normalPen);
403 574​
404 if (getNumPieces() > 1) { 575​ if (getNumPieces() > 1) {
405 for(int i=0; i<getNumRings(); ++i) { 576​// for(int i=0; i<getNumRings(); ++i) {
406 painter.resetTransform(); 577​// painter.resetTransform();
407 painter.translate(rect.x() + rect.width()/2, rect.y() + rect.height()/2); 578​// painter.translate(rect.x() + rect.width()/2, rect.y() + rect.height()/2);
408 painter.scale(rect.width()/2, rect.height()/2); 579​// painter.scale(rect.width()/2, rect.height()/2);
409 painter.rotate(-m_colorRings[i].getShift().degrees()); 580​// painter.rotate(-m_colorRings[i].getShift().degrees());
410 581​
411 for(int j=0; j<m_colorRings[i].pieced.size(); ++j) 582​// for(int j=0; j<m_colorRings[i].pieced.size(); ++j)
412 painter.drawPath(m_colorRings[i].pieced[j]); 583​// painter.drawPath(m_colorRings[i].pieced[j]);
413 } 584​// }
414 585​
415 if (m_selectedRing >= 0 && m_selectedPiece >= 0) { 586​ if (m_selectedRing >= 0 && m_selectedPiece >= 0) {
416 painter.resetTransform(); 587​ painter.resetTransform();
Context not available.
418 painter.rotate(-m_colorRings[m_selectedRing].getShift().degrees()); 589​ painter.rotate(-m_colorRings[m_selectedRing].getShift().degrees());
419 painter.scale(rect.width()/2, rect.height()/2); 590​ painter.scale(rect.width()/2, rect.height()/2);
420 591​
421 painter.setPen(QPen(QBrush(Qt::red), 0.01)); 592​ painter.setPen(selectedPen);
422 painter.drawPath(m_colorRings[m_selectedRing].pieced[m_selectedPiece]); 593​ painter.drawPath(m_colorRings[m_selectedRing].pieced[m_selectedPiece]);
423 } 594​ }
424 } 595​ }
Context not available.
427 qreal rad = m_colorRings[i].outerRadius; 598​ qreal rad = m_colorRings[i].outerRadius;
428 painter.drawEllipse(QRectF(-rad, -rad, rad*2.0, rad*2.0)); 599​ painter.drawEllipse(QRectF(-rad, -rad, rad*2.0, rad*2.0));
429 } 600​ }
430 } ​
431 601​
432 if (m_selectedRing >= 0) { 602​ if (m_selectedRing >= 0) {
433 qreal iRad = m_colorRings[m_selectedRing].innerRadius; 603​ qreal iRad = m_colorRings[m_selectedRing].innerRadius;
434 qreal oRad = m_colorRings[m_selectedRing].outerRadius; 604​ qreal oRad = m_colorRings[m_selectedRing].outerRadius;
435 605​
436 painter.setPen(QPen(QBrush(Qt::red), 0.005)); 606​ painter.setPen(selectedPen);
437 painter.drawEllipse(QRectF(-iRad, -iRad, iRad*2.0, iRad*2.0)); 607​ painter.drawEllipse(QRectF(-iRad, -iRad, iRad*2.0, iRad*2.0));
438 painter.drawEllipse(QRectF(-oRad, -oRad, oRad*2.0, oRad*2.0)); 608​ painter.drawEllipse(QRectF(-oRad, -oRad, oRad*2.0, oRad*2.0));
439 609​
440 if (getNumPieces() <= 1) { ​
441 float c = std::cos(-m_selectedColor.getH() * PI2); 610​ float c = std::cos(-m_selectedColor.getH() * PI2);
442 float s = std::sin(-m_selectedColor.getH() * PI2); 611​ float s = std::sin(-m_selectedColor.getH() * PI2);
443 painter.drawLine(QPointF(c*iRad, s*iRad), QPointF(c*oRad, s*oRad)); 612​ painter.drawLine(QPointF(c*iRad, s*iRad), QPointF(c*oRad, s*oRad));
Context not available.
449{ 618​{
450 bool isVertical = true; 619​ bool isVertical = true;
451 qreal penSize = qreal(qMin(QWidget::width(), QWidget::height())) / 200.0; 620​ qreal penSize = qreal(qMin(QWidget::width(), QWidget::height())) / 200.0;
452 KisColor color(m_selectedColor); 621​ KisColor color(m_fgColor);
453 622​
454 painter.resetTransform(); 623​ painter.resetTransform();
455 624​
Context not available.
475 644​
476 if (i == m_selectedLightPiece) 645​ if (i == m_selectedLightPiece)
477 painter.drawRect(r); 646​ painter.drawRect(r);
647​
648​ if (m_showValueScaleNumbers) {
649​ int valueNumber = light*100;
650​ painter.drawText(r, Qt::AlignCenter, QString::number(valueNumber));
651​ }
478 } 652​ }
479 } 653​ }
480 else { 654​ else {
Context not available.
515 } 689​ }
516} 690​}
517 691​
692​void KisColorSelector::drawBlip(QPainter& painter, const QRect& rect)
693​{
694​ painter.setRenderHint(QPainter::Antialiasing, false);
695​ painter.resetTransform();
696​ painter.translate(rect.x() + rect.width()/2, rect.y() + rect.height()/2);
697​ painter.scale(rect.width()/2, rect.height()/2);
698​
699​ QPointF fgColorPos = mapColorToUnit(m_fgColor);
700​
701​ dbgPlugins << "KisColorSelector::drawBlip: "
702​ << "colorPoint H:" << m_fgColor.getH() << " S:" << m_fgColor.getS()
703​ << "-> coord X:" << fgColorPos.x() << " Y:" << fgColorPos.y();
704​
705​
706​ painter.setPen(QPen(QBrush(Qt::white), 0.01));
707​ painter.drawEllipse(fgColorPos, 0.05, 0.05);
708​
709​ painter.setPen(QPen(QBrush(Qt::black), 0.01));
710​ painter.setBrush(m_fgColor.getQColor());
711​ painter.drawEllipse(fgColorPos, 0.04, 0.04);
712​}
713​
714​void KisColorSelector::drawGamutMaskShape(QPainter &painter, const QRect &rect)
715​{
716​ painter.save();
717​ painter.setRenderHint(QPainter::Antialiasing, true);
718​
719​ painter.resetTransform();
720​ painter.translate(rect.width()/2, rect.height()/2);
721​ painter.scale(rect.width()/2, rect.height()/2);
722​
723​ painter.setPen(Qt::NoPen);
724​ painter.setBrush(m_gamutMaskColor);
725​
726​ painter.drawEllipse(QPointF(0,0), 1.0, 1.0);
727​
728​ painter.resetTransform();
729​ painter.setCompositionMode(QPainter::CompositionMode_Xor);
730​
731​ m_currentGamutMask->paint(painter);
732​
733​ painter.restore();
734​}
735​
518void KisColorSelector::paintEvent(QPaintEvent* /*event*/) 736​void KisColorSelector::paintEvent(QPaintEvent* /*event*/)
519{ 737​{
520 // 0 red -> (1,0,0) 738​ // 0 red -> (1,0,0)
Context not available.
530 QPainter imgPainter(&m_renderBuffer); 748​ QPainter imgPainter(&m_renderBuffer);
531 QPainter wdgPainter(this); 749​ QPainter wdgPainter(this);
532 750​
533 QRect fgRect(0, 0 , QWidget::width(), QWidget::height()/2); 751​ // draw the fg and bg color previews
534 QRect bgRect(0, QWidget::height()/2, QWidget::width(), QWidget::height()/2); 752​ // QPainter settings must be saved and restored afterwards, otherwise the wheel drawing is totally broken
753​ wdgPainter.save();
754​ wdgPainter.setRenderHint(QPainter::Antialiasing, true);
755​
756​ QRect fgRect(0, 0, QWidget::width(), QWidget::height());
535 wdgPainter.fillRect(fgRect, m_fgColor.getQColor()); 757​ wdgPainter.fillRect(fgRect, m_fgColor.getQColor());
536 wdgPainter.fillRect(bgRect, m_bgColor.getQColor()); 758​
759​ int bgSide = qMin(QWidget::width()*0.15,QWidget::height()*0.15);
760​
761​ if (m_showBgColor) {
762​ QPointF bgPolyPoints[3] = {
763​ QPointF(QWidget::width(), QWidget::height()),
764​ QPointF(QWidget::width()-bgSide, QWidget::height()),
765​ QPointF(QWidget::width(), QWidget::height()-bgSide)
766​ };
767​
768​ wdgPainter.setBrush(m_bgColor.getQColor());
769​ wdgPainter.setPen(m_bgColor.getQColor());
770​ wdgPainter.drawPolygon(bgPolyPoints, 3);
771​ }
772​
773​ wdgPainter.restore();
537 774​
538 for(int i=0; i<m_colorRings.size(); ++i) 775​ for(int i=0; i<m_colorRings.size(); ++i)
539 drawRing(imgPainter, m_colorRings[i], m_renderArea); 776​ drawRing(imgPainter, i, m_colorRings[i], m_renderArea);
540 777​
541 wdgPainter.drawImage(m_renderArea, m_renderBuffer); 778​ wdgPainter.drawImage(m_renderArea, m_renderBuffer);
542 779​
780​
781​ // draw the mask either in continuous mode or in discrete mode when enforcing is turned off
782​ // if enforcing is turned on in discrete mode,
783​ // drawRing function takes care of delineating the mask swatches
784​ if (m_gamutMaskOn
785​ && ((getNumPieces() == 1) || (!m_enforceGamutMask))) {
786​
787​ m_maskBuffer.fill(0);
788​ QPainter maskPainter(&m_maskBuffer);
789​ drawGamutMaskShape(maskPainter, m_renderArea);
790​
791​ wdgPainter.drawImage(m_renderArea, m_maskBuffer);
792​ }
793​
543 drawOutline (wdgPainter, m_renderArea); 794​ drawOutline (wdgPainter, m_renderArea);
795​
544 drawLightStrip(wdgPainter, m_lightStripArea); 796​ drawLightStrip(wdgPainter, m_lightStripArea);
797​
798​ if (m_showColorBlip) {
799​ drawBlip (wdgPainter, m_renderArea);
800​ }
545} 801​}
546 802​
547void KisColorSelector::mousePressEvent(QMouseEvent* event) 803​void KisColorSelector::mousePressEvent(QMouseEvent* event)
548{ 804​{
549 m_clickPos = mapCoord(event->localPos(), m_renderArea); 805​ m_widgetUpdatesSelf = true;
806​ dbgPlugins << "KisColorSelector::mousePressEvent: m_widgetUpdatesSelf = true";
807​
808​ m_clickPos = mapCoordToUnit(event->localPos(), m_renderArea);
550 m_mouseMoved = false; 809​ m_mouseMoved = false;
551 m_pressedButtons = event->buttons(); 810​ m_pressedButtons = event->buttons();
552 m_clickedRing = getSaturationIndex(m_clickPos); 811​ m_clickedRing = getSaturationIndex(m_clickPos);
Context not available.
566 } 825​ }
567 else { 826​ else {
568 Radian angle = std::atan2(m_clickPos.x(), m_clickPos.y()) - RAD_90; 827​ Radian angle = std::atan2(m_clickPos.x(), m_clickPos.y()) - RAD_90;
569 m_selectedColor.setH(angle.scaled(0.0f, 1.0f)); 828​
570 m_selectedColor.setS(getSaturation(m_clickedRing)); 829​ KisColor color;
571 m_selectedColor.setX(getLight(m_light, m_selectedColor.getH(), m_relativeLight)); 830​ color.setH(angle.scaled(0.0f, 1.0f));
572 requestUpdateColorAndPreview(m_selectedColor, Acs::buttonsToRole(Qt::NoButton, m_pressedButtons)); 831​ color.setS(getSaturation(m_clickedRing));
573 m_selectedRing = m_clickedRing; 832​ color.setX(getLight(m_light, color.getH(), m_relativeLight));
574 m_mouseMoved = true; 833​
575 update(); 834​ if ((!m_enforceGamutMask) || colorIsClear(color)) {
835​ m_selectedColor.setHSX(color.getH(), color.getS(), color.getX());
836​ requestUpdateColorAndPreview(m_selectedColor, Acs::buttonsToRole(Qt::NoButton, m_pressedButtons));
837​ m_selectedRing = m_clickedRing;
838​ m_mouseMoved = true;
839​ update();
840​ }
576 } 841​ }
577 } 842​ }
578} 843​}
579 844​
580void KisColorSelector::mouseMoveEvent(QMouseEvent* event) 845​void KisColorSelector::mouseMoveEvent(QMouseEvent* event)
581{ 846​{
582 QPointF dragPos = mapCoord(event->localPos(), m_renderArea); 847​ QPointF dragPos = mapCoordToUnit(event->localPos(), m_renderArea);
583 qint8 clickedLightPiece = getLightIndex(event->localPos()); 848​ qint8 clickedLightPiece = getLightIndex(event->localPos());
584 849​
585 if (clickedLightPiece >= 0) { 850​ if (clickedLightPiece >= 0) {
Context not available.
612 color.setH(angle.scaled(0.0f, 1.0f)); 877​ color.setH(angle.scaled(0.0f, 1.0f));
613 color.setX(getLight(m_light, color.getH(), m_relativeLight)); 878​ color.setX(getLight(m_light, color.getH(), m_relativeLight));
614 879​
615 m_selectedPiece = getHueIndex(angle, m_colorRings[m_clickedRing].getShift()); 880​ if ((!m_enforceGamutMask) || colorIsClear(color)) {
616 requestUpdateColorAndPreview(color, m_selectedColorRole); 881​ m_selectedPiece = getHueIndex(angle, m_colorRings[m_clickedRing].getShift());
882​ requestUpdateColorAndPreview(color, m_selectedColorRole);
883​ }
617 } 884​ }
618 885​
619 m_mouseMoved = true; 886​ m_mouseMoved = true;
Context not available.
621 } 888​ }
622 else { 889​ else {
623 Radian angle = std::atan2(dragPos.x(), dragPos.y()) - RAD_90; 890​ Radian angle = std::atan2(dragPos.x(), dragPos.y()) - RAD_90;
624 m_selectedColor.setH(angle.scaled(0.0f, 1.0f)); 891​ KisColor color;
625 m_selectedColor.setX(getLight(m_light, m_selectedColor.getH(), m_relativeLight)); 892​ color.setH(angle.scaled(0.0f, 1.0f));
626 requestUpdateColorAndPreview(m_selectedColor, m_selectedColorRole); 893​ color.setS(getSaturation(m_clickedRing));
894​ color.setX(getLight(m_light, color.getH(), m_relativeLight));
895​
896​ if ((!m_enforceGamutMask) || colorIsClear(color)) {
897​ m_selectedColor.setHSX(color.getH(), color.getS(), color.getX());
898​ requestUpdateColorAndPreview(m_selectedColor, m_selectedColorRole);
899​ }
627 } 900​ }
628 901​
629 update(); 902​ update();
Context not available.
633{ 906​{
634 if (!m_mouseMoved && m_clickedRing >= 0) { 907​ if (!m_mouseMoved && m_clickedRing >= 0) {
635 Radian angle = std::atan2(m_clickPos.x(), m_clickPos.y()) - RAD_90; 908​ Radian angle = std::atan2(m_clickPos.x(), m_clickPos.y()) - RAD_90;
909​ KisColor color;
636 910​
637 m_selectedRing = m_clickedRing; 911​ qint8 hueIndex = getHueIndex(angle, m_colorRings[m_clickedRing].getShift());
638 m_selectedPiece = getHueIndex(angle, m_colorRings[m_clickedRing].getShift()); ​
639 912​
640 if (getNumPieces() > 1) 913​ if (getNumPieces() > 1) {
641 m_selectedColor.setH(getHue(m_selectedPiece, m_colorRings[m_clickedRing].getShift())); 914​ color.setH(getHue(hueIndex, m_colorRings[m_clickedRing].getShift()));
642 else 915​ } else {
643 m_selectedColor.setH(angle.scaled(0.0f, 1.0f)); 916​ color.setH(angle.scaled(0.0f, 1.0f));
917​ }
644 918​
645 m_selectedColor.setS(getSaturation(m_selectedRing)); 919​ color.setS(getSaturation(m_clickedRing));
646 m_selectedColor.setX(getLight(m_light, m_selectedColor.getH(), m_relativeLight)); 920​ color.setX(getLight(m_light, color.getH(), m_relativeLight));
647 921​
648 requestUpdateColorAndPreview(m_selectedColor, Acs::buttonsToRole(Qt::NoButton, m_pressedButtons)); 922​ if ((!m_enforceGamutMask) || colorIsClear(color)) {
923​ m_selectedColor.setHSX(color.getH(), color.getS(), color.getX());
924​ m_selectedPiece = hueIndex;
925​ m_selectedRing = m_clickedRing;
926​ requestUpdateColorAndPreview(m_selectedColor, Acs::buttonsToRole(Qt::NoButton, m_pressedButtons));
927​ }
649 } 928​ }
650 else if (m_mouseMoved) 929​ else if (m_mouseMoved)
651 requestUpdateColorAndPreview(m_selectedColor, m_selectedColorRole); 930​ requestUpdateColorAndPreview(m_selectedColor, m_selectedColorRole);
652 931​
653 m_clickedRing = -1; 932​ m_clickedRing = -1;
933​
934​ m_widgetUpdatesSelf = false;
935​ dbgPlugins << "KisColorSelector::ReleasePressEvent: m_widgetUpdatesSelf = false";
936​
654 update(); 937​ update();
655} 938​}
656 939​
Context not available.
659 recalculateAreas(quint8(getNumLightPieces())); 942​ recalculateAreas(quint8(getNumLightPieces()));
660} 943​}
661 944​
945​void KisColorSelector::leaveEvent(QEvent* /*e*/)
946​{
947​ m_widgetUpdatesSelf = false;
948​ dbgPlugins << "KisColorSelector::leaveEvent: m_widgetUpdatesSelf = false";
949​}
950​
662void KisColorSelector::saveSettings() 951​void KisColorSelector::saveSettings()
663{ 952​{
664 KisConfig cfg; 953​ KisConfig cfg;
Context not available.
676 cfg.writeEntry("ArtColorSel.SelColorX", m_selectedColor.getX()); 965​ cfg.writeEntry("ArtColorSel.SelColorX", m_selectedColor.getX());
677 cfg.writeEntry("ArtColorSel.SelColorA", m_selectedColor.getA()); 966​ cfg.writeEntry("ArtColorSel.SelColorA", m_selectedColor.getA());
678 967​
968​ cfg.writeEntry("ArtColorSel.defaultHueSteps", quint32(m_defaultHueSteps));
969​ cfg.writeEntry("ArtColorSel.defaultSaturationSteps", quint32(m_defaultSaturationSteps));
970​ cfg.writeEntry("ArtColorSel.defaultValueScaleSteps", quint32(m_defaultValueScaleSteps));
971​
972​ cfg.writeEntry("ArtColorSel.showBgColor", m_showBgColor);
973​ cfg.writeEntry("ArtColorSel.showColorBlip", m_showColorBlip);
974​ cfg.writeEntry("ArtColorSel.showValueScaleNumber", m_showValueScaleNumbers);
975​ cfg.writeEntry("ArtColorSel.enforceGamutMask", m_enforceGamutMask);
976​
679 QList<float> angles; 977​ QList<float> angles;
680 978​
681 for(int i=0; i<m_colorRings.size(); ++i) 979​ for(int i=0; i<m_colorRings.size(); ++i)
Context not available.
689 KisConfig cfg; 987​ KisConfig cfg;
690 setColorSpace(KisColor::Type(cfg.readEntry<qint32>("ArtColorSel.ColorSpace" , KisColor::HSY))); 988​ setColorSpace(KisColor::Type(cfg.readEntry<qint32>("ArtColorSel.ColorSpace" , KisColor::HSY)));
691 989​
692 setNumLightPieces(cfg.readEntry("ArtColorSel.LightPieces", 19)); 990​ m_defaultHueSteps = cfg.readEntry("ArtColorSel.defaultHueSteps", DEFAULT_HUE_STEPS);
991​ m_defaultSaturationSteps = cfg.readEntry("ArtColorSel.defaultSaturationSteps", DEFAULT_SATURATION_STEPS);
992​ m_defaultValueScaleSteps = cfg.readEntry("ArtColorSel.defaultValueScaleSteps", DEFAULT_VALUE_SCALE_STEPS);
993​
994​ setNumLightPieces(cfg.readEntry("ArtColorSel.LightPieces", DEFAULT_VALUE_SCALE_STEPS));
693 995​
694 m_selectedColor.setH(cfg.readEntry<float>("ArtColorSel.SelColorH", 0.0f)); 996​ m_selectedColor.setH(cfg.readEntry<float>("ArtColorSel.SelColorH", 0.0f));
695 m_selectedColor.setS(cfg.readEntry<float>("ArtColorSel.SelColorS", 0.0f)); 997​ m_selectedColor.setS(cfg.readEntry<float>("ArtColorSel.SelColorS", 0.0f));
Context not available.
697 m_selectedColor.setA(1.0f); 999​ m_selectedColor.setA(1.0f);
698 1000​
699 setInverseSaturation(cfg.readEntry<bool>("ArtColorSel.InversedSaturation", false)); 1001​ setInverseSaturation(cfg.readEntry<bool>("ArtColorSel.InversedSaturation", false));
700 setLight(cfg.readEntry<float>("ArtColorSel.Light", 0.5f), cfg.readEntry<bool>("ArtColorSel.RelativeLight", false)); 1002​ setLight(cfg.readEntry<float>("ArtColorSel.Light", 0.5f), cfg.readEntry<bool>("ArtColorSel.RelativeLight", true));
701 1003​
702 recalculateRings( 1004​ setNumRings(cfg.readEntry("ArtColorSel.NumRings" , DEFAULT_SATURATION_STEPS));
703 cfg.readEntry("ArtColorSel.NumRings" , 11), 1005​ setNumPieces(cfg.readEntry("ArtColorSel.RingPieces", DEFAULT_HUE_STEPS));
704 cfg.readEntry("ArtColorSel.RingPieces", 12) ​
705 ); ​
706 1006​
707 QList<float> angles = cfg.readList<float>("ArtColorSel.RingAngles"); 1007​ QList<float> angles = cfg.readList<float>("ArtColorSel.RingAngles");
708 1008​
Context not available.
712 } 1012​ }
713 } 1013​ }
714 1014​
1015​ m_showBgColor = cfg.readEntry("ArtColorSel.showBgColor", true);
1016​ m_showColorBlip = cfg.readEntry("ArtColorSel.showColorBlip", true);
1017​ m_showValueScaleNumbers = cfg.readEntry("ArtColorSel.showValueScaleNumber", false);
1018​ m_enforceGamutMask = cfg.readEntry("ArtColorSel.enforceGamutMask", true);
1019​
715 selectColor(m_selectedColor); 1020​ selectColor(m_selectedColor);
716 update(); 1021​ update();
717} 1022​}
1023​
1024​void KisColorSelector::setDefaultHueSteps(int num)
1025​{
1026​ num = qBound(MIN_NUM_HUE_PIECES, num, MAX_NUM_HUE_PIECES);
1027​ m_defaultHueSteps = num;
1028​}
1029​
1030​void KisColorSelector::setDefaultSaturationSteps(int num)
1031​{
1032​ num = qBound(MIN_NUM_SATURATION_RINGS, num, MAX_NUM_SATURATION_RINGS);
1033​ m_defaultSaturationSteps = num;
1034​}
1035​
1036​void KisColorSelector::setDefaultValueScaleSteps(int num)
1037​{
1038​ num = qBound(MIN_NUM_LIGHT_PIECES, num, MAX_NUM_LIGHT_PIECES);
1039​ m_defaultValueScaleSteps = num;
1040​}
1041​
1042​void KisColorSelector::setShowColorBlip(bool value) {
1043​ m_showColorBlip = value;
1044​ update();
1045​}
1046​
1047​void KisColorSelector::setShowBgColor(bool value)
1048​{
1049​ m_showBgColor = value;
1050​ update();
1051​}
1052​
1053​void KisColorSelector::setShowValueScaleNumbers(bool value)
1054​{
1055​ m_showValueScaleNumbers = value;
1056​ update();
1057​}
1058​
1059​bool KisColorSelector::saturationIsInvertible()
1060​{
1061​ if (!m_gamutMaskOn) return true;
1062​ bool b = (m_enforceGamutMask && getNumPieces() == 1) ? false : true;
1063​ return b;
1064​}
1065​
Context not available.