SHS/qad
4
1
Fork 0
Code Issues 5 Pull Requests Releases Wiki Activity

git-svn-id: svn://db.shs.com.ru/libs@654 a8b55f48-bf90-11e4-a774-851b48703e85

Browse Source
This commit is contained in:
Бычков Андрей
2019-12-05 11:27:38 +00:00
parent d8b59d19f1
commit d5eaa289b2
2 changed files with 18 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
qad/widgets/spinslider.cpp
View File

@@ -41,6 +41,21 @@ void SpinSlider::setOrientation(Qt::Orientation orient) {
} }
bool SpinSlider::adaptiveStep() const {
#if (QT_VERSION >= QT_VERSION_CHECK(5, 12, 0))
return (spin->stepType() == QDoubleSpinBox::AdaptiveDecimalStepType);
#endif
return false;
}
void SpinSlider::setAdaptiveStep(bool on) {
#if (QT_VERSION >= QT_VERSION_CHECK(5, 12, 0))
if (on) spin->setStepType(QDoubleSpinBox::AdaptiveDecimalStepType);
else spin->setStepType(QDoubleSpinBox::DefaultStepType);
#endif
}
void SpinSlider::adjust() { void SpinSlider::adjust() {
adjusting = true; adjusting = true;
delim = qPow(10, dec_); delim = qPow(10, dec_);

3
qad/widgets/spinslider.h
View File

@@ -19,6 +19,7 @@ class SpinSlider: public QWidget
Q_PROPERTY(int decimals READ decimals WRITE setDecimals) Q_PROPERTY(int decimals READ decimals WRITE setDecimals)
Q_PROPERTY(double singleStep READ singleStep WRITE setSingleStep) Q_PROPERTY(double singleStep READ singleStep WRITE setSingleStep)
Q_PROPERTY(double pageStep READ pageStep WRITE setPageStep) Q_PROPERTY(double pageStep READ pageStep WRITE setPageStep)
Q_PROPERTY(bool adaptiveStep READ adaptiveStep WRITE setAdaptiveStep)
Q_PROPERTY(QString prefix READ prefix WRITE setPrefix) Q_PROPERTY(QString prefix READ prefix WRITE setPrefix)
Q_PROPERTY(QString suffix READ suffix WRITE setSuffix) Q_PROPERTY(QString suffix READ suffix WRITE setSuffix)
Q_PROPERTY(QSlider::TickPosition tickPosition READ tickPosition WRITE setTickPosition) Q_PROPERTY(QSlider::TickPosition tickPosition READ tickPosition WRITE setTickPosition)
@@ -43,6 +44,7 @@ public:
double value() const {return val_;} double value() const {return val_;}
int decimals() const {return dec_;} int decimals() const {return dec_;}
double singleStep() const {return spin->singleStep();} double singleStep() const {return spin->singleStep();}
bool adaptiveStep() const;
double pageStep() const {return page;} double pageStep() const {return page;}
QString prefix() const {return spin->prefix();} QString prefix() const {return spin->prefix();}
QString suffix() const {return spin->suffix();} QString suffix() const {return spin->suffix();}
@@ -54,6 +56,7 @@ public:
bool squareScale() const {return square;} bool squareScale() const {return square;}
void setSingleStep(double step) {spin->setSingleStep(step); slider->setPageStep(qRound(step * delim));} void setSingleStep(double step) {spin->setSingleStep(step); slider->setPageStep(qRound(step * delim));}
void setAdaptiveStep(bool on);
void setPageStep(double step) {page = step; slider->setPageStep(qRound(page * delim));} void setPageStep(double step) {page = step; slider->setPageStep(qRound(page * delim));}
void setPrefix(QString prefix) {spin->setPrefix(prefix);} void setPrefix(QString prefix) {spin->setPrefix(prefix);}
void setSuffix(QString suffix) {spin->setSuffix(suffix);} void setSuffix(QString suffix) {spin->setSuffix(suffix);}