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

Removed dialog Detail.

Browse Source 
--HG--
branch : feature
This commit is contained in:
Roman Telezhynskyi 2017-01-12 19:17:13 +02:00
parent 297b73a951
commit 29490b9e66
6 changed files with 92 additions and 2410 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/libs/vtools/dialogs/dialogs.pri
View File

@ -11,7 +11,6 @@ HEADERS += \
$$PWD/tools/dialogcutarc.h \ $$PWD/tools/dialogcutarc.h \
$$PWD/tools/dialogcutspline.h \ $$PWD/tools/dialogcutspline.h \
$$PWD/tools/dialogcutsplinepath.h \ $$PWD/tools/dialogcutsplinepath.h \
$$PWD/tools/dialogdetail.h \
$$PWD/tools/dialogendline.h \ $$PWD/tools/dialogendline.h \
$$PWD/tools/dialogheight.h \ $$PWD/tools/dialogheight.h \
$$PWD/tools/dialogline.h \ $$PWD/tools/dialogline.h \
@ -55,7 +54,6 @@ SOURCES += \
$$PWD/tools/dialogcutarc.cpp \ $$PWD/tools/dialogcutarc.cpp \
$$PWD/tools/dialogcutspline.cpp \ $$PWD/tools/dialogcutspline.cpp \
$$PWD/tools/dialogcutsplinepath.cpp \ $$PWD/tools/dialogcutsplinepath.cpp \
$$PWD/tools/dialogdetail.cpp \
$$PWD/tools/dialogendline.cpp \ $$PWD/tools/dialogendline.cpp \
$$PWD/tools/dialogheight.cpp \ $$PWD/tools/dialogheight.cpp \
$$PWD/tools/dialogline.cpp \ $$PWD/tools/dialogline.cpp \
@ -99,7 +97,6 @@ FORMS += \
$$PWD/tools/dialogcutarc.ui \ $$PWD/tools/dialogcutarc.ui \
$$PWD/tools/dialogcutspline.ui \ $$PWD/tools/dialogcutspline.ui \
$$PWD/tools/dialogcutsplinepath.ui \ $$PWD/tools/dialogcutsplinepath.ui \
$$PWD/tools/dialogdetail.ui \
$$PWD/tools/dialogendline.ui \ $$PWD/tools/dialogendline.ui \
$$PWD/tools/dialogheight.ui \ $$PWD/tools/dialogheight.ui \
$$PWD/tools/dialogline.ui \ $$PWD/tools/dialogline.ui \

1
src/libs/vtools/dialogs/tooldialogs.h
View File

@ -33,7 +33,6 @@
#include "tools/dialogarc.h" #include "tools/dialogarc.h"
#include "tools/dialogarcwithlength.h" #include "tools/dialogarcwithlength.h"
#include "tools/dialogbisector.h" #include "tools/dialogbisector.h"
#include "tools/dialogdetail.h"
#include "tools/dialogseamallowance.h" #include "tools/dialogseamallowance.h"
#include "tools/dialogendline.h" #include "tools/dialogendline.h"
#include "tools/dialogline.h" #include "tools/dialogline.h"

1046
src/libs/vtools/dialogs/tools/dialogdetail.cpp
View File

File diff suppressed because it is too large Load Diff

151
src/libs/vtools/dialogs/tools/dialogdetail.h
View File

