aw/valentina_old
1
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Conversion individual measurements.

Browse Source 
--HG--
branch : develop
This commit is contained in:
Roman Telezhynskyi 2015-09-07 14:51:21 +03:00
parent 3d297d657c
commit d2bb126d04
11 changed files with 440 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/app/tape/tmainwindow.cpp
View File

@ -225,6 +225,7 @@ void TMainWindow::LoadFile(const QString &path)
VDomDocument::ValidateXML(VVITConverter::CurrentSchema, path); VDomDocument::ValidateXML(VVITConverter::CurrentSchema, path);
} }
m->setXMLContent(path);// Read again after conversion
mUnit = m->MUnit(); mUnit = m->MUnit();
pUnit = mUnit; pUnit = mUnit;

3
src/app/valentina/xml/vpattern.cpp
View File

@ -69,7 +69,8 @@ void VPattern::CreateEmptyFile()
this->clear(); this->clear();
QDomElement patternElement = this->createElement(TagPattern); QDomElement patternElement = this->createElement(TagPattern);
patternElement.appendChild(createComment("Pattern created with Valentina (http://www.valentina-project.org/).")); patternElement.appendChild(
createComment(QStringLiteral("Pattern created with Valentina (http://www.valentina-project.org/).")));
QDomElement version = createElement(TagVersion); QDomElement version = createElement(TagVersion);
QDomText newNodeText = createTextNode(VPatternConverter::PatternMaxVerStr); QDomText newNodeText = createTextNode(VPatternConverter::PatternMaxVerStr);

2
src/libs/ifc/schema/individual_measurements/v0.3.0.xsd
View File

@ -10,8 +10,8 @@
<xs:element name="personal"> <xs:element name="personal">
<xs:complexType> <xs:complexType>
<xs:sequence> <xs:sequence>
<xs:element name="given-name" type="xs:string"></xs:element>
<xs:element name="family-name" type="xs:string"></xs:element> <xs:element name="family-name" type="xs:string"></xs:element>
<xs:element name="given-name" type="xs:string"></xs:element>
<xs:element name="birth-date" type="xs:date"></xs:element> <xs:element name="birth-date" type="xs:date"></xs:element>
<xs:element name="sex" type="sex"></xs:element> <xs:element name="sex" type="sex"></xs:element>
<xs:element name="email" type="xs:string"></xs:element> <xs:element name="email" type="xs:string"></xs:element>

290
src/libs/ifc/xml/vabstractmconverter.cpp Normal file
View File

