Resolved issue #377. Add blank option for 'sex' field in Tape.exe.

--HG--
branch : develop

share/translations/valentina.ts

@@ -4322,14 +4322,6 @@ Do you want to save your changes?</source>
         <source>Individual measurements</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <source>male</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>female</source>
-        <translation type="unfinished"></translation>
-    </message>
     <message>
         <source>untitled</source>
         <translation type="unfinished"></translation>
@@ -4475,6 +4467,21 @@ Do you want to save your changes?</source>
         <source>CAlculated value</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>unknown</source>
+        <comment>gender</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>male</source>
+        <comment>gender</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>female</source>
+        <comment>gender</comment>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>TapeConfigDialog</name>

share/translations/valentina_cs_CZ.ts

@@ -6390,11 +6390,11 @@ Chcete uložit své změny?</translation>
     </message>
     <message>
         <source>male</source>
-        <translation type="unfinished">muž</translation>
+        <translation type="obsolete">muž</translation>
     </message>
     <message>
         <source>female</source>
-        <translation type="unfinished">žena</translation>
+        <translation type="obsolete">žena</translation>
     </message>
     <message>
         <source>untitled</source>
@@ -6541,6 +6541,21 @@ Do you want to save your changes?</source>
         <source>CAlculated value</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>unknown</source>
+        <comment>gender</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>male</source>
+        <comment>gender</comment>
+        <translation type="unfinished">muž</translation>
+    </message>
+    <message>
+        <source>female</source>
+        <comment>gender</comment>
+        <translation type="unfinished">žena</translation>
+    </message>
 </context>
 <context>
     <name>TableWindow</name>

share/translations/valentina_de_DE.ts

@@ -5683,11 +5683,11 @@ Sollen die Änderungen gespeichert werden?</translation>
     </message>
     <message>
         <source>male</source>
-        <translation type="unfinished">männlich</translation>
+        <translation type="obsolete">männlich</translation>
     </message>
     <message>
         <source>female</source>
-        <translation type="unfinished">weiblich</translation>
+        <translation type="obsolete">weiblich</translation>
     </message>
     <message>
         <source>untitled</source>
@@ -5834,6 +5834,21 @@ Do you want to save your changes?</source>
         <source>CAlculated value</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>unknown</source>
+        <comment>gender</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>male</source>
+        <comment>gender</comment>
+        <translation type="unfinished">männlich</translation>
+    </message>
+    <message>
+        <source>female</source>
+        <comment>gender</comment>
+        <translation type="unfinished">weiblich</translation>
+    </message>
 </context>
 <context>
     <name>TableWindow</name>

share/translations/valentina_en_US.ts

@@ -7613,11 +7613,11 @@ Do you want to save your changes?</translation>
     </message>
     <message>
         <source>male</source>
-        <translation type="unfinished">male</translation>
+        <translation type="obsolete">male</translation>
     </message>
     <message>
         <source>female</source>
-        <translation type="unfinished">female</translation>
+        <translation type="obsolete">female</translation>
     </message>
     <message>
         <source>untitled</source>
@@ -7764,6 +7764,21 @@ Do you want to save your changes?</source>
         <source>CAlculated value</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>unknown</source>
+        <comment>gender</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>male</source>
+        <comment>gender</comment>
+        <translation type="unfinished">male</translation>
+    </message>
+    <message>
+        <source>female</source>
+        <comment>gender</comment>
+        <translation type="unfinished">female</translation>
+    </message>
 </context>
 <context>
     <name>TableWindow</name>

share/translations/valentina_es_ES.ts

@@ -5896,11 +5896,11 @@ Quiere guardar los cambios?</translation>
     </message>
     <message>
         <source>male</source>
-        <translation type="unfinished">hombre</translation>
+        <translation type="obsolete">hombre</translation>
     </message>
     <message>
         <source>female</source>
-        <translation type="unfinished">mujer</translation>
+        <translation type="obsolete">mujer</translation>
     </message>
     <message>
         <source>untitled</source>
@@ -6047,6 +6047,21 @@ Do you want to save your changes?</source>
         <source>CAlculated value</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>unknown</source>
+        <comment>gender</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>male</source>
+        <comment>gender</comment>
+        <translation type="unfinished">hombre</translation>
+    </message>
+    <message>
+        <source>female</source>
+        <comment>gender</comment>
+        <translation type="unfinished">mujer</translation>
+    </message>
 </context>
 <context>
     <name>TableWindow</name>

share/translations/valentina_fi_FI.ts

@@ -6145,11 +6145,11 @@ Haluatko tallentaa muutokset?</translation>
     </message>
     <message>
         <source>male</source>
-        <translation type="unfinished">Mies</translation>
+        <translation type="obsolete">Mies</translation>
     </message>
     <message>
         <source>female</source>
