From 49a45e9d57393589626d49a7aa2835b92ca004af Mon Sep 17 00:00:00 2001 From: dismine Date: Fri, 21 Feb 2014 14:04:07 +0200 Subject: [PATCH] Dialog Measurements. --HG-- branch : feature --- share/resources/icon.qrc | 2 + share/resources/icon/Graduation.png | Bin 0 -> 4179 bytes share/resources/icon/individual.png | Bin 0 -> 16854 bytes src/dialogs/dialogmeasurements.cpp | 60 +++++++++++++ src/dialogs/dialogmeasurements.h | 63 +++++++++++++ src/dialogs/dialogmeasurements.ui | 135 ++++++++++++++++++++++++++++ src/dialogs/dialogs.pri | 9 +- 7 files changed, 266 insertions(+), 3 deletions(-) create mode 100644 share/resources/icon/Graduation.png create mode 100644 share/resources/icon/individual.png create mode 100644 src/dialogs/dialogmeasurements.cpp create mode 100644 src/dialogs/dialogmeasurements.h create mode 100644 src/dialogs/dialogmeasurements.ui diff --git a/share/resources/icon.qrc b/share/resources/icon.qrc index 504b28697..64d48ee8e 100644 --- a/share/resources/icon.qrc +++ b/share/resources/icon.qrc @@ -50,5 +50,7 @@ icon/flags/he_IL.png icon/flags/ru.png icon/flags/uk.png + icon/Graduation.png + icon/individual.png diff --git a/share/resources/icon/Graduation.png b/share/resources/icon/Graduation.png new file mode 100644 index 0000000000000000000000000000000000000000..461bc95d1d755daa2a441baeee7da11785a5fcd3 GIT binary patch literal 4179 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 NfTVA#S4nh^`47faXeR&w literal 0 HcmV?d00001 diff --git a/share/resources/icon/individual.png b/share/resources/icon/individual.png new file mode 100644 index 0000000000000000000000000000000000000000..9081d75c2a53173c256cfd7b85a38ef041491aa6 GIT binary patch literal 16854 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 + ** @date 21 2, 2014 + ** + ** @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 Valentina project + ** 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 . + ** + *************************************************************************/ + +#include "dialogmeasurements.h" +#include "ui_dialogmeasurements.h" + +DialogMeasurements::DialogMeasurements(QWidget *parent) : + QDialog(parent), ui(new Ui::DialogMeasurements), result(Measurements::Individual) +{ + ui->setupUi(this); + connect(ui->toolButtonStandard, &QToolButton::clicked, this, &DialogMeasurements::StandardMeasurements); + connect(ui->toolButtonIndividual, &QToolButton::clicked, this, &DialogMeasurements::IndividualMeasurements); +} + +DialogMeasurements::~DialogMeasurements() +{ + delete ui; +} + +Measurements::Type DialogMeasurements::type() const +{ + return result; +} + +void DialogMeasurements::StandardMeasurements() +{ + result = Measurements::Standard; + accept(); +} + +void DialogMeasurements::IndividualMeasurements() +{ + result = Measurements::Individual; + accept(); +} diff --git a/src/dialogs/dialogmeasurements.h b/src/dialogs/dialogmeasurements.h new file mode 100644 index 000000000..73945dda9 --- /dev/null +++ b/src/dialogs/dialogmeasurements.h @@ -0,0 +1,63 @@ +/************************************************************************ + ** + ** @file dialogpatterntype.h + ** @author Roman Telezhinsky + ** @date 21 2, 2014 + ** + ** @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 Valentina project + ** 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 . + ** + *************************************************************************/ + +#ifndef DIALOGMEASUREMENTS_H +#define DIALOGMEASUREMENTS_H + +#include + +namespace Ui { +class DialogMeasurements; +} + +namespace Measurements +{ + /** + * @brief The Type enum pattern measurements. + */ + enum Type { Standard, Individual }; + Q_DECLARE_FLAGS(Types, Type) +} +Q_DECLARE_OPERATORS_FOR_FLAGS( Measurements::Types ) + +class DialogMeasurements : public QDialog +{ + Q_OBJECT +public: + explicit DialogMeasurements(QWidget *parent = 0); + ~DialogMeasurements(); + Measurements::Type type() const; +private: + Q_DISABLE_COPY(DialogMeasurements) + Ui::DialogMeasurements *ui; + Measurements::Type result; + void StandardMeasurements(); + void IndividualMeasurements(); +}; + +#endif // DIALOGMEASUREMENTS_H diff --git a/src/dialogs/dialogmeasurements.ui b/src/dialogs/dialogmeasurements.ui new file mode 100644 index 000000000..bf5a53bab --- /dev/null +++ b/src/dialogs/dialogmeasurements.ui @@ -0,0 +1,135 @@ + + + DialogMeasurements + + + + 0 + 0 + 385 + 244 + + + + Measurements + + + + + + + 0 + 0 + + + + <html><head/><body><p><span style=" font-size:18pt;">Please, choose pattern type.</span></p></body></html> + + + Qt::AlignCenter + + + + + + + 13 + + + + + 5 + + + 5 + + + 5 + + + 5 + + + + + Graduation + + + + :/icon/Graduation.png:/icon/Graduation.png + + + + 160 + 120 + + + + + + + + Use for creation pattern standard measurement table + + + true + + + + + + + + + 6 + + + 5 + + + 5 + + + 5 + + + 5 + + + + + Individual + + + + :/icon/individual.png:/icon/individual.png + + + + 160 + 120 + + + + + + + + Use for creation pattern individual measurements + + + true + + + + + + + + + + + + + + diff --git a/src/dialogs/dialogs.pri b/src/dialogs/dialogs.pri index 8796a0c47..58829f139 100644 --- a/src/dialogs/dialogs.pri +++ b/src/dialogs/dialogs.pri @@ -25,7 +25,8 @@ HEADERS += \ src/dialogs/dialogcutarc.h \ src/dialogs/configdialog.h \ src/dialogs/pages.h \ - src/dialogs/dialogpatternproperties.h + src/dialogs/dialogpatternproperties.h \ + src/dialogs/dialogmeasurements.h SOURCES += \ src/dialogs/dialogtriangle.cpp \ @@ -53,7 +54,8 @@ SOURCES += \ src/dialogs/dialogcutarc.cpp \ src/dialogs/configdialog.cpp \ src/dialogs/pages.cpp \ - src/dialogs/dialogpatternproperties.cpp + src/dialogs/dialogpatternproperties.cpp \ + src/dialogs/dialogmeasurements.cpp FORMS += \ src/dialogs/dialogtriangle.ui \ @@ -78,4 +80,5 @@ FORMS += \ src/dialogs/dialogcutsplinepath.ui \ src/dialogs/dialoguniondetails.ui \ src/dialogs/dialogcutarc.ui \ - src/dialogs/dialogpatternproperties.ui + src/dialogs/dialogpatternproperties.ui \ + src/dialogs/dialogmeasurements.ui