@ -0,0 +1,290 @@
/************************************************************************
**
** @file vabstractmconverter.cpp
** @author Roman Telezhynskyi <dismine(at)gmail.com>
** @date 5 9, 2015
**
** @brief
** @copyright
** This source code is part of the Valentine project, a pattern making
** program, whose allow create and modeling patterns of clothing.
** Copyright (C) 2015 Valentina project
** <https://bitbucket.org/dismine/valentina> All Rights Reserved.
**
** Valentina is free software: you can redistribute it and/or modify
** it under the terms of the GNU General Public License as published by
** the Free Software Foundation, either version 3 of the License, or
** (at your option) any later version.
**
** Valentina is distributed in the hope that it will be useful,
** but WITHOUT ANY WARRANTY; without even the implied warranty of
** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
** GNU General Public License for more details.
**
** You should have received a copy of the GNU General Public License
** along with Valentina. If not, see <http://www.gnu.org/licenses/>.
**
*************************************************************************/
#include "vabstractmconverter.h"
//---------------------------------------------------------------------------------------------------------------------
VAbstractMConverter::VAbstractMConverter(const QString &fileName)
:VAbstractConverter(fileName)
{
}
//---------------------------------------------------------------------------------------------------------------------
VAbstractMConverter::~VAbstractMConverter()
{
}
//---------------------------------------------------------------------------------------------------------------------
void VAbstractMConverter::AddRootCommentV0_3_0()
{
const QString rootComment =
QStringLiteral("Measurements created with Valentina (http://www.valentina-project.org/).");
QDomElement rootElement = this->documentElement();
rootElement.insertBefore(createComment(rootComment), rootElement.firstChild());
}
//---------------------------------------------------------------------------------------------------------------------
QMultiMap<QString, QString> VAbstractMConverter::OldNamesToNewNames_InV0_3_0()
{
QMultiMap<QString, QString> names;
// A02
names.insert(QStringLiteral("height_neck_back"), QStringLiteral("cervicale_height"));
// A03
names.insert(QStringLiteral("height_scapula"), QStringLiteral("height_scapular_point"));
// A04
names.insert(QStringLiteral("height_armpit"), QStringLiteral("height_back_angle_axilla"));
// A05
names.insert(QStringLiteral("height_waist_side"), QStringLiteral("waist_height"));
// A06
names.insert(QStringLiteral("height_hip"), QStringLiteral("hip_height"));
// A08
names.insert(QStringLiteral("height_knee"), QStringLiteral("knee_height"));
// A11
names.insert(QStringLiteral("height_ankle"), QStringLiteral("ankle_height"));
// A12
names.insert(QStringLiteral("height_highhip"), QStringLiteral("high_hip_height"));
// A13
names.insert(QStringLiteral("height_waist_front"), QStringLiteral("front_waist_to_floor"));
// A14
names.insert(QStringLiteral("height_bustpoint"), QStringLiteral("height_nipple_point"));
// A15
names.insert(QStringLiteral("height_shoulder_tip"), QStringLiteral("shoulder_height"));
names.insert(QStringLiteral("height_shoulder_tip"), QStringLiteral("height_shoulder_point"));
// A16
names.insert(QStringLiteral("height_neck_front"), QStringLiteral("height_clavicular_point"));
names.insert(QStringLiteral("height_neck_front"), QStringLiteral("height_front_neck_base_point"));
// A17
names.insert(QStringLiteral("height_neck_side"), QStringLiteral("height_base_neck_side_point"));
// A18
names.insert(QStringLiteral("height_neck_back_to_knee"), QStringLiteral("neck_to_knee_point"));
names.insert(QStringLiteral("height_neck_back_to_knee"), QStringLiteral("cervicale_to_knee_height"));
// A19
names.insert(QStringLiteral("height_waist_side_to_knee"), QStringLiteral("waist_to_knee_height"));
// A20
names.insert(QStringLiteral("height_waist_side_to_hip"), QStringLiteral("waist_to_hip_height"));
// C01
names.insert(QStringLiteral("indent_neck_back"), QStringLiteral("body_position"));
// D01
names.insert(QStringLiteral("neck_mid_circ"), QStringLiteral("half_girth_neck_for_shirts"));
names.insert(QStringLiteral("neck_mid_circ"), QStringLiteral("mid_neck_girth"));
// D02
names.insert(QStringLiteral("neck_circ"), QStringLiteral("neck_base_girth"));
// D03
names.insert(QStringLiteral("highbust_circ"), QStringLiteral("upper_chest_girth"));
// D04
names.insert(QStringLiteral("bust_circ"), QStringLiteral("bust_girth"));
// D05
names.insert(QStringLiteral("lowbust_circ"), QStringLiteral("under_bust_girth"));
// D07
names.insert(QStringLiteral("waist_circ"), QStringLiteral("waist_girth"));
// D08
names.insert(QStringLiteral("highhip_circ"), QStringLiteral("high_hip_girth"));
// D09
names.insert(QStringLiteral("hip_circ"), QStringLiteral("hips_excluding_protruding_abdomen"));
names.insert(QStringLiteral("hip_circ"), QStringLiteral("hip_girth"));
// D10
names.insert(QStringLiteral("neck_arc_f"), QStringLiteral("half_girth_neck"));
names.insert(QStringLiteral("neck_arc_f"), QStringLiteral("front_neck_arc"));
// D11
names.insert(QStringLiteral("highbust_arc_f"), QStringLiteral("half_girth_chest_first"));
names.insert(QStringLiteral("highbust_arc_f"), QStringLiteral("front_upper_chest_arc"));
// D12
names.insert(QStringLiteral("bust_arc_f"), QStringLiteral("half_girth_chest_second"));
// D13
names.insert(QStringLiteral("lowbust_arc_f"), QStringLiteral("half_girth_chest_third"));
// D15
names.insert(QStringLiteral("waist_arc_f"), QStringLiteral("half_girth_waist"));
names.insert(QStringLiteral("waist_arc_f"), QStringLiteral("front_waist_arc"));
// D16
names.insert(QStringLiteral("highhip_arc_f"), QStringLiteral("front_upper_hip_arc"));
// D17
names.insert(QStringLiteral("hip_arc_f"), QStringLiteral("half_girth_hips_excluding_protruding_abdomen"));
names.insert(QStringLiteral("hip_arc_f"), QStringLiteral("front_hip_arc"));
// D18
names.insert(QStringLiteral("neck_arc_b"), QStringLiteral("back_neck_arc"));
// D19
names.insert(QStringLiteral("highbust_arc_b"), QStringLiteral("back_upper_chest_arc"));
// D23
names.insert(QStringLiteral("waist_arc_b"), QStringLiteral("back_waist_arc"));
// D24
names.insert(QStringLiteral("highhip_arc_b"), QStringLiteral("back_upper_hip_arc"));
// D25
names.insert(QStringLiteral("hip_arc_b"), QStringLiteral("back_hip_arc"));
// D42
names.insert(QStringLiteral("hip_with_abdomen_arc_f"),
QStringLiteral("half_girth_hips_considering_protruding_abdomen"));
// D43
names.insert(QStringLiteral("body_armfold_circ"), QStringLiteral("shoulder_girth"));
// D45
names.insert(QStringLiteral("body_torso_circ"), QStringLiteral("trunk_length"));
// E01
names.insert(QStringLiteral("neck_front_to_waist_f"), QStringLiteral("front_waist_length"));
names.insert(QStringLiteral("neck_front_to_waist_f"), QStringLiteral("center_front_waist_length"));
// E03
names.insert(QStringLiteral("armpit_to_waist_side"), QStringLiteral("side_waist_length"));
// E05
names.insert(QStringLiteral("neck_side_to_waist_f"), QStringLiteral("neck_to_front_waist_line"));
names.insert(QStringLiteral("neck_side_to_waist_f"), QStringLiteral("waist_to_neck_side"));
names.insert(QStringLiteral("neck_side_to_waist_f"), QStringLiteral("front_shoulder_to_waist_length"));
// E08
names.insert(QStringLiteral("neck_side_to_waist_b"), QStringLiteral("back_shoulder_to_waist_length"));
// E09
names.insert(QStringLiteral("neck_back_to_waist_b"), QStringLiteral("center_back_waist_length"));
// E11
names.insert(QStringLiteral("neck_front_to_highbust_f"), QStringLiteral("neck_to_first_line_chest_circumference"));
names.insert(QStringLiteral("neck_front_to_highbust_f"), QStringLiteral("front_neck_to_upper_chest_height"));
// E12
names.insert(QStringLiteral("neck_front_to_bust_f"), QStringLiteral("front_neck_to_bust_height"));
// E13
names.insert(QStringLiteral("highbust_to_waist_f"), QStringLiteral("front_waist_to_upper_chest"));
// E15
names.insert(QStringLiteral("lowbust_to_waist_f"), QStringLiteral("front_waist_to_lower_breast"));
// E17
names.insert(QStringLiteral("neck_back_to_highbust_b"), QStringLiteral("neck_to_back_line_chest_circumference"));
// E30
names.insert(QStringLiteral("waist_to_highhip_f"), QStringLiteral("depth_waist_first"));
// E31
names.insert(QStringLiteral("waist_to_hip_f"), QStringLiteral("depth_waist_second"));
// E36
names.insert(QStringLiteral("shoulder_slope_neck_side_angle"), QStringLiteral("shoulder_slope_degrees"));
// E37
names.insert(QStringLiteral("shoulder_slope_neck_side_length"), QStringLiteral("shoulder_drop"));
// F01
names.insert(QStringLiteral("shoulder_length"), QStringLiteral("shoulder_length"));
// F02
names.insert(QStringLiteral("shoulder_width_f"), QStringLiteral("across_front_shoulder_width"));
// F03
names.insert(QStringLiteral("across_chest_f"), QStringLiteral("upper_front_chest_width"));
// F04
names.insert(QStringLiteral("armfold_to_armfold_f"), QStringLiteral("chest_width"));
names.insert(QStringLiteral("armfold_to_armfold_f"), QStringLiteral("front_chest_width"));
// F05
names.insert(QStringLiteral("shoulder_width_b"), QStringLiteral("arc_behind_shoulder_girdle"));
names.insert(QStringLiteral("shoulder_width_b"), QStringLiteral("across_back_shoulder_width"));
// F06
names.insert(QStringLiteral("across_back_b"), QStringLiteral("upper_back_width"));
// F07
names.insert(QStringLiteral("armfold_to_armfold_b"), QStringLiteral("back_width"));
// F14
names.insert(QStringLiteral("neck_width"), QStringLiteral("neck_transverse_diameter"));
// G01
names.insert(QStringLiteral("bustpoint_to_bustpoint"), QStringLiteral("bustpoint_to_bustpoint"));
// G02
names.insert(QStringLiteral("bustpoint_to_neck_side"), QStringLiteral("neck_to_bustpoint"));
// G06
names.insert(QStringLiteral("bustpoint_to_bustpoint_halter"), QStringLiteral("halter_bustpoint_to_bustpoint"));
// H01
names.insert(QStringLiteral("shoulder_tip_to_waist_front"), QStringLiteral("front_slash_shoulder_height"));
names.insert(QStringLiteral("shoulder_tip_to_waist_front"), QStringLiteral("front_shoulder_slope_length"));
// H02
names.insert(QStringLiteral("neck_front_to_waist_side"), QStringLiteral("front_waist_slope"));
// H04
names.insert(QStringLiteral("neck_side_to_armfold_f"), QStringLiteral("height_armhole_slash"));
names.insert(QStringLiteral("neck_side_to_armfold_f"), QStringLiteral("chest_slope"));
// H07
names.insert(QStringLiteral("shoulder_tip_to_waist_back"), QStringLiteral("slash_shoulder_height"));
names.insert(QStringLiteral("shoulder_tip_to_waist_back"), QStringLiteral("back_shoulder_slope_length"));
// H08
names.insert(QStringLiteral("neck_back_to_waist_side"), QStringLiteral("back_waist_slope"));
// H10
names.insert(QStringLiteral("neck_side_to_armfold_b"), QStringLiteral("back_slope"));
// I05
names.insert(QStringLiteral("arm_shoulder_tip_to_wrist"), QStringLiteral("arm_length"));
// I06
names.insert(QStringLiteral("arm_shoulder_tip_to_elbow"), QStringLiteral("shoulder_to_elbow_length"));
// I08
names.insert(QStringLiteral("arm_armpit_to_wrist"), QStringLiteral("underarm_length"));
// I11
names.insert(QStringLiteral("arm_upper_circ"), QStringLiteral("upper_arm_girth"));
// I15
names.insert(QStringLiteral("arm_wrist_circ"), QStringLiteral("wrist_girth"));
// I17
names.insert(QStringLiteral("armscye_circ"), QStringLiteral("armscye_girth"));
// I19
names.insert(QStringLiteral("armscye_width"), QStringLiteral("anteroposterior_diameter_hands"));
// I20
names.insert(QStringLiteral("arm_neck_side_to_finger_tip"), QStringLiteral("neck_to_third_finger"));
// I21
names.insert(QStringLiteral("arm_neck_side_to_wrist"), QStringLiteral("neck_to_radial_point"));
names.insert(QStringLiteral("arm_neck_side_to_wrist"), QStringLiteral("shoulder_and_arm_length"));
// J01
names.insert(QStringLiteral("leg_crotch_to_floor"), QStringLiteral("crotch_height"));
// J02
names.insert(QStringLiteral("leg_waist_side_to_floor"), QStringLiteral("side_waist_to_floor"));
// J03
names.insert(QStringLiteral("leg_waist_side_to_knee"), QStringLiteral("waist_to_knee"));
// J04
names.insert(QStringLiteral("leg_thigh_upper_circ"), QStringLiteral("thigh_girth"));
// J05
names.insert(QStringLiteral("leg_thigh_mid_circ"), QStringLiteral("mid_thigh_girth"));
// J06
names.insert(QStringLiteral("leg_knee_circ"), QStringLiteral("knee_girth"));
// J08
names.insert(QStringLiteral("leg_calf_circ"), QStringLiteral("calf_girth"));
// J10
names.insert(QStringLiteral("leg_ankle_circ"), QStringLiteral("ankle_girth"));
// J11
names.insert(QStringLiteral("leg_knee_circ_bent"), QStringLiteral("girth_knee_flexed_feet"));
// K01
names.insert(QStringLiteral("crotch_length"), QStringLiteral("arc_through_groin_area"));
names.insert(QStringLiteral("crotch_length"), QStringLiteral("crotch_length"));
// K04
names.insert(QStringLiteral("rise_length_side"), QStringLiteral("waist_to_plane_seat"));
names.insert(QStringLiteral("rise_length_side"), QStringLiteral("rise_height"));
// L02
names.insert(QStringLiteral("hand_length"), QStringLiteral("hand_vertical_diameter"));
names.insert(QStringLiteral("hand_length"), QStringLiteral("hand_length"));
// L03
names.insert(QStringLiteral("hand_palm_width"), QStringLiteral("hand_width"));
// L05
names.insert(QStringLiteral("hand_circ"), QStringLiteral("hand_girth"));
// M01
names.insert(QStringLiteral("foot_width"), QStringLiteral("foot_width"));
// M02
names.insert(QStringLiteral("foot_length"), QStringLiteral("foot_length"));
// M04
names.insert(QStringLiteral("foot_instep_circ"), QStringLiteral("girth_foot_instep"));
// N02
names.insert(QStringLiteral("head_length"), QStringLiteral("head_height"));
// N05
names.insert(QStringLiteral("head_crown_to_neck_back"), QStringLiteral("head_and_neck_length"));
// N06
names.insert(QStringLiteral("head_chin_to_neck_back"), QStringLiteral("neck_to_neck_base"));
// O02
names.insert(QStringLiteral("waist_to_waist_halter"), QStringLiteral("arc_length_upper_body"));
// O09
names.insert(QStringLiteral("arm_neck_back_to_wrist_bent"), QStringLiteral("cervicale_to_wrist_length"));
// P11
names.insert(QStringLiteral("highbust_b_over_shoulder_to_highbust_f"), QStringLiteral("strap_length"));
// P12
names.insert(QStringLiteral("armscye_arc"), QStringLiteral("arc_through_shoulder_joint"));
return names;
}

