Differential D15316 Diff 43979 widgets/imagelib/effects/kpEffectHSVWidget.cpp

Changeset View

Standalone View

View Options

widgets/imagelib/effects/kpEffectHSVWidget.cpp

Context not available.
28 28​
29#include "kpEffectHSVWidget.h" 29​#include "kpEffectHSVWidget.h"
30 30​
31#include <qgridlayout.h> 31​#include <QGridLayout>
32#include <qlabel.h> 32​#include <QLabel>
33​#include <QSlider>
34​#include <QDoubleSpinBox>
33 35​
34#include "kpLogCategories.h" 36​#include "kpLogCategories.h"
35#include <KLocalizedString> 37​#include <KLocalizedString>
36#include <knuminput.h> // kdelibs4support ​
37 38​
38#include "imagelib/effects/kpEffectHSV.h" 39​#include "imagelib/effects/kpEffectHSV.h"
39#include "commands/imagelib/effects/kpEffectHSVCommand.h" 40​#include "commands/imagelib/effects/kpEffectHSVCommand.h"
Context not available.
49 QLabel *saturationLabel = new QLabel (i18n ("&Saturation:"), this); 50​ QLabel *saturationLabel = new QLabel (i18n ("&Saturation:"), this);
50 QLabel *valueLabel = new QLabel (i18nc ("The V of HSV", "&Value:"), this); 51​ QLabel *valueLabel = new QLabel (i18nc ("The V of HSV", "&Value:"), this);
51 52​
52 m_hueInput = new KDoubleNumInput (this); 53​ m_hueInputSB = new KpMultDoubleSpinBox (this);
53 m_hueInput->setRange (-180, 180, 15/*step*/, true/*slider*/); 54​ m_hueInputSB->setRange (-180, 180);
54 55​ m_hueInputSB->setSingleStep (15);
55 m_saturationInput = new KDoubleNumInput (this); 56​ m_hueInputS = new KpDoubleSlider (this);
56 m_saturationInput->setRange (-1, 1, .1/*step*/, true/*slider*/); 57​ m_hueInputS->setRange (-100, 100);
mkollerUnsubmitted
Done

passing a range of -180..180 in ctor and setting a range of -100..100 in the next line seems odd.

mkoller: passing a range of -180..180 in ctor and setting a range of -100..100 in the next line seems…
yurchorAuthorUnsubmitted
Not Done

It appears that creating a connection between two different widgets one of which understands integers and both of them do not know about deficiencies of each other only is a tricky thing. To make the appearance for the different ranges similar I decided to make the ranges equal to [-100, 100].

Should I put it into the header? May it be that some inline lambdas can be useful? May it be that some comments on this will be enough?

I just do not know. Now it's a bit cryptic and ugly indeed but kind of working.

yurchor: It appears that creating a connection between two different widgets one of which understands…
57 58​ m_hueInputS->setTickPosition(QSlider::TicksBelow);
58 m_valueInput = new KDoubleNumInput (this); 59​
59 m_valueInput->setRange (-1, 1, .1/*step*/, true/*slider*/); 60​ m_saturationInputSB = new KpMultDoubleSpinBox (this);
aacidUnsubmitted
Done

Something is "not working the same" in the Hue slider, with the old code, when i move the mouse wheel up/down it changes in 1.08 increments, with the new code it changes in 0,03 increments, which make it kind of hard to use since it barely moves.

Can you have a look at that?

aacid: Something is "not working the same" in the Hue slider, with the old code, when i move the mouse…
yurchorAuthorUnsubmitted
Not Done

Actually, I was thinking this will be a funny feature (rough tuning with dragging the slider and finetuning with the wheel-scrolling) but it can be done to mimic the good old behavior.

