Changeset View
Changeset View
Standalone View
Standalone View
plugins/dockers/artisticcolorselector/kis_color.cpp
Show First 20 Lines • Show All 70 Lines • ▼ Show 20 Line(s) | 66 | { | |||
---|---|---|---|---|---|
71 | m_lumaG = lG; | 71 | m_lumaG = lG; | ||
72 | m_lumaB = lB; | 72 | m_lumaB = lB; | ||
73 | m_lumaGamma = lGamma; | 73 | m_lumaGamma = lGamma; | ||
74 | 74 | | |||
75 | KoColor koColor = m_colorConverter->approximateFromRenderedQColor(c); | 75 | KoColor koColor = m_colorConverter->approximateFromRenderedQColor(c); | ||
76 | fromKoColor(koColor); | 76 | fromKoColor(koColor); | ||
77 | } | 77 | } | ||
78 | 78 | | |||
79 | KisColor::KisColor(const KisColor& color) | | |||
80 | { | | |||
81 | m_colorConverter = color.colorConverter(); | | |||
82 | m_lumaR = color.lumaR(); | | |||
83 | m_lumaG = color.lumaG(); | | |||
84 | m_lumaB = color.lumaB(); | | |||
85 | m_lumaGamma = color.lumaGamma(); | | |||
86 | initHSX(color.getType(), color.getH(), color.getS(), color.getX()); | | |||
87 | } | | |||
88 | | ||||
89 | KisColor::KisColor(const KoColor &color, KisDisplayColorConverter* converter, KisColor::Type type, | 79 | KisColor::KisColor(const KoColor &color, KisDisplayColorConverter* converter, KisColor::Type type, | ||
90 | qreal lR, qreal lG, qreal lB, qreal lGamma) | 80 | qreal lR, qreal lG, qreal lB, qreal lGamma) | ||
91 | { | 81 | { | ||
92 | m_colorConverter = converter; | 82 | m_colorConverter = converter; | ||
93 | m_type = type; | 83 | m_type = type; | ||
94 | m_lumaR = lR; | 84 | m_lumaR = lR; | ||
95 | m_lumaG = lG; | 85 | m_lumaG = lG; | ||
96 | m_lumaB = lB; | 86 | m_lumaB = lB; | ||
97 | m_lumaGamma = lGamma; | 87 | m_lumaGamma = lGamma; | ||
98 | fromKoColor(color); | 88 | fromKoColor(color); | ||
99 | } | 89 | } | ||
100 | 90 | | |||
101 | KisColor::KisColor(const KisColor& color, KisColor::Type type, | 91 | KisColor::KisColor(const KisColor& color, KisDisplayColorConverter* converter, KisColor::Type type, | ||
102 | qreal lR, qreal lG, qreal lB, qreal lGamma) | 92 | qreal lR, qreal lG, qreal lB, qreal lGamma) | ||
103 | { | 93 | { | ||
104 | m_colorConverter = color.colorConverter(); | 94 | m_colorConverter = converter; | ||
105 | m_type = type; | 95 | m_type = type; | ||
106 | m_lumaR = lR; | 96 | m_lumaR = lR; | ||
107 | m_lumaG = lG; | 97 | m_lumaG = lG; | ||
108 | m_lumaB = lB; | 98 | m_lumaB = lB; | ||
109 | m_lumaGamma = lGamma; | 99 | m_lumaGamma = lGamma; | ||
110 | initHSX(type, color.getH(), color.getS(), color.getX()); | 100 | initHSX(type, color.getH(), color.getS(), color.getX()); | ||
111 | } | 101 | } | ||
112 | 102 | | |||
▲ Show 20 Lines • Show All 56 Lines • Show Last 20 Lines |