-        <translation type="unfinished">Nainen</translation>
+        <translation type="obsolete">Nainen</translation>
     </message>
     <message>
         <source>untitled</source>
@@ -6296,6 +6296,21 @@ Do you want to save your changes?</source>
         <source>CAlculated value</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>unknown</source>
+        <comment>gender</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>male</source>
+        <comment>gender</comment>
+        <translation type="unfinished">Mies</translation>
+    </message>
+    <message>
+        <source>female</source>
+        <comment>gender</comment>
+        <translation type="unfinished">Nainen</translation>
+    </message>
 </context>
 <context>
     <name>TableWindow</name>

share/translations/valentina_fr_FR.ts

@@ -5953,11 +5953,11 @@ Voulez-vous sauvegarder les changements ? </translation>
     </message>
     <message>
         <source>male</source>
-        <translation type="unfinished">homme</translation>
+        <translation type="obsolete">homme</translation>
     </message>
     <message>
         <source>female</source>
-        <translation type="unfinished">femme</translation>
+        <translation type="obsolete">femme</translation>
     </message>
     <message>
         <source>untitled</source>
@@ -6104,6 +6104,21 @@ Do you want to save your changes?</source>
         <source>CAlculated value</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>unknown</source>
+        <comment>gender</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>male</source>
+        <comment>gender</comment>
+        <translation type="unfinished">homme</translation>
+    </message>
+    <message>
+        <source>female</source>
+        <comment>gender</comment>
+        <translation type="unfinished">femme</translation>
+    </message>
 </context>
 <context>
     <name>TableWindow</name>

share/translations/valentina_he_IL.ts

@@ -4438,14 +4438,6 @@ Do you want to save your changes?</source>
         <source>Individual measurements</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <source>male</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>female</source>
-        <translation type="unfinished"></translation>
-    </message>
     <message>
         <source>untitled</source>
         <translation type="unfinished"></translation>
@@ -4591,6 +4583,21 @@ Do you want to save your changes?</source>
         <source>CAlculated value</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>unknown</source>
+        <comment>gender</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>male</source>
+        <comment>gender</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>female</source>
+        <comment>gender</comment>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>TableWindow</name>

share/translations/valentina_id_ID.ts

@@ -4856,14 +4856,6 @@ Apakah anda ingin menyimpan perubahan anda?</translation>
         <source>Individual measurements</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <source>male</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>female</source>
-        <translation type="unfinished"></translation>
-    </message>
     <message>
         <source>untitled</source>
         <translation type="unfinished"></translation>
@@ -5009,6 +5001,21 @@ Do you want to save your changes?</source>
         <source>CAlculated value</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>unknown</source>
+        <comment>gender</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>male</source>
+        <comment>gender</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>female</source>
+        <comment>gender</comment>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>TableWindow</name>

share/translations/valentina_it_IT.ts

@@ -4409,14 +4409,6 @@ Do you want to save your changes?</source>
         <source>Individual measurements</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <source>male</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>female</source>
-        <translation type="unfinished"></translation>
-    </message>
     <message>
         <source>untitled</source>
         <translation type="unfinished"></translation>
@@ -4562,6 +4554,21 @@ Do you want to save your changes?</source>
         <source>CAlculated value</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>unknown</source>
+        <comment>gender</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>male</source>
+        <comment>gender</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>female</source>
+        <comment>gender</comment>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>TapeConfigDialog</name>

share/translations/valentina_nl_NL.ts

@@ -7587,11 +7587,11 @@ Do you want to save your changes?</source>
     </message>
     <message>
         <source>male</source>
-        <translation type="unfinished">Mannelijk</translation>
+        <translation type="obsolete">Mannelijk</translation>
     </message>
     <message>
         <source>female</source>
-        <translation type="unfinished">Vrouwelijk</translation>
+        <translation type="obsolete">Vrouwelijk</translation>
     </message>
     <message>
         <source>untitled</source>
@@ -7738,6 +7738,21 @@ Do you want to save your changes?</source>
         <source>CAlculated value</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>unknown</source>
+        <comment>gender</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>male</source>
+        <comment>gender</comment>
+        <translation type="unfinished">Mannelijk</translation>
+    </message>
+    <message>
+        <source>female</source>
+        <comment>gender</comment>
+        <translation type="unfinished">Vrouwelijk</translation>
+    </message>
 </context>
 <context>
     <name>TableWindow</name>

share/translations/valentina_ru_RU.ts

@@ -9460,11 +9460,11 @@ Do you want to save your changes?</source>
     </message>
     <message>
         <source>male</source>
-        <translation type="unfinished">мужчина</translation>
+        <translation type="obsolete">мужчина</translation>
     </message>
     <message>
         <source>female</source>
-        <translation type="unfinished">женщина</translation>
+        <translation type="obsolete">женщина</translation>
     </message>
     <message>
         <source>untitled</source>
