From 9064768a5c19180220daeecc52e5eb53c1cca335 Mon Sep 17 00:00:00 2001 From: donovaly Date: Sat, 28 Mar 2020 21:23:08 +0100 Subject: [PATCH] [TD] TaskCenterLine add missing unit initialization next try because PR #3275 cannot be merged. --- src/Mod/TechDraw/Gui/TaskCenterLine.cpp | 8 +++++--- src/Mod/TechDraw/Gui/TaskCenterLine.ui | 5 ++++- 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/src/Mod/TechDraw/Gui/TaskCenterLine.cpp b/src/Mod/TechDraw/Gui/TaskCenterLine.cpp index 5c0803899a..79d110eca2 100644 --- a/src/Mod/TechDraw/Gui/TaskCenterLine.cpp +++ b/src/Mod/TechDraw/Gui/TaskCenterLine.cpp @@ -173,6 +173,8 @@ void TaskCenterLine::setUiPrimary() ui->dsbWeight->setValue(getCenterWidth()); ui->cboxStyle->setCurrentIndex(getCenterStyle() - 1); + ui->qsbVertShift->setUnit(Base::Unit::Length); + ui->qsbHorizShift->setUnit(Base::Unit::Length); Base::Quantity qVal; qVal.setUnit(Base::Unit::Length); qVal.setValue(getExtendBy()); @@ -305,7 +307,7 @@ void TaskCenterLine::onColorChanged() void TaskCenterLine::onWeightChanged() { - m_cl->m_format.m_weight = ui->dsbWeight->value(); + m_cl->m_format.m_weight = ui->dsbWeight->value().getValue(); m_partFeat->recomputeFeature(); } @@ -355,7 +357,7 @@ void TaskCenterLine::createCenterLine(void) App::Color ac; ac.setValue(ui->cpLineColor->color()); cl->m_format.m_color = ac; - cl->m_format.m_weight = ui->dsbWeight->value(); + cl->m_format.m_weight = ui->dsbWeight->value().getValue(); cl->m_format.m_style = ui->cboxStyle->currentIndex() + 1; //Qt Styles start at 0:NoLine cl->m_format.m_visible = true; m_partFeat->addCenterLine(cl); @@ -373,7 +375,7 @@ void TaskCenterLine::updateCenterLine(void) // Base::Console().Message("TCL::updateCenterLine()\n"); Gui::Command::openCommand("Edit CenterLine"); m_cl->m_format.m_color.setValue(ui->cpLineColor->color() ); - m_cl->m_format.m_weight = ui->dsbWeight->value(); + m_cl->m_format.m_weight = ui->dsbWeight->value().getValue(); m_cl->m_format.m_style = ui->cboxStyle->currentIndex() + 1; m_cl->m_format.m_visible = true; diff --git a/src/Mod/TechDraw/Gui/TaskCenterLine.ui b/src/Mod/TechDraw/Gui/TaskCenterLine.ui index 99a3e17cc1..278d2cc5a9 100644 --- a/src/Mod/TechDraw/Gui/TaskCenterLine.ui +++ b/src/Mod/TechDraw/Gui/TaskCenterLine.ui @@ -221,6 +221,9 @@ Rotate line +CCW or -CW + + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + -360.000000000000000 @@ -295,7 +298,7 @@ - + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter