SHS/qad
4
1
Fork 0
Code Issues 5 Pull Requests Releases Wiki Activity

git-svn-id: svn://db.shs.com.ru/libs@310 a8b55f48-bf90-11e4-a774-851b48703e85

Browse Source
This commit is contained in:
Бычков Андрей
2017-11-03 15:35:49 +00:00
parent 75a8ea9a54
commit f03264d7fb
2 changed files with 6 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
piqt/piqt.cpp
View File

@@ -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<QColor>()));
default: break;
}
if (v.canConvert<QAD::Enum>()) return PIVariant(QAD2PIEnum(v.value<QAD::Enum>()));

4
piqt/piqt.h
View File

@@ -14,6 +14,7 @@
#include <QDateTime>
#include <QStringList>
#include <QVariant>
#include <QColor>
//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);}