diff --git a/src/app/dialogs/app/dialogindividualmeasurements.cpp b/src/app/dialogs/app/dialogindividualmeasurements.cpp
index e90db6da9..73c48818f 100644
--- a/src/app/dialogs/app/dialogindividualmeasurements.cpp
+++ b/src/app/dialogs/app/dialogindividualmeasurements.cpp
@@ -147,6 +147,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);
@@ -165,6 +167,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);
@@ -199,6 +203,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 3e2527051..f41edf414 100644
--- a/src/app/dialogs/app/dialogindividualmeasurements.h
+++ b/src/app/dialogs/app/dialogindividualmeasurements.h
@@ -60,11 +60,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
+
+
+
+
+
-