Add the KeepExisting option for renumbering.

Author: u-235

addons/src/renumber/renumberdialog.cpp

@@ -87,6 +87,7 @@ void RenumberDialog::renumClicked()
 	mRenumWithComm->setEnabled(false);
 	mRenumEmpty->setEnabled(false);
 	mRenumMarked->setEnabled(true);
+	mKeepExisting->setEnabled(false);
 	mCheckDivide->setEnabled(true);
 	divideClicked();
 }
@@ -103,6 +104,7 @@ void RenumberDialog::mRenumHeClicked()
 	mRenumWithComm->setEnabled(false);
 	mRenumEmpty->setEnabled(true);
 	mRenumMarked->setEnabled(false);
+	mKeepExisting->setEnabled(false);
 	mCheckDivide->setEnabled(true);
 	divideClicked();
 }
@@ -119,6 +121,7 @@ void RenumberDialog::allLinesClicked()
 	mRenumWithComm->setEnabled(true);
 	mRenumEmpty->setEnabled(true);
 	mRenumMarked->setEnabled(false);
+	mKeepExisting->setEnabled(true);
 	mCheckDivide->setEnabled(true);
 	divideClicked();
 }
@@ -135,6 +138,7 @@ void RenumberDialog::removeAllClicked()
 	mRenumWithComm->setEnabled(false);
 	mRenumEmpty->setEnabled(false);
 	mRenumMarked->setEnabled(false);
+	mKeepExisting->setEnabled(false);
 	mCheckDivide->setEnabled(false);
 	divideClicked();
 }
@@ -147,6 +151,7 @@ void RenumberDialog::setOptions(const RenumberOptions& options)
 	mRenumEmpty->setChecked(options.renumEmpty);
 	mRenumWithComm->setChecked(options.renumComm);
 	mRenumMarked->setChecked(options.renumMarked);
+	mKeepExisting->setChecked(options.keepExisting);
 	toInput->setValue(options.to);
 	mSpinBox->setValue(options.width);
 	mCheckDivide->setChecked(options.applyWidth);
@@ -191,6 +196,7 @@ RenumberOptions RenumberDialog::options()
 	options.renumEmpty = mRenumEmpty->isChecked();
 	options.renumComm = mRenumWithComm->isChecked();
 	options.renumMarked = mRenumMarked->isChecked();
+	options.keepExisting = mKeepExisting->isChecked();
 	options.to = toInput->value();
 	options.width = mSpinBox->value();
 	options.applyWidth = mCheckDivide->isChecked();

addons/src/renumber/renumberdialog.ui

@@ -223,6 +223,22 @@
         </property>
        </widget>
       </item>
+      <item row="9" column="0">
+       <widget class="QCheckBox" name="mKeepExisting">
+        <property name="enabled">
+         <bool>false</bool>
+        </property>
+        <property name="checked">
+         <bool>true</bool>
+        </property>
+        <property name="text">
+         <string>Keep existing block numbers.</string>
+        </property>
+        <property name="toolTip">
+         <string>Keep already existing block numbers for empty lines.</string>
+        </property>
+       </widget>
+      </item>
      </layout>
     </widget>
    </item>

addons/src/renumber/renumberoptions.cpp

@@ -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.
  *
@@ -26,6 +26,7 @@
 #define CFG_KEY_APPLY_WIDTH     "ApplyWidth"
 #define CFG_KEY_FROM            "From"
 #define CFG_KEY_INC             "Inc"
+#define CFG_KEY_KEEP_EXISTING   "KeepExisting"
 #define CFG_KEY_MODE            "Mode"
 #define CFG_KEY_RENUM_EMPTY     "RenumEmpty"
 #define CFG_KEY_RENUM_MARKED    "RenumMarked"
@@ -46,6 +47,7 @@ void RenumberOptions::load(QSettings* settings, const RenumberOptions& defaultOp
 	renumComm = settings->value(CFG_KEY_RENUM_WITH_COMM, defaultOptions.renumComm).toBool();
 	renumEmpty = settings->value(CFG_KEY_RENUM_EMPTY, defaultOptions.renumEmpty).toBool();
 	renumMarked = settings->value(CFG_KEY_RENUM_MARKED, defaultOptions.renumMarked).toBool();
+	keepExisting = settings->value(CFG_KEY_KEEP_EXISTING, defaultOptions.keepExisting).toBool();
 	width = settings->value(CFG_KEY_WIDTH, defaultOptions.width).toInt();
 }
 
@@ -58,6 +60,7 @@ void RenumberOptions::save(QSettings* settings)
 	settings->setValue(CFG_KEY_RENUM_WITH_COMM, renumComm);
 	settings->setValue(CFG_KEY_RENUM_EMPTY, renumEmpty);
 	settings->setValue(CFG_KEY_RENUM_MARKED, renumMarked);
+	settings->setValue(CFG_KEY_KEEP_EXISTING, keepExisting);
 	settings->setValue(CFG_KEY_START, startAt);
 	settings->setValue(CFG_KEY_TO, to);
 	settings->setValue(CFG_KEY_WIDTH, width);

addons/src/renumber/renumberoptions.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.
  *
@@ -41,6 +41,7 @@ struct RenumberOptions {
 	bool    renumEmpty;
 	bool    renumComm;
 	bool    renumMarked;
+	bool    keepExisting;
 
 	void load(QSettings* settings, const RenumberOptions& defaultOptions);
 	void save(QSettings* settings);

addons/src/renumber/utils-renumber.cpp

@@ -60,7 +60,7 @@ bool Utils::renumber(QString& text, const RenumberOptions& opt, const std::funct
 			break;
 
 		case RenumberOptions::RenumberAll:
-			localChange = renumberAll(line, num, width, opt.renumEmpty, opt.renumComm, true);
+			localChange = renumberAll(line, num, width, opt.renumEmpty, opt.renumComm, opt.keepExisting);
 			break;
 
 		case RenumberOptions::RemoveAll: