diff --git a/src/libs/vgeometry/vgeometrydef.h b/src/libs/vgeometry/vgeometrydef.h index 670214621..c66510b7d 100644 --- a/src/libs/vgeometry/vgeometrydef.h +++ b/src/libs/vgeometry/vgeometrydef.h @@ -97,4 +97,12 @@ private: }; Q_DECLARE_METATYPE(VLayoutPassmark) +constexpr qreal accuracyPointOnLine = (0.12/*mm*/ / 25.4) * PrintDPI; + +Q_REQUIRED_RESULT static inline bool VFuzzyComparePoints(const QPointF &p1, const QPointF &p2); +static inline bool VFuzzyComparePoints(const QPointF &p1, const QPointF &p2) +{ + return QLineF(p1, p2).length() <= accuracyPointOnLine; +} + #endif // VGEOMETRYDEF_H diff --git a/src/libs/vlayout/vbestsquare.cpp b/src/libs/vlayout/vbestsquare.cpp index fdf06bbf6..4eed145a7 100644 --- a/src/libs/vlayout/vbestsquare.cpp +++ b/src/libs/vlayout/vbestsquare.cpp @@ -28,7 +28,7 @@ #include "vbestsquare.h" #include "vbestsquare_p.h" -#include "../vmisc/def.h" +#include "../vgeometry/vgeometrydef.h" #include diff --git a/src/libs/vmisc/def.h b/src/libs/vmisc/def.h index d71440bb5..6067ae839 100644 --- a/src/libs/vmisc/def.h +++ b/src/libs/vmisc/def.h @@ -642,14 +642,6 @@ Q_DECL_RELAXED_CONSTEXPR static inline bool VFuzzyComparePossibleNulls(double p1 } } -constexpr qreal accuracyPointOnLine = (0.12/*mm*/ / 25.4) * PrintDPI; - -Q_REQUIRED_RESULT static inline bool VFuzzyComparePoints(const QPointF &p1, const QPointF &p2); -static inline bool VFuzzyComparePoints(const QPointF &p1, const QPointF &p2) -{ - return QLineF(p1, p2).length() <= accuracyPointOnLine; -} - /** * @brief The CustomSA struct contains record about custom seam allowanse (SA). */