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

Fixed schema and undo bug

Browse Source 
--HG--
branch : feature
This commit is contained in:
BojanKverh 2016-06-27 20:51:29 +02:00
parent 6577d82771
commit 2b7f056566
3 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/libs/ifc/schema.qrc
View File

@ -16,6 +16,7 @@
<file>schema/pattern/v0.3.0.xsd</file>
<file>schema/pattern/v0.3.1.xsd</file>
<file>schema/pattern/v0.3.2.xsd</file>
<file>schema/pattern/v0.3.3.xsd</file>
<file>schema/standard_measurements/v0.3.0.xsd</file>
<file>schema/standard_measurements/v0.4.0.xsd</file>
<file>schema/standard_measurements/v0.4.1.xsd</file>
@ -25,6 +26,5 @@
<file>schema/individual_measurements/v0.3.1.xsd</file>
<file>schema/individual_measurements/v0.3.2.xsd</file>
<file>schema/individual_measurements/v0.3.3.xsd</file>
<file>schema/pattern/v0.3.3.xsd</file>
</qresource>
</RCC>

3
src/libs/vtools/tools/vtooldetail.cpp
View File

@ -137,6 +137,8 @@ VToolDetail::VToolDetail(VAbstractPattern *doc, VContainer *data, const quint32
connect(patternInfo, &VTextGraphicsItem::SignalResized, this, &VToolDetail::SaveResizePattern);
connect(patternInfo, &VTextGraphicsItem::SignalShrink, this, &VToolDetail::UpdateAll);
connect(doc, &VAbstractPattern::patternChanged, this, &VToolDetail::UpdatePatternInfo);
connect(doc, &VAbstractPattern::CheckLayout, this, &VToolDetail::UpdateLabel);
UpdateLabel();
UpdatePatternInfo();
}
@ -648,6 +650,7 @@ void VToolDetail::UpdateLabel()
{
const VDetail detail = VAbstractTool::data.GetDetail(id);
qDebug() << "Update label";
const VPatternPieceData& data = detail.GetPatternPieceData();
if (data.GetLetter().isEmpty() == false || data.GetName().isEmpty() == false || data.GetMCPCount() > 0)
{

4
src/libs/vtools/tools/vtooldetail.h
View File

@ -106,10 +106,10 @@ protected:
virtual void contextMenuEvent ( QGraphicsSceneContextMenuEvent * event ) Q_DECL_OVERRIDE;
virtual void keyReleaseEvent(QKeyEvent * event) Q_DECL_OVERRIDE;
virtual void SetVisualization() Q_DECL_OVERRIDE {}
virtual void UpdateLabel();
virtual void UpdatePatternInfo();
protected slots:
virtual void UpdateLabel();
virtual void UpdatePatternInfo();
virtual void SaveMoveDetail(QPointF ptPos);
virtual void SaveResizeDetail(qreal dLabelW, int iFontSize);
virtual void SaveMovePattern(QPointF ptPos);