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

Gui: [skip ci] fix unicode handling when showing units in status bar

Browse Source
This commit is contained in:
wmayer
2020-06-04 16:27:58 +02:00
parent 7fffe88433
commit 515250485e
3 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/Gui/Selection.cpp
View File

@@ -865,9 +865,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.toStdString()),
std::make_pair(yuser, yunit.toStdString()),
std::make_pair(zuser, zunit.toStdString())};
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())};
return ret;
}
}
@@ -893,7 +893,7 @@ void SelectionSingleton::setPreselectCoord( float x, float y, float z)
,pts[2].first, pts[2].second.c_str());
if (getMainWindow())
getMainWindow()->showMessage(QString::fromLatin1(buf));
getMainWindow()->showMessage(QString::fromUtf8(buf));
}
void SelectionSingleton::rmvPreselect(bool signal)

2
src/Gui/SoFCSelection.cpp
View File

@@ -415,7 +415,7 @@ SoFCSelection::handleEvent(SoHandleEventAction * action)
,pts[1].first, pts[1].second.c_str()
,pts[2].first, pts[2].second.c_str());
getMainWindow()->showMessage(QString::fromLatin1(buf));
getMainWindow()->showMessage(QString::fromUtf8(buf));
}
else { // picked point
if (highlighted) {

2
src/Gui/SoFCUnifiedSelection.cpp
View File

@@ -494,7 +494,7 @@ bool SoFCUnifiedSelection::setHighlight(SoFullPath *path, const SoDetail *det,
,pts[1].first,pts[1].second.c_str()
,pts[2].first,pts[2].second.c_str());
getMainWindow()->showMessage(QString::fromLatin1(buf));
getMainWindow()->showMessage(QString::fromUtf8(buf));
int ret = Gui::Selection().setPreselect(docname,objname,element,x,y,z);
if(ret<0 && currenthighlight)