SHS/pip
4
3
Fork 0
Code Issues 67 Pull Requests 1 Actions Releases Wiki Activity

PIValueTreeConversions start

Browse Source
This commit is contained in:
Пелипенко Иван
2022-11-29 20:44:46 +03:00
parent 1327e46f61
commit a27353d42d
5 changed files with 170 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
libs/main/types/pivaluetree.h
View File

@@ -109,8 +109,7 @@ BINARY_STREAM_WRITE(PIValueTree) {
.add(2, v._comment)
.add(3, v._attributes)
.add(4, v._value)
.add(5, v._name)
.add(6, v._children);
.add(5, v._children);
s << cs.data();
return s;
}
@@ -127,8 +126,7 @@ BINARY_STREAM_READ (PIValueTree) {
case 2: cs.get(v._comment);
case 3: cs.get(v._attributes);
case 4: cs.get(v._value);
case 5: cs.get(v._name);
case 6: cs.get(v._children);
case 5: cs.get(v._children);
}
}
return s;

8
libs/main/types/pivariant.cpp
View File

@@ -172,7 +172,7 @@ PIVariant::Type PIVariant::typeFromName(const PIString & tname) {
if (s == "pibitarray" || s == "bitarray") return PIVariant::pivBitArray;
if (s == "pibytearray" || s == "bytearray" || s == "vector<uchar>" || s == "pivector<uchar>" || s == "vector<unsignedchar>" || s == "pivector<unsignedchar>" ||
s == "vector<char>" || s == "pivector<char>") return PIVariant::pivByteArray;
if (s == "pistring" || s == "string") return PIVariant::pivString;
if (s == "pistring" || s == "string" || s == "text") return PIVariant::pivString;
if (s == "pistringlist" || s == "stringlist" || s == "vector<string>" || s == "vector<pistring>" || s == "pivector<string>" || s == "pivector<pistring>") return PIVariant::pivStringList;
if (s == "pitime" || s == "time") return PIVariant::pivTime;
if (s == "pidate" || s == "date") return PIVariant::pivDate;
@@ -221,12 +221,12 @@ PIVariant::Type PIVariant::typeFromID(uint type_id) {
if (type_id == typeID<PIVariantTypes::File>()) return PIVariant::pivFile;
if (type_id == typeID<PIVariantTypes::Dir>()) return PIVariant::pivDir;
if (type_id == typeID<PIVariantTypes::Color>()) return PIVariant::pivColor;
if (type_id == typeID<PIVariantTypes::IODevice>()) return PIVariant::pivIODevice;
if (type_id == typeID<PIPointd>()) return PIVariant::pivPoint;
if (type_id == typeID<PIRectd>()) return PIVariant::pivRect;
if (type_id == typeID<PIMathVectord>()) return PIVariant::pivMathVector;
if (type_id == typeID<PIMathMatrixd>()) return PIVariant::pivMathMatrix;
if (type_id == typeID<PILined>()) return PIVariant::pivLine;
if (type_id == typeID<PIVariantTypes::IODevice>()) return PIVariant::pivIODevice;
#ifdef CUSTOM_PIVARIANT
if (__PIVariantInfoStorage__::get()->map->contains(type_id))
return PIVariant::pivCustom;
@@ -271,12 +271,12 @@ uint PIVariant::typeIDFromType(Type type) {
case (PIVariant::pivFile ): return typeID<PIVariantTypes::File >();
case (PIVariant::pivDir ): return typeID<PIVariantTypes::Dir >();
case (PIVariant::pivColor ): return typeID<PIVariantTypes::Color >();
case (PIVariant::pivIODevice ): return typeID<PIVariantTypes::IODevice >();
case (PIVariant::pivPoint ): return typeID<PIPointd >();
case (PIVariant::pivRect ): return typeID<PIRectd >();
case (PIVariant::pivMathVector): return typeID<PIMathVectord >();
case (PIVariant::pivMathMatrix): return typeID<PIMathMatrixd >();
case (PIVariant::pivLine ): return typeID<PILined >();
case (PIVariant::pivIODevice ): return typeID<PIVariantTypes::IODevice >();
default: break;
}
return 0;
@@ -385,11 +385,11 @@ PIString PIVariant::typeName(PIVariant::Type type) {
case PIVariant::pivFile: return "File";
case PIVariant::pivDir: return "Dir";
case PIVariant::pivColor: return "Color";
case PIVariant::pivIODevice: return "IODevice";
case PIVariant::pivPoint: return "Point";
case PIVariant::pivRect: return "Rect";
case PIVariant::pivMathVector: return "Vector";
case PIVariant::pivMathMatrix: return "Matrix";
case PIVariant::pivIODevice: return "IODevice";
case PIVariant::pivCustom: return "Custom";
default: break;
}