48
src/libs/ifc/xml/vabstractmconverter.h Normal file
View File

@ -0,0 +1,48 @@
/************************************************************************
**
** @file vabstractmconverter.h
** @author Roman Telezhynskyi <dismine(at)gmail.com>
** @date 5 9, 2015
**
** @brief
** @copyright
** This source code is part of the Valentine project, a pattern making
** program, whose allow create and modeling patterns of clothing.
** Copyright (C) 2015 Valentina project
** <https://bitbucket.org/dismine/valentina> All Rights Reserved.
**
** Valentina is free software: you can redistribute it and/or modify
** it under the terms of the GNU General Public License as published by
** the Free Software Foundation, either version 3 of the License, or
** (at your option) any later version.
**
** Valentina is distributed in the hope that it will be useful,
** but WITHOUT ANY WARRANTY; without even the implied warranty of
** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
** GNU General Public License for more details.
**
** You should have received a copy of the GNU General Public License
** along with Valentina. If not, see <http://www.gnu.org/licenses/>.
**
*************************************************************************/
#ifndef VABSTRACTMCONVERTER_H
#define VABSTRACTMCONVERTER_H
#include "vabstractconverter.h"
class VAbstractMConverter : public VAbstractConverter
{
public:
VAbstractMConverter(const QString &fileName);
virtual ~VAbstractMConverter() Q_DECL_OVERRIDE;
protected:
void AddRootCommentV0_3_0();
static QMultiMap<QString, QString> OldNamesToNewNames_InV0_3_0();
private:
Q_DISABLE_COPY(VAbstractMConverter)
};
#endif // VABSTRACTMCONVERTER_H

