kindred/create
1
1
Fork 0
Code Issues 31 Pull Requests Actions 6 Packages Projects 9 Releases 2 Wiki Activity

[TD] Add under- and overtolerances for Dimension Task layout, fixes for Dimension tolerance refresh and behavior.

Browse Source
This commit is contained in:
Aapo
2021-01-27 21:46:22 +02:00
committed by wwmayer
parent 5350a2c3d0
commit dbef970697
5 changed files with 93 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

49
src/Mod/TechDraw/Gui/TaskDimension.cpp
View File

@@ -54,7 +54,6 @@ using namespace TechDrawGui;
TaskDimension::TaskDimension(QGIViewDimension *parent, ViewProviderDimension *dimensionVP) :
ui(new Ui_TaskDimension)
{
int i = 0;
m_parent = parent;
m_dimensionVP = dimensionVP;
@@ -68,6 +67,8 @@ TaskDimension::TaskDimension(QGIViewDimension *parent, ViewProviderDimension *di
ui->cbEqualTolerance->setDisabled(true);
ui->qsbOvertolerance->setDisabled(true);
ui->qsbUndertolerance->setDisabled(true);
ui->leFormatSpecifierOverTolerance->setDisabled(true);
ui->leFormatSpecifierUnderTolerance->setDisabled(true);
}
ui->cbEqualTolerance->setChecked(parent->dvDimension->EqualTolerance.getValue());
connect(ui->cbEqualTolerance, SIGNAL(stateChanged(int)), this, SLOT(onEqualToleranceChanged()));
@@ -88,8 +89,10 @@ TaskDimension::TaskDimension(QGIViewDimension *parent, ViewProviderDimension *di
connect(ui->qsbOvertolerance, SIGNAL(valueChanged(double)), this, SLOT(onOvertoleranceChanged()));
connect(ui->qsbUndertolerance, SIGNAL(valueChanged(double)), this, SLOT(onUndertoleranceChanged()));
// undertolerance is disabled when EqualTolerance is true
if (ui->cbEqualTolerance->isChecked())
if (ui->cbEqualTolerance->isChecked()) {
ui->qsbUndertolerance->setDisabled(true);
ui->leFormatSpecifierUnderTolerance->setDisabled(true);
}
// Formatting
std::string StringValue = parent->dvDimension->FormatSpec.getValue();
@@ -100,8 +103,12 @@ TaskDimension::TaskDimension(QGIViewDimension *parent, ViewProviderDimension *di
connect(ui->cbArbitrary, SIGNAL(stateChanged(int)), this, SLOT(onArbitraryChanged()));
StringValue = parent->dvDimension->FormatSpecOverTolerance.getValue();
qs = QString::fromUtf8(StringValue.data(), StringValue.size());
ui->leToleranceFormatSpecifier->setText(qs);
connect(ui->leToleranceFormatSpecifier, SIGNAL(textChanged(QString)), this, SLOT(onToleranceFormatSpecifierChanged()));
ui->leFormatSpecifierOverTolerance->setText(qs);
StringValue = parent->dvDimension->FormatSpecUnderTolerance.getValue();
qs = QString::fromUtf8(StringValue.data(), StringValue.size());
ui->leFormatSpecifierUnderTolerance->setText(qs);
connect(ui->leFormatSpecifierOverTolerance, SIGNAL(textChanged(QString)), this, SLOT(onFormatSpecifierOverToleranceChanged()));
connect(ui->leFormatSpecifierUnderTolerance, SIGNAL(textChanged(QString)), this, SLOT(onFormatSpecifierUnderToleranceChanged()));
ui->cbArbitraryTolerances->setChecked(parent->dvDimension->ArbitraryTolerances.getValue());
connect(ui->cbArbitraryTolerances, SIGNAL(stateChanged(int)), this, SLOT(onArbitraryTolerancesChanged()));
@@ -133,7 +140,8 @@ bool TaskDimension::accept()
m_parent->dvDimension->FormatSpec.setValue(ui->leFormatSpecifier->text().toUtf8().constData());
m_parent->dvDimension->Arbitrary.setValue(ui->cbArbitrary->isChecked());
m_parent->dvDimension->FormatSpecOverTolerance.setValue(ui->leToleranceFormatSpecifier->text().toUtf8().constData());
m_parent->dvDimension->FormatSpecOverTolerance.setValue(ui->leFormatSpecifierOverTolerance->text().toUtf8().constData());
m_parent->dvDimension->FormatSpecUnderTolerance.setValue(ui->leFormatSpecifierUnderTolerance->text().toUtf8().constData());
m_parent->dvDimension->ArbitraryTolerances.setValue(ui->cbArbitraryTolerances->isChecked());
m_dimensionVP->FlipArrowheads.setValue(ui->cbArrowheads->isChecked());
@@ -170,12 +178,17 @@ void TaskDimension::onTheoreticallyExactChanged()
ui->cbEqualTolerance->setDisabled(true);
ui->qsbOvertolerance->setDisabled(true);
ui->qsbUndertolerance->setDisabled(true);
ui->leFormatSpecifierOverTolerance->setDisabled(true);
ui->leFormatSpecifierUnderTolerance->setDisabled(true);
}
else {
ui->cbEqualTolerance->setDisabled(false);
ui->qsbOvertolerance->setDisabled(false);
if (!ui->cbEqualTolerance->isChecked())
ui->leFormatSpecifierOverTolerance->setDisabled(false);
if (!ui->cbEqualTolerance->isChecked()) {
ui->qsbUndertolerance->setDisabled(false);
ui->leFormatSpecifierUnderTolerance->setDisabled(false);
}
}
recomputeFeature();
}
@@ -193,13 +206,15 @@ void TaskDimension::onEqualToleranceChanged()
ui->qsbUndertolerance->setValue(-1.0 * ui->qsbOvertolerance->value().getValue());
ui->qsbUndertolerance->setUnit(ui->qsbOvertolerance->value().getUnit());
ui->qsbUndertolerance->setDisabled(true);
ui->leFormatSpecifierUnderTolerance->setDisabled(true);
}
else {
ui->qsbOvertolerance->setMinimum(-DBL_MAX);
if (!ui->cbTheoreticallyExact->isChecked())
if (!ui->cbTheoreticallyExact->isChecked()) {
ui->qsbUndertolerance->setDisabled(false);
ui->leFormatSpecifierUnderTolerance->setDisabled(false);
}
}
ui->qsbUndertolerance->setDisabled(ui->cbEqualTolerance->isChecked());
recomputeFeature();
}
@@ -232,9 +247,23 @@ void TaskDimension::onArbitraryChanged()
recomputeFeature();
}
void TaskDimension::onToleranceFormatSpecifierChanged()
void TaskDimension::onFormatSpecifierOverToleranceChanged()
{
m_parent->dvDimension->FormatSpecOverTolerance.setValue(ui->leToleranceFormatSpecifier->text().toUtf8().constData());
m_parent->dvDimension->FormatSpecOverTolerance.setValue(ui->leFormatSpecifierOverTolerance->text().toUtf8().constData());
if (!ui->cbArbitraryTolerances->isChecked()) {
ui->leFormatSpecifierUnderTolerance->setText(ui->leFormatSpecifierOverTolerance->text());
m_parent->dvDimension->FormatSpecUnderTolerance.setValue(ui->leFormatSpecifierUnderTolerance->text().toUtf8().constData());
}
recomputeFeature();
}
void TaskDimension::onFormatSpecifierUnderToleranceChanged()
{
m_parent->dvDimension->FormatSpecUnderTolerance.setValue(ui->leFormatSpecifierUnderTolerance->text().toUtf8().constData());
if (!ui->cbArbitraryTolerances->isChecked()) {
ui->leFormatSpecifierOverTolerance->setText(ui->leFormatSpecifierUnderTolerance->text());
m_parent->dvDimension->FormatSpecOverTolerance.setValue(ui->leFormatSpecifierOverTolerance->text().toUtf8().constData());
}
recomputeFeature();
}