From e412c3f4cc13af62fdff14a9e8d1bbc3d2c29d86 Mon Sep 17 00:00:00 2001
From: wmayer <wmayer@users.sourceforge.net>
Date: Fri, 26 Nov 2021 16:58:59 +0100
Subject: [PATCH] PD: add enum class to TaskPadParameters to avoid to work with
 magic numbers

---
 src/Mod/PartDesign/Gui/TaskPadParameters.cpp  | 56 +++++++++----------
 src/Mod/PartDesign/Gui/TaskPadParameters.h    |  8 +++
 .../PartDesign/Gui/TaskPocketParameters.cpp   |  4 +-
 src/Mod/PartDesign/Gui/TaskPocketParameters.h |  2 +-
 4 files changed, 36 insertions(+), 34 deletions(-)

diff --git a/src/Mod/PartDesign/Gui/TaskPadParameters.cpp b/src/Mod/PartDesign/Gui/TaskPadParameters.cpp
index d193222925..9e7d902178 100644
--- a/src/Mod/PartDesign/Gui/TaskPadParameters.cpp
+++ b/src/Mod/PartDesign/Gui/TaskPadParameters.cpp
@@ -32,22 +32,10 @@
 
 #include "ui_TaskPadParameters.h"
 #include "TaskPadParameters.h"
-#include <App/Application.h>
-#include <App/Document.h>
-#include <App/Origin.h>
-#include <Base/Console.h>
-#include <Base/UnitsApi.h>
-#include <Gui/Application.h>
-#include <Gui/BitmapFactory.h>
 #include <Gui/Command.h>
-#include <Gui/Document.h>
-#include <Gui/Selection.h>
 #include <Gui/ViewProvider.h>
-#include <Gui/WaitCursor.h>
-#include <Mod/PartDesign/App/Body.h>
 #include <Mod/PartDesign/App/FeaturePad.h>
 #include <Mod/Sketcher/App/SketchObject.h>
-#include "ReferenceSelection.h"
 
 using namespace PartDesignGui;
 using namespace Gui;
@@ -99,8 +87,9 @@ void TaskPadParameters::updateUI(int index)
     bool isReversedVisible    = false;
     bool isFaceEditEnabled    = false;
 
