diff --git a/piqt/piqt.cpp b/piqt/piqt.cpp index a8c07c7..3bf7e74 100644 --- a/piqt/piqt.cpp +++ b/piqt/piqt.cpp @@ -43,6 +43,7 @@ const QVariant PI2QVariant(const PIVariant & v) { case PIVariant::pivEnum: return QVariant::fromValue(PI2QADEnum(v.toEnum())); case PIVariant::pivFile: return QVariant::fromValue(PI2QADFile(v.toFile())); case PIVariant::pivDir: return QVariant::fromValue(PI2QADDir(v.toDir())); + case PIVariant::pivColor: return QVariant::fromValue(PI2QColor(v.toColor())); //case PIVariant::pivSystemTime: return QVariant(v.to()); default: return QVariant(); } @@ -64,6 +65,7 @@ const PIVariant Q2PIVariant(const QVariant & v) { case QVariant::Time: return PIVariant(Q2PITime(v.toTime())); case QVariant::Date: return PIVariant(Q2PIDate(v.toDate())); case QVariant::DateTime: return PIVariant(Q2PIDateTime(v.toDateTime())); + case QVariant::Color: return PIVariant(Q2PIColor(v.value())); default: break; } if (v.canConvert()) return PIVariant(QAD2PIEnum(v.value())); diff --git a/piqt/piqt.h b/piqt/piqt.h index 28045e2..53f70e3 100644 --- a/piqt/piqt.h +++ b/piqt/piqt.h @@ -14,6 +14,7 @@ #include #include #include +#include //inline const QString PI2QString(const PIString & v) {return QString::fromLocal8Bit(v.data());} @@ -49,6 +50,9 @@ inline const PITime Q2PITime(const QTime & v) {return PITime(v.hour(), v.minute( inline const PIDateTime Q2PIDateTime(const QDateTime & v) {return PIDateTime(Q2PIDate(v.date()), Q2PITime(v.time()));} +inline const QColor PI2QColor(const PIVariantTypes::Color & v) {return QColor::fromRgba(v.rgba);} +inline const PIVariantTypes::Color Q2PIColor(const QColor & v) {return PIVariantTypes::Color(v.rgba());} + const QAD::Enum PI2QADEnum(const PIVariantTypes::Enum & el); inline const QAD::File PI2QADFile(const PIVariantTypes::File & v) {return QAD::File(PI2QString(v.file), PI2QString(v.filter), v.is_abs);} inline const QAD::Dir PI2QADDir(const PIVariantTypes::Dir & v) {return QAD::Dir(PI2QString(v.dir), v.is_abs);}