From 9bf4cc0dbdeadd3ed840f92d2f1858175405f479 Mon Sep 17 00:00:00 2001
From: dismine <dismine@gmail.com>
Date: Tue, 10 Jun 2014 21:20:39 +0300
Subject: [PATCH] Fixed issue #77.

--HG--
branch : develop
---
 .../app/dialogindividualmeasurements.cpp      |  8 ++
 .../app/dialogindividualmeasurements.h        |  2 +
 .../app/dialogindividualmeasurements.ui       | 91 ++++++++++++++++++-
 3 files changed, 99 insertions(+), 2 deletions(-)

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 @@
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>397</width>
-    <height>280</height>
+    <width>385</width>
+    <height>295</height>
    </rect>
   </property>
   <property name="windowTitle">
@@ -73,6 +73,93 @@
        </item>
       </layout>
      </item>
+     <item>
+      <layout class="QHBoxLayout" name="horizontalLayout_3">
+       <property name="sizeConstraint">
+        <enum>QLayout::SetMinimumSize</enum>
+       </property>
+       <item>
+        <widget class="QLabel" name="label_2">
+         <property name="enabled">
+          <bool>true</bool>
+         </property>
+         <property name="sizePolicy">
+          <sizepolicy hsizetype="Preferred" vsizetype="Minimum">
+           <horstretch>0</horstretch>
+           <verstretch>0</verstretch>
+          </sizepolicy>
+         </property>
+         <property name="minimumSize">
+          <size>
+           <width>90</width>
+           <height>0</height>
+          </size>
+         </property>
+         <property name="text">
+          <string>Given name:</string>
+         </property>
+        </widget>
+       </item>
+       <item>
+        <widget class="QLabel" name="labelGivenName">
+         <property name="sizePolicy">
+          <sizepolicy hsizetype="Preferred" vsizetype="Minimum">
+           <horstretch>1</horstretch>
+           <verstretch>0</verstretch>
+          </sizepolicy>
+         </property>
+         <property name="text">
+          <string notr="true"/>
+         </property>
+         <property name="wordWrap">
+          <bool>true</bool>
+         </property>
+        </widget>
+       </item>
+      </layout>
+     </item>
+     <item>
+      <layout class="QHBoxLayout" name="horizontalLayout_6">
+       <property name="sizeConstraint">
+        <enum>QLayout::SetMinimumSize</enum>
+       </property>
+       <item>
+        <widget class="QLabel" name="label_7">
+         <property name="sizePolicy">
+          <sizepolicy hsizetype="Preferred" vsizetype="Minimum">
+           <horstretch>0</horstretch>
+           <verstretch>0</verstretch>
+          </sizepolicy>
+         </property>
+         <property name="minimumSize">
+          <size>
+           <width>90</width>
+           <height>0</height>
+          </size>
+         </property>
+         <property name="text">
+          <string>Family name:</string>
+         </property>
+        </widget>
+       </item>
+       <item>
+        <widget class="QLabel" name="labelFamilyName">
+         <property name="sizePolicy">
+          <sizepolicy hsizetype="Preferred" vsizetype="Minimum">
+           <horstretch>1</horstretch>
+           <verstretch>0</verstretch>
+          </sizepolicy>
+         </property>
+         <property name="text">
+          <string/>
+         </property>
+         <property name="wordWrap">
+          <bool>true</bool>
+         </property>
+        </widget>
+       </item>
+      </layout>
+     </item>
     </layout>
    </item>
    <item>