yurchor: Actually, I was thinking this will be a funny feature (rough tuning with dragging the slider…
60 61​ m_saturationInputSB->setRange (-1, 1);
61 hueLabel->setBuddy (m_hueInput); 62​ m_saturationInputSB->setSingleStep (.1);
62 saturationLabel->setBuddy (m_saturationInput); 63​ m_saturationInputS = new KpDoubleSlider (this);
63 valueLabel->setBuddy (m_valueInput); 64​ m_saturationInputS->setRange (-100, 100);
mkollerUnsubmitted
Done

same comment as above. Why passing 2 different ranges ?

mkoller: same comment as above. Why passing 2 different ranges ?
65​ m_saturationInputS->setTickPosition(QSlider::TicksBelow);
66​
67​ m_valueInputSB = new KpMultDoubleSpinBox (this);
68​ m_valueInputSB->setRange (-1, 1);
69​ m_valueInputSB->setSingleStep (.1);
70​ m_valueInputS = new KpDoubleSlider (this);
71​ m_valueInputS->setRange (-100, 100);
72​ m_valueInputS->setTickPosition(QSlider::TicksBelow);
73​
74​ hueLabel->setBuddy (m_hueInputS);
75​ saturationLabel->setBuddy (m_saturationInputS);
76​ valueLabel->setBuddy (m_valueInputS);
64 77​
65 lay->addWidget (hueLabel, 0, 0); 78​ lay->addWidget (hueLabel, 0, 0);
66 lay->addWidget (m_hueInput, 0, 1); 79​ lay->addWidget (m_hueInputS, 0, 1);
80​ lay->addWidget (m_hueInputSB, 0, 2);
67 81​
68 lay->addWidget (saturationLabel, 1, 0); 82​ lay->addWidget (saturationLabel, 1, 0);
69 lay->addWidget (m_saturationInput, 1, 1); 83​ lay->addWidget (m_saturationInputS, 1, 1);
84​ lay->addWidget (m_saturationInputSB, 1, 2);
70 85​
71 lay->addWidget (valueLabel, 2, 0); 86​ lay->addWidget (valueLabel, 2, 0);
72 lay->addWidget (m_valueInput, 2, 1); 87​ lay->addWidget (m_valueInputS, 2, 1);
88​ lay->addWidget (m_valueInputSB, 2, 2);
73 89​
74 lay->setColumnStretch (1, 1); 90​ lay->setColumnStretch (1, 1);
75 91​
76 92​
77 connect (m_hueInput, SIGNAL (valueChanged(double)), 93​ connect (m_hueInputSB, QOverload<double>::of(&QDoubleSpinBox::valueChanged),
78 this, SIGNAL (settingsChangedDelayed())); 94​ this, &kpEffectHSVWidget::settingsChangedDelayed);
79 95​ connect (m_hueInputSB, &KpMultDoubleSpinBox::doubleSBValueChanged,
80 connect (m_saturationInput, SIGNAL (valueChanged(double)), 96​ m_hueInputS, &QSlider::setValue);
81 this, SIGNAL (settingsChangedDelayed())); 97​ connect (m_hueInputS, &KpDoubleSlider::doubleValueChanged,
82 98​ m_hueInputSB, &QDoubleSpinBox::setValue);
83 connect (m_valueInput, SIGNAL (valueChanged(double)), 99​
84 this, SIGNAL (settingsChangedDelayed())); 100​ connect (m_saturationInputSB, QOverload<double>::of(&QDoubleSpinBox::valueChanged),
101​ this, &kpEffectHSVWidget::settingsChangedDelayed);
102​ connect (m_saturationInputSB, &KpMultDoubleSpinBox::doubleSBValueChanged,
103​ m_saturationInputS, &QSlider::setValue);
104​ connect (m_saturationInputS, &KpDoubleSlider::doubleValueChanged,
105​ m_saturationInputSB, &QDoubleSpinBox::setValue);
106​
107​ connect (m_valueInputSB, QOverload<double>::of(&QDoubleSpinBox::valueChanged),
108​ this, &kpEffectHSVWidget::settingsChangedDelayed);
109​ connect (m_valueInputSB, &KpMultDoubleSpinBox::doubleSBValueChanged,
110​ m_valueInputS, &QSlider::setValue);
111​ connect (m_valueInputS, &KpDoubleSlider::doubleValueChanged,
112​ m_valueInputSB, &QDoubleSpinBox::setValue);
85} 113​}
86 114​
87kpEffectHSVWidget::~kpEffectHSVWidget () 115​kpEffectHSVWidget::~kpEffectHSVWidget ()
Context not available.
100// public virtual [base kpEffectWidgetBase] 128​// public virtual [base kpEffectWidgetBase]
101bool kpEffectHSVWidget::isNoOp () const 129​bool kpEffectHSVWidget::isNoOp () const
102{ 130​{
103 if (m_hueInput->value () == 0 && m_saturationInput->value () == 0 && m_valueInput->value () == 0) 131​ if (m_hueInputSB->value () == 0 && m_saturationInputSB->value () == 0 && m_valueInputSB->value () == 0)
104 return true; 132​ return true;
105 else 133​ else
106 return false; 134​ return false;
Context not available.
110kpImage kpEffectHSVWidget::applyEffect (const kpImage &image) 138​kpImage kpEffectHSVWidget::applyEffect (const kpImage &image)
111{ 139​{
112 return kpEffectHSV::applyEffect (image, 140​ return kpEffectHSV::applyEffect (image,
113 m_hueInput->value (), m_saturationInput->value (), m_valueInput->value ()); 141​ m_hueInputSB->value (), m_saturationInputSB->value (), m_valueInputSB->value ());
114} 142​}
115 143​
116// public virtual [base kpEffectWidgetBase] 144​// public virtual [base kpEffectWidgetBase]
Context not available.
118 kpCommandEnvironment *cmdEnviron) const 146​ kpCommandEnvironment *cmdEnviron) const
119{ 147​{
120 return new kpEffectHSVCommand ( 148​ return new kpEffectHSVCommand (
121 m_hueInput->value (), m_saturationInput->value (), m_valueInput->value (), 149​ m_hueInputSB->value (), m_saturationInputSB->value (), m_valueInputSB->value (),
122 m_actOnSelection, 150​ m_actOnSelection,
123 cmdEnviron); 151​ cmdEnviron);
124} 152​}
Context not available.