SHS/libs
Archived
3
1
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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

Browse Source
This commit is contained in:
Пелипенко Иван
2017-11-27 14:06:25 +00:00
parent 23e987ff0a
commit 4c6143de38
9 changed files with 31 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
piqt/piqt.cpp
View File

@@ -44,6 +44,8 @@ const QVariant PI2QVariant(const PIVariant & v) {
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::pivPoint: return QVariant(PI2QPoint(v.toPoint()));
case PIVariant::pivRect: return QVariant(PI2QRect(v.toRect()));
//case PIVariant::pivSystemTime: return QVariant(v.to());
default: return QVariant();
}
@@ -66,6 +68,10 @@ const PIVariant Q2PIVariant(const QVariant & v) {
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>()));
case QVariant::Point:
case QVariant::PointF: return PIVariant(Q2PIPoint(v.toPointF()));
case QVariant::Rect:
case QVariant::RectF: return PIVariant(Q2PIRect(v.toRectF()));
default: break;
}
if (v.canConvert<QAD::Enum>()) return PIVariant(QAD2PIEnum(v.value<QAD::Enum>()));

7
piqt/piqt.h
View File

@@ -3,6 +3,7 @@
#include "pistring.h"
#include "pimathmatrix.h"
#include "pigeometry.h"
#include "pitime.h"
#include "pivariant.h"
#include "qad_types.h"
@@ -40,6 +41,12 @@ inline const QVector3D PI2QVector3(const PIMathVectorT3d & v) {return QVector3D(
inline const PIMathVectorT2d Q2PIVector2(const QPointF & v) {return PIMathVectorT2d(double(v.x()), double(v.y()), 0.);}
inline const PIMathVectorT3d Q2PIVector3(const QVector3D & v) {return PIMathVectorT3d(double(v.x()), double(v.y()), double(v.z()));}
inline const QPointF PI2QPoint(const PIPointd & v) {return QPointF(v.x, v.y);}
inline const PIPointd Q2PIPoint(const QPointF & v) {return PIPointd(v.x(), v.y());}
inline const QRectF PI2QRect(const PIRectd & v) {return QRectF(v.x0, v.y0, v.width(), v.height());}
inline const PIRectd Q2PIRect(const QRectF & v) {return PIRectd(v.x(), v.y(), v.width(), v.height());}
inline const QDate PI2QDate(const PIDate & v) {return QDate(v.year, v.month, v.day);}
inline const QTime PI2QTime(const PITime & v) {return QTime(v.hours, v.minutes, v.seconds, v.milliseconds);}