SHS/pip
4
3
Fork 0
Code Issues 16 Pull Requests 2 Actions Releases Wiki Activity

Bugfixes part 3 #209

Open
andrey wants to merge 36 commits from bugfixes3 into master
pull from: bugfixes3
merge into: :master
Conversation 0 Commits 36 Files Changed 27
+4 -4
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit c3cd9496dd - Show all commits
libs/main/types/pivariant.cpp
+4 -4
View File
@@ -133,15 +133,15 @@ void PIVariant::setValueFromString(const PIString & v) {
case PIVariant::pivComplexf: { case PIVariant::pivComplexf: {
PIStringList sl = v.mid(1, v.size_s() - 2).split(';'); PIStringList sl = v.mid(1, v.size_s() - 2).split(';');
setValue(complexf(sl.size() > 0 ? sl[0].toFloat() : 0.f, sl.size() > 1 ? sl[1].toFloat() : 0.f)); setValue(complexf(sl.size() > 0 ? sl[0].toFloat() : 0.f, sl.size() > 1 ? sl[1].toFloat() : 0.f));
} } break;
case PIVariant::pivComplexd: { case PIVariant::pivComplexd: {
PIStringList sl = v.mid(1, v.size_s() - 2).split(';'); PIStringList sl = v.mid(1, v.size_s() - 2).split(';');
setValue(complexd(sl.size() > 0 ? sl[0].toDouble() : 0., sl.size() > 1 ? sl[1].toDouble() : 0.)); setValue(complexd(sl.size() > 0 ? sl[0].toDouble() : 0., sl.size() > 1 ? sl[1].toDouble() : 0.));
} } break;
case PIVariant::pivComplexld: { case PIVariant::pivComplexld: {
PIStringList sl = v.mid(1, v.size_s() - 2).split(';'); PIStringList sl = v.mid(1, v.size_s() - 2).split(';');
setValue(complexld(sl.size() > 0 ? sl[0].toLDouble() : 0.L, sl.size() > 1 ? sl[1].toLDouble() : 0.L)); setValue(complexld(sl.size() > 0 ? sl[0].toLDouble() : 0.L, sl.size() > 1 ? sl[1].toLDouble() : 0.L));
} } break;
case PIVariant::pivTime: { case PIVariant::pivTime: {
setValue(PITime::fromString(v)); setValue(PITime::fromString(v));
} break; } break;
@@ -243,7 +243,7 @@ PIVariant::Type PIVariant::typeFromName(const PIString & tname) {
if (s == "int" || s == "signed" || s == "signedint" || s == "int32_t") return PIVariant::pivInt; if (s == "int" || s == "signed" || s == "signedint" || s == "int32_t") return PIVariant::pivInt;
if (s == "long" || s == "longint" || s == "signedlong" || s == "signedlongint" || s == "sdword") return PIVariant::pivInt; if (s == "long" || s == "longint" || s == "signedlong" || s == "signedlongint" || s == "sdword") return PIVariant::pivInt;
if (s == "llong" || s == "longlong" || s == "longlongint" || s == "signedlonglong" || s == "signedlonglongint" || s == "sqword" || if (s == "llong" || s == "longlong" || s == "longlongint" || s == "signedlonglong" || s == "signedlonglongint" || s == "sqword" ||
s == "int64_t") s == "int64_t")
return PIVariant::pivLLong; return PIVariant::pivLLong;
if (s == "uchar" || s == "byte" || s == "uint8_t") return PIVariant::pivUChar; if (s == "uchar" || s == "byte" || s == "uint8_t") return PIVariant::pivUChar;
if (s == "ushort" || s == "unsignedshort" || s == "unsignedshortint" || s == "word" || s == "uint16_t") return PIVariant::pivUShort; if (s == "ushort" || s == "unsignedshort" || s == "unsignedshortint" || s == "word" || s == "uint16_t") return PIVariant::pivUShort;