aw/valentina
1
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Refactoring.

Browse Source
This commit is contained in:
Roman Telezhynskyi 2022-08-16 16:01:17 +03:00
parent 5b9c1b1d55
commit 53905b624a
2 changed files with 28 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
src/libs/vlayout/vposition.cpp
View File

@ -51,16 +51,9 @@
#include <functional> #include <functional>
#include "../vmisc/def.h" #include "../vmisc/def.h"
#include "../vmisc/vmath.h"
#include "../ifc/exception/vexception.h" #include "../ifc/exception/vexception.h"
#include "../vpatterndb/floatItemData/floatitemdef.h" #include "../vpatterndb/floatItemData/floatitemdef.h"
#if QT_VERSION < QT_VERSION_CHECK(5, 12, 0)
#include "../vmisc/backport/qscopeguard.h"
#else
#include <QScopeGuard>
#endif
namespace namespace
{ {
#ifdef LAYOUT_DEBUG #ifdef LAYOUT_DEBUG
@ -140,17 +133,12 @@ QPainterPath DumpDetails(const QVector<VLayoutPiece> &details)
#endif #endif
} //anonymous namespace } //anonymous namespace
//---------------------------------------------------------------------------------------------------------------------
VPosition::VPosition()
{}
//--------------------------------------------------------------------------------------------------------------------- //---------------------------------------------------------------------------------------------------------------------
VPosition::VPosition(const VPositionData &data, std::atomic_bool *stop, bool saveLength) VPosition::VPosition(const VPositionData &data, std::atomic_bool *stop, bool saveLength)
: m_isValid(true), : m_isValid(true),
m_bestResult(VBestSquare(data.gContour.GetSize(), saveLength, data.isOriginPaperOrientationPortrait)), m_bestResult(VBestSquare(data.gContour.GetSize(), saveLength, data.isOriginPaperOrientationPortrait)),
m_data(data), m_data(data),
stop(stop), stop(stop)
angle_between(0)
{ {
if (m_data.rotationNumber > 360 || m_data.rotationNumber < 1) if (m_data.rotationNumber > 360 || m_data.rotationNumber < 1)
{ {
@ -202,13 +190,13 @@ void VPosition::run()
} }
//--------------------------------------------------------------------------------------------------------------------- //---------------------------------------------------------------------------------------------------------------------
VBestSquare VPosition::getBestResult() const auto VPosition::getBestResult() const -> VBestSquare
{ {
return m_bestResult; return m_bestResult;
} }
//--------------------------------------------------------------------------------------------------------------------- //---------------------------------------------------------------------------------------------------------------------
VBestSquare VPosition::ArrangeDetail(const VPositionData &data, std::atomic_bool *stop, bool saveLength) auto VPosition::ArrangeDetail(const VPositionData &data, std::atomic_bool *stop, bool saveLength) -> VBestSquare
{ {
VBestSquare bestResult(data.gContour.GetSize(), saveLength, data.isOriginPaperOrientationPortrait); VBestSquare bestResult(data.gContour.GetSize(), saveLength, data.isOriginPaperOrientationPortrait);
@ -317,7 +305,7 @@ void VPosition::SaveCandidate(VBestSquare &bestResult, const VLayoutPiece &detai
} }
//--------------------------------------------------------------------------------------------------------------------- //---------------------------------------------------------------------------------------------------------------------
bool VPosition::CheckCombineEdges(VLayoutPiece &detail, int j, int &dEdge) auto VPosition::CheckCombineEdges(VLayoutPiece &detail, int j, int &dEdge) -> bool
{ {
const QLineF globalEdge = m_data.gContour.GlobalEdge(j); const QLineF globalEdge = m_data.gContour.GlobalEdge(j);
bool flagMirror = false; bool flagMirror = false;
@ -398,7 +386,7 @@ bool VPosition::CheckCombineEdges(VLayoutPiece &detail, int j, int &dEdge)
} }
//--------------------------------------------------------------------------------------------------------------------- //---------------------------------------------------------------------------------------------------------------------
bool VPosition::CheckRotationEdges(VLayoutPiece &detail, int j, int dEdge, qreal angle) const auto VPosition::CheckRotationEdges(VLayoutPiece &detail, int j, int dEdge, qreal angle) const -> bool
{ {
const QLineF globalEdge = m_data.gContour.GlobalEdge(j); const QLineF globalEdge = m_data.gContour.GlobalEdge(j);
bool flagSquare = false; bool flagSquare = false;
@ -462,7 +450,7 @@ void VPosition::RotateOnAngle(qreal angle)
} }
//--------------------------------------------------------------------------------------------------------------------- //---------------------------------------------------------------------------------------------------------------------
VPosition::CrossingType VPosition::Crossing(const VLayoutPiece &detail) const auto VPosition::Crossing(const VLayoutPiece &detail) const -> VPosition::CrossingType
{ {
if (m_data.positionsCache.isEmpty()) if (m_data.positionsCache.isEmpty())
{ {
@ -478,7 +466,7 @@ VPosition::CrossingType VPosition::Crossing(const VLayoutPiece &detail) const
const QRectF detailBoundingRect = VLayoutPiece::BoundingRect(contourPoints); const QRectF detailBoundingRect = VLayoutPiece::BoundingRect(contourPoints);
const QPainterPath contourPath = VAbstractPiece::PainterPath(contourPoints); const QPainterPath contourPath = VAbstractPiece::PainterPath(contourPoints);
for(auto &position : m_data.positionsCache) for(const auto &position : m_data.positionsCache)
{ {
if (position.boundingRect.intersects(layoutBoundingRect) || position.boundingRect.contains(detailBoundingRect) if (position.boundingRect.intersects(layoutBoundingRect) || position.boundingRect.contains(detailBoundingRect)
|| detailBoundingRect.contains(position.boundingRect)) || detailBoundingRect.contains(position.boundingRect))
@ -495,7 +483,7 @@ VPosition::CrossingType VPosition::Crossing(const VLayoutPiece &detail) const
} }
//--------------------------------------------------------------------------------------------------------------------- //---------------------------------------------------------------------------------------------------------------------
bool VPosition::SheetContains(const QRectF &rect) const auto VPosition::SheetContains(const QRectF &rect) const -> bool
{ {
const QRectF bRect(-accuracyPointOnLine, -accuracyPointOnLine, m_data.gContour.GetWidth()+accuracyPointOnLine, const QRectF bRect(-accuracyPointOnLine, -accuracyPointOnLine, m_data.gContour.GetWidth()+accuracyPointOnLine,
m_data.gContour.GetHeight()+accuracyPointOnLine); m_data.gContour.GetHeight()+accuracyPointOnLine);
@ -535,13 +523,15 @@ void VPosition::RotateEdges(VLayoutPiece &detail, const QLineF &globalEdge, int
//--------------------------------------------------------------------------------------------------------------------- //---------------------------------------------------------------------------------------------------------------------
void VPosition::Rotate(int number) void VPosition::Rotate(int number)
{ {
const qreal step = 360/number; const qreal step = 360.0/number;
qreal startAngle = 0; qreal startAngle = 0;
if (VFuzzyComparePossibleNulls(angle_between, 360)) if (VFuzzyComparePossibleNulls(angle_between, 360))
{ {
startAngle = step; startAngle = step;
} }
for (qreal angle = startAngle; angle < 360; angle = angle+step)
qreal angle = startAngle;
while(angle < 360)
{ {
if (stop->load()) if (stop->load())
{ {
@ -549,6 +539,8 @@ void VPosition::Rotate(int number)
} }
RotateOnAngle(angle); RotateOnAngle(angle);
angle = angle+step;
} }
} }

25
src/libs/vlayout/vposition.h
View File

@ -67,18 +67,21 @@ QT_WARNING_DISABLE_GCC("-Weffc++")
class VPosition class VPosition
{ {
public: public:
VPosition(); VPosition() = default;
VPosition(const VPositionData &data, std::atomic_bool *stop, bool saveLength); VPosition(const VPositionData &data, std::atomic_bool *stop, bool saveLength);
VPosition(const VPosition&) = default; VPosition(const VPosition&) = default;
VPosition& operator=(const VPosition&) = default; auto operator=(const VPosition&) -> VPosition& = default;
VPosition& operator=(VPosition&&) = default; #ifdef Q_COMPILER_RVALUE_REFS
VPosition(VPosition&&) = default;
auto operator=(VPosition&&) -> VPosition& = default;
#endif
~VPosition()= default; ~VPosition()= default;
void run(); void run();
VBestSquare getBestResult() const; auto getBestResult() const -> VBestSquare;
static VBestSquare ArrangeDetail(const VPositionData &data, std::atomic_bool *stop, bool saveLength); static auto ArrangeDetail(const VPositionData &data, std::atomic_bool *stop, bool saveLength) -> VBestSquare;
#ifdef LAYOUT_DEBUG #ifdef LAYOUT_DEBUG
static void DumpFrame(const VContour &contour, const VLayoutPiece &detail, QMutex *mutex, static void DumpFrame(const VContour &contour, const VLayoutPiece &detail, QMutex *mutex,
@ -111,13 +114,13 @@ private:
void SaveCandidate(VBestSquare &bestResult, const VLayoutPiece &detail, int globalI, int detJ, BestFrom type); void SaveCandidate(VBestSquare &bestResult, const VLayoutPiece &detail, int globalI, int detJ, BestFrom type);
bool CheckCombineEdges(VLayoutPiece &detail, int j, int &dEdge); auto CheckCombineEdges(VLayoutPiece &detail, int j, int &dEdge) -> bool;
bool CheckRotationEdges(VLayoutPiece &detail, int j, int dEdge, qreal angle) const; auto CheckRotationEdges(VLayoutPiece &detail, int j, int dEdge, qreal angle) const -> bool;
void RotateOnAngle(qreal angle); void RotateOnAngle(qreal angle);
CrossingType Crossing(const VLayoutPiece &detail) const; auto Crossing(const VLayoutPiece &detail) const -> CrossingType;
bool SheetContains(const QRectF &rect) const; auto SheetContains(const QRectF &rect) const -> bool;
void CombineEdges(VLayoutPiece &detail, const QLineF &globalEdge, int dEdge); void CombineEdges(VLayoutPiece &detail, const QLineF &globalEdge, int dEdge);
static void RotateEdges(VLayoutPiece &detail, const QLineF &globalEdge, int dEdge, qreal angle); static void RotateEdges(VLayoutPiece &detail, const QLineF &globalEdge, int dEdge, qreal angle);
@ -125,7 +128,7 @@ private:
void Rotate(int number); void Rotate(int number);
void FollowGrainline(); void FollowGrainline();
QLineF FabricGrainline() const; auto FabricGrainline() const -> QLineF;
void FindBestPosition(); void FindBestPosition();
}; };
@ -137,7 +140,7 @@ QT_WARNING_POP
* @brief VPosition::FabricGrainline return fabric gainline accoding to paper orientation * @brief VPosition::FabricGrainline return fabric gainline accoding to paper orientation
* @return fabric gainline line * @return fabric gainline line
*/ */
inline QLineF VPosition::FabricGrainline() const inline auto VPosition::FabricGrainline() const -> QLineF
{ {
return m_data.isOriginPaperOrientationPortrait ? QLineF(10, 10, 10, 100) : QLineF(10, 10, 100, 10); return m_data.isOriginPaperOrientationPortrait ? QLineF(10, 10, 10, 100) : QLineF(10, 10, 100, 10);
} }