Differential D8543 Diff 21844 plugins/paintops/libpaintop/kis_pressure_sharpness_option.cpp

Changeset View

Standalone View

View Options

plugins/paintops/libpaintop/kis_pressure_sharpness_option.cpp

Context not available.
31KisPressureSharpnessOption::KisPressureSharpnessOption() 31​KisPressureSharpnessOption::KisPressureSharpnessOption()
32 : KisCurveOption("Sharpness", KisPaintOpOption::GENERAL, false) 32​ : KisCurveOption("Sharpness", KisPaintOpOption::GENERAL, false)
33{ 33​{
34 m_threshold = 40; 34​ m_softness = 0;
35​ m_soft = false;
36​}
37​
38​void KisPressureSharpnessOption::setSoft(bool soft)
39​{
40​ m_soft = soft;
41​}
42​
43​bool KisPressureSharpnessOption::isSoft()
44​{
45​ return m_soft;
35} 46​}
36 47​
37void KisPressureSharpnessOption::writeOptionSetting(KisPropertiesConfigurationSP setting) const 48​void KisPressureSharpnessOption::writeOptionSetting(KisPropertiesConfigurationSP setting) const
38{ 49​{
39 KisCurveOption::writeOptionSetting(setting); 50​ KisCurveOption::writeOptionSetting(setting);
40 setting->setProperty(SHARPNESS_THRESHOLD, m_threshold); 51​ setting->setProperty(SHARPNESS_SOFTNESS, m_softness);
52​ setting->setProperty(SOFT_MODE, m_soft);
41} 53​}
42 54​
43void KisPressureSharpnessOption::readOptionSetting(const KisPropertiesConfigurationSP setting) 55​void KisPressureSharpnessOption::readOptionSetting(const KisPropertiesConfigurationSP setting)
44{ 56​{
45 KisCurveOption::readOptionSetting(setting); 57​ KisCurveOption::readOptionSetting(setting);
46 m_threshold = setting->getInt(SHARPNESS_THRESHOLD, 4); 58​ m_softness = setting->getInt(SHARPNESS_SOFTNESS, 0);
woltheravUnsubmitted
Done

the threshold/softness slider will also need to have m_softness set, otherwise it won't save.

woltherav: the threshold/softness slider will also need to have m_softness set, otherwise it won't save.
woltheravUnsubmitted
Done

oh, also change the 0 to 100, that way new brushes get loaded with this set to 100 and there's nothing funny happening with the brushes.

woltherav: oh, also change the 0 to 100, that way new brushes get loaded with this set to 100 and there's…
59​ m_soft = setting->getBool(SOFT_MODE, false);
47 60​
48 // backward compatibility: test for a "sharpness factor" property 61​ // backward compatibility: test for a "sharpness factor" property
49 // and use this value if it does exist 62​ // and use this value if it does exist
Context not available.
82 } 95​ }
83} 96​}
84 97​
85void KisPressureSharpnessOption::applyThreshold(KisFixedPaintDeviceSP dab) 98​void KisPressureSharpnessOption::applyThreshold(KisFixedPaintDeviceSP dab, const KisPaintInformation & info)
86{ 99​{
87 if (!isChecked()) return; 100​ if (!isChecked()) return;
88 const KoColorSpace * cs = dab->colorSpace(); 101​ const KoColorSpace * cs = dab->colorSpace();
Context not available.
92 quint8* dabPointer = dab->data(); 105​ quint8* dabPointer = dab->data();
93 QRect rc = dab->bounds(); 106​ QRect rc = dab->bounds();
94 107​
108​ qreal threshold = computeSizeLikeValue(info);
109​
95 int pixelSize = dab->pixelSize(); 110​ int pixelSize = dab->pixelSize();
96 int pixelCount = rc.width() * rc.height(); 111​ int pixelCount = rc.width() * rc.height();
97 112​
98 for (int i = 0; i < pixelCount; i++) { 113​ for (int i = 0; i < pixelCount; i++) {
99 quint8 alpha = cs->opacityU8(dabPointer); 114​ quint8 alpha = cs->opacityU8(dabPointer);
100 115​
101 if (alpha < (m_threshold * OPACITY_OPAQUE_U8) / 100) { 116​ if (alpha + m_softness < (threshold * OPACITY_OPAQUE_U8 ) ) {
102 cs->setOpacity(dabPointer, OPACITY_TRANSPARENT_U8, 1); 117​ cs->setOpacity(dabPointer, OPACITY_TRANSPARENT_U8, 1);
103 } 118​ }
104 else { 119​ else if (m_soft == false) {
105 cs->setOpacity(dabPointer, OPACITY_OPAQUE_U8, 1); 120​ if (alpha - m_softness > (threshold * OPACITY_OPAQUE_U8 ) ) {
121​ cs->setOpacity(dabPointer, OPACITY_OPAQUE_U8, 1);
122​ }
106 } 123​ }
107 124​
108 dabPointer += pixelSize; 125​ dabPointer += pixelSize;
Context not available.