@ -1,151 +0,0 @@
/************************************************************************
**
** @file dialogdetail.h
** @author Roman Telezhynskyi <dismine(at)gmail.com>
** @date November 15, 2013
**
** @brief
** @copyright
** This source code is part of the Valentine project, a pattern making
** program, whose allow create and modeling patterns of clothing.
** Copyright (C) 2013-2015 Valentina project
** <https://bitbucket.org/dismine/valentina> All Rights Reserved.
**
** Valentina is free software: you can redistribute it and/or modify
** it under the terms of the GNU General Public License as published by
** the Free Software Foundation, either version 3 of the License, or
** (at your option) any later version.
**
** Valentina is distributed in the hope that it will be useful,
** but WITHOUT ANY WARRANTY; without even the implied warranty of
** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
** GNU General Public License for more details.
**
** You should have received a copy of the GNU General Public License
** along with Valentina. If not, see <http://www.gnu.org/licenses/>.
**
*************************************************************************/
#ifndef DIALOGDETAIL_H
#define DIALOGDETAIL_H
#include <qcompilerdetection.h>
#include <QMetaObject>
#include <QObject>
#include <QString>
#include <QStringList>
#include <QtGlobal>
#include "../vmisc/def.h"
#include "../vpatterndb/vdetail.h"
#include "../vpatterndb/vpatterninfogeometry.h"
#include "../vpatterndb/vpatternpiecedata.h"
#include "../vpatterndb/vgrainlinegeometry.h"
#include "dialogtool.h"
#include "ui_dialogdetail.h"
class QWidget;
class VContainer;
/**
* @brief The DialogDetail class dialog for ToolDetai. Help create detail and edit option.
*/
class DialogDetail : public DialogTool
{
Q_OBJECT
public:
DialogDetail(const VContainer *data, const quint32 &toolId, QWidget *parent = nullptr);
VDetail getDetail() const;
void setDetail(const VDetail &value);
public slots:
virtual void ChosenObject(quint32 id, const SceneObject &type) Q_DECL_OVERRIDE;
void BiasXChanged(qreal d);
void BiasYChanged(qreal d);
void AlowenceChanged(qreal d);
void ClickedSeams(bool checked);
void ClickedClosed(bool checked);
void ClickedReverse(bool checked);
void ObjectChanged(int row);
void DeleteItem();
void ScrollUp();
void ScrollDown();
protected:
/**
* @brief SaveData Put dialog data in local variables
*/
virtual void SaveData() Q_DECL_OVERRIDE;
virtual void CheckState() Q_DECL_OVERRIDE;
protected slots:
void UpdateList();
void AddUpdate();
void Cancel();
void Remove();
private slots:
void NameDetailChanged();
void MaterialChanged();
private:
/** @brief ui keeps information about user interface */
Ui::DialogDetail ui;
/** @brief detail detail */
VDetail detail;
/** @brief supplement keep option supplement of seams */
bool supplement;
/** @brief closed keep option about equdistant (closed or not) */
bool closed;
bool flagWidth;
bool m_bAddMode;
QStringList m_qslMaterials;
QStringList m_qslPlacements;
// temporary container for Material/Cut/Placement 3-tuples
MCPContainer m_conMCP;
VPatternPieceData m_oldData;
VPatternInfoGeometry m_oldGeom;
VGrainlineGeometry m_oldGrainline;
int m_iRotBaseHeight;
int m_iLenBaseHeight;
bool DetailIsValid() const;
bool FirstPointEqualLast() const;
bool DetailIsClockwise() const;
void NewItem(quint32 id, const Tool &typeTool, const NodeDetail &typeNode,
qreal mx = 0, qreal my = 0, bool reverse = false);
VDetail CreateDetail() const;
void ValidObjects(bool value);
void EnableObjectGUI(bool value);
void ClearFields();
quint32 RowId(int i) const;
private slots:
void UpdateValues();
void SetAddMode();
void SetEditMode();
void EnableGrainlineRotation();
void EditFormula();
void DeployRotation();
void DeployLength();
void ResetWarning();
};
//---------------------------------------------------------------------------------------------------------------------
/**
* @brief getDetails return detail
* @return detail
*/
inline VDetail DialogDetail::getDetail() const
{
return detail;
}
#endif // DIALOGDETAIL_H

1116
src/libs/vtools/dialogs/tools/dialogdetail.ui
View File

File diff suppressed because it is too large Load Diff

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

