fixes #1745 Encode Annotation Text using latin1

for Coin Versions <= 3
This commit is contained in:
Sebastian Hoogen
2014-09-18 21:31:02 +02:00
committed by wmayer
parent 6ad50db01b
commit 6a89b33816
2 changed files with 8 additions and 4 deletions

View File

@@ -218,8 +218,15 @@ void ViewProviderAnnotation::updateData(const App::Property* prop)
pLabel->string.setNum((int)lines.size());
pLabel3d->string.setNum((int)lines.size());
for (std::vector<std::string>::const_iterator it = lines.begin(); it != lines.end(); ++it) {
#if (COIN_MAJOR_VERSION <= 3)
QByteArray latin1str;
latin1str = (QString::fromUtf8(it->c_str())).toLatin1();
pLabel->string.set1Value(index, SbString(latin1str.constData()));
pLabel3d->string.set1Value(index, SbString(latin1str.constData()));
#else
pLabel->string.set1Value(index, SbString(it->c_str()));
pLabel3d->string.set1Value(index, SbString(it->c_str()));
#endif
index++;
}
}