Add LongJobHelper to the Addons::SwapAxes

Author: u-235

addons/src/addons-actions.cpp

@@ -464,11 +464,13 @@ void Addons::Actions::doSwapAxes()
 {
 	Addons::Context ctx;
 
-	if (!ctx.pull(Addons::Context::ALL)) {
+	if (!ctx.pull(Addons::Context::SELECTED_OR_ALL)) {
 		return;
 	}
 
-	Addons::doSwapAxes(GCodeWorkShop::instance(), Medium::instance().settings(), ctx.textEdit());
+	if (Addons::doSwapAxes(GCodeWorkShop::instance(), Medium::instance().settings(), ctx.text())) {
+		ctx.push();
+	}
 }
 
 void Addons::Actions::doTriangle()

addons/src/swapaxes/addons-swapaxes.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,19 +18,22 @@
  *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
+#include <functional>   // for function
+
 #include <QDialog>  // for QDialog, QDialog::Accepted
 #include <QString>  // for QString
 #include <QWidget>  // for QWidget
 
+#include <ui/longjobhelper.h>   // for LongJobHelper, LongJobHelper::CANCEL
+
 #include "addons-swapaxes.h"
 #include "swapaxesdialog.h"     // for SwapAxesDialog
 #include "swapaxesoptions.h"    // for SwapAxesOptions
 #include "utils-swapaxes.h"     // for swapAxes, COMMENT_ID_UNKNOWN
 
 
-int Addons::doSwapAxes(QWidget* parent, QSettings* settings, QPlainTextEdit* textEdit)
+bool Addons::doSwapAxes(QWidget* parent, QSettings* settings, QString& text)
 {
-	int result = 0;
 	QString key = "SwapAxesDialog";
 	SwapAxesDialog* dlg;
 	dlg = parent->findChild<SwapAxesDialog*>(key);
@@ -41,10 +44,19 @@ int Addons::doSwapAxes(QWidget* parent, QSettings* settings, QPlainTextEdit* tex
 		dlg->loadSettings(SwapAxesOptions());
 	}
 
-	if (dlg->exec() == QDialog::Accepted) {
-		Utils::swapAxes(textEdit, false, 40000, COMMENT_ID_UNKNOWN, dlg->options());
+	if (dlg->exec() != QDialog::Accepted) {
+		return false;
 	}
 
+
+	LongJobHelper helper{parent};
+	helper.begin(text.length(), QCoreApplication::translate("Addons::Actions", "Axis exchange"), 20);
+
+	bool changed = Utils::swapAxes(text, dlg->options(), [&helper](int pos) -> bool{
+		return helper.check(pos) == LongJobHelper::CANCEL;
+	});
+
+	helper.end();
 	dlg->deleteLater();
-	return result;
+	return changed;
 }

addons/src/swapaxes/addons-swapaxes.h

@@ -1,5 +1,5 @@
 /*
- *  Copyright (C) 2023 Nick Egorrov, nicegorov@yandex.ru
+ *  Copyright (C) 2023-2025 Nick Egorrov, nicegorov@yandex.ru
  *
  *  This file is part of GCodeWorkShop.
  *
@@ -20,13 +20,13 @@
 #ifndef ADDONS_SWAPAXES_H
 #define ADDONS_SWAPAXES_H
 
-class QPlainTextEdit;
 class QSettings;
+class QString;
 class QWidget;
 
 
 namespace Addons {
-int doSwapAxes(QWidget* parent, QSettings* settings,  QPlainTextEdit* textEdit);
+bool doSwapAxes(QWidget* parent, QSettings* settings,  QString& text);
 }
 
 #endif // ADDONS_SWAPAXES_H

addons/src/swapaxes/swapaxesoptions.h

@@ -41,6 +41,7 @@ struct SwapAxesOptions {
 	} limit;
 
 	enum Operation {
+		Nop = -1,
 		Add,
 		Subtract,
 		Multiply,