@@ -9611,6 +9611,21 @@ Do you want to save your changes?</source>
         <source>CAlculated value</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>unknown</source>
+        <comment>gender</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>male</source>
+        <comment>gender</comment>
+        <translation type="unfinished">мужчина</translation>
+    </message>
+    <message>
+        <source>female</source>
+        <comment>gender</comment>
+        <translation type="unfinished">женщина</translation>
+    </message>
 </context>
 <context>
     <name>TableWindow</name>

share/translations/valentina_uk_UA.ts

@@ -8429,11 +8429,11 @@ Do you want to save your changes?</source>
     </message>
     <message>
         <source>male</source>
-        <translation type="unfinished">чоловік</translation>
+        <translation type="obsolete">чоловік</translation>
     </message>
     <message>
         <source>female</source>
-        <translation type="unfinished">жінка</translation>
+        <translation type="obsolete">жінка</translation>
     </message>
     <message>
         <source>untitled</source>
@@ -8580,6 +8580,21 @@ Do you want to save your changes?</source>
         <source>CAlculated value</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>unknown</source>
+        <comment>gender</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>male</source>
+        <comment>gender</comment>
+        <translation type="unfinished">чоловік</translation>
+    </message>
+    <message>
+        <source>female</source>
+        <comment>gender</comment>
+        <translation type="unfinished">жінка</translation>
+    </message>
 </context>
 <context>
     <name>TableWindow</name>

src/app/tape/tmainwindow.cpp

@@ -1705,8 +1705,9 @@ void TMainWindow::InitWindow()
         ui->lineEditGivenName->setText(m->GivenName());
         ui->lineEditFamilyName->setText(m->FamilyName());
 
-        ui->comboBoxSex->addItem(tr("male"), QVariant(static_cast<int>(SexType::Male)));
+        ui->comboBoxSex->addItem(tr("unknown", "gender"), QVariant(static_cast<int>(SexType::Unknown)));
-        ui->comboBoxSex->addItem(tr("female"), QVariant(static_cast<int>(SexType::Female)));
+        ui->comboBoxSex->addItem(tr("male", "gender"), QVariant(static_cast<int>(SexType::Male)));
+        ui->comboBoxSex->addItem(tr("female", "gender"), QVariant(static_cast<int>(SexType::Female)));
         const qint32 index = ui->comboBoxSex->findData(static_cast<int>(m->Sex()));
         ui->comboBoxSex->setCurrentIndex(index);
 

src/libs/ifc/schema/individual_measurements/v0.3.0.xsd

@@ -58,6 +58,7 @@
 	</xs:simpleType>
 	<xs:simpleType name="sex">
 		<xs:restriction base="xs:string">
+			<xs:enumeration value="unknown"/>
 			<xs:enumeration value="male"/>
 			<xs:enumeration value="female"/>
 		</xs:restriction>

src/libs/vformat/vmeasurements.cpp

@@ -381,7 +381,7 @@ void VMeasurements::SetBirthDate(const QDate &date)
 //---------------------------------------------------------------------------------------------------------------------
 SexType VMeasurements::Sex() const
 {
-    return StrToGender(UniqueTagText(TagSex, ""));
+    return StrToGender(UniqueTagText(TagSex, SexUnknown));
 }
 
 //---------------------------------------------------------------------------------------------------------------------
@@ -542,7 +542,6 @@ QString VMeasurements::GenderToStr(const SexType &sex)
         case SexType::Female:
             return SexFemale;
         case SexType::Unknown:
-            return SexUnknown;
         default:
             return SexUnknown;
     }
@@ -551,7 +550,7 @@ QString VMeasurements::GenderToStr(const SexType &sex)
 //---------------------------------------------------------------------------------------------------------------------
 SexType VMeasurements::StrToGender(const QString &sex)
 {
-    QStringList genders = QStringList() << SexMale << SexFemale << SexUnknown;
+    const QStringList genders = QStringList() << SexMale << SexFemale << SexUnknown;
     switch (genders.indexOf(sex))
     {
         case 0: // SexMale
@@ -559,7 +558,6 @@ SexType VMeasurements::StrToGender(const QString &sex)
         case 1: // SexFemale
             return SexType::Female;
         case 2: // SexUnknown
-            return SexType::Unknown;
         default:
             return SexType::Unknown;
     }
@@ -708,7 +706,7 @@ void VMeasurements::CreateEmptyIndividualFile(Unit unit)
     personal.appendChild(date);
 
     QDomElement sex = createElement(TagSex);
-    const QDomText newSex = createTextNode(GenderToStr(SexType::Male));
+    const QDomText newSex = createTextNode(GenderToStr(SexType::Unknown));
     sex.appendChild(newSex);
     personal.appendChild(sex);