@ -66,7 +66,6 @@
#include <QtDebug> #include <QtDebug>
#include <new> #include <new>
#include "../dialogs/tools/dialogdetail.h"
#include "../dialogs/tools/dialogtool.h" #include "../dialogs/tools/dialogtool.h"
#include "../ifc/exception/vexception.h" #include "../ifc/exception/vexception.h"
#include "../ifc/xml/vdomdocument.h" #include "../ifc/xml/vdomdocument.h"
@ -236,9 +235,9 @@ VToolDetail::~VToolDetail()
void VToolDetail::setDialog() void VToolDetail::setDialog()
{ {
SCASSERT(dialog != nullptr) SCASSERT(dialog != nullptr)
DialogDetail *dialogTool = qobject_cast<DialogDetail*>(dialog); // DialogDetail *dialogTool = qobject_cast<DialogDetail*>(dialog);
SCASSERT(dialogTool != nullptr) // SCASSERT(dialogTool != nullptr)
dialogTool->setDetail(VAbstractTool::data.GetDetail(id)); // dialogTool->setDetail(VAbstractTool::data.GetDetail(id));
} }
//--------------------------------------------------------------------------------------------------------------------- //---------------------------------------------------------------------------------------------------------------------
@ -252,79 +251,79 @@ void VToolDetail::setDialog()
void VToolDetail::Create(DialogTool *dialog, VMainGraphicsScene *scene, VAbstractPattern *doc, VContainer *data) void VToolDetail::Create(DialogTool *dialog, VMainGraphicsScene *scene, VAbstractPattern *doc, VContainer *data)
{ {
SCASSERT(dialog != nullptr) SCASSERT(dialog != nullptr)
DialogDetail *dialogTool = qobject_cast<DialogDetail*>(dialog); // DialogDetail *dialogTool = qobject_cast<DialogDetail*>(dialog);
SCASSERT(dialogTool != nullptr) // SCASSERT(dialogTool != nullptr)
VDetail detail = dialogTool->getDetail(); // VDetail detail = dialogTool->getDetail();
VDetail det; // VDetail det;
qApp->getUndoStack()->beginMacro("add detail"); // qApp->getUndoStack()->beginMacro("add detail");
for (int i = 0; i< detail.CountNode(); ++i) // for (int i = 0; i< detail.CountNode(); ++i)
{ // {
quint32 id = 0; // quint32 id = 0;
const VNodeDetail &nodeD = detail.at(i); // const VNodeDetail &nodeD = detail.at(i);
switch (nodeD.getTypeTool()) // switch (nodeD.getTypeTool())
{ // {
case (Tool::NodePoint): // case (Tool::NodePoint):
{ // {
id = CreateNode<VPointF>(data, nodeD.getId()); // id = CreateNode<VPointF>(data, nodeD.getId());
VNodePoint::Create(doc, data, scene, id, nodeD.getId(), Document::FullParse, Source::FromGui); // VNodePoint::Create(doc, data, scene, id, nodeD.getId(), Document::FullParse, Source::FromGui);
} // }
break; // break;
case (Tool::NodeArc): // case (Tool::NodeArc):
{ // {
id = CreateNode<VArc>(data, nodeD.getId()); // id = CreateNode<VArc>(data, nodeD.getId());
VNodeArc::Create(doc, data, id, nodeD.getId(), Document::FullParse, Source::FromGui); // VNodeArc::Create(doc, data, id, nodeD.getId(), Document::FullParse, Source::FromGui);
} // }
break; // break;
case (Tool::NodeElArc): // case (Tool::NodeElArc):
{ // {
id = CreateNode<VEllipticalArc>(data, nodeD.getId()); // id = CreateNode<VEllipticalArc>(data, nodeD.getId());
VNodeEllipticalArc::Create(doc, data, id, nodeD.getId(), Document::FullParse, Source::FromGui); // VNodeEllipticalArc::Create(doc, data, id, nodeD.getId(), Document::FullParse, Source::FromGui);
} // }
break; // break;
case (Tool::NodeSpline): // case (Tool::NodeSpline):
{ // {
const auto obj = data->GetGObject(nodeD.getId()); // const auto obj = data->GetGObject(nodeD.getId());
if (obj->getType() == GOType::Spline) // if (obj->getType() == GOType::Spline)
{ // {
id = CreateNode<VSpline>(data, nodeD.getId()); // id = CreateNode<VSpline>(data, nodeD.getId());
} // }
else // else
{ // {
id = CreateNode<VCubicBezier>(data, nodeD.getId()); // id = CreateNode<VCubicBezier>(data, nodeD.getId());
} // }
VNodeSpline::Create(doc, data, id, nodeD.getId(), Document::FullParse, Source::FromGui); // VNodeSpline::Create(doc, data, id, nodeD.getId(), Document::FullParse, Source::FromGui);
} // }
break; // break;
case (Tool::NodeSplinePath): // case (Tool::NodeSplinePath):
{ // {
const auto obj = data->GetGObject(nodeD.getId()); // const auto obj = data->GetGObject(nodeD.getId());
if (obj->getType() == GOType::SplinePath) // if (obj->getType() == GOType::SplinePath)
{ // {
id = CreateNode<VSplinePath>(data, nodeD.getId()); // id = CreateNode<VSplinePath>(data, nodeD.getId());
} // }
else // else
{ // {
id = CreateNode<VCubicBezierPath>(data, nodeD.getId()); // id = CreateNode<VCubicBezierPath>(data, nodeD.getId());
} // }
VNodeSplinePath::Create(doc, data, id, nodeD.getId(), Document::FullParse, Source::FromGui); // VNodeSplinePath::Create(doc, data, id, nodeD.getId(), Document::FullParse, Source::FromGui);
} // }
break; // break;
default: // default:
qDebug()<<"May be wrong tool type!!! Ignoring."<<Q_FUNC_INFO; // qDebug()<<"May be wrong tool type!!! Ignoring."<<Q_FUNC_INFO;
break; // break;
} // }
VNodeDetail node(id, nodeD.getTypeTool(), NodeDetail::Contour, nodeD.getMx(), nodeD.getMy(), // VNodeDetail node(id, nodeD.getTypeTool(), NodeDetail::Contour, nodeD.getMx(), nodeD.getMy(),
nodeD.getReverse()); // nodeD.getReverse());
det.append(node); // det.append(node);
} // }
det.setName(detail.getName()); // det.setName(detail.getName());
det.setWidth(detail.getWidth()); // det.setWidth(detail.getWidth());
det.setClosed(detail.getClosed()); // det.setClosed(detail.getClosed());
det.setSeamAllowance(detail.getSeamAllowance()); // det.setSeamAllowance(detail.getSeamAllowance());
det.setForbidFlipping(detail.getForbidFlipping()); // det.setForbidFlipping(detail.getForbidFlipping());
det.SetPatternPieceData(detail.GetPatternPieceData()); // det.SetPatternPieceData(detail.GetPatternPieceData());
det.SetPatternInfo(detail.GetPatternInfo()); // det.SetPatternInfo(detail.GetPatternInfo());
Create(0, det, scene, doc, data, Document::FullParse, Source::FromGui); // Create(0, det, scene, doc, data, Document::FullParse, Source::FromGui);
} }
//--------------------------------------------------------------------------------------------------------------------- //---------------------------------------------------------------------------------------------------------------------
@ -403,16 +402,16 @@ void VToolDetail::FullUpdateFromGuiOk(int result)
if (result == QDialog::Accepted) if (result == QDialog::Accepted)
{ {
SCASSERT(dialog != nullptr) SCASSERT(dialog != nullptr)
DialogDetail *dialogTool = qobject_cast<DialogDetail*>(dialog); // DialogDetail *dialogTool = qobject_cast<DialogDetail*>(dialog);
SCASSERT(dialogTool != nullptr) // SCASSERT(dialogTool != nullptr)
const VDetail newDet = dialogTool->getDetail(); // const VDetail newDet = dialogTool->getDetail();
const VDetail oldDet = VAbstractTool::data.GetDetail(id); // const VDetail oldDet = VAbstractTool::data.GetDetail(id);
qDebug() << "VToolDetail Position" << newDet.GetPatternPieceData().GetPos(); // qDebug() << "VToolDetail Position" << newDet.GetPatternPieceData().GetPos();
SaveDetailOptions *saveCommand = new SaveDetailOptions(oldDet, newDet, doc, id, this->scene()); // SaveDetailOptions *saveCommand = new SaveDetailOptions(oldDet, newDet, doc, id, this->scene());
connect(saveCommand, &SaveDetailOptions::NeedLiteParsing, doc, &VAbstractPattern::LiteParseTree); // connect(saveCommand, &SaveDetailOptions::NeedLiteParsing, doc, &VAbstractPattern::LiteParseTree);
qApp->getUndoStack()->push(saveCommand); // qApp->getUndoStack()->push(saveCommand);
UpdateLabel(); // UpdateLabel();
} }
delete dialog; delete dialog;
dialog = nullptr; dialog = nullptr;
@ -801,13 +800,13 @@ void VToolDetail::contextMenuEvent(QGraphicsSceneContextMenuEvent *event)
QAction *selectedAction = menu.exec(event->screenPos()); QAction *selectedAction = menu.exec(event->screenPos());
if (selectedAction == actionOption) if (selectedAction == actionOption)
{ {
dialog = new DialogDetail(getData(), id, qApp->getMainWindow()); // dialog = new DialogDetail(getData(), id, qApp->getMainWindow());
dialog->setModal(true); // dialog->setModal(true);
connect(qobject_cast< VMainGraphicsScene * >(this->scene()), &VMainGraphicsScene::ChoosedObject, // connect(qobject_cast< VMainGraphicsScene * >(this->scene()), &VMainGraphicsScene::ChoosedObject,
dialog, &DialogTool::ChosenObject); // dialog, &DialogTool::ChosenObject);
connect(dialog, &DialogTool::DialogClosed, this, &VToolDetail::FullUpdateFromGuiOk); // connect(dialog, &DialogTool::DialogClosed, this, &VToolDetail::FullUpdateFromGuiOk);
setDialog(); // setDialog();
dialog->show(); // dialog->show();
} }
else if (selectedAction == inLayoutOption) else if (selectedAction == inLayoutOption)
{ {