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

[TD]fix unit display to standards

Browse Source
This commit is contained in:
Wanderer Fan
2022-03-12 13:01:08 -05:00
committed by WandererFan
parent b13284a221
commit 37014eb586
3 changed files with 120 additions and 68 deletions
Download Patch File Download Diff File Expand all files Collapse all files

37
src/Mod/TechDraw/Gui/QGIViewDimension.cpp
View File

@@ -359,7 +359,7 @@ void QGIDatumLabel::setToleranceString()
std::pair<std::string, std::string> labelTexts, unitTexts;
if (dim->ArbitraryTolerances.getValue()) {
labelTexts = dim->getFormattedToleranceValues(1); //just the number pref/spec/suf
labelTexts = dim->getFormattedToleranceValues(1); //copy tolerance spec
unitTexts.first = "";
unitTexts.second = "";
} else {
@@ -368,13 +368,13 @@ void QGIDatumLabel::setToleranceString()
unitTexts.first = "";
unitTexts.second = "";
} else {
labelTexts = dim->getFormattedToleranceValues(1); //just the number pref/spec/suf
labelTexts = dim->getFormattedToleranceValues(1); // prefix value [unit] postfix
unitTexts = dim->getFormattedToleranceValues(2); //just the unit
}
}
m_tolTextUnder->setPlainText(QString::fromUtf8(labelTexts.first.c_str()) + QString::fromUtf8(unitTexts.first.c_str()));
m_tolTextOver->setPlainText(QString::fromUtf8(labelTexts.second.c_str()) + QString::fromUtf8(unitTexts.second.c_str()));
m_tolTextUnder->setPlainText(QString::fromUtf8(labelTexts.first.c_str()));
m_tolTextOver->setPlainText(QString::fromUtf8(labelTexts.second.c_str()));
return;
}
@@ -580,10 +580,6 @@ void QGIViewDimension::setNormalColorAll()
aHead2->setFillColor(qc);
}
//special handling to prevent unwanted repositioning
//clicking on the dimension, but outside the label, should do nothing to position
//label will get clicks before QGIVDim
void QGIViewDimension::mouseReleaseEvent(QGraphicsSceneMouseEvent * event)
{
// Base::Console().Message("QGIVDim::mouseReleaseEvent() - %s\n",getViewName());
@@ -633,27 +629,11 @@ void QGIViewDimension::updateDim()
return;
}
QString labelText;
QString unitText;
if ( (dim->Arbitrary.getValue() && !dim->EqualTolerance.getValue())
|| (dim->Arbitrary.getValue() && dim->TheoreticalExact.getValue()) ) {
labelText = QString::fromUtf8(dim->getFormattedDimensionValue(1).c_str()); //just the number pref/spec/suf
} else {
if (dim->isMultiValueSchema()) {
labelText = QString::fromUtf8(dim->getFormattedDimensionValue(0).c_str()); //don't format multis
} else {
labelText = QString::fromUtf8(dim->getFormattedDimensionValue(1).c_str()); //just the number pref/spec/suf
if (dim->EqualTolerance.getValue()) {
if (dim->ArbitraryTolerances.getValue()) {
unitText = QString();
} else {
unitText = QString::fromUtf8(dim->getFormattedToleranceValue(2).c_str()); //just the unit
}
} else {
unitText = QString::fromUtf8(dim->getFormattedDimensionValue(2).c_str()); //just the unit
}
}
QString labelText= QString::fromUtf8(dim->getFormattedDimensionValue(1).c_str()); // pre value [unit] post
if (dim->isMultiValueSchema()) {
labelText = QString::fromUtf8(dim->getFormattedDimensionValue(0).c_str()); //don't format multis
}
QFont font = datumLabel->getFont();
font.setFamily(QString::fromUtf8(vp->Font.getValue()));
font.setPixelSize(calculateFontPixelSize(vp->Fontsize.getValue()));
@@ -662,7 +642,6 @@ void QGIViewDimension::updateDim()
prepareGeometryChange();
datumLabel->setDimString(labelText);
datumLabel->setToleranceString();
datumLabel->setUnitString(unitText);
datumLabel->setPosFromCenter(datumLabel->X(),datumLabel->Y());
datumLabel->setFramed(dim->TheoreticalExact.getValue());