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

exportGraphics with custom convert functions

Browse Source 
fix QPIConnection for pip2
This commit is contained in:
Бычков Андрей
2022-08-04 11:36:59 +03:00
parent 291b2a698d
commit 4c0e61fdb6
2 changed files with 14 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
libs/graphic/graphic.cpp
View File

@@ -963,10 +963,18 @@ void Graphic::exportGraphics(QString filename, QChar decimal_point) {
} }
has_data = true; has_data = true;
line += ";"; line += ";";
if (func_gridMarkX) {
line += func_gridMarkX(g.polyline[ind].x()).replace('.', decimal_point);
} else {
line += QString::number(g.polyline[ind].x(), 'g', 9).replace('.', decimal_point); line += QString::number(g.polyline[ind].x(), 'g', 9).replace('.', decimal_point);
}
line += ";"; line += ";";
if (func_gridMarkY) {
line += func_gridMarkY(g.polyline[ind].y()).replace('.', decimal_point);
} else {
line += QString::number(g.polyline[ind].y(), 'g', 9).replace('.', decimal_point); line += QString::number(g.polyline[ind].y(), 'g', 9).replace('.', decimal_point);
} }
}
++ind; ++ind;
line += "\n"; line += "\n";
if (has_data) if (has_data)

4
libs/piqt/qpiconnection.h
View File

@@ -37,7 +37,11 @@ public:
bool loadFromCMFile(const QString & file); bool loadFromCMFile(const QString & file);
protected: protected:
#if PIP_VERSION >= PIP_MAKE_VERSION(2,38,0)
void propertyChanged(const char *) override {setObjectName(PI2QString(name()));} void propertyChanged(const char *) override {setObjectName(PI2QString(name()));}
#else
void propertyChanged(const PIString &) override {setObjectName(PI2QString(name()));}
#endif
EVENT_HANDLER2(void, piDataRec, const PIString &, from, const PIByteArray &, data); EVENT_HANDLER2(void, piDataRec, const PIString &, from, const PIByteArray &, data);
EVENT_HANDLER2(void, piPacketRec, const PIString &, from, const PIByteArray &, data); EVENT_HANDLER2(void, piPacketRec, const PIString &, from, const PIByteArray &, data);