Add LongJobHelper to the Addons::I2MProg

Author: u-235

addons/src/i2mprog/addons-i2mprog.cpp

@@ -1,6 +1,6 @@
 /*
  *  Copyright (C) 2006-2018 by Artur Kozioł, artkoz78@gmail.com
- *  Copyright (C) 2023 Nick Egorrov, nicegorov@yandex.ru
+ *  Copyright (C) 2023-2025 Nick Egorrov, nicegorov@yandex.ru
  *
  *  This file is part of GCodeWorkShop.
  *
@@ -18,9 +18,14 @@
  *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include <QDialog>  // for QDialog
-#include <QString>  // for QString
-#include <QWidget>  // for QWidget
+#include <functional>   // for function
+
+#include <QCoreApplication> // for QCoreApplication
+#include <QDialog>          // for QDialog
+#include <QString>          // for QString
+#include <QWidget>          // for QWidget
+
+#include <ui/longjobhelper.h>   // for LongJobHelper, LongJobHelper::CANCEL
 
 #include "addons-i2mprog.h"
 #include "i2mprogdialog.h"  // for I2MProgDialog
@@ -41,11 +46,19 @@ int Addons::doI2MProg(QWidget* parent, QSettings* settings,  QString& tx)
 		dlg->loadSettings(I2MProgOptions());
 	}
 
-	if (dlg->exec() == QDialog::Accepted) {
-		I2MProgOptions opt = dlg->options();
-		result = Utils::i2mprog(tx, opt.axes, opt.toInch, opt.prec);
+	if (dlg->exec() != QDialog::Accepted) {
+		return 0;
 	}
 
+	LongJobHelper helper{parent};
+	helper.begin(tx.length(), QCoreApplication::translate("Addons::Actions", "Converting inch to metric"), 20);
+
+	I2MProgOptions opt = dlg->options();
+	result = Utils::i2mprog(tx, opt.axes, opt.toInch, opt.prec, [&helper](int pos) -> bool{
+		return helper.check(pos) == LongJobHelper::CANCEL;
+	});
+
+	helper.end();
 	dlg->deleteLater();
 	return result;
 }

addons/src/i2mprog/utils-i2mprog.cpp

@@ -1,6 +1,6 @@
 /*
  *  Copyright (C) 2006-2018 by Artur Kozioł, artkoz78@gmail.com
- *  Copyright (C) 2023 Nick Egorrov, nicegorov@yandex.ru
+ *  Copyright (C) 2023-2025 Nick Egorrov, nicegorov@yandex.ru
  *
  *  This file is part of GCodeWorkShop.
  *
@@ -25,7 +25,10 @@
 #include "utils-i2mprog.h"
 
 
-int Utils::i2mprog(QString tx, const QString& addr, bool toInch, int prec)
+int Utils::i2mprog(QString tx,
+                   const QString& addr,
+                   bool toInch, int prec,
+                   const std::function<bool (int)>& interrupt)
 {
 	int count = 0;
 	QRegularExpression regex;
@@ -38,6 +41,10 @@ int Utils::i2mprog(QString tx, const QString& addr, bool toInch, int prec)
 	while (match.hasMatch()) {
 		int pos = match.capturedEnd();
 
+		if (interrupt(pos)) {
+			return count;
+		}
+
 		if (match.capturedLength(1) > 0) {
 			QString f_tx = match.captured(1);
 			bool ok;

addons/src/i2mprog/utils-i2mprog.h

@@ -1,6 +1,6 @@
 /*
  *  Copyright (C) 2006-2018 by Artur Kozioł, artkoz78@gmail.com
- *  Copyright (C) 2023 Nick Egorrov, nicegorov@yandex.ru
+ *  Copyright (C) 2023-2025 Nick Egorrov, nicegorov@yandex.ru
  *
  *  This file is part of GCodeWorkShop.
  *
@@ -21,11 +21,16 @@
 #ifndef UTILS_I2M_H
 #define UTILS_I2M_H
 
+#include <functional>   // for function
+
 class QString;
 
 
 namespace Utils {
-int i2mprog(QString tx, const QString& addr, bool toInch, int prec);
+int i2mprog(QString tx,
+            const QString& addr,
+            bool toInch, int prec,
+            const std::function<bool(int)>& interrupt);
 }
 
 #endif // UTILS_I2M_H