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

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

Browse Source
This commit is contained in:
Пелипенко Иван
2019-04-16 20:12:00 +00:00
parent 90919ca7ea
commit 2ec93af541
2 changed files with 10 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
piqt/piqt.cpp
View File

@@ -1,6 +1,8 @@
#include "piqt.h" #include "piqt.h"
#include "qvariantedit.h" #include "qvariantedit.h"
#include <QGeoCoordinate> #if QT_VERSION >= 0x050200
# include <QGeoCoordinate>
#endif
const QAD::Enum PI2QADEnum(const PIVariantTypes::Enum & el) { const QAD::Enum PI2QADEnum(const PIVariantTypes::Enum & el) {
@@ -123,6 +125,7 @@ const PIVariantTypes::Dir QAD2PIDir(const QAD::Dir & v) {
} }
#if QT_VERSION >= 0x050200
const QGeoCoordinate PI2QGeoPosition(const PIGeoPosition & v) { const QGeoCoordinate PI2QGeoPosition(const PIGeoPosition & v) {
PIGeoPosition p(v); PIGeoPosition p(v);
p.transformTo(PIGeoPosition::Cartesian); p.transformTo(PIGeoPosition::Cartesian);
@@ -135,3 +138,4 @@ const QGeoCoordinate PI2QGeoPosition(const PIGeoPosition & v) {
const PIGeoPosition Q2PIGeoPosition(const QGeoCoordinate & v) { const PIGeoPosition Q2PIGeoPosition(const QGeoCoordinate & v) {
return PIGeoPosition(createVectorT3d(v.latitude(), v.longitude(), v.altitude()), PIGeoPosition::Geodetic); return PIGeoPosition(createVectorT3d(v.latitude(), v.longitude(), v.altitude()), PIGeoPosition::Geodetic);
} }
#endif

6
piqt/piqt.h
View File

@@ -3,11 +3,13 @@
#include "pimathmatrix.h" #include "pimathmatrix.h"
#include "pipropertystorage.h" #include "pipropertystorage.h"
#include "pigeoposition.h"
#include "qad_types.h" #include "qad_types.h"
#include <QVector3D> #include <QVector3D>
#include <QDateTime> #include <QDateTime>
#include <QColor> #include <QColor>
#if QT_VERSION >= 0x050200
# include "pigeoposition.h"
#endif
class QGeoCoordinate; class QGeoCoordinate;
@@ -114,8 +116,10 @@ const PIVariantTypes::IODevice QAD2PIIODevice(const QAD::IODevice & v);
//inline const PIVariant QString2PIVariant(const QString & v) {return PIVariant::readFromString(QString2PIString(v));} //inline const PIVariant QString2PIVariant(const QString & v) {return PIVariant::readFromString(QString2PIString(v));}
#if QT_VERSION >= 0x050200
const QGeoCoordinate PI2QGeoPosition(const PIGeoPosition & v); const QGeoCoordinate PI2QGeoPosition(const PIGeoPosition & v);
const PIGeoPosition Q2PIGeoPosition(const QGeoCoordinate & v); const PIGeoPosition Q2PIGeoPosition(const QGeoCoordinate & v);
#endif
template <typename From> template <typename From>
class __PIQtConverter { class __PIQtConverter {