diff --git a/src/app/dialogs/app/dialogincrements.h b/src/app/dialogs/app/dialogincrements.h
index 244b6e8a7..2b4d18e03 100644
--- a/src/app/dialogs/app/dialogincrements.h
+++ b/src/app/dialogs/app/dialogincrements.h
@@ -49,10 +49,6 @@ public:
DialogIncrements(VContainer *data, VPattern *doc, QWidget *parent = nullptr);
~DialogIncrements();
public slots:
- /** TODO ISSUE 79 : create real function
- * @brief DialogApply apply data and emit signal about applied dialog.
- */
- virtual void DialogApply(){}
void clickedToolButtonAdd();
void clickedToolButtonRemove();
void IncrementChanged ( qint32 row, qint32 column );
diff --git a/src/app/dialogs/app/dialogindividualmeasurements.cpp b/src/app/dialogs/app/dialogindividualmeasurements.cpp
index 0f1870c14..cfebbdd8a 100644
--- a/src/app/dialogs/app/dialogindividualmeasurements.cpp
+++ b/src/app/dialogs/app/dialogindividualmeasurements.cpp
@@ -145,6 +145,8 @@ void DialogIndividualMeasurements::CheckState()
bool flagPath = false;
if (ui->radioButtonExistM->isChecked())
{
+ ui->labelGivenName->setEnabled(true);
+ ui->labelFamilyName->setEnabled(true);
ui->lineEditPathExistM->setEnabled(true);
ui->toolButtonOpenExist->setEnabled(true);
@@ -163,6 +165,8 @@ void DialogIndividualMeasurements::CheckState()
ui->toolButtonOpenNew->setEnabled(true);
ui->comboBoxUnits->setEnabled(true);
+ ui->labelGivenName->setEnabled(false);
+ ui->labelFamilyName->setEnabled(false);
ui->toolButtonOpenExist->setEnabled(false);
ui->lineEditPathExistM->setEnabled(false);
@@ -197,6 +201,10 @@ void DialogIndividualMeasurements::OpenTable()
e.CriticalMessageBox(tr("File error."), this);
fileName.clear();
}
+ VIndividualMeasurements m(data);
+ m.setContent(fileName);
+ ui->labelGivenName->setText(m.GivenName());
+ ui->labelFamilyName->setText(m.FamilyName());
ui->lineEditPathExistM->setText(fileName);
ui->lineEditPathExistM->setToolTip(fileName);
CheckState();
diff --git a/src/app/dialogs/app/dialogindividualmeasurements.h b/src/app/dialogs/app/dialogindividualmeasurements.h
index 160da77d8..c133c4799 100644
--- a/src/app/dialogs/app/dialogindividualmeasurements.h
+++ b/src/app/dialogs/app/dialogindividualmeasurements.h
@@ -61,11 +61,13 @@ private:
void InitUnits();
};
+//---------------------------------------------------------------------------------------------------------------------
inline QString DialogIndividualMeasurements::name() const
{
return _name;
}
+//---------------------------------------------------------------------------------------------------------------------
inline QString DialogIndividualMeasurements::tablePath() const
{
return _tablePath;
diff --git a/src/app/dialogs/app/dialogindividualmeasurements.ui b/src/app/dialogs/app/dialogindividualmeasurements.ui
index 696dccacd..c1907788f 100644
--- a/src/app/dialogs/app/dialogindividualmeasurements.ui
+++ b/src/app/dialogs/app/dialogindividualmeasurements.ui
@@ -6,8 +6,8 @@
0
0
- 397
- 280
+ 385
+ 295
@@ -73,6 +73,93 @@
+ -
+
+
+ QLayout::SetMinimumSize
+
+
-
+
+
+ true
+
+
+
+ 0
+ 0
+
+
+
+
+ 90
+ 0
+
+
+
+ Given name:
+
+
+
+ -
+
+
+
+ 1
+ 0
+
+
+
+
+
+
+ true
+
+
+
+
+
+ -
+
+
+ QLayout::SetMinimumSize
+
+
-
+
+
+
+ 0
+ 0
+
+
+
+
+ 90
+ 0
+
+
+
+ Family name:
+
+
+
+ -
+
+
+
+ 1
+ 0
+
+
+
+
+
+
+ true
+
+
+
+
+
-
diff --git a/src/app/tools/drawTools/vtoolpoint.cpp b/src/app/tools/drawTools/vtoolpoint.cpp
index 94aa6353a..395eb45da 100644
--- a/src/app/tools/drawTools/vtoolpoint.cpp
+++ b/src/app/tools/drawTools/vtoolpoint.cpp
@@ -39,22 +39,7 @@ const QString VToolPoint::TagName = QStringLiteral("point");
VToolPoint::VToolPoint(VPattern *doc, VContainer *data, quint32 id, QGraphicsItem *parent):VDrawTool(doc, data, id),
QGraphicsEllipseItem(parent), radius(DefRadius), namePoint(0), lineName(0)
{
- switch (qApp->patternUnit())
- {
- case Valentina::Mm:
- radius = qApp->toPixel(DefRadius);
- break;
- case Valentina::Cm:
- radius = qApp->toPixel(DefRadius/10.0);
- break;
- case Valentina::Inch:
- radius = qApp->toPixel(DefRadius/25.4);
- break;
- default:
- radius = qApp->toPixel(DefRadius);
- break;
- }
-
+ radius = (DefRadius/*mm*/ / 25.4) * VApplication::PrintDPI;
namePoint = new VGraphicsSimpleTextItem(this);
connect(namePoint, &VGraphicsSimpleTextItem::ShowContextMenu, this, &VToolPoint::ShowContextMenu);
namePoint->setBrush(Qt::black);
diff --git a/src/app/tools/nodeDetails/vnodepoint.cpp b/src/app/tools/nodeDetails/vnodepoint.cpp
index 9e58cc23f..4401bfc73 100644
--- a/src/app/tools/nodeDetails/vnodepoint.cpp
+++ b/src/app/tools/nodeDetails/vnodepoint.cpp
@@ -39,9 +39,10 @@ const QString VNodePoint::ToolType = QStringLiteral("modeling");
VNodePoint::VNodePoint(VPattern *doc, VContainer *data, quint32 id, quint32 idPoint,
const Valentina::Sources &typeCreation, const quint32 &idTool, QObject *qoParent,
QGraphicsItem *parent)
- :VAbstractNode(doc, data, id, idPoint, idTool, qoParent), QGraphicsEllipseItem(parent), radius(qApp->toPixel(1.5)),
+ :VAbstractNode(doc, data, id, idPoint, idTool, qoParent), QGraphicsEllipseItem(parent), radius(0),
namePoint(nullptr), lineName(nullptr)
{
+ radius = (1.5/*mm*/ / 25.4) * VApplication::PrintDPI;
namePoint = new VGraphicsSimpleTextItem(this);
lineName = new QGraphicsLineItem(this);
connect(namePoint, &VGraphicsSimpleTextItem::NameChangePosition, this,
diff --git a/src/app/widgets/vapplication.cpp b/src/app/widgets/vapplication.cpp
index 8a3a19653..b02113de2 100644
--- a/src/app/widgets/vapplication.cpp
+++ b/src/app/widgets/vapplication.cpp
@@ -168,7 +168,7 @@ QString VApplication::pathToTables() const
return QApplication::applicationDirPath() + QStringLiteral("/tables/standard");
#else
QDir dir(QApplication::applicationDirPath() + QStringLiteral("/tables/standard"));
- if (dir.exist())
+ if (dir.exists())
{
return dir.absolutePath();
}
@@ -191,7 +191,7 @@ QString VApplication::translationsPath() const
return QApplication::applicationDirPath() + QStringLiteral("/translations");
#else
QDir dir(QApplication::applicationDirPath() + QStringLiteral("/translations"));
- if (dir.exist())
+ if (dir.exists())
{
return dir.absolutePath();
}