Revert "[Base]retrieve unit text"

This reverts both pointless and broken commit c9fffa6789.
This commit is contained in:
Ladislav Michl
2025-12-01 15:21:18 +01:00
parent 53b724c40e
commit c0a11089a6
4 changed files with 0 additions and 40 deletions

View File

@@ -66,11 +66,6 @@ std::string UnitsApi::getBasicLengthUnit()
return schemas->currentSchema()->getBasicLengthUnit();
}
std::string UnitsApi::getUnitText(const Quantity& quant)
{
return schemas->currentSchema()->getUnitText(quant);
}
void UnitsApi::setDecimals(const int prec)
{
decimals = prec;

View File

@@ -67,7 +67,6 @@ public:
static bool isMultiUnitAngle();
static bool isMultiUnitLength();
static std::string getBasicLengthUnit();
static std::string getUnitText(const Quantity& quant);
static std::size_t getDefSchemaNum()
{

View File

@@ -35,8 +35,6 @@
#include "Exception.h"
#include "Quantity.h"
#include "Console.h"
using Base::UnitsSchema;
using Base::UnitsSchemaSpec;
@@ -145,34 +143,3 @@ int UnitsSchema::getNum() const
{
return static_cast<int>(spec.num);
}
//! return the unit text for this quantity in this schema. ex 10 mm => "mm"
//! a more general approach than getBasicLengthUnit.
//! TODO: some common code here with translate()
std::string UnitsSchema::getUnitText(const Base::Quantity& quant) const
{
std::string typeString = quant.getUnit().getTypeString(); // "Area", "Mass", ...
const auto value = quant.getValue();
// TODO: some common code here with translate()
if (!spec.translationSpecs.contains(typeString)) {
Base::Console().log("Schema %s has no entry for %s\n", getName().c_str(), typeString.c_str());
return {};
}
auto unitSpecs = spec.translationSpecs.at(typeString);
auto isSuitable = [&](const UnitTranslationSpec& row) {
return row.threshold > value || row.threshold == 0;
};
const auto unitSpec = std::ranges::find_if(unitSpecs, isSuitable);
if (unitSpec == unitSpecs.end()) {
throw RuntimeError(
"Suitable threshold not found (2). Schema: " + spec.name
+ " value: " + std::to_string(value)
);
}
return unitSpec->unitString;
}

View File

@@ -50,7 +50,6 @@ public:
[[nodiscard]] std::string getName() const;
[[nodiscard]] std::string getDescription() const;
[[nodiscard]] int getNum() const;
[[nodiscard]] std::string getUnitText(const Quantity& quant) const;
std::string translate(const Quantity& quant) const;
std::string translate(const Quantity& quant, double& factor, std::string& unitString) const;