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

PIValueTreeConversions text, options

Browse Source 
PIVariant fixes
This commit is contained in:
Пелипенко Иван
2022-12-04 18:27:54 +03:00
parent 5bb9477b5b
commit b25ecf42fb
8 changed files with 199 additions and 51 deletions
Download Patch File Download Diff File Expand all files Collapse all files

167
libs/main/serialization/pivaluetree_conversions.cpp
View File

@@ -23,6 +23,40 @@
#include "piiostring.h"
#include "piiostream.h"
const char _attribute_[] = "_attribute_";
PIString unmask(const PIString & str) {
PIString ret;
for (int i = 0; i < str.size_s(); ++i) {
if (str[i] == '\\') {
if (i < str.size_s() - 1) {
++i;
ret += str[i];
continue;
}
}
ret += str[i];
}
return ret;
}
PIString mask(const PIString & str) {
PIString ret = str;
if (ret.isEmpty()) return ret;
int start = 0;
if (ret[0].isSpace()) {
ret.insert(0, '\\');
start = 1;
}
for (int i = start; i < ret.size_s(); ++i) {
if (ret[i] == '\\') {
ret.insert(i, '\\');
++i;
}
}
return ret;
}
PIValueTree PIValueTreeConversions::fromPropertyStorage(const PIPropertyStorage & ps) {
PIValueTree ret;
@@ -88,6 +122,25 @@ PIValueTree PIValueTreeConversions::fromJSON(const PIJSON & json) {
}
PIValueTree prepareFromText(const PIValueTree & root) {
PIValueTree ret;
ret.setName(root.name());
ret.setComment(root.comment());
if (root.contains(_attribute_)) {
for (const auto & a: root.child(_attribute_).children())
ret.attributes()[a.name()] = a.value().toString();
}
PIVariant value = PIVariant::fromType(ret.attribute("type", PIVariant::typeName<PIString>()).toString());
value.setValueFromString(root.value().toString());
ret.setValue(value);
for (const auto & c: root.children()) {
if (c.name() != _attribute_)
ret[c.name()] = prepareFromText(c);
}
return ret;
}
PIValueTree PIValueTreeConversions::fromText(PIIODevice * device) {
PIValueTree ret;
if (!device) return ret;
@@ -96,7 +149,7 @@ PIValueTree PIValueTreeConversions::fromText(PIIODevice * device) {
PIIOTextStream ts(device);
PIString line, comm;
PIVariant value;
PIChar type;
PIString type;
PIStringList prefix, path;
while (!ts.isEnd()) {
PIString l = ts.readLine().trim();
@@ -115,7 +168,7 @@ PIValueTree PIValueTreeConversions::fromText(PIIODevice * device) {
line.clear();
continue;
}
type = 's';
type = PIVariant::typeName<PIString>();
comm.clear();
int ind = line.find('#');
if (ind >= 0) {
@@ -126,7 +179,18 @@ PIValueTree PIValueTreeConversions::fromText(PIIODevice * device) {
else if (comm[0].isAlpha() && comm[1].isSpace()) typed = true;
}
if (typed) {
type = comm.takeLeft(1)[0];
switch (comm.takeLeft(1)[0].toAscii()) {
case 'b': type = PIVariant::typeName<bool>(); break;
case 'n': type = PIVariant::typeName<int>(); break;
case 'f': type = PIVariant::typeName<double>(); break;
case 'l': type = PIVariant::typeName<PIStringList>(); break;
case 'c': type = PIVariant::typeName<PIVariantTypes::Color>(); break;
case 'p':
case 'v': type = PIVariant::typeName<PIPointd>(); break;
case 'r':
case 'a': type = PIVariant::typeName<PIRectd>(); break;
default: break;
}
}
comm.trim();
line.cutRight(1).trim();
@@ -134,7 +198,7 @@ PIValueTree PIValueTreeConversions::fromText(PIIODevice * device) {
ind = line.find('=');
if ((ind > 0) && (line[0] != '#')) {
path = prefix;
path << line.takeLeft(ind).trim().split('.');
path << line.takeLeft(ind).split('.').trim();
line.cutLeft(1).trim();
if (path.front() == "include") {
/*name = line.mid(ind + 1).trimmed();
@@ -151,39 +215,31 @@ PIValueTree PIValueTreeConversions::fromText(PIIODevice * device) {
}
}
//piCout << path << line << comm;
switch (type.toAscii()) {
case 'b': value = line.toBool(); break;
case 'n': value = line.toInt(); break;
case 'f': value = line.toDouble(); break;
case 'l': value = line.split("%|%"); break;
case 'c': value = PIVariantTypes::Color(line.toUInt()); break;
case 'p':
case 'v': value = PIVariant(line).toPoint(); break;
case 'r':
case 'a': value = PIVariant(line).toRect(); break;
default: value = line;
}
PIValueTree & leaf(ret[path]);
value.setValueFromString(line);
leaf.setComment(comm);
leaf.setValue(value);
leaf.setValue(unmask(line));
if (!path.contains(_attribute_))
if (!leaf.contains({_attribute_, "type"}))
leaf[_attribute_].addChild({"type", type});
line.clear();
}
return ret;
return prepareFromText(ret);
//return ret;
}
PIJSON toJSONTree(const PIValueTree & root) {
PIJSON toJSONTree(const PIValueTree & root, PIValueTreeConversions::Options options) {
PIJSON ret = PIJSON::newObject();
if (root.name().isNotEmpty())
ret["name"] = root.name();
if (root.comment().isNotEmpty())
if (root.comment().isNotEmpty() && options[PIValueTreeConversions::WithComment])
ret["comment"] = root.comment();
if (root.value().isValid()) {
ret["type"] = root.value().typeName();
if (options[PIValueTreeConversions::WithType])
ret["type"] = root.value().typeName();
ret["value"] = root.value().toString();
}
if (root.attributes().isNotEmpty()) {
if (root.attributes().isNotEmpty() && options[PIValueTreeConversions::WithAttributes]) {
PIJSON j;
for (const auto & a: root.attributes())
j[a.first] = a.second.toString();
@@ -192,22 +248,79 @@ PIJSON toJSONTree(const PIValueTree & root) {
if (root.hasChildren()) {
PIJSON j;
for (const auto & c: root.children())
j << toJSONTree(c);
j << toJSONTree(c, options);
ret["children"] = j;
}
return ret;
}
PIJSON PIValueTreeConversions::toJSON(const PIValueTree & root) {
PIJSON PIValueTreeConversions::toJSON(const PIValueTree & root, Options options) {
PIJSON ret = PIJSON::newArray();
for (const auto & c: root.children())
ret << toJSONTree(c);
ret << toJSONTree(c, options);
return ret;
}
PIString PIValueTreeConversions::toText(const PIValueTree & root) {
PIString toTextTreeAttributes(const PIValueTree & root, PIString prefix, PIValueTreeConversions::Options options) {
PIString ret;
for (const auto & a: root.attributes()) {
if (a.first == "type") continue;
ret += prefix + _attribute_ + "." + a.first;
ret += " = " + mask(a.second.toString());
ret += '\n';
}
if (options[PIValueTreeConversions::WithType]) {
ret += prefix + _attribute_ + ".type";
ret += " = " + root.value().typeName();
ret += '\n';
}
return ret;
}
PIString toTextTree(const PIValueTree & root, PIString prefix, PIValueTreeConversions::Options options) {
PIString ret;
if (prefix.isNotEmpty()) prefix += '.';
prefix += root.name();
if (root.hasChildren()) {
ret += "\n[" + prefix + "]\n";
if (root.isArray() && options[PIValueTreeConversions::WithAttributes])
ret += toTextTreeAttributes(root, "", options);
for (const auto & c: root.children()) {
PIString cp = prefix;
ret += toTextTree(c, prefix, options);
}
} else {
if (root.value().isValid()) {
ret += root.name() + " = ";
ret += mask(root.value().toString()).replacedAll('\n', " \\\n");
}
if (root.comment().isNotEmpty() && options[PIValueTreeConversions::WithComment]) {
ret += " # ";
ret += root.comment();
}
ret += "\n";
if (options[PIValueTreeConversions::WithAttributes])
ret += toTextTreeAttributes(root, root.name() + ".", options);
}
return ret;
}
PIString PIValueTreeConversions::toText(const PIValueTree & root, Options options) {
PIString ret;
for (const auto & c: root.children()) {
ret += toTextTree(c, PIString(), options);
}
return ret;
}
PIValueTree PIValueTreeConversions::fromText(const PIString & str) {
PIIOString dev(str);
return fromText(&dev);
}

16
libs/main/serialization/pivaluetree_conversions.h
View File

@@ -33,12 +33,24 @@ class PIJSON;
class PIIODevice;
namespace PIValueTreeConversions {
enum Option {
WithAttributes = 0x1,
WithComment = 0x2,
WithType = 0x4,
WithAll = 0xFFFFFF,
Default = WithAll
};
typedef PIFlags<Option> Options;
PIP_EXPORT PIValueTree fromPropertyStorage(const PIPropertyStorage & ps);
PIP_EXPORT PIValueTree fromVariantMap(const PIVariantMap & vm);
PIP_EXPORT PIValueTree fromJSON(const PIJSON & json);
PIP_EXPORT PIValueTree fromText(PIIODevice * device);
PIP_EXPORT PIJSON toJSON(const PIValueTree & root);
PIP_EXPORT PIString toText(const PIValueTree & root);
PIP_EXPORT PIValueTree fromText(const PIString & str);
PIP_EXPORT PIJSON toJSON(const PIValueTree & root, Options options = Default);
PIP_EXPORT PIString toText(const PIValueTree & root, Options options = Default);
}
#endif

1
libs/main/text/pistring.cpp
View File

@@ -772,6 +772,7 @@ PIString & PIString::replaceAll(const PIString & what, const PIString & with) {
if (dl > 0) d.insert(i, PIDeque<PIChar>((size_t)dl));
if (dl < 0) d.remove(i, -dl);
memcpy(d.data(i), with.d.data(), with.size() * sizeof(PIChar));
i += dl;
}
}
return *this;

4
libs/main/types/pidatetime.h
View File

@@ -211,7 +211,7 @@ public:
//! \~english Returns string representation
//! \~russian Возвращает строковое представление
PIString toString(const PIString & format = "h:mm:ss d.MM.yyyy") const;
PIString toString(const PIString & format = "d.MM.yyyy h:mm:ss") const;
//! \~english Returns seconds since 1 Jan 1970
//! \~russian Возвращает секунды от 1 Янв 1970
@@ -219,7 +219,7 @@ public:
//! \~english Returns %PIDateTime from string representation
//! \~russian Возвращает %PIDateTime из строкового представления
static PIDateTime fromString(PIString string, PIString format = "h:mm:ss d.MM.yyyy");
static PIDateTime fromString(PIString string, PIString format = "d.MM.yyyy h:mm:ss");
//! \~english Returns time as %PISystemTime
//! \~russian Возвращает время как %PISystemTime

11
libs/main/types/pivaluetree.cpp
View File

@@ -30,7 +30,7 @@
//!
//!
const char PIValueTree::attributeHidden [] = "hidden" ;
const char PIValueTree::attributeReadOnly [] = "readonly" ;
const char PIValueTree::attributeReadOnly [] = "readOnly" ;
const char PIValueTree::attributeIsLabel [] = "label" ;
const char PIValueTree::attributeArrayType [] = "arrayType" ;
@@ -106,6 +106,15 @@ bool PIValueTree::contains(const PIString & name) const {
}
bool PIValueTree::contains(const PIStringList & path) const {
if (_is_null || path.isEmpty()) return false;
const PIValueTree * ret = &(child(path[0]));
for (int i = 1; i < path.size_s(); ++i)
ret = &(ret->child(path[i]));
return !ret->isNull();
}
const PIValueTree & PIValueTree::child(const PIString & name) const {
if (_is_null) return *this;
for (const auto & c: _children)

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

@@ -80,6 +80,7 @@ public:
void clearChildren() {_children.clear();}
bool contains(const PIString & name) const;
bool contains(const PIStringList & path) const;
const PIValueTree & child(const PIString & name) const;
PIValueTree & child(const PIString & name);
PIValueTree & addChild(const PIValueTree & n);

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

@@ -110,7 +110,7 @@ void PIVariant::setValueFromString(const PIString & v) {
case PIVariant::pivEnum: {PIVariantTypes::Enum r = toEnum(); r.selectName(v); setValue(r);} break;
case PIVariant::pivFile: {PIVariantTypes::File r = toFile(); r.file = v; setValue(r);} break;
case PIVariant::pivDir: {PIVariantTypes::Dir r = toDir(); r.dir = v; setValue(r);} break;
case PIVariant::pivColor: {setValue(PIVariantTypes::Color(v.mid(1).toUInt(16)));} break;
case PIVariant::pivColor: {if (v.startsWith('#')) setValue(PIVariantTypes::Color(v.mid(1).toUInt(16))); else setValue(PIVariantTypes::Color(v.toUInt()));} break;
case PIVariant::pivIODevice: {setValue(PIVariantTypes::IODevice());} break; // TODO
case PIVariant::pivPoint: {PIStringList l = v.split(';'); if (l.size() >= 2) setValue(PIPointd(l[0].toDouble(), l[1].toDouble()));} break;
case PIVariant::pivRect: {PIStringList l = v.split(';'); if (l.size() >= 4) setValue(PIRectd(l[0].toDouble(), l[1].toDouble(), l[2].toDouble(), l[3].toDouble()));} break;
@@ -181,16 +181,16 @@ PIVariant::Type PIVariant::typeFromName(const PIString & tname) {
if (s == "pidate" || s == "date") return PIVariant::pivDate;
if (s == "pidatetime" || s == "datetime") return PIVariant::pivDateTime;
if (s == "pisystemtime" || s == "systemtime") return PIVariant::pivSystemTime;
if (s == "enum") return PIVariant::pivEnum;
if (s == "file" || s == "path") return PIVariant::pivFile;
if (s == "dir" || s == "directory") return PIVariant::pivDir;
if (s == "color") return PIVariant::pivColor;
if (s == "point") return PIVariant::pivPoint;
if (s == "rect") return PIVariant::pivRect;
if (s == "vector") return PIVariant::pivMathVector;
if (s == "matrix") return PIVariant::pivMathMatrix;
if (s == "line") return PIVariant::pivLine;
if (s == "device" || s == "iodevice") return PIVariant::pivIODevice;
if (s == "pivarianttypes::enum" || s == "enum") return PIVariant::pivEnum;
if (s == "pivarianttypes::file" || s == "file" || s == "path") return PIVariant::pivFile;
if (s == "pivarianttypes::dir" || s == "dir" || s == "directory") return PIVariant::pivDir;
if (s == "pivarianttypes::color" || s == "color") return PIVariant::pivColor;
if (s == "pivarianttypes::iodevice" || s == "device" || s == "iodevice") return PIVariant::pivIODevice;
if (s == "pipointd" || s == "point") return PIVariant::pivPoint;
if (s == "pirectd" || s == "rect") return PIVariant::pivRect;
if (s == "pimathvectord" || s == "vector") return PIVariant::pivMathVector;
if (s == "pimathmatrixd" || s == "matrix") return PIVariant::pivMathMatrix;
if (s == "pilined" || s == "line") return PIVariant::pivLine;
return PIVariant::pivInvalid;
}
@@ -822,7 +822,7 @@ PIString PIVariant::toString() const {
case PIVariant::pivEnum: {PIVariantTypes::Enum r; ba >> r; return r.selectedName();}
case PIVariant::pivFile: {PIVariantTypes::File r; ba >> r; return r.file;}
case PIVariant::pivDir: {PIVariantTypes::Dir r; ba >> r; return r.dir;}
case PIVariant::pivColor: {PIVariantTypes::Color r; ba >> r; return "#" + PIString::fromNumber(r.rgba, 16);}
case PIVariant::pivColor: {PIVariantTypes::Color r; ba >> r; return "0x" + PIString::fromNumber(r.rgba, 16);}
case PIVariant::pivIODevice: {PIVariantTypes::IODevice r; ba >> r; return "IODevice";} // TODO
case PIVariant::pivPoint: {PIPointd r; ba >> r; return PIString::fromNumber(r.x) + ";" + PIString::fromNumber(r.y);} break;
case PIVariant::pivRect: {PIRectd r; ba >> r; return PIString::fromNumber(r.left()) + ";" + PIString::fromNumber(r.bottom()) + ";" + PIString::fromNumber(r.width()) + ";" + PIString::fromNumber(r.height());} break;
@@ -990,7 +990,9 @@ PIVariantTypes::Dir PIVariant::toDir() const {
//!
PIVariantTypes::Color PIVariant::toColor() const {
PIByteArray ba(_content);
if (_type == PIVariant::pivString) {PIString r; ba >> r; return PIVariantTypes::Color(r.mid(1).toUInt(16));}
if (_type == PIVariant::pivString) {PIString r; ba >> r;
if (r.startsWith('#')) return PIVariantTypes::Color(r.mid(1).toUInt(16));
else return PIVariantTypes::Color(r.toUInt());}
if (_type == PIVariant::pivColor) {PIVariantTypes::Color r; ba >> r; return r;}
if (_type == PIVariant::pivInt) {int v; ba >> v; return PIVariantTypes::Color(v);}
if (_type == PIVariant::pivCustom) {return getAsValue<PIVariantTypes::Color>(*this);}

22
main.cpp
View File

@@ -42,12 +42,22 @@ int main(int argc, char * argv[]) {
//piCout << v.value<double>();
//piCout << v.toString();
piCout << PITime();
piCout << PITime::fromString("05:12:56");
piCout << PITime::fromString("05: 12:56");
piCout << PITime::fromString("05.12:56");
piCout << PITime::fromString("05.12:56:333", "h.m.s");
piCout << PIDateTime::fromString(PIDateTime::current().toString("__yyyy_MM_d__hh_mm_ss__"), "__yyyy_MM_d__hh_mm_ss__");
//piCout << PITime();
//piCout << PITime::fromString("05:12:56");
//piCout << PITime::fromString("05: 12:56");
//piCout << PITime::fromString("05.12:56");
//piCout << PITime::fromString("05.12:56:333", "h.m.s");
//piCout << PIDateTime::fromString(PIDateTime::current().toString("__yyyy_MM_d__hh_mm_ss__"), "__yyyy_MM_d__hh_mm_ss__");
piCout << PIVariantTypes::Color();
piCout << PIVariantTypes::Color(0xFF00FFff);
PIVariant v = PIVariant::fromType(PIVariant::typeName<PIVariantTypes::Color>());
piCout << PIVariant::typeName<PIPointd>();
piCout << PIVariant::typeFromName(PIVariant::typeName<PIVariantTypes::Color>());
piCout << PIVariant::typeIDFromName(PIVariant::typeName<PIVariantTypes::Color>());
piCout << PIVariant::typeIDFromType(PIVariant::pivColor);
v.setValueFromString("0xFF00FFff");
piCout << v;
return 0;
}