Change English spelling of "Standart" to "Standard"
--HG-- branch : develop
This commit is contained in:
parent
7c268f2544
commit
6d0302feaf
src
container
dialogs
dialogalongline.cppdialogalongline.uidialogarc.cppdialogarc.uidialogbisector.cppdialogbisector.uidialogcutarc.cppdialogcutarc.uidialogcutspline.cppdialogcutspline.uidialogcutsplinepath.cppdialogcutsplinepath.uidialogendline.cppdialogendline.uidialogincrements.cppdialogincrements.hdialogincrements.uidialognormal.cppdialognormal.uidialogpointofcontact.cppdialogpointofcontact.uidialogshoulderpoint.cppdialogshoulderpoint.uidialogtool.cppdialogtool.h
|
@ -2,10 +2,10 @@ SOURCES += \
|
|||
src/container/vincrementtablerow.cpp \
|
||||
src/container/vcontainer.cpp \
|
||||
src/container/calculator.cpp \
|
||||
src/container/vstandarttablerow.cpp
|
||||
src/container/vstandardtablerow.cpp
|
||||
|
||||
HEADERS += \
|
||||
src/container/vincrementtablerow.h \
|
||||
src/container/vcontainer.h \
|
||||
src/container/calculator.h \
|
||||
src/container/vstandarttablerow.h
|
||||
src/container/vstandardtablerow.h
|
||||
|
|
|
@ -35,7 +35,7 @@ qint64 VContainer::_id = 0;
|
|||
|
||||
VContainer::VContainer()
|
||||
:base(QHash<QString, qint32>()), gObjects(QHash<qint64, VGObject *>()),
|
||||
standartTable(QHash<QString, VStandartTableRow>()), incrementTable(QHash<QString, VIncrementTableRow>()),
|
||||
standardTable(QHash<QString, VStandardTableRow>()), incrementTable(QHash<QString, VIncrementTableRow>()),
|
||||
lengthLines(QHash<QString, qreal>()), lineAngles(QHash<QString, qreal>()), lengthSplines(QHash<QString, qreal>()),
|
||||
lengthArcs(QHash<QString, qreal>()), details(QHash<qint64, VDetail>())
|
||||
{
|
||||
|
@ -52,7 +52,7 @@ VContainer &VContainer::operator =(const VContainer &data)
|
|||
|
||||
VContainer::VContainer(const VContainer &data)
|
||||
:base(QHash<QString, qint32>()), gObjects(QHash<qint64, VGObject *>()),
|
||||
standartTable(QHash<QString, VStandartTableRow>()), incrementTable(QHash<QString, VIncrementTableRow>()),
|
||||
standardTable(QHash<QString, VStandardTableRow>()), incrementTable(QHash<QString, VIncrementTableRow>()),
|
||||
lengthLines(QHash<QString, qreal>()), lineAngles(QHash<QString, qreal>()), lengthSplines(QHash<QString, qreal>()),
|
||||
lengthArcs(QHash<QString, qreal>()), details(QHash<qint64, VDetail>())
|
||||
{
|
||||
|
@ -103,7 +103,7 @@ void VContainer::setData(const VContainer &data)
|
|||
qWarning()<<"Don't know how copy this type.";
|
||||
}
|
||||
}
|
||||
standartTable = *data.DataStandartTable();
|
||||
standardTable = *data.DataStandardTable();
|
||||
incrementTable = *data.DataIncrementTable();
|
||||
lengthLines = *data.DataLengthLines();
|
||||
lineAngles = *data.DataLineAngles();
|
||||
|
@ -143,10 +143,10 @@ val VContainer::GetVariable(const QHash<key, val> &obj, key id) const
|
|||
}
|
||||
}
|
||||
|
||||
const VStandartTableRow VContainer::GetStandartTableCell(const QString &name) const
|
||||
const VStandardTableRow VContainer::GetStandardTableCell(const QString &name) const
|
||||
{
|
||||
Q_ASSERT(name.isEmpty()==false);
|
||||
return GetVariable(standartTable, name);
|
||||
return GetVariable(standardTable, name);
|
||||
}
|
||||
|
||||
const VIncrementTableRow VContainer::GetIncrementTableRow(const QString& name) const
|
||||
|
@ -634,9 +634,9 @@ void VContainer::AddLineAngle(const QString &name, const qreal &value)
|
|||
lineAngles[name] = value;
|
||||
}
|
||||
|
||||
qreal VContainer::GetValueStandartTableCell(const QString& name) const
|
||||
qreal VContainer::GetValueStandardTableCell(const QString& name) const
|
||||
{
|
||||
VStandartTableRow cell = GetStandartTableCell(name);
|
||||
VStandardTableRow cell = GetStandardTableCell(name);
|
||||
qreal k_size = ( static_cast<qreal> (size()/10.0) - 50.0 ) / 2.0;
|
||||
qreal k_growth = ( static_cast<qreal> (growth()/10.0) - 176.0 ) / 6.0;
|
||||
qreal value = cell.GetBase() + k_size*cell.GetKsize() + k_growth*cell.GetKgrowth();
|
||||
|
@ -655,7 +655,7 @@ qreal VContainer::GetValueIncrementTableRow(const QString& name) const
|
|||
void VContainer::Clear()
|
||||
{
|
||||
_id = 0;
|
||||
standartTable.clear();
|
||||
standardTable.clear();
|
||||
incrementTable.clear();
|
||||
lengthLines.clear();
|
||||
lengthArcs.clear();
|
||||
|
@ -698,10 +698,10 @@ qreal VContainer::FindVar(const QString &name, bool *ok)const
|
|||
return base.value(name);
|
||||
}
|
||||
|
||||
if (standartTable.contains(name))
|
||||
if (standardTable.contains(name))
|
||||
{
|
||||
*ok = true;
|
||||
return GetValueStandartTableCell(name);
|
||||
return GetValueStandardTableCell(name);
|
||||
}
|
||||
if (incrementTable.contains(name))
|
||||
{
|
||||
|
@ -788,64 +788,64 @@ void VContainer::AddLengthLine(const QString &name, const qreal &value)
|
|||
|
||||
void VContainer::CreateManTableIGroup ()
|
||||
{
|
||||
AddStandartTableCell("Pkor", VStandartTableRow(84, 0, 3));
|
||||
AddStandartTableCell("Vtos", VStandartTableRow(1450, 2, 51));
|
||||
AddStandartTableCell("Vtosh", VStandartTableRow(1506, 2, 54));
|
||||
AddStandartTableCell("Vpt", VStandartTableRow(1438, 3, 52));
|
||||
AddStandartTableCell("Vst", VStandartTableRow(1257, -1, 49));
|
||||
AddStandartTableCell("Vlt", VStandartTableRow(1102, 0, 43));
|
||||
AddStandartTableCell("Vk", VStandartTableRow(503, 0, 22));
|
||||
AddStandartTableCell("Vsht", VStandartTableRow(1522, 2, 54));
|
||||
AddStandartTableCell("Vzy", VStandartTableRow(1328, 0, 49));
|
||||
AddStandartTableCell("Vlop", VStandartTableRow(1320, 0, 49));
|
||||
AddStandartTableCell("Vps", VStandartTableRow(811, -1, 36));
|
||||
AddStandartTableCell("Ssh", VStandartTableRow(202, 4, 1));
|
||||
AddStandartTableCell("SgI", VStandartTableRow(517, 18, 2));
|
||||
AddStandartTableCell("SgII", VStandartTableRow(522, 19, 1));
|
||||
AddStandartTableCell("SgIII", VStandartTableRow(500, 20, 0));
|
||||
AddStandartTableCell("SbI", VStandartTableRow(482, 12, 6));
|
||||
AddStandartTableCell("Obed", VStandartTableRow(566, 18, 6));
|
||||
AddStandartTableCell("Ok", VStandartTableRow(386, 8, 8));
|
||||
AddStandartTableCell("Oi", VStandartTableRow(380, 8, 6));
|
||||
AddStandartTableCell("Osch", VStandartTableRow(234, 4, 4));
|
||||
AddStandartTableCell("Dsb", VStandartTableRow(1120, 0, 44));
|
||||
AddStandartTableCell("Dsp", VStandartTableRow(1110, 0, 43));
|
||||
AddStandartTableCell("Dn", VStandartTableRow(826, -3, 37));
|
||||
AddStandartTableCell("Dps", VStandartTableRow(316, 4, 7));
|
||||
AddStandartTableCell("Dpob", VStandartTableRow(783, 14, 15));
|
||||
AddStandartTableCell("Ds", VStandartTableRow(260, 1, 6));
|
||||
AddStandartTableCell("Op", VStandartTableRow(316, 12, 0));
|
||||
AddStandartTableCell("Ozap", VStandartTableRow(180, 4, 0));
|
||||
AddStandartTableCell("Pkis", VStandartTableRow(250, 4, 0));
|
||||
AddStandartTableCell("SHp", VStandartTableRow(160, 1, 4));
|
||||
AddStandartTableCell("Dlych", VStandartTableRow(500, 2, 15));
|
||||
AddStandartTableCell("Dzap", VStandartTableRow(768, 2, 24));
|
||||
AddStandartTableCell("DIIIp", VStandartTableRow(970, 2, 29));
|
||||
AddStandartTableCell("Vprp", VStandartTableRow(214, 3, 3));
|
||||
AddStandartTableCell("Vg", VStandartTableRow(262, 8, 3));
|
||||
AddStandartTableCell("Dtp", VStandartTableRow(460, 7, 9));
|
||||
AddStandartTableCell("Dp", VStandartTableRow(355, 5, 5));
|
||||
AddStandartTableCell("Vprz", VStandartTableRow(208, 3, 5));
|
||||
AddStandartTableCell("Dts", VStandartTableRow(438, 2, 10));
|
||||
AddStandartTableCell("DtsI", VStandartTableRow(469, 2, 10));
|
||||
AddStandartTableCell("Dvcht", VStandartTableRow(929, 9, 19));
|
||||
AddStandartTableCell("SHg", VStandartTableRow(370, 14, 4));
|
||||
AddStandartTableCell("Cg", VStandartTableRow(224, 6, 0));
|
||||
AddStandartTableCell("SHs", VStandartTableRow(416, 10, 2));
|
||||
AddStandartTableCell("dpzr", VStandartTableRow(121, 6, 0));
|
||||
AddStandartTableCell("Ogol", VStandartTableRow(576, 4, 4));
|
||||
AddStandartTableCell("Ssh1", VStandartTableRow(205, 5, 0));
|
||||
AddStandardTableCell("Pkor", VStandardTableRow(84, 0, 3));
|
||||
AddStandardTableCell("Vtos", VStandardTableRow(1450, 2, 51));
|
||||
AddStandardTableCell("Vtosh", VStandardTableRow(1506, 2, 54));
|
||||
AddStandardTableCell("Vpt", VStandardTableRow(1438, 3, 52));
|
||||
AddStandardTableCell("Vst", VStandardTableRow(1257, -1, 49));
|
||||
AddStandardTableCell("Vlt", VStandardTableRow(1102, 0, 43));
|
||||
AddStandardTableCell("Vk", VStandardTableRow(503, 0, 22));
|
||||
AddStandardTableCell("Vsht", VStandardTableRow(1522, 2, 54));
|
||||
AddStandardTableCell("Vzy", VStandardTableRow(1328, 0, 49));
|
||||
AddStandardTableCell("Vlop", VStandardTableRow(1320, 0, 49));
|
||||
AddStandardTableCell("Vps", VStandardTableRow(811, -1, 36));
|
||||
AddStandardTableCell("Ssh", VStandardTableRow(202, 4, 1));
|
||||
AddStandardTableCell("SgI", VStandardTableRow(517, 18, 2));
|
||||
AddStandardTableCell("SgII", VStandardTableRow(522, 19, 1));
|
||||
AddStandardTableCell("SgIII", VStandardTableRow(500, 20, 0));
|
||||
AddStandardTableCell("SbI", VStandardTableRow(482, 12, 6));
|
||||
AddStandardTableCell("Obed", VStandardTableRow(566, 18, 6));
|
||||
AddStandardTableCell("Ok", VStandardTableRow(386, 8, 8));
|
||||
AddStandardTableCell("Oi", VStandardTableRow(380, 8, 6));
|
||||
AddStandardTableCell("Osch", VStandardTableRow(234, 4, 4));
|
||||
AddStandardTableCell("Dsb", VStandardTableRow(1120, 0, 44));
|
||||
AddStandardTableCell("Dsp", VStandardTableRow(1110, 0, 43));
|
||||
AddStandardTableCell("Dn", VStandardTableRow(826, -3, 37));
|
||||
AddStandardTableCell("Dps", VStandardTableRow(316, 4, 7));
|
||||
AddStandardTableCell("Dpob", VStandardTableRow(783, 14, 15));
|
||||
AddStandardTableCell("Ds", VStandardTableRow(260, 1, 6));
|
||||
AddStandardTableCell("Op", VStandardTableRow(316, 12, 0));
|
||||
AddStandardTableCell("Ozap", VStandardTableRow(180, 4, 0));
|
||||
AddStandardTableCell("Pkis", VStandardTableRow(250, 4, 0));
|
||||
AddStandardTableCell("SHp", VStandardTableRow(160, 1, 4));
|
||||
AddStandardTableCell("Dlych", VStandardTableRow(500, 2, 15));
|
||||
AddStandardTableCell("Dzap", VStandardTableRow(768, 2, 24));
|
||||
AddStandardTableCell("DIIIp", VStandardTableRow(970, 2, 29));
|
||||
AddStandardTableCell("Vprp", VStandardTableRow(214, 3, 3));
|
||||
AddStandardTableCell("Vg", VStandardTableRow(262, 8, 3));
|
||||
AddStandardTableCell("Dtp", VStandardTableRow(460, 7, 9));
|
||||
AddStandardTableCell("Dp", VStandardTableRow(355, 5, 5));
|
||||
AddStandardTableCell("Vprz", VStandardTableRow(208, 3, 5));
|
||||
AddStandardTableCell("Dts", VStandardTableRow(438, 2, 10));
|
||||
AddStandardTableCell("DtsI", VStandardTableRow(469, 2, 10));
|
||||
AddStandardTableCell("Dvcht", VStandardTableRow(929, 9, 19));
|
||||
AddStandardTableCell("SHg", VStandardTableRow(370, 14, 4));
|
||||
AddStandardTableCell("Cg", VStandardTableRow(224, 6, 0));
|
||||
AddStandardTableCell("SHs", VStandardTableRow(416, 10, 2));
|
||||
AddStandardTableCell("dpzr", VStandardTableRow(121, 6, 0));
|
||||
AddStandardTableCell("Ogol", VStandardTableRow(576, 4, 4));
|
||||
AddStandardTableCell("Ssh1", VStandardTableRow(205, 5, 0));
|
||||
|
||||
//TODO Posible duplicate. Need check.
|
||||
//AddStandartTableCell("St", VStandartTableRow(410, 20, 0));
|
||||
AddStandartTableCell("St", VStandartTableRow(390, 20, 0));
|
||||
//AddStandardTableCell("St", VStandardTableRow(410, 20, 0));
|
||||
AddStandardTableCell("St", VStandardTableRow(390, 20, 0));
|
||||
|
||||
AddStandartTableCell("Drzap", VStandartTableRow(594, 3, 19));
|
||||
AddStandartTableCell("DbII", VStandartTableRow(1020, 0, 44));
|
||||
AddStandardTableCell("Drzap", VStandardTableRow(594, 3, 19));
|
||||
AddStandardTableCell("DbII", VStandardTableRow(1020, 0, 44));
|
||||
|
||||
//TODO Posible duplicate. Need check.
|
||||
//AddStandartTableCell("Sb", VStandartTableRow(504, 15, 4));
|
||||
AddStandartTableCell("Sb", VStandartTableRow(492, 15, 5));
|
||||
//AddStandardTableCell("Sb", VStandardTableRow(504, 15, 4));
|
||||
AddStandardTableCell("Sb", VStandardTableRow(492, 15, 5));
|
||||
}
|
||||
|
||||
QVector<QPointF> VContainer::GetReversePoint(const QVector<QPointF> &points) const
|
||||
|
|
|
@ -29,7 +29,7 @@
|
|||
#ifndef VCONTAINER_H
|
||||
#define VCONTAINER_H
|
||||
|
||||
#include "vstandarttablerow.h"
|
||||
#include "vstandardtablerow.h"
|
||||
#include "vincrementtablerow.h"
|
||||
#include "../geometry/varc.h"
|
||||
#include "../geometry/vsplinepath.h"
|
||||
|
@ -97,11 +97,11 @@ public:
|
|||
*/
|
||||
const VGObject *GetGObject(qint64 id) const;
|
||||
/**
|
||||
* @brief GetStandartTableCell return standart table row by name
|
||||
* @param name name of standart table row
|
||||
* @return row of standart table
|
||||
* @brief GetStandardTableCell return standard table row by name
|
||||
* @param name name of standard table row
|
||||
* @return row of standard table
|
||||
*/
|
||||
const VStandartTableRow GetStandartTableCell(const QString& name) const;
|
||||
const VStandardTableRow GetStandardTableCell(const QString& name) const;
|
||||
/**
|
||||
* @brief GetIncrementTableRow return increment table row by name
|
||||
* @param name name of increment table row
|
||||
|
@ -156,12 +156,12 @@ public:
|
|||
*/
|
||||
qint64 AddDetail(VDetail detail);
|
||||
/**
|
||||
* @brief AddStandartTableCell add new row of standart table
|
||||
* @param name name of row of standart table
|
||||
* @param cell row of standart table
|
||||
* @brief AddStandardTableCell add new row of standard table
|
||||
* @param name name of row of standard table
|
||||
* @param cell row of standard table
|
||||
*/
|
||||
inline void AddStandartTableCell(const QString& name, const VStandartTableRow &cell)
|
||||
{standartTable[name] = cell;}
|
||||
inline void AddStandardTableCell(const QString& name, const VStandardTableRow &cell)
|
||||
{standardTable[name] = cell;}
|
||||
/**
|
||||
* @brief AddIncrementTableRow add new row of increment table
|
||||
* @param name name of new row of increment table
|
||||
|
@ -225,12 +225,12 @@ public:
|
|||
*/
|
||||
void UpdateDetail(qint64 id, const VDetail &detail);
|
||||
/**
|
||||
* @brief UpdateStandartTableCell update standart table row by name
|
||||
* @brief UpdateStandardTableCell update standard table row by name
|
||||
* @param name name of row
|
||||
* @param cell row of standart table
|
||||
* @param cell row of standard table
|
||||
*/
|
||||
inline void UpdateStandartTableCell(const QString& name, VStandartTableRow cell)
|
||||
{standartTable[name] = cell;}
|
||||
inline void UpdateStandardTableCell(const QString& name, VStandardTableRow cell)
|
||||
{standardTable[name] = cell;}
|
||||
/**
|
||||
* @brief UpdateIncrementTableRow update increment table row by name
|
||||
* @param name name of row
|
||||
|
@ -239,11 +239,11 @@ public:
|
|||
inline void UpdateIncrementTableRow(const QString& name, VIncrementTableRow row)
|
||||
{incrementTable[name] = row;}
|
||||
/**
|
||||
* @brief GetValueStandartTableCell return value of standart table row by name
|
||||
* @brief GetValueStandardTableCell return value of standard table row by name
|
||||
* @param name name of row
|
||||
* @return value in mm
|
||||
*/
|
||||
qreal GetValueStandartTableCell(const QString& name) const;
|
||||
qreal GetValueStandardTableCell(const QString& name) const;
|
||||
/**
|
||||
* @brief GetValueIncrementTableRow return value of increment table row by name
|
||||
* @param name name of row
|
||||
|
@ -334,10 +334,10 @@ public:
|
|||
*/
|
||||
inline const QHash<QString, qint32> *DataBase() const {return &base;}
|
||||
/**
|
||||
* @brief data container with dataStandartTable return container of standart table
|
||||
* @return pointer on container of standart table
|
||||
* @brief data container with dataStandardTable return container of standard table
|
||||
* @return pointer on container of standard table
|
||||
*/
|
||||
inline const QHash<QString, VStandartTableRow> *DataStandartTable() const {return &standartTable;}
|
||||
inline const QHash<QString, VStandardTableRow> *DataStandardTable() const {return &standardTable;}
|
||||
/**
|
||||
* @brief data container with dataIncrementTable return container of increment table
|
||||
* @return pointer on container of increment table
|
||||
|
@ -431,7 +431,7 @@ public:
|
|||
*/
|
||||
void PrepareDetails(QVector<VItem *> & list) const;
|
||||
/**
|
||||
* @brief CreateManTableIGroup generate man standart table of measurements
|
||||
* @brief CreateManTableIGroup generate man standard table of measurements
|
||||
*/
|
||||
void CreateManTableIGroup ();
|
||||
private:
|
||||
|
@ -448,9 +448,9 @@ private:
|
|||
*/
|
||||
QHash<qint64, VGObject*> gObjects;
|
||||
/**
|
||||
* @brief standartTable container of standart table rows
|
||||
* @brief standardTable container of standard table rows
|
||||
*/
|
||||
QHash<QString, VStandartTableRow> standartTable;
|
||||
QHash<QString, VStandardTableRow> standardTable;
|
||||
/**
|
||||
* @brief incrementTable
|
||||
*/
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
/************************************************************************
|
||||
**
|
||||
** @file vstandarttablecell.cpp
|
||||
** @file vstandardtablecell.cpp
|
||||
** @author Roman Telezhinsky <dismine@gmail.com>
|
||||
** @date November 15, 2013
|
||||
**
|
||||
|
@ -26,11 +26,11 @@
|
|||
**
|
||||
*************************************************************************/
|
||||
|
||||
#include "vstandarttablerow.h"
|
||||
#include "vstandardtablerow.h"
|
||||
|
||||
VStandartTableRow::VStandartTableRow()
|
||||
VStandardTableRow::VStandardTableRow()
|
||||
:base(0), ksize(0), kgrowth(0), description(QString()){}
|
||||
|
||||
VStandartTableRow::VStandartTableRow(const qint32 &base, const qreal &ksize, const qreal &kgrowth,
|
||||
VStandardTableRow::VStandardTableRow(const qint32 &base, const qreal &ksize, const qreal &kgrowth,
|
||||
const QString &description)
|
||||
:base(base), ksize(ksize), kgrowth(kgrowth), description(description){}
|
|
@ -1,6 +1,6 @@
|
|||
/************************************************************************
|
||||
**
|
||||
** @file vstandarttablecell.h
|
||||
** @file vstandardtablecell.h
|
||||
** @author Roman Telezhinsky <dismine@gmail.com>
|
||||
** @date November 15, 2013
|
||||
**
|
||||
|
@ -26,31 +26,31 @@
|
|||
**
|
||||
*************************************************************************/
|
||||
|
||||
#ifndef VSTANDARTTABLEROW_H
|
||||
#define VSTANDARTTABLEROW_H
|
||||
#ifndef VSTANDARDTABLEROW_H
|
||||
#define VSTANDARDTABLEROW_H
|
||||
|
||||
#include <QString>
|
||||
|
||||
/**
|
||||
* @brief The VStandartTableRow class keep data row of standart table
|
||||
* @brief The VStandardTableRow class keep data row of standard table
|
||||
*/
|
||||
class VStandartTableRow
|
||||
class VStandardTableRow
|
||||
{
|
||||
public:
|
||||
/**
|
||||
* @brief VStandartTableRow create empty row
|
||||
* @brief VStandardTableRow create empty row
|
||||
*/
|
||||
VStandartTableRow();
|
||||
VStandardTableRow();
|
||||
/**
|
||||
* @brief VStandartTableRow create row
|
||||
* @brief VStandardTableRow create row
|
||||
* @param base value in base size and growth
|
||||
* @param ksize increment in sizes
|
||||
* @param kgrowth increment in growths
|
||||
* @param description description of increment
|
||||
*/
|
||||
VStandartTableRow(const qint32 &base, const qreal &ksize, const qreal &kgrowth,
|
||||
VStandardTableRow(const qint32 &base, const qreal &ksize, const qreal &kgrowth,
|
||||
const QString &description = QString());
|
||||
~VStandartTableRow(){}
|
||||
~VStandardTableRow(){}
|
||||
/**
|
||||
* @brief GetBase return value in base size and growth
|
||||
* @return value
|
||||
|
@ -90,4 +90,4 @@ private:
|
|||
QString description;
|
||||
};
|
||||
|
||||
#endif // VSTANDARTTABLEROW_H
|
||||
#endif // VSTANDARDTABLEROW_H
|
|
@ -40,7 +40,7 @@ DialogAlongLine::DialogAlongLine(const VContainer *data, QWidget *parent)
|
|||
labelResultCalculation = ui->labelResultCalculation;
|
||||
labelDescription = ui->labelDescription;
|
||||
radioButtonSizeGrowth = ui->radioButtonSizeGrowth;
|
||||
radioButtonStandartTable = ui->radioButtonStandartTable;
|
||||
radioButtonStandardTable = ui->radioButtonStandardTable;
|
||||
radioButtonIncrements = ui->radioButtonIncrements;
|
||||
radioButtonLengthLine = ui->radioButtonLengthLine;
|
||||
radioButtonLengthArc = ui->radioButtonLengthArc;
|
||||
|
@ -66,7 +66,7 @@ DialogAlongLine::DialogAlongLine(const VContainer *data, QWidget *parent)
|
|||
|
||||
ShowVariable(data->DataBase());
|
||||
connect(ui->radioButtonSizeGrowth, &QRadioButton::clicked, this, &DialogAlongLine::SizeGrowth);
|
||||
connect(ui->radioButtonStandartTable, &QRadioButton::clicked, this, &DialogAlongLine::StandartTable);
|
||||
connect(ui->radioButtonStandardTable, &QRadioButton::clicked, this, &DialogAlongLine::StandardTable);
|
||||
connect(ui->radioButtonIncrements, &QRadioButton::clicked, this, &DialogAlongLine::Increments);
|
||||
connect(ui->radioButtonLengthLine, &QRadioButton::clicked, this, &DialogAlongLine::LengthLines);
|
||||
connect(ui->radioButtonLengthArc, &QRadioButton::clicked, this, &DialogAlongLine::LengthArcs);
|
||||
|
|
|
@ -279,7 +279,7 @@
|
|||
</widget>
|
||||
</item>
|
||||
<item>
|
||||
<widget class="QRadioButton" name="radioButtonStandartTable">
|
||||
<widget class="QRadioButton" name="radioButtonStandardTable">
|
||||
<property name="text">
|
||||
<string>Standard table</string>
|
||||
</property>
|
||||
|
@ -359,7 +359,7 @@
|
|||
<tabstop>comboBoxSecondPoint</tabstop>
|
||||
<tabstop>comboBoxLineType</tabstop>
|
||||
<tabstop>radioButtonSizeGrowth</tabstop>
|
||||
<tabstop>radioButtonStandartTable</tabstop>
|
||||
<tabstop>radioButtonStandardTable</tabstop>
|
||||
<tabstop>radioButtonIncrements</tabstop>
|
||||
<tabstop>radioButtonLengthLine</tabstop>
|
||||
<tabstop>radioButtonLengthArc</tabstop>
|
||||
|
|
|
@ -60,7 +60,7 @@ DialogArc::DialogArc(const VContainer *data, QWidget *parent)
|
|||
listWidget = ui->listWidget;
|
||||
labelDescription = ui->labelDescription;
|
||||
radioButtonSizeGrowth = ui->radioButtonSizeGrowth;
|
||||
radioButtonStandartTable = ui->radioButtonStandartTable;
|
||||
radioButtonStandardTable = ui->radioButtonStandardTable;
|
||||
radioButtonIncrements = ui->radioButtonIncrements;
|
||||
radioButtonLengthLine = ui->radioButtonLengthLine;
|
||||
radioButtonLengthArc = ui->radioButtonLengthArc;
|
||||
|
@ -73,7 +73,7 @@ DialogArc::DialogArc(const VContainer *data, QWidget *parent)
|
|||
|
||||
ShowVariable(data->DataBase());
|
||||
connect(ui->radioButtonSizeGrowth, &QRadioButton::clicked, this, &DialogArc::SizeGrowth);
|
||||
connect(ui->radioButtonStandartTable, &QRadioButton::clicked, this, &DialogArc::StandartTable);
|
||||
connect(ui->radioButtonStandardTable, &QRadioButton::clicked, this, &DialogArc::StandardTable);
|
||||
connect(ui->radioButtonIncrements, &QRadioButton::clicked, this, &DialogArc::Increments);
|
||||
connect(ui->radioButtonLengthLine, &QRadioButton::clicked, this, &DialogArc::LengthLines);
|
||||
connect(ui->radioButtonLineAngles, &QRadioButton::clicked, this, &DialogArc::LineAngles);
|
||||
|
|
|
@ -456,7 +456,7 @@
|
|||
</widget>
|
||||
</item>
|
||||
<item>
|
||||
<widget class="QRadioButton" name="radioButtonStandartTable">
|
||||
<widget class="QRadioButton" name="radioButtonStandardTable">
|
||||
<property name="text">
|
||||
<string>Standard table</string>
|
||||
</property>
|
||||
|
@ -547,7 +547,7 @@
|
|||
<tabstop>lineEditF2</tabstop>
|
||||
<tabstop>comboBoxBasePoint</tabstop>
|
||||
<tabstop>radioButtonSizeGrowth</tabstop>
|
||||
<tabstop>radioButtonStandartTable</tabstop>
|
||||
<tabstop>radioButtonStandardTable</tabstop>
|
||||
<tabstop>radioButtonIncrements</tabstop>
|
||||
<tabstop>radioButtonLengthLine</tabstop>
|
||||
<tabstop>radioButtonLengthArc</tabstop>
|
||||
|
|
|
@ -40,7 +40,7 @@ DialogBisector::DialogBisector(const VContainer *data, QWidget *parent)
|
|||
labelResultCalculation = ui->labelResultCalculation;
|
||||
labelDescription = ui->labelDescription;
|
||||
radioButtonSizeGrowth = ui->radioButtonSizeGrowth;
|
||||
radioButtonStandartTable = ui->radioButtonStandartTable;
|
||||
radioButtonStandardTable = ui->radioButtonStandardTable;
|
||||
radioButtonIncrements = ui->radioButtonIncrements;
|
||||
radioButtonLengthLine = ui->radioButtonLengthLine;
|
||||
radioButtonLengthArc = ui->radioButtonLengthArc;
|
||||
|
@ -67,7 +67,7 @@ DialogBisector::DialogBisector(const VContainer *data, QWidget *parent)
|
|||
|
||||
ShowVariable(data->DataBase());
|
||||
connect(ui->radioButtonSizeGrowth, &QRadioButton::clicked, this, &DialogBisector::SizeGrowth);
|
||||
connect(ui->radioButtonStandartTable, &QRadioButton::clicked, this, &DialogBisector::StandartTable);
|
||||
connect(ui->radioButtonStandardTable, &QRadioButton::clicked, this, &DialogBisector::StandardTable);
|
||||
connect(ui->radioButtonIncrements, &QRadioButton::clicked, this, &DialogBisector::Increments);
|
||||
connect(ui->radioButtonLengthLine, &QRadioButton::clicked, this, &DialogBisector::LengthLines);
|
||||
connect(ui->radioButtonLengthArc, &QRadioButton::clicked, this, &DialogBisector::LengthArcs);
|
||||
|
|
|
@ -318,7 +318,7 @@
|
|||
</widget>
|
||||
</item>
|
||||
<item>
|
||||
<widget class="QRadioButton" name="radioButtonStandartTable">
|
||||
<widget class="QRadioButton" name="radioButtonStandardTable">
|
||||
<property name="text">
|
||||
<string>Standard table</string>
|
||||
</property>
|
||||
|
@ -404,7 +404,7 @@
|
|||
<tabstop>comboBoxThirdPoint</tabstop>
|
||||
<tabstop>comboBoxLineType</tabstop>
|
||||
<tabstop>radioButtonSizeGrowth</tabstop>
|
||||
<tabstop>radioButtonStandartTable</tabstop>
|
||||
<tabstop>radioButtonStandardTable</tabstop>
|
||||
<tabstop>radioButtonIncrements</tabstop>
|
||||
<tabstop>radioButtonLengthLine</tabstop>
|
||||
<tabstop>radioButtonLengthArc</tabstop>
|
||||
|
|
|
@ -37,7 +37,7 @@ DialogCutArc::DialogCutArc(const VContainer *data, QWidget *parent) :
|
|||
labelResultCalculation = ui->labelResultCalculation;
|
||||
labelDescription = ui->labelDescription;
|
||||
radioButtonSizeGrowth = ui->radioButtonSizeGrowth;
|
||||
radioButtonStandartTable = ui->radioButtonStandartTable;
|
||||
radioButtonStandardTable = ui->radioButtonStandardTable;
|
||||
radioButtonIncrements = ui->radioButtonIncrements;
|
||||
radioButtonLengthLine = ui->radioButtonLengthLine;
|
||||
radioButtonLengthArc = ui->radioButtonLengthArc;
|
||||
|
@ -61,7 +61,7 @@ DialogCutArc::DialogCutArc(const VContainer *data, QWidget *parent) :
|
|||
|
||||
ShowVariable(data->DataBase());
|
||||
connect(ui->radioButtonSizeGrowth, &QRadioButton::clicked, this, &DialogCutArc::SizeGrowth);
|
||||
connect(ui->radioButtonStandartTable, &QRadioButton::clicked, this, &DialogCutArc::StandartTable);
|
||||
connect(ui->radioButtonStandardTable, &QRadioButton::clicked, this, &DialogCutArc::StandardTable);
|
||||
connect(ui->radioButtonIncrements, &QRadioButton::clicked, this, &DialogCutArc::Increments);
|
||||
connect(ui->radioButtonLengthLine, &QRadioButton::clicked, this, &DialogCutArc::LengthLines);
|
||||
connect(ui->radioButtonLengthArc, &QRadioButton::clicked, this, &DialogCutArc::LengthArcs);
|
||||
|
|
|
@ -245,7 +245,7 @@
|
|||
</widget>
|
||||
</item>
|
||||
<item>
|
||||
<widget class="QRadioButton" name="radioButtonStandartTable">
|
||||
<widget class="QRadioButton" name="radioButtonStandardTable">
|
||||
<property name="text">
|
||||
<string>Standard table</string>
|
||||
</property>
|
||||
|
|
|
@ -37,7 +37,7 @@ DialogCutSpline::DialogCutSpline(const VContainer *data, QWidget *parent)
|
|||
labelResultCalculation = ui->labelResultCalculation;
|
||||
labelDescription = ui->labelDescription;
|
||||
radioButtonSizeGrowth = ui->radioButtonSizeGrowth;
|
||||
radioButtonStandartTable = ui->radioButtonStandartTable;
|
||||
radioButtonStandardTable = ui->radioButtonStandardTable;
|
||||
radioButtonIncrements = ui->radioButtonIncrements;
|
||||
radioButtonLengthLine = ui->radioButtonLengthLine;
|
||||
radioButtonLengthArc = ui->radioButtonLengthArc;
|
||||
|
@ -61,7 +61,7 @@ DialogCutSpline::DialogCutSpline(const VContainer *data, QWidget *parent)
|
|||
|
||||
ShowVariable(data->DataBase());
|
||||
connect(ui->radioButtonSizeGrowth, &QRadioButton::clicked, this, &DialogCutSpline::SizeGrowth);
|
||||
connect(ui->radioButtonStandartTable, &QRadioButton::clicked, this, &DialogCutSpline::StandartTable);
|
||||
connect(ui->radioButtonStandardTable, &QRadioButton::clicked, this, &DialogCutSpline::StandardTable);
|
||||
connect(ui->radioButtonIncrements, &QRadioButton::clicked, this, &DialogCutSpline::Increments);
|
||||
connect(ui->radioButtonLengthLine, &QRadioButton::clicked, this, &DialogCutSpline::LengthLines);
|
||||
connect(ui->radioButtonLengthArc, &QRadioButton::clicked, this, &DialogCutSpline::LengthArcs);
|
||||
|
|
|
@ -245,7 +245,7 @@
|
|||
</widget>
|
||||
</item>
|
||||
<item>
|
||||
<widget class="QRadioButton" name="radioButtonStandartTable">
|
||||
<widget class="QRadioButton" name="radioButtonStandardTable">
|
||||
<property name="text">
|
||||
<string>Standard table</string>
|
||||
</property>
|
||||
|
|
|
@ -38,7 +38,7 @@ DialogCutSplinePath::DialogCutSplinePath(const VContainer *data, QWidget *parent
|
|||
labelResultCalculation = ui->labelResultCalculation;
|
||||
labelDescription = ui->labelDescription;
|
||||
radioButtonSizeGrowth = ui->radioButtonSizeGrowth;
|
||||
radioButtonStandartTable = ui->radioButtonStandartTable;
|
||||
radioButtonStandardTable = ui->radioButtonStandardTable;
|
||||
radioButtonIncrements = ui->radioButtonIncrements;
|
||||
radioButtonLengthLine = ui->radioButtonLengthLine;
|
||||
radioButtonLengthArc = ui->radioButtonLengthArc;
|
||||
|
@ -62,7 +62,7 @@ DialogCutSplinePath::DialogCutSplinePath(const VContainer *data, QWidget *parent
|
|||
|
||||
ShowVariable(data->DataBase());
|
||||
connect(ui->radioButtonSizeGrowth, &QRadioButton::clicked, this, &DialogCutSplinePath::SizeGrowth);
|
||||
connect(ui->radioButtonStandartTable, &QRadioButton::clicked, this, &DialogCutSplinePath::StandartTable);
|
||||
connect(ui->radioButtonStandardTable, &QRadioButton::clicked, this, &DialogCutSplinePath::StandardTable);
|
||||
connect(ui->radioButtonIncrements, &QRadioButton::clicked, this, &DialogCutSplinePath::Increments);
|
||||
connect(ui->radioButtonLengthLine, &QRadioButton::clicked, this, &DialogCutSplinePath::LengthLines);
|
||||
connect(ui->radioButtonLengthArc, &QRadioButton::clicked, this, &DialogCutSplinePath::LengthArcs);
|
||||
|
|
|
@ -245,7 +245,7 @@
|
|||
</widget>
|
||||
</item>
|
||||
<item>
|
||||
<widget class="QRadioButton" name="radioButtonStandartTable">
|
||||
<widget class="QRadioButton" name="radioButtonStandardTable">
|
||||
<property name="text">
|
||||
<string>Standard table</string>
|
||||
</property>
|
||||
|
|
|
@ -41,7 +41,7 @@ DialogEndLine::DialogEndLine(const VContainer *data, QWidget *parent)
|
|||
labelResultCalculation = ui->labelResultCalculation;
|
||||
labelDescription = ui->labelDescription;
|
||||
radioButtonSizeGrowth = ui->radioButtonSizeGrowth;
|
||||
radioButtonStandartTable = ui->radioButtonStandartTable;
|
||||
radioButtonStandardTable = ui->radioButtonStandardTable;
|
||||
radioButtonIncrements = ui->radioButtonIncrements;
|
||||
radioButtonLengthLine = ui->radioButtonLengthLine;
|
||||
radioButtonLengthArc = ui->radioButtonLengthArc;
|
||||
|
@ -83,7 +83,7 @@ DialogEndLine::DialogEndLine(const VContainer *data, QWidget *parent)
|
|||
|
||||
ShowVariable(data->DataBase());
|
||||
connect(ui->radioButtonSizeGrowth, &QRadioButton::clicked, this, &DialogEndLine::SizeGrowth);
|
||||
connect(ui->radioButtonStandartTable, &QRadioButton::clicked, this, &DialogEndLine::StandartTable);
|
||||
connect(ui->radioButtonStandardTable, &QRadioButton::clicked, this, &DialogEndLine::StandardTable);
|
||||
connect(ui->radioButtonIncrements, &QRadioButton::clicked, this, &DialogEndLine::Increments);
|
||||
connect(ui->radioButtonLengthLine, &QRadioButton::clicked, this, &DialogEndLine::LengthLines);
|
||||
connect(ui->radioButtonLengthArc, &QRadioButton::clicked, this, &DialogEndLine::LengthArcs);
|
||||
|
|
|
@ -474,7 +474,7 @@
|
|||
</widget>
|
||||
</item>
|
||||
<item>
|
||||
<widget class="QRadioButton" name="radioButtonStandartTable">
|
||||
<widget class="QRadioButton" name="radioButtonStandardTable">
|
||||
<property name="text">
|
||||
<string>Standard table</string>
|
||||
</property>
|
||||
|
@ -564,7 +564,7 @@
|
|||
<tabstop>toolButtonArrowRightDown</tabstop>
|
||||
<tabstop>comboBoxLineType</tabstop>
|
||||
<tabstop>radioButtonSizeGrowth</tabstop>
|
||||
<tabstop>radioButtonStandartTable</tabstop>
|
||||
<tabstop>radioButtonStandardTable</tabstop>
|
||||
<tabstop>radioButtonIncrements</tabstop>
|
||||
<tabstop>radioButtonLengthLine</tabstop>
|
||||
<tabstop>radioButtonLengthArc</tabstop>
|
||||
|
|
|
@ -37,7 +37,7 @@ DialogIncrements::DialogIncrements(VContainer *data, VDomDocument *doc, QWidget
|
|||
:DialogTool(data, parent), ui(new Ui::DialogIncrements), data(data), doc(doc), row(0), column(0)
|
||||
{
|
||||
ui->setupUi(this);
|
||||
InitialStandartTable();
|
||||
InitialStandardTable();
|
||||
InitialIncrementTable();
|
||||
InitialLinesTable();
|
||||
InitialSplinesTable();
|
||||
|
@ -46,7 +46,7 @@ DialogIncrements::DialogIncrements(VContainer *data, VDomDocument *doc, QWidget
|
|||
ui->tableWidgetIncrement->setItemDelegateForColumn(2, doubleDelegate);
|
||||
ui->tableWidgetIncrement->setItemDelegateForColumn(3, doubleDelegate);
|
||||
ui->tableWidgetIncrement->setItemDelegateForColumn(4, doubleDelegate);
|
||||
FillStandartTable();
|
||||
FillStandardTable();
|
||||
FillIncrementTable();
|
||||
FillLengthLines();
|
||||
FillLengthSplines();
|
||||
|
@ -67,46 +67,46 @@ DialogIncrements::DialogIncrements(VContainer *data, VDomDocument *doc, QWidget
|
|||
ui->tabWidget->setCurrentIndex(0);
|
||||
}
|
||||
|
||||
void DialogIncrements::FillStandartTable()
|
||||
void DialogIncrements::FillStandardTable()
|
||||
{
|
||||
const QHash<QString, VStandartTableRow> *standartTable = data->DataStandartTable();
|
||||
const QHash<QString, VStandardTableRow> *standardTable = data->DataStandardTable();
|
||||
qint32 currentRow = -1;
|
||||
QHashIterator<QString, VStandartTableRow> i(*standartTable);
|
||||
ui->tableWidgetStandart->setRowCount ( standartTable->size() );
|
||||
QHashIterator<QString, VStandardTableRow> i(*standardTable);
|
||||
ui->tableWidgetStandard->setRowCount ( standardTable->size() );
|
||||
while (i.hasNext())
|
||||
{
|
||||
i.next();
|
||||
VStandartTableRow cell = i.value();
|
||||
VStandardTableRow cell = i.value();
|
||||
currentRow++;
|
||||
|
||||
QTableWidgetItem *item = new QTableWidgetItem(QString(i.key()));
|
||||
item->setTextAlignment(Qt::AlignHCenter);
|
||||
item->setFont(QFont("Times", 12, QFont::Bold));
|
||||
ui->tableWidgetStandart->setItem(currentRow, 0, item);
|
||||
ui->tableWidgetStandard->setItem(currentRow, 0, item);
|
||||
|
||||
item = new QTableWidgetItem(QString().setNum(data->GetValueStandartTableCell(i.key())));
|
||||
item = new QTableWidgetItem(QString().setNum(data->GetValueStandardTableCell(i.key())));
|
||||
item->setTextAlignment(Qt::AlignHCenter);
|
||||
ui->tableWidgetStandart->setItem(currentRow, 1, item);
|
||||
ui->tableWidgetStandard->setItem(currentRow, 1, item);
|
||||
|
||||
item = new QTableWidgetItem(QString().setNum(cell.GetBase()));
|
||||
item->setTextAlignment(Qt::AlignHCenter);
|
||||
ui->tableWidgetStandart->setItem(currentRow, 2, item);
|
||||
ui->tableWidgetStandard->setItem(currentRow, 2, item);
|
||||
|
||||
item = new QTableWidgetItem(QString().setNum(cell.GetKsize()));
|
||||
item->setTextAlignment(Qt::AlignHCenter);
|
||||
ui->tableWidgetStandart->setItem(currentRow, 3, item);
|
||||
ui->tableWidgetStandard->setItem(currentRow, 3, item);
|
||||
|
||||
item = new QTableWidgetItem(QString().setNum(cell.GetKgrowth()));
|
||||
item->setTextAlignment(Qt::AlignHCenter);
|
||||
ui->tableWidgetStandart->setItem(currentRow, 4, item);
|
||||
ui->tableWidgetStandard->setItem(currentRow, 4, item);
|
||||
|
||||
item = new QTableWidgetItem(cell.GetDescription());
|
||||
item->setTextAlignment(Qt::AlignHCenter);
|
||||
ui->tableWidgetStandart->setItem(currentRow, 5, item);
|
||||
ui->tableWidgetStandard->setItem(currentRow, 5, item);
|
||||
}
|
||||
ui->tableWidgetStandart->resizeColumnsToContents();
|
||||
ui->tableWidgetStandart->resizeRowsToContents();
|
||||
ui->tableWidgetStandart->verticalHeader()->setDefaultSectionSize(20);
|
||||
ui->tableWidgetStandard->resizeColumnsToContents();
|
||||
ui->tableWidgetStandard->resizeRowsToContents();
|
||||
ui->tableWidgetStandard->verticalHeader()->setDefaultSectionSize(20);
|
||||
}
|
||||
|
||||
void DialogIncrements::FillIncrementTable()
|
||||
|
@ -280,9 +280,9 @@ void DialogIncrements::FullUpdateFromFile()
|
|||
disconnect(ui->tableWidgetIncrement, &QTableWidget::cellChanged, this,
|
||||
&DialogIncrements::cellChanged);
|
||||
|
||||
ui->tableWidgetStandart->clear();
|
||||
InitialStandartTable();
|
||||
FillStandartTable();
|
||||
ui->tableWidgetStandard->clear();
|
||||
InitialStandardTable();
|
||||
FillStandardTable();
|
||||
|
||||
ui->tableWidgetIncrement->clear();
|
||||
InitialIncrementTable();
|
||||
|
@ -513,15 +513,15 @@ void DialogIncrements::cellChanged ( qint32 row, qint32 column )
|
|||
}
|
||||
}
|
||||
|
||||
void DialogIncrements::InitialStandartTable()
|
||||
void DialogIncrements::InitialStandardTable()
|
||||
{
|
||||
ui->tableWidgetStandart->setSortingEnabled(false);
|
||||
ui->tableWidgetStandart->setHorizontalHeaderItem(0, new QTableWidgetItem(tr("Name")));
|
||||
ui->tableWidgetStandart->setHorizontalHeaderItem(1, new QTableWidgetItem(tr("Calculated value")));
|
||||
ui->tableWidgetStandart->setHorizontalHeaderItem(2, new QTableWidgetItem(tr("Base value")));
|
||||
ui->tableWidgetStandart->setHorizontalHeaderItem(3, new QTableWidgetItem(tr("In size")));
|
||||
ui->tableWidgetStandart->setHorizontalHeaderItem(4, new QTableWidgetItem(tr("In growth")));
|
||||
ui->tableWidgetStandart->setHorizontalHeaderItem(5, new QTableWidgetItem(tr("Description")));
|
||||
ui->tableWidgetStandard->setSortingEnabled(false);
|
||||
ui->tableWidgetStandard->setHorizontalHeaderItem(0, new QTableWidgetItem(tr("Name")));
|
||||
ui->tableWidgetStandard->setHorizontalHeaderItem(1, new QTableWidgetItem(tr("Calculated value")));
|
||||
ui->tableWidgetStandard->setHorizontalHeaderItem(2, new QTableWidgetItem(tr("Base value")));
|
||||
ui->tableWidgetStandard->setHorizontalHeaderItem(3, new QTableWidgetItem(tr("In size")));
|
||||
ui->tableWidgetStandard->setHorizontalHeaderItem(4, new QTableWidgetItem(tr("In growth")));
|
||||
ui->tableWidgetStandard->setHorizontalHeaderItem(5, new QTableWidgetItem(tr("Description")));
|
||||
}
|
||||
|
||||
void DialogIncrements::InitialIncrementTable()
|
||||
|
|
|
@ -107,9 +107,9 @@ private:
|
|||
*/
|
||||
qint32 column;
|
||||
/**
|
||||
* @brief InitialStandartTable initial option standart table
|
||||
* @brief InitialStandardTable initial option standard table
|
||||
*/
|
||||
void InitialStandartTable();
|
||||
void InitialStandardTable();
|
||||
/**
|
||||
* @brief InitialIncrementTable initial option increment table
|
||||
*/
|
||||
|
@ -127,9 +127,9 @@ private:
|
|||
*/
|
||||
void InitialArcsTable();
|
||||
/**
|
||||
* @brief FillStandartTable fill data for standart table
|
||||
* @brief FillStandardTable fill data for standard table
|
||||
*/
|
||||
void FillStandartTable();
|
||||
void FillStandardTable();
|
||||
/**
|
||||
* @brief FillIncrementTable fill data for increment table
|
||||
*/
|
||||
|
|
|
@ -29,13 +29,13 @@
|
|||
<property name="currentIndex">
|
||||
<number>1</number>
|
||||
</property>
|
||||
<widget class="QWidget" name="tabStandart">
|
||||
<widget class="QWidget" name="tabStandard">
|
||||
<attribute name="title">
|
||||
<string>Sizes table</string>
|
||||
</attribute>
|
||||
<layout class="QGridLayout" name="gridLayout_2">
|
||||
<item row="0" column="0">
|
||||
<widget class="QTableWidget" name="tableWidgetStandart">
|
||||
<widget class="QTableWidget" name="tableWidgetStandard">
|
||||
<property name="enabled">
|
||||
<bool>true</bool>
|
||||
</property>
|
||||
|
@ -346,7 +346,7 @@
|
|||
</widget>
|
||||
<tabstops>
|
||||
<tabstop>tabWidget</tabstop>
|
||||
<tabstop>tableWidgetStandart</tabstop>
|
||||
<tabstop>tableWidgetStandard</tabstop>
|
||||
<tabstop>tableWidgetIncrement</tabstop>
|
||||
<tabstop>toolButtonAdd</tabstop>
|
||||
<tabstop>toolButtonRemove</tabstop>
|
||||
|
|
|
@ -41,7 +41,7 @@ DialogNormal::DialogNormal(const VContainer *data, QWidget *parent)
|
|||
labelResultCalculation = ui->labelResultCalculation;
|
||||
labelDescription = ui->labelDescription;
|
||||
radioButtonSizeGrowth = ui->radioButtonSizeGrowth;
|
||||
radioButtonStandartTable = ui->radioButtonStandartTable;
|
||||
radioButtonStandardTable = ui->radioButtonStandardTable;
|
||||
radioButtonIncrements = ui->radioButtonIncrements;
|
||||
radioButtonLengthLine = ui->radioButtonLengthLine;
|
||||
radioButtonLengthArc = ui->radioButtonLengthArc;
|
||||
|
@ -83,7 +83,7 @@ DialogNormal::DialogNormal(const VContainer *data, QWidget *parent)
|
|||
|
||||
ShowVariable(data->DataBase());
|
||||
connect(ui->radioButtonSizeGrowth, &QRadioButton::clicked, this, &DialogNormal::SizeGrowth);
|
||||
connect(ui->radioButtonStandartTable, &QRadioButton::clicked, this, &DialogNormal::StandartTable);
|
||||
connect(ui->radioButtonStandardTable, &QRadioButton::clicked, this, &DialogNormal::StandardTable);
|
||||
connect(ui->radioButtonIncrements, &QRadioButton::clicked, this, &DialogNormal::Increments);
|
||||
connect(ui->radioButtonLengthLine, &QRadioButton::clicked, this, &DialogNormal::LengthLines);
|
||||
connect(ui->radioButtonLengthArc, &QRadioButton::clicked, this, &DialogNormal::LengthArcs);
|
||||
|
|
|
@ -493,7 +493,7 @@
|
|||
</widget>
|
||||
</item>
|
||||
<item>
|
||||
<widget class="QRadioButton" name="radioButtonStandartTable">
|
||||
<widget class="QRadioButton" name="radioButtonStandardTable">
|
||||
<property name="text">
|
||||
<string>Standard table</string>
|
||||
</property>
|
||||
|
@ -584,7 +584,7 @@
|
|||
<tabstop>toolButtonArrowRightDown</tabstop>
|
||||
<tabstop>comboBoxLineType</tabstop>
|
||||
<tabstop>radioButtonSizeGrowth</tabstop>
|
||||
<tabstop>radioButtonStandartTable</tabstop>
|
||||
<tabstop>radioButtonStandardTable</tabstop>
|
||||
<tabstop>radioButtonIncrements</tabstop>
|
||||
<tabstop>radioButtonLengthLine</tabstop>
|
||||
<tabstop>radioButtonLengthArc</tabstop>
|
||||
|
|
|
@ -39,7 +39,7 @@ DialogPointOfContact::DialogPointOfContact(const VContainer *data, QWidget *pare
|
|||
labelResultCalculation = ui.labelResultCalculation;
|
||||
labelDescription = ui.labelDescription;
|
||||
radioButtonSizeGrowth = ui.radioButtonSizeGrowth;
|
||||
radioButtonStandartTable = ui.radioButtonStandartTable;
|
||||
radioButtonStandardTable = ui.radioButtonStandardTable;
|
||||
radioButtonIncrements = ui.radioButtonIncrements;
|
||||
radioButtonLengthLine = ui.radioButtonLengthLine;
|
||||
radioButtonLengthArc = ui.radioButtonLengthArc;
|
||||
|
@ -65,7 +65,7 @@ DialogPointOfContact::DialogPointOfContact(const VContainer *data, QWidget *pare
|
|||
|
||||
ShowVariable(data->DataBase());
|
||||
connect(ui.radioButtonSizeGrowth, &QRadioButton::clicked, this, &DialogPointOfContact::SizeGrowth);
|
||||
connect(ui.radioButtonStandartTable, &QRadioButton::clicked, this, &DialogPointOfContact::StandartTable);
|
||||
connect(ui.radioButtonStandardTable, &QRadioButton::clicked, this, &DialogPointOfContact::StandardTable);
|
||||
connect(ui.radioButtonIncrements, &QRadioButton::clicked, this, &DialogPointOfContact::Increments);
|
||||
connect(ui.radioButtonLengthLine, &QRadioButton::clicked, this, &DialogPointOfContact::LengthLines);
|
||||
connect(ui.radioButtonLengthArc, &QRadioButton::clicked, this, &DialogPointOfContact::LengthArcs);
|
||||
|
|
|
@ -333,7 +333,7 @@
|
|||
</widget>
|
||||
</item>
|
||||
<item>
|
||||
<widget class="QRadioButton" name="radioButtonStandartTable">
|
||||
<widget class="QRadioButton" name="radioButtonStandardTable">
|
||||
<property name="text">
|
||||
<string>Standard table</string>
|
||||
</property>
|
||||
|
@ -415,7 +415,7 @@
|
|||
<tabstop>comboBoxFirstPoint</tabstop>
|
||||
<tabstop>comboBoxSecondPoint</tabstop>
|
||||
<tabstop>radioButtonSizeGrowth</tabstop>
|
||||
<tabstop>radioButtonStandartTable</tabstop>
|
||||
<tabstop>radioButtonStandardTable</tabstop>
|
||||
<tabstop>radioButtonIncrements</tabstop>
|
||||
<tabstop>radioButtonLengthLine</tabstop>
|
||||
<tabstop>radioButtonLengthArc</tabstop>
|
||||
|
|
|
@ -41,7 +41,7 @@ DialogShoulderPoint::DialogShoulderPoint(const VContainer *data, QWidget *parent
|
|||
labelResultCalculation = ui->labelResultCalculation;
|
||||
labelDescription = ui->labelDescription;
|
||||
radioButtonSizeGrowth = ui->radioButtonSizeGrowth;
|
||||
radioButtonStandartTable = ui->radioButtonStandartTable;
|
||||
radioButtonStandardTable = ui->radioButtonStandardTable;
|
||||
radioButtonIncrements = ui->radioButtonIncrements;
|
||||
radioButtonLengthLine = ui->radioButtonLengthLine;
|
||||
radioButtonLengthArc = ui->radioButtonLengthArc;
|
||||
|
@ -68,7 +68,7 @@ DialogShoulderPoint::DialogShoulderPoint(const VContainer *data, QWidget *parent
|
|||
|
||||
ShowVariable(data->DataBase());
|
||||
connect(ui->radioButtonSizeGrowth, &QRadioButton::clicked, this, &DialogShoulderPoint::SizeGrowth);
|
||||
connect(ui->radioButtonStandartTable, &QRadioButton::clicked, this, &DialogShoulderPoint::StandartTable);
|
||||
connect(ui->radioButtonStandardTable, &QRadioButton::clicked, this, &DialogShoulderPoint::StandardTable);
|
||||
connect(ui->radioButtonIncrements, &QRadioButton::clicked, this, &DialogShoulderPoint::Increments);
|
||||
connect(ui->radioButtonLengthLine, &QRadioButton::clicked, this, &DialogShoulderPoint::LengthLines);
|
||||
connect(ui->radioButtonLengthArc, &QRadioButton::clicked, this, &DialogShoulderPoint::LengthArcs);
|
||||
|
|
|
@ -354,7 +354,7 @@
|
|||
</widget>
|
||||
</item>
|
||||
<item>
|
||||
<widget class="QRadioButton" name="radioButtonStandartTable">
|
||||
<widget class="QRadioButton" name="radioButtonStandardTable">
|
||||
<property name="text">
|
||||
<string>Standard table</string>
|
||||
</property>
|
||||
|
@ -437,7 +437,7 @@
|
|||
<tabstop>comboBoxPShoulder</tabstop>
|
||||
<tabstop>comboBoxLineType</tabstop>
|
||||
<tabstop>radioButtonSizeGrowth</tabstop>
|
||||
<tabstop>radioButtonStandartTable</tabstop>
|
||||
<tabstop>radioButtonStandardTable</tabstop>
|
||||
<tabstop>radioButtonIncrements</tabstop>
|
||||
<tabstop>radioButtonLengthLine</tabstop>
|
||||
<tabstop>radioButtonLengthArc</tabstop>
|
||||
|
|
|
@ -35,7 +35,7 @@
|
|||
DialogTool::DialogTool(const VContainer *data, QWidget *parent)
|
||||
:QDialog(parent), data(data), isInitialized(false), flagName(true), flagFormula(true), timerFormula(0), bOk(0),
|
||||
spinBoxAngle(0), lineEditFormula(0), listWidget(0), labelResultCalculation(0), labelDescription(0),
|
||||
labelEditNamePoint(0), labelEditFormula(0), radioButtonSizeGrowth(0), radioButtonStandartTable(0),
|
||||
labelEditNamePoint(0), labelEditFormula(0), radioButtonSizeGrowth(0), radioButtonStandardTable(0),
|
||||
radioButtonIncrements(0), radioButtonLengthLine(0), radioButtonLengthArc(0), radioButtonLengthCurve(0)
|
||||
{
|
||||
Q_ASSERT(data != 0);
|
||||
|
@ -500,9 +500,9 @@ void DialogTool::SizeGrowth()
|
|||
ShowVariable(data->DataBase());
|
||||
}
|
||||
|
||||
void DialogTool::StandartTable()
|
||||
void DialogTool::StandardTable()
|
||||
{
|
||||
ShowVariable(data->DataStandartTable());
|
||||
ShowVariable(data->DataStandardTable());
|
||||
}
|
||||
|
||||
void DialogTool::LengthLines()
|
||||
|
@ -546,7 +546,7 @@ void DialogTool::ValChenged(int row)
|
|||
Q_ASSERT(listWidget != 0);
|
||||
Q_ASSERT(labelDescription != 0);
|
||||
Q_ASSERT(radioButtonSizeGrowth != 0);
|
||||
Q_ASSERT(radioButtonStandartTable != 0);
|
||||
Q_ASSERT(radioButtonStandardTable != 0);
|
||||
Q_ASSERT(radioButtonIncrements != 0);
|
||||
Q_ASSERT(radioButtonLengthLine != 0);
|
||||
Q_ASSERT(radioButtonLengthArc != 0);
|
||||
|
@ -570,10 +570,10 @@ void DialogTool::ValChenged(int row)
|
|||
}
|
||||
return;
|
||||
}
|
||||
if (radioButtonStandartTable->isChecked())
|
||||
if (radioButtonStandardTable->isChecked())
|
||||
{
|
||||
VStandartTableRow stable = data->GetStandartTableCell(item->text());
|
||||
QString desc = QString("%1(%2) - %3").arg(item->text()).arg(data->GetValueStandartTableCell(item->text()))
|
||||
VStandardTableRow stable = data->GetStandardTableCell(item->text());
|
||||
QString desc = QString("%1(%2) - %3").arg(item->text()).arg(data->GetValueStandardTableCell(item->text()))
|
||||
.arg(stable.GetDescription());
|
||||
labelDescription->setText(desc);
|
||||
return;
|
||||
|
@ -612,7 +612,7 @@ void DialogTool::ValChenged(int row)
|
|||
void DialogTool::UpdateList()
|
||||
{
|
||||
Q_ASSERT(radioButtonSizeGrowth != 0);
|
||||
Q_ASSERT(radioButtonStandartTable != 0);
|
||||
Q_ASSERT(radioButtonStandardTable != 0);
|
||||
Q_ASSERT(radioButtonIncrements != 0);
|
||||
Q_ASSERT(radioButtonLengthLine != 0);
|
||||
Q_ASSERT(radioButtonLengthArc != 0);
|
||||
|
@ -622,9 +622,9 @@ void DialogTool::UpdateList()
|
|||
{
|
||||
ShowVariable(data->DataBase());
|
||||
}
|
||||
if (radioButtonStandartTable->isChecked())
|
||||
if (radioButtonStandardTable->isChecked())
|
||||
{
|
||||
ShowVariable(data->DataStandartTable());
|
||||
ShowVariable(data->DataStandardTable());
|
||||
}
|
||||
if (radioButtonIncrements->isChecked())
|
||||
{
|
||||
|
|
|
@ -140,9 +140,9 @@ public slots:
|
|||
*/
|
||||
void SizeGrowth();
|
||||
/**
|
||||
* @brief StandartTable show in list standart table variables
|
||||
* @brief StandardTable show in list standard table variables
|
||||
*/
|
||||
void StandartTable();
|
||||
void StandardTable();
|
||||
/**
|
||||
* @brief LengthLines show in list lengths of lines variables
|
||||
*/
|
||||
|
@ -236,9 +236,9 @@ protected:
|
|||
*/
|
||||
QRadioButton *radioButtonSizeGrowth;
|
||||
/**
|
||||
* @brief radioButtonStandartTable radio button for standart table variables
|
||||
* @brief radioButtonStandardTable radio button for standard table variables
|
||||
*/
|
||||
QRadioButton *radioButtonStandartTable;
|
||||
QRadioButton *radioButtonStandardTable;
|
||||
/**
|
||||
* @brief radioButtonIncrements radio button for increments variables
|
||||
*/
|
||||
|
|
Loading…
Reference in New Issue
Block a user