Remove magic numbers and hard type enums in DimensionFormatter.h.h

- Remove currently present magic numbers
- Hard type enums, so magic numbers can no longer be introduced. We don't want people to introduce magic numbers.
This commit is contained in:
Benjamin Bræstrup Sayoc
2025-01-30 22:45:48 +01:00
committed by WandererFan
parent 97b34f9c57
commit c53679422b
7 changed files with 56 additions and 41 deletions

View File

@@ -69,6 +69,7 @@
using namespace TechDraw;
using namespace TechDrawGui;
using Format = DimensionFormatter::Format;
enum SnapMode
{
@@ -522,19 +523,19 @@ void QGIDatumLabel::setToleranceString()
std::pair<std::string, std::string> labelTexts, unitTexts;
if (dim->ArbitraryTolerances.getValue()) {
labelTexts = dim->getFormattedToleranceValues(1);//copy tolerance spec
labelTexts = dim->getFormattedToleranceValues(Format::FORMATTED);//copy tolerance spec
unitTexts.first = "";
unitTexts.second = "";
}
else {
if (dim->isMultiValueSchema()) {
labelTexts = dim->getFormattedToleranceValues(0);//don't format multis
labelTexts = dim->getFormattedToleranceValues(Format::UNALTERED);//don't format multis
unitTexts.first = "";
unitTexts.second = "";
}
else {
labelTexts = dim->getFormattedToleranceValues(1);// prefix value [unit] postfix
unitTexts = dim->getFormattedToleranceValues(2); //just the unit
labelTexts = dim->getFormattedToleranceValues(Format::FORMATTED);// prefix value [unit] postfix
unitTexts = dim->getFormattedToleranceValues(Format::UNIT); //just the unit
}
}
@@ -831,10 +832,11 @@ void QGIViewDimension::updateDim()
}
QString labelText =
QString::fromUtf8(dim->getFormattedDimensionValue(1).c_str());// pre value [unit] post
// what about fromStdString?
QString::fromUtf8(dim->getFormattedDimensionValue(Format::FORMATTED).c_str());// pre value [unit] post
if (dim->isMultiValueSchema()) {
labelText =
QString::fromUtf8(dim->getFormattedDimensionValue(0).c_str());//don't format multis
QString::fromUtf8(dim->getFormattedDimensionValue(Format::UNALTERED).c_str());//don't format multis
}
QFont font = datumLabel->getFont();