From 7d01bca72d5a51731b0e05dae2cdd85c274f77de Mon Sep 17 00:00:00 2001 From: dismine Date: Fri, 14 Mar 2014 16:12:53 +0200 Subject: [PATCH] Parsing individual measurements table. --HG-- branch : feature --- share/tables/individual/indivindual_ru.vit | 160 +++++++-------- src/container/container.pri | 4 +- src/container/vcontainer.cpp | 20 +- src/container/vcontainer.h | 42 ++-- ...vstandardtablerow.cpp => vmeasurement.cpp} | 30 ++- .../{vstandardtablerow.h => vmeasurement.h} | 30 +-- src/dialogs/app/dialogincrements.cpp | 8 +- src/dialogs/tools/dialogtool.cpp | 2 +- src/main.cpp | 4 +- src/options.h | 12 ++ src/xml/vdomdocument.cpp | 32 ++- src/xml/vdomdocument.h | 2 + src/xml/vindividualmeasurements.cpp | 184 ++++++++++++++++++ src/xml/vindividualmeasurements.h | 8 + src/xml/vstandardmeasurements.cpp | 26 +-- src/xml/vstandardmeasurements.h | 1 - 16 files changed, 404 insertions(+), 161 deletions(-) rename src/container/{vstandardtablerow.cpp => vmeasurement.cpp} (58%) rename src/container/{vstandardtablerow.h => vmeasurement.h} (77%) diff --git a/share/tables/individual/indivindual_ru.vit b/share/tables/individual/indivindual_ru.vit index 9f7ee6edf..796a317ab 100644 --- a/share/tables/individual/indivindual_ru.vit +++ b/share/tables/individual/indivindual_ru.vit @@ -9,98 +9,98 @@ mm - - - - + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - + + + + + + + + + + - - - + + + - - - - - - - + + + + + + + - - + + - - - - - - - - - + + + + + + + + + diff --git a/src/container/container.pri b/src/container/container.pri index 5fe8d435f..bbc26547b 100644 --- a/src/container/container.pri +++ b/src/container/container.pri @@ -2,10 +2,10 @@ SOURCES += \ src/container/vincrementtablerow.cpp \ src/container/vcontainer.cpp \ src/container/calculator.cpp \ - src/container/vstandardtablerow.cpp + src/container/vmeasurement.cpp HEADERS += \ src/container/vincrementtablerow.h \ src/container/vcontainer.h \ src/container/calculator.h \ - src/container/vstandardtablerow.h + src/container/vmeasurement.h diff --git a/src/container/vcontainer.cpp b/src/container/vcontainer.cpp index 3dc327aa2..e6219cc78 100644 --- a/src/container/vcontainer.cpp +++ b/src/container/vcontainer.cpp @@ -35,7 +35,7 @@ quint32 VContainer::_id = 0; VContainer::VContainer() :_size(50), sizeName("Сг"), _height(176), heightName("P"), gObjects(QHash()), - standardTable(QHash()), incrementTable(QHash()), + standardTable(QHash()), incrementTable(QHash()), lengthLines(QHash()), lineAngles(QHash()), lengthSplines(QHash()), lengthArcs(QHash()), details(QHash()) { @@ -49,7 +49,7 @@ VContainer &VContainer::operator =(const VContainer &data) VContainer::VContainer(const VContainer &data) :_size(50), sizeName("Сг"), _height(176), heightName("P"), gObjects(QHash()), - standardTable(QHash()), incrementTable(QHash()), + standardTable(QHash()), incrementTable(QHash()), lengthLines(QHash()), lineAngles(QHash()), lengthSplines(QHash()), lengthArcs(QHash()), details(QHash()) { @@ -143,7 +143,7 @@ val VContainer::GetVariable(const QHash &obj, key id) const } } -const VStandardTableRow VContainer::GetStandardTableCell(const QString &name) const +const VMeasurement VContainer::GetMeasurement(const QString &name) const { Q_ASSERT(name.isEmpty()==false); return GetVariable(standardTable, name); @@ -250,11 +250,15 @@ void VContainer::AddLineAngle(const QString &name, const qreal &value) qreal VContainer::GetValueStandardTableRow(const QString& name) const { - const VStandardTableRow row = GetStandardTableCell(name); - const qreal k_size = ( size() - 50.0 ) / 2.0; - const qreal k_growth = ( height() - 176.0 ) / 6.0; - const qreal value = row.GetBase() + k_size * row.GetKsize() + k_growth * row.GetKgrowth(); - return value; + const VMeasurement m = GetMeasurement(name); + if (patternType == Pattern::Individual) + { + return m.GetValue(); + } + else + { + return m.GetValue(size(), height()); + } } qreal VContainer::GetValueIncrementTableRow(const QString& name) const diff --git a/src/container/vcontainer.h b/src/container/vcontainer.h index 08e7c1f07..0550c0a45 100644 --- a/src/container/vcontainer.h +++ b/src/container/vcontainer.h @@ -29,7 +29,7 @@ #ifndef VCONTAINER_H #define VCONTAINER_H -#include "vstandardtablerow.h" +#include "vmeasurement.h" #include "vincrementtablerow.h" #include "../geometry/varc.h" #include "../geometry/vsplinepath.h" @@ -107,11 +107,11 @@ public: */ const VGObject *GetGObject(quint32 id) const; /** - * @brief GetStandardTableCell return standard table row by name - * @param name name of standard table row - * @return row of standard table + * @brief GetMeasurement return measurement by name + * @param name short measurement name + * @return measurement */ - const VStandardTableRow GetStandardTableCell(const QString& name) const; + const VMeasurement GetMeasurement(const QString& name) const; /** * @brief GetIncrementTableRow return increment table row by name * @param name name of increment table row @@ -147,7 +147,7 @@ public: * @param id id of detail * @return detail */ - const VDetail GetDetail(quint32 id) const; + const VDetail GetDetail(quint32 id) const; /** * @brief getId return current id * @return current id @@ -166,11 +166,11 @@ public: */ quint32 AddDetail(VDetail detail); /** - * @brief AddStandardTableRow add new row of standard table - * @param name name of row of standard table - * @param row row of standard table + * @brief AddMeasurement add new measurement + * @param name short measurement name + * @param row measurement */ - void AddStandardTableRow(const QString& name, const VStandardTableRow &row); + void AddMeasurement(const QString& name, const VMeasurement &m); /** * @brief AddIncrementTableRow add new row of increment table * @param name name of new row of increment table @@ -236,11 +236,11 @@ public: */ void UpdateDetail(quint32 id, const VDetail &detail); /** - * @brief UpdateStandardTableCell update standard table row by name - * @param name name of row - * @param cell row of standard table + * @brief UpdateMeasurement update measurement by name + * @param name short measurement name + * @param m measurement */ - void UpdateStandardTableCell(const QString& name, VStandardTableRow cell); + void UpdateMeasurement(const QString& name, VMeasurement m); /** * @brief UpdateIncrementTableRow update increment table row by name * @param name name of row @@ -345,7 +345,7 @@ public: * @brief data container with dataStandardTable return container of standard table * @return pointer on container of standard table */ - const QHash *DataStandardTable() const; + const QHash *DataStandardTable() const; /** * @brief data container with dataIncrementTable return container of increment table * @return pointer on container of increment table @@ -397,7 +397,7 @@ private: /** * @brief standardTable container of standard table rows */ - QHash standardTable; + QHash standardTable; /** * @brief incrementTable */ @@ -458,14 +458,14 @@ private: static quint32 AddObject(QHash &obj, val value); }; -inline void VContainer::AddStandardTableRow(const QString &name, const VStandardTableRow &row) +inline void VContainer::AddMeasurement(const QString &name, const VMeasurement &m) { - standardTable[name] = row; + standardTable[name] = m; } -inline void VContainer::UpdateStandardTableCell(const QString &name, VStandardTableRow cell) +inline void VContainer::UpdateMeasurement(const QString &name, VMeasurement m) { - standardTable[name] = cell; + standardTable[name] = m; } inline void VContainer::UpdateIncrementTableRow(const QString &name, VIncrementTableRow row) @@ -558,7 +558,7 @@ inline const QHash *VContainer::DataGObjects() const return &gObjects; } -inline const QHash *VContainer::DataStandardTable() const +inline const QHash *VContainer::DataStandardTable() const { return &standardTable; } diff --git a/src/container/vstandardtablerow.cpp b/src/container/vmeasurement.cpp similarity index 58% rename from src/container/vstandardtablerow.cpp rename to src/container/vmeasurement.cpp index a150460df..c08f28318 100644 --- a/src/container/vstandardtablerow.cpp +++ b/src/container/vmeasurement.cpp @@ -26,11 +26,29 @@ ** *************************************************************************/ -#include "vstandardtablerow.h" +#include "vmeasurement.h" -VStandardTableRow::VStandardTableRow() - :base(0), ksize(0), kgrowth(0), gui_text(QString()), number(QString()){} +VMeasurement::VMeasurement() + :base(0), ksize(50.0), kheight(176.0), gui_text(QString()), number(QString()){} -VStandardTableRow::VStandardTableRow(const qreal &base, const qreal &ksize, const qreal &kgrowth, - const QString &description, const QString &number) - :base(base), ksize(ksize), kgrowth(kgrowth), gui_text(description), number(number){} +VMeasurement::VMeasurement(const qreal &base, const qreal &ksize, const qreal &kgrowth, + const QString &gui_text, const QString &number) + :base(base), ksize(ksize), kheight(kgrowth), gui_text(gui_text), number(number){} + +VMeasurement::VMeasurement(const qreal &base, const QString &gui_text, const QString &number) + :base(base), ksize(50.0), kheight(176.0), gui_text(gui_text), number(number) +{ + +} + +qreal VMeasurement::GetValue() const +{ + return base; +} + +qreal VMeasurement::GetValue(const qreal &size, const qreal &height) const +{ + const qreal k_size = ( size - 50.0 ) / 2.0; + const qreal k_growth = ( height - 176.0 ) / 6.0; + return base + k_size * ksize + k_growth * kheight; +} diff --git a/src/container/vstandardtablerow.h b/src/container/vmeasurement.h similarity index 77% rename from src/container/vstandardtablerow.h rename to src/container/vmeasurement.h index 6305e6746..7942df8d7 100644 --- a/src/container/vstandardtablerow.h +++ b/src/container/vmeasurement.h @@ -32,15 +32,15 @@ #include /** - * @brief The VStandardTableRow class keep data row of standard table + * @brief The VMeasurement class keep data row of standard table */ -class VStandardTableRow +class VMeasurement { public: /** * @brief VStandardTableRow create empty row */ - VStandardTableRow(); + VMeasurement(); /** * @brief VStandardTableRow create row * @param base value in base size and growth @@ -48,9 +48,11 @@ public: * @param kgrowth increment in growths * @param description description of increment */ - VStandardTableRow(const qreal &base, const qreal &ksize, const qreal &kgrowth, + VMeasurement(const qreal &base, const qreal &ksize, const qreal &kheight, const QString &gui_text = QString(), const QString &number = QString()); - ~VStandardTableRow(){} + VMeasurement(const qreal &base, const QString &gui_text = QString(), + const QString &number = QString()); + ~VMeasurement(){} /** * @brief GetBase return value in base size and growth * @return value @@ -65,13 +67,15 @@ public: * @brief GetKgrowth return increment in growths * @return increment */ - qreal GetKgrowth() const; + qreal GetKheight() const; /** * @brief GetDescription return description * @return description */ QString GetDescription() const; QString GetNumber() const; + qreal GetValue() const; + qreal GetValue(const qreal &size, const qreal &height) const; private: /** * @brief base value in base size and growth @@ -84,7 +88,7 @@ private: /** * @brief kgrowth increment in growths */ - qreal kgrowth; + qreal kheight; /** * @brief description description measurement */ @@ -92,27 +96,27 @@ private: QString number; }; -inline qreal VStandardTableRow::GetBase() const +inline qreal VMeasurement::GetBase() const { return base; } -inline qreal VStandardTableRow::GetKsize() const +inline qreal VMeasurement::GetKsize() const { return ksize; } -inline qreal VStandardTableRow::GetKgrowth() const +inline qreal VMeasurement::GetKheight() const { - return kgrowth; + return kheight; } -inline QString VStandardTableRow::GetDescription() const +inline QString VMeasurement::GetDescription() const { return gui_text; } -inline QString VStandardTableRow::GetNumber() const +inline QString VMeasurement::GetNumber() const { return number; } diff --git a/src/dialogs/app/dialogincrements.cpp b/src/dialogs/app/dialogincrements.cpp index 96b27bae5..2fa67fc92 100644 --- a/src/dialogs/app/dialogincrements.cpp +++ b/src/dialogs/app/dialogincrements.cpp @@ -64,14 +64,14 @@ DialogIncrements::DialogIncrements(VContainer *data, VPattern *doc, QWidget *par void DialogIncrements::FillStandardTable() { - const QHash *standardTable = data->DataStandardTable(); + const QHash *standardTable = data->DataStandardTable(); qint32 currentRow = -1; - QHashIterator i(*standardTable); + QHashIterator i(*standardTable); ui->tableWidgetStandard->setRowCount ( standardTable->size() ); while (i.hasNext()) { i.next(); - VStandardTableRow cell = i.value(); + VMeasurement cell = i.value(); currentRow++; QTableWidgetItem *item = new QTableWidgetItem(QString(i.key())); @@ -91,7 +91,7 @@ void DialogIncrements::FillStandardTable() item->setTextAlignment(Qt::AlignHCenter); ui->tableWidgetStandard->setItem(currentRow, 3, item); - item = new QTableWidgetItem(QString().setNum(cell.GetKgrowth())); + item = new QTableWidgetItem(QString().setNum(cell.GetKheight())); item->setTextAlignment(Qt::AlignHCenter); ui->tableWidgetStandard->setItem(currentRow, 4, item); diff --git a/src/dialogs/tools/dialogtool.cpp b/src/dialogs/tools/dialogtool.cpp index ba6efc9aa..378508674 100644 --- a/src/dialogs/tools/dialogtool.cpp +++ b/src/dialogs/tools/dialogtool.cpp @@ -616,7 +616,7 @@ void DialogTool::ValChenged(int row) } if (radioButtonStandardTable->isChecked()) { - VStandardTableRow stable = data->GetStandardTableCell(item->text()); + VMeasurement stable = data->GetMeasurement(item->text()); QString desc = QString("%1(%2) - %3").arg(item->text()).arg(data->GetValueStandardTableRow(item->text())) .arg(stable.GetDescription()); labelDescription->setText(desc); diff --git a/src/main.cpp b/src/main.cpp index f604eac08..250149737 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -33,8 +33,8 @@ #include "tablewindow.h" #include "options.h" -//Default pattern unit. -Valentina::Units patternUnit = Valentina::Cm; +Valentina::Units patternUnit = Valentina::Cm;// Default pattern unit. +Pattern::Measurements patternType = Pattern::Individual;// Default pattern type. #ifdef Q_OS_WIN const QString translationsPath = QString("/translations"); diff --git a/src/options.h b/src/options.h index d07c656eb..b7466d681 100644 --- a/src/options.h +++ b/src/options.h @@ -103,6 +103,18 @@ Q_DECLARE_OPERATORS_FOR_FLAGS( Valentina::Units ) extern Valentina::Units patternUnit; +namespace Pattern +{ + /** + * @brief The Scene enum + */ + enum Measurement { Standard, Individual }; + Q_DECLARE_FLAGS(Measurements, Measurement) +} +Q_DECLARE_OPERATORS_FOR_FLAGS( Pattern::Measurements ) + +extern Pattern::Measurements patternType; + #define PrintDPI 96.0 inline double toPixel(double unit) diff --git a/src/xml/vdomdocument.cpp b/src/xml/vdomdocument.cpp index e22d956e5..bc248a6bc 100644 --- a/src/xml/vdomdocument.cpp +++ b/src/xml/vdomdocument.cpp @@ -168,7 +168,14 @@ QString VDomDocument::GetParametrString(const QDomElement &domElement, const QSt const QString parameter = domElement.attribute(name, defValue); if (parameter.isEmpty()) { - throw VExceptionEmptyParameter(tr("Got empty parameter"), name, domElement); + if (defValue.isEmpty()) + { + throw VExceptionEmptyParameter(tr("Got empty parameter"), name, domElement); + } + else + { + return defValue; + } } return parameter; } @@ -258,3 +265,26 @@ bool VDomDocument::ValidatePattern(const QString &schema, const QString &fileNam return true; } } + +Valentina::Units VDomDocument::Units(const QString &unit) +{ + QStringList units; + units << "mm" << "cm" << "in"; + Valentina::Units result = Valentina::Cm; + switch (units.indexOf(unit)) + { + case 0:// mm + result = Valentina::Mm; + break; + case 1:// cm + result = Valentina::Cm; + break; + case 2:// in + result = Valentina::In; + break; + default: + result = Valentina::Cm; + break; + } + return result; +} diff --git a/src/xml/vdomdocument.h b/src/xml/vdomdocument.h index fe667ff64..ede7c9963 100644 --- a/src/xml/vdomdocument.h +++ b/src/xml/vdomdocument.h @@ -33,6 +33,7 @@ #include #include +#include "../options.h" #ifdef Q_CC_GNU #pragma GCC diagnostic push @@ -117,6 +118,7 @@ protected: * @brief data container with data. */ VContainer *data; + Valentina::Units Units(const QString &unit); private: Q_DISABLE_COPY(VDomDocument) /** diff --git a/src/xml/vindividualmeasurements.cpp b/src/xml/vindividualmeasurements.cpp index 94bd3d812..e474fd179 100644 --- a/src/xml/vindividualmeasurements.cpp +++ b/src/xml/vindividualmeasurements.cpp @@ -31,3 +31,187 @@ VIndividualMeasurements::VIndividualMeasurements(VContainer *data):VDomDocument(data) { } + +Valentina::Units VIndividualMeasurements::Unit() +{ + const QString unit = UniqueTagText("unit", "cm"); + return VDomDocument::Units(unit); +} + +void VIndividualMeasurements::Measurements() +{ + //head and neck + Measurement("head_girth"); + Measurement("mid_neck_girth"); + Measurement("neck_base_girth"); + Measurement("head_and_neck_length"); + //torso + Measurement("center_front_waist_length"); + Measurement("center_back_waist_length"); + Measurement("shoulder_length"); + Measurement("side_waist_length"); + Measurement("trunk_length"); + Measurement("shoulder_girth"); + Measurement("upper_chest_girth"); + Measurement("bust__girth"); + Measurement("under_bust_girth"); + Measurement("waist_girth"); + Measurement("high_hip_girth"); + Measurement("hip_girth"); + Measurement("upper_front_chest_width"); + Measurement("front_chest_width"); + Measurement("across_front_shoulder_width"); + Measurement("across_back_shoulder_width"); + Measurement("upper_back_width"); + Measurement("back_width"); + Measurement("bustpoint_to_bustpoint"); + Measurement("halter_bustpoint_to_bustpoint"); + Measurement("neck_to_bustpoint"); + Measurement("crotch_length"); + Measurement("rise_height"); + Measurement("shoulder_drop"); + Measurement("shoulder_slope_degrees"); + Measurement("front_shoulder_slope_length"); + Measurement("back_shoulder_slope_length"); + Measurement("front_shoulder_to_waist_length"); + Measurement("back_shoulder_to_waist_length"); + Measurement("front_neck_arc"); + Measurement("back_neck_arc"); + Measurement("front_upper-bust_arc"); + Measurement("back_upper-bust_arc"); + Measurement("front_waist_arc"); + Measurement("back_waist_arc"); + Measurement("front_upper-hip_arc"); + Measurement("back_upper-hip_arc"); + Measurement("front_hip_arc"); + Measurement("back_hip_arc"); + Measurement("chest_slope"); + Measurement("back_slope"); + Measurement("front_waist_slope"); + Measurement("back_waist_slope"); + Measurement("front-neck_to_upper-chest_height"); + Measurement("front-neck_to_bust_height"); + //arm + Measurement("armscye_girth"); + Measurement("elbow_girth"); + Measurement("upper-arm_girth"); + Measurement("wrist_girth"); + Measurement("scye_depth"); + Measurement("shoulder_and_arm_length"); + Measurement("underarm_length"); + Measurement("cervicale_to_wrist_length"); + Measurement("shoulder_to_elbow_length"); + Measurement("arm_length"); + //hand + Measurement("hand_width"); + Measurement("hand_length"); + Measurement("hand_girth"); + //leg + Measurement("thigh_girth"); + Measurement("mid_thigh_girth"); + Measurement("knee_girth"); + Measurement("calf_girth"); + Measurement("ankle_girth"); + Measurement("knee_height"); + Measurement("ankle_height"); + //foot + Measurement("foot_width"); + Measurement("foot_length"); + //heights + Measurement("height"); + Measurement("cervicale_height"); + Measurement("cervicale_to_knee_height"); + Measurement("waist_height"); + Measurement("high_hip_height"); + Measurement("hip_height"); + Measurement("waist_to_hip_height"); + Measurement("waist_to_knee_height"); + Measurement("crotch_height"); +} + +void VIndividualMeasurements::Measurement(const QString &tag) +{ + const QDomNodeList nodeList = this->elementsByTagName(tag); + if (nodeList.isEmpty()) + { + qWarning()<<"Measurement" << tag <<"doesn't exist"<AddMeasurement(name, VMeasurement(value/10.0, gui_text, description)); + if (m_number.isEmpty()) + { + qWarning()<<"Can't find language-independent measurement name for "<< tag; + return; + } + else + { + data->AddMeasurement(m_number, VMeasurement(value/10.0, gui_text, description)); + } + } + else//Cm or inch. + { + data->AddMeasurement(name, VMeasurement(value, gui_text, description)); + if (m_number.isEmpty()) + { + qWarning()<<"Can't find language-independent measurement name for "<< tag; + return; + } + else + { + data->AddMeasurement(m_number, VMeasurement(value, gui_text, description)); + } + } + } + } + } +} + +QString VIndividualMeasurements::Language() +{ + return UniqueTagText("lang", "en"); +} + +QString VIndividualMeasurements::FamilyName() +{ + return UniqueTagText("family-name", ""); +} + +QString VIndividualMeasurements::GivenName() +{ + return UniqueTagText("given-name", ""); +} + +QString VIndividualMeasurements::BirthDate() +{ + return UniqueTagText("birth-date", ""); +} + +QString VIndividualMeasurements::Sex() +{ + return UniqueTagText("sex", ""); +} diff --git a/src/xml/vindividualmeasurements.h b/src/xml/vindividualmeasurements.h index f2cf6fda6..55931039d 100644 --- a/src/xml/vindividualmeasurements.h +++ b/src/xml/vindividualmeasurements.h @@ -35,6 +35,14 @@ class VIndividualMeasurements:public VDomDocument { public: VIndividualMeasurements(VContainer *data); + Valentina::Units Unit(); + void Measurements(); + void Measurement(const QString &tag); + QString Language(); + QString FamilyName(); + QString GivenName(); + QString BirthDate(); + QString Sex(); }; #endif // VINDIVIDUALMEASUREMENTS_H diff --git a/src/xml/vstandardmeasurements.cpp b/src/xml/vstandardmeasurements.cpp index 92c88a976..cf146f807 100644 --- a/src/xml/vstandardmeasurements.cpp +++ b/src/xml/vstandardmeasurements.cpp @@ -36,25 +36,7 @@ VStandardMeasurements::VStandardMeasurements(VContainer *data):VDomDocument(data Valentina::Units VStandardMeasurements::Unit() { const QString unit = UniqueTagText("unit", "cm"); - QStringList units; - units << "mm" << "cm" << "in"; - Valentina::Units result = Valentina::Cm; - switch (units.indexOf(unit)) - { - case 0:// mm - result = Valentina::Mm; - break; - case 1:// cm - result = Valentina::Cm; - break; - case 2:// in - result = Valentina::In; - break; - default: - result = Valentina::Cm; - break; - } - return result; + return VDomDocument::Units(unit); } QString VStandardMeasurements::Description() @@ -98,12 +80,12 @@ void VStandardMeasurements::Measurements() if (Unit() == Valentina::Mm)//Convert to Cm. { - data->AddStandardTableRow(name, VStandardTableRow(base/10.0, size_increace/10.0, - height_increase/10.0, gui_text, number)); + data->AddMeasurement(name, VMeasurement(base/10.0, size_increace/10.0, height_increase/10.0, + gui_text, number)); } else//Cm or inch. { - data->AddStandardTableRow(name, VStandardTableRow(base, size_increace, height_increase, + data->AddMeasurement(name, VMeasurement(base, size_increace, height_increase, gui_text, number)); } } diff --git a/src/xml/vstandardmeasurements.h b/src/xml/vstandardmeasurements.h index 7df93d3c0..327c32caa 100644 --- a/src/xml/vstandardmeasurements.h +++ b/src/xml/vstandardmeasurements.h @@ -30,7 +30,6 @@ #define VSTANDARDMEASUREMENTS_H #include "vdomdocument.h" -#include "../options.h" class VStandardMeasurements:public QObject, public VDomDocument {