84
src/libs/ifc/xml/vvitconverter.cpp
View File

@ -45,7 +45,7 @@ const QString VVITConverter::CurrentSchema = QStringLiteral("://schema/in
//--------------------------------------------------------------------------------------------------------------------- //---------------------------------------------------------------------------------------------------------------------
VVITConverter::VVITConverter(const QString &fileName) VVITConverter::VVITConverter(const QString &fileName)
:VAbstractConverter(fileName) :VAbstractMConverter(fileName)
{ {
const QString schema = XSDSchema(ver); const QString schema = XSDSchema(ver);
ValidateXML(schema, fileName); ValidateXML(schema, fileName);
@ -137,9 +137,91 @@ void VVITConverter::ApplyPatches()
} }
} }
//---------------------------------------------------------------------------------------------------------------------
void VVITConverter::AddNewTagsForV0_3_0()
{
QDomElement rootElement = this->documentElement();
QDomNode refChild = rootElement.firstChildElement("version");
QDomElement ro = createElement(QStringLiteral("read-only"));
const QDomText roNodeText = createTextNode("false");
ro.appendChild(roNodeText);
refChild = rootElement.insertAfter(ro, refChild);
refChild = rootElement.insertAfter(createElement(QStringLiteral("notes")), refChild);
QDomElement unit = createElement("unit");
unit.appendChild(createTextNode(MUnitV0_2_0()));
rootElement.insertAfter(unit, refChild);
}
//---------------------------------------------------------------------------------------------------------------------
QString VVITConverter::MUnitV0_2_0()
{
return UniqueTagText(QStringLiteral("unit"), QStringLiteral("cm"));
}
//---------------------------------------------------------------------------------------------------------------------
void VVITConverter::ConvertMeasurementsToV0_3_0()
{
const QString tagBM = QStringLiteral("body-measurements");
QDomElement bm = createElement(tagBM);
QMultiMap<QString, QString> names = OldNamesToNewNames_InV0_3_0();
QMutableMapIterator<QString, QString> iter( names );
while( iter.hasNext() )
{
iter.next();
qreal resValue = 0;
// This has the same effect as a .values(), just isn't as elegant
const QList<QString> list = names.values( iter.key() );
foreach(const QString &val, list )
{
const QDomNodeList nodeList = this->elementsByTagName(val);
if (nodeList.isEmpty())
{
continue;
}
const qreal value = GetParametrDouble(nodeList.at(0).toElement(), QStringLiteral("value"), "0.0");
if (not qFuzzyIsNull(value))
{
resValue = value;
}
}
bm.appendChild(AddMV0_3_0(iter.key(), resValue));
}
QDomElement rootElement = this->documentElement();
const QDomNodeList listBM = elementsByTagName(tagBM);
rootElement.replaceChild(bm, listBM.at(0));
}
//---------------------------------------------------------------------------------------------------------------------
QDomElement VVITConverter::AddMV0_3_0(const QString &name, qreal value)
{
QDomElement element = createElement(QStringLiteral("m"));
SetAttribute(element, QStringLiteral("name"), name);
SetAttribute(element, QStringLiteral("value"), QString().setNum(value));
SetAttribute(element, QStringLiteral("description"), QString(""));
SetAttribute(element, QStringLiteral("full_name"), QString(""));
return element;
}
//--------------------------------------------------------------------------------------------------------------------- //---------------------------------------------------------------------------------------------------------------------
void VVITConverter::ToV0_3_0() void VVITConverter::ToV0_3_0()
{ {
AddRootCommentV0_3_0();
SetVersion(QStringLiteral("0.3.0")); SetVersion(QStringLiteral("0.3.0"));
AddNewTagsForV0_3_0();
ConvertMeasurementsToV0_3_0();
Save(); Save();
} }

