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

Resolved issue #684. Proposal: Add option to only show outer edges on detail.

Browse Source 
--HG--
branch : develop
This commit is contained in:
Roman Telezhynskyi 2017-05-16 15:16:50 +03:00
parent 13a93ef5df
commit 56dd8ef3b6
17 changed files with 89 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
ChangeLog.txt
View File

@ -1,6 +1,7 @@
# Version 0.6.0
- [#682] New feature. Export increments to Excel .csv.
- [#681] Enhance feature: Dashed line options for curves, arcs, etc.
- [#684] Proposal: Add option to only show outer edges on detail.
# Version 0.5.1
- [#683] Tool Seam allowance's dialog is off screen on small resolutions.

2
src/app/valentina/dialogs/configpages/preferencespatternpage.cpp
View File

@ -54,6 +54,7 @@ PreferencesPatternPage::PreferencesPatternPage(QWidget *parent)
ui->forbidFlippingCheck->setChecked(qApp->ValentinaSettings()->GetForbidWorkpieceFlipping());
ui->doublePassmarkCheck->setChecked(qApp->ValentinaSettings()->IsDoublePassmark());
ui->checkBoxHideMainPath->setChecked(qApp->ValentinaSettings()->IsHideMainPath());
}
//---------------------------------------------------------------------------------------------------------------------
@ -79,6 +80,7 @@ void PreferencesPatternPage::Apply()
settings->SetUndoCount(ui->undoCount->value());
settings->SetForbidWorkpieceFlipping(ui->forbidFlippingCheck->isChecked());
settings->SetHideMainPath(ui->checkBoxHideMainPath->isChecked());
if (settings->IsDoublePassmark() != ui->doublePassmarkCheck->isChecked())
{

10
src/app/valentina/dialogs/configpages/preferencespatternpage.ui
View File

@ -123,6 +123,16 @@
</property>
</widget>
</item>
<item>
<widget class="QCheckBox" name="checkBoxHideMainPath">
<property name="toolTip">
<string>By default hide the main path if the seam allowance was enabled</string>
</property>
<property name="text">
<string>Hide main path</string>
</property>
</widget>
</item>
</layout>
</widget>
</item>

2
src/app/valentina/xml/vpattern.cpp
View File

@ -703,6 +703,8 @@ void VPattern::ParseDetailElement(QDomElement &domElement, const Document &parse
detail.SetMx(qApp->toPixel(GetParametrDouble(domElement, AttrMx, "0.0")));
detail.SetMy(qApp->toPixel(GetParametrDouble(domElement, AttrMy, "0.0")));
detail.SetSeamAllowance(GetParametrBool(domElement, VToolSeamAllowance::AttrSeamAllowance, falseStr));
detail.SetHideMainPath(GetParametrBool(domElement, VToolSeamAllowance::AttrHideMainPath,
QString().setNum(qApp->ValentinaSettings()->IsHideMainPath())));
detail.SetSeamAllowanceBuiltIn(GetParametrBool(domElement, VToolSeamAllowance::AttrSeamAllowanceBuiltIn,
falseStr));
detail.SetForbidFlipping(GetParametrBool(domElement, VToolSeamAllowance::AttrForbidFlipping,

1
src/libs/ifc/schema/pattern/v0.5.0.xsd
View File

@ -609,6 +609,7 @@
<xs:attribute name="seamAllowanceBuiltIn" type="xs:boolean"/>
<xs:attribute name="united" type="xs:boolean"/>
<xs:attribute name="closed" type="xs:unsignedInt"/>
<xs:attribute name="hideMainPath" type="xs:boolean"/>
</xs:complexType>
</xs:element>
</xs:sequence>

12
src/libs/vlayout/vabstractpiece.cpp
View File

@ -111,6 +111,18 @@ void VAbstractPiece::SetSeamAllowanceBuiltIn(bool value)
d->m_seamAllowanceBuiltIn = value;
}
//---------------------------------------------------------------------------------------------------------------------
bool VAbstractPiece::IsHideMainPath() const
{
return d->m_hideMainPath;
}
//---------------------------------------------------------------------------------------------------------------------
void VAbstractPiece::SetHideMainPath(bool value)
{
d->m_hideMainPath = value;
}
//---------------------------------------------------------------------------------------------------------------------
qreal VAbstractPiece::GetSAWidth() const
{

3
src/libs/vlayout/vabstractpiece.h
View File

@ -164,6 +164,9 @@ public:
bool IsSeamAllowanceBuiltIn() const;
void SetSeamAllowanceBuiltIn(bool value);
bool IsHideMainPath() const;
void SetHideMainPath(bool value);
qreal GetSAWidth() const;
void SetSAWidth(qreal value);

3
src/libs/vlayout/vabstractpiece_p.h
View File

@ -47,6 +47,7 @@ public:
m_forbidFlipping(false),
m_seamAllowance(false),
m_seamAllowanceBuiltIn(false),
m_hideMainPath(false),
m_width(0)
{}
@ -56,6 +57,7 @@ public:
m_forbidFlipping(piece.m_forbidFlipping),
m_seamAllowance(piece.m_seamAllowance),
m_seamAllowanceBuiltIn(piece.m_seamAllowanceBuiltIn),
m_hideMainPath(piece.m_hideMainPath),
m_width(piece.m_width)
{}
@ -66,6 +68,7 @@ public:
bool m_forbidFlipping;
bool m_seamAllowance;
bool m_seamAllowanceBuiltIn;
bool m_hideMainPath;
qreal m_width;
private:

17
src/libs/vlayout/vlayoutpiece.cpp
View File

@ -382,7 +382,7 @@ VLayoutPiece::~VLayoutPiece()
VLayoutPiece VLayoutPiece::Create(const VPiece &piece, const VContainer *pattern)
{
VLayoutPiece det;
det.SetCountourPoints(piece.MainPathPoints(pattern));
det.SetCountourPoints(piece.MainPathPoints(pattern), piece.IsHideMainPath());
det.SetSeamAllowancePoints(piece.SeamAllowancePoints(pattern), piece.IsSeamAllowance(),
piece.IsSeamAllowanceBuiltIn());
det.SetInternalPaths(ConvertInternalPaths(piece, pattern));
@ -429,9 +429,10 @@ QVector<QPointF> VLayoutPiece::GetContourPoints() const
}
//---------------------------------------------------------------------------------------------------------------------
void VLayoutPiece::SetCountourPoints(const QVector<QPointF> &points)
void VLayoutPiece::SetCountourPoints(const QVector<QPointF> &points, bool hideMainPath)
{
d->contour = RemoveDublicates(RoundPoints(points), false);
SetHideMainPath(hideMainPath);
}
//---------------------------------------------------------------------------------------------------------------------
@ -862,12 +863,16 @@ QPainterPath VLayoutPiece::ContourPath() const
// contour
QVector<QPointF> points = GetContourPoints();
path.moveTo(points.at(0));
for (qint32 i = 1; i < points.count(); ++i)
if (not IsHideMainPath() || not IsSeamAllowance() || IsSeamAllowanceBuiltIn())
{
path.lineTo(points.at(i));
path.moveTo(points.at(0));
for (qint32 i = 1; i < points.count(); ++i)
{
path.lineTo(points.at(i));
}
path.lineTo(points.at(0));
}
path.lineTo(points.at(0));
// seam allowance
if (IsSeamAllowance())

2
src/libs/vlayout/vlayoutpiece.h
View File

@ -73,7 +73,7 @@ public:
static VLayoutPiece Create(const VPiece &piece, const VContainer *pattern);
QVector<QPointF> GetContourPoints() const;
void SetCountourPoints(const QVector<QPointF> &points);
void SetCountourPoints(const QVector<QPointF> &points, bool hideMainPath = false);
QVector<QPointF> GetSeamAllowancePoints() const;
void SetSeamAllowancePoints(const QVector<QPointF> &points, bool seamAllowance = true,

13
src/libs/vmisc/vcommonsettings.cpp
View File

@ -61,6 +61,7 @@ const QString settingConfigurationToolBarStyle = QStringLiteral("confi
const QString settingPatternUser = QStringLiteral("pattern/user");
const QString settingPatternUndo = QStringLiteral("pattern/undo");
const QString settingPatternForbidFlipping = QStringLiteral("pattern/forbidFlipping");
const QString settingPatternHideMainPath = QStringLiteral("pattern/hideMainPath");
const QString settingDoublePassmark = QStringLiteral("pattern/doublePassmark");
const QString settingGeneralRecentFileList = QStringLiteral("recentFileList");
@ -606,6 +607,18 @@ void VCommonSettings::SetForbidWorkpieceFlipping(bool value)
setValue(settingPatternForbidFlipping, value);
}
//---------------------------------------------------------------------------------------------------------------------
bool VCommonSettings::IsHideMainPath() const
{
return value(settingPatternHideMainPath, false).toBool();
}
//---------------------------------------------------------------------------------------------------------------------
void VCommonSettings::SetHideMainPath(bool value)
{
setValue(settingPatternHideMainPath, value);
}
//---------------------------------------------------------------------------------------------------------------------
bool VCommonSettings::IsDoublePassmark() const
{

3
src/libs/vmisc/vcommonsettings.h
View File

@ -133,6 +133,9 @@ public:
bool GetForbidWorkpieceFlipping() const;
void SetForbidWorkpieceFlipping(bool value);
bool IsHideMainPath() const;
void SetHideMainPath(bool value);
bool IsDoublePassmark() const;
void SetDoublePassmark(bool value);

1
src/libs/vpatterndb/vpiece.cpp
View File

@ -1105,6 +1105,7 @@ QVector<QLineF> VPiece::CreatePassmark(const QVector<VPieceNode> &path, int prev
QVector<QLineF> lines;
lines += SAPassmark(path, previousSAPoint, passmarkSAPoint, nextSAPoint, data, passmarkIndex);
if (qApp->Settings()->IsDoublePassmark()
&& not IsHideMainPath()
&& path.at(passmarkIndex).IsMainPathNode()
&& path.at(passmarkIndex).GetPassmarkAngleType() != PassmarkAngleType::Intersection
&& path.at(passmarkIndex).IsShowSecondPassmark())

2
src/libs/vtools/dialogs/tools/piece/dialogseamallowance.cpp
View File

@ -200,6 +200,7 @@ void DialogSeamAllowance::SetPiece(const VPiece &piece)
NewMainPathItem(piece.GetPath().at(i));
}
uiTabPaths->checkBoxHideMainPath->setChecked(piece.IsHideMainPath());
uiTabPaths->listWidgetCustomSA->blockSignals(true);
uiTabPaths->listWidgetCustomSA->clear();
for (int i = 0; i < piece.GetCustomSARecords().size(); ++i)
@ -2079,6 +2080,7 @@ VPiece DialogSeamAllowance::CreatePiece() const
piece.SetForbidFlipping(uiTabPaths->checkBoxForbidFlipping->isChecked());
piece.SetSeamAllowance(uiTabPaths->checkBoxSeams->isChecked());
piece.SetSeamAllowanceBuiltIn(uiTabPaths->checkBoxBuiltIn->isChecked());
piece.SetHideMainPath(uiTabPaths->checkBoxHideMainPath->isChecked());
piece.SetName(uiTabLabels->lineEditName->text());
piece.SetMx(m_mx);
piece.SetMy(m_my);

10
src/libs/vtools/dialogs/tools/piece/tabs/tabpaths.ui
View File

@ -83,6 +83,16 @@
</property>
</widget>
</item>
<item>
<widget class="QCheckBox" name="checkBoxHideMainPath">
<property name="toolTip">
<string>Hide the main path if the seam allowance is enabled</string>
</property>
<property name="text">
<string>Hide main path</string>
</property>
</widget>
</item>
<item>
<widget class="QListWidget" name="listWidgetMainPath">
<property name="dragDropMode">

14
src/libs/vtools/tools/vtoolseamallowance.cpp
View File

@ -73,6 +73,7 @@ const QString VToolSeamAllowance::TagPins = QStringLiteral("pins");
const QString VToolSeamAllowance::AttrVersion = QStringLiteral("version");
const QString VToolSeamAllowance::AttrForbidFlipping = QStringLiteral("forbidFlipping");
const QString VToolSeamAllowance::AttrSeamAllowance = QStringLiteral("seamAllowance");
const QString VToolSeamAllowance::AttrHideMainPath = QStringLiteral("hideMainPath");
const QString VToolSeamAllowance::AttrSeamAllowanceBuiltIn = QStringLiteral("seamAllowanceBuiltIn");
const QString VToolSeamAllowance::AttrHeight = QStringLiteral("height");
const QString VToolSeamAllowance::AttrUnited = QStringLiteral("united");
@ -218,6 +219,7 @@ void VToolSeamAllowance::AddAttributes(VAbstractPattern *doc, QDomElement &domEl
doc->SetAttribute(domElement, AttrInLayout, piece.IsInLayout());
doc->SetAttribute(domElement, AttrForbidFlipping, piece.IsForbidFlipping());
doc->SetAttribute(domElement, AttrSeamAllowance, piece.IsSeamAllowance());
doc->SetAttribute(domElement, AttrHideMainPath, piece.IsHideMainPath());
const bool saBuiltIn = piece.IsSeamAllowanceBuiltIn();
if (saBuiltIn)
@ -1164,7 +1166,17 @@ void VToolSeamAllowance::RefreshGeometry()
this->setFlag(QGraphicsItem::ItemSendsGeometryChanges, false);
const VPiece detail = VAbstractTool::data.GetPiece(id);
QPainterPath path = detail.MainPathPath(this->getData());
QPainterPath path;
if (not detail.IsHideMainPath() || not detail.IsSeamAllowance() || detail.IsSeamAllowanceBuiltIn())
{
m_seamAllowance->setBrush(QBrush(Qt::Dense7Pattern));
path = detail.MainPathPath(this->getData());
}
else
{
m_seamAllowance->setBrush(QBrush(Qt::NoBrush)); // Disable if the main path was hidden
}
{
QPainterPath mainPath = path;

1
src/libs/vtools/tools/vtoolseamallowance.h
View File

@ -63,6 +63,7 @@ public:
static const QString AttrVersion;
static const QString AttrForbidFlipping;
static const QString AttrSeamAllowance;
static const QString AttrHideMainPath;
static const QString AttrSeamAllowanceBuiltIn;
static const QString AttrHeight;
static const QString AttrUnited;