-    // dimension
-    if (index == 0) {
+    Modes mode = static_cast<Modes>(index);
+
+    if (mode == Modes::Dimension) {
         isLengthEditVisible = true;
         ui->lengthEdit->selectNumber();
         // Make sure that the spin box has the focus to get key events
@@ -113,14 +102,12 @@ void TaskPadParameters::updateUI(int index)
         isReversedEnabled = !ui->checkBoxMidplane->isChecked();
         isReversedVisible = true;
     }
-    // up to first/last
-    else if (index == 1 || index == 2) {
+    else if (mode == Modes::ToLast || mode == Modes::ToFirst) {
         isOffsetEditVisible = true;
         isReversedEnabled = true;
         isReversedVisible = true;
     }
-    // up to face
-    else if (index == 3) {
+    else if (mode == Modes::ToFace) {
         isOffsetEditVisible = true;
         isFaceEditEnabled   = true;
         QMetaObject::invokeMethod(ui->lineFaceName, "setFocus", Qt::QueuedConnection);
@@ -130,8 +117,7 @@ void TaskPadParameters::updateUI(int index)
         isReversedEnabled = true;
         isReversedVisible = true;
     }
-    // two dimensions
-    else {
+    else if (mode == Modes::TwoDimensions) {
         isLengthEditVisible  = true;
         isLengthEdit2Visible = true;
         isMidplaneEnabled    = !ui->checkBoxReversed->isChecked();
@@ -170,17 +156,25 @@ void TaskPadParameters::onModeChanged(int index)
 {
     PartDesign::Pad* pcPad = static_cast<PartDesign::Pad*>(vp->getObject());
 
-    switch (index) {
-        case 0:
-            pcPad->Type.setValue("Length");
-            // Avoid error message
-            if (ui->lengthEdit->value() < Base::Quantity(Precision::Confusion(), Base::Unit::Length))
-                ui->lengthEdit->setValue(5.0);
-            break;
-        case 1: pcPad->Type.setValue("UpToLast"); break;
-        case 2: pcPad->Type.setValue("UpToFirst"); break;
-        case 3: pcPad->Type.setValue("UpToFace"); break;
-        default: pcPad->Type.setValue("TwoLengths");
+    switch (static_cast<Modes>(index)) {
+    case Modes::Dimension:
+        pcPad->Type.setValue("Length");
+        // Avoid error message
+        if (ui->lengthEdit->value() < Base::Quantity(Precision::Confusion(), Base::Unit::Length))
+            ui->lengthEdit->setValue(5.0);
+        break;
+    case Modes::ToLast:
+        pcPad->Type.setValue("UpToLast");
+        break;
+    case Modes::ToFirst:
+        pcPad->Type.setValue("UpToFirst");
+        break;
+    case Modes::ToFace:
+        pcPad->Type.setValue("UpToFace");
+        break;
+    case Modes::TwoDimensions:
+        pcPad->Type.setValue("TwoLengths");
+        break;
     }
 
     updateUI(index);
diff --git a/src/Mod/PartDesign/Gui/TaskPadParameters.h b/src/Mod/PartDesign/Gui/TaskPadParameters.h
index a3701e1588..b5acca2f3e 100644
--- a/src/Mod/PartDesign/Gui/TaskPadParameters.h
+++ b/src/Mod/PartDesign/Gui/TaskPadParameters.h
@@ -46,6 +46,14 @@ class TaskPadParameters : public TaskExtrudeParameters
 {
     Q_OBJECT
 
+    enum class Modes {
+        Dimension,
+        ToLast,
+        ToFirst,
+        ToFace,
+        TwoDimensions
+    };
+
 public:
     TaskPadParameters(ViewProviderPad *PadView, QWidget *parent = 0, bool newObj=false);
     ~TaskPadParameters();
diff --git a/src/Mod/PartDesign/Gui/TaskPocketParameters.cpp b/src/Mod/PartDesign/Gui/TaskPocketParameters.cpp
index 06401f0fff..086318c86f 100644
--- a/src/Mod/PartDesign/Gui/TaskPocketParameters.cpp
+++ b/src/Mod/PartDesign/Gui/TaskPocketParameters.cpp
@@ -113,7 +113,7 @@ void TaskPocketParameters::updateUI(int index)
             // (may happen in bodies)
             // FIXME: Fix probably lies somewhere in IF block on line 125 of FeaturePocket.cpp
     }
-    else if (mode == Modes::UpToFace) {
+    else if (mode == Modes::ToFace) {
         isOffsetEditVisible = true;
         isReversedEnabled = true;
         isFaceEditEnabled    = true;
@@ -173,7 +173,7 @@ void TaskPocketParameters::onModeChanged(int index)
             oldLength = pcPocket->Length.getValue();
             pcPocket->Type.setValue("UpToFirst");
             break;
-        case Modes::UpToFace:
+        case Modes::ToFace:
             // Because of the code at the beginning of Pocket::execute() which is used to detect
             // broken legacy parts, we must set the length to zero here!
             oldLength = pcPocket->Length.getValue();
diff --git a/src/Mod/PartDesign/Gui/TaskPocketParameters.h b/src/Mod/PartDesign/Gui/TaskPocketParameters.h
index ae95bd2d2a..30c1414495 100644
--- a/src/Mod/PartDesign/Gui/TaskPocketParameters.h
+++ b/src/Mod/PartDesign/Gui/TaskPocketParameters.h
@@ -50,7 +50,7 @@ class TaskPocketParameters : public TaskExtrudeParameters
         Dimension,
         ThroughAll,
         ToFirst,
-        UpToFace,
+        ToFace,
         TwoDimensions
     };