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

Base: Quantity: return std::string

Browse Source
This commit is contained in:
Ladislav Michl
2024-07-13 13:07:27 +02:00
committed by Yorik van Havre
parent 9f7218ac75
commit 0b3adee2ab
58 changed files with 573 additions and 592 deletions
Download Patch File Download Diff File Expand all files Collapse all files

38
src/Base/Quantity.cpp
View File

@@ -28,6 +28,7 @@
#include <array>
#endif
#include <fmt/format.h>
#include <Base/Tools.h>
#include "Quantity.h"
#include "Exception.h"
@@ -81,10 +82,10 @@ Quantity::Quantity(double value, const Unit& unit)
, myUnit {unit}
{}
Quantity::Quantity(double value, const QString& unit)
Quantity::Quantity(double value, const std::string& unit)
: myValue {0.0}
{
if (unit.isEmpty()) {
if (unit.empty()) {
this->myValue = value;
this->myUnit = Unit();
return;
@@ -236,29 +237,34 @@ Quantity Quantity::operator-() const
return Quantity(-(this->myValue), this->myUnit);
}
QString Quantity::getUserString(double& factor, QString& unitString) const
std::string Quantity::getUserString(double& factor, std::string& unitString) const
{
return Base::UnitsApi::schemaTranslate(*this, factor, unitString);
QString str = QString::fromStdString(unitString);
QString ret = Base::UnitsApi::schemaTranslate(*this, factor, str);
unitString = str.toStdString();
return ret.toStdString();
}
QString Quantity::getUserString(UnitsSchema* schema, double& factor, QString& unitString) const
std::string
Quantity::getUserString(UnitsSchema* schema, double& factor, std::string& unitString) const
{
return schema->schemaTranslate(*this, factor, unitString);
QString str = QString::fromStdString(unitString);
QString ret = schema->schemaTranslate(*this, factor, str);
unitString = str.toStdString();
return ret.toStdString();
}
QString Quantity::getSafeUserString() const
std::string Quantity::getSafeUserString() const
{
auto retString = getUserString();
if (Q_LIKELY(this->myValue != 0)) {
auto feedbackQty = parse(retString);
auto ret = getUserString();
if (this->myValue) {
auto feedbackQty = parse(ret);
auto feedbackVal = feedbackQty.getValue();
if (feedbackVal == 0) {
retString = QStringLiteral("%1 %2").arg(this->myValue).arg(QString::fromStdString(this->getUnit().getString()));
ret = fmt::format("{} {}", this->myValue, this->getUnit().getString());
}
}
retString =
QString::fromStdString(Base::Tools::escapeQuotesFromString(retString.toStdString()));
return retString;
return Base::Tools::escapeQuotesFromString(ret);
}
/// true if it has a number without a unit
@@ -562,11 +568,11 @@ private:
#pragma GCC diagnostic pop
#endif
Quantity Quantity::parse(const QString& string)
Quantity Quantity::parse(const std::string& string)
{
// parse from buffer
QuantityParser::YY_BUFFER_STATE my_string_buffer =
QuantityParser::yy_scan_string(string.toUtf8().data());
QuantityParser::yy_scan_string(string.c_str());
QuantityParser::StringBufferCleaner cleaner(my_string_buffer);
// set the global return variables
QuantResult = Quantity(DOUBLE_MIN);