9
src/libs/ifc/xml/vvitconverter.h
View File

@ -29,9 +29,9 @@
#ifndef VVITCONVERTER_H #ifndef VVITCONVERTER_H
#define VVITCONVERTER_H #define VVITCONVERTER_H
#include "vabstractconverter.h" #include "vabstractmconverter.h"
class VVITConverter : public VAbstractConverter class VVITConverter : public VAbstractMConverter
{ {
Q_DECLARE_TR_FUNCTIONS(VVITConverter) Q_DECLARE_TR_FUNCTIONS(VVITConverter)
public: public:
@ -55,6 +55,11 @@ private:
Q_DISABLE_COPY(VVITConverter) Q_DISABLE_COPY(VVITConverter)
static const QString MeasurementMinVerStr; static const QString MeasurementMinVerStr;
void AddNewTagsForV0_3_0();
QString MUnitV0_2_0();
void ConvertMeasurementsToV0_3_0();
QDomElement AddMV0_3_0(const QString &name, qreal value);
void ToV0_3_0(); void ToV0_3_0();
}; };

2
src/libs/ifc/xml/vvstconverter.cpp
View File

@ -45,7 +45,7 @@ const QString VVSTConverter::CurrentSchema = QStringLiteral("://schema/st
//--------------------------------------------------------------------------------------------------------------------- //---------------------------------------------------------------------------------------------------------------------
VVSTConverter::VVSTConverter(const QString &fileName) VVSTConverter::VVSTConverter(const QString &fileName)
:VAbstractConverter(fileName) :VAbstractMConverter(fileName)
{ {
const QString schema = XSDSchema(ver); const QString schema = XSDSchema(ver);
ValidateXML(schema, fileName); ValidateXML(schema, fileName);

4
src/libs/ifc/xml/vvstconverter.h
View File

@ -29,9 +29,9 @@
#ifndef VMEASUREMENTCONVERTER_H #ifndef VMEASUREMENTCONVERTER_H
#define VMEASUREMENTCONVERTER_H #define VMEASUREMENTCONVERTER_H
#include "vabstractconverter.h" #include "vabstractmconverter.h"
class VVSTConverter : public VAbstractConverter class VVSTConverter : public VAbstractMConverter
{ {
Q_DECLARE_TR_FUNCTIONS(VVSTConverter) Q_DECLARE_TR_FUNCTIONS(VVSTConverter)
public: public:

6
src/libs/ifc/xml/xml.pri
View File

@ -8,7 +8,8 @@ HEADERS += \
$$PWD/vtoolrecord.h \ $$PWD/vtoolrecord.h \
$$PWD/vabstractpattern.h \ $$PWD/vabstractpattern.h \
$$PWD/vvstconverter.h \ $$PWD/vvstconverter.h \
xml/vvitconverter.h $$PWD//vvitconverter.h \
$$PWD//vabstractmconverter.h
SOURCES += \ SOURCES += \
$$PWD/vabstractconverter.cpp \ $$PWD/vabstractconverter.cpp \
@ -17,4 +18,5 @@ SOURCES += \
$$PWD/vtoolrecord.cpp \ $$PWD/vtoolrecord.cpp \
$$PWD/vabstractpattern.cpp \ $$PWD/vabstractpattern.cpp \
$$PWD/vvstconverter.cpp \ $$PWD/vvstconverter.cpp \
xml/vvitconverter.cpp $$PWD//vvitconverter.cpp \
$$PWD//vabstractmconverter.cpp

2
src/libs/vformat/vmeasurements.cpp
View File

@ -611,8 +611,8 @@ void VMeasurements::CreateEmptyIndividualFile(Unit unit)
mElement.appendChild(mUnit); mElement.appendChild(mUnit);
QDomElement personal = createElement(TagPersonal); QDomElement personal = createElement(TagPersonal);
personal.appendChild(createElement(TagGivenName));
personal.appendChild(createElement(TagFamilyName)); personal.appendChild(createElement(TagFamilyName));
personal.appendChild(createElement(TagGivenName));
QDomElement date = createElement(TagBirthDate); QDomElement date = createElement(TagBirthDate);
const QDomText newDate = createTextNode(QDate(1990, 02, 15).toString("yyyy-MM-dd")); const QDomText newDate = createTextNode(QDate(1990, 02, 15).toString("yyyy-MM-dd"));