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

Refactoring.

Browse Source 
--HG--
branch : feature
This commit is contained in:
Roman Telezhynskyi 2015-02-03 10:32:32 +02:00
parent 493f607cac
commit f141edad27
28 changed files with 18 additions and 54 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/app/dialogs/tools/dialogalongline.cpp
View File

@ -41,7 +41,7 @@
* @param parent parent widget
*/
DialogAlongLine::DialogAlongLine(const VContainer *data, const quint32 &toolId, QWidget *parent)
:DialogTool(data, toolId, parent), ui(new Ui::DialogAlongLine), number(0),
:DialogTool(data, toolId, parent), ui(new Ui::DialogAlongLine),
typeLine(QString()), formula(QString()), formulaBaseHeight(0), line(nullptr), lineColor(VAbstractTool::ColorBlack)
{
ui->setupUi(this);

3
src/app/dialogs/tools/dialogalongline.h
View File

@ -88,9 +88,6 @@ private:
/** @brief ui keeps information about user interface */
Ui::DialogAlongLine *ui;
/** @brief number number of handled objects */
qint32 number;
/** @brief typeLine type of line */
QString typeLine;

2
src/app/dialogs/tools/dialogbisector.cpp
View File

@ -42,7 +42,7 @@
* @param parent parent widget
*/
DialogBisector::DialogBisector(const VContainer *data, const quint32 &toolId, QWidget *parent)
:DialogTool(data, toolId, parent), ui(new Ui::DialogBisector), number(0), typeLine(QString()),
:DialogTool(data, toolId, parent), ui(new Ui::DialogBisector), typeLine(QString()),
formula(QString()), formulaBaseHeight(0), line(nullptr)
{
ui->setupUi(this);

3
src/app/dialogs/tools/dialogbisector.h
View File

@ -89,9 +89,6 @@ private:
/** @brief ui keeps information about user interface */
Ui::DialogBisector *ui;
/** @brief number number of handled objects */
qint32 number;
/** @brief typeLine type of line */
QString typeLine;

2
src/app/dialogs/tools/dialogcurveintersectaxis.cpp
View File

@ -38,7 +38,7 @@
//---------------------------------------------------------------------------------------------------------------------
DialogCurveIntersectAxis::DialogCurveIntersectAxis(const VContainer *data, const quint32 &toolId, QWidget *parent)
:DialogTool(data, toolId, parent), ui(new Ui::DialogCurveIntersectAxis), number(0), typeLine(QString()),
:DialogTool(data, toolId, parent), ui(new Ui::DialogCurveIntersectAxis), typeLine(QString()),
formulaAngle(QString()), formulaBaseHeightAngle(0), line(nullptr)
{
ui->setupUi(this);

3
src/app/dialogs/tools/dialogcurveintersectaxis.h
View File

@ -77,9 +77,6 @@ private:
Q_DISABLE_COPY(DialogCurveIntersectAxis)
Ui::DialogCurveIntersectAxis *ui;
/** @brief number number of handled objects */
qint32 number;
/** @brief typeLine type of line */
QString typeLine;

2
src/app/dialogs/tools/dialogheight.cpp
View File

@ -42,7 +42,7 @@
* @param parent parent widget
*/
DialogHeight::DialogHeight(const VContainer *data, const quint32 &toolId, QWidget *parent)
:DialogTool(data, toolId, parent), ui(new Ui::DialogHeight), number(0), typeLine(QString()), line(nullptr)
:DialogTool(data, toolId, parent), ui(new Ui::DialogHeight), typeLine(QString()), line(nullptr)
{
ui->setupUi(this);
ui->lineEditNamePoint->setText(qApp->getCurrentDocument()->GenerateLabel(LabelType::NewLabel));

3
src/app/dialogs/tools/dialogheight.h
View File

@ -77,9 +77,6 @@ private:
/** @brief ui keeps information about user interface */
Ui::DialogHeight *ui;
/** @brief number number of handled objects */
qint32 number;
/** @brief typeLine type of line */
QString typeLine;

2
src/app/dialogs/tools/dialogline.cpp
View File

@ -43,7 +43,7 @@
* @param parent parent widget
*/
DialogLine::DialogLine(const VContainer *data, const quint32 &toolId, QWidget *parent)
:DialogTool(data, toolId, parent), ui(new Ui::DialogLine), number(0), typeLine(QString()), line(nullptr)
:DialogTool(data, toolId, parent), ui(new Ui::DialogLine), typeLine(QString()), line(nullptr)
{
ui->setupUi(this);
InitOkCancelApply(ui);

3
src/app/dialogs/tools/dialogline.h
View File

@ -72,9 +72,6 @@ private:
/** @brief ui keeps information about user interface */
Ui::DialogLine *ui;
/** @brief number number of handled objects */
qint32 number;
/** @brief typeLine type of line */
QString typeLine;
VisToolLine *line;

2
src/app/dialogs/tools/dialoglineintersect.cpp
View File

@ -42,7 +42,7 @@
* @param parent parent widget
*/
DialogLineIntersect::DialogLineIntersect(const VContainer *data, const quint32 &toolId, QWidget *parent)
:DialogTool(data, toolId, parent), ui(new Ui::DialogLineIntersect), number(0), flagPoint(true), line(nullptr)
:DialogTool(data, toolId, parent), ui(new Ui::DialogLineIntersect), flagPoint(true), line(nullptr)
{
ui->setupUi(this);
number = 0;

3
src/app/dialogs/tools/dialoglineintersect.h
View File

@ -78,9 +78,6 @@ private:
/** @brief ui keeps information about user interface */
Ui::DialogLineIntersect *ui;
/** @brief number number of handled objects */
qint32 number;
/** @brief flagPoint keep state of point */
bool flagPoint;

2
src/app/dialogs/tools/dialoglineintersectaxis.cpp
View File

@ -38,7 +38,7 @@
//---------------------------------------------------------------------------------------------------------------------
DialogLineIntersectAxis::DialogLineIntersectAxis(const VContainer *data, const quint32 &toolId, QWidget *parent)
:DialogTool(data, toolId, parent), ui(new Ui::DialogLineIntersectAxis), number(0), typeLine(QString()),
:DialogTool(data, toolId, parent), ui(new Ui::DialogLineIntersectAxis), typeLine(QString()),
formulaAngle(QString()), formulaBaseHeightAngle(0), line(nullptr)
{
ui->setupUi(this);

3
src/app/dialogs/tools/dialoglineintersectaxis.h
View File

@ -81,9 +81,6 @@ private:
Q_DISABLE_COPY(DialogLineIntersectAxis)
Ui::DialogLineIntersectAxis *ui;
/** @brief number number of handled objects */
qint32 number;
/** @brief typeLine type of line */
QString typeLine;

2
src/app/dialogs/tools/dialognormal.cpp
View File

@ -39,7 +39,7 @@
* @param parent parent widget
*/
DialogNormal::DialogNormal(const VContainer *data, const quint32 &toolId, QWidget *parent)
:DialogTool(data, toolId, parent), ui(new Ui::DialogNormal), number(0), typeLine(QString()),
:DialogTool(data, toolId, parent), ui(new Ui::DialogNormal), typeLine(QString()),
formula(QString()), angle(0), formulaBaseHeight(0), line(nullptr)
{
ui->setupUi(this);

3
src/app/dialogs/tools/dialognormal.h
View File

@ -88,9 +88,6 @@ private:
/** @brief ui keeps information about user interface */
Ui::DialogNormal *ui;
/** @brief number number of handled objects */
qint32 number;
/** @brief typeLine type of line */
QString typeLine;

2
src/app/dialogs/tools/dialogpointofcontact.cpp
View File

@ -41,7 +41,7 @@
* @param parent parent widget
*/
DialogPointOfContact::DialogPointOfContact(const VContainer *data, const quint32 &toolId, QWidget *parent)
:DialogTool(data, toolId, parent), ui(new Ui::DialogPointOfContact), number(0),
:DialogTool(data, toolId, parent), ui(new Ui::DialogPointOfContact),
radius(QString()), formulaBaseHeight(0), line(nullptr)
{
ui->setupUi(this);

3
src/app/dialogs/tools/dialogpointofcontact.h
View File

@ -86,9 +86,6 @@ private:
/** @brief ui keeps information about user interface */
Ui::DialogPointOfContact *ui;
/** @brief number number of handled objects */
qint32 number;
/** @brief radius radius of arc */
QString radius;

2
src/app/dialogs/tools/dialogpointofintersection.cpp
View File

@ -42,7 +42,7 @@
* @param parent parent widget
*/
DialogPointOfIntersection::DialogPointOfIntersection(const VContainer *data, const quint32 &toolId, QWidget *parent)
:DialogTool(data, toolId, parent), ui(new Ui::DialogPointOfIntersection), number(0), line(nullptr)
:DialogTool(data, toolId, parent), ui(new Ui::DialogPointOfIntersection), line(nullptr)
{
ui->setupUi(this);
ui->lineEditNamePoint->setText(qApp->getCurrentDocument()->GenerateLabel(LabelType::NewLabel));

3
src/app/dialogs/tools/dialogpointofintersection.h
View File

@ -71,9 +71,6 @@ private:
/** @brief ui keeps information about user interface */
Ui::DialogPointOfIntersection *ui;
/** @brief number number of handled objects */
qint32 number;
VisToolPointOfIntersection *line;
};

4
src/app/dialogs/tools/dialogshoulderpoint.cpp
View File

@ -42,8 +42,8 @@
* @param parent parent widget
*/
DialogShoulderPoint::DialogShoulderPoint(const VContainer *data, const quint32 &toolId, QWidget *parent)
:DialogTool(data, toolId, parent), ui(new Ui::DialogShoulderPoint), number(0),
typeLine(QString()), formula(QString()), formulaBaseHeight(0), line (nullptr)
:DialogTool(data, toolId, parent), ui(new Ui::DialogShoulderPoint), typeLine(QString()),
formula(QString()), formulaBaseHeight(0), line (nullptr)
{
ui->setupUi(this);
InitVariables(ui);

3
src/app/dialogs/tools/dialogshoulderpoint.h
View File

@ -88,9 +88,6 @@ private:
/** @brief ui keeps information about user interface */
Ui::DialogShoulderPoint *ui;
/** @brief number number of handled objects */
qint32 number;
/** @brief typeLine type of line */
QString typeLine;

2
src/app/dialogs/tools/dialogspline.cpp
View File

@ -41,7 +41,7 @@
* @param parent parent widget
*/
DialogSpline::DialogSpline(const VContainer *data, const quint32 &toolId, QWidget *parent)
:DialogTool(data, toolId, parent), ui(new Ui::DialogSpline), number(0), angle1(0), angle2(0), kAsm1(1), kAsm2(1),
:DialogTool(data, toolId, parent), ui(new Ui::DialogSpline), angle1(0), angle2(0), kAsm1(1), kAsm2(1),
kCurve(1), path(nullptr)
{
ui->setupUi(this);

3
src/app/dialogs/tools/dialogspline.h
View File

@ -84,9 +84,6 @@ private:
/** @brief ui keeps information about user interface */
Ui::DialogSpline *ui;
/** @brief number number of handled objects */
qint32 number;
/** @brief angle1 first angle of spline in degree */
qreal angle1;

2
src/app/dialogs/tools/dialogtool.cpp
View File

@ -67,7 +67,7 @@ DialogTool::DialogTool(const VContainer *data, const quint32 &toolId, QWidget *p
radioButtonIncrements(nullptr), radioButtonLengthLine(nullptr), radioButtonLengthArc(nullptr),
radioButtonLengthCurve(nullptr), radioButtonAngleLine(nullptr), checkBoxHideEmpty(nullptr),
okColor(QColor(76, 76, 76)), errorColor(Qt::red), associatedTool(nullptr),
toolId(toolId), prepare(false), pointName(QString())
toolId(toolId), prepare(false), pointName(QString()), number(0)
{
SCASSERT(data != nullptr);
timerFormula = new QTimer(this);

3
src/app/dialogs/tools/dialogtool.h
View File

@ -209,6 +209,9 @@ protected:
/** @brief pointName name of point */
QString pointName;
/** @brief number number of handled objects */
qint32 number;
virtual void closeEvent ( QCloseEvent * event );
virtual void showEvent( QShowEvent *event );

2
src/app/dialogs/tools/dialogtriangle.cpp
View File

@ -41,7 +41,7 @@
* @param parent parent widget
*/
DialogTriangle::DialogTriangle(const VContainer *data, const quint32 &toolId, QWidget *parent)
:DialogTool(data, toolId, parent), ui(new Ui::DialogTriangle), number(0), line (nullptr)
:DialogTool(data, toolId, parent), ui(new Ui::DialogTriangle), line (nullptr)
{
ui->setupUi(this);
ui->lineEditNamePoint->setText(qApp->getCurrentDocument()->GenerateLabel(LabelType::NewLabel));

3
src/app/dialogs/tools/dialogtriangle.h
View File

@ -77,9 +77,6 @@ private:
/** @brief ui keeps information about user interface */
Ui::DialogTriangle *ui;
/** @brief number number of handled objects */
qint32 number;
VisToolTriangle *line;
};