diff --git a/src/app/container/vmeasurement.cpp b/src/app/container/vmeasurement.cpp index 1701e604e..0ecf094e7 100644 --- a/src/app/container/vmeasurement.cpp +++ b/src/app/container/vmeasurement.cpp @@ -118,8 +118,8 @@ QStringList VMeasurement::ListHeights(QMap heights) if (list.isEmpty()) { - // from 92 cm to 188 cm - for (int i = 92; i<= 188; i = i+6) + // from 92 cm to 194 cm + for (int i = 92; i<= 194; i = i+6) { ListValue(list, i); } diff --git a/src/app/dialogs/app/dialogpatternproperties.cpp b/src/app/dialogs/app/dialogpatternproperties.cpp index b0e24d325..07783621f 100644 --- a/src/app/dialogs/app/dialogpatternproperties.cpp +++ b/src/app/dialogs/app/dialogpatternproperties.cpp @@ -62,6 +62,12 @@ DialogPatternProperties::DialogPatternProperties(VPattern *doc, QWidget *parent) connect(bCansel, &QPushButton::clicked, this, &DialogPatternProperties::close); connect(this, &DialogPatternProperties::haveChange, this->doc, &VPattern::haveLiteChange); + + ui->tabWidget->setCurrentIndex(0); + if (qApp->patternUnit() == Unit::Inch) + { + ui->tabWidget->setTabEnabled(1, false); + } } //--------------------------------------------------------------------------------------------------------------------- diff --git a/src/app/dialogs/app/dialogpatternproperties.ui b/src/app/dialogs/app/dialogpatternproperties.ui index f18932430..82cf6a777 100644 --- a/src/app/dialogs/app/dialogpatternproperties.ui +++ b/src/app/dialogs/app/dialogpatternproperties.ui @@ -6,8 +6,8 @@ 0 0 - 646 - 605 + 657 + 562 @@ -17,52 +17,714 @@ :/icon/64x64/icon64x64.png:/icon/64x64/icon64x64.png - + - - - - - Author name - - - - - - - - - - - - - - Pattern description - - - - - - - - - - - - - - - - - - For technical notes. - - - - - - - + + + 1 + + + + Description + + + + + + + + Author name + + + + + + + + + + + + + + Pattern description + + + + + + + + + + + + + + + + + + For technical notes. + + + + + + + + + + + + + Heights and Sizes + + + + + + + + + + All heights (cm) + + + true + + + + + + + QFrame::StyledPanel + + + QFrame::Raised + + + + QLayout::SetMaximumSize + + + + + + 0 + 0 + + + + 92 + + + true + + + + + + + + 0 + 0 + + + + 146 + + + true + + + + + + + + 0 + 0 + + + + 98 + + + true + + + + + + + + 0 + 0 + + + + 152 + + + true + + + + + + + + 0 + 0 + + + + + 0 + 0 + + + + 104 + + + true + + + + + + + + 0 + 0 + + + + 158 + + + true + + + + + + + + 0 + 0 + + + + 110 + + + true + + + + + + + + 0 + 0 + + + + 164 + + + true + + + + + + + + 0 + 0 + + + + 116 + + + true + + + + + + + + 0 + 0 + + + + 170 + + + true + + + + + + + + 0 + 0 + + + + 122 + + + true + + + + + + + + 0 + 0 + + + + 176 + + + true + + + + + + + + 0 + 0 + + + + 128 + + + true + + + + + + + + 0 + 0 + + + + 182 + + + true + + + + + + + + 0 + 0 + + + + 134 + + + true + + + + + + + + 0 + 0 + + + + 188 + + + true + + + + + + + + 0 + 0 + + + + 140 + + + true + + + + + + + + 0 + 0 + + + + 194 + + + true + + + + + + + + + + + + + + All sizes (cm) + + + true + + + + + + + QFrame::StyledPanel + + + QFrame::Raised + + + + + + + 0 + 0 + + + + 22 + + + true + + + + + + + + 0 + 0 + + + + 40 + + + true + + + + + + + + 0 + 0 + + + + 24 + + + true + + + + + + + + 0 + 0 + + + + 42 + + + true + + + + + + + + 0 + 0 + + + + 26 + + + true + + + + + + + + 0 + 0 + + + + 44 + + + true + + + + + + + + 0 + 0 + + + + 28 + + + true + + + + + + + + 0 + 0 + + + + 46 + + + true + + + + + + + + 0 + 0 + + + + 30 + + + true + + + + + + + + 0 + 0 + + + + 48 + + + true + + + + + + + + 0 + 0 + + + + 32 + + + true + + + + + + + + 0 + 0 + + + + 50 + + + true + + + + + + + + 0 + 0 + + + + 34 + + + true + + + + + + + + 0 + 0 + + + + 52 + + + true + + + + + + + + 0 + 0 + + + + 36 + + + true + + + + + + + + 0 + 0 + + + + 54 + + + true + + + + + + + + 0 + 0 + + + + 38 + + + true + + + + + + + + 0 + 0 + + + + 56 + + + true + + + + + + + + + + + + + diff --git a/src/app/options.h b/src/app/options.h index 8ea646eaf..6c6c22db4 100644 --- a/src/app/options.h +++ b/src/app/options.h @@ -77,7 +77,7 @@ enum class MeasurementsType : char { Standard, Individual }; enum class GHeights : unsigned char { H92=92, H98=98, H104=104, H110=110, H116=116, H122=122, H128=128, H134=134, H140=140, H146=146, H152=152, H158=158, H164=164, H170=170, H176=176, H182=182, - H188=188 }; + H188=188, H194=194}; enum class GSizes : unsigned char { S22=22, S24=24, S26=26, S28=28, S30=30, S32=32, S34=34, S36=36, S38=38, S40=40, S42=42, S44=44, S46=46, S48=48, S50=50, S52=52, S54=54, S56=56 }; diff --git a/src/app/xml/vpattern.cpp b/src/app/xml/vpattern.cpp index bff2bfe79..70c75dc19 100644 --- a/src/app/xml/vpattern.cpp +++ b/src/app/xml/vpattern.cpp @@ -89,6 +89,7 @@ const QString VPattern::AttrH170 = QStringLiteral("h170"); const QString VPattern::AttrH176 = QStringLiteral("h176"); const QString VPattern::AttrH182 = QStringLiteral("h182"); const QString VPattern::AttrH188 = QStringLiteral("h188"); +const QString VPattern::AttrH194 = QStringLiteral("h194"); const QString VPattern::AttrS22 = QStringLiteral("s22"); const QString VPattern::AttrS24 = QStringLiteral("s24"); @@ -1879,6 +1880,7 @@ QMap VPattern::GetGradationHeights() const map.insert(GHeights::H176, true); map.insert(GHeights::H182, true); map.insert(GHeights::H188, true); + map.insert(GHeights::H194, true); QDomNodeList tags = elementsByTagName(TagGradation); if (tags.size() == 0) @@ -1921,6 +1923,7 @@ QMap VPattern::GetGradationHeights() const map.insert(GHeights::H176, GetParametrBool(domElement, AttrH176, defValue)); map.insert(GHeights::H182, GetParametrBool(domElement, AttrH182, defValue)); map.insert(GHeights::H188, GetParametrBool(domElement, AttrH188, defValue)); + map.insert(GHeights::H194, GetParametrBool(domElement, AttrH194, defValue)); return map; break; case 1: // TagSizes diff --git a/src/app/xml/vpattern.h b/src/app/xml/vpattern.h index e63d1f4ed..2008a23c2 100644 --- a/src/app/xml/vpattern.h +++ b/src/app/xml/vpattern.h @@ -130,6 +130,7 @@ public: static const QString AttrH176; static const QString AttrH182; static const QString AttrH188; + static const QString AttrH194; static const QString AttrS22; static const QString AttrS24;