From 4c0e61fdb6a4efd09aec267331699c8cc41ae892 Mon Sep 17 00:00:00 2001
From: Andrey <wapmobil@gmail.com>
Date: Thu, 4 Aug 2022 11:36:59 +0300
Subject: [PATCH] exportGraphics with custom convert functions fix
 QPIConnection for pip2

---
 libs/graphic/graphic.cpp  | 12 ++++++++++--
 libs/piqt/qpiconnection.h |  4 ++++
 2 files changed, 14 insertions(+), 2 deletions(-)

diff --git a/libs/graphic/graphic.cpp b/libs/graphic/graphic.cpp
index fc07aff..11cc548 100644
--- a/libs/graphic/graphic.cpp
+++ b/libs/graphic/graphic.cpp
@@ -963,9 +963,17 @@ void Graphic::exportGraphics(QString filename, QChar decimal_point) {
 			}
 			has_data = true;
 			line += ";";
-			line += QString::number(g.polyline[ind].x(), 'g', 9).replace('.', decimal_point);
+			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 += ";";
-			line += QString::number(g.polyline[ind].y(), 'g', 9).replace('.', decimal_point);
+			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);
+			}
 		}
 		++ind;
 		line += "\n";
diff --git a/libs/piqt/qpiconnection.h b/libs/piqt/qpiconnection.h
index 9767692..46dc5aa 100644
--- a/libs/piqt/qpiconnection.h
+++ b/libs/piqt/qpiconnection.h
@@ -37,7 +37,11 @@ public:
 	bool loadFromCMFile(const QString & file);
 	
 protected:
+#if PIP_VERSION >= PIP_MAKE_VERSION(2,38,0)
 	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, piPacketRec, const PIString &, from, const PIByteArray &, data);