From 58b926e308587eec2f476b3967fbcc392edda30e Mon Sep 17 00:00:00 2001 From: donovaly Date: Sun, 22 Mar 2020 05:13:31 +0100 Subject: [PATCH] forbid negative width and size - also uniform line endings --- src/Mod/TechDraw/Gui/TaskBalloon.cpp | 77 +++++++++++++++------------- 1 file changed, 40 insertions(+), 37 deletions(-) diff --git a/src/Mod/TechDraw/Gui/TaskBalloon.cpp b/src/Mod/TechDraw/Gui/TaskBalloon.cpp index 3583ade0f9..73a788ad69 100644 --- a/src/Mod/TechDraw/Gui/TaskBalloon.cpp +++ b/src/Mod/TechDraw/Gui/TaskBalloon.cpp @@ -88,11 +88,14 @@ TaskBalloon::TaskBalloon(QGIViewBalloon *parent, ViewProviderBalloon *balloonVP) connect(ui->comboSymbol, SIGNAL(currentIndexChanged(int)), this, SLOT(onShapeChanged())); ui->qsbFontSize->setUnit(Base::Unit::Length); + ui->qsbFontSize->setMinimum(0); connect(ui->qsbFontSize, SIGNAL(valueChanged(double)), this, SLOT(onFontsizeChanged())); ui->qsbLineWidth->setUnit(Base::Unit::Length); ui->qsbLineWidth->setSingleStep(0.100); + ui->qsbLineWidth->setMinimum(0); connect(ui->qsbLineWidth, SIGNAL(valueChanged(double)), this, SLOT(onLineWidthChanged())); ui->qsbBalloonKink->setUnit(Base::Unit::Length); + // negative kink length is allowed, thus no minimum connect(ui->qsbBalloonKink, SIGNAL(valueChanged(double)), this, SLOT(onBalloonKinkChanged())); if (balloonVP != nullptr) { @@ -132,61 +135,61 @@ bool TaskBalloon::reject() return false; } -void TaskBalloon::recomputeFeature() -{ - App::DocumentObject* objVP = m_balloonVP->getObject(); - assert(objVP); - objVP->getDocument()->recomputeFeature(objVP); +void TaskBalloon::recomputeFeature() +{ + App::DocumentObject* objVP = m_balloonVP->getObject(); + assert(objVP); + objVP->getDocument()->recomputeFeature(objVP); } -void TaskBalloon::onTextChanged() -{ - m_parent->dvBalloon->Text.setValue(ui->inputValue->text().toUtf8().constData()); - recomputeFeature(); +void TaskBalloon::onTextChanged() +{ + m_parent->dvBalloon->Text.setValue(ui->inputValue->text().toUtf8().constData()); + recomputeFeature(); } -void TaskBalloon::onColorChanged() -{ +void TaskBalloon::onColorChanged() +{ App::Color ac; ac.setValue(ui->textColor->color()); - m_balloonVP->Color.setValue(ac); - recomputeFeature(); + m_balloonVP->Color.setValue(ac); + recomputeFeature(); } -void TaskBalloon::onFontsizeChanged() -{ - m_balloonVP->Fontsize.setValue(ui->qsbFontSize->value().getValue()); - recomputeFeature(); +void TaskBalloon::onFontsizeChanged() +{ + m_balloonVP->Fontsize.setValue(ui->qsbFontSize->value().getValue()); + recomputeFeature(); } -void TaskBalloon::onShapeChanged() -{ - m_parent->dvBalloon->Shape.setValue(ui->comboSymbol->currentIndex()); - recomputeFeature(); +void TaskBalloon::onShapeChanged() +{ + m_parent->dvBalloon->Shape.setValue(ui->comboSymbol->currentIndex()); + recomputeFeature(); } -void TaskBalloon::onShapeScaleChanged() -{ - m_parent->dvBalloon->ShapeScale.setValue(ui->inputScale->value()); - recomputeFeature(); +void TaskBalloon::onShapeScaleChanged() +{ + m_parent->dvBalloon->ShapeScale.setValue(ui->inputScale->value()); + recomputeFeature(); } -void TaskBalloon::onEndTypeChanged() -{ - m_parent->dvBalloon->EndType.setValue(ui->comboEndType->currentIndex()); - recomputeFeature(); +void TaskBalloon::onEndTypeChanged() +{ + m_parent->dvBalloon->EndType.setValue(ui->comboEndType->currentIndex()); + recomputeFeature(); } -void TaskBalloon::onLineWidthChanged() -{ - m_balloonVP->LineWidth.setValue(ui->qsbLineWidth->value().getValue());; - recomputeFeature(); +void TaskBalloon::onLineWidthChanged() +{ + m_balloonVP->LineWidth.setValue(ui->qsbLineWidth->value().getValue()); + recomputeFeature(); } -void TaskBalloon::onBalloonKinkChanged() -{ - m_parent->dvBalloon->KinkLength.setValue(ui->qsbBalloonKink->value().getValue()); - recomputeFeature(); +void TaskBalloon::onBalloonKinkChanged() +{ + m_parent->dvBalloon->KinkLength.setValue(ui->qsbBalloonKink->value().getValue()); + recomputeFeature(); }