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

Base: UnitsSchema: return std::string

Browse Source
This commit is contained in:
Ladislav Michl
2024-07-13 17:19:27 +02:00
committed by Yorik van Havre
parent 2ea8a633ac
commit 4d6ed9d531
25 changed files with 493 additions and 589 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/Gui/Selection.cpp
View File

@@ -702,7 +702,7 @@ std::array<std::pair<double, std::string>, 3> schemaTranslatePoint(double x, dou
mmz.setValue(fabs(z) > precision ? z : 0.0);
double xfactor, yfactor, zfactor;
QString xunit, yunit, zunit;
std::string xunit, yunit, zunit;
Base::UnitsApi::schemaTranslate(mmx, xfactor, xunit);
Base::UnitsApi::schemaTranslate(mmy, yfactor, yunit);
@@ -712,9 +712,9 @@ std::array<std::pair<double, std::string>, 3> schemaTranslatePoint(double x, dou
double yuser = fabs(y) > precision ? y / yfactor : 0.0;
double zuser = fabs(z) > precision ? z / zfactor : 0.0;
std::array<std::pair<double, std::string>, 3> ret = {std::make_pair(xuser, xunit.toUtf8().constBegin()),
std::make_pair(yuser, yunit.toUtf8().constBegin()),
std::make_pair(zuser, zunit.toUtf8().constBegin())};
std::array<std::pair<double, std::string>, 3> ret = {std::make_pair(xuser, xunit),
std::make_pair(yuser, yunit),
std::make_pair(zuser, zunit)};
return ret;
}