kindred/create
1
1
Fork 0
Code Issues 37 Pull Requests Actions Packages Projects 9 Releases 2 Wiki Activity

Remove magic number and hard type enums in CenterLine.h

Browse Source 
- Remove currently present magic numbers
- Hard type enums, so magic numbers can no longer be introduced. We don't want people to introduce magic numbers.
This commit is contained in:
Benjamin Bræstrup Sayoc
2025-01-30 22:46:13 +01:00
committed by WandererFan
parent c53679422b
commit ea26b3f18c
6 changed files with 109 additions and 93 deletions
Download Patch File Download Diff File Expand all files Collapse all files

40
src/Mod/TechDraw/App/CenterLine.h
View File

@@ -40,30 +40,44 @@ class TechDrawExport CenterLine: public Base::Persistence
TYPESYSTEM_HEADER_WITH_OVERRIDE();
public:
enum CLMODE
enum class Mode
{
VERTICAL,
HORIZONTAL,
ALIGNED
};
enum CLTYPE
// TODO: when C++ 20
// using Mode;
enum class Type
{
FACE,
EDGE,
VERTEX
};
}; // TODO: Make this global
// TODO: when C++ 20
// using Mode;
template <typename U, std::enable_if_t<
std::is_same_v<CenterLine::Type, U> ||
std::is_same_v<CenterLine::Mode, U>,
bool
> =true>
friend std::ostream& operator<<(std::ostream& out, const U& type) {
out << static_cast<int>(type);
return out;
}
CenterLine();
CenterLine(const CenterLine* cl);
//set m_faces after using next 3 ctors
CenterLine(const TechDraw::BaseGeomPtr& bg,
const int m = CLMODE::VERTICAL,
const Mode m = Mode::VERTICAL,
const double h = 0.0,
const double v = 0.0,
const double r = 0.0,
const double x = 0.0);
CenterLine(const Base::Vector3d& p1, const Base::Vector3d& p2,
const int m = CLMODE::VERTICAL,
const Mode m = Mode::VERTICAL,
const double h = 0.0,
const double v = 0.0,
const double r = 0.0,
@@ -85,7 +99,7 @@ public:
static CenterLine* CenterLineBuilder(const TechDraw::DrawViewPart* partFeat,
const std::vector<std::string>& subs,
const int mode = 0,
const Mode mode = Mode::VERTICAL,
const bool flip = false);
TechDraw::BaseGeomPtr scaledGeometry(const TechDraw::DrawViewPart* partFeat);
TechDraw::BaseGeomPtr scaledAndRotatedGeometry(TechDraw::DrawViewPart* partFeat);
@@ -107,7 +121,7 @@ public:
static std::pair<Base::Vector3d, Base::Vector3d> calcEndPoints(
const TechDraw::DrawViewPart* partFeat,
const std::vector<std::string>& faceNames,
const int mode,
const Mode mode,
const double ext,
const double m_hShift,
const double m_vShift,
@@ -115,7 +129,7 @@ public:
static std::pair<Base::Vector3d, Base::Vector3d> calcEndPoints2Lines(
const TechDraw::DrawViewPart* partFeat,
const std::vector<std::string>& faceNames,
const int vert,
const Mode mode,
const double ext,
const double m_hShift,
const double m_vShift,
@@ -124,7 +138,7 @@ public:
static std::pair<Base::Vector3d, Base::Vector3d> calcEndPoints2Points(
const TechDraw::DrawViewPart* partFeat,
const std::vector<std::string>& faceNames,
const int vert,
const Mode mode,
const double ext,
const double m_hShift,
const double m_vShift,
@@ -140,8 +154,8 @@ public:
double getExtend() const;
void setFlip(const bool f);
bool getFlip() const;
void setType(const int type) { m_type = type; };
int getType() const { return m_type; }
void setType(const Type type) { m_type = type; };
Type getType() const { return m_type; }
Base::Vector3d m_start;
Base::Vector3d m_end;
@@ -150,8 +164,8 @@ public:
std::vector<std::string> m_faces;
std::vector<std::string> m_edges;
std::vector<std::string> m_verts;
int m_type; // CLTYPE enum
int m_mode; // CLMODE enum
Type m_type;
Mode m_mode;
double m_hShift;
double m_vShift;
double m_rotate;