diff --git a/ChangeLog.txt b/ChangeLog.txt
index 6d1476ad2..a9f2106da 100644
--- a/ChangeLog.txt
+++ b/ChangeLog.txt
@@ -52,6 +52,7 @@
 - [smart-pattern/valentina#40] Invalid name of arc in modeling mode.
 - New warning. Error calculating segment of curve.
 - Improve searching lost measurements. Additional case with underscores instead of regular spaces.
+- Redesign multisize measurements.
 
 # Version 0.6.2 (unreleased)
 - [#903] Bug in tool Cut Spline path.
diff --git a/dist/debian/tape.1 b/dist/debian/tape.1
index 83d3dfc27..97e240551 100644
--- a/dist/debian/tape.1
+++ b/dist/debian/tape.1
@@ -1,6 +1,6 @@
 .\" Manpage for tape.
 .\" Contact dismine@gmail.com to correct errors.
-.TH tape 1 "10 March, 2017" "tape man page"
+.TH tape 1 "3 October, 2020" "tape man page"
 .SH NAME
 Tape \- Valentina's measurements editor.
 .SH SYNOPSIS
@@ -20,12 +20,14 @@ is a part of Valentina. And used for creating and editing measurement files.
 Displays this help.
 .IP "-v, --version"
 Displays version information.
-.IP "-e, --height <The base height>"
-Open with the base height. Valid values: 92, 98, 104, 110, 116, 122, 128, 134, 140, 146, 152, 158, 164, 170, 176, 182, 188, 194, 200cm.
-.IP "-s, --size <The base size>" 
-Open with the base size. Valid values: 22, 24, 26, 28, 30, 32, 34, 36, 38, 40, 42, 44, 46, 48, 50, 52, 54, 56cm.
-.IP "-u, --unit <The pattern unit>" 
-Set pattern file unit: cm, mm, inch.
+.IP "-a, --dimensionA <The dimension A base>"
+Set base for dimension A in the table units.
+.IP "-b, --dimensionB <The dimension B base>"
+Set base for dimension B in the table units.
+.IP "-c, --dimensionA <The dimension C base>"
+Set base for dimension C in the table units.
+.IP "-u, --units <The pattern units>" 
+Set pattern file units: cm, mm, inch.
 .IP "--test"
 Use for unit testing. Run the program and open a file without showing the main window.
 .IP "--no-scaling"
@@ -35,9 +37,5 @@ Disable high dpi scaling. Call this option if has problem with scaling (by defau
 \- the measurement file.
 .SH AUTHOR
 .RI "This  manual  page  was  written  by Roman Telezhynskyi <" dismine@gmail.com ">"
-.SH "SEE ALSO"
-.RB "Full " "User Manual" " is availiable in" 
-.UR https://bitbucket.org/dismine/valentina/wiki/manual/Content
-.UE
 
 .BR valentina (1)
diff --git a/dist/debian/valentina.1 b/dist/debian/valentina.1
index 48c841dd1..44803fad8 100644
--- a/dist/debian/valentina.1
+++ b/dist/debian/valentina.1
@@ -139,10 +139,12 @@ The path to output destination folder. By default the directory at which the app
 .RB "Export only details. Export details as they positioned in the details mode. Any layout related options will be ignored."
 .IP "--exportSuchDetails <The name regex>"
 .RB "Export only details that match a piece name regex."
-.IP "-x, --gsize <The size value>"
-.RB "Set size value a pattern file, that was opened with multisize measurements " "(export mode)" ". Valid values: 22, 24, 26, 28, 30, 32, 34, 36, 38, 40, 42, 44, 46, 48, 50, 52, 54, 56cm."
-.IP "-e, --gheight <The height value>"
-.RB "Set height value a pattern file, that was opened with multisize measurements (" "export mode" "). Valid values: 92, 98, 104, 110, 116, 122, 128, 134, 140, 146, 152, 158, 164, 170, 176, 182, 188, 194, 200cm."
+.IP "--dimensionA <The dimension A base>"
+.RB "Set base for dimension A in the multisize measurements units " "(export mode)" "."
+.IP "--dimensionB <The dimension B base>"
+.RB "Set base for dimension B in the multisize measurements units " "(export mode)" "."
+.IP "--dimensionC <The dimension C base>"
+.RB "Set base for dimension C in the multisize measurements units " "(export mode)" "."
 .IP "--userMaterial <User material>"                      
 .RB "Use this option to override user material defined in pattern. The value must be in form <number>@<user matrial name>. The number should be in range from 1 to 20. For example, 1@Fabric2. The key can be used multiple times. Has no effect in GUI mode."
 .IP "-p, --pageformat <Template number>"
diff --git a/src/app/tape/dialogs/configpages/tapepreferencesconfigurationpage.cpp b/src/app/tape/dialogs/configpages/tapepreferencesconfigurationpage.cpp
index b8d42f37f..b0854aa25 100644
--- a/src/app/tape/dialogs/configpages/tapepreferencesconfigurationpage.cpp
+++ b/src/app/tape/dialogs/configpages/tapepreferencesconfigurationpage.cpp
@@ -38,8 +38,7 @@ TapePreferencesConfigurationPage::TapePreferencesConfigurationPage(QWidget *pare
     : QWidget(parent),
       ui(new Ui::TapePreferencesConfigurationPage),
       m_langChanged(false),
-      m_systemChanged(false),
-      m_defGradationChanged(false)
+      m_systemChanged(false)
 {
     ui->setupUi(this);
     RetranslateUi();
@@ -84,31 +83,6 @@ TapePreferencesConfigurationPage::TapePreferencesConfigurationPage(QWidget *pare
 
     //----------------------- Toolbar
     ui->toolBarStyleCheck->setChecked(qApp->TapeSettings()->GetToolBarStyle());
-
-    //---------------------------Default height and size
-    // If change units don't forget about the label
-    ui->defHeightCombo->addItems(VMeasurement::WholeListHeights(Unit::Cm));
-    index = ui->defHeightCombo->findText(QString().setNum(qApp->TapeSettings()->GetDefHeight()));
-    if (index != -1)
-    {
-        ui->defHeightCombo->setCurrentIndex(index);
-    }
-
-    auto DefGradationChanged = [this]()
-    {
-        m_defGradationChanged = true;
-    };
-
-    connect(ui->defHeightCombo, QOverload<int>::of(&QComboBox::currentIndexChanged), this, DefGradationChanged);
-
-    // If change units don't forget about the label
-    ui->defSizeCombo->addItems(VMeasurement::WholeListSizes(Unit::Cm));
-    index = ui->defSizeCombo->findText(QString().setNum(qApp->TapeSettings()->GetDefSize()));
-    if (index != -1)
-    {
-        ui->defSizeCombo->setCurrentIndex(index);
-    }
-    connect(ui->defSizeCombo, QOverload<int>::of(&QComboBox::currentIndexChanged), this, DefGradationChanged);
 }
 
 //---------------------------------------------------------------------------------------------------------------------
@@ -150,13 +124,6 @@ QStringList TapePreferencesConfigurationPage::Apply()
         qApp->RetranslateGroups();
     }
 
-    if (m_defGradationChanged)
-    {
-        settings->SetDefHeight(ui->defHeightCombo->currentText().toInt());
-        settings->SetDefSize(ui->defSizeCombo->currentText().toInt());
-        m_defGradationChanged = false;
-    }
-
     return preferences;
 }
 
@@ -187,7 +154,4 @@ void TapePreferencesConfigurationPage::RetranslateUi()
     ui->systemCombo->blockSignals(false);
     ui->systemCombo->setCurrentIndex(ui->systemCombo->findData(code));
     }
-
-    ui->labelHeightUnit->setText(UnitsToStr(Unit::Cm, true));
-    ui->labelSizeUnit->setText(UnitsToStr(Unit::Cm, true));
 }
diff --git a/src/app/tape/dialogs/configpages/tapepreferencesconfigurationpage.h b/src/app/tape/dialogs/configpages/tapepreferencesconfigurationpage.h
index 9ee0a6196..26e2931ae 100644
--- a/src/app/tape/dialogs/configpages/tapepreferencesconfigurationpage.h
+++ b/src/app/tape/dialogs/configpages/tapepreferencesconfigurationpage.h
@@ -52,7 +52,6 @@ private:
     Ui::TapePreferencesConfigurationPage *ui;
     bool m_langChanged;
     bool m_systemChanged;
-    bool m_defGradationChanged;
 
     void RetranslateUi();
 };
diff --git a/src/app/tape/dialogs/configpages/tapepreferencesconfigurationpage.ui b/src/app/tape/dialogs/configpages/tapepreferencesconfigurationpage.ui
index bc74e62dd..55a8f6328 100644
--- a/src/app/tape/dialogs/configpages/tapepreferencesconfigurationpage.ui
+++ b/src/app/tape/dialogs/configpages/tapepreferencesconfigurationpage.ui
@@ -7,7 +7,7 @@
     <x>0</x>
     <y>0</y>
     <width>544</width>
-    <height>750</height>
+    <height>648</height>
    </rect>
   </property>
   <property name="windowTitle">
@@ -25,7 +25,7 @@
         <x>0</x>
         <y>0</y>
         <width>524</width>
-        <height>730</height>
+        <height>628</height>
        </rect>
       </property>
       <layout class="QVBoxLayout" name="verticalLayout_2">
@@ -165,89 +165,6 @@
          </layout>
         </widget>
        </item>
-       <item>
-        <widget class="QGroupBox" name="groupBox">
-         <property name="title">
-          <string>Default height and size</string>
-         </property>
-         <layout class="QGridLayout" name="gridLayout">
-          <item row="0" column="0">
-           <widget class="QLabel" name="label">
-            <property name="text">
-             <string>Default height:</string>
-            </property>
-           </widget>
-          </item>
-          <item row="1" column="1">
-           <widget class="QComboBox" name="defSizeCombo">
-            <property name="sizePolicy">
-             <sizepolicy hsizetype="Preferred" vsizetype="Fixed">
-              <horstretch>0</horstretch>
-              <verstretch>0</verstretch>
-             </sizepolicy>
-            </property>
-           </widget>
-          </item>
-          <item row="0" column="2">
-           <widget class="QLabel" name="labelHeightUnit">
-            <property name="text">
-             <string notr="true">Height unit</string>
-            </property>
-           </widget>
-          </item>
-          <item row="0" column="1">
-           <widget class="QComboBox" name="defHeightCombo">
-            <property name="sizePolicy">
-             <sizepolicy hsizetype="Preferred" vsizetype="Fixed">
-              <horstretch>0</horstretch>
-              <verstretch>0</verstretch>
-             </sizepolicy>
-            </property>
-           </widget>
-          </item>
-          <item row="1" column="2">
-           <widget class="QLabel" name="labelSizeUnit">
-            <property name="text">
-             <string notr="true">Size unit</string>
-            </property>
-           </widget>
-          </item>
-          <item row="1" column="0">
-           <widget class="QLabel" name="label_4">
-            <property name="text">
-             <string>Default size:</string>
-            </property>
-           </widget>
-          </item>
-          <item row="0" column="3">
-           <spacer name="horizontalSpacer">
-            <property name="orientation">
-             <enum>Qt::Horizontal</enum>
-            </property>
-            <property name="sizeHint" stdset="0">
-             <size>
-              <width>40</width>
-              <height>20</height>
-             </size>
-            </property>
-           </spacer>
-          </item>
-          <item row="1" column="3">
-           <spacer name="horizontalSpacer_2">
-            <property name="orientation">
-             <enum>Qt::Horizontal</enum>
-            </property>
-            <property name="sizeHint" stdset="0">
-             <size>
-              <width>40</width>
-              <height>20</height>
-             </size>
-            </property>
-           </spacer>
-          </item>
-         </layout>
-        </widget>
-       </item>
        <item>
         <widget class="QGroupBox" name="groupBox_4">
          <property name="title">
diff --git a/src/app/tape/dialogs/dialogdimensionlabels.cpp b/src/app/tape/dialogs/dialogdimensionlabels.cpp
new file mode 100644
index 000000000..fc5d4e0d4
--- /dev/null
+++ b/src/app/tape/dialogs/dialogdimensionlabels.cpp
@@ -0,0 +1,223 @@
+/************************************************************************
+ **
+ **  @file   dialogdimensionlabels.cpp
+ **  @author Roman Telezhynskyi <dismine(at)gmail.com>
+ **  @date   8 10, 2020
+ **
+ **  @brief
+ **  @copyright
+ **  This source code is part of the Valentina project, a pattern making
+ **  program, whose allow create and modeling patterns of clothing.
+ **  Copyright (C) 2020 Valentina project
+ **  <https://gitlab.com/smart-pattern/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 "dialogdimensionlabels.h"
+#include "ui_dialogdimensionlabels.h"
+
+//---------------------------------------------------------------------------------------------------------------------
+DialogDimensionLabels::DialogDimensionLabels(const QMap<MeasurementDimension, MeasurementDimension_p> &dimensions, bool fullCircumference,
+                                             QWidget *parent)
+    : QDialog(parent),
+      ui(new Ui::DialogDimensionLabels),
+      m_dimensions(dimensions),
+      m_fullCircumference(fullCircumference)
+{
+    ui->setupUi(this);
+
+    InitLabels();
+
+    InitDimensions();
+    InitTable();
+
+    connect(ui->comboBoxDimensionLabels, QOverload<int>::of(&QComboBox::currentIndexChanged), this,
+            &DialogDimensionLabels::DimensionChanged);
+    connect(ui->tableWidget, &QTableWidget::itemChanged, this, &DialogDimensionLabels::LabelChanged);
+}
+
+//---------------------------------------------------------------------------------------------------------------------
+DialogDimensionLabels::~DialogDimensionLabels()
+{
+    delete ui;
+}
+
+//---------------------------------------------------------------------------------------------------------------------
+void DialogDimensionLabels::changeEvent(QEvent *event)
+{
+    if (event->type() == QEvent::LanguageChange)
+    {
+        // retranslate designer form (single inheritance approach)
+        ui->retranslateUi(this);
+
+        MeasurementDimension type =
+            static_cast<MeasurementDimension>(ui->comboBoxDimensionLabels->currentData().toInt());
+
+        InitDimensions();
+
+        int index = ui->comboBoxDimensionLabels->findData(static_cast<int>(type));
+        if (index != -1)
+        {
+            ui->comboBoxDimensionLabels->blockSignals(true);
+            ui->comboBoxDimensionLabels->setCurrentIndex(index);
+            ui->comboBoxDimensionLabels->blockSignals(false);
+        }
+
+        const int row = ui->tableWidget->currentRow();
+        InitTable();
+        ui->tableWidget->blockSignals(true);
+        ui->tableWidget->selectRow(row);
+        ui->tableWidget->blockSignals(false);
+    }
+
+    // remember to call base class implementation
+    QDialog::changeEvent(event);
+}
+
+//---------------------------------------------------------------------------------------------------------------------
+void DialogDimensionLabels::DimensionChanged()
+{
+    InitTable();
+    ui->tableWidget->selectRow(0);
+}
+
+//---------------------------------------------------------------------------------------------------------------------
+void DialogDimensionLabels::LabelChanged(QTableWidgetItem *item)
+{
+    if (item)
+    {
+        MeasurementDimension type =
+            static_cast<MeasurementDimension>(ui->comboBoxDimensionLabels->currentData().toInt());
+        int value = item->data(Qt::UserRole).toInt();
+
+        DimesionLabels labels = m_labels.value(type);
+        labels.insert(value, item->text());
+
+        m_labels.insert(type, labels);
+    }
+}
+
+//---------------------------------------------------------------------------------------------------------------------
+void DialogDimensionLabels::InitLabels()
+{
+    m_labels.clear();
+
+    const QList<MeasurementDimension_p> dimensions = m_dimensions.values();
+
+    for(auto &dimension : dimensions)
+    {
+        m_labels.insert(dimension->Type(), dimension->Labels());
+    }
+}
+
+//---------------------------------------------------------------------------------------------------------------------
+void DialogDimensionLabels::InitDimensions()
+{
+    ui->comboBoxDimensionLabels->blockSignals(true);
+    ui->comboBoxDimensionLabels->clear();
+
+    for(auto &dimension : m_dimensions)
+    {
+        ui->comboBoxDimensionLabels->addItem(VAbstartMeasurementDimension::DimensionName(dimension->Type()),
+                                             static_cast<int>(dimension->Type()));
+    }
+
+    ui->comboBoxDimensionLabels->blockSignals(false);
+}
+
+//---------------------------------------------------------------------------------------------------------------------
+void DialogDimensionLabels::InitTable()
+{
+    ui->tableWidget->blockSignals(true);
+    ui->tableWidget->clearContents();
+
+    const MeasurementDimension type =
+        static_cast<MeasurementDimension>(ui->comboBoxDimensionLabels->currentData().toInt());
+
+    MeasurementDimension_p dimension;
+
+    if (m_dimensions.contains(type))
+    {
+        dimension = m_dimensions.value(type);
+    }
+
+    if (dimension.isNull())
+    {
+        return;
+    }
+
+    const QVector<int> bases = dimension->ValidBases();
+
+    ui->tableWidget->setRowCount(bases.size());
+
+    const DimesionLabels labels = m_labels.value(type);
+
+    for(int row = 0; row < bases.size(); ++row)
+    {
+        const int base = bases.at(row);
+
+        {
+            auto *itemValue = new QTableWidgetItem(DimensionValue(dimension, base));
+            itemValue->setData(Qt::UserRole, base);
+            itemValue->setTextAlignment(Qt::AlignHCenter | Qt::AlignCenter);
+
+            // set the item non-editable (view only), and non-selectable
+            Qt::ItemFlags flags = itemValue->flags();
+            flags &= ~(Qt::ItemIsEditable); // reset/clear the flag
+            itemValue->setFlags(flags);
+
+            ui->tableWidget->setItem(row, 0, itemValue);
+        }
+
+        {
+            auto *itemLabel = new QTableWidgetItem(labels.value(base));
+            itemLabel->setData(Qt::UserRole, base);
+            itemLabel->setTextAlignment(Qt::AlignHCenter | Qt::AlignCenter);
+
+            ui->tableWidget->setItem(row, 1, itemLabel);
+        }
+    }
+
+    ui->tableWidget->horizontalHeader()->setSectionResizeMode(QHeaderView::Stretch);
+    ui->tableWidget->blockSignals(false);
+}
+
+//---------------------------------------------------------------------------------------------------------------------
+QString DialogDimensionLabels::DimensionValue(const MeasurementDimension_p &dimension, int value)
+{
+    QStringList labels;
+
+    if (dimension->Type() == MeasurementDimension::X)
+    {
+        return QString::number(value);
+    }
+    else if (dimension->Type() == MeasurementDimension::Y)
+    {
+        if (dimension->IsCircumference())
+        {
+            return QString::number(m_fullCircumference ? value*2 : value);
+        }
+        else
+        {
+            return QString::number(value);
+        }
+    }
+    else if (dimension->Type() == MeasurementDimension::W || dimension->Type() == MeasurementDimension::Z)
+    {
+        return QString::number(m_fullCircumference ? value*2 : value);
+    }
+
+    return QString::number(value);
+}
diff --git a/src/app/tape/dialogs/dialogdimensionlabels.h b/src/app/tape/dialogs/dialogdimensionlabels.h
new file mode 100644
index 000000000..7ef85bbf3
--- /dev/null
+++ b/src/app/tape/dialogs/dialogdimensionlabels.h
@@ -0,0 +1,82 @@
+/************************************************************************
+ **
+ **  @file   dialogdimensionlabels.h
+ **  @author Roman Telezhynskyi <dismine(at)gmail.com>
+ **  @date   8 10, 2020
+ **
+ **  @brief
+ **  @copyright
+ **  This source code is part of the Valentina project, a pattern making
+ **  program, whose allow create and modeling patterns of clothing.
+ **  Copyright (C) 2020 Valentina project
+ **  <https://gitlab.com/smart-pattern/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 DIALOGDIMENSIONLABELS_H
+#define DIALOGDIMENSIONLABELS_H
+
+#include <QDialog>
+#include <QMap>
+
+#include "../vformat/vdimensions.h"
+
+namespace Ui
+{
+class DialogDimensionLabels;
+}
+
+class QTableWidgetItem;
+
+class DialogDimensionLabels : public QDialog
+{
+    Q_OBJECT
+
+public:
+    explicit DialogDimensionLabels(const QMap<MeasurementDimension, MeasurementDimension_p > &dimensions,
+                                   bool fullCircumference, QWidget *parent = nullptr);
+    virtual ~DialogDimensionLabels();
+
+    QMap<MeasurementDimension, DimesionLabels> Labels() const;
+
+protected:
+    virtual void changeEvent(QEvent* event) override;
+
+private slots:
+    void DimensionChanged();
+    void LabelChanged(QTableWidgetItem *item);
+
+private:
+    Q_DISABLE_COPY(DialogDimensionLabels)
+    Ui::DialogDimensionLabels *ui;
+
+    QMap<MeasurementDimension, MeasurementDimension_p > m_dimensions;
+    QMap<MeasurementDimension, DimesionLabels> m_labels{};
+    bool m_fullCircumference;
+
+    void InitLabels();
+    void InitDimensions();
+    void InitTable();
+
+    QString DimensionValue(const MeasurementDimension_p &dimension, int value);
+};
+
+//---------------------------------------------------------------------------------------------------------------------
+inline QMap<MeasurementDimension, DimesionLabels> DialogDimensionLabels::Labels() const
+{
+    return m_labels;
+}
+
+#endif // DIALOGDIMENSIONLABELS_H
diff --git a/src/app/tape/dialogs/dialogdimensionlabels.ui b/src/app/tape/dialogs/dialogdimensionlabels.ui
new file mode 100644
index 000000000..4dbf89a00
--- /dev/null
+++ b/src/app/tape/dialogs/dialogdimensionlabels.ui
@@ -0,0 +1,136 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<ui version="4.0">
+ <class>DialogDimensionLabels</class>
+ <widget class="QDialog" name="DialogDimensionLabels">
+  <property name="geometry">
+   <rect>
+    <x>0</x>
+    <y>0</y>
+    <width>345</width>
+    <height>424</height>
+   </rect>
+  </property>
+  <property name="windowTitle">
+   <string>Dimension labels</string>
+  </property>
+  <property name="windowIcon">
+   <iconset resource="../share/resources/tapeicon.qrc">
+    <normaloff>:/tapeicon/64x64/logo.png</normaloff>:/tapeicon/64x64/logo.png</iconset>
+  </property>
+  <layout class="QVBoxLayout" name="verticalLayout">
+   <item>
+    <layout class="QHBoxLayout" name="horizontalLayout">
+     <item>
+      <spacer name="horizontalSpacer">
+       <property name="orientation">
+        <enum>Qt::Horizontal</enum>
+       </property>
+       <property name="sizeHint" stdset="0">
+        <size>
+         <width>40</width>
+         <height>20</height>
+        </size>
+       </property>
+      </spacer>
+     </item>
+     <item>
+      <widget class="QLabel" name="labelDimension">
+       <property name="text">
+        <string notr="true">Dimension:</string>
+       </property>
+      </widget>
+     </item>
+     <item>
+      <widget class="QComboBox" name="comboBoxDimensionLabels"/>
+     </item>
+     <item>
+      <spacer name="horizontalSpacer_2">
+       <property name="orientation">
+        <enum>Qt::Horizontal</enum>
+       </property>
+       <property name="sizeHint" stdset="0">
+        <size>
+         <width>40</width>
+         <height>20</height>
+        </size>
+       </property>
+      </spacer>
+     </item>
+    </layout>
+   </item>
+   <item>
+    <widget class="QTableWidget" name="tableWidget">
+     <property name="alternatingRowColors">
+      <bool>true</bool>
+     </property>
+     <property name="selectionMode">
+      <enum>QAbstractItemView::SingleSelection</enum>
+     </property>
+     <property name="selectionBehavior">
+      <enum>QAbstractItemView::SelectRows</enum>
+     </property>
+     <attribute name="verticalHeaderVisible">
+      <bool>false</bool>
+     </attribute>
+     <column>
+      <property name="text">
+       <string>Value</string>
+      </property>
+     </column>
+     <column>
+      <property name="text">
+       <string>Label</string>
+      </property>
+     </column>
+    </widget>
+   </item>
+   <item>
+    <widget class="QDialogButtonBox" name="buttonBox">
+     <property name="orientation">
+      <enum>Qt::Horizontal</enum>
+     </property>
+     <property name="standardButtons">
+      <set>QDialogButtonBox::Cancel|QDialogButtonBox::Ok</set>
+     </property>
+    </widget>
+   </item>
+  </layout>
+ </widget>
+ <resources>
+  <include location="../share/resources/tapeicon.qrc"/>
+ </resources>
+ <connections>
+  <connection>
+   <sender>buttonBox</sender>
+   <signal>accepted()</signal>
+   <receiver>DialogDimensionLabels</receiver>
+   <slot>accept()</slot>
+   <hints>
+    <hint type="sourcelabel">
+     <x>248</x>
+     <y>254</y>
+    </hint>
+    <hint type="destinationlabel">
+     <x>157</x>
+     <y>274</y>
+    </hint>
+   </hints>
+  </connection>
+  <connection>
+   <sender>buttonBox</sender>
+   <signal>rejected()</signal>
+   <receiver>DialogDimensionLabels</receiver>
+   <slot>reject()</slot>
+   <hints>
+    <hint type="sourcelabel">
+     <x>316</x>
+     <y>260</y>
+    </hint>
+    <hint type="destinationlabel">
+     <x>286</x>
+     <y>274</y>
+    </hint>
+   </hints>
+  </connection>
+ </connections>
+</ui>
diff --git a/src/app/tape/dialogs/dialogmeasurementscsvcolumns.cpp b/src/app/tape/dialogs/dialogmeasurementscsvcolumns.cpp
new file mode 100644
index 000000000..44d496507
--- /dev/null
+++ b/src/app/tape/dialogs/dialogmeasurementscsvcolumns.cpp
@@ -0,0 +1,916 @@
+/************************************************************************
+ **
+ **  @file   dialogmeasurementscsvcolumns.cpp
+ **  @author Roman Telezhynskyi <dismine(at)gmail.com>
+ **  @date   9 10, 2020
+ **
+ **  @brief
+ **  @copyright
+ **  This source code is part of the Valentina project, a pattern making
+ **  program, whose allow create and modeling patterns of clothing.
+ **  Copyright (C) 2020 Valentina project
+ **  <https://gitlab.com/smart-pattern/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 "dialogmeasurementscsvcolumns.h"
+#include "ui_dialogmeasurementscsvcolumns.h"
+
+#include "../vmisc/qxtcsvmodel.h"
+#include "../vtools/dialogs/dialogtoolbox.h"
+
+#include <QPushButton>
+#include <QShowEvent>
+
+//---------------------------------------------------------------------------------------------------------------------
+DialogMeasurementsCSVColumns::DialogMeasurementsCSVColumns(const QString &filename, MeasurementsType type,
+                                                           QWidget *parent) :
+    QDialog(parent),
+    ui(new Ui::DialogMeasurementsCSVColumns),
+    m_fileName{filename},
+    m_type(type)
+{
+    ui->setupUi(this);
+
+    HackColumnControls();
+}
+
+//---------------------------------------------------------------------------------------------------------------------
+DialogMeasurementsCSVColumns::DialogMeasurementsCSVColumns(const QString &filename, MeasurementsType type,
+                                                           const QList<MeasurementDimension_p> &dimensions,
+                                                           QWidget *parent) :
+    QDialog(parent),
+    ui(new Ui::DialogMeasurementsCSVColumns),
+    m_fileName{filename},
+    m_type(type),
+    m_dimensions{dimensions}
+{
+    ui->setupUi(this);
+
+    HackColumnControls();
+}
+
+//---------------------------------------------------------------------------------------------------------------------
+DialogMeasurementsCSVColumns::~DialogMeasurementsCSVColumns()
+{
+    qDeleteAll(m_hackedWidgets);
+    delete ui;
+}
+
+//---------------------------------------------------------------------------------------------------------------------
+void DialogMeasurementsCSVColumns::changeEvent(QEvent *event)
+{
+    if (event->type() == QEvent::LanguageChange)
+    {
+        // retranslate designer form (single inheritance approach)
+        ui->retranslateUi(this);
+
+        RetranslateLabels();
+        InitColumnsControls();
+        InitImportHeaders();
+        ShowImportPreview();
+        CheckStatus();
+    }
+
+    // remember to call base class implementation
+    QDialog::changeEvent(event);
+}
+
+//---------------------------------------------------------------------------------------------------------------------
+void DialogMeasurementsCSVColumns::showEvent(QShowEvent *event)
+{
+    QDialog::showEvent( event );
+    if ( event->spontaneous() )
+    {
+        return;
+    }
+
+    if (m_isInitialized)
+    {
+        return;
+    }
+    // do your init stuff here
+
+    if (not m_fileName.isEmpty())
+    {
+        InitColumnsMap();
+        ShowInputPreview();
+        InitColumnsControls();
+        RetranslateLabels();
+        InitColumnsControls();
+        SetDefaultColumns();
+        InitImportHeaders();
+        ShowImportPreview();
+
+        connect(ui->comboBoxName, QOverload<int>::of(&QComboBox::currentIndexChanged),
+                this, &DialogMeasurementsCSVColumns::ColumnChanged);
+        connect(ui->comboBoxValue, QOverload<int>::of(&QComboBox::currentIndexChanged),
+                this, &DialogMeasurementsCSVColumns::ColumnChanged);
+
+        if (m_type == MeasurementsType::Multisize)
+        {
+            if (m_dimensions.size() > 0)
+            {
+                connect(ui->comboBoxShiftA, QOverload<int>::of(&QComboBox::currentIndexChanged),
+                        this, &DialogMeasurementsCSVColumns::ColumnChanged);
+            }
+
+            if (m_dimensions.size() > 1)
+            {
+                connect(ui->comboBoxShiftB, QOverload<int>::of(&QComboBox::currentIndexChanged),
+                        this, &DialogMeasurementsCSVColumns::ColumnChanged);
+            }
+
+            if (m_dimensions.size() > 2)
+            {
+                connect(ui->comboBoxShiftC, QOverload<int>::of(&QComboBox::currentIndexChanged),
+                        this, &DialogMeasurementsCSVColumns::ColumnChanged);
+            }
+        }
+
+
+        connect(ui->comboBoxFullName, QOverload<int>::of(&QComboBox::currentIndexChanged),
+                this, &DialogMeasurementsCSVColumns::ColumnChanged);
+        connect(ui->comboBoxDescription, QOverload<int>::of(&QComboBox::currentIndexChanged),
+                this, &DialogMeasurementsCSVColumns::ColumnChanged);
+
+        CheckStatus();
+    }
+
+    m_isInitialized = true;//first show windows are held
+}
+
+//---------------------------------------------------------------------------------------------------------------------
+void DialogMeasurementsCSVColumns::ColumnChanged()
+{
+    auto *control = qobject_cast<QComboBox*>(sender());
+
+    auto SaveColum = [this, control](int column)
+    {
+        m_columnsMap[column] = control->currentData().toInt();
+        ShowImportPreview();
+        CheckStatus();
+    };
+
+    if (control == ui->comboBoxName)
+    {
+        if (m_type == MeasurementsType::Individual)
+        {
+            SaveColum(static_cast<int>(IndividualMeasurementsColumns::Name));
+        }
+        else
+        {
+            SaveColum(static_cast<int>(MultisizeMeasurementsColumns::Name));
+        }
+    }
+    else if (control == ui->comboBoxValue)
+    {
+        if (m_type == MeasurementsType::Individual)
+        {
+            SaveColum(static_cast<int>(IndividualMeasurementsColumns::Value));
+        }
+        else
+        {
+            SaveColum(static_cast<int>(MultisizeMeasurementsColumns::BaseValue));
+        }
+    }
+    else if (control == ui->comboBoxShiftA)
+    {
+        SaveColum(static_cast<int>(MultisizeMeasurementsColumns::ShiftA));
+    }
+    else if (control == ui->comboBoxShiftB)
+    {
+        SaveColum(static_cast<int>(MultisizeMeasurementsColumns::ShiftB));
+    }
+    else if (control == ui->comboBoxShiftC)
+    {
+        SaveColum(static_cast<int>(MultisizeMeasurementsColumns::ShiftC));
+    }
+    else if (control == ui->comboBoxFullName)
+    {
+        if (m_type == MeasurementsType::Individual)
+        {
+            SaveColum(static_cast<int>(IndividualMeasurementsColumns::FullName));
+        }
+        else
+        {
+            SaveColum(static_cast<int>(MultisizeMeasurementsColumns::FullName));
+        }
+    }
+    else if (control == ui->comboBoxDescription)
+    {
+        if (m_type == MeasurementsType::Individual)
+        {
+            SaveColum(static_cast<int>(IndividualMeasurementsColumns::Description));
+        }
+        else
+        {
+            SaveColum(static_cast<int>(MultisizeMeasurementsColumns::Description));
+        }
+    }
+}
+
+//---------------------------------------------------------------------------------------------------------------------
+bool DialogMeasurementsCSVColumns::ColumnMandatory(int column) const
+{
+    if (m_type == MeasurementsType::Individual)
+    {
+        return column < static_cast<int>(IndividualMeasurementsColumns::FullName);
+    }
+    else
+    {
+        int mandatory = 3;
+
+        if (m_dimensions.size() > 1)
+        {
+            mandatory += qMin(m_dimensions.size(), 2);
+        }
+
+        return static_cast<int>(column) < mandatory;
+    }
+}
+
+//---------------------------------------------------------------------------------------------------------------------
+QString DialogMeasurementsCSVColumns::ColumnHeader(int column) const
+{
+    if (m_type == MeasurementsType::Individual)
+    {
+        const auto individualColumn = static_cast<IndividualMeasurementsColumns>(column);
+        switch(individualColumn)
+        {
+            case IndividualMeasurementsColumns::Name:
+                return tr("Name");
+            case IndividualMeasurementsColumns::Value:
+                return tr("Value");
+            case IndividualMeasurementsColumns::FullName:
+                return tr("Full name");
+            case IndividualMeasurementsColumns::Description:
+                return tr("Description");
+            default:
+                return QString();
+        }
+    }
+    else
+    {
+        const auto multisizeColumn = static_cast<MultisizeMeasurementsColumns>(column);
+        switch(multisizeColumn)
+        {
+            case MultisizeMeasurementsColumns::Name:
+                return tr("Name");
+            case MultisizeMeasurementsColumns::BaseValue:
+                return tr("Base value");
+            case MultisizeMeasurementsColumns::ShiftA:
+                if (m_dimensions.size() > 0)
+                {
+                    MeasurementDimension_p dimension = m_dimensions.at(0);
+                    return tr("Shift (%1):").arg(VAbstartMeasurementDimension::DimensionName(dimension->Type()));
+                }
+                else
+                {
+                    return "Shift A";
+                }
+            case MultisizeMeasurementsColumns::ShiftB:
+                if (m_dimensions.size() > 1)
+                {
+                    MeasurementDimension_p dimension = m_dimensions.at(1);
+                    return tr("Shift (%1):").arg(VAbstartMeasurementDimension::DimensionName(dimension->Type()));
+                }
+                else
+                {
+                    return "Shift B";
+                }
+            case MultisizeMeasurementsColumns::ShiftC:
+                if (m_dimensions.size() > 2)
+                {
+                    MeasurementDimension_p dimension = m_dimensions.at(2);
+                    return tr("Shift (%1):").arg(VAbstartMeasurementDimension::DimensionName(dimension->Type()));
+                }
+                else
+                {
+                    return "Shift C";
+                }
+            case MultisizeMeasurementsColumns::FullName:
+                return tr("Full name");
+            case MultisizeMeasurementsColumns::Description:
+                return tr("Description");
+            default:
+                return QString();
+        }
+    }
+}
+
+//---------------------------------------------------------------------------------------------------------------------
+int DialogMeasurementsCSVColumns::ImportColumnCount() const
+{
+    if (m_type == MeasurementsType::Individual)
+    {
+        return static_cast<int>(IndividualMeasurementsColumns::LAST_DO_NOT_USE);
+    }
+    else
+    {
+        return static_cast<int>(MultisizeMeasurementsColumns::LAST_DO_NOT_USE);
+    }
+}
+
+//---------------------------------------------------------------------------------------------------------------------
+int DialogMeasurementsCSVColumns::MinimumColumns() const
+{
+    if (m_type == MeasurementsType::Individual)
+    {
+        return 2;
+    }
+    else
+    {
+        int mandatory = 3;
+
+        if (m_dimensions.size() > 1)
+        {
+            mandatory += qMin(m_dimensions.size(), 2);
+        }
+
+        return mandatory;
+    }
+}
+
+//---------------------------------------------------------------------------------------------------------------------
+bool DialogMeasurementsCSVColumns::ColumnsValid()
+{
+    ChangeColor(ui->labelName, OkColor(this));
+    ChangeColor(ui->labelValue, OkColor(this));
+    if (m_type == MeasurementsType::Multisize)
+    {
+        if (m_dimensions.size() > 0)
+        {
+            ChangeColor(ui->labelShiftA, OkColor(this));
+        }
+
+        if (m_dimensions.size() > 1)
+        {
+            ChangeColor(ui->labelShiftB, OkColor(this));
+        }
+
+        if (m_dimensions.size() > 2)
+        {
+            ChangeColor(ui->labelShiftC, OkColor(this));
+        }
+    }
+    ChangeColor(ui->labelFullName, OkColor(this));
+    ChangeColor(ui->labelDescription, OkColor(this));
+
+    auto ColumnValid = [this](int column)
+    {
+        int value = m_columnsMap.at(column);
+
+        if (value == -1 && not ColumnMandatory(column))
+        {
+            return true;
+        }
+
+        for (int c=0; c < m_columnsMap.size(); ++c)
+        {
+            if (c == column)
+            {
+                continue;
+            }
+
+            if (value == m_columnsMap.at(c))
+            {
+                return false;
+            }
+        }
+
+        return true;
+    };
+
+    bool columnNameFlag = true;
+    bool columnValueFlag = true;
+    bool columnShiftAFlag = true;
+    bool columnShiftBFlag = true;
+    bool columnShiftCFlag = true;
+    bool columnFullNameFlag = true;
+    bool columnDescriptionFlag = true;
+
+    const QColor errorColor = Qt::red;
+
+
+    if (m_type == MeasurementsType::Multisize)
+    {
+        if (not ColumnValid(static_cast<int>(MultisizeMeasurementsColumns::Name)))
+        {
+            ChangeColor(ui->labelName, errorColor);
+            columnNameFlag = false;
+        }
+    }
+    else
+    {
+        if (not ColumnValid(static_cast<int>(IndividualMeasurementsColumns::Name)))
+        {
+            ChangeColor(ui->labelName, errorColor);
+            columnNameFlag = false;
+        }
+    }
+
+    if (m_type == MeasurementsType::Multisize)
+    {
+        if (not ColumnValid(static_cast<int>(MultisizeMeasurementsColumns::BaseValue)))
+        {
+            ChangeColor(ui->labelValue, errorColor);
+            columnValueFlag = false;
+        }
+    }
+    else
+    {
+        if (not ColumnValid(static_cast<int>(IndividualMeasurementsColumns::Value)))
+        {
+            ChangeColor(ui->labelValue, errorColor);
+            columnValueFlag = false;
+        }
+    }
+
+    if (m_type == MeasurementsType::Multisize)
+    {
+        if (m_dimensions.size() > 0)
+        {
+            if (not ColumnValid(static_cast<int>(MultisizeMeasurementsColumns::ShiftA)))
+            {
+                ChangeColor(ui->labelShiftA, errorColor);
+                columnShiftAFlag = false;
+            }
+        }
+
+        if (m_dimensions.size() > 1)
+        {
+            if (not ColumnValid(static_cast<int>(MultisizeMeasurementsColumns::ShiftB)))
+            {
+                ChangeColor(ui->labelShiftB, errorColor);
+                columnShiftBFlag = false;
+            }
+        }
+
+        if (m_dimensions.size() > 2)
+        {
+            if (not ColumnValid(static_cast<int>(MultisizeMeasurementsColumns::ShiftC)))
+            {
+                ChangeColor(ui->labelShiftC, errorColor);
+                columnShiftCFlag = false;
+            }
+        }
+    }
+
+    if (not ColumnValid(m_type == MeasurementsType::Multisize
+                            ? static_cast<int>(MultisizeMeasurementsColumns::FullName)
+                            : static_cast<int>(IndividualMeasurementsColumns::FullName)))
+    {
+        ChangeColor(ui->labelFullName, errorColor);
+        columnFullNameFlag = false;
+    }
+
+    if (not ColumnValid(m_type == MeasurementsType::Multisize
+                            ? static_cast<int>(MultisizeMeasurementsColumns::Description)
+                            : static_cast<int>(IndividualMeasurementsColumns::Description)))
+    {
+        ChangeColor(ui->labelDescription, errorColor);
+        columnDescriptionFlag = false;
+    }
+
+    return columnNameFlag && columnValueFlag && columnShiftAFlag && columnShiftBFlag && columnShiftCFlag &&
+           columnFullNameFlag && columnDescriptionFlag;
+}
+
+//---------------------------------------------------------------------------------------------------------------------
+void DialogMeasurementsCSVColumns::InitColumnsMap()
+{
+    QSharedPointer<QxtCsvModel> csv = DialogMeasurementsCSVColumns::CSVModel();
+    m_columnsMap.clear();
+
+    auto InitColumn = [this, csv](int column, bool forceSkip=false)
+    {
+        if (forceSkip)
+        {
+            m_columnsMap[column] = -1;
+        }
+        else
+        {
+            if (ColumnMandatory(column))
+            {
+                m_columnsMap[column] = column;
+            }
+            else
+            {
+                m_columnsMap[column] = csv->columnCount() >= column ? column : -1;
+            }
+        }
+    };
+
+    if (m_type == MeasurementsType::Individual)
+    {
+        m_columnsMap.resize(static_cast<int>(IndividualMeasurementsColumns::LAST_DO_NOT_USE));
+
+        for(int column = 0; column < static_cast<int>(IndividualMeasurementsColumns::LAST_DO_NOT_USE); ++column)
+        {
+            InitColumn(column);
+        }
+    }
+    else
+    {
+        m_columnsMap.resize(static_cast<int>(MultisizeMeasurementsColumns::LAST_DO_NOT_USE));
+
+        InitColumn(static_cast<int>(MultisizeMeasurementsColumns::Name));
+        InitColumn(static_cast<int>(MultisizeMeasurementsColumns::BaseValue));
+        InitColumn(static_cast<int>(MultisizeMeasurementsColumns::ShiftA));
+        InitColumn(static_cast<int>(MultisizeMeasurementsColumns::ShiftB), m_dimensions.size() < 2);
+        InitColumn(static_cast<int>(MultisizeMeasurementsColumns::ShiftC), m_dimensions.size() < 3);
+        InitColumn(static_cast<int>(MultisizeMeasurementsColumns::FullName));
+        InitColumn(static_cast<int>(MultisizeMeasurementsColumns::Description));
+    }
+}
+
+//---------------------------------------------------------------------------------------------------------------------
+void DialogMeasurementsCSVColumns::InitColumnsControls()
+{
+    const int inputColumnCount = CSVModel()->columnCount();
+
+    auto InitControl = [this, inputColumnCount](QComboBox *control, int column)
+    {
+        SCASSERT(control != nullptr)
+
+        int currentColumn = -2;
+        int index = control->currentIndex();
+        if (index != -1)
+        {
+            currentColumn = control->currentData().toInt();
+        }
+
+        control->blockSignals(true);
+        control->clear();
+
+        for(int i=0; i < inputColumnCount; ++i)
+        {
+            control->addItem(QString::number(i+1), i);
+        }
+
+        if (not ColumnMandatory(column))
+        {
+            control->addItem(tr("Skip"), -1);
+        }
+
+        control->setCurrentIndex(-1);
+
+        index = control->findData(currentColumn);
+        if (index != -1)
+        {
+            control->setCurrentIndex(index);
+            control->blockSignals(false);
+        }
+        else
+        {
+            control->blockSignals(false);
+            control->setCurrentIndex(0);
+        }
+    };
+
+    if (m_type == MeasurementsType::Individual)
+    {
+        InitControl(ui->comboBoxName, static_cast<int>(IndividualMeasurementsColumns::Name));
+        InitControl(ui->comboBoxValue, static_cast<int>(IndividualMeasurementsColumns::Value));
+        InitControl(ui->comboBoxFullName, static_cast<int>(IndividualMeasurementsColumns::FullName));
+        InitControl(ui->comboBoxDescription, static_cast<int>(IndividualMeasurementsColumns::Description));
+    }
+    else
+    {
+        InitControl(ui->comboBoxName, static_cast<int>(MultisizeMeasurementsColumns::Name));
+        InitControl(ui->comboBoxValue, static_cast<int>(MultisizeMeasurementsColumns::BaseValue));
+
+        if (m_dimensions.size() > 0)
+        {
+            InitControl(ui->comboBoxShiftA, static_cast<int>(MultisizeMeasurementsColumns::ShiftA));
+        }
+
+        if (m_dimensions.size() > 1)
+        {
+            InitControl(ui->comboBoxShiftB, static_cast<int>(MultisizeMeasurementsColumns::ShiftB));
+        }
+
+        if (m_dimensions.size() > 2)
+        {
+            InitControl(ui->comboBoxShiftC, static_cast<int>(MultisizeMeasurementsColumns::ShiftC));
+        }
+
+        InitControl(ui->comboBoxFullName, static_cast<int>(MultisizeMeasurementsColumns::FullName));
+        InitControl(ui->comboBoxDescription, static_cast<int>(MultisizeMeasurementsColumns::Description));
+    }
+}
+
+//---------------------------------------------------------------------------------------------------------------------
+void DialogMeasurementsCSVColumns::InitImportHeaders()
+{
+    if (m_fileName.isEmpty())
+    {
+        return;
+    }
+
+    const int columns = ImportColumnCount();
+
+    ui->tableWidgetImport->clear();
+    ui->tableWidgetImport->setColumnCount(columns);
+
+    auto AddHeader = [this](int column, bool visible=true)
+    {
+        QTableWidgetItem *header = new QTableWidgetItem(ColumnHeader(column));
+        ui->tableWidgetImport->setHorizontalHeaderItem(column, header);
+        ui->tableWidgetImport->setColumnHidden(column, not visible);
+    };
+
+    if (m_type == MeasurementsType::Individual)
+    {
+        AddHeader(static_cast<int>(IndividualMeasurementsColumns::Name));
+        AddHeader(static_cast<int>(IndividualMeasurementsColumns::Value));
+        AddHeader(static_cast<int>(IndividualMeasurementsColumns::FullName));
+        AddHeader(static_cast<int>(IndividualMeasurementsColumns::Description));
+    }
+    else
+    {
+        AddHeader(static_cast<int>(MultisizeMeasurementsColumns::Name));
+        AddHeader(static_cast<int>(MultisizeMeasurementsColumns::BaseValue));
+        AddHeader(static_cast<int>(MultisizeMeasurementsColumns::ShiftA), m_dimensions.size() > 0);
+        AddHeader(static_cast<int>(MultisizeMeasurementsColumns::ShiftB), m_dimensions.size() > 1);
+        AddHeader(static_cast<int>(MultisizeMeasurementsColumns::ShiftC), m_dimensions.size() > 2);
+        AddHeader(static_cast<int>(MultisizeMeasurementsColumns::FullName));
+        AddHeader(static_cast<int>(MultisizeMeasurementsColumns::Description));
+    }
+}
+
+//---------------------------------------------------------------------------------------------------------------------
+QSharedPointer<QxtCsvModel> DialogMeasurementsCSVColumns::CSVModel() const
+{
+    return QSharedPointer<QxtCsvModel>::create(m_fileName, nullptr, m_withHeader, m_separator, m_codec);
+}
+
+//---------------------------------------------------------------------------------------------------------------------
+void DialogMeasurementsCSVColumns::ShowInputPreview()
+{
+    if (m_fileName.isEmpty())
+    {
+        return;
+    }
+
+    QSharedPointer<QxtCsvModel> csv = DialogMeasurementsCSVColumns::CSVModel();
+
+    const int columns = csv->columnCount();
+    const int rows = csv->rowCount();
+
+    ui->tableWidgetInput->clear();
+    ui->tableWidgetInput->setColumnCount(columns);
+    ui->tableWidgetInput->setRowCount(rows);
+
+    ui->tableWidgetInput->horizontalHeader()->setVisible(m_withHeader);
+    if (m_withHeader)
+    {
+        for(int column=0; column<columns; ++column)
+        {
+            QTableWidgetItem *header = new QTableWidgetItem(csv->headerText(column));
+            header->setToolTip(QString::number(column+1));
+            ui->tableWidgetInput->setHorizontalHeaderItem(column, header);
+        }
+    }
+
+    for (int row=0; row < rows; ++row)
+    {
+        for(int column=0; column<columns; ++column)
+        {
+            const QString text = csv->text(row, column);
+            QTableWidgetItem *item = new QTableWidgetItem(text);
+            item->setToolTip(text);
+
+            // set the item non-editable (view only), and non-selectable
+            Qt::ItemFlags flags = item->flags();
+            flags &= ~(Qt::ItemIsEditable); // reset/clear the flag
+            item->setFlags(flags);
+
+            ui->tableWidgetInput->setItem(row, column, item);
+        }
+    }
+
+    ui->tableWidgetInput->resizeColumnsToContents();
+    ui->tableWidgetInput->resizeRowsToContents();
+}
+
+//---------------------------------------------------------------------------------------------------------------------
+void DialogMeasurementsCSVColumns::ShowImportPreview()
+{
+    if (m_fileName.isEmpty())
+    {
+        return;
+    }
+
+    QSharedPointer<QxtCsvModel> csv = DialogMeasurementsCSVColumns::CSVModel();
+
+    const int importColumns = ImportColumnCount();
+    const int columns = csv->columnCount();
+    const int rows = csv->rowCount();
+
+    ui->tableWidgetImport->clearContents();
+    ui->tableWidgetImport->setRowCount(rows);
+
+    for (int row=0; row < rows; ++row)
+    {
+        for(int column=0; column < importColumns; ++column)
+        {
+            const int tableColumn = m_columnsMap.at(column);
+            if (tableColumn >= 0 && tableColumn < columns)
+            {
+                const QString text = csv->text(row, tableColumn);
+                QTableWidgetItem *item = new QTableWidgetItem(text);
+                item->setToolTip(text);
+
+                // set the item non-editable (view only), and non-selectable
+                Qt::ItemFlags flags = item->flags();
+                flags &= ~(Qt::ItemIsEditable); // reset/clear the flag
+                item->setFlags(flags);
+
+                ui->tableWidgetImport->setItem(row, column, item);
+            }
+        }
+    }
+
+    ui->tableWidgetImport->resizeColumnsToContents();
+    ui->tableWidgetImport->resizeRowsToContents();
+}
+
+//---------------------------------------------------------------------------------------------------------------------
+void DialogMeasurementsCSVColumns::HackColumnControls()
+{
+    if (m_type == MeasurementsType::Individual)
+    {
+        HackWidget(&ui->labelShiftA);
+        HackWidget(&ui->labelShiftB);
+        HackWidget(&ui->labelShiftC);
+
+        HackWidget(&ui->comboBoxShiftA);
+        HackWidget(&ui->comboBoxShiftB);
+        HackWidget(&ui->comboBoxShiftC);
+    }
+    else
+    {
+        if (m_dimensions.size() < 2)
+        {
+            HackWidget(&ui->labelShiftB);
+            HackWidget(&ui->comboBoxShiftB);
+        }
+
+        if (m_dimensions.size() < 3)
+        {
+            HackWidget(&ui->labelShiftC);
+            HackWidget(&ui->comboBoxShiftC);
+        }
+    }
+}
+
+//---------------------------------------------------------------------------------------------------------------------
+void DialogMeasurementsCSVColumns::RetranslateLabels()
+{
+    ui->labelName->setText(tr("Name") + "*:");
+
+    if (m_type == MeasurementsType::Individual)
+    {
+        ui->labelValue->setText(tr("Value") + "*:");
+    }
+    else
+    {
+        ui->labelValue->setText(tr("Base value") + "*:");
+
+        if (m_dimensions.size() > 0)
+        {
+            MeasurementDimension_p dimension = m_dimensions.at(0);
+            ui->labelShiftA->setText(tr("Shift (%1)*:")
+                                         .arg(VAbstartMeasurementDimension::DimensionName(dimension->Type())));
+        }
+
+        if (m_dimensions.size() > 1)
+        {
+            MeasurementDimension_p dimension = m_dimensions.at(1);
+            ui->labelShiftB->setText(tr("Shift (%1)*:")
+                                         .arg(VAbstartMeasurementDimension::DimensionName(dimension->Type())));
+        }
+
+        if (m_dimensions.size() > 2)
+        {
+            MeasurementDimension_p dimension = m_dimensions.at(2);
+            ui->labelShiftC->setText(tr("Shift (%1)*:")
+                                         .arg(VAbstartMeasurementDimension::DimensionName(dimension->Type())));
+        }
+    }
+}
+
+//---------------------------------------------------------------------------------------------------------------------
+void DialogMeasurementsCSVColumns::SetDefaultColumns()
+{
+    auto SetDefault = [this](QComboBox *control, int column)
+    {
+        SCASSERT(control != nullptr)
+
+        int index = control->findData(m_columnsMap.at(column));
+        if (index != -1)
+        {
+            control->setCurrentIndex(index);
+        }
+    };
+
+    if (m_type == MeasurementsType::Individual)
+    {
+        SetDefault(ui->comboBoxName, static_cast<int>(IndividualMeasurementsColumns::Name));
+        SetDefault(ui->comboBoxValue, static_cast<int>(IndividualMeasurementsColumns::Value));
+        SetDefault(ui->comboBoxFullName, static_cast<int>(IndividualMeasurementsColumns::FullName));
+        SetDefault(ui->comboBoxDescription, static_cast<int>(IndividualMeasurementsColumns::Description));
+    }
+    else
+    {
+        SetDefault(ui->comboBoxName, static_cast<int>(MultisizeMeasurementsColumns::Name));
+        SetDefault(ui->comboBoxValue, static_cast<int>(MultisizeMeasurementsColumns::BaseValue));
+
+        if (m_dimensions.size() > 0)
+        {
+            SetDefault(ui->comboBoxShiftA, static_cast<int>(MultisizeMeasurementsColumns::ShiftA));
+        }
+
+        if (m_dimensions.size() > 1)
+        {
+            SetDefault(ui->comboBoxShiftB, static_cast<int>(MultisizeMeasurementsColumns::ShiftB));
+        }
+
+        if (m_dimensions.size() > 2)
+        {
+            SetDefault(ui->comboBoxShiftC, static_cast<int>(MultisizeMeasurementsColumns::ShiftC));
+        }
+
+        SetDefault(ui->comboBoxFullName, static_cast<int>(MultisizeMeasurementsColumns::FullName));
+        SetDefault(ui->comboBoxDescription, static_cast<int>(MultisizeMeasurementsColumns::Description));
+    }
+}
+
+//---------------------------------------------------------------------------------------------------------------------
+void DialogMeasurementsCSVColumns::CheckStatus()
+{
+    auto SetStatus = [this](bool status)
+    {
+        QPushButton *bOk = ui->buttonBox->button(QDialogButtonBox::Ok);
+        SCASSERT(bOk != nullptr)
+        bOk->setEnabled(status);
+    };
+
+    if (m_fileName.isEmpty())
+    {
+        SetStatus(false);
+        ui->labelStatus->setText(tr("File path is empty"));
+        return;
+    }
+
+    QSharedPointer<QxtCsvModel> csv = DialogMeasurementsCSVColumns::CSVModel();
+
+    const int columns = csv->columnCount();
+    if (columns < MinimumColumns())
+    {
+        SetStatus(false);
+        ui->labelStatus->setText(tr("Not enough columns"));
+        return;
+    }
+
+    const int rows = csv->rowCount();
+    if (rows < 1)
+    {
+        SetStatus(false);
+        ui->labelStatus->setText(tr("Not enough data to import"));
+        return;
+    }
+
+    if (not ColumnsValid())
+    {
+        SetStatus(false);
+        ui->labelStatus->setText(tr("Please, select unique number for each column"));
+        return;
+    }
+
+    SetStatus(true);
+    ui->labelStatus->setText(tr("Ready"));
+}
+
+//---------------------------------------------------------------------------------------------------------------------
+template<class T>
+void DialogMeasurementsCSVColumns::HackWidget(T **widget)
+{
+    delete *widget;
+    *widget = new T();
+    m_hackedWidgets.append(*widget);
+}
diff --git a/src/app/tape/dialogs/dialogmeasurementscsvcolumns.h b/src/app/tape/dialogs/dialogmeasurementscsvcolumns.h
new file mode 100644
index 000000000..5745476e9
--- /dev/null
+++ b/src/app/tape/dialogs/dialogmeasurementscsvcolumns.h
@@ -0,0 +1,149 @@
+/************************************************************************
+ **
+ **  @file   dialogmeasurementscsvcolumns.h
+ **  @author Roman Telezhynskyi <dismine(at)gmail.com>
+ **  @date   9 10, 2020
+ **
+ **  @brief
+ **  @copyright
+ **  This source code is part of the Valentina project, a pattern making
+ **  program, whose allow create and modeling patterns of clothing.
+ **  Copyright (C) 2020 Valentina project
+ **  <https://gitlab.com/smart-pattern/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 DIALOGMEASUREMENTSCSVCOLUMNS_H
+#define DIALOGMEASUREMENTSCSVCOLUMNS_H
+
+#include <QDialog>
+
+#include "../vformat/vdimensions.h"
+
+class QxtCsvModel;
+
+enum class IndividualMeasurementsColumns: qint8
+{
+    Name = 0,
+    Value = 1,
+    FullName = 2,   // optional
+    Description = 3, // optional
+    LAST_DO_NOT_USE = 4
+};
+
+enum class MultisizeMeasurementsColumns: qint8
+{
+    Name = 0,
+    BaseValue = 1,
+    ShiftA = 2,
+    ShiftB = 3,      // optional if not required
+    ShiftC = 4,      // optional if not required
+    FullName = 5,    // optional
+    Description = 6, // optional
+    LAST_DO_NOT_USE = 7
+};
+
+
+namespace Ui {
+class DialogMeasurementsCSVColumns;
+}
+
+class DialogMeasurementsCSVColumns : public QDialog
+{
+    Q_OBJECT
+
+public:
+    DialogMeasurementsCSVColumns(const QString &filename, MeasurementsType type, QWidget *parent = nullptr);
+    DialogMeasurementsCSVColumns(const QString &filename, MeasurementsType type,
+                                 const QList<MeasurementDimension_p> &dimensions, QWidget *parent = nullptr);
+    virtual ~DialogMeasurementsCSVColumns();
+
+    QVector<int> ColumnsMap() const;
+
+    void SetWithHeader(bool withHeader);
+    void SetSeparator(const QChar &separator);
+    void SetCodec(QTextCodec *codec);
+
+protected:
+    virtual void changeEvent(QEvent* event) override;
+    virtual void showEvent(QShowEvent *event) override;
+
+private slots:
+    void ColumnChanged();
+
+private:
+    Q_DISABLE_COPY(DialogMeasurementsCSVColumns)
+    Ui::DialogMeasurementsCSVColumns *ui;
+    bool m_isInitialized{false};
+    QString m_fileName;
+    bool m_withHeader{false};
+    QChar m_separator{','};
+    QTextCodec *m_codec{nullptr};
+    QVector<int> m_columnsMap{};
+    MeasurementsType m_type;
+    QList<MeasurementDimension_p> m_dimensions{};
+    QVector<QObject *> m_hackedWidgets{};
+
+    bool    ColumnMandatory(int column) const;
+    QString ColumnHeader(int column) const;
+    int     ImportColumnCount() const;
+    int     MinimumColumns() const;
+    bool    ColumnsValid();
+
+    void InitColumnsMap();
+    void InitColumnsControls();
+    void InitImportHeaders();
+
+    QSharedPointer<QxtCsvModel> CSVModel() const;
+
+    void ShowInputPreview();
+    void ShowImportPreview();
+
+    template <class T>
+    void HackWidget(T **widget);
+    void HackColumnControls();
+
+    void RetranslateLabels();
+
+    void SetDefaultColumns();
+
+    void CheckStatus();
+};
+
+//---------------------------------------------------------------------------------------------------------------------
+inline QVector<int> DialogMeasurementsCSVColumns::ColumnsMap() const
+{
+    return m_columnsMap;
+}
+
+//---------------------------------------------------------------------------------------------------------------------
+inline void DialogMeasurementsCSVColumns::SetWithHeader(bool withHeader)
+{
+    m_withHeader = withHeader;
+}
+
+//---------------------------------------------------------------------------------------------------------------------
+inline void DialogMeasurementsCSVColumns::SetSeparator(const QChar &separator)
+{
+    m_separator = separator;
+}
+
+//---------------------------------------------------------------------------------------------------------------------
+inline void DialogMeasurementsCSVColumns::SetCodec(QTextCodec *codec)
+{
+    m_codec = codec;
+}
+
+#endif // DIALOGMEASUREMENTSCSVCOLUMNS_H
diff --git a/src/app/tape/dialogs/dialogmeasurementscsvcolumns.ui b/src/app/tape/dialogs/dialogmeasurementscsvcolumns.ui
new file mode 100644
index 000000000..e3aa17d38
--- /dev/null
+++ b/src/app/tape/dialogs/dialogmeasurementscsvcolumns.ui
@@ -0,0 +1,204 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<ui version="4.0">
+ <class>DialogMeasurementsCSVColumns</class>
+ <widget class="QDialog" name="DialogMeasurementsCSVColumns">
+  <property name="geometry">
+   <rect>
+    <x>0</x>
+    <y>0</y>
+    <width>908</width>
+    <height>703</height>
+   </rect>
+  </property>
+  <property name="windowTitle">
+   <string>Setup columns</string>
+  </property>
+  <property name="windowIcon">
+   <iconset resource="../share/resources/tapeicon.qrc">
+    <normaloff>:/tapeicon/64x64/logo.png</normaloff>:/tapeicon/64x64/logo.png</iconset>
+  </property>
+  <layout class="QVBoxLayout" name="verticalLayout_4">
+   <item>
+    <layout class="QHBoxLayout" name="horizontalLayout">
+     <item>
+      <widget class="QGroupBox" name="groupBox">
+       <property name="title">
+        <string>Preview</string>
+       </property>
+       <layout class="QVBoxLayout" name="verticalLayout_3">
+        <item>
+         <widget class="QGroupBox" name="groupBox_2">
+          <property name="title">
+           <string>Input</string>
+          </property>
+          <layout class="QVBoxLayout" name="verticalLayout_2">
+           <item>
+            <widget class="QTableWidget" name="tableWidgetInput">
+             <attribute name="verticalHeaderVisible">
+              <bool>false</bool>
+             </attribute>
+            </widget>
+           </item>
+          </layout>
+         </widget>
+        </item>
+        <item>
+         <widget class="QGroupBox" name="groupBox_3">
+          <property name="title">
+           <string>Import</string>
+          </property>
+          <layout class="QVBoxLayout" name="verticalLayout">
+           <item>
+            <widget class="QTableWidget" name="tableWidgetImport">
+             <attribute name="verticalHeaderVisible">
+              <bool>false</bool>
+             </attribute>
+            </widget>
+           </item>
+          </layout>
+         </widget>
+        </item>
+       </layout>
+      </widget>
+     </item>
+     <item>
+      <widget class="QGroupBox" name="groupBox_4">
+       <property name="title">
+        <string>Columns</string>
+       </property>
+       <layout class="QFormLayout" name="formLayout">
+        <property name="horizontalSpacing">
+         <number>6</number>
+        </property>
+        <item row="0" column="0">
+         <widget class="QLabel" name="labelName">
+          <property name="text">
+           <string notr="true">Name:</string>
+          </property>
+         </widget>
+        </item>
+        <item row="0" column="1">
+         <widget class="QComboBox" name="comboBoxName"/>
+        </item>
+        <item row="1" column="0">
+         <widget class="QLabel" name="labelValue">
+          <property name="text">
+           <string notr="true">Value:</string>
+          </property>
+         </widget>
+        </item>
+        <item row="1" column="1">
+         <widget class="QComboBox" name="comboBoxValue"/>
+        </item>
+        <item row="2" column="0">
+         <widget class="QLabel" name="labelShiftA">
+          <property name="text">
+           <string notr="true">ShiftA:</string>
+          </property>
+         </widget>
+        </item>
+        <item row="2" column="1">
+         <widget class="QComboBox" name="comboBoxShiftA"/>
+        </item>
+        <item row="3" column="0">
+         <widget class="QLabel" name="labelShiftB">
+          <property name="text">
+           <string notr="true">ShiftB:</string>
+          </property>
+         </widget>
+        </item>
+        <item row="3" column="1">
+         <widget class="QComboBox" name="comboBoxShiftB"/>
+        </item>
+        <item row="4" column="0">
+         <widget class="QLabel" name="labelShiftC">
+          <property name="text">
+           <string notr="true">ShiftC:</string>
+          </property>
+         </widget>
+        </item>
+        <item row="4" column="1">
+         <widget class="QComboBox" name="comboBoxShiftC"/>
+        </item>
+        <item row="5" column="0">
+         <widget class="QLabel" name="labelFullName">
+          <property name="text">
+           <string>Full name:</string>
+          </property>
+         </widget>
+        </item>
+        <item row="5" column="1">
+         <widget class="QComboBox" name="comboBoxFullName"/>
+        </item>
+        <item row="6" column="0">
+         <widget class="QLabel" name="labelDescription">
+          <property name="text">
+           <string>Description:</string>
+          </property>
+         </widget>
+        </item>
+        <item row="6" column="1">
+         <widget class="QComboBox" name="comboBoxDescription"/>
+        </item>
+       </layout>
+      </widget>
+     </item>
+    </layout>
+   </item>
+   <item>
+    <widget class="QLabel" name="labelStatus">
+     <property name="text">
+      <string>Ready</string>
+     </property>
+    </widget>
+   </item>
+   <item>
+    <widget class="QDialogButtonBox" name="buttonBox">
+     <property name="orientation">
+      <enum>Qt::Horizontal</enum>
+     </property>
+     <property name="standardButtons">
+      <set>QDialogButtonBox::Cancel|QDialogButtonBox::Ok</set>
+     </property>
+    </widget>
+   </item>
+  </layout>
+ </widget>
+ <resources>
+  <include location="../share/resources/tapeicon.qrc"/>
+ </resources>
+ <connections>
+  <connection>
+   <sender>buttonBox</sender>
+   <signal>accepted()</signal>
+   <receiver>DialogMeasurementsCSVColumns</receiver>
+   <slot>accept()</slot>
+   <hints>
+    <hint type="sourcelabel">
+     <x>248</x>
+     <y>254</y>
+    </hint>
+    <hint type="destinationlabel">
+     <x>157</x>
+     <y>274</y>
+    </hint>
+   </hints>
+  </connection>
+  <connection>
+   <sender>buttonBox</sender>
+   <signal>rejected()</signal>
+   <receiver>DialogMeasurementsCSVColumns</receiver>
+   <slot>reject()</slot>
+   <hints>
+    <hint type="sourcelabel">
+     <x>316</x>
+     <y>260</y>
+    </hint>
+    <hint type="destinationlabel">
+     <x>286</x>
+     <y>274</y>
+    </hint>
+   </hints>
+  </connection>
+ </connections>
+</ui>
diff --git a/src/app/tape/dialogs/dialognewmeasurements.cpp b/src/app/tape/dialogs/dialognewmeasurements.cpp
index 9643fa021..2d0fa2202 100644
--- a/src/app/tape/dialogs/dialognewmeasurements.cpp
+++ b/src/app/tape/dialogs/dialognewmeasurements.cpp
@@ -44,31 +44,7 @@ DialogNewMeasurements::DialogNewMeasurements(QWidget *parent)
     ui->setupUi(this);
 
     InitMTypes();
-    InitUnits(MeasurementsType::Individual);
-    InitHeightsList();
-    InitSizesList();
-
-    const VTapeSettings *settings = qApp->TapeSettings();
-
-    const int height = static_cast<int>(UnitConvertor(settings->GetDefHeight(), Unit::Cm, MUnit()));
-    int index = ui->comboBoxBaseHeight->findText(QString().setNum(height));
-    if (index != -1)
-    {
-        ui->comboBoxBaseHeight->setCurrentIndex(index);
-    }
-
-    const int size = static_cast<int>(UnitConvertor(settings->GetDefSize(), Unit::Cm, MUnit()));
-    index = ui->comboBoxBaseSize->findText(QString().setNum(size));
-    if (index != -1)
-    {
-        ui->comboBoxBaseSize->setCurrentIndex(index);
-    }
-
-    connect(ui->comboBoxMType, QOverload<int>::of(&QComboBox::currentIndexChanged), this,
-            &DialogNewMeasurements::CurrentTypeChanged);
-
-    connect(ui->comboBoxUnit, QOverload<int>::of(&QComboBox::currentIndexChanged), this,
-            &DialogNewMeasurements::CurrentUnitChanged);
+    InitUnits();
 }
 
 //---------------------------------------------------------------------------------------------------------------------
@@ -89,18 +65,6 @@ Unit DialogNewMeasurements::MUnit() const
     return static_cast<Unit>(ui->comboBoxUnit->currentData().toInt());
 }
 
-//---------------------------------------------------------------------------------------------------------------------
-int DialogNewMeasurements::BaseSize() const
-{
-    return ui->comboBoxBaseSize->currentText().toInt();
-}
-
-//---------------------------------------------------------------------------------------------------------------------
-int DialogNewMeasurements::BaseHeight() const
-{
-    return ui->comboBoxBaseHeight->currentText().toInt();
-}
-
 //---------------------------------------------------------------------------------------------------------------------
 void DialogNewMeasurements::changeEvent(QEvent *event)
 {
@@ -109,7 +73,7 @@ void DialogNewMeasurements::changeEvent(QEvent *event)
         // retranslate designer form (single inheritance approach)
         ui->retranslateUi(this);
         InitMTypes();
-        InitUnits(static_cast<MeasurementsType>(ui->comboBoxMType->currentData().toInt()));
+        InitUnits();
     }
 
     // remember to call base class implementation
@@ -137,40 +101,6 @@ void DialogNewMeasurements::showEvent(QShowEvent *event)
     isInitialized = true;//first show windows are held
 }
 
-//---------------------------------------------------------------------------------------------------------------------
-void DialogNewMeasurements::CurrentTypeChanged(int index)
-{
-    const MeasurementsType type = static_cast<MeasurementsType>(ui->comboBoxMType->itemData(index).toInt());
-    if (type == MeasurementsType::Multisize)
-    {
-        ui->comboBoxBaseSize->setEnabled(true);
-        ui->comboBoxBaseHeight->setEnabled(true);
-    }
-    else
-    {
-        ui->comboBoxBaseSize->setEnabled(false);
-        ui->comboBoxBaseHeight->setEnabled(false);
-    }
-    InitUnits(type);
-}
-
-//---------------------------------------------------------------------------------------------------------------------
-void DialogNewMeasurements::CurrentUnitChanged(int index)
-{
-    Q_UNUSED(index)
-
-    if (MUnit() != Unit::Inch)
-    {
-        int i = ui->comboBoxBaseHeight->currentIndex();
-        InitHeightsList();
-        ui->comboBoxBaseHeight->setCurrentIndex(i);
-
-        i = ui->comboBoxBaseSize->currentIndex();
-        InitSizesList();
-        ui->comboBoxBaseSize->setCurrentIndex(i);
-    }
-}
-
 //---------------------------------------------------------------------------------------------------------------------
 void DialogNewMeasurements::InitMTypes()
 {
@@ -194,23 +124,7 @@ void DialogNewMeasurements::InitMTypes()
 }
 
 //---------------------------------------------------------------------------------------------------------------------
-void DialogNewMeasurements::InitHeightsList()
-{
-    const QStringList list = VMeasurement::WholeListHeights(MUnit());
-    ui->comboBoxBaseHeight->clear();
-    ui->comboBoxBaseHeight->addItems(list);
-}
-
-//---------------------------------------------------------------------------------------------------------------------
-void DialogNewMeasurements::InitSizesList()
-{
-    const QStringList list = VMeasurement::WholeListSizes(MUnit());
-    ui->comboBoxBaseSize->clear();
-    ui->comboBoxBaseSize->addItems(list);
-}
-
-//---------------------------------------------------------------------------------------------------------------------
-void DialogNewMeasurements::InitUnits(const MeasurementsType &type)
+void DialogNewMeasurements::InitUnits()
 {
     int val = static_cast<int>(Unit::Cm);
     if (ui->comboBoxUnit->currentIndex() != -1)
@@ -220,12 +134,11 @@ void DialogNewMeasurements::InitUnits(const MeasurementsType &type)
 
     ui->comboBoxUnit->blockSignals(true);
     ui->comboBoxUnit->clear();
+
     ui->comboBoxUnit->addItem(tr("Centimeters"), static_cast<int>(Unit::Cm));
     ui->comboBoxUnit->addItem(tr("Millimiters"), static_cast<int>(Unit::Mm));
-    if (type == MeasurementsType::Individual)
-    {
-        ui->comboBoxUnit->addItem(tr("Inches"), static_cast<int>(Unit::Inch));
-    }
+    ui->comboBoxUnit->addItem(tr("Inches"), static_cast<int>(Unit::Inch));
+
     ui->comboBoxUnit->setCurrentIndex(-1);
     ui->comboBoxUnit->blockSignals(false);
 
diff --git a/src/app/tape/dialogs/dialognewmeasurements.h b/src/app/tape/dialogs/dialognewmeasurements.h
index bf81fa517..9b301a4d1 100644
--- a/src/app/tape/dialogs/dialognewmeasurements.h
+++ b/src/app/tape/dialogs/dialognewmeasurements.h
@@ -48,26 +48,18 @@ public:
 
     MeasurementsType Type() const;
     Unit MUnit() const;
-    int BaseSize() const;
-    int BaseHeight() const;
 
 protected:
     virtual void changeEvent(QEvent* event) override;
     virtual void showEvent(QShowEvent *event) override;
 
-private slots:
-    void CurrentTypeChanged(int index);
-    void CurrentUnitChanged(int index);
-
 private:
     Q_DISABLE_COPY(DialogNewMeasurements)
     Ui::DialogNewMeasurements *ui;
     bool isInitialized;
 
     void InitMTypes();
-    void InitHeightsList();
-    void InitSizesList();
-    void InitUnits(const MeasurementsType &type);
+    void InitUnits();
 };
 
 #endif // DIALOGNEWMEASUREMENTS_H
diff --git a/src/app/tape/dialogs/dialognewmeasurements.ui b/src/app/tape/dialogs/dialognewmeasurements.ui
index de6b15994..16835baee 100644
--- a/src/app/tape/dialogs/dialognewmeasurements.ui
+++ b/src/app/tape/dialogs/dialognewmeasurements.ui
@@ -9,8 +9,8 @@
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>244</width>
-    <height>185</height>
+    <width>220</width>
+    <height>104</height>
    </rect>
   </property>
   <property name="windowTitle">
@@ -60,64 +60,6 @@
        </property>
       </widget>
      </item>
-     <item row="2" column="0">
-      <widget class="QLabel" name="label_2">
-       <property name="text">
-        <string>Base size:</string>
-       </property>
-      </widget>
-     </item>
-     <item row="2" column="1">
-      <widget class="QComboBox" name="comboBoxBaseSize">
-       <property name="enabled">
-        <bool>false</bool>
-       </property>
-       <property name="sizePolicy">
-        <sizepolicy hsizetype="Preferred" vsizetype="Preferred">
-         <horstretch>0</horstretch>
-         <verstretch>0</verstretch>
-        </sizepolicy>
-       </property>
-       <property name="minimumSize">
-        <size>
-         <width>0</width>
-         <height>0</height>
-        </size>
-       </property>
-       <property name="minimumContentsLength">
-        <number>3</number>
-       </property>
-      </widget>
-     </item>
-     <item row="3" column="0">
-      <widget class="QLabel" name="label_3">
-       <property name="text">
-        <string>Base height:</string>
-       </property>
-      </widget>
-     </item>
-     <item row="3" column="1">
-      <widget class="QComboBox" name="comboBoxBaseHeight">
-       <property name="enabled">
-        <bool>false</bool>
-       </property>
-       <property name="sizePolicy">
-        <sizepolicy hsizetype="Preferred" vsizetype="Preferred">
-         <horstretch>0</horstretch>
-         <verstretch>0</verstretch>
-        </sizepolicy>
-       </property>
-       <property name="minimumSize">
-        <size>
-         <width>0</width>
-         <height>0</height>
-        </size>
-       </property>
-       <property name="minimumContentsLength">
-        <number>4</number>
-       </property>
-      </widget>
-     </item>
     </layout>
    </item>
    <item>
diff --git a/src/app/tape/dialogs/dialogrestrictdimension.cpp b/src/app/tape/dialogs/dialogrestrictdimension.cpp
new file mode 100644
index 000000000..e9053ce41
--- /dev/null
+++ b/src/app/tape/dialogs/dialogrestrictdimension.cpp
@@ -0,0 +1,655 @@
+/************************************************************************
+ **
+ **  @file   dialogrestrictdimension.cpp
+ **  @author Roman Telezhynskyi <dismine(at)gmail.com>
+ **  @date   5 10, 2020
+ **
+ **  @brief
+ **  @copyright
+ **  This source code is part of the Valentina project, a pattern making
+ **  program, whose allow create and modeling patterns of clothing.
+ **  Copyright (C) 2020 Valentina project
+ **  <https://gitlab.com/smart-pattern/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 "dialogrestrictdimension.h"
+#include "ui_dialogrestrictdimension.h"
+
+#include <QTableWidgetItem>
+
+#include "../vpatterndb/variables/vmeasurement.h"
+#include "../vwidgets/vdecorationaligningdelegate.h"
+
+
+namespace
+{
+//---------------------------------------------------------------------------------------------------------------------
+QVector<int> FilterByMinimum(const QVector<int> &base, int restriction)
+{
+    if (restriction <= 0)
+    {
+        return base;
+    }
+
+    QVector<int> filtered;
+    filtered.reserve(base.size());
+    for(auto &b : base)
+    {
+        if (b >= restriction)
+        {
+            filtered.append(b);
+        }
+    }
+    return filtered;
+}
+
+//---------------------------------------------------------------------------------------------------------------------
+QVector<int> FilterByMaximum(const QVector<int> &base, int restriction)
+{
+    if (restriction <= 0)
+    {
+        return base;
+    }
+
+    QVector<int> filtered;
+    filtered.reserve(base.size());
+    for(auto &b : base)
+    {
+        if (b <= restriction)
+        {
+            filtered.append(b);
+        }
+    }
+    return filtered;
+}
+}
+
+//---------------------------------------------------------------------------------------------------------------------
+DialogRestrictDimension::DialogRestrictDimension(const QList<MeasurementDimension_p> &dimensions,
+                                                 const QMap<QString, QPair<int, int>> &restrictions,
+                                                 bool oneDimesionRestriction, bool fullCircumference,
+                                                 QWidget *parent) :
+    QDialog(parent),
+    ui(new Ui::DialogRestrictDimension),
+    m_oneDimesionRestriction(oneDimesionRestriction),
+    m_fullCircumference(fullCircumference),
+    m_dimensions(dimensions),
+    m_restrictions(restrictions)
+{
+    ui->setupUi(this);
+
+    ui->tableWidget->setItemDelegate(
+        new VDecorationAligningDelegate(Qt::AlignHCenter | Qt::AlignCenter, ui->tableWidget));
+
+    connect(ui->tableWidget, &QTableWidget::itemSelectionChanged, this, &DialogRestrictDimension::RowSelected);
+
+    connect(ui->comboBoxDimensionA, QOverload<int>::of(&QComboBox::currentIndexChanged), this,
+            &DialogRestrictDimension::DimensionAChanged);
+
+    connect(ui->comboBoxMin, QOverload<int>::of(&QComboBox::currentIndexChanged), this,
+            &DialogRestrictDimension::MinRestrictionChanged);
+    connect(ui->comboBoxMax, QOverload<int>::of(&QComboBox::currentIndexChanged), this,
+            &DialogRestrictDimension::MaxRestrictionChanged);
+
+    InitDimensionsBaseValues();
+    InitTable();
+}
+
+//---------------------------------------------------------------------------------------------------------------------
+DialogRestrictDimension::~DialogRestrictDimension()
+{
+    delete ui;
+}
+
+//---------------------------------------------------------------------------------------------------------------------
+void DialogRestrictDimension::changeEvent(QEvent *event)
+{
+    if (event->type() == QEvent::LanguageChange)
+    {
+        // retranslate designer form (single inheritance approach)
+        ui->retranslateUi(this);
+
+        auto RetranslateControls = [this](int index, QLabel *name, QComboBox *control)
+        {
+            SCASSERT(name != nullptr)
+            SCASSERT(control != nullptr)
+
+            if (m_dimensions.size() > index)
+            {
+                MeasurementDimension_p dimension = m_dimensions.at(index);
+
+                name->setText(VAbstartMeasurementDimension::DimensionName(dimension->Type())+QChar(':'));
+                name->setToolTip(VAbstartMeasurementDimension::DimensionToolTip(dimension->Type(),
+                                                                                dimension->IsCircumference(),
+                                                                                m_fullCircumference));
+
+                InitDimensionGradation(dimension, control);
+            }
+        };
+
+        if (not m_oneDimesionRestriction)
+        {
+            RetranslateControls(0, ui->labelDimensionA, ui->comboBoxDimensionA);
+        }
+    }
+
+    // remember to call base class implementation
+    QDialog::changeEvent(event);
+}
+
+//---------------------------------------------------------------------------------------------------------------------
+void DialogRestrictDimension::RowSelected()
+{
+    EnableRestrictionControls(false);
+
+    QTableWidgetItem *item = ui->tableWidget->currentItem();
+
+    if (item)
+    {
+        int base1 = 0;
+        int base2 = 0;
+        MeasurementDimension_p dimension;
+
+        if (m_oneDimesionRestriction)
+        {
+            base1 = item->data(Qt::UserRole).toInt();
+
+            if (m_dimensions.size() > 1)
+            {
+                dimension = m_dimensions.at(1);
+            }
+        }
+        else
+        {
+            base1 = ui->comboBoxDimensionA->currentData().toInt();
+            base2 = item->data(Qt::UserRole).toInt();
+
+            if (m_dimensions.size() > 2)
+            {
+                dimension = m_dimensions.at(2);
+            }
+        }
+
+        QPair<int, int> restriction = m_restrictions.value(VMeasurement::CorrectionHash(base1, base2),
+                                                           QPair<int, int>(0, 0));
+
+        if (dimension.isNull())
+        {
+            return;
+        }
+
+        const QVector<int> bases = dimension->ValidBases();
+
+        ui->comboBoxMin->blockSignals(true);
+        ui->comboBoxMin->clear();
+        QVector<int> filtered = FilterByMaximum(bases, restriction.second);
+        FillBases(filtered, dimension, ui->comboBoxMin);
+        int index = ui->comboBoxMin->findData(restriction.first);
+        ui->comboBoxMin->setCurrentIndex(index != -1 ? index : 0);
+        ui->comboBoxMin->blockSignals(false);
+
+        ui->comboBoxMax->blockSignals(true);
+        ui->comboBoxMax->clear();
+        filtered = FilterByMinimum(bases, restriction.first);
+        FillBases(FilterByMinimum(bases, restriction.first), dimension, ui->comboBoxMax);
+        index = ui->comboBoxMax->findData(restriction.second);
+        ui->comboBoxMax->setCurrentIndex(index != -1 ? index : ui->comboBoxMax->count() - 1);
+        ui->comboBoxMax->blockSignals(false);
+
+        EnableRestrictionControls(true);
+    }
+}
+
+//---------------------------------------------------------------------------------------------------------------------
+void DialogRestrictDimension::DimensionAChanged()
+{
+    InitTable();
+}
+
+//---------------------------------------------------------------------------------------------------------------------
+void DialogRestrictDimension::MinRestrictionChanged()
+{
+    QTableWidgetItem *item = ui->tableWidget->currentItem();
+
+    if (item)
+    {
+        int base1 = 0;
+        int base2 = 0;
+
+        if (m_oneDimesionRestriction)
+        {
+            base1 = item->data(Qt::UserRole).toInt();
+        }
+        else
+        {
+            base1 = ui->comboBoxDimensionA->currentData().toInt();
+            base2 = item->data(Qt::UserRole).toInt();
+        }
+
+        const QString coordinates = VMeasurement::CorrectionHash(base1, base2);
+        QPair<int, int> restriction = m_restrictions.value(coordinates, QPair<int, int>(0, 0));
+
+        restriction.first = ui->comboBoxMin->currentData().toInt();
+        m_restrictions.insert(coordinates, restriction);
+
+        const int currentRow = ui->tableWidget->currentRow();
+        RefreshTable();
+
+        ui->tableWidget->blockSignals(true);
+        ui->tableWidget->selectRow(currentRow);
+        ui->tableWidget->blockSignals(false);
+
+        RowSelected();
+    }
+}
+
+//---------------------------------------------------------------------------------------------------------------------
+void DialogRestrictDimension::MaxRestrictionChanged()
+{
+    QTableWidgetItem *item = ui->tableWidget->currentItem();
+
+    if (item)
+    {
+        int base1 = 0;
+        int base2 = 0;
+
+        if (m_oneDimesionRestriction)
+        {
+            base1 = item->data(Qt::UserRole).toInt();
+        }
+        else
+        {
+            base1 = ui->comboBoxDimensionA->currentData().toInt();
+            base2 = item->data(Qt::UserRole).toInt();
+        }
+
+        const QString coordinates = VMeasurement::CorrectionHash(base1, base2);
+        QPair<int, int> restriction = m_restrictions.value(coordinates, QPair<int, int>(0, 0));
+
+        restriction.second = ui->comboBoxMax->currentData().toInt();
+        m_restrictions.insert(coordinates, restriction);
+
+        const int currentRow = ui->tableWidget->currentRow();
+        RefreshTable();
+
+        ui->tableWidget->blockSignals(true);
+        ui->tableWidget->selectRow(currentRow);
+        ui->tableWidget->blockSignals(false);
+
+        RowSelected();
+    }
+}
+
+//---------------------------------------------------------------------------------------------------------------------
+void DialogRestrictDimension::InitDimensionsBaseValues()
+{
+    auto DimensionsBaseValue = [this](int index, QLabel *name, QComboBox *control)
+    {
+        SCASSERT(name != nullptr)
+        SCASSERT(control != nullptr)
+
+        if (m_dimensions.size() > index)
+        {
+            MeasurementDimension_p dimension = m_dimensions.at(index);
+            const QString unit = UnitsToStr(dimension->Units(), true);
+            name->setText(VAbstartMeasurementDimension::DimensionName(dimension->Type())+QChar(':'));
+            name->setToolTip(VAbstartMeasurementDimension::DimensionToolTip(dimension->Type(),
+                                                                            dimension->IsCircumference(),
+                                                                            m_fullCircumference));
+
+            InitDimensionGradation(dimension, control);
+        }
+    };
+
+    if (not m_oneDimesionRestriction)
+    {
+        if (m_dimensions.size() > 0)
+        {
+            DimensionsBaseValue(0, ui->labelDimensionA, ui->comboBoxDimensionA);
+        }
+        else
+        {
+            ui->labelDimensionA->setVisible(false);
+            ui->comboBoxDimensionA->setVisible(false);
+        }
+    }
+    else
+    {
+        ui->labelDimensionA->setVisible(false);
+        ui->comboBoxDimensionA->setVisible(false);
+    }
+}
+
+//---------------------------------------------------------------------------------------------------------------------
+void DialogRestrictDimension::InitDimensionGradation(const MeasurementDimension_p &dimension, QComboBox *control)
+{
+    SCASSERT(control != nullptr)
+
+    int current = -1;
+    if (control->currentIndex() != -1)
+    {
+        current = control->currentData().toInt();
+    }
+
+    control->blockSignals(true);
+    control->clear();
+
+    FillBases(dimension->ValidBases(), dimension, control);
+
+    int i = control->findData(current);
+    if (i != -1)
+    {
+        control->setCurrentIndex(i);
+        control->blockSignals(false);
+    }
+    else
+    {
+        control->blockSignals(false);
+        control->setCurrentIndex(0);
+    }
+}
+
+//---------------------------------------------------------------------------------------------------------------------
+void DialogRestrictDimension::InitTable()
+{
+    ui->tableWidget->blockSignals(true);
+    ui->tableWidget->clear();
+
+    auto InitHeaders = [this](int index)
+    {
+        if (m_dimensions.size() > index)
+        {
+            MeasurementDimension_p dimensionA = m_dimensions.at(index-1);
+            const QVector<int> basesA = dimensionA->ValidBases();
+            ui->tableWidget->setRowCount(basesA.size());
+            ui->tableWidget->setVerticalHeaderLabels(DimensionLabels(basesA, dimensionA));
+
+            MeasurementDimension_p dimensionB = m_dimensions.at(index);
+            const QVector<int> basesB = dimensionB->ValidBases();
+            ui->tableWidget->setColumnCount(basesB.size());
+            ui->tableWidget->setHorizontalHeaderLabels(DimensionLabels(basesB, dimensionB));
+        }
+    };
+
+    InitHeaders(m_oneDimesionRestriction ? 1 : 2);
+    ui->tableWidget->blockSignals(false);
+
+    RefreshTable();
+    ui->tableWidget->selectRow(0);
+}
+
+//---------------------------------------------------------------------------------------------------------------------
+void DialogRestrictDimension::RefreshTable()
+{
+    QVector<int> basesRow;
+    QVector<int> basesColumn;
+
+    if (m_oneDimesionRestriction)
+    {
+        if (m_dimensions.size() >= 2)
+        {
+            MeasurementDimension_p dimensionA = m_dimensions.at(0);
+            basesRow = dimensionA->ValidBases();
+
+            MeasurementDimension_p dimensionB = m_dimensions.at(1);
+            basesColumn = dimensionB->ValidBases();
+        }
+        else
+        {
+            return;
+        }
+    }
+    else
+    {
+        if (m_dimensions.size() >= 3)
+        {
+            MeasurementDimension_p dimensionA = m_dimensions.at(1);
+            basesRow = dimensionA->ValidBases();
+
+            MeasurementDimension_p dimensionB = m_dimensions.at(2);
+            basesColumn = dimensionB->ValidBases();
+        }
+        else
+        {
+            return;
+        }
+    }
+
+    ui->tableWidget->blockSignals(true);
+    ui->tableWidget->clearContents();
+
+    for(int row=0; row < basesRow.size(); ++row)
+    {
+        for(int column=0; column < basesColumn.size(); ++column)
+        {
+            AddCell(row, column, basesRow.at(row), basesColumn.at(column));
+        }
+    }
+
+    ui->tableWidget->horizontalHeader()->setSectionResizeMode(QHeaderView::Stretch);
+    ui->tableWidget->verticalHeader()->setSectionResizeMode(QHeaderView::Stretch);
+
+    ui->tableWidget->blockSignals(false);
+}
+
+//---------------------------------------------------------------------------------------------------------------------
+void DialogRestrictDimension::AddCell(int row, int column, int rowValue, int columnValue)
+{
+    auto *item = new QTableWidgetItem();
+    item->setData(Qt::UserRole, rowValue);
+
+    int base1 = 0;
+    int base2 = 0;
+    MeasurementDimension_p dimension;
+    QVector<int> bases;
+
+    if (m_oneDimesionRestriction)
+    {
+        base1 = rowValue;
+
+        if (m_dimensions.size() >= 2)
+        {
+            dimension = m_dimensions.at(1);
+            bases = dimension->ValidBases();
+        }
+    }
+    else
+    {
+        base1 = ui->comboBoxDimensionA->currentData().toInt();
+        base2 = rowValue;
+
+        if (m_dimensions.size() >= 3)
+        {
+            dimension = m_dimensions.at(2);
+            bases = dimension->ValidBases();
+        }
+    }
+
+    QPair<int, int> restriction = m_restrictions.value(VMeasurement::CorrectionHash(base1, base2),
+                                                       QPair<int, int>(0, 0));
+    int min = INT32_MIN;
+    int max = INT32_MAX;
+
+    if (not dimension.isNull())
+    {
+        min = bases.indexOf(restriction.first) != -1 ? restriction.first : dimension->MinValue();
+        max = bases.indexOf(restriction.second) != -1 ? restriction.second : dimension->MaxValue();
+
+        if (max < min)
+        {
+            min = dimension->MinValue();
+            max = dimension->MaxValue();
+        }
+    }
+
+    const bool leftRestriction = columnValue >= min;
+    const bool rightRestriction = columnValue <= max;
+
+    if (leftRestriction && rightRestriction)
+    {
+        item->setIcon(QIcon("://icon/24x24/star.png"));
+    }
+    else
+    {
+        item->setIcon(QIcon("://icon/24x24/close.png"));
+    }
+
+    // set the item non-editable (view only), and non-selectable
+    Qt::ItemFlags flags = item->flags();
+    flags &= ~(Qt::ItemIsEditable); // reset/clear the flag
+    item->setFlags(flags);
+
+    ui->tableWidget->setItem(row, column, item);
+}
+
+//---------------------------------------------------------------------------------------------------------------------
+void DialogRestrictDimension::EnableRestrictionControls(bool enable)
+{
+    if (not enable)
+    {
+        ui->comboBoxMin->blockSignals(true);
+        ui->comboBoxMin->setCurrentIndex(-1);
+        ui->comboBoxMin->blockSignals(false);
+
+        ui->comboBoxMax->blockSignals(true);
+        ui->comboBoxMax->setCurrentIndex(-1);
+        ui->comboBoxMax->blockSignals(false);
+    }
+
+    ui->groupBoxRestriction->setEnabled(enable);
+}
+
+//---------------------------------------------------------------------------------------------------------------------
+void DialogRestrictDimension::FillBases(const QVector<int> &bases, const MeasurementDimension_p &dimension,
+                                        QComboBox *control)
+{
+    SCASSERT(control != nullptr)
+
+    const DimesionLabels labels = dimension->Labels();
+    const QString units = UnitsToStr(dimension->Units(), true);
+
+    if (dimension->Type() == MeasurementDimension::X)
+    {
+        for(auto base : bases)
+        {
+            if (labels.contains(base) && not labels.value(base).isEmpty())
+            {
+                control->addItem(labels.value(base), base);
+            }
+            else
+            {
+                control->addItem(QString("%1 %2").arg(base).arg(units), base);
+            }
+        }
+    }
+    else if (dimension->Type() == MeasurementDimension::Y)
+    {
+        for(auto base : bases)
+        {
+            if (labels.contains(base) && not labels.value(base).isEmpty())
+            {
+                control->addItem(labels.value(base), base);
+            }
+            else
+            {
+                if (dimension->IsCircumference())
+                {
+                    control->addItem(QString("%1 %2").arg(m_fullCircumference ? base*2 : base).arg(units), base);
+                }
+                else
+                {
+                    control->addItem(QString::number(base), base);
+                }
+            }
+        }
+    }
+    else if (dimension->Type() == MeasurementDimension::W || dimension->Type() == MeasurementDimension::Z)
+    {
+        for(auto base : bases)
+        {
+            if (labels.contains(base) && not labels.value(base).isEmpty())
+            {
+                control->addItem(labels.value(base), base);
+            }
+            else
+            {
+                control->addItem(QString("%1 %2").arg(m_fullCircumference ? base*2 : base).arg(units), base);
+            }
+        }
+    }
+}
+
+//---------------------------------------------------------------------------------------------------------------------
+QStringList DialogRestrictDimension::DimensionLabels(const QVector<int> &bases, const MeasurementDimension_p &dimension)
+{
+    const bool showUnits = dimension->IsCircumference() || dimension->Type() == MeasurementDimension::X;
+    const QString units = showUnits ? UnitsToStr(dimension->Units(), true) : QString();
+    const DimesionLabels dimensionLabels = dimension->Labels();
+
+    QStringList labels;
+
+    if (dimension->Type() == MeasurementDimension::X)
+    {
+        for(auto base : bases)
+        {
+            if (dimensionLabels.contains(base) && not dimensionLabels.value(base).isEmpty())
+            {
+                labels.append(dimensionLabels.value(base));
+            }
+            else
+            {
+                labels.append(QString("%1 %2").arg(base).arg(units));
+            }
+        }
+    }
+    else if (dimension->Type() == MeasurementDimension::Y)
+    {
+        for(auto base : bases)
+        {
+            if (dimensionLabels.contains(base) && not dimensionLabels.value(base).isEmpty())
+            {
+                labels.append(dimensionLabels.value(base));
+            }
+            else
+            {
+                if (dimension->IsCircumference())
+                {
+                    labels.append(QString("%1 %2").arg(m_fullCircumference ? base*2 : base).arg(units));
+                }
+                else
+                {
+                    labels.append(QString::number(base));
+                }
+            }
+        }
+    }
+    else if (dimension->Type() == MeasurementDimension::W || dimension->Type() == MeasurementDimension::Z)
+    {
+        for(auto base : bases)
+        {
+            if (dimensionLabels.contains(base) && not dimensionLabels.value(base).isEmpty())
+            {
+                labels.append(dimensionLabels.value(base));
+            }
+            else
+            {
+                labels.append(QString("%1 %2").arg(m_fullCircumference ? base*2 : base).arg(units));
+            }
+        }
+    }
+
+    return labels;
+}
diff --git a/src/app/tape/dialogs/dialogrestrictdimension.h b/src/app/tape/dialogs/dialogrestrictdimension.h
new file mode 100644
index 000000000..0a3c03335
--- /dev/null
+++ b/src/app/tape/dialogs/dialogrestrictdimension.h
@@ -0,0 +1,95 @@
+/************************************************************************
+ **
+ **  @file   dialogrestrictdimension.h
+ **  @author Roman Telezhynskyi <dismine(at)gmail.com>
+ **  @date   5 10, 2020
+ **
+ **  @brief
+ **  @copyright
+ **  This source code is part of the Valentina project, a pattern making
+ **  program, whose allow create and modeling patterns of clothing.
+ **  Copyright (C) 2020 Valentina project
+ **  <https://gitlab.com/smart-pattern/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 DIALOGRESTRICTDIMENSION_H
+#define DIALOGRESTRICTDIMENSION_H
+
+#include <QDialog>
+#include <QMap>
+
+#include "../vformat/vdimensions.h"
+
+namespace Ui
+{
+class DialogRestrictDimension;
+}
+
+class QTableWidgetItem;
+
+
+class DialogRestrictDimension : public QDialog
+{
+    Q_OBJECT
+
+public:
+    DialogRestrictDimension(const QList<MeasurementDimension_p> &dimensions,
+                            const QMap<QString, QPair<int, int>> &restrictions, bool oneDimesionRestriction,
+                            bool fullCircumference, QWidget *parent = nullptr);
+    virtual ~DialogRestrictDimension();
+
+    QMap<QString, QPair<int, int> > Restrictions() const;
+
+protected:
+    virtual void changeEvent(QEvent* event) override;
+
+protected slots:
+    void RowSelected();
+    void DimensionAChanged();
+    void MinRestrictionChanged();
+    void MaxRestrictionChanged();
+
+private:
+    Q_DISABLE_COPY(DialogRestrictDimension)
+    Ui::DialogRestrictDimension *ui;
+
+    bool m_oneDimesionRestriction;
+    bool m_fullCircumference;
+    QList<MeasurementDimension_p>  m_dimensions;
+    QMap<QString, QPair<int, int>> m_restrictions;
+
+    void InitDimensionsBaseValues();
+    void InitDimensionGradation(const MeasurementDimension_p &dimension, QComboBox *control);
+    void InitTable();
+
+    void RefreshTable();
+
+    void AddCell(int row, int column, int rowValue, int columnValue);
+
+    void EnableRestrictionControls(bool enable);
+
+    void FillBases(const QVector<int> &bases, const MeasurementDimension_p &dimension, QComboBox *control);
+
+    QStringList DimensionLabels(const QVector<int> &bases, const MeasurementDimension_p &dimension);
+};
+
+//---------------------------------------------------------------------------------------------------------------------
+inline QMap<QString, QPair<int, int> > DialogRestrictDimension::Restrictions() const
+{
+    return m_restrictions;
+}
+
+#endif // DIALOGRESTRICTDIMENSION_H
diff --git a/src/app/tape/dialogs/dialogrestrictdimension.ui b/src/app/tape/dialogs/dialogrestrictdimension.ui
new file mode 100644
index 000000000..3aefc5815
--- /dev/null
+++ b/src/app/tape/dialogs/dialogrestrictdimension.ui
@@ -0,0 +1,180 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<ui version="4.0">
+ <class>DialogRestrictDimension</class>
+ <widget class="QDialog" name="DialogRestrictDimension">
+  <property name="geometry">
+   <rect>
+    <x>0</x>
+    <y>0</y>
+    <width>699</width>
+    <height>566</height>
+   </rect>
+  </property>
+  <property name="windowTitle">
+   <string>Restrict dimension</string>
+  </property>
+  <property name="windowIcon">
+   <iconset resource="../share/resources/tapeicon.qrc">
+    <normaloff>:/tapeicon/64x64/logo.png</normaloff>:/tapeicon/64x64/logo.png</iconset>
+  </property>
+  <layout class="QVBoxLayout" name="verticalLayout">
+   <item>
+    <layout class="QGridLayout" name="gridLayout_2">
+     <item row="0" column="0">
+      <spacer name="horizontalSpacer_3">
+       <property name="orientation">
+        <enum>Qt::Horizontal</enum>
+       </property>
+       <property name="sizeHint" stdset="0">
+        <size>
+         <width>40</width>
+         <height>20</height>
+        </size>
+       </property>
+      </spacer>
+     </item>
+     <item row="0" column="1">
+      <widget class="QLabel" name="labelDimensionA">
+       <property name="text">
+        <string>Dimension A:</string>
+       </property>
+      </widget>
+     </item>
+     <item row="0" column="2">
+      <widget class="QComboBox" name="comboBoxDimensionA"/>
+     </item>
+     <item row="0" column="3">
+      <spacer name="horizontalSpacer">
+       <property name="orientation">
+        <enum>Qt::Horizontal</enum>
+       </property>
+       <property name="sizeHint" stdset="0">
+        <size>
+         <width>40</width>
+         <height>20</height>
+        </size>
+       </property>
+      </spacer>
+     </item>
+    </layout>
+   </item>
+   <item>
+    <widget class="QTableWidget" name="tableWidget">
+     <property name="sizePolicy">
+      <sizepolicy hsizetype="Expanding" vsizetype="Expanding">
+       <horstretch>0</horstretch>
+       <verstretch>4</verstretch>
+      </sizepolicy>
+     </property>
+     <property name="editTriggers">
+      <set>QAbstractItemView::CurrentChanged|QAbstractItemView::SelectedClicked</set>
+     </property>
+     <property name="selectionMode">
+      <enum>QAbstractItemView::SingleSelection</enum>
+     </property>
+     <property name="selectionBehavior">
+      <enum>QAbstractItemView::SelectRows</enum>
+     </property>
+     <property name="iconSize">
+      <size>
+       <width>24</width>
+       <height>24</height>
+      </size>
+     </property>
+    </widget>
+   </item>
+   <item>
+    <widget class="QGroupBox" name="groupBoxRestriction">
+     <property name="enabled">
+      <bool>false</bool>
+     </property>
+     <property name="title">
+      <string>Restriction</string>
+     </property>
+     <layout class="QGridLayout" name="gridLayout">
+      <item row="0" column="0">
+       <widget class="QLabel" name="label_4">
+        <property name="text">
+         <string>Min:</string>
+        </property>
+       </widget>
+      </item>
+      <item row="0" column="1">
+       <widget class="QComboBox" name="comboBoxMin"/>
+      </item>
+      <item row="0" column="2">
+       <spacer name="horizontalSpacer_4">
+        <property name="orientation">
+         <enum>Qt::Horizontal</enum>
+        </property>
+        <property name="sizeHint" stdset="0">
+         <size>
+          <width>40</width>
+          <height>20</height>
+         </size>
+        </property>
+       </spacer>
+      </item>
+      <item row="0" column="3">
+       <widget class="QLabel" name="label_5">
+        <property name="text">
+         <string>Max:</string>
+        </property>
+       </widget>
+      </item>
+      <item row="0" column="4">
+       <widget class="QComboBox" name="comboBoxMax"/>
+      </item>
+     </layout>
+    </widget>
+   </item>
+   <item>
+    <widget class="QDialogButtonBox" name="buttonBox">
+     <property name="orientation">
+      <enum>Qt::Horizontal</enum>
+     </property>
+     <property name="standardButtons">
+      <set>QDialogButtonBox::Cancel|QDialogButtonBox::Ok</set>
+     </property>
+    </widget>
+   </item>
+  </layout>
+ </widget>
+ <resources>
+  <include location="../share/resources/tapeicon.qrc"/>
+ </resources>
+ <connections>
+  <connection>
+   <sender>buttonBox</sender>
+   <signal>accepted()</signal>
+   <receiver>DialogRestrictDimension</receiver>
+   <slot>accept()</slot>
+   <hints>
+    <hint type="sourcelabel">
+     <x>248</x>
+     <y>254</y>
+    </hint>
+    <hint type="destinationlabel">
+     <x>157</x>
+     <y>274</y>
+    </hint>
+   </hints>
+  </connection>
+  <connection>
+   <sender>buttonBox</sender>
+   <signal>rejected()</signal>
+   <receiver>DialogRestrictDimension</receiver>
+   <slot>reject()</slot>
+   <hints>
+    <hint type="sourcelabel">
+     <x>316</x>
+     <y>260</y>
+    </hint>
+    <hint type="destinationlabel">
+     <x>286</x>
+     <y>274</y>
+    </hint>
+   </hints>
+  </connection>
+ </connections>
+</ui>
diff --git a/src/app/tape/dialogs/dialogsetupmultisize.cpp b/src/app/tape/dialogs/dialogsetupmultisize.cpp
new file mode 100644
index 000000000..b68463284
--- /dev/null
+++ b/src/app/tape/dialogs/dialogsetupmultisize.cpp
@@ -0,0 +1,604 @@
+/************************************************************************
+ **
+ **  @file   dialogsetupmultisize.cpp
+ **  @author Roman Telezhynskyi <dismine(at)gmail.com>
+ **  @date   26 9, 2020
+ **
+ **  @brief
+ **  @copyright
+ **  This source code is part of the Valentina project, a pattern making
+ **  program, whose allow create and modeling patterns of clothing.
+ **  Copyright (C) 2020 Valentina project
+ **  <https://gitlab.com/smart-pattern/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 "dialogsetupmultisize.h"
+#include "ui_dialogsetupmultisize.h"
+
+#include <QPushButton>
+#include <QShowEvent>
+
+#include "../mapplication.h"
+#include "../vmisc/backport/qoverload.h"
+
+//---------------------------------------------------------------------------------------------------------------------
+DialogSetupMultisize::DialogSetupMultisize(Unit unit, QWidget *parent) :
+    QDialog(parent),
+    ui(new Ui::DialogSetupMultisize),
+    m_xDimension(QSharedPointer<VXMeasurementDimension>::create(unit)),
+    m_yDimension(QSharedPointer<VYMeasurementDimension>::create(unit)),
+    m_wDimension(QSharedPointer<VWMeasurementDimension>::create(unit)),
+    m_zDimension(QSharedPointer<VZMeasurementDimension>::create(unit))
+{
+    ui->setupUi(this);
+
+    ui->labelError->clear();
+    ui->checkBoxYDimensionCircumference->setChecked(m_yDimension->IsCircumference());
+
+    InitXDimension();
+    InitYDimension();
+    InitWDimension();
+    InitZDimension();
+
+    // height
+    connect(ui->spinBoxXDimensionMinValue, QOverload<int>::of(&QSpinBox::valueChanged),
+            this, [this](int value)
+            {
+                DimensionMinValueChanged(value, ui->spinBoxXDimensionMaxValue, ui->comboBoxXDimensionStep,
+                                         ui->comboBoxXDimensionBase, m_xDimension);
+            });
+    connect(ui->spinBoxXDimensionMaxValue, QOverload<int>::of(&QSpinBox::valueChanged),
+            this, [this](int value)
+            {
+                DimensionMaxValueChanged(value, ui->spinBoxXDimensionMinValue, ui->comboBoxXDimensionStep,
+                                         ui->comboBoxXDimensionBase, m_xDimension);
+            });
+    connect(ui->comboBoxXDimensionStep, QOverload<int>::of(&QComboBox::currentIndexChanged),
+            this, [this](int index)
+            {
+                DimensionStepChanged(index, ui->comboBoxXDimensionStep, ui->comboBoxXDimensionBase, m_xDimension);
+            });
+    connect(ui->comboBoxXDimensionBase, QOverload<int>::of(&QComboBox::currentIndexChanged),
+            this, [this](int index)
+            {
+                DimensionBaseChanged(index, ui->comboBoxXDimensionBase, m_xDimension);
+            });
+
+    // size
+    connect(ui->spinBoxYDimensionMinValue, QOverload<int>::of(&QSpinBox::valueChanged),
+            this, [this](int value)
+            {
+                DimensionMinValueChanged(value, ui->spinBoxYDimensionMaxValue, ui->comboBoxYDimensionStep,
+                                         ui->comboBoxYDimensionBase, m_yDimension);
+            });
+    connect(ui->spinBoxYDimensionMaxValue, QOverload<int>::of(&QSpinBox::valueChanged),
+            this, [this](int value)
+            {
+                DimensionMaxValueChanged(value, ui->spinBoxYDimensionMinValue, ui->comboBoxYDimensionStep,
+                                         ui->comboBoxYDimensionBase, m_yDimension);
+            });
+    connect(ui->comboBoxYDimensionStep, QOverload<int>::of(&QComboBox::currentIndexChanged),
+            this, [this](int index)
+            {
+                DimensionStepChanged(index, ui->comboBoxYDimensionStep, ui->comboBoxYDimensionBase, m_yDimension);
+            });
+    connect(ui->comboBoxYDimensionBase, QOverload<int>::of(&QComboBox::currentIndexChanged),
+            this, [this](int index)
+            {
+                DimensionBaseChanged(index, ui->comboBoxYDimensionBase, m_yDimension);
+            });
+
+    // hip
+    connect(ui->spinBoxWDimensionMinValue, QOverload<int>::of(&QSpinBox::valueChanged),
+            this, [this](int value)
+            {
+                DimensionMinValueChanged(value, ui->spinBoxWDimensionMaxValue, ui->comboBoxWDimensionStep,
+                                         ui->comboBoxWDimensionBase, m_wDimension);
+            });
+    connect(ui->spinBoxWDimensionMaxValue, QOverload<int>::of(&QSpinBox::valueChanged),
+            this, [this](int value)
+            {
+                DimensionMaxValueChanged(value, ui->spinBoxWDimensionMinValue, ui->comboBoxWDimensionStep,
+                                         ui->comboBoxWDimensionBase, m_wDimension);
+            });
+    connect(ui->comboBoxWDimensionStep, QOverload<int>::of(&QComboBox::currentIndexChanged),
+            this, [this](int index)
+            {
+                DimensionStepChanged(index, ui->comboBoxWDimensionStep, ui->comboBoxWDimensionBase, m_wDimension);
+            });
+    connect(ui->comboBoxWDimensionBase, QOverload<int>::of(&QComboBox::currentIndexChanged),
+            this, [this](int index)
+            {
+                DimensionBaseChanged(index, ui->comboBoxWDimensionBase, m_wDimension);
+            });
+
+    // waist
+    connect(ui->spinBoxZDimensionMinValue, QOverload<int>::of(&QSpinBox::valueChanged),
+            this, [this](int value)
+            {
+                DimensionMinValueChanged(value, ui->spinBoxZDimensionMaxValue, ui->comboBoxZDimensionStep,
+                                         ui->comboBoxZDimensionBase, m_zDimension);
+            });
+    connect(ui->spinBoxZDimensionMaxValue, QOverload<int>::of(&QSpinBox::valueChanged),
+            this, [this](int value)
+            {
+                DimensionMaxValueChanged(value, ui->spinBoxZDimensionMinValue, ui->comboBoxZDimensionStep,
+                                         ui->comboBoxZDimensionBase, m_zDimension);
+            });
+    connect(ui->comboBoxZDimensionStep, QOverload<int>::of(&QComboBox::currentIndexChanged),
+            this, [this](int index)
+            {
+                DimensionStepChanged(index, ui->comboBoxZDimensionStep, ui->comboBoxZDimensionBase, m_zDimension);
+            });
+    connect(ui->comboBoxZDimensionBase, QOverload<int>::of(&QComboBox::currentIndexChanged),
+            this, [this](int index)
+            {
+                DimensionBaseChanged(index, ui->comboBoxZDimensionBase, m_zDimension);
+            });
+
+
+    connect(ui->groupBoxXDimension, &QGroupBox::clicked, this, [this](){CheckState();});
+    connect(ui->groupBoxYDimension, &QGroupBox::clicked, this, [this](){CheckState();});
+    connect(ui->groupBoxWDimension, &QGroupBox::clicked, this, [this](){CheckState();});
+    connect(ui->groupBoxZDimension, &QGroupBox::clicked, this, [this](){CheckState();});
+
+    connect(ui->checkBoxFullCircumference, &QCheckBox::stateChanged,
+            this, &DialogSetupMultisize::ShowFullCircumference);
+    connect(ui->checkBoxYDimensionCircumference, &QCheckBox::stateChanged,
+            this, &DialogSetupMultisize::YDimensionCircumferenceChanged);
+
+    CheckState();
+}
+
+//---------------------------------------------------------------------------------------------------------------------
+DialogSetupMultisize::~DialogSetupMultisize()
+{
+    delete ui;
+}
+
+//---------------------------------------------------------------------------------------------------------------------
+QVector<MeasurementDimension_p> DialogSetupMultisize::Dimensions() const
+{
+    QVector<MeasurementDimension_p> dimensions;
+
+    if (ui->groupBoxXDimension->isChecked())
+    {
+        dimensions.append(m_xDimension);
+    }
+
+    if (ui->groupBoxYDimension->isChecked())
+    {
+        dimensions.append(m_yDimension);
+    }
+
+    if (ui->groupBoxWDimension->isChecked())
+    {
+        dimensions.append(m_wDimension);
+    }
+
+    if (ui->groupBoxZDimension->isChecked())
+    {
+        dimensions.append(m_zDimension);
+    }
+
+    return dimensions;
+}
+
+//---------------------------------------------------------------------------------------------------------------------
+bool DialogSetupMultisize::FullCircumference() const
+{
+    return ui->checkBoxFullCircumference->isChecked();
+}
+
+//---------------------------------------------------------------------------------------------------------------------
+void DialogSetupMultisize::changeEvent(QEvent *event)
+{
+    if (event->type() == QEvent::LanguageChange)
+    {
+        // retranslate designer form (single inheritance approach)
+        ui->retranslateUi(this);
+    }
+
+    // remember to call base class implementation
+    QDialog::changeEvent(event);
+}
+
+//---------------------------------------------------------------------------------------------------------------------
+void DialogSetupMultisize::showEvent(QShowEvent *event)
+{
+    QDialog::showEvent( event );
+    if ( event->spontaneous() )
+    {
+        return;
+    }
+
+    if (m_isInitialized)
+    {
+        return;
+    }
+    // do your init stuff here
+
+    setMaximumSize(size());
+    setMinimumSize(size());
+
+    m_isInitialized = true;//first show windows are held
+}
+
+//---------------------------------------------------------------------------------------------------------------------
+void DialogSetupMultisize::ShowFullCircumference()
+{
+    auto ShowDimensionFullCircumference = [this](QSpinBox *spinboxMinValue, QSpinBox *spinboxMaxValue,
+                                                 QComboBox *comboBoxStep, QComboBox *comboBoxBase,
+                                                 const MeasurementDimension_p &dimension)
+    {
+        SCASSERT(spinboxMinValue != nullptr)
+        SCASSERT(spinboxMaxValue != nullptr)
+        SCASSERT(comboBoxStep != nullptr)
+        SCASSERT(comboBoxBase != nullptr)
+
+        InitDimension(spinboxMinValue, spinboxMaxValue, comboBoxStep, dimension);
+        UpdateBase(comboBoxBase, dimension);
+
+        comboBoxBase->blockSignals(true);
+        comboBoxBase->setCurrentIndex(-1);
+        comboBoxBase->blockSignals(false);
+    };
+
+    ShowDimensionFullCircumference(ui->spinBoxYDimensionMinValue, ui->spinBoxYDimensionMaxValue,
+                                   ui->comboBoxYDimensionStep, ui->comboBoxYDimensionBase, m_yDimension);
+    ShowDimensionFullCircumference(ui->spinBoxWDimensionMinValue, ui->spinBoxWDimensionMaxValue,
+                                   ui->comboBoxWDimensionStep, ui->comboBoxWDimensionBase, m_wDimension);
+    ShowDimensionFullCircumference(ui->spinBoxZDimensionMinValue, ui->spinBoxZDimensionMaxValue,
+                                   ui->comboBoxZDimensionStep, ui->comboBoxZDimensionBase, m_zDimension);
+
+    CheckState();
+}
+
+//---------------------------------------------------------------------------------------------------------------------
+void DialogSetupMultisize::YDimensionCircumferenceChanged()
+{
+    bool checked = ui->checkBoxYDimensionCircumference->isChecked();
+    m_yDimension->SetCircumference(checked);
+
+    const bool c = m_yDimension->IsCircumference();
+    const QString unitStr = c ? " " + UnitsToStr(m_yDimension->Units()) : QString();
+
+    ui->spinBoxYDimensionMinValue->setSuffix(unitStr);
+    ui->spinBoxYDimensionMaxValue->setSuffix(unitStr);
+
+    InitDimension(ui->spinBoxYDimensionMinValue, ui->spinBoxYDimensionMaxValue, ui->comboBoxYDimensionStep,
+                  m_yDimension);
+
+    UpdateBase(ui->comboBoxYDimensionBase, m_yDimension);
+
+    ui->comboBoxYDimensionBase->blockSignals(true);
+    ui->comboBoxYDimensionBase->setCurrentIndex(-1);
+    ui->comboBoxYDimensionBase->blockSignals(false);
+
+    bool ok = false;
+    const int base = ui->comboBoxYDimensionBase->currentData().toInt(&ok);
+    m_yDimension->SetBaseValue(ok ? base : -1);
+
+    CheckState();
+}
+
+//---------------------------------------------------------------------------------------------------------------------
+void DialogSetupMultisize::CheckState()
+{
+    ui->labelError->clear();
+
+    bool xDimensionValid = true;
+    bool yDimensionValid = true;
+    bool wDimensionValid = true;
+    bool zDimensionValid = true;
+
+    int dimensions = 0;
+
+    auto CheckDimension = [this](QGroupBox *group, bool &dimensionValid, int &dimensions,
+                                 const MeasurementDimension_p &dimension)
+    {
+        SCASSERT(group != nullptr)
+
+        if (group->isChecked())
+        {
+            dimensionValid = dimension->IsValid();
+            ++dimensions;
+
+            if (ui->labelError->text().isEmpty() && not dimensionValid)
+            {
+                ui->labelError->setText(tr("Please, provide correct data for dimensions"));
+            }
+        }
+    };
+
+    CheckDimension(ui->groupBoxXDimension, xDimensionValid, dimensions, m_xDimension);
+    CheckDimension(ui->groupBoxYDimension, yDimensionValid, dimensions, m_yDimension);
+    CheckDimension(ui->groupBoxWDimension, wDimensionValid, dimensions, m_wDimension);
+    CheckDimension(ui->groupBoxZDimension, zDimensionValid, dimensions, m_zDimension);
+
+    if (ui->labelError->text().isEmpty() && dimensions == 0)
+    {
+        ui->labelError->setText(tr("Please, select at least one dimension"));
+    }
+    else if (ui->labelError->text().isEmpty() && dimensions > 3)
+    {
+        ui->labelError->setText(tr("No more than 3 dimensions allowed"));
+    }
+
+    const bool enough = dimensions > 0 && dimensions <= 3;
+
+    QPushButton *bOk = ui->buttonBox->button(QDialogButtonBox::Ok);
+    SCASSERT(bOk != nullptr)
+    bOk->setEnabled(enough && xDimensionValid && yDimensionValid && wDimensionValid && zDimensionValid);
+
+    if (ui->labelError->text().isEmpty())
+    {
+        ui->labelError->setText(tr("Ready"));
+    }
+}
+
+//---------------------------------------------------------------------------------------------------------------------
+void DialogSetupMultisize::InitDimensionMinMax(QSpinBox *spinboxMinValue, QSpinBox *spinboxMaxValue,
+                                               const MeasurementDimension_p &dimension)
+{
+    SCASSERT(spinboxMinValue != nullptr)
+    SCASSERT(spinboxMaxValue != nullptr)
+
+    dimension->SetMinValue(dimension->RangeMin());
+    dimension->SetMaxValue(dimension->RangeMax());
+
+    const bool fc = ui->checkBoxFullCircumference->isChecked();
+    const bool c = dimension->IsCircumference();
+
+    spinboxMinValue->blockSignals(true);
+    const QString unitStr = " " + UnitsToStr(dimension->Units());
+    if (c || dimension->Type() == MeasurementDimension::X)
+    {
+        spinboxMinValue->setSuffix(unitStr);
+    }
+
+    spinboxMinValue->setMinimum(c && fc ? dimension->RangeMin()*2 : dimension->RangeMin());
+    spinboxMinValue->setMaximum(c && fc ? dimension->MaxValue()*2 : dimension->MaxValue());
+    spinboxMinValue->setValue(c && fc ? dimension->MinValue()*2 : dimension->MinValue());
+    spinboxMinValue->blockSignals(false);
+
+    spinboxMaxValue->blockSignals(true);
+    if (c || dimension->Type() == MeasurementDimension::X)
+    {
+        spinboxMaxValue->setSuffix(unitStr);
+    }
+    spinboxMaxValue->setMinimum(c && fc ? dimension->MinValue()*2 : dimension->MinValue());
+    spinboxMaxValue->setMaximum(c && fc ? dimension->RangeMax()*2 : dimension->RangeMax());
+    spinboxMaxValue->setValue(c && fc ? dimension->RangeMax()*2 : dimension->RangeMax());
+    spinboxMaxValue->setValue(c && fc ? dimension->MaxValue()*2 : dimension->MaxValue());
+    spinboxMaxValue->blockSignals(false);
+}
+
+//---------------------------------------------------------------------------------------------------------------------
+void DialogSetupMultisize::InitDimensionStep(QComboBox *comboBoxStep,
+                                             const MeasurementDimension_p &dimension)
+{
+    SCASSERT(comboBoxStep != nullptr)
+
+    const bool fc = ui->checkBoxFullCircumference->isChecked();
+    const bool c = dimension->IsCircumference();
+    const QString unitStr = " " + UnitsToStr(dimension->Units());
+
+    dimension->SetStep(-1);
+
+    comboBoxStep->blockSignals(true);
+    const QVector<int> steps = dimension->ValidSteps();
+    comboBoxStep->clear();
+    for(auto step : steps)
+    {
+        comboBoxStep->addItem(QString("%1%2").arg(c && fc ? step*2 : step)
+                                  .arg(c || dimension->Type() == MeasurementDimension::X ? unitStr : QString()), step);
+    }
+
+    comboBoxStep->setCurrentIndex(-1); // force a user to select
+    comboBoxStep->blockSignals(false);
+
+    bool ok = false;
+    const int step = comboBoxStep->currentData().toInt(&ok);
+    dimension->SetStep(ok ? step : -1);
+}
+
+//---------------------------------------------------------------------------------------------------------------------
+void DialogSetupMultisize::InitDimension(QSpinBox *spinboxMinValue, QSpinBox *spinboxMaxValue, QComboBox *comboBoxStep,
+                                         const MeasurementDimension_p &dimension)
+{
+    InitDimensionMinMax(spinboxMinValue, spinboxMaxValue, dimension);
+    InitDimensionStep(comboBoxStep, dimension);
+}
+
+//---------------------------------------------------------------------------------------------------------------------
+void DialogSetupMultisize::InitXDimension()
+{
+    InitDimension(ui->spinBoxXDimensionMinValue, ui->spinBoxXDimensionMaxValue, ui->comboBoxXDimensionStep,
+                  m_xDimension);
+}
+
+//---------------------------------------------------------------------------------------------------------------------
+void DialogSetupMultisize::InitYDimension()
+{
+    InitDimension(ui->spinBoxYDimensionMinValue, ui->spinBoxYDimensionMaxValue, ui->comboBoxYDimensionStep,
+                  m_yDimension);
+}
+
+//---------------------------------------------------------------------------------------------------------------------
+void DialogSetupMultisize::InitWDimension()
+{
+    InitDimension(ui->spinBoxWDimensionMinValue, ui->spinBoxWDimensionMaxValue, ui->comboBoxWDimensionStep,
+                  m_wDimension);
+}
+
+//---------------------------------------------------------------------------------------------------------------------
+void DialogSetupMultisize::InitZDimension()
+{
+    InitDimension(ui->spinBoxZDimensionMinValue, ui->spinBoxZDimensionMaxValue, ui->comboBoxZDimensionStep,
+                  m_zDimension);
+}
+
+//---------------------------------------------------------------------------------------------------------------------
+void DialogSetupMultisize::DimensionMinValueChanged(int value, QSpinBox *spinboxMaxValue, QComboBox *comboBoxStep,
+                                                    QComboBox *comboBoxBase,
+                                                    const MeasurementDimension_p &dimension)
+{
+    SCASSERT(spinboxMaxValue != nullptr)
+    SCASSERT(comboBoxStep != nullptr)
+    SCASSERT(comboBoxBase != nullptr)
+
+    const bool fc = ui->checkBoxFullCircumference->isChecked();
+    const bool c = dimension->IsCircumference();
+
+    dimension->SetMinValue(c && fc ? value / 2 : value);
+
+    spinboxMaxValue->blockSignals(true);
+    spinboxMaxValue->setMinimum(value);
+    spinboxMaxValue->blockSignals(false);
+
+    dimension->SetMaxValue(c && fc ? spinboxMaxValue->value() / 2 : spinboxMaxValue->value());
+
+    UpdateSteps(comboBoxStep, dimension);
+    UpdateBase(comboBoxBase, dimension);
+
+    CheckState();
+}
+
+//---------------------------------------------------------------------------------------------------------------------
+void DialogSetupMultisize::DimensionMaxValueChanged(int value, QSpinBox *spinboxMinValue, QComboBox *comboBoxStep,
+                                                    QComboBox *comboBoxBase,
+                                                    const MeasurementDimension_p &dimension)
+{
+    SCASSERT(spinboxMinValue != nullptr)
+    SCASSERT(comboBoxStep != nullptr)
+    SCASSERT(comboBoxBase != nullptr)
+
+    const bool fc = ui->checkBoxFullCircumference->isChecked();
+    const bool c = dimension->IsCircumference();
+
+    dimension->SetMaxValue(c && fc ? value / 2 : value);
+
+    spinboxMinValue->blockSignals(true);
+    spinboxMinValue->setMaximum(value);
+    spinboxMinValue->blockSignals(false);
+
+    dimension->SetMinValue(c && fc ? spinboxMinValue->value() / 2 : spinboxMinValue->value());
+
+    UpdateSteps(comboBoxStep, dimension);
+    UpdateBase(comboBoxBase, dimension);
+
+    CheckState();
+}
+
+//---------------------------------------------------------------------------------------------------------------------
+void DialogSetupMultisize::DimensionStepChanged(int index, QComboBox *comboBoxStep, QComboBox *comboBoxBase,
+                                                const MeasurementDimension_p &dimension)
+{
+    SCASSERT(comboBoxStep != nullptr)
+    SCASSERT(comboBoxBase != nullptr)
+
+    bool ok = false;
+    const int step = comboBoxStep->itemData(index).toInt(&ok);
+    dimension->SetStep(ok ? step : -1);
+
+    UpdateBase(comboBoxBase, dimension);
+
+    CheckState();
+}
+
+//---------------------------------------------------------------------------------------------------------------------
+void DialogSetupMultisize::DimensionBaseChanged(int index, QComboBox *comboBoxBase,
+                                                const MeasurementDimension_p &dimension)
+{
+    SCASSERT(comboBoxBase != nullptr)
+
+    bool ok = false;
+    const int base = comboBoxBase->itemData(index).toInt(&ok);
+    dimension->SetBaseValue(ok ? base : -1);
+
+    CheckState();
+}
+
+//---------------------------------------------------------------------------------------------------------------------
+void DialogSetupMultisize::UpdateSteps(QComboBox *comboBoxStep,
+                                       const MeasurementDimension_p &dimension)
+{
+    SCASSERT(comboBoxStep != nullptr)
+
+    int oldStep = -1;
+    if (comboBoxStep->currentIndex() != -1)
+    {
+        oldStep = comboBoxStep->currentData().toInt();
+    }
+
+    comboBoxStep->blockSignals(true);
+
+    const QString unitStr = " " + UnitsToStr(dimension->Units());
+    const QVector<int> steps = dimension->ValidSteps();
+    comboBoxStep->clear();
+
+    const bool fc = ui->checkBoxFullCircumference->isChecked();
+    const bool c = dimension->IsCircumference();
+
+    for(auto step : steps)
+    {
+        comboBoxStep->addItem(QString("%1%2").arg(c && fc ? step * 2 : step)
+                                  .arg(c ? unitStr : QString()), step);
+    }
+
+    comboBoxStep->setCurrentIndex(comboBoxStep->findData(oldStep));
+    comboBoxStep->blockSignals(false);
+
+    bool ok = false;
+    const int step = comboBoxStep->currentData().toInt(&ok);
+    dimension->SetStep(ok ? step : -1);
+}
+
+//---------------------------------------------------------------------------------------------------------------------
+void DialogSetupMultisize::UpdateBase(QComboBox *comboBoxBase,
+                                      const MeasurementDimension_p &dimension)
+{
+    SCASSERT(comboBoxBase != nullptr)
+
+    int oldBase = -1;
+    if (comboBoxBase->currentIndex() != -1)
+    {
+        oldBase = comboBoxBase->currentData().toInt();
+    }
+
+    comboBoxBase->blockSignals(true);
+
+    const QString unitStr = " " + UnitsToStr(dimension->Units());
+    const QVector<int> bases = dimension->ValidBases();
+    comboBoxBase->clear();
+    const bool fc = ui->checkBoxFullCircumference->isChecked();
+    const bool c = dimension->IsCircumference();
+
+    for(auto base : bases)
+    {
+        comboBoxBase->addItem(QString("%1%2").arg(c && fc ? base * 2 : base)
+                                  .arg(c || dimension->Type() == MeasurementDimension::X ? unitStr : QString()), base);
+    }
+
+    comboBoxBase->setCurrentIndex(comboBoxBase->findData(oldBase));
+    comboBoxBase->blockSignals(false);
+
+    bool ok = false;
+    const int base = comboBoxBase->currentData().toInt(&ok);
+    dimension->SetBaseValue(ok ? base : -1);
+}
+
diff --git a/src/app/tape/dialogs/dialogsetupmultisize.h b/src/app/tape/dialogs/dialogsetupmultisize.h
new file mode 100644
index 000000000..9751f5587
--- /dev/null
+++ b/src/app/tape/dialogs/dialogsetupmultisize.h
@@ -0,0 +1,101 @@
+/************************************************************************
+ **
+ **  @file   dialogsetupmultisize.h
+ **  @author Roman Telezhynskyi <dismine(at)gmail.com>
+ **  @date   26 9, 2020
+ **
+ **  @brief
+ **  @copyright
+ **  This source code is part of the Valentina project, a pattern making
+ **  program, whose allow create and modeling patterns of clothing.
+ **  Copyright (C) 2020 Valentina project
+ **  <https://gitlab.com/smart-pattern/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 DIALOGSETUPMULTISIZE_H
+#define DIALOGSETUPMULTISIZE_H
+
+#include <QDialog>
+
+#include "../vformat/vdimensions.h"
+#include "../vmisc/def.h"
+
+class QSpinBox;
+
+namespace Ui
+{
+class DialogSetupMultisize;
+}
+
+class DialogSetupMultisize : public QDialog
+{
+    Q_OBJECT
+
+public:
+    explicit DialogSetupMultisize(Unit unit, QWidget *parent = nullptr);
+    ~DialogSetupMultisize();
+
+    QVector<MeasurementDimension_p> Dimensions() const;
+
+    bool FullCircumference() const;
+
+protected:
+    virtual void changeEvent(QEvent* event) override;
+    virtual void showEvent(QShowEvent *event) override;
+
+private slots:
+    void ShowFullCircumference();
+    void YDimensionCircumferenceChanged();
+
+private:
+    Q_DISABLE_COPY(DialogSetupMultisize)
+    Ui::DialogSetupMultisize *ui;
+    bool m_isInitialized{false};
+    QSharedPointer<VXMeasurementDimension> m_xDimension;
+    QSharedPointer<VYMeasurementDimension> m_yDimension;
+    QSharedPointer<VWMeasurementDimension> m_wDimension;
+    QSharedPointer<VZMeasurementDimension> m_zDimension;
+
+    void CheckState();
+
+    void InitDimensionMinMax(QSpinBox *spinboxMinValue, QSpinBox *spinboxMaxValue,
+                             const MeasurementDimension_p &dimension);
+    void InitDimensionStep(QComboBox *comboBoxStep,const MeasurementDimension_p &dimension);
+
+    void InitDimension(QSpinBox *spinboxMinValue, QSpinBox *spinboxMaxValue, QComboBox *comboBoxStep,
+                       const MeasurementDimension_p &dimension);
+    void InitXDimension();
+    void InitYDimension();
+    void InitWDimension();
+    void InitZDimension();
+
+    void DimensionMinValueChanged(int value, QSpinBox *spinboxMaxValue, QComboBox *comboBoxStep,
+                                  QComboBox *comboBoxBase,
+                                  const MeasurementDimension_p &dimension);
+    void DimensionMaxValueChanged(int value, QSpinBox *spinboxMinValue, QComboBox *comboBoxStep,
+                                  QComboBox *comboBoxBase,
+                                  const MeasurementDimension_p &dimension);
+
+    void DimensionStepChanged(int index, QComboBox *comboBoxStep, QComboBox *comboBoxBase,
+                              const MeasurementDimension_p &dimension);
+    void DimensionBaseChanged(int index, QComboBox *comboBoxBase,
+                              const MeasurementDimension_p &dimension);
+
+    void UpdateSteps(QComboBox *comboBoxStep, const MeasurementDimension_p &dimension);
+    void UpdateBase(QComboBox *comboBoxBase, const MeasurementDimension_p &dimension);
+};
+
+#endif // DIALOGSETUPMULTISIZE_H
diff --git a/src/app/tape/dialogs/dialogsetupmultisize.ui b/src/app/tape/dialogs/dialogsetupmultisize.ui
new file mode 100644
index 000000000..a09b0aac6
--- /dev/null
+++ b/src/app/tape/dialogs/dialogsetupmultisize.ui
@@ -0,0 +1,480 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<ui version="4.0">
+ <class>DialogSetupMultisize</class>
+ <widget class="QDialog" name="DialogSetupMultisize">
+  <property name="geometry">
+   <rect>
+    <x>0</x>
+    <y>0</y>
+    <width>734</width>
+    <height>289</height>
+   </rect>
+  </property>
+  <property name="windowTitle">
+   <string>Setup multisize measurements</string>
+  </property>
+  <property name="windowIcon">
+   <iconset resource="../share/resources/tapeicon.qrc">
+    <normaloff>:/tapeicon/64x64/logo.png</normaloff>:/tapeicon/64x64/logo.png</iconset>
+  </property>
+  <layout class="QVBoxLayout" name="verticalLayout_5">
+   <item>
+    <widget class="QCheckBox" name="checkBoxFullCircumference">
+     <property name="text">
+      <string>Use full circumference</string>
+     </property>
+    </widget>
+   </item>
+   <item>
+    <layout class="QHBoxLayout" name="horizontalLayout">
+     <item>
+      <widget class="QGroupBox" name="groupBoxXDimension">
+       <property name="title">
+        <string>Height</string>
+       </property>
+       <property name="checkable">
+        <bool>true</bool>
+       </property>
+       <layout class="QVBoxLayout" name="verticalLayout_2">
+        <item>
+         <layout class="QFormLayout" name="formLayout_2">
+          <property name="fieldGrowthPolicy">
+           <enum>QFormLayout::ExpandingFieldsGrow</enum>
+          </property>
+          <item row="0" column="0">
+           <widget class="QLabel" name="label">
+            <property name="text">
+             <string>Min value:</string>
+            </property>
+           </widget>
+          </item>
+          <item row="0" column="1">
+           <widget class="QSpinBox" name="spinBoxXDimensionMinValue">
+            <property name="toolTip">
+             <string>Minimal value described in the column</string>
+            </property>
+            <property name="suffix">
+             <string/>
+            </property>
+           </widget>
+          </item>
+          <item row="1" column="0">
+           <widget class="QLabel" name="label_2">
+            <property name="text">
+             <string>Max value:</string>
+            </property>
+           </widget>
+          </item>
+          <item row="1" column="1">
+           <widget class="QSpinBox" name="spinBoxXDimensionMaxValue">
+            <property name="toolTip">
+             <string>Maximal value described in the column</string>
+            </property>
+           </widget>
+          </item>
+          <item row="2" column="0">
+           <widget class="QLabel" name="label_3">
+            <property name="text">
+             <string>Step:</string>
+            </property>
+           </widget>
+          </item>
+          <item row="2" column="1">
+           <widget class="QComboBox" name="comboBoxXDimensionStep">
+            <property name="sizePolicy">
+             <sizepolicy hsizetype="Preferred" vsizetype="Fixed">
+              <horstretch>0</horstretch>
+              <verstretch>0</verstretch>
+             </sizepolicy>
+            </property>
+            <property name="toolTip">
+             <string>Single-step between the column values</string>
+            </property>
+           </widget>
+          </item>
+          <item row="3" column="0">
+           <widget class="QLabel" name="label_4">
+            <property name="text">
+             <string>Base:</string>
+            </property>
+           </widget>
+          </item>
+          <item row="3" column="1">
+           <widget class="QComboBox" name="comboBoxXDimensionBase">
+            <property name="sizePolicy">
+             <sizepolicy hsizetype="Preferred" vsizetype="Fixed">
+              <horstretch>0</horstretch>
+              <verstretch>0</verstretch>
+             </sizepolicy>
+            </property>
+            <property name="toolTip">
+             <string>The base value for the column</string>
+            </property>
+           </widget>
+          </item>
+         </layout>
+        </item>
+       </layout>
+      </widget>
+     </item>
+     <item>
+      <widget class="QGroupBox" name="groupBoxYDimension">
+       <property name="title">
+        <string>Size</string>
+       </property>
+       <property name="checkable">
+        <bool>true</bool>
+       </property>
+       <property name="checked">
+        <bool>true</bool>
+       </property>
+       <layout class="QVBoxLayout" name="verticalLayout">
+        <item>
+         <layout class="QFormLayout" name="formLayout_3">
+          <property name="fieldGrowthPolicy">
+           <enum>QFormLayout::ExpandingFieldsGrow</enum>
+          </property>
+          <item row="0" column="0">
+           <widget class="QLabel" name="label_5">
+            <property name="text">
+             <string>Min value:</string>
+            </property>
+           </widget>
+          </item>
+          <item row="0" column="1">
+           <widget class="QSpinBox" name="spinBoxYDimensionMinValue">
+            <property name="toolTip">
+             <string>Minimal value described in the column</string>
+            </property>
+           </widget>
+          </item>
+          <item row="1" column="0">
+           <widget class="QLabel" name="label_6">
+            <property name="text">
+             <string>Max value:</string>
+            </property>
+           </widget>
+          </item>
+          <item row="1" column="1">
+           <widget class="QSpinBox" name="spinBoxYDimensionMaxValue">
+            <property name="toolTip">
+             <string>Maximal value described in the column</string>
+            </property>
+           </widget>
+          </item>
+          <item row="2" column="0">
+           <widget class="QLabel" name="label_7">
+            <property name="text">
+             <string>Step:</string>
+            </property>
+           </widget>
+          </item>
+          <item row="2" column="1">
+           <widget class="QComboBox" name="comboBoxYDimensionStep">
+            <property name="sizePolicy">
+             <sizepolicy hsizetype="Preferred" vsizetype="Fixed">
+              <horstretch>0</horstretch>
+              <verstretch>0</verstretch>
+             </sizepolicy>
+            </property>
+            <property name="toolTip">
+             <string>Single-step between the column values</string>
+            </property>
+           </widget>
+          </item>
+          <item row="3" column="0">
+           <widget class="QLabel" name="label_8">
+            <property name="text">
+             <string>Base:</string>
+            </property>
+           </widget>
+          </item>
+          <item row="3" column="1">
+           <widget class="QComboBox" name="comboBoxYDimensionBase">
+            <property name="sizePolicy">
+             <sizepolicy hsizetype="Preferred" vsizetype="Fixed">
+              <horstretch>0</horstretch>
+              <verstretch>0</verstretch>
+             </sizepolicy>
+            </property>
+            <property name="toolTip">
+             <string>The base value for the column</string>
+            </property>
+           </widget>
+          </item>
+         </layout>
+        </item>
+        <item>
+         <widget class="QCheckBox" name="checkBoxYDimensionCircumference">
+          <property name="text">
+           <string>Circumference</string>
+          </property>
+          <property name="checked">
+           <bool>true</bool>
+          </property>
+         </widget>
+        </item>
+       </layout>
+      </widget>
+     </item>
+     <item>
+      <widget class="QGroupBox" name="groupBoxWDimension">
+       <property name="title">
+        <string>Hip</string>
+       </property>
+       <property name="checkable">
+        <bool>true</bool>
+       </property>
+       <property name="checked">
+        <bool>false</bool>
+       </property>
+       <layout class="QVBoxLayout" name="verticalLayout_4">
+        <item>
+         <layout class="QFormLayout" name="formLayout_5">
+          <property name="fieldGrowthPolicy">
+           <enum>QFormLayout::ExpandingFieldsGrow</enum>
+          </property>
+          <item row="0" column="0">
+           <widget class="QLabel" name="label_13">
+            <property name="text">
+             <string>Min value:</string>
+            </property>
+           </widget>
+          </item>
+          <item row="0" column="1">
+           <widget class="QSpinBox" name="spinBoxWDimensionMinValue">
+            <property name="toolTip">
+             <string>Minimal value described in the column</string>
+            </property>
+           </widget>
+          </item>
+          <item row="1" column="0">
+           <widget class="QLabel" name="label_14">
+            <property name="text">
+             <string>Max value:</string>
+            </property>
+           </widget>
+          </item>
+          <item row="1" column="1">
+           <widget class="QSpinBox" name="spinBoxWDimensionMaxValue">
+            <property name="toolTip">
+             <string>Maximal value described in the column</string>
+            </property>
+           </widget>
+          </item>
+          <item row="2" column="0">
+           <widget class="QLabel" name="label_15">
+            <property name="text">
+             <string>Step:</string>
+            </property>
+           </widget>
+          </item>
+          <item row="2" column="1">
+           <widget class="QComboBox" name="comboBoxWDimensionStep">
+            <property name="sizePolicy">
+             <sizepolicy hsizetype="Preferred" vsizetype="Fixed">
+              <horstretch>0</horstretch>
+              <verstretch>0</verstretch>
+             </sizepolicy>
+            </property>
+            <property name="toolTip">
+             <string>Single-step between the column values</string>
+            </property>
+           </widget>
+          </item>
+          <item row="3" column="0">
+           <widget class="QLabel" name="label_16">
+            <property name="text">
+             <string>Base:</string>
+            </property>
+           </widget>
+          </item>
+          <item row="3" column="1">
+           <widget class="QComboBox" name="comboBoxWDimensionBase">
+            <property name="sizePolicy">
+             <sizepolicy hsizetype="Preferred" vsizetype="Fixed">
+              <horstretch>0</horstretch>
+              <verstretch>0</verstretch>
+             </sizepolicy>
+            </property>
+            <property name="toolTip">
+             <string>The base value for the column</string>
+            </property>
+           </widget>
+          </item>
+         </layout>
+        </item>
+       </layout>
+      </widget>
+     </item>
+     <item>
+      <widget class="QGroupBox" name="groupBoxZDimension">
+       <property name="title">
+        <string>Waist</string>
+       </property>
+       <property name="checkable">
+        <bool>true</bool>
+       </property>
+       <property name="checked">
+        <bool>false</bool>
+       </property>
+       <layout class="QVBoxLayout" name="verticalLayout_3">
+        <item>
+         <layout class="QFormLayout" name="formLayout_4">
+          <property name="fieldGrowthPolicy">
+           <enum>QFormLayout::ExpandingFieldsGrow</enum>
+          </property>
+          <item row="0" column="0">
+           <widget class="QLabel" name="label_9">
+            <property name="text">
+             <string>Min value:</string>
+            </property>
+           </widget>
+          </item>
+          <item row="0" column="1">
+           <widget class="QSpinBox" name="spinBoxZDimensionMinValue">
+            <property name="toolTip">
+             <string>Minimal value described in the column</string>
+            </property>
+           </widget>
+          </item>
+          <item row="1" column="0">
+           <widget class="QLabel" name="label_10">
+            <property name="text">
+             <string>Max value:</string>
+            </property>
+           </widget>
+          </item>
+          <item row="1" column="1">
+           <widget class="QSpinBox" name="spinBoxZDimensionMaxValue">
+            <property name="toolTip">
+             <string>Maximal value described in the column</string>
+            </property>
+           </widget>
+          </item>
+          <item row="2" column="0">
+           <widget class="QLabel" name="label_11">
+            <property name="text">
+             <string>Step:</string>
+            </property>
+           </widget>
+          </item>
+          <item row="2" column="1">
+           <widget class="QComboBox" name="comboBoxZDimensionStep">
+            <property name="sizePolicy">
+             <sizepolicy hsizetype="Preferred" vsizetype="Fixed">
+              <horstretch>0</horstretch>
+              <verstretch>0</verstretch>
+             </sizepolicy>
+            </property>
+            <property name="toolTip">
+             <string>Single-step between the column values</string>
+            </property>
+           </widget>
+          </item>
+          <item row="3" column="0">
+           <widget class="QLabel" name="label_12">
+            <property name="text">
+             <string>Base:</string>
+            </property>
+           </widget>
+          </item>
+          <item row="3" column="1">
+           <widget class="QComboBox" name="comboBoxZDimensionBase">
+            <property name="sizePolicy">
+             <sizepolicy hsizetype="Preferred" vsizetype="Fixed">
+              <horstretch>0</horstretch>
+              <verstretch>0</verstretch>
+             </sizepolicy>
+            </property>
+            <property name="toolTip">
+             <string>The base value for the column</string>
+            </property>
+           </widget>
+          </item>
+         </layout>
+        </item>
+       </layout>
+      </widget>
+     </item>
+    </layout>
+   </item>
+   <item>
+    <widget class="QLabel" name="labelError">
+     <property name="text">
+      <string notr="true">_</string>
+     </property>
+    </widget>
+   </item>
+   <item>
+    <widget class="QDialogButtonBox" name="buttonBox">
+     <property name="orientation">
+      <enum>Qt::Horizontal</enum>
+     </property>
+     <property name="standardButtons">
+      <set>QDialogButtonBox::Cancel|QDialogButtonBox::Ok</set>
+     </property>
+    </widget>
+   </item>
+  </layout>
+ </widget>
+ <tabstops>
+  <tabstop>groupBoxXDimension</tabstop>
+  <tabstop>spinBoxXDimensionMinValue</tabstop>
+  <tabstop>spinBoxXDimensionMaxValue</tabstop>
+  <tabstop>comboBoxXDimensionStep</tabstop>
+  <tabstop>comboBoxXDimensionBase</tabstop>
+  <tabstop>groupBoxYDimension</tabstop>
+  <tabstop>spinBoxYDimensionMinValue</tabstop>
+  <tabstop>spinBoxYDimensionMaxValue</tabstop>
+  <tabstop>comboBoxYDimensionStep</tabstop>
+  <tabstop>comboBoxYDimensionBase</tabstop>
+  <tabstop>groupBoxWDimension</tabstop>
+  <tabstop>spinBoxWDimensionMinValue</tabstop>
+  <tabstop>spinBoxWDimensionMaxValue</tabstop>
+  <tabstop>comboBoxWDimensionStep</tabstop>
+  <tabstop>comboBoxWDimensionBase</tabstop>
+  <tabstop>groupBoxZDimension</tabstop>
+  <tabstop>spinBoxZDimensionMinValue</tabstop>
+  <tabstop>spinBoxZDimensionMaxValue</tabstop>
+  <tabstop>comboBoxZDimensionStep</tabstop>
+  <tabstop>comboBoxZDimensionBase</tabstop>
+ </tabstops>
+ <resources>
+  <include location="../share/resources/tapeicon.qrc"/>
+ </resources>
+ <connections>
+  <connection>
+   <sender>buttonBox</sender>
+   <signal>accepted()</signal>
+   <receiver>DialogSetupMultisize</receiver>
+   <slot>accept()</slot>
+   <hints>
+    <hint type="sourcelabel">
+     <x>746</x>
+     <y>383</y>
+    </hint>
+    <hint type="destinationlabel">
+     <x>157</x>
+     <y>274</y>
+    </hint>
+   </hints>
+  </connection>
+  <connection>
+   <sender>buttonBox</sender>
+   <signal>rejected()</signal>
+   <receiver>DialogSetupMultisize</receiver>
+   <slot>reject()</slot>
+   <hints>
+    <hint type="sourcelabel">
+     <x>746</x>
+     <y>383</y>
+    </hint>
+    <hint type="destinationlabel">
+     <x>286</x>
+     <y>274</y>
+    </hint>
+   </hints>
+  </connection>
+ </connections>
+</ui>
diff --git a/src/app/tape/mapplication.cpp b/src/app/tape/mapplication.cpp
index f69427993..444b31152 100644
--- a/src/app/tape/mapplication.cpp
+++ b/src/app/tape/mapplication.cpp
@@ -216,7 +216,7 @@ inline void noisyFailureMsgHandler(QtMsgType type, const QMessageLogContext &con
             {
                 if (topWinAllowsPop)
                 {
-                    messageBox.setText(VAbstractApplication::ClearMessage(msg));
+                    messageBox.setText(msg);
                     messageBox.setStandardButtons(QMessageBox::Ok);
                     messageBox.setWindowModality(Qt::ApplicationModal);
                     messageBox.setModal(true);
@@ -599,96 +599,46 @@ void MApplication::ParseCommandLine(const SocketConnection &connection, const QS
     parser.addHelpOption();
     parser.addVersionOption();
     parser.addPositionalArgument("filename", tr("The measurement file."));
-    //-----
-    QCommandLineOption heightOption(QStringList() << "e" << "height",
-            tr("Open with the base height. Valid values: %1cm.")
-                                    .arg(VMeasurement::WholeListHeights(Unit::Cm).join(", ")),
-            tr("The base height"));
-    parser.addOption(heightOption);
-    //-----
-    QCommandLineOption sizeOption(QStringList() << "s" << "size",
-            tr("Open with the base size. Valid values: %1cm.").arg(VMeasurement::WholeListSizes(Unit::Cm).join(", ")),
-            tr("The base size"));
-    parser.addOption(sizeOption);
-    //-----
-    QCommandLineOption unitOption(QStringList() << "u" << "unit",
-            tr("Set pattern file unit: cm, mm, inch."),
-            tr("The pattern unit"));
-    parser.addOption(unitOption);
-    //-----
-    QCommandLineOption testOption(QStringList() << "test",
-            tr("Use for unit testing. Run the program and open a file without showing the main window."));
-    parser.addOption(testOption);
-    //-----
-    QCommandLineOption scalingOption(QStringList() << LONG_OPTION_NO_HDPI_SCALING,
-            tr("Disable high dpi scaling. Call this option if has problem with scaling (by default scaling enabled). "
-               "Alternatively you can use the %1 environment variable.").arg("QT_AUTO_SCREEN_SCALE_FACTOR=0"));
-    parser.addOption(scalingOption);
-    //-----
+
+    const QString LONG_OPTION_DIMENSION_A = QStringLiteral("dimensionA");
+    const QString SINGLE_OPTION_DIMENSION_A = QChar('a');
+
+    const QString LONG_OPTION_DIMENSION_B = QStringLiteral("dimensionB");
+    const QString SINGLE_OPTION_DIMENSION_B = QChar('b');
+
+    const QString LONG_OPTION_DIMENSION_C = QStringLiteral("dimensionC");
+    const QString SINGLE_OPTION_DIMENSION_C = QChar('c');
+
+    const QString LONG_OPTION_UNITS = QStringLiteral("units");
+    const QString SINGLE_OPTION_UNITS = QChar('u');
+
+    const QString LONG_OPTION_TEST = QStringLiteral("test");
+
+    parser.addOptions(
+    {
+        {{SINGLE_OPTION_DIMENSION_A, LONG_OPTION_DIMENSION_A}, tr("Set base for dimension A in the table units."),
+             tr("The dimension A base")},
+
+        {{SINGLE_OPTION_DIMENSION_B, LONG_OPTION_DIMENSION_B}, tr("Set base for dimension B in the table units."),
+             tr("The dimension B base")},
+
+        {{SINGLE_OPTION_DIMENSION_C, LONG_OPTION_DIMENSION_C}, tr("Set base for dimension C in the table units."),
+             tr("The dimension C base")},
+
+        {{SINGLE_OPTION_UNITS, LONG_OPTION_UNITS}, tr("Set pattern file units: cm, mm, inch."),
+             tr("The pattern units")},
+
+        {LONG_OPTION_TEST,
+             tr("Use for unit testing. Run the program and open a file without showing the main window.")},
+
+        {LONG_OPTION_NO_HDPI_SCALING,
+             tr("Disable high dpi scaling. Call this option if has problem with scaling (by default scaling enabled). "
+                "Alternatively you can use the %1 environment variable.").arg("QT_AUTO_SCREEN_SCALE_FACTOR=0")},
+    });
+
     parser.process(arguments);
 
-    bool flagHeight = false;
-    bool flagSize = false;
-    bool flagUnit = false;
-
-    int size = 0;
-    int height = 0;
-    Unit unit = Unit::Cm;
-
-    if (parser.isSet(heightOption))
-    {
-        const QString heightValue = parser.value(heightOption);
-        if (VMeasurement::IsGradationHeightValid(heightValue))
-        {
-            flagHeight = true;
-            height = heightValue.toInt();
-        }
-        else
-        {
-            qCCritical(mApp, "%s\n",
-                    qPrintable(tr("Invalid base height argument. Must be %1cm.")
-                               .arg(VMeasurement::WholeListHeights(Unit::Cm).join(", "))));
-            parser.showHelp(V_EX_USAGE);
-        }
-    }
-
-    if (parser.isSet(sizeOption))
-    {
-        const QString sizeValue = parser.value(sizeOption);
-        if (VMeasurement::IsGradationSizeValid(sizeValue))
-        {
-            flagSize = true;
-            size = sizeValue.toInt();
-        }
-        else
-        {
-            qCCritical(mApp, "%s\n",
-                    qPrintable(tr("Invalid base size argument. Must be %1cm.")
-                               .arg(VMeasurement::WholeListSizes(Unit::Cm).join(", "))));
-            parser.showHelp(V_EX_USAGE);
-        }
-    }
-
-    {
-    const QString unitValue = parser.value(unitOption);
-    if (not unitValue.isEmpty())
-    {
-
-        const QStringList units = QStringList() << unitMM << unitCM << unitINCH;
-        if (units.contains(unitValue))
-        {
-            flagUnit = true;
-            unit = StrToUnits(unitValue);
-        }
-        else
-        {
-            qCCritical(mApp, "%s\n", qPrintable(tr("Invalid base size argument. Must be cm, mm or inch.")));
-            parser.showHelp(V_EX_USAGE);
-        }
-    }
-    }
-
-    testMode = parser.isSet(testOption);
+    testMode = parser.isSet(LONG_OPTION_TEST);
 
     if (not testMode && connection == SocketConnection::Client)
     {
@@ -737,6 +687,84 @@ void MApplication::ParseCommandLine(const SocketConnection &connection, const QS
             parser.showHelp(V_EX_USAGE);
         }
 
+        bool flagDimensionA = false;
+        bool flagDimensionB = false;
+        bool flagDimensionC = false;
+        bool flagUnits = false;
+
+        int dimensionAValue = 0;
+        int dimensionBValue = 0;
+        int dimensionCValue = 0;
+        Unit unit = Unit::Cm;
+
+        if (parser.isSet(LONG_OPTION_DIMENSION_A))
+        {
+            const QString value = parser.value(LONG_OPTION_DIMENSION_A);
+
+            bool ok = false;
+            dimensionAValue = value.toInt(&ok);
+            if(ok && dimensionAValue > 0)
+            {
+                flagDimensionA = true;
+            }
+            else
+            {
+                qCCritical(mApp, "%s\n", qPrintable(tr("Invalid dimension A base value.")));
+                parser.showHelp(V_EX_USAGE);
+            }
+        }
+
+        if (parser.isSet(LONG_OPTION_DIMENSION_B))
+        {
+            const QString value = parser.value(LONG_OPTION_DIMENSION_B);
+
+            bool ok = false;
+            dimensionBValue = value.toInt(&ok);
+            if(ok && dimensionBValue > 0)
+            {
+                flagDimensionB = true;
+            }
+            else
+            {
+                qCCritical(mApp, "%s\n", qPrintable(tr("Invalid dimension B base value.")));
+                parser.showHelp(V_EX_USAGE);
+            }
+        }
+
+        if (parser.isSet(LONG_OPTION_DIMENSION_C))
+        {
+            const QString value = parser.value(LONG_OPTION_DIMENSION_C);
+
+            bool ok = false;
+            dimensionCValue = value.toInt(&ok);
+            if(ok && dimensionCValue > 0)
+            {
+                flagDimensionC = true;
+            }
+            else
+            {
+                qCCritical(mApp, "%s\n", qPrintable(tr("Invalid dimension C base value.")));
+                parser.showHelp(V_EX_USAGE);
+            }
+        }
+
+        {
+            const QString unitValue = parser.value(LONG_OPTION_UNITS);
+            if (not unitValue.isEmpty())
+            {
+                if (QStringList{unitMM, unitCM, unitINCH}.contains(unitValue))
+                {
+                    flagUnits = true;
+                    unit = StrToUnits(unitValue);
+                }
+                else
+                {
+                    qCCritical(mApp, "%s\n", qPrintable(tr("Invalid base size argument. Must be cm, mm or inch.")));
+                    parser.showHelp(V_EX_USAGE);
+                }
+            }
+        }
+
         for (auto &arg : args)
         {
             NewMainWindow();
@@ -750,17 +778,31 @@ void MApplication::ParseCommandLine(const SocketConnection &connection, const QS
                 continue;
             }
 
-            if (flagSize)
+            if (flagDimensionA)
             {
-                MainWindow()->SetBaseMSize(size);
+                if (not MainWindow()->SetDimensionABase(dimensionAValue))
+                {
+                    parser.showHelp(V_EX_USAGE);
+                }
             }
 
-            if (flagHeight)
+            if (flagDimensionB)
             {
-                MainWindow()->SetBaseMHeight(height);
+                if (not MainWindow()->SetDimensionBBase(dimensionBValue))
+                {
+                    parser.showHelp(V_EX_USAGE);
+                }
             }
 
-            if (flagUnit)
+            if (flagDimensionC)
+            {
+                if (not MainWindow()->SetDimensionCBase(dimensionCValue))
+                {
+                    parser.showHelp(V_EX_USAGE);
+                }
+            }
+
+            if (flagUnits)
             {
                 MainWindow()->SetPUnit(unit);
             }
diff --git a/src/app/tape/tape.pri b/src/app/tape/tape.pri
index 6f46e9e94..32d965def 100644
--- a/src/app/tape/tape.pri
+++ b/src/app/tape/tape.pri
@@ -2,6 +2,9 @@
 # This need for corect working file translations.pro
 
 SOURCES  += \
+    $$PWD/dialogs/dialogdimensionlabels.cpp \
+    $$PWD/dialogs/dialogmeasurementscsvcolumns.cpp \
+    $$PWD/dialogs/dialogrestrictdimension.cpp \
     $$PWD/main.cpp \
     $$PWD/tmainwindow.cpp \
     $$PWD/mapplication.cpp \
@@ -11,11 +14,15 @@ SOURCES  += \
     $$PWD/vlitepattern.cpp \
     $$PWD/dialogs/dialogtapepreferences.cpp \
     $$PWD/dialogs/configpages/tapepreferencesconfigurationpage.cpp \
-    $$PWD/dialogs/configpages/tapepreferencespathpage.cpp
+    $$PWD/dialogs/configpages/tapepreferencespathpage.cpp \
+    $$PWD/dialogs/dialogsetupmultisize.cpp
 
 *msvc*:SOURCES += $$PWD/stable.cpp
 
 HEADERS  += \
+    $$PWD/dialogs/dialogdimensionlabels.h \
+    $$PWD/dialogs/dialogmeasurementscsvcolumns.h \
+    $$PWD/dialogs/dialogrestrictdimension.h \
     $$PWD/tmainwindow.h \
     $$PWD/stable.h \
     $$PWD/mapplication.h \
@@ -26,13 +33,18 @@ HEADERS  += \
     $$PWD/vlitepattern.h \
     $$PWD/dialogs/dialogtapepreferences.h \
     $$PWD/dialogs/configpages/tapepreferencesconfigurationpage.h \
-    $$PWD/dialogs/configpages/tapepreferencespathpage.h
+    $$PWD/dialogs/configpages/tapepreferencespathpage.h \
+    $$PWD/dialogs/dialogsetupmultisize.h
 
 FORMS    += \
+    $$PWD/dialogs/dialogdimensionlabels.ui \
+    $$PWD/dialogs/dialogmeasurementscsvcolumns.ui \
+    $$PWD/dialogs/dialogrestrictdimension.ui \
     $$PWD/tmainwindow.ui \
     $$PWD/dialogs/dialogabouttape.ui \
     $$PWD/dialogs/dialognewmeasurements.ui \
     $$PWD/dialogs/dialogmdatabase.ui \
     $$PWD/dialogs/dialogtapepreferences.ui \
     $$PWD/dialogs/configpages/tapepreferencesconfigurationpage.ui \
-    $$PWD/dialogs/configpages/tapepreferencespathpage.ui
+    $$PWD/dialogs/configpages/tapepreferencespathpage.ui \
+    $$PWD/dialogs/dialogsetupmultisize.ui
diff --git a/src/app/tape/tmainwindow.cpp b/src/app/tape/tmainwindow.cpp
index 889f2e3b8..e02bdfe23 100644
--- a/src/app/tape/tmainwindow.cpp
+++ b/src/app/tape/tmainwindow.cpp
@@ -32,6 +32,10 @@
 #include "dialogs/dialognewmeasurements.h"
 #include "dialogs/dialogmdatabase.h"
 #include "dialogs/dialogtapepreferences.h"
+#include "dialogs/dialogsetupmultisize.h"
+#include "dialogs/dialogrestrictdimension.h"
+#include "dialogs/dialogdimensionlabels.h"
+#include "dialogs/dialogmeasurementscsvcolumns.h"
 #include "../vpatterndb/vcontainer.h"
 #include "../vpatterndb/calculator.h"
 #include "../vpatterndb/pmsystems.h"
@@ -63,6 +67,7 @@
 #include <QProcess>
 #include <QtNumeric>
 #include <QTextCodec>
+#include <QTimer>
 
 #if defined(Q_OS_MAC)
 #include <QMimeData>
@@ -79,33 +84,30 @@ Q_LOGGING_CATEGORY(tMainWindow, "t.mainwindow")
 
 QT_WARNING_POP
 
+namespace
+{
+enum class MUnits : qint8 { Table, Degrees};
+}
+
 // We need this enum in case we will add or delete a column. And also make code more readable.
-enum {ColumnName = 0, ColumnFullName, ColumnCalcValue, ColumnFormula, ColumnBaseValue, ColumnInSizes, ColumnInHeights};
+enum {
+    ColumnName = 0,
+    ColumnFullName = 1,
+    ColumnCalcValue = 2,
+    ColumnFormula = 3,
+    ColumnBaseValue = 4,
+    ColumnShiftA = 5,
+    ColumnShiftB = 6,
+    ColumnShiftC = 7,
+    ColumnCorrection = 8
+};
 
 //---------------------------------------------------------------------------------------------------------------------
 TMainWindow::TMainWindow(QWidget *parent)
     : VAbstractMainWindow(parent),
       ui(new Ui::TMainWindow),
-      m(nullptr),
-      data(nullptr),
-      mUnit(Unit::Cm),
-      pUnit(Unit::Cm),
-      mType(MeasurementsType::Individual),
-      currentSize(0),
-      currentHeight(0),
-      curFile(),
-      gradationHeights(nullptr),
-      gradationSizes(nullptr),
-      comboBoxUnits(nullptr),
       formulaBaseHeight(0),
-      lock(nullptr),
-      search(),
-      labelGradationHeights(nullptr),
-      labelGradationSizes(nullptr),
-      labelPatternUnit(nullptr),
-      isInitialized(false),
-      mIsReadOnly(false),
-      hackedWidgets()
+      gradation(new QTimer(this))
 {
     ui->setupUi(this);
 
@@ -128,6 +130,8 @@ TMainWindow::TMainWindow(QWidget *parent)
 
     m_recentFileActs.fill(nullptr);
 
+    connect(gradation, &QTimer::timeout, this, &TMainWindow::GradationChanged);
+
     SetupMenu();
     UpdateWindowTitle();
     ReadSettings();
@@ -174,45 +178,79 @@ void TMainWindow::RetranslateTable()
 }
 
 //---------------------------------------------------------------------------------------------------------------------
-void TMainWindow::SetBaseMHeight(int height)
+bool TMainWindow::SetDimensionABase(int base)
 {
-    if (m != nullptr)
+    const QList<MeasurementDimension_p> dimensions = m->Dimensions().values();
+
+    if (dimensions.isEmpty())
     {
-        if (mType == MeasurementsType::Multisize)
-        {
-            const int row = ui->tableWidget->currentRow();
-            currentHeight = UnitConvertor(height, Unit::Cm, mUnit);
-
-            gradationHeights->blockSignals(true);
-            SetDefaultHeight(static_cast<int>(currentHeight));
-            gradationHeights->blockSignals(false);
-
-            RefreshData();
-            search->RefreshList(ui->lineEditFind->text());
-            ui->tableWidget->selectRow(row);
-        }
+        qCCritical(tMainWindow, "%s\n", qPrintable(tr("The table doesn't provide dimensions")));
+        return false;
     }
+
+    const qint32 i = gradationDimensionA->findData(base);
+    if (i != -1)
+    {
+        gradationDimensionA->setCurrentIndex(i);
+    }
+
+    if (base != currentDimensionA)
+    {
+        qCCritical(tMainWindow, "%s\n", qPrintable(tr("Invalid base value for dimension A")));
+        return false;
+    }
+    return true;
 }
 
 //---------------------------------------------------------------------------------------------------------------------
-void TMainWindow::SetBaseMSize(int size)
+bool TMainWindow::SetDimensionBBase(int base)
 {
-    if (m != nullptr)
+    const QList<MeasurementDimension_p> dimensions = m->Dimensions().values();
+
+    if (dimensions.size() <= 1)
     {
-        if (mType == MeasurementsType::Multisize)
-        {
-            const int row = ui->tableWidget->currentRow();
-            currentSize = UnitConvertor(size, Unit::Cm, mUnit);
-
-            gradationSizes->blockSignals(true);
-            SetDefaultSize(static_cast<int>(currentSize));
-            gradationSizes->blockSignals(false);
-
-            RefreshData();
-            search->RefreshList(ui->lineEditFind->text());
-            ui->tableWidget->selectRow(row);
-        }
+        qCCritical(tMainWindow, "%s\n", qPrintable(tr("The table doesn't support dimension B")));
+        return false;
     }
+
+    const qint32 i = gradationDimensionB->findData(base);
+    if (i != -1)
+    {
+        gradationDimensionB->setCurrentIndex(i);
+    }
+
+    if (base != currentDimensionB)
+    {
+        qCCritical(tMainWindow, "%s\n", qPrintable(tr("Invalid base value for dimension B")));
+        return false;
+    }
+
+    return true;
+}
+
+//---------------------------------------------------------------------------------------------------------------------
+bool TMainWindow::SetDimensionCBase(int base)
+{
+    const QList<MeasurementDimension_p> dimensions = m->Dimensions().values();
+
+    if (dimensions.size() <= 2)
+    {
+        qCCritical(tMainWindow, "%s\n", qPrintable(tr("The table doesn't support dimension C")));
+        return false;
+    }
+
+    const qint32 i = gradationDimensionC->findData(base);
+    if (i != -1)
+    {
+        gradationDimensionC->setCurrentIndex(i);
+    }
+
+    if (base != currentDimensionC)
+    {
+        qCCritical(tMainWindow, "%s\n", qPrintable(tr("Invalid base value for dimension C")));
+        return false;
+    }
+    return true;
 }
 
 //---------------------------------------------------------------------------------------------------------------------
@@ -297,8 +335,9 @@ bool TMainWindow::LoadFile(const QString &path)
             mUnit = m->MUnit();
             pUnit = mUnit;
 
-            currentSize = m->BaseSize();
-            currentHeight = m->BaseHeight();
+            currentDimensionA = m->DimensionABase();
+            currentDimensionB = m->DimensionBBase();
+            currentDimensionC = m->DimensionCBase();
 
             ui->labelToolTip->setVisible(false);
             ui->tabWidget->setVisible(true);
@@ -371,18 +410,27 @@ void TMainWindow::FileNew()
         pUnit = mUnit;
         mType = measurements.Type();
 
-        data = new VContainer(qApp->TrVars(), &mUnit, VContainer::UniqueNamespace());
-        currentHeight = measurements.BaseHeight();
-        currentSize = measurements.BaseSize();
-
         if (mType == MeasurementsType::Multisize)
         {
-            m = new VMeasurements(mUnit, measurements.BaseSize(), measurements.BaseHeight(), data);
+            DialogSetupMultisize setup(mUnit, this);
+            if (setup.exec() == QDialog::Rejected)
+            {
+                return;
+            }
+
+            data = new VContainer(qApp->TrVars(), &mUnit, VContainer::UniqueNamespace());
+
+            m = new VMeasurements(mUnit, setup.Dimensions(), data);
+            m->SetFullCircumference(setup.FullCircumference());
             m_curFileFormatVersion = VVSTConverter::MeasurementMaxVer;
             m_curFileFormatVersionStr = VVSTConverter::MeasurementMaxVerStr;
+
+            SetCurrentDimensionValues();
         }
         else
         {
+            data = new VContainer(qApp->TrVars(), &mUnit, VContainer::UniqueNamespace());
+
             m = new VMeasurements(mUnit, data);
             m_curFileFormatVersion = VVITConverter::MeasurementMaxVer;
             m_curFileFormatVersionStr = VVITConverter::MeasurementMaxVerStr;
@@ -553,16 +601,15 @@ void TMainWindow::changeEvent(QEvent *event)
         // retranslate designer form (single inheritance approach)
         ui->retranslateUi(this);
 
+        InitMeasurementUnits();
+
         if (mType == MeasurementsType::Multisize)
         {
             ui->labelMType->setText(tr("Multisize measurements"));
-            ui->labelBaseSizeValue->setText(QString().setNum(m->BaseSize()) + QChar(QChar::Space) +
-                                            UnitsToStr(m->MUnit(), true));
-            ui->labelBaseHeightValue->setText(QString().setNum(m->BaseHeight()) + QChar(QChar::Space) +
-                                              UnitsToStr(m->MUnit(), true));
 
-            labelGradationHeights->setText(tr("Height (%1):").arg(UnitsToStr(mUnit)));
-            labelGradationSizes->setText(tr("Size (%1):").arg(UnitsToStr(mUnit)));
+            InitDimensionsBaseValue();
+            InitDimensionControls();
+            InitDimesionShifts();
         }
         else
         {
@@ -574,6 +621,8 @@ void TMainWindow::changeEvent(QEvent *event)
             InitGender(ui->comboBoxGender);
             ui->comboBoxGender->setCurrentIndex(index);
             ui->comboBoxGender->blockSignals(false);
+
+            InitMeasurementDimension();
         }
 
         {
@@ -586,7 +635,7 @@ void TMainWindow::changeEvent(QEvent *event)
         }
 
         {
-            labelPatternUnit = new QLabel(tr("Pattern unit:"));
+            labelPatternUnit->setText(tr("Pattern unit:"));
 
             if (comboBoxUnits != nullptr)
             {
@@ -974,16 +1023,34 @@ void TMainWindow::ImportDataFromCSV()
         qApp->Settings()->SetCSVCodec(dialog.GetSelectedMib());
         qApp->Settings()->SetCSVWithHeader(dialog.IsWithHeader());
 
-        QxtCsvModel csv(fileName, nullptr, dialog.IsWithHeader(), dialog.GetSeparator(),
-                        QTextCodec::codecForMib(dialog.GetSelectedMib()));
-
-        if (m->Type() == MeasurementsType::Individual)
+        QSharedPointer<DialogMeasurementsCSVColumns> columns;
+        if (m->Type() == MeasurementsType::Multisize)
         {
-            ImportIndividualMeasurements(csv);
+            const QList<MeasurementDimension_p> dimensions = m->Dimensions().values();
+            columns = QSharedPointer<DialogMeasurementsCSVColumns>::create(fileName, m->Type(), dimensions, this);
         }
         else
         {
-            ImportMultisizeMeasurements(csv);
+            columns = QSharedPointer<DialogMeasurementsCSVColumns>::create(fileName, m->Type(), this);
+        }
+        columns->SetWithHeader(dialog.IsWithHeader());
+        columns->SetSeparator(dialog.GetSeparator());
+        columns->SetCodec(QTextCodec::codecForMib(dialog.GetSelectedMib()));
+
+        if (columns->exec() == QDialog::Accepted)
+        {
+            QxtCsvModel csv(fileName, nullptr, dialog.IsWithHeader(), dialog.GetSeparator(),
+                            QTextCodec::codecForMib(dialog.GetSelectedMib()));
+            const QVector<int> map = columns->ColumnsMap();
+
+            if (m->Type() == MeasurementsType::Individual)
+            {
+                ImportIndividualMeasurements(csv, map);
+            }
+            else
+            {
+                ImportMultisizeMeasurements(csv, map);
+            }
         }
     }
 }
@@ -1131,22 +1198,32 @@ void TMainWindow::Remove()
         ui->lineEditFullName->setText(QString());
         ui->lineEditFullName->blockSignals(false);
 
+        ui->comboBoxMUnits->blockSignals(true);
+        ui->comboBoxMUnits->setCurrentIndex(-1);
+        ui->comboBoxMUnits->blockSignals(false);
+
         if (mType == MeasurementsType::Multisize)
         {
             ui->labelCalculatedValue->blockSignals(true);
             ui->doubleSpinBoxBaseValue->blockSignals(true);
-            ui->doubleSpinBoxInSizes->blockSignals(true);
-            ui->doubleSpinBoxInHeights->blockSignals(true);
+            ui->doubleSpinBoxCorrection->blockSignals(true);
+            ui->doubleSpinBoxShiftA->blockSignals(true);
+            ui->doubleSpinBoxShiftB->blockSignals(true);
+            ui->doubleSpinBoxShiftC->blockSignals(true);
 
             ui->labelCalculatedValue->setText(QString());
             ui->doubleSpinBoxBaseValue->setValue(0);
-            ui->doubleSpinBoxInSizes->setValue(0);
-            ui->doubleSpinBoxInHeights->setValue(0);
+            ui->doubleSpinBoxCorrection->setValue(0);
+            ui->doubleSpinBoxShiftA->setValue(0);
+            ui->doubleSpinBoxShiftB->setValue(0);
+            ui->doubleSpinBoxShiftC->setValue(0);
 
             ui->labelCalculatedValue->blockSignals(false);
             ui->doubleSpinBoxBaseValue->blockSignals(false);
-            ui->doubleSpinBoxInSizes->blockSignals(false);
-            ui->doubleSpinBoxInHeights->blockSignals(false);
+            ui->doubleSpinBoxCorrection->blockSignals(false);
+            ui->doubleSpinBoxShiftA->blockSignals(false);
+            ui->doubleSpinBoxShiftB->blockSignals(false);
+            ui->doubleSpinBoxShiftC->blockSignals(false);
         }
         else
         {
@@ -1453,20 +1530,54 @@ void TMainWindow::ImportFromPattern()
 }
 
 //---------------------------------------------------------------------------------------------------------------------
-void TMainWindow::ChangedSize(const QString &text)
+void TMainWindow::DimensionABaseChanged()
 {
-    const int row = ui->tableWidget->currentRow();
-    currentSize = text.toInt();
-    RefreshData();
-    search->RefreshList(ui->lineEditFind->text());
-    ui->tableWidget->selectRow(row);
+    currentDimensionA = gradationDimensionA->currentData().toInt();
+
+    const QList<MeasurementDimension_p> dimensions = m->Dimensions().values();
+    if (dimensions.size() > 1)
+    {
+        MeasurementDimension_p dimension = dimensions.at(1);
+        InitDimensionGradation(1, dimension, gradationDimensionB);
+
+        if (dimensions.size() > 2)
+        {
+            dimension = dimensions.at(2);
+            InitDimensionGradation(2, dimension, gradationDimensionC);
+        }
+    }
+
+    gradation->start();
 }
 
 //---------------------------------------------------------------------------------------------------------------------
-void TMainWindow::ChangedHeight(const QString &text)
+void TMainWindow::DimensionBBaseChanged()
 {
+    currentDimensionB = gradationDimensionB->currentData().toInt();
+
+    const QList<MeasurementDimension_p> dimensions = m->Dimensions().values();
+
+    if (dimensions.size() > 2)
+    {
+        MeasurementDimension_p dimension = dimensions.at(2);
+        InitDimensionGradation(2, dimension, gradationDimensionC);
+    }
+
+    gradation->start();
+}
+
+//---------------------------------------------------------------------------------------------------------------------
+void TMainWindow::DimensionCBaseChanged()
+{
+    currentDimensionC = gradationDimensionC->currentData().toInt();
+    gradation->start();
+}
+
+//---------------------------------------------------------------------------------------------------------------------
+void TMainWindow::GradationChanged()
+{
+    gradation->stop();
     const int row = ui->tableWidget->currentRow();
-    currentHeight = text.toInt();
     RefreshData();
     search->RefreshList(ui->lineEditFind->text());
     ui->tableWidget->selectRow(row);
@@ -1529,33 +1640,57 @@ void TMainWindow::ShowNewMData(bool fresh)
         connect(ui->lineEditName, &QLineEdit::textEdited, this, &TMainWindow::SaveMName);
         ui->plainTextEditDescription->blockSignals(false);
 
+        ui->comboBoxMUnits->blockSignals(true);
+        ui->comboBoxMUnits->setCurrentIndex(
+            ui->comboBoxMUnits->findData(static_cast<int>(meash->IsSpecialUnits() ? MUnits::Degrees : MUnits::Table)));
+        ui->comboBoxMUnits->blockSignals(false);
+
         if (mType == MeasurementsType::Multisize)
         {
             ui->labelCalculatedValue->blockSignals(true);
             ui->doubleSpinBoxBaseValue->blockSignals(true);
-            ui->doubleSpinBoxInSizes->blockSignals(true);
-            ui->doubleSpinBoxInHeights->blockSignals(true);
+            ui->doubleSpinBoxCorrection->blockSignals(true);
+            ui->doubleSpinBoxShiftA->blockSignals(true);
+            ui->doubleSpinBoxShiftB->blockSignals(true);
+            ui->doubleSpinBoxShiftC->blockSignals(true);
 
-            const QString postfix = UnitsToStr(pUnit);//Show unit in dialog lable (cm, mm or inch)
-            const qreal value = UnitConvertor(*data->DataVariables()->value(meash->GetName())->GetValue(), mUnit,
-                                              pUnit);
-            ui->labelCalculatedValue->setText(qApp->LocaleToString(value) + QChar(QChar::Space) +postfix);
+            QString calculatedValue;
+
+            if (meash->IsSpecialUnits())
+            {
+                const qreal value = *data->DataVariables()->value(meash->GetName())->GetValue();
+                calculatedValue = qApp->LocaleToString(value) + QChar(QChar::Space) + degreeSymbol;
+            }
+            else
+            {
+                const QString postfix = UnitsToStr(pUnit);//Show unit in dialog lable (cm, mm or inch)
+                const qreal value = UnitConvertor(*data->DataVariables()->value(meash->GetName())->GetValue(), mUnit,
+                                                  pUnit);
+                calculatedValue = qApp->LocaleToString(value) + QChar(QChar::Space) + postfix;
+            }
+            ui->labelCalculatedValue->setText(calculatedValue);
 
             if (fresh)
             {
                 ui->doubleSpinBoxBaseValue->setValue(meash->GetBase());
-                ui->doubleSpinBoxInSizes->setValue(meash->GetKsize());
-                ui->doubleSpinBoxInHeights->setValue(meash->GetKheight());
+                ui->doubleSpinBoxCorrection->setValue(
+                    meash->GetCorrection(currentDimensionA, currentDimensionB, currentDimensionC));
+                ui->doubleSpinBoxShiftA->setValue(meash->GetShiftA());
+                ui->doubleSpinBoxShiftB->setValue(meash->GetShiftB());
+                ui->doubleSpinBoxShiftC->setValue(meash->GetShiftC());
             }
 
             ui->labelCalculatedValue->blockSignals(false);
             ui->doubleSpinBoxBaseValue->blockSignals(false);
-            ui->doubleSpinBoxInSizes->blockSignals(false);
-            ui->doubleSpinBoxInHeights->blockSignals(false);
+            ui->doubleSpinBoxCorrection->blockSignals(false);
+            ui->doubleSpinBoxShiftA->blockSignals(false);
+            ui->doubleSpinBoxShiftB->blockSignals(false);
+            ui->doubleSpinBoxShiftC->blockSignals(false);
         }
         else
         {
-            EvalFormula(meash->GetFormula(), false, meash->GetData(), ui->labelCalculatedValue);
+            EvalFormula(meash->GetFormula(), false, meash->GetData(), ui->labelCalculatedValue,
+                        meash->IsSpecialUnits());
 
             ui->plainTextEditFormula->blockSignals(true);
 
@@ -1563,6 +1698,11 @@ void TMainWindow::ShowNewMData(bool fresh)
 
             ui->plainTextEditFormula->setPlainText(formula);
             ui->plainTextEditFormula->blockSignals(false);
+
+            ui->comboBoxDimension->blockSignals(true);
+            ui->comboBoxDimension->setCurrentIndex(
+                ui->comboBoxDimension->findData(static_cast<int>(meash->GetDimension())));
+            ui->comboBoxDimension->blockSignals(false);
         }
 
         MeasurementGUI();
@@ -1734,7 +1874,7 @@ void TMainWindow::SaveMValue()
         return;
     }
 
-    if (not EvalFormula(text, true, meash->GetData(), ui->labelCalculatedValue))
+    if (not EvalFormula(text, true, meash->GetData(), ui->labelCalculatedValue, meash->IsSpecialUnits()))
     {
         return;
     }
@@ -1790,7 +1930,7 @@ void TMainWindow::SaveMBaseValue(double value)
 }
 
 //---------------------------------------------------------------------------------------------------------------------
-void TMainWindow::SaveMSizeIncrease(double value)
+void TMainWindow::SaveMShiftA(double value)
 {
     const int row = ui->tableWidget->currentRow();
 
@@ -1800,7 +1940,7 @@ void TMainWindow::SaveMSizeIncrease(double value)
     }
 
     const QTableWidgetItem *nameField = ui->tableWidget->item(ui->tableWidget->currentRow(), ColumnName);
-    m->SetMSizeIncrease(nameField->data(Qt::UserRole).toString(), value);
+    m->SetMShiftA(nameField->data(Qt::UserRole).toString(), value);
 
     MeasurementsWereSaved(false);
 
@@ -1815,7 +1955,7 @@ void TMainWindow::SaveMSizeIncrease(double value)
 }
 
 //---------------------------------------------------------------------------------------------------------------------
-void TMainWindow::SaveMHeightIncrease(double value)
+void TMainWindow::SaveMShiftB(double value)
 {
     const int row = ui->tableWidget->currentRow();
 
@@ -1825,7 +1965,58 @@ void TMainWindow::SaveMHeightIncrease(double value)
     }
 
     const QTableWidgetItem *nameField = ui->tableWidget->item(ui->tableWidget->currentRow(), ColumnName);
-    m->SetMHeightIncrease(nameField->data(Qt::UserRole).toString(), value);
+    m->SetMShiftB(nameField->data(Qt::UserRole).toString(), value);
+
+    MeasurementsWereSaved(false);
+
+    RefreshData();
+    search->RefreshList(ui->lineEditFind->text());
+
+    ui->tableWidget->blockSignals(true);
+    ui->tableWidget->selectRow(row);
+    ui->tableWidget->blockSignals(false);
+
+    ShowNewMData(false);
+}
+
+//---------------------------------------------------------------------------------------------------------------------
+void TMainWindow::SaveMShiftC(double value)
+{
+    const int row = ui->tableWidget->currentRow();
+
+    if (row == -1)
+    {
+        return;
+    }
+
+    const QTableWidgetItem *nameField = ui->tableWidget->item(ui->tableWidget->currentRow(), ColumnName);
+    m->SetMShiftC(nameField->data(Qt::UserRole).toString(), value);
+
+    MeasurementsWereSaved(false);
+
+    RefreshData();
+    search->RefreshList(ui->lineEditFind->text());
+
+    ui->tableWidget->blockSignals(true);
+    ui->tableWidget->selectRow(row);
+    ui->tableWidget->blockSignals(false);
+
+    ShowNewMData(false);
+}
+
+//---------------------------------------------------------------------------------------------------------------------
+void TMainWindow::SaveMCorrectionValue(double value)
+{
+    const int row = ui->tableWidget->currentRow();
+
+    if (row == -1)
+    {
+        return;
+    }
+
+    const QTableWidgetItem *nameField = ui->tableWidget->item(ui->tableWidget->currentRow(), ColumnName);
+    m->SetMCorrectionValue(nameField->data(Qt::UserRole).toString(),
+                           currentDimensionA, currentDimensionB, currentDimensionC, value);
 
     MeasurementsWereSaved(false);
 
@@ -1911,6 +2102,205 @@ void TMainWindow::SaveMFullName()
     }
 }
 
+//---------------------------------------------------------------------------------------------------------------------
+void TMainWindow::SaveMUnits()
+{
+    const int row = ui->tableWidget->currentRow();
+
+    if (row == -1)
+    {
+        return;
+    }
+
+    const QTableWidgetItem *nameField = ui->tableWidget->item(ui->tableWidget->currentRow(), ColumnName);
+    const MUnits units = static_cast<MUnits>(ui->comboBoxMUnits->currentData().toInt());
+    m->SetMSpecialUnits(nameField->data(Qt::UserRole).toString(), units == MUnits::Degrees);
+
+    MeasurementsWereSaved(false);
+
+    RefreshData();
+    search->RefreshList(ui->lineEditFind->text());
+
+    ui->tableWidget->blockSignals(true);
+    ui->tableWidget->selectRow(row);
+    ui->tableWidget->blockSignals(false);
+
+    ShowNewMData(false);
+}
+
+//---------------------------------------------------------------------------------------------------------------------
+void TMainWindow::SaveMDimension()
+{
+    const int row = ui->tableWidget->currentRow();
+
+    if (row == -1)
+    {
+        return;
+    }
+
+    const QTableWidgetItem *nameField = ui->tableWidget->item(ui->tableWidget->currentRow(), ColumnName);
+    const IMD dimension = static_cast<IMD>(ui->comboBoxDimension->currentData().toInt());
+    m->SetMDimension(nameField->data(Qt::UserRole).toString(), dimension);
+
+    MeasurementsWereSaved(false);
+
+    RefreshData();
+    search->RefreshList(ui->lineEditFind->text());
+
+    ui->tableWidget->blockSignals(true);
+    ui->tableWidget->selectRow(row);
+    ui->tableWidget->blockSignals(false);
+
+    ShowNewMData(false);
+}
+
+//---------------------------------------------------------------------------------------------------------------------
+void TMainWindow::FullCircumferenceChanged(bool checked)
+{
+    m->SetFullCircumference(checked);
+    MeasurementsWereSaved(false);
+    InitDimensionsBaseValue();
+    InitDimensionControls();
+}
+
+//---------------------------------------------------------------------------------------------------------------------
+void TMainWindow::ExportToIndividual()
+{
+    QString dir;
+    if (curFile.isEmpty())
+    {
+        dir = qApp->TapeSettings()->GetPathIndividualMeasurements();
+    }
+    else
+    {
+        dir = QFileInfo(curFile).absolutePath();
+    }
+
+    bool usedNotExistedDir = false;
+    QDir directory(dir);
+    if (not directory.exists())
+    {
+        usedNotExistedDir = directory.mkpath(QChar('.'));
+    }
+
+    QString filters = tr("Individual measurements") + QStringLiteral(" (*.vit)");
+    QString fName = tr("measurements.vit");
+    QString fileName = QFileDialog::getSaveFileName(this, tr("Export to individual"), dir + QChar('/') + fName,
+                                                    filters);
+
+    auto RemoveTempDir = qScopeGuard([usedNotExistedDir, dir]()
+                                     {
+                                         if (usedNotExistedDir)
+                                         {
+                                             QDir(dir).rmpath(QChar('.'));
+                                         }
+                                     });
+
+    if (fileName.isEmpty())
+    {
+        return;
+    }
+
+    QString suffix = QStringLiteral("vit");
+    QFileInfo f( fileName );
+    if (f.suffix().isEmpty() && f.suffix() != suffix)
+    {
+        fileName += QChar('.') + suffix;
+    }
+
+    QScopedPointer<VContainer> tmpData(new VContainer(qApp->TrVars(), &mUnit, VContainer::UniqueNamespace()));
+
+    VMeasurements individualMeasurements(mUnit, tmpData.data());
+
+    const QMap<int, QSharedPointer<VMeasurement> > orderedTable = OrderedMeasurments();
+    QMap<int, QSharedPointer<VMeasurement> >::const_iterator iMap;
+    for (iMap = orderedTable.constBegin(); iMap != orderedTable.constEnd(); ++iMap)
+    {
+        const QSharedPointer<VMeasurement> &meash = iMap.value();
+        individualMeasurements.AddEmpty(meash->GetName());
+        individualMeasurements.SetMValue(meash->GetName(), QString::number(*meash->GetValue()));
+        individualMeasurements.SetMSpecialUnits(meash->GetName(), meash->IsSpecialUnits());
+        if (meash->IsCustom())
+        {
+            individualMeasurements.SetMDescription(meash->GetName(), meash->GetDescription());
+            individualMeasurements.SetMFullName(meash->GetName(), meash->GetGuiText());
+        }
+    }
+
+    QString error;
+    const bool result = individualMeasurements.SaveDocument(fileName, error);
+    if (not result)
+    {
+        QMessageBox messageBox;
+        messageBox.setIcon(QMessageBox::Warning);
+        messageBox.setInformativeText(tr("Could not save the file"));
+        messageBox.setDefaultButton(QMessageBox::Ok);
+        messageBox.setDetailedText(error);
+        messageBox.setStandardButtons(QMessageBox::Ok);
+        messageBox.exec();
+        return;
+    }
+}
+
+//---------------------------------------------------------------------------------------------------------------------
+void TMainWindow::RestrictSecondDimesion()
+{
+    const QList<MeasurementDimension_p> dimensions = m->Dimensions().values();
+    const QMap<QString, QPair<int, int>> restrictions = m->GetRestrictions();
+
+    bool oneDimesionRestriction = true;
+    bool fullCircumference = m->IsFullCircumference();
+
+    DialogRestrictDimension dialog(dimensions, restrictions, oneDimesionRestriction, fullCircumference, this);
+    if (dialog.exec() == QDialog::Rejected)
+    {
+        return;
+    }
+
+    m->SetRestrictions(dialog.Restrictions());
+    MeasurementsWereSaved(false);
+    DimensionABaseChanged(); // trigger refresh
+}
+
+//---------------------------------------------------------------------------------------------------------------------
+void TMainWindow::RestrictThirdDimesion()
+{
+    const QList<MeasurementDimension_p> dimensions = m->Dimensions().values();
+    const QMap<QString, QPair<int, int>> restrictions = m->GetRestrictions();
+
+    bool oneDimesionRestriction = false;
+    bool fullCircumference = m->IsFullCircumference();
+
+    DialogRestrictDimension dialog(dimensions, restrictions, oneDimesionRestriction, fullCircumference, this);
+    if (dialog.exec() == QDialog::Rejected)
+    {
+        return;
+    }
+
+    m->SetRestrictions(dialog.Restrictions());
+    MeasurementsWereSaved(false);
+    DimensionABaseChanged(); // trigger refresh
+}
+
+//---------------------------------------------------------------------------------------------------------------------
+void TMainWindow::EditDimensionLabels()
+{
+    const QMap<MeasurementDimension, MeasurementDimension_p > dimensions = m->Dimensions();
+
+    DialogDimensionLabels dialog(dimensions, m->IsFullCircumference(), this);
+    if (dialog.exec() == QDialog::Rejected)
+    {
+        return;
+    }
+
+    m->SetDimensionLabels(dialog.Labels());
+
+    MeasurementsWereSaved(false);
+
+    InitDimensionsBaseValue();
+    InitDimensionControls();
+}
+
 //---------------------------------------------------------------------------------------------------------------------
 void TMainWindow::SetupMenu()
 {
@@ -2011,18 +2401,18 @@ void TMainWindow::InitWindow()
     SCASSERT(m != nullptr)
     ui->labelToolTip->setVisible(false);
     ui->tabWidget->setVisible(true);
-    ui->tabWidget->setCurrentIndex(0);
+    ui->tabWidget->setCurrentIndex(0); // measurements
 
     ui->plainTextEditNotes->setEnabled(true);
     ui->toolBarGradation->setVisible(true);
 
     if (mType == MeasurementsType::Multisize)
     {
+        InitMenu();
         ui->labelMType->setText(tr("Multisize measurements"));
-        ui->labelBaseSizeValue->setText(QString().setNum(m->BaseSize()) + QChar(QChar::Space) +
-                                        UnitsToStr(m->MUnit(), true));
-        ui->labelBaseHeightValue->setText(QString().setNum(m->BaseHeight()) + QChar(QChar::Space) +
-                                          UnitsToStr(m->MUnit(), true));
+
+        InitDimensionsBaseValue();
+        HackDimensionBaseValue();
 
         // Because Qt Designer doesn't know about our deleting we will create empty objects for correct
         // working the retranslation UI
@@ -2032,6 +2422,8 @@ void TMainWindow::InitWindow()
         HackWidget(&ui->toolButtonExpr);
         HackWidget(&ui->labelFormula);
         HackWidget(&ui->pushButtonGrow);
+        HackWidget(&ui->labelDimension);
+        HackWidget(&ui->comboBoxDimension);
 
         // Tab Information
         HackWidget(&ui->lineEditCustomerName);
@@ -2043,27 +2435,25 @@ void TMainWindow::InitWindow()
         HackWidget(&ui->labelGender);
         HackWidget(&ui->labelEmail);
 
-        const QStringList listHeights = VMeasurement::WholeListHeights(mUnit);
-        const QStringList listSizes = VMeasurement::WholeListSizes(mUnit);
+        InitDimensionControls();
+        ShowDimensionControls();
+        SetDimensionBases();
 
-        labelGradationHeights = new QLabel(tr("Height (%1):").arg(UnitsToStr(mUnit)));
-        gradationHeights = SetGradationList(labelGradationHeights, listHeights);
-        SetDefaultHeight(static_cast<int>(data->height()));
-        connect(gradationHeights, &QComboBox::currentTextChanged,
-                this, &TMainWindow::ChangedHeight);
-
-        labelGradationSizes = new QLabel(tr("Size (%1):").arg(UnitsToStr(mUnit)));
-        gradationSizes = SetGradationList(labelGradationSizes, listSizes);
-        SetDefaultSize(static_cast<int>(data->size()));
-        connect(gradationSizes, &QComboBox::currentTextChanged,
-                this, &TMainWindow::ChangedSize);
+        InitDimesionShifts();
 
         connect(ui->doubleSpinBoxBaseValue, QOverload<double>::of(&QDoubleSpinBox::valueChanged),
                 this, &TMainWindow::SaveMBaseValue);
-        connect(ui->doubleSpinBoxInSizes, QOverload<double>::of(&QDoubleSpinBox::valueChanged),
-                this, &TMainWindow::SaveMSizeIncrease);
-        connect(ui->doubleSpinBoxInHeights, QOverload<double>::of(&QDoubleSpinBox::valueChanged),
-                this, &TMainWindow::SaveMHeightIncrease);
+        connect(ui->doubleSpinBoxCorrection, QOverload<double>::of(&QDoubleSpinBox::valueChanged),
+                this, &TMainWindow::SaveMCorrectionValue);
+
+        connect(ui->doubleSpinBoxShiftA, QOverload<double>::of(&QDoubleSpinBox::valueChanged),
+                this, &TMainWindow::SaveMShiftA);
+        connect(ui->doubleSpinBoxShiftB, QOverload<double>::of(&QDoubleSpinBox::valueChanged),
+                this, &TMainWindow::SaveMShiftB);
+        connect(ui->doubleSpinBoxShiftC, QOverload<double>::of(&QDoubleSpinBox::valueChanged),
+                this, &TMainWindow::SaveMShiftC);
+
+        HackDimensionShifts();
 
         SetDecimals();
     }
@@ -2078,17 +2468,15 @@ void TMainWindow::InitWindow()
 
         // Tab Measurements
         HackWidget(&ui->doubleSpinBoxBaseValue);
-        HackWidget(&ui->doubleSpinBoxInSizes);
-        HackWidget(&ui->doubleSpinBoxInHeights);
+        HackWidget(&ui->doubleSpinBoxCorrection);
         HackWidget(&ui->labelBaseValue);
-        HackWidget(&ui->labelInSizes);
-        HackWidget(&ui->labelInHeights);
+        HackWidget(&ui->labelCorrection);
+        HackDimensionShifts();
 
         // Tab Information
-        HackWidget(&ui->labelBaseSize);
-        HackWidget(&ui->labelBaseSizeValue);
-        HackWidget(&ui->labelBaseHeight);
-        HackWidget(&ui->labelBaseHeightValue);
+        HackDimensionBaseValue();
+        HackWidget(&ui->frameBaseValue);
+        HackWidget(&ui->labelBaseValues);
 
         ui->lineEditCustomerName->setText(m->Customer());
 
@@ -2118,6 +2506,10 @@ void TMainWindow::InitWindow()
                 Qt::UniqueConnection);
 
         connect(ui->toolButtonExpr, &QToolButton::clicked, this, &TMainWindow::Fx);
+
+        InitMeasurementDimension();
+        connect(ui->comboBoxDimension, QOverload<int>::of(&QComboBox::currentIndexChanged), this,
+                &TMainWindow::SaveMDimension);
     }
 
     ui->comboBoxPMSystem->setEnabled(true);
@@ -2168,23 +2560,305 @@ void TMainWindow::InitWindow()
         ShowInGraphicalShell(curFile);
     });
 
-    InitUnits();
+    InitPatternUnits();
+    InitMeasurementUnits();
+
+    ui->comboBoxMUnits->blockSignals(true);
+    ui->comboBoxMUnits->setCurrentIndex(-1);
+    ui->comboBoxMUnits->blockSignals(false);
+
+    connect(ui->comboBoxMUnits, QOverload<int>::of(&QComboBox::currentIndexChanged), this, &TMainWindow::SaveMUnits);
 
     InitTable();
 }
 
+//---------------------------------------------------------------------------------------------------------------------
+void TMainWindow::InitMenu()
+{
+    if (mType == MeasurementsType::Multisize)
+    {
+        // Measurements
+        ui->actionUseFullCircumference->setVisible(true);
+        ui->actionUseFullCircumference->setEnabled(true);
+        ui->actionUseFullCircumference->setChecked(m->IsFullCircumference());
+        connect(ui->actionUseFullCircumference, &QAction::triggered, this, &TMainWindow::FullCircumferenceChanged);
+
+        QAction *separator = new QAction(this);
+        separator->setSeparator(true);
+        ui->menuMeasurements->insertAction(ui->actionUseFullCircumference, separator);
+
+        const QList<MeasurementDimension_p> dimensions = m->Dimensions().values();
+        if (dimensions.size() > 1)
+        {
+            ui->actionRestrictSecondDimension->setVisible(true);
+            ui->actionRestrictSecondDimension->setEnabled(true);
+            connect(ui->actionRestrictSecondDimension, &QAction::triggered, this, &TMainWindow::RestrictSecondDimesion);
+
+            if (dimensions.size() > 2)
+            {
+                ui->actionRestrictThirdDimension->setVisible(true);
+                ui->actionRestrictThirdDimension->setEnabled(true);
+                connect(ui->actionRestrictThirdDimension, &QAction::triggered, this,
+                        &TMainWindow::RestrictThirdDimesion);
+            }
+        }
+
+        ui->actionDimensionLabels->setVisible(true);
+        ui->actionDimensionLabels->setEnabled(true);
+        connect(ui->actionDimensionLabels, &QAction::triggered, this, &TMainWindow::EditDimensionLabels);
+
+        // File
+        ui->actionExportToIndividual->setVisible(true);
+        ui->actionExportToIndividual->setEnabled(true);
+        connect(ui->actionExportToIndividual, &QAction::triggered, this, &TMainWindow::ExportToIndividual);
+    }
+}
+
+//---------------------------------------------------------------------------------------------------------------------
+void TMainWindow::InitDimensionsBaseValue()
+{
+    const QList<MeasurementDimension_p> dimensions = m->Dimensions().values();
+    const QString unit = UnitsToStr(m->MUnit(), true);
+    const bool fc = m->IsFullCircumference();
+
+    auto DimensionsBaseValue = [this, dimensions, unit, fc](int index, QLabel *name, QLabel *base)
+    {
+        SCASSERT(name != nullptr)
+        SCASSERT(base != nullptr)
+
+        if (dimensions.size() > index)
+        {
+            MeasurementDimension_p dimension = dimensions.at(index);
+            name->setText(VAbstartMeasurementDimension::DimensionName(dimension->Type())+QChar(':'));
+            name->setToolTip(VAbstartMeasurementDimension::DimensionToolTip(dimension->Type(),
+                                                                            dimension->IsCircumference(),
+                                                                            m->IsFullCircumference()));
+
+            DimesionLabels labels = dimension->Labels();
+
+            if (labels.contains(dimension->BaseValue()) && not labels.value(dimension->BaseValue()).isEmpty())
+            {
+                base->setText(labels.value(dimension->BaseValue()));
+            }
+            else
+            {
+                if (dimension->IsCircumference() || dimension->Type() == MeasurementDimension::X)
+                {
+                    if (dimension->Type() != MeasurementDimension::X && fc)
+                    {
+                        base->setText(QString("%1 %2").arg(dimension->BaseValue()*2).arg(unit));
+                    }
+                    else
+                    {
+                        base->setText(QString("%1 %2").arg(dimension->BaseValue()).arg(unit));
+                    }
+                }
+                else
+                {
+                    base->setText(QString::number(dimension->BaseValue()));
+                }
+            }
+        }
+    };
+
+    DimensionsBaseValue(0, ui->labelDimensionA, ui->labelDimensionABase);
+    DimensionsBaseValue(1, ui->labelDimensionB, ui->labelDimensionBBase);
+    DimensionsBaseValue(2, ui->labelDimensionC, ui->labelDimensionCBase);
+}
+
+//---------------------------------------------------------------------------------------------------------------------
+void TMainWindow::InitDimensionGradation(int index, const MeasurementDimension_p &dimension, QComboBox *control)
+{
+    SCASSERT(control != nullptr)
+
+    const bool fc = m->IsFullCircumference();
+    const QString unit = UnitsToStr(m->MUnit(), true);
+
+    int current = -1;
+    if (control->currentIndex() != -1)
+    {
+        current = control->currentData().toInt();
+    }
+
+    control->blockSignals(true);
+    control->clear();
+
+    const QVector<int> bases = DimensionRestrictedValues(index, dimension);
+    const DimesionLabels labels = dimension->Labels();
+
+    if (dimension->Type() == MeasurementDimension::X)
+    {
+        for(auto base : bases)
+        {
+            if (labels.contains(base) && not labels.value(base).isEmpty())
+            {
+                control->addItem(labels.value(base), base);
+            }
+            else
+            {
+                control->addItem(QString("%1 %2").arg(base).arg(unit), base);
+            }
+        }
+    }
+    else if (dimension->Type() == MeasurementDimension::Y)
+    {
+        for(auto base : bases)
+        {
+            if (labels.contains(base) && not labels.value(base).isEmpty())
+            {
+                control->addItem(labels.value(base), base);
+            }
+            else
+            {
+                if (dimension->IsCircumference())
+                {
+                    control->addItem(QString("%1 %2").arg(fc ? base*2 : base).arg(unit), base);
+                }
+                else
+                {
+                    control->addItem(QString::number(base), base);
+                }
+            }
+        }
+    }
+    else if (dimension->Type() == MeasurementDimension::W || dimension->Type() == MeasurementDimension::Z)
+    {
+        for(auto base : bases)
+        {
+            if (labels.contains(base) && not labels.value(base).isEmpty())
+            {
+                control->addItem(labels.value(base), base);
+            }
+            else
+            {
+                control->addItem(QString("%1 %2").arg(fc ? base*2 : base).arg(unit), base);
+            }
+        }
+    }
+
+    // after initialization the current index is 0. The signal for changing the index will not be triggered if not make
+    // it invalid first
+    control->setCurrentIndex(-1);
+
+    int i = control->findData(current);
+    if (i != -1)
+    {
+        control->setCurrentIndex(i);
+        control->blockSignals(false);
+    }
+    else
+    {
+        control->blockSignals(false);
+        control->setCurrentIndex(0);
+    }
+}
+
+//---------------------------------------------------------------------------------------------------------------------
+void TMainWindow::InitDimensionControls()
+{
+    const QList<MeasurementDimension_p> dimensions = m->Dimensions().values();
+    const QString unit = UnitsToStr(m->MUnit(), true);
+
+    auto InitControl = [this, dimensions, unit](int index, QLabel *&name, QComboBox *&control)
+    {
+        if (dimensions.size() > index)
+        {
+            MeasurementDimension_p dimension = dimensions.at(index);
+
+            if (name == nullptr)
+            {
+                name = new QLabel(VAbstartMeasurementDimension::DimensionName(dimension->Type())+QChar(':'));
+            }
+            else
+            {
+                name->setText(VAbstartMeasurementDimension::DimensionName(dimension->Type())+QChar(':'));
+            }
+            name->setToolTip(VAbstartMeasurementDimension::DimensionToolTip(dimension->Type(),
+                                                                            dimension->IsCircumference(),
+                                                                            m->IsFullCircumference()));
+
+            if (control == nullptr)
+            {
+                control = new QComboBox;
+            }
+
+            InitDimensionGradation(index, dimension, control);
+        }
+    };
+
+    InitControl(0, labelGradationDimensionA, gradationDimensionA);
+    InitControl(1, labelGradationDimensionB, gradationDimensionB);
+    InitControl(2, labelGradationDimensionC, gradationDimensionC);
+}
+
+//---------------------------------------------------------------------------------------------------------------------
+void TMainWindow::InitDimesionShifts()
+{
+    const QList<MeasurementDimension_p> dimensions = m->Dimensions().values();
+
+    auto InitShift = [this, dimensions](int index, QLabel *name)
+    {
+        if (dimensions.size() > index)
+        {
+            MeasurementDimension_p dimension = dimensions.at(index);
+
+            name->setText(tr("Shift (%1):").arg(VAbstartMeasurementDimension::DimensionName(dimension->Type())));
+            name->setToolTip(VAbstartMeasurementDimension::DimensionToolTip(dimension->Type(),
+                                                                            dimension->IsCircumference(),
+                                                                            m->IsFullCircumference()));
+        }
+    };
+
+    InitShift(0, ui->labelShiftA);
+    InitShift(1, ui->labelShiftB);
+    InitShift(2, ui->labelShiftC);
+}
+
 //---------------------------------------------------------------------------------------------------------------------
 void TMainWindow::InitTable()
 {
     if (mType == MeasurementsType::Multisize)
     {
         ui->tableWidget->setColumnHidden( ColumnFormula, true );// formula
+
+        const QList< MeasurementDimension_p > dimensions = m->Dimensions().values();
+
+        if (dimensions.size() > 0)
+        {
+            MeasurementDimension_p dimension = dimensions.at(0);
+            ui->tableWidget->horizontalHeaderItem(ColumnShiftA)->setText(
+                tr("%1 shift").arg(VAbstartMeasurementDimension::DimensionName(dimension->Type())));
+        }
+
+        if (dimensions.size() < 2)
+        {
+            ui->tableWidget->setColumnHidden( ColumnShiftB, true );
+        }
+        else
+        {
+            MeasurementDimension_p dimension = dimensions.at(1);
+            ui->tableWidget->horizontalHeaderItem(ColumnShiftB)->setText(
+                tr("%1 shift").arg(VAbstartMeasurementDimension::DimensionName(dimension->Type())));
+        }
+
+        if (dimensions.size() < 3)
+        {
+            ui->tableWidget->setColumnHidden( ColumnShiftC, true );
+        }
+        else
+        {
+            MeasurementDimension_p dimension = dimensions.at(2);
+            ui->tableWidget->horizontalHeaderItem(ColumnShiftC)->setText(
+                tr("%1 shift").arg(VAbstartMeasurementDimension::DimensionName(dimension->Type())));
+        }
     }
     else
     {
         ui->tableWidget->setColumnHidden( ColumnBaseValue, true );// base value
-        ui->tableWidget->setColumnHidden( ColumnInSizes, true );// in sizes
-        ui->tableWidget->setColumnHidden( ColumnInHeights, true );// in heights
+        ui->tableWidget->setColumnHidden( ColumnShiftA, true );
+        ui->tableWidget->setColumnHidden( ColumnShiftB, true );
+        ui->tableWidget->setColumnHidden( ColumnShiftC, true );
+        ui->tableWidget->setColumnHidden( ColumnCorrection, true );
     }
 
     connect(ui->tableWidget, &QTableWidget::itemSelectionChanged, this, &TMainWindow::ShowMData);
@@ -2204,8 +2878,10 @@ void TMainWindow::ShowUnits()
     ShowHeaderUnits(ui->tableWidget, ColumnCalcValue, UnitsToStr(pUnit));// calculated value
     ShowHeaderUnits(ui->tableWidget, ColumnFormula, unit);// formula
     ShowHeaderUnits(ui->tableWidget, ColumnBaseValue, unit);// base value
-    ShowHeaderUnits(ui->tableWidget, ColumnInSizes, unit);// in sizes
-    ShowHeaderUnits(ui->tableWidget, ColumnInHeights, unit);// in heights
+    ShowHeaderUnits(ui->tableWidget, ColumnShiftA, unit);
+    ShowHeaderUnits(ui->tableWidget, ColumnShiftB, unit);
+    ShowHeaderUnits(ui->tableWidget, ColumnShiftC, unit);
+    ShowHeaderUnits(ui->tableWidget, ColumnCorrection, unit);
 }
 
 //---------------------------------------------------------------------------------------------------------------------
@@ -2345,52 +3021,12 @@ QTableWidgetItem *TMainWindow::AddCell(const QString &text, int row, int column,
     return item;
 }
 
-//---------------------------------------------------------------------------------------------------------------------
-QComboBox *TMainWindow::SetGradationList(QLabel *label, const QStringList &list)
-{
-    ui->toolBarGradation->addWidget(label);
-
-    auto *comboBox = new QComboBox;
-    comboBox->addItems(list);
-    ui->toolBarGradation->addWidget(comboBox);
-
-    return comboBox;
-}
-
-//---------------------------------------------------------------------------------------------------------------------
-void TMainWindow::SetDefaultHeight(int value)
-{
-    const qint32 index = gradationHeights->findText(QString::number(value));
-    if (index != -1)
-    {
-        gradationHeights->setCurrentIndex(index);
-    }
-    else
-    {
-        currentHeight = gradationHeights->currentText().toInt();
-    }
-}
-
-//---------------------------------------------------------------------------------------------------------------------
-void TMainWindow::SetDefaultSize(int value)
-{
-    const qint32 index = gradationSizes->findText(QString::number(value));
-    if (index != -1)
-    {
-        gradationSizes->setCurrentIndex(index);
-    }
-    else
-    {
-        currentSize = gradationSizes->currentText().toInt();
-    }
-}
-
 //---------------------------------------------------------------------------------------------------------------------
 void TMainWindow::RefreshData(bool freshCall)
 {
     data->ClearUniqueNames();
     data->ClearVariables(VarType::Measurement);
-    m->ReadMeasurements(currentHeight, currentSize);
+    m->ReadMeasurements(currentDimensionA, currentDimensionB, currentDimensionC);
 
     RefreshTable(freshCall);
 }
@@ -2403,15 +3039,7 @@ void TMainWindow::RefreshTable(bool freshCall)
 
     ShowUnits();
 
-    const QMap<QString, QSharedPointer<VMeasurement> > table = data->DataMeasurements();
-    QMap<int, QSharedPointer<VMeasurement> > orderedTable;
-    QMap<QString, QSharedPointer<VMeasurement> >::const_iterator iterMap;
-    for (iterMap = table.constBegin(); iterMap != table.constEnd(); ++iterMap)
-    {
-        const QSharedPointer<VMeasurement> &meash = iterMap.value();
-        orderedTable.insert(meash->Index(), meash);
-    }
-
+    const QMap<int, QSharedPointer<VMeasurement> > orderedTable = OrderedMeasurments();
     qint32 currentRow = -1;
     QMap<int, QSharedPointer<VMeasurement> >::const_iterator iMap;
     ui->tableWidget->setRowCount ( orderedTable.size() );
@@ -2435,8 +3063,17 @@ void TMainWindow::RefreshTable(bool freshCall)
                 AddCell(qApp->TrVars()->GuiText(meash->GetName()), currentRow, ColumnFullName, Qt::AlignVCenter);
             }
 
-            const qreal value = UnitConvertor(*meash->GetValue(), mUnit, pUnit);
-            AddCell(locale().toString(value), currentRow, ColumnCalcValue, Qt::AlignHCenter | Qt::AlignVCenter,
+            QString calculatedValue;
+            if (meash->IsSpecialUnits())
+            {
+                calculatedValue = locale().toString(*meash->GetValue()) + degreeSymbol;
+            }
+            else
+            {
+                calculatedValue = locale().toString(UnitConvertor(*meash->GetValue(), mUnit, pUnit));
+            }
+
+            AddCell(calculatedValue, currentRow, ColumnCalcValue, Qt::AlignHCenter | Qt::AlignVCenter,
                     meash->IsFormulaOk()); // calculated value
 
             QString formula = VTranslateVars::TryFormulaToUser(meash->GetFormula(), qApp->Settings()->GetOsSeparator());
@@ -2458,19 +3095,36 @@ void TMainWindow::RefreshTable(bool freshCall)
                 AddCell(qApp->TrVars()->GuiText(meash->GetName()), currentRow, ColumnFullName, Qt::AlignVCenter);
             }
 
-            const qreal value = UnitConvertor(*data->DataVariables()->value(meash->GetName())->GetValue(), mUnit,
-                                              pUnit);
-            AddCell(locale().toString(value), currentRow, ColumnCalcValue,
+            QString calculatedValue;
+            if (meash->IsSpecialUnits())
+            {
+                const qreal value = *data->DataVariables()->value(meash->GetName())->GetValue();
+                calculatedValue = locale().toString(value) + degreeSymbol;
+            }
+            else
+            {
+                const qreal value = UnitConvertor(*data->DataVariables()->value(meash->GetName())->GetValue(), mUnit,
+                                                  pUnit);
+                calculatedValue = locale().toString(value);
+            }
+
+            AddCell(calculatedValue, currentRow, ColumnCalcValue,
                     Qt::AlignHCenter | Qt::AlignVCenter, meash->IsFormulaOk()); // calculated value
 
             AddCell(locale().toString(meash->GetBase()), currentRow, ColumnBaseValue,
                     Qt::AlignHCenter | Qt::AlignVCenter); // base value
 
-            AddCell(locale().toString(meash->GetKsize()), currentRow, ColumnInSizes,
-                    Qt::AlignHCenter | Qt::AlignVCenter); // in sizes
+            AddCell(locale().toString(meash->GetShiftA()), currentRow, ColumnShiftA,
+                    Qt::AlignHCenter | Qt::AlignVCenter);
 
-            AddCell(locale().toString(meash->GetKheight()), currentRow, ColumnInHeights,
-                    Qt::AlignHCenter | Qt::AlignVCenter); // in heights
+            AddCell(locale().toString(meash->GetShiftB()), currentRow, ColumnShiftB,
+                    Qt::AlignHCenter | Qt::AlignVCenter);
+
+            AddCell(locale().toString(meash->GetShiftC()), currentRow, ColumnShiftC,
+                    Qt::AlignHCenter | Qt::AlignVCenter);
+
+            AddCell(locale().toString(meash->GetCorrection(currentDimensionA, currentDimensionB, currentDimensionC)),
+                    currentRow, ColumnCorrection, Qt::AlignHCenter | Qt::AlignVCenter);
         }
     }
 
@@ -2550,18 +3204,22 @@ void TMainWindow::MFields(bool enabled)
     ui->lineEditName->setEnabled(enabled);
     ui->plainTextEditDescription->setEnabled(enabled);
     ui->lineEditFullName->setEnabled(enabled);
+    ui->comboBoxMUnits->setEnabled(enabled);
 
     if (mType == MeasurementsType::Multisize)
     {
         ui->doubleSpinBoxBaseValue->setEnabled(enabled);
-        ui->doubleSpinBoxInSizes->setEnabled(enabled);
-        ui->doubleSpinBoxInHeights->setEnabled(enabled);
+        ui->doubleSpinBoxShiftA->setEnabled(enabled);
+        ui->doubleSpinBoxShiftB->setEnabled(enabled);
+        ui->doubleSpinBoxShiftC->setEnabled(enabled);
+        ui->doubleSpinBoxCorrection->setEnabled(enabled);
     }
     else
     {
         ui->plainTextEditFormula->setEnabled(enabled);
         ui->pushButtonGrow->setEnabled(enabled);
         ui->toolButtonExpr->setEnabled(enabled);
+        ui->comboBoxDimension->setEnabled(enabled);
     }
 
     ui->lineEditFind->setEnabled(enabled);
@@ -2643,9 +3301,11 @@ QString TMainWindow::ClearCustomName(const QString &name) const
 }
 
 //---------------------------------------------------------------------------------------------------------------------
-bool TMainWindow::EvalFormula(const QString &formula, bool fromUser, VContainer *data, QLabel *label)
+bool TMainWindow::EvalFormula(const QString &formula, bool fromUser, VContainer *data, QLabel *label,
+                              bool specialUnits)
 {
-    const QString postfix = UnitsToStr(pUnit);//Show unit in dialog lable (cm, mm or inch)
+    const QString postfix = specialUnits ? degreeSymbol : UnitsToStr(pUnit);
+
     if (formula.isEmpty())
     {
         label->setText(tr("Error") + QStringLiteral(" (") + postfix + QStringLiteral("). ") + tr("Empty field."));
@@ -2675,7 +3335,10 @@ bool TMainWindow::EvalFormula(const QString &formula, bool fromUser, VContainer
             return false;
         }
 
-        result = UnitConvertor(result, mUnit, pUnit);
+        if (not specialUnits)
+        {
+            result = UnitConvertor(result, mUnit, pUnit);
+        }
 
         label->setText(qApp->LocaleToString(result) + QChar(QChar::Space) +postfix);
         label->setToolTip(tr("Value"));
@@ -2872,8 +3535,9 @@ bool TMainWindow::LoadFromExistingFile(const QString &path)
             mUnit = m->MUnit();
             pUnit = mUnit;
 
-            currentHeight = m->BaseHeight();
-            currentSize = m->BaseSize();
+            currentDimensionA = m->DimensionABase();
+            currentDimensionB = m->DimensionBBase();
+            currentDimensionC = m->DimensionCBase();
 
             ui->labelToolTip->setVisible(false);
             ui->tabWidget->setVisible(true);
@@ -3024,6 +3688,50 @@ bool TMainWindow::IgnoreLocking(int error, const QString &path)
     return true;
 }
 
+//---------------------------------------------------------------------------------------------------------------------
+void TMainWindow::HackDimensionBaseValue()
+{
+    const QList<MeasurementDimension_p> dimensions = m->Dimensions().values();
+
+    auto DimensionsBaseValue = [this, dimensions](int index, QLabel *name, QLabel *base)
+    {
+        SCASSERT(name != nullptr)
+        SCASSERT(base != nullptr)
+
+        if (dimensions.size() <= index)
+        {
+            HackWidget(&name);
+            HackWidget(&base);
+        }
+    };
+
+    DimensionsBaseValue(0, ui->labelDimensionA, ui->labelDimensionABase);
+    DimensionsBaseValue(1, ui->labelDimensionB, ui->labelDimensionBBase);
+    DimensionsBaseValue(2, ui->labelDimensionC, ui->labelDimensionCBase);
+}
+
+//---------------------------------------------------------------------------------------------------------------------
+void TMainWindow::HackDimensionShifts()
+{
+    const QList<MeasurementDimension_p> dimensions = m->Dimensions().values();
+
+    auto HackShift = [this, dimensions](int index, QLabel *&name, QDoubleSpinBox *&shift)
+    {
+        SCASSERT(name != nullptr)
+        SCASSERT(shift != nullptr)
+
+        if (dimensions.size() <= index)
+        {
+            HackWidget(&name);
+            HackWidget(&shift);
+        }
+    };
+
+    HackShift(0, ui->labelShiftA, ui->doubleSpinBoxShiftA);
+    HackShift(1, ui->labelShiftB, ui->doubleSpinBoxShiftB);
+    HackShift(2, ui->labelShiftC, ui->doubleSpinBoxShiftC);
+}
+
 //---------------------------------------------------------------------------------------------------------------------
 QString TMainWindow::CheckMName(const QString &name, const QSet<QString> &importedNames) const
 {
@@ -3091,7 +3799,7 @@ void TMainWindow::RefreshDataAfterImport()
 }
 
 //---------------------------------------------------------------------------------------------------------------------
-void TMainWindow::ImportIndividualMeasurements(const QxtCsvModel &csv)
+void TMainWindow::ImportIndividualMeasurements(const QxtCsvModel &csv, const QVector<int> &map)
 {
     const int columns = csv.columnCount();
     const int rows = csv.rowCount();
@@ -3124,7 +3832,8 @@ void TMainWindow::ImportIndividualMeasurements(const QxtCsvModel &csv)
     {
         try
         {
-            const QString name = csv.text(i, 0).simplified();
+            const int nameColumn = map.at(static_cast<int>(IndividualMeasurementsColumns::Name));
+            const QString name = csv.text(i, nameColumn).simplified();
             if (name.isEmpty())
             {
                 ShowError(tr("Error in row %1. Measurement name is empty.").arg(i));
@@ -3135,17 +3844,28 @@ void TMainWindow::ImportIndividualMeasurements(const QxtCsvModel &csv)
             const QString mName = CheckMName(qApp->TrVars()->MFromUser(name), importedNames);
             importedNames.insert(mName);
             measurement.name = mName;
-            measurement.value = VTranslateVars::TryFormulaFromUser(csv.text(i, 1), qApp->Settings()->GetOsSeparator());
 
-            const bool custom = csv.text(i, 0).simplified().startsWith(CustomMSign);
+            const int valueColumn = map.at(static_cast<int>(IndividualMeasurementsColumns::Value));
+            measurement.value = VTranslateVars::TryFormulaFromUser(csv.text(i, valueColumn),
+                                                                   qApp->Settings()->GetOsSeparator());
+
+            const bool custom = name.startsWith(CustomMSign);
             if (columns > 2 && custom)
             {
-                measurement.fullName = csv.text(i, 2).simplified();
+                const int fullNameColumn = map.at(static_cast<int>(IndividualMeasurementsColumns::FullName));
+                if (fullNameColumn >= 0)
+                {
+                    measurement.fullName = csv.text(i, fullNameColumn).simplified();
+                }
             }
 
             if (columns > 3 && custom)
             {
-                measurement.description = csv.text(i, 3).simplified();
+                const int descriptionColumn = map.at(static_cast<int>(IndividualMeasurementsColumns::Description));
+                if (descriptionColumn >= 0)
+                {
+                    measurement.description = csv.text(i, descriptionColumn).simplified();
+                }
             }
 
             measurements.append(measurement);
@@ -3176,7 +3896,7 @@ void TMainWindow::ImportIndividualMeasurements(const QxtCsvModel &csv)
 }
 
 //---------------------------------------------------------------------------------------------------------------------
-void TMainWindow::ImportMultisizeMeasurements(const QxtCsvModel &csv)
+void TMainWindow::ImportMultisizeMeasurements(const QxtCsvModel &csv, const QVector<int> &map)
 {
     const int columns = csv.columnCount();
     const int rows = csv.rowCount();
@@ -3189,9 +3909,10 @@ void TMainWindow::ImportMultisizeMeasurements(const QxtCsvModel &csv)
 
     auto ConverToDouble = [](QString text, const QString &error)
     {
+        text.replace(" ", QString());
         text = VTranslateVars::TryFormulaFromUser(text, qApp->Settings()->GetOsSeparator());
         bool ok = false;
-        QLocale::c();
+
         const qreal value = QLocale::c().toDouble(text, &ok);
         if (not ok)
         {
@@ -3210,8 +3931,9 @@ void TMainWindow::ImportMultisizeMeasurements(const QxtCsvModel &csv)
 
         QString name;
         qreal base{0};
-        qreal heightIncrease{0};
-        qreal sizeIncrease{0};
+        qreal shiftA{0};
+        qreal shiftB{0};
+        qreal shiftC{0};
         QString fullName;
         QString description;
     };
@@ -3219,11 +3941,14 @@ void TMainWindow::ImportMultisizeMeasurements(const QxtCsvModel &csv)
     QVector<MultisizeMeasurement> measurements;
     QSet<QString> importedNames;
 
+    const QMap<MeasurementDimension, MeasurementDimension_p > dimensions = m->Dimensions();
+
     for(int i=0; i < rows; ++i)
     {
         try
         {
-            const QString name = csv.text(i, 0).simplified();
+            const int nameColumn = map.at(static_cast<int>(MultisizeMeasurementsColumns::Name));
+            const QString name = csv.text(i, nameColumn).simplified();
             if (name.isEmpty())
             {
                 ShowError(tr("Error in row %1. Measurement name is empty.").arg(i));
@@ -3235,24 +3960,48 @@ void TMainWindow::ImportMultisizeMeasurements(const QxtCsvModel &csv)
             importedNames.insert(mName);
             measurement.name = mName;
 
-            measurement.base = ConverToDouble(csv.text(i, 1),
-                                              tr("Cannot convert base size value to double in column 2."));
+            const int baseValueColumn = map.at(static_cast<int>(MultisizeMeasurementsColumns::BaseValue));
+            measurement.base = ConverToDouble(csv.text(i, baseValueColumn),
+                                              tr("Cannot convert base value to double in column 2."));
 
-            measurement.heightIncrease = ConverToDouble(csv.text(i, 2),
-                                                     tr("Cannot convert height increase value to double in column 3."));
+            const int shiftAColumn = map.at(static_cast<int>(MultisizeMeasurementsColumns::ShiftA));
+            measurement.shiftA = ConverToDouble(csv.text(i, shiftAColumn),
+                                                tr("Cannot convert shift value to double in column %1.")
+                                                    .arg(shiftAColumn));
 
-            measurement.sizeIncrease = ConverToDouble(csv.text(i, 3),
-                                                      tr("Cannot convert size increase value to double in column 4."));
+            if (dimensions.size() > 1)
+            {
+                const int shiftBColumn = map.at(static_cast<int>(MultisizeMeasurementsColumns::ShiftB));
+                measurement.shiftB = ConverToDouble(csv.text(i, shiftBColumn),
+                                                    tr("Cannot convert shift value to double in column %1.")
+                                                        .arg(shiftBColumn));
+            }
 
-            const bool custom = csv.text(i, 0).simplified().startsWith(CustomMSign);
+            if (dimensions.size() > 2)
+            {
+                const int shiftCColumn = map.at(static_cast<int>(MultisizeMeasurementsColumns::ShiftC));
+                measurement.shiftC = ConverToDouble(csv.text(i, shiftCColumn),
+                                                    tr("Cannot convert shift value to double in column %1.")
+                                                        .arg(shiftCColumn));
+            }
+
+            const bool custom = name.startsWith(CustomMSign);
             if (columns > 4 && custom)
             {
-                measurement.fullName = csv.text(i, 4).simplified();
+                const int fullNameColumn = map.at(static_cast<int>(MultisizeMeasurementsColumns::FullName));
+                if (fullNameColumn >= 0)
+                {
+                    measurement.fullName = csv.text(i, fullNameColumn).simplified();
+                }
             }
 
             if (columns > 5 && custom)
             {
-                measurement.description = csv.text(i, 5).simplified();
+                const int descriptionColumn = map.at(static_cast<int>(MultisizeMeasurementsColumns::Description));
+                if (descriptionColumn >= 0)
+                {
+                    measurement.description = csv.text(i, descriptionColumn).simplified();
+                }
             }
 
             measurements.append(measurement);
@@ -3268,8 +4017,17 @@ void TMainWindow::ImportMultisizeMeasurements(const QxtCsvModel &csv)
     {
         m->AddEmpty(mm.name);
         m->SetMBaseValue(mm.name, mm.base);
-        m->SetMSizeIncrease(mm.name, mm.sizeIncrease);
-        m->SetMHeightIncrease(mm.name, mm.heightIncrease);
+        m->SetMShiftA(mm.name, mm.shiftA);
+
+        if (dimensions.size() > 1)
+        {
+            m->SetMShiftB(mm.name, mm.shiftB);
+        }
+
+        if (dimensions.size() > 2)
+        {
+            m->SetMShiftC(mm.name, mm.shiftC);
+        }
 
         if (not mm.fullName.isEmpty())
         {
@@ -3300,6 +4058,160 @@ void TMainWindow::SetCurrentPatternUnit()
     }
 }
 
+//---------------------------------------------------------------------------------------------------------------------
+void TMainWindow::ShowDimensionControls()
+{
+    const QList<MeasurementDimension_p> dimensions = m->Dimensions().values();
+
+    auto ShowControl = [this, dimensions](int index, QLabel *name, QComboBox *control)
+    {
+        if (dimensions.size() > index)
+        {
+            SCASSERT(name != nullptr)
+            SCASSERT(control != nullptr)
+
+            ui->toolBarGradation->addWidget(name);
+            ui->toolBarGradation->addWidget(control);
+        }
+    };
+
+    ShowControl(0, labelGradationDimensionA, gradationDimensionA);
+    ShowControl(1, labelGradationDimensionB, gradationDimensionB);
+    ShowControl(2, labelGradationDimensionC, gradationDimensionC);
+
+    if (gradationDimensionA)
+    {
+        connect(gradationDimensionA, QOverload<int>::of(&QComboBox::currentIndexChanged),
+                this, &TMainWindow::DimensionABaseChanged);
+    }
+
+    if (gradationDimensionB)
+    {
+        connect(gradationDimensionB, QOverload<int>::of(&QComboBox::currentIndexChanged),
+                this, &TMainWindow::DimensionBBaseChanged);
+    }
+
+    if (gradationDimensionC)
+    {
+        connect(gradationDimensionC, QOverload<int>::of(&QComboBox::currentIndexChanged),
+                this, &TMainWindow::DimensionCBaseChanged);
+    }
+}
+
+//---------------------------------------------------------------------------------------------------------------------
+void TMainWindow::SetDimensionBases()
+{
+    const QList<MeasurementDimension_p> dimensions = m->Dimensions().values();
+
+    if (dimensions.size() > 0)
+    {
+        MeasurementDimension_p dimension = dimensions.at(0);
+        currentDimensionA = dimension->BaseValue();
+    }
+
+    if (dimensions.size() > 1)
+    {
+        MeasurementDimension_p dimension = dimensions.at(1);
+        currentDimensionB = dimension->BaseValue();
+    }
+
+    if (dimensions.size() > 2)
+    {
+        MeasurementDimension_p dimension = dimensions.at(2);
+        currentDimensionC = dimension->BaseValue();
+    }
+
+    auto SetBase = [dimensions](int index, QComboBox *control, int &value)
+    {
+        if (dimensions.size() > index)
+        {
+            SCASSERT(control != nullptr)
+
+            MeasurementDimension_p dimension = dimensions.at(index);
+
+            const qint32 i = control->findData(value);
+            if (i != -1)
+            {
+                control->setCurrentIndex(i);
+            }
+            else
+            {
+                value = control->currentData().toInt();
+            }
+        }
+    };
+
+    SetBase(0, gradationDimensionA, currentDimensionA);
+    SetBase(1, gradationDimensionB, currentDimensionB);
+    SetBase(2, gradationDimensionC, currentDimensionC);
+}
+
+//---------------------------------------------------------------------------------------------------------------------
+void TMainWindow::SetCurrentDimensionValues()
+{
+    const QList<MeasurementDimension_p> dimensions = m->Dimensions().values();
+
+    auto SetDimensionValue = [dimensions](int index, int &value)
+    {
+        if (dimensions.size() > index)
+        {
+            MeasurementDimension_p dimension = dimensions.at(index);
+            value = dimension->BaseValue();
+        }
+    };
+
+    SetDimensionValue(0, currentDimensionA);
+    SetDimensionValue(1, currentDimensionB);
+    SetDimensionValue(2, currentDimensionC);
+}
+
+//---------------------------------------------------------------------------------------------------------------------
+QVector<int> TMainWindow::DimensionRestrictedValues(int index, const MeasurementDimension_p &dimension)
+{
+    QPair<int, int> restriction;
+
+    if (index == 0)
+    {
+        return dimension->ValidBases();
+    }
+    else if (index == 1)
+    {
+        restriction = m->Restriction(currentDimensionA);
+    }
+    else
+    {
+        restriction = m->Restriction(currentDimensionA, currentDimensionB);
+    }
+
+    const QVector<int> bases = dimension->ValidBases();
+
+    int min = bases.indexOf(restriction.first) != -1 ? restriction.first : dimension->MinValue();
+    int max = bases.indexOf(restriction.second) != -1 ? restriction.second : dimension->MaxValue();
+
+    if (min > max)
+    {
+        min = dimension->MinValue();
+        max = dimension->MaxValue();
+    }
+
+    return VAbstartMeasurementDimension::ValidBases(min, max, dimension->Step());
+}
+
+//---------------------------------------------------------------------------------------------------------------------
+QMap<int, QSharedPointer<VMeasurement> > TMainWindow::OrderedMeasurments() const
+{
+    const QMap<QString, QSharedPointer<VMeasurement> > table = data->DataMeasurements();
+    QMap<int, QSharedPointer<VMeasurement> > orderedTable;
+    QMap<QString, QSharedPointer<VMeasurement> >::const_iterator iterMap;
+    for (iterMap = table.constBegin(); iterMap != table.constEnd(); ++iterMap)
+    {
+        const QSharedPointer<VMeasurement> &meash = iterMap.value();
+        orderedTable.insert(meash->Index(), meash);
+    }
+
+    return orderedTable;
+}
+
 //---------------------------------------------------------------------------------------------------------------------
 void TMainWindow::SetDecimals()
 {
@@ -3309,31 +4221,49 @@ void TMainWindow::SetDecimals()
             ui->doubleSpinBoxBaseValue->setDecimals(2);
             ui->doubleSpinBoxBaseValue->setSingleStep(0.01);
 
-            ui->doubleSpinBoxInSizes->setDecimals(2);
-            ui->doubleSpinBoxInSizes->setSingleStep(0.01);
+            ui->doubleSpinBoxCorrection->setDecimals(2);
+            ui->doubleSpinBoxCorrection->setSingleStep(0.01);
 
-            ui->doubleSpinBoxInHeights->setDecimals(2);
-            ui->doubleSpinBoxInHeights->setSingleStep(0.01);
+            ui->doubleSpinBoxShiftA->setDecimals(2);
+            ui->doubleSpinBoxShiftA->setSingleStep(0.01);
+
+            ui->doubleSpinBoxShiftB->setDecimals(2);
+            ui->doubleSpinBoxShiftB->setSingleStep(0.01);
+
+            ui->doubleSpinBoxShiftC->setDecimals(2);
+            ui->doubleSpinBoxShiftC->setSingleStep(0.01);
             break;
         case Unit::Mm:
             ui->doubleSpinBoxBaseValue->setDecimals(1);
             ui->doubleSpinBoxBaseValue->setSingleStep(0.1);
 
-            ui->doubleSpinBoxInSizes->setDecimals(1);
-            ui->doubleSpinBoxInSizes->setSingleStep(0.1);
+            ui->doubleSpinBoxCorrection->setDecimals(1);
+            ui->doubleSpinBoxCorrection->setSingleStep(0.1);
 
-            ui->doubleSpinBoxInHeights->setDecimals(1);
-            ui->doubleSpinBoxInHeights->setSingleStep(0.1);
+            ui->doubleSpinBoxShiftA->setDecimals(1);
+            ui->doubleSpinBoxShiftA->setSingleStep(0.1);
+
+            ui->doubleSpinBoxShiftB->setDecimals(1);
+            ui->doubleSpinBoxShiftB->setSingleStep(0.1);
+
+            ui->doubleSpinBoxShiftC->setDecimals(1);
+            ui->doubleSpinBoxShiftC->setSingleStep(0.1);
             break;
         case Unit::Inch:
             ui->doubleSpinBoxBaseValue->setDecimals(5);
             ui->doubleSpinBoxBaseValue->setSingleStep(0.00001);
 
-            ui->doubleSpinBoxInSizes->setDecimals(5);
-            ui->doubleSpinBoxInSizes->setSingleStep(0.00001);
+            ui->doubleSpinBoxCorrection->setDecimals(5);
+            ui->doubleSpinBoxCorrection->setSingleStep(0.00001);
 
-            ui->doubleSpinBoxInHeights->setDecimals(5);
-            ui->doubleSpinBoxInHeights->setSingleStep(0.00001);
+            ui->doubleSpinBoxShiftA->setDecimals(5);
+            ui->doubleSpinBoxShiftA->setSingleStep(0.00001);
+
+            ui->doubleSpinBoxShiftB->setDecimals(5);
+            ui->doubleSpinBoxShiftB->setSingleStep(0.00001);
+
+            ui->doubleSpinBoxShiftC->setDecimals(5);
+            ui->doubleSpinBoxShiftC->setSingleStep(0.00001);
             break;
         default:
             break;
@@ -3341,7 +4271,7 @@ void TMainWindow::SetDecimals()
 }
 
 //---------------------------------------------------------------------------------------------------------------------
-void TMainWindow::InitUnits()
+void TMainWindow::InitPatternUnits()
 {
     labelPatternUnit = new QLabel(tr("Pattern unit:"));
     ui->toolBarGradation->addWidget(labelPatternUnit);
@@ -3369,6 +4299,47 @@ void TMainWindow::InitComboBoxUnits()
     comboBoxUnits->addItem(UnitsToStr(Unit::Inch, true), QVariant(static_cast<int>(Unit::Inch)));
 }
 
+//---------------------------------------------------------------------------------------------------------------------
+void TMainWindow::InitMeasurementUnits()
+{
+    ui->comboBoxMUnits->blockSignals(true);
+
+    int current = -1;
+    if (ui->comboBoxMUnits->currentIndex() != -1)
+    {
+        current = ui->comboBoxMUnits->currentData().toInt();
+    }
+
+    QString units;
+    switch (m->MUnit())
+    {
+        case Unit::Mm:
+            units = tr("Millimeters");
+            break;
+        case Unit::Inch:
+            units = tr("Inches");
+            break;
+        case Unit::Cm:
+            units = tr("Centimeters");
+            break;
+        default:
+            units = "<Invalid>";
+            break;
+    }
+
+    ui->comboBoxMUnits->clear();
+    ui->comboBoxMUnits->addItem(units, QVariant(static_cast<int>(MUnits::Table)));
+    ui->comboBoxMUnits->addItem(tr("Degrees"), QVariant(static_cast<int>(MUnits::Degrees)));
+
+    int i = ui->comboBoxMUnits->findData(current);
+    if (i != -1)
+    {
+        ui->comboBoxMUnits->setCurrentIndex(i);
+    }
+
+    ui->comboBoxMUnits->blockSignals(false);
+}
+
 //---------------------------------------------------------------------------------------------------------------------
 void TMainWindow::InitGender(QComboBox *gender)
 {
@@ -3378,6 +4349,34 @@ void TMainWindow::InitGender(QComboBox *gender)
     gender->addItem(tr("female", "gender"), QVariant(static_cast<int>(GenderType::Female)));
 }
 
+//---------------------------------------------------------------------------------------------------------------------
+void TMainWindow::InitMeasurementDimension()
+{
+    ui->comboBoxDimension->blockSignals(true);
+
+    int current = -1;
+    if (ui->comboBoxDimension->currentIndex() != -1)
+    {
+        current = ui->comboBoxDimension->currentData().toInt();
+    }
+
+    ui->comboBoxDimension->clear();
+
+    ui->comboBoxDimension->addItem(VMeasurements::IMDName(IMD::N), QVariant(static_cast<int>(IMD::N)));
+    ui->comboBoxDimension->addItem(VMeasurements::IMDName(IMD::X), QVariant(static_cast<int>(IMD::X)));
+    ui->comboBoxDimension->addItem(VMeasurements::IMDName(IMD::Y), QVariant(static_cast<int>(IMD::Y)));
+    ui->comboBoxDimension->addItem(VMeasurements::IMDName(IMD::W), QVariant(static_cast<int>(IMD::W)));
+    ui->comboBoxDimension->addItem(VMeasurements::IMDName(IMD::Z), QVariant(static_cast<int>(IMD::Z)));
+
+    int i = ui->comboBoxDimension->findData(current);
+    if (i != -1)
+    {
+        ui->comboBoxDimension->setCurrentIndex(i);
+    }
+
+    ui->comboBoxDimension->blockSignals(false);
+}
+
 //---------------------------------------------------------------------------------------------------------------------
 template <class T>
 void TMainWindow::HackWidget(T **widget)
diff --git a/src/app/tape/tmainwindow.h b/src/app/tape/tmainwindow.h
index 17bf00074..ff641374f 100644
--- a/src/app/tape/tmainwindow.h
+++ b/src/app/tape/tmainwindow.h
@@ -44,6 +44,7 @@ namespace Ui
 
 class QLabel;
 class QxtCsvModel;
+class VMeasurement;
 
 class TMainWindow : public VAbstractMainWindow
 {
@@ -57,8 +58,9 @@ public:
 
     void RetranslateTable();
 
-    void SetBaseMHeight(int height);
-    void SetBaseMSize(int size);
+    bool SetDimensionABase(int base);
+    bool SetDimensionBBase(int base);
+    bool SetDimensionCBase(int base);
     void SetPUnit(Unit unit);
 
     bool LoadFile(const QString &path);
@@ -112,8 +114,11 @@ private slots:
     void AddKnown();
     void ImportFromPattern();
 
-    void ChangedSize(const QString &text);
-    void ChangedHeight(const QString & text);
+    void DimensionABaseChanged();
+    void DimensionBBaseChanged();
+    void DimensionCBaseChanged();
+
+    void GradationChanged();
 
     void ShowMData();
 
@@ -122,43 +127,67 @@ private slots:
     void SaveMName(const QString &text);
     void SaveMValue();
     void SaveMBaseValue(double value);
-    void SaveMSizeIncrease(double value);
-    void SaveMHeightIncrease(double value);
+    void SaveMShiftA(double value);
+    void SaveMShiftB(double value);
+    void SaveMShiftC(double value);
+    void SaveMCorrectionValue(double value);
     void SaveMDescription();
     void SaveMFullName();
+    void SaveMUnits();
+    void SaveMDimension();
+
+    void FullCircumferenceChanged(bool checked);
+
+    void ExportToIndividual();
+
+    void RestrictSecondDimesion();
+    void RestrictThirdDimesion();
+
+    void EditDimensionLabels();
 
 private:
     Q_DISABLE_COPY(TMainWindow)
     Ui::TMainWindow *ui;
-    VMeasurements   *m;
-    VContainer      *data;
-    Unit             mUnit;
-    Unit             pUnit;
-    MeasurementsType mType;
-    qreal            currentSize;
-    qreal            currentHeight;
-    QString          curFile;
-    QComboBox       *gradationHeights;
-    QComboBox       *gradationSizes;
-    QComboBox       *comboBoxUnits;
+    VMeasurements   *m{nullptr};
+    VContainer      *data{nullptr};
+    Unit             mUnit{Unit::Cm};
+    Unit             pUnit{Unit::Cm};
+    MeasurementsType mType{MeasurementsType::Individual};
+    int              currentDimensionA{0};
+    int              currentDimensionB{0};
+    int              currentDimensionC{0};
+    QString          curFile{};
+    QComboBox       *gradationDimensionA{nullptr};
+    QComboBox       *gradationDimensionB{nullptr};
+    QComboBox       *gradationDimensionC{nullptr};
+    QComboBox       *comboBoxUnits{nullptr};
     int              formulaBaseHeight;
-    QSharedPointer<VLockGuard<char>> lock;
-    QSharedPointer<VTableSearch> search;
-    QLabel *labelGradationHeights;
-    QLabel *labelGradationSizes;
-    QLabel *labelPatternUnit;
-    bool isInitialized;
-    bool mIsReadOnly;
+    QSharedPointer<VLockGuard<char>> lock{nullptr};
+    QSharedPointer<VTableSearch> search{};
+    QLabel *labelGradationDimensionA{nullptr};
+    QLabel *labelGradationDimensionB{nullptr};
+    QLabel *labelGradationDimensionC{nullptr};
+    QLabel *labelPatternUnit{nullptr};
+    bool isInitialized{false};
+    bool mIsReadOnly{false};
+    QTimer *gradation;
 
-    QVector<QObject *> hackedWidgets;
+    QVector<QObject *> hackedWidgets{};
 
     void SetupMenu();
     void InitWindow();
+    void InitMenu();
+    void InitDimensionsBaseValue();
+    void InitDimensionGradation(int index, const MeasurementDimension_p &dimension, QComboBox *control);
+    void InitDimensionControls();
+    void InitDimesionShifts();
     void InitTable();
     void SetDecimals();
-    void InitUnits();
+    void InitPatternUnits();
     void InitComboBoxUnits();
+    void InitMeasurementUnits();
     void InitGender(QComboBox *gender);
+    void InitMeasurementDimension();
 
     void ShowNewMData(bool fresh);
     void ShowUnits();
@@ -172,18 +201,13 @@ private:
 
     QTableWidgetItem *AddCell(const QString &text, int row, int column, int aligment, bool ok = true);
 
-    Q_REQUIRED_RESULT QComboBox *SetGradationList(QLabel *label, const QStringList &list);
-
-    void       SetDefaultHeight(int value);
-    void       SetDefaultSize(int value);
-
     void RefreshData(bool freshCall = false);
     void RefreshTable(bool freshCall = false);
 
     QString GetCustomName() const;
     QString ClearCustomName(const QString &name) const;
 
-    bool EvalFormula(const QString &formula, bool fromUser, VContainer *data, QLabel *label);
+    bool EvalFormula(const QString &formula, bool fromUser, VContainer *data, QLabel *label, bool specialUnits);
     void ShowMDiagram(const QString &name);
 
     void Open(const QString &pathTo, const QString &filter);
@@ -208,15 +232,25 @@ private:
 
     template <class T>
     void HackWidget(T **widget);
+    void HackDimensionBaseValue();
+    void HackDimensionShifts();
 
     QString CheckMName(const QString &name, const QSet<QString> &importedNames) const;
     void ShowError(const QString &text);
     void RefreshDataAfterImport();
 
-    void ImportIndividualMeasurements(const QxtCsvModel &csv);
-    void ImportMultisizeMeasurements(const QxtCsvModel &csv);
+    void ImportIndividualMeasurements(const QxtCsvModel &csv, const QVector<int> &map);
+    void ImportMultisizeMeasurements(const QxtCsvModel &csv, const QVector<int> &map);
 
     void SetCurrentPatternUnit();
+
+    void ShowDimensionControls();
+    void SetDimensionBases();
+    void SetCurrentDimensionValues();
+
+    QVector<int> DimensionRestrictedValues(int index, const MeasurementDimension_p &dimension);
+
+    QMap<int, QSharedPointer<VMeasurement> > OrderedMeasurments() const;
 };
 
 #endif // TMAINWINDOW_H
diff --git a/src/app/tape/tmainwindow.ui b/src/app/tape/tmainwindow.ui
index 62e6dab34..17175c597 100644
--- a/src/app/tape/tmainwindow.ui
+++ b/src/app/tape/tmainwindow.ui
@@ -6,15 +6,15 @@
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>835</width>
-    <height>726</height>
+    <width>1188</width>
+    <height>836</height>
    </rect>
   </property>
   <property name="windowTitle">
    <string notr="true"/>
   </property>
   <property name="windowIcon">
-   <iconset resource="share/resources/tapeicon.qrc">
+   <iconset>
     <normaloff>:/tapeicon/64x64/logo.png</normaloff>:/tapeicon/64x64/logo.png</iconset>
   </property>
   <widget class="QWidget" name="centralWidget">
@@ -24,7 +24,7 @@
      <verstretch>0</verstretch>
     </sizepolicy>
    </property>
-   <layout class="QVBoxLayout" name="verticalLayout">
+   <layout class="QVBoxLayout" name="verticalLayout_5">
     <item>
      <widget class="QLabel" name="labelToolTip">
       <property name="sizePolicy">
@@ -47,11 +47,11 @@
        <string/>
       </property>
       <property name="currentIndex">
-       <number>0</number>
+       <number>1</number>
       </property>
       <widget class="QWidget" name="tabMeasurements">
        <attribute name="icon">
-        <iconset resource="share/resources/tapeicon.qrc">
+        <iconset>
          <normaloff>:/tapeicon/16x16/measurement.png</normaloff>:/tapeicon/16x16/measurement.png</iconset>
        </attribute>
        <attribute name="title">
@@ -173,12 +173,22 @@
            </column>
            <column>
             <property name="text">
-             <string>In sizes</string>
+             <string notr="true">Shift A</string>
             </property>
            </column>
            <column>
             <property name="text">
-             <string>In heights</string>
+             <string notr="true">Shift B</string>
+            </property>
+           </column>
+           <column>
+            <property name="text">
+             <string notr="true">Shift C</string>
+            </property>
+           </column>
+           <column>
+            <property name="text">
+             <string>Correction</string>
             </property>
            </column>
           </widget>
@@ -198,173 +208,12 @@
            <property name="title">
             <string>Details</string>
            </property>
-           <layout class="QFormLayout" name="formLayout">
-            <property name="fieldGrowthPolicy">
-             <enum>QFormLayout::ExpandingFieldsGrow</enum>
-            </property>
-            <item row="2" column="0">
-             <widget class="QLabel" name="label">
-              <property name="text">
-               <string>Name:</string>
-              </property>
-             </widget>
-            </item>
-            <item row="2" column="1">
-             <widget class="QLineEdit" name="lineEditName">
-              <property name="enabled">
-               <bool>false</bool>
-              </property>
-              <property name="toolTip">
-               <string>Measurement's name in a formula</string>
-              </property>
-              <property name="placeholderText">
-               <string>Measurement's name in a formula.</string>
-              </property>
-             </widget>
-            </item>
-            <item row="5" column="0">
-             <widget class="QLabel" name="labelFormula">
-              <property name="text">
-               <string>Formula:</string>
-              </property>
-             </widget>
-            </item>
-            <item row="5" column="1">
-             <layout class="QHBoxLayout" name="horizontalLayoutValue">
-              <item>
-               <widget class="VPlainTextEdit" name="plainTextEditFormula">
-                <property name="enabled">
-                 <bool>false</bool>
-                </property>
-                <property name="sizePolicy">
-                 <sizepolicy hsizetype="Expanding" vsizetype="Preferred">
-                  <horstretch>0</horstretch>
-                  <verstretch>0</verstretch>
-                 </sizepolicy>
-                </property>
-                <property name="maximumSize">
-                 <size>
-                  <width>16777215</width>
-                  <height>28</height>
-                 </size>
-                </property>
-                <property name="tabChangesFocus">
-                 <bool>true</bool>
-                </property>
-               </widget>
-              </item>
-              <item>
-               <widget class="QPushButton" name="pushButtonGrow">
-                <property name="enabled">
-                 <bool>false</bool>
-                </property>
-                <property name="maximumSize">
-                 <size>
-                  <width>18</width>
-                  <height>18</height>
-                 </size>
-                </property>
-                <property name="sizeIncrement">
-                 <size>
-                  <width>0</width>
-                  <height>0</height>
-                 </size>
-                </property>
-                <property name="toolTip">
-                 <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Show full calculation in message box&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
-                </property>
-                <property name="text">
-                 <string notr="true"/>
-                </property>
-                <property name="icon">
-                 <iconset theme="go-down">
-                  <normaloff>../../libs/vtools/dialogs/support</normaloff>../../libs/vtools/dialogs/support</iconset>
-                </property>
-                <property name="iconSize">
-                 <size>
-                  <width>16</width>
-                  <height>16</height>
-                 </size>
-                </property>
-                <property name="flat">
-                 <bool>true</bool>
-                </property>
-               </widget>
-              </item>
-              <item>
-               <widget class="QToolButton" name="toolButtonExpr">
-                <property name="enabled">
-                 <bool>false</bool>
-                </property>
-                <property name="toolTip">
-                 <string>Function Wizard</string>
-                </property>
-                <property name="text">
-                 <string notr="true">...</string>
-                </property>
-                <property name="icon">
-                 <iconset resource="share/resources/tapeicon.qrc">
-                  <normaloff>:/tapeicon/24x24/fx.png</normaloff>:/tapeicon/24x24/fx.png</iconset>
-                </property>
-                <property name="iconSize">
-                 <size>
-                  <width>24</width>
-                  <height>24</height>
-                 </size>
-                </property>
-               </widget>
-              </item>
-             </layout>
-            </item>
-            <item row="6" column="0">
-             <widget class="QLabel" name="labelBaseValue">
-              <property name="text">
-               <string>Base value:</string>
-              </property>
-             </widget>
-            </item>
-            <item row="7" column="0">
-             <widget class="QLabel" name="labelInSizes">
-              <property name="text">
-               <string>In sizes:</string>
-              </property>
-             </widget>
-            </item>
-            <item row="8" column="0">
-             <widget class="QLabel" name="labelInHeights">
-              <property name="text">
-               <string>In heights:</string>
-              </property>
-             </widget>
-            </item>
-            <item row="10" column="0">
-             <widget class="QLabel" name="label_7">
-              <property name="text">
-               <string>Description:</string>
-              </property>
-             </widget>
-            </item>
-            <item row="10" column="1">
-             <widget class="VPlainTextEdit" name="plainTextEditDescription">
-              <property name="enabled">
-               <bool>false</bool>
-              </property>
-              <property name="sizePolicy">
-               <sizepolicy hsizetype="Expanding" vsizetype="Ignored">
-                <horstretch>0</horstretch>
-                <verstretch>1</verstretch>
-               </sizepolicy>
-              </property>
-              <property name="minimumSize">
-               <size>
-                <width>0</width>
-                <height>28</height>
-               </size>
-              </property>
-             </widget>
-            </item>
-            <item row="0" column="0">
+           <layout class="QVBoxLayout" name="verticalLayout_3">
+            <item>
              <layout class="QHBoxLayout" name="horizontalLayout">
+              <property name="spacing">
+               <number>9</number>
+              </property>
               <item alignment="Qt::AlignLeft">
                <widget class="QToolButton" name="toolButtonTop">
                 <property name="enabled">
@@ -433,23 +282,6 @@
                 </property>
                </widget>
               </item>
-              <item>
-               <spacer name="horizontalSpacer_2">
-                <property name="orientation">
-                 <enum>Qt::Horizontal</enum>
-                </property>
-                <property name="sizeHint" stdset="0">
-                 <size>
-                  <width>5000</width>
-                  <height>20</height>
-                 </size>
-                </property>
-               </spacer>
-              </item>
-             </layout>
-            </item>
-            <item row="0" column="1">
-             <layout class="QHBoxLayout" name="horizontalLayout_3">
               <item>
                <spacer name="horizontalSpacer">
                 <property name="orientation">
@@ -457,13 +289,13 @@
                 </property>
                 <property name="sizeHint" stdset="0">
                  <size>
-                  <width>5000</width>
+                  <width>40</width>
                   <height>20</height>
                  </size>
                 </property>
                </spacer>
               </item>
-              <item alignment="Qt::AlignRight">
+              <item>
                <widget class="QToolButton" name="toolButtonRemove">
                 <property name="enabled">
                  <bool>false</bool>
@@ -482,81 +314,332 @@
               </item>
              </layout>
             </item>
-            <item row="4" column="0">
-             <widget class="QLabel" name="labelCalculated">
-              <property name="text">
-               <string>Calculated value:</string>
+            <item>
+             <layout class="QFormLayout" name="formLayout">
+              <property name="fieldGrowthPolicy">
+               <enum>QFormLayout::ExpandingFieldsGrow</enum>
               </property>
-             </widget>
-            </item>
-            <item row="4" column="1">
-             <widget class="QLabel" name="labelCalculatedValue">
-              <property name="toolTip">
-               <string>Calculated value</string>
-              </property>
-              <property name="text">
-               <string notr="true"/>
-              </property>
-             </widget>
-            </item>
-            <item row="6" column="1">
-             <widget class="QDoubleSpinBox" name="doubleSpinBoxBaseValue">
-              <property name="enabled">
-               <bool>false</bool>
-              </property>
-              <property name="minimum">
-               <double>-10000.000000000000000</double>
-              </property>
-              <property name="maximum">
-               <double>10000.000000000000000</double>
-              </property>
-             </widget>
-            </item>
-            <item row="7" column="1">
-             <widget class="QDoubleSpinBox" name="doubleSpinBoxInSizes">
-              <property name="enabled">
-               <bool>false</bool>
-              </property>
-              <property name="minimum">
-               <double>-10000.000000000000000</double>
-              </property>
-              <property name="maximum">
-               <double>10000.000000000000000</double>
-              </property>
-             </widget>
-            </item>
-            <item row="8" column="1">
-             <widget class="QDoubleSpinBox" name="doubleSpinBoxInHeights">
-              <property name="enabled">
-               <bool>false</bool>
-              </property>
-              <property name="minimum">
-               <double>-10000.000000000000000</double>
-              </property>
-              <property name="maximum">
-               <double>10000.000000000000000</double>
-              </property>
-             </widget>
-            </item>
-            <item row="9" column="0">
-             <widget class="QLabel" name="labelFullName">
-              <property name="text">
-               <string>Full name:</string>
-              </property>
-             </widget>
-            </item>
-            <item row="9" column="1">
-             <widget class="QLineEdit" name="lineEditFullName">
-              <property name="enabled">
-               <bool>false</bool>
-              </property>
-              <property name="toolTip">
-               <string/>
-              </property>
-              <property name="placeholderText">
-               <string>Measurement's human-readable name.</string>
-              </property>
-             </widget>
+              <item row="0" column="0">
+               <widget class="QLabel" name="labelMUnits">
+                <property name="text">
+                 <string>Units:</string>
+                </property>
+               </widget>
+              </item>
+              <item row="0" column="1">
+               <widget class="QComboBox" name="comboBoxMUnits">
+                <property name="enabled">
+                 <bool>false</bool>
+                </property>
+                <property name="sizePolicy">
+                 <sizepolicy hsizetype="MinimumExpanding" vsizetype="Fixed">
+                  <horstretch>0</horstretch>
+                  <verstretch>0</verstretch>
+                 </sizepolicy>
+                </property>
+               </widget>
+              </item>
+              <item row="2" column="0">
+               <widget class="QLabel" name="label">
+                <property name="text">
+                 <string>Name:</string>
+                </property>
+               </widget>
+              </item>
+              <item row="2" column="1">
+               <widget class="QLineEdit" name="lineEditName">
+                <property name="enabled">
+                 <bool>false</bool>
+                </property>
+                <property name="toolTip">
+                 <string>Measurement's name in a formula</string>
+                </property>
+                <property name="placeholderText">
+                 <string>Measurement's name in a formula.</string>
+                </property>
+               </widget>
+              </item>
+              <item row="3" column="0">
+               <widget class="QLabel" name="labelCalculated">
+                <property name="text">
+                 <string>Calculated value:</string>
+                </property>
+               </widget>
+              </item>
+              <item row="3" column="1">
+               <widget class="QLabel" name="labelCalculatedValue">
+                <property name="toolTip">
+                 <string>Calculated value</string>
+                </property>
+                <property name="text">
+                 <string notr="true"/>
+                </property>
+               </widget>
+              </item>
+              <item row="4" column="0">
+               <widget class="QLabel" name="labelFormula">
+                <property name="text">
+                 <string>Formula:</string>
+                </property>
+               </widget>
+              </item>
+              <item row="4" column="1">
+               <layout class="QHBoxLayout" name="horizontalLayoutValue">
+                <item>
+                 <widget class="VPlainTextEdit" name="plainTextEditFormula">
+                  <property name="enabled">
+                   <bool>false</bool>
+                  </property>
+                  <property name="sizePolicy">
+                   <sizepolicy hsizetype="Expanding" vsizetype="Preferred">
+                    <horstretch>0</horstretch>
+                    <verstretch>0</verstretch>
+                   </sizepolicy>
+                  </property>
+                  <property name="maximumSize">
+                   <size>
+                    <width>16777215</width>
+                    <height>28</height>
+                   </size>
+                  </property>
+                  <property name="tabChangesFocus">
+                   <bool>true</bool>
+                  </property>
+                 </widget>
+                </item>
+                <item>
+                 <widget class="QPushButton" name="pushButtonGrow">
+                  <property name="enabled">
+                   <bool>false</bool>
+                  </property>
+                  <property name="maximumSize">
+                   <size>
+                    <width>18</width>
+                    <height>18</height>
+                   </size>
+                  </property>
+                  <property name="sizeIncrement">
+                   <size>
+                    <width>0</width>
+                    <height>0</height>
+                   </size>
+                  </property>
+                  <property name="toolTip">
+                   <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Show full calculation in message box&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
+                  </property>
+                  <property name="text">
+                   <string notr="true"/>
+                  </property>
+                  <property name="icon">
+                   <iconset theme="go-down">
+                    <normaloff>../../libs/vtools/dialogs/support</normaloff>../../libs/vtools/dialogs/support</iconset>
+                  </property>
+                  <property name="iconSize">
+                   <size>
+                    <width>16</width>
+                    <height>16</height>
+                   </size>
+                  </property>
+                  <property name="flat">
+                   <bool>true</bool>
+                  </property>
+                 </widget>
+                </item>
+                <item>
+                 <widget class="QToolButton" name="toolButtonExpr">
+                  <property name="enabled">
+                   <bool>false</bool>
+                  </property>
+                  <property name="toolTip">
+                   <string>Function Wizard</string>
+                  </property>
+                  <property name="text">
+                   <string notr="true">...</string>
+                  </property>
+                  <property name="icon">
+                   <iconset>
+                    <normaloff>:/tapeicon/24x24/fx.png</normaloff>:/tapeicon/24x24/fx.png</iconset>
+                  </property>
+                  <property name="iconSize">
+                   <size>
+                    <width>24</width>
+                    <height>24</height>
+                   </size>
+                  </property>
+                 </widget>
+                </item>
+               </layout>
+              </item>
+              <item row="5" column="0">
+               <widget class="QLabel" name="labelBaseValue">
+                <property name="text">
+                 <string>Base value:</string>
+                </property>
+               </widget>
+              </item>
+              <item row="5" column="1">
+               <widget class="QDoubleSpinBox" name="doubleSpinBoxBaseValue">
+                <property name="enabled">
+                 <bool>false</bool>
+                </property>
+                <property name="minimum">
+                 <double>-10000.000000000000000</double>
+                </property>
+                <property name="maximum">
+                 <double>10000.000000000000000</double>
+                </property>
+               </widget>
+              </item>
+              <item row="6" column="0">
+               <widget class="QLabel" name="labelShiftA">
+                <property name="text">
+                 <string notr="true">Shift A</string>
+                </property>
+               </widget>
+              </item>
+              <item row="6" column="1">
+               <widget class="QDoubleSpinBox" name="doubleSpinBoxShiftA">
+                <property name="enabled">
+                 <bool>false</bool>
+                </property>
+                <property name="minimum">
+                 <double>-10000.000000000000000</double>
+                </property>
+                <property name="maximum">
+                 <double>10000.000000000000000</double>
+                </property>
+               </widget>
+              </item>
+              <item row="7" column="0">
+               <widget class="QLabel" name="labelShiftB">
+                <property name="text">
+                 <string>Shift B</string>
+                </property>
+               </widget>
+              </item>
+              <item row="7" column="1">
+               <widget class="QDoubleSpinBox" name="doubleSpinBoxShiftB">
+                <property name="enabled">
+                 <bool>false</bool>
+                </property>
+                <property name="minimum">
+                 <double>-10000.000000000000000</double>
+                </property>
+                <property name="maximum">
+                 <double>10000.000000000000000</double>
+                </property>
+               </widget>
+              </item>
+              <item row="8" column="0">
+               <widget class="QLabel" name="labelShiftC">
+                <property name="text">
+                 <string>Shift C</string>
+                </property>
+               </widget>
+              </item>
+              <item row="8" column="1">
+               <widget class="QDoubleSpinBox" name="doubleSpinBoxShiftC">
+                <property name="enabled">
+                 <bool>false</bool>
+                </property>
+                <property name="minimum">
+                 <double>-10000.000000000000000</double>
+                </property>
+                <property name="maximum">
+                 <double>10000.000000000000000</double>
+                </property>
+               </widget>
+              </item>
+              <item row="9" column="0">
+               <widget class="QLabel" name="labelCorrection">
+                <property name="text">
+                 <string>Correction:</string>
+                </property>
+               </widget>
+              </item>
+              <item row="9" column="1">
+               <widget class="QDoubleSpinBox" name="doubleSpinBoxCorrection">
+                <property name="enabled">
+                 <bool>false</bool>
+                </property>
+                <property name="minimum">
+                 <double>-10000.000000000000000</double>
+                </property>
+                <property name="maximum">
+                 <double>10000.000000000000000</double>
+                </property>
+               </widget>
+              </item>
+              <item row="10" column="0">
+               <widget class="QLabel" name="labelFullName">
+                <property name="text">
+                 <string>Full name:</string>
+                </property>
+               </widget>
+              </item>
+              <item row="10" column="1">
+               <widget class="QLineEdit" name="lineEditFullName">
+                <property name="enabled">
+                 <bool>false</bool>
+                </property>
+                <property name="toolTip">
+                 <string/>
+                </property>
+                <property name="placeholderText">
+                 <string>Measurement's human-readable name.</string>
+                </property>
+               </widget>
+              </item>
+              <item row="11" column="0">
+               <widget class="QLabel" name="label_7">
+                <property name="text">
+                 <string>Description:</string>
+                </property>
+               </widget>
+              </item>
+              <item row="11" column="1">
+               <widget class="VPlainTextEdit" name="plainTextEditDescription">
+                <property name="enabled">
+                 <bool>false</bool>
+                </property>
+                <property name="sizePolicy">
+                 <sizepolicy hsizetype="Expanding" vsizetype="Ignored">
+                  <horstretch>0</horstretch>
+                  <verstretch>1</verstretch>
+                 </sizepolicy>
+                </property>
+                <property name="minimumSize">
+                 <size>
+                  <width>0</width>
+                  <height>28</height>
+                 </size>
+                </property>
+               </widget>
+              </item>
+              <item row="1" column="0">
+               <widget class="QLabel" name="labelDimension">
+                <property name="text">
+                 <string>Dimension:</string>
+                </property>
+               </widget>
+              </item>
+              <item row="1" column="1">
+               <widget class="QComboBox" name="comboBoxDimension">
+                <property name="enabled">
+                 <bool>false</bool>
+                </property>
+                <property name="sizePolicy">
+                 <sizepolicy hsizetype="MinimumExpanding" vsizetype="Fixed">
+                  <horstretch>0</horstretch>
+                  <verstretch>0</verstretch>
+                 </sizepolicy>
+                </property>
+                <property name="toolTip">
+                 <string>Select one of the dimensions to later use the measurement value in piece label</string>
+                </property>
+               </widget>
+              </item>
+             </layout>
             </item>
            </layout>
           </widget>
@@ -566,267 +649,313 @@
       </widget>
       <widget class="QWidget" name="tabInformation">
        <attribute name="icon">
-        <iconset resource="share/resources/tapeicon.qrc">
+        <iconset>
          <normaloff>:/tapeicon/16x16/info.png</normaloff>:/tapeicon/16x16/info.png</iconset>
        </attribute>
        <attribute name="title">
         <string>Information</string>
        </attribute>
-       <layout class="QFormLayout" name="formLayout_2">
-        <item row="0" column="0">
-         <widget class="QLabel" name="label_21">
-          <property name="text">
-           <string>Type:</string>
+       <layout class="QVBoxLayout" name="verticalLayout">
+        <item>
+         <layout class="QFormLayout" name="formLayout_2">
+          <property name="fieldGrowthPolicy">
+           <enum>QFormLayout::ExpandingFieldsGrow</enum>
           </property>
-         </widget>
-        </item>
-        <item row="0" column="1">
-         <widget class="QLabel" name="labelMType">
-          <property name="text">
-           <string>Measurement type</string>
-          </property>
-         </widget>
-        </item>
-        <item row="1" column="0">
-         <widget class="QLabel" name="label_9">
-          <property name="text">
-           <string>Path:</string>
-          </property>
-         </widget>
-        </item>
-        <item row="1" column="1">
-         <layout class="QHBoxLayout" name="horizontalLayoutPath">
-          <item>
-           <widget class="QLineEdit" name="lineEditPathToFile">
-            <property name="sizePolicy">
-             <sizepolicy hsizetype="Expanding" vsizetype="Fixed">
-              <horstretch>0</horstretch>
-              <verstretch>0</verstretch>
-             </sizepolicy>
-            </property>
-            <property name="autoFillBackground">
-             <bool>false</bool>
-            </property>
-            <property name="styleSheet">
-             <string notr="true">background: transparent;</string>
-            </property>
-            <property name="frame">
-             <bool>false</bool>
-            </property>
-            <property name="readOnly">
-             <bool>true</bool>
-            </property>
-            <property name="placeholderText">
-             <string notr="true">Path to the measurement file</string>
+          <item row="0" column="0">
+           <widget class="QLabel" name="label_21">
+            <property name="text">
+             <string>Type:</string>
             </property>
            </widget>
           </item>
-          <item alignment="Qt::AlignRight">
-           <widget class="QPushButton" name="pushButtonShowInExplorer">
+          <item row="0" column="1">
+           <widget class="QLabel" name="labelMType">
+            <property name="text">
+             <string>Measurement type</string>
+            </property>
+           </widget>
+          </item>
+          <item row="1" column="0">
+           <widget class="QLabel" name="label_9">
+            <property name="text">
+             <string>Path:</string>
+            </property>
+           </widget>
+          </item>
+          <item row="1" column="1">
+           <layout class="QHBoxLayout" name="horizontalLayoutPath">
+            <item>
+             <widget class="QLineEdit" name="lineEditPathToFile">
+              <property name="sizePolicy">
+               <sizepolicy hsizetype="Expanding" vsizetype="Fixed">
+                <horstretch>0</horstretch>
+                <verstretch>0</verstretch>
+               </sizepolicy>
+              </property>
+              <property name="autoFillBackground">
+               <bool>false</bool>
+              </property>
+              <property name="styleSheet">
+               <string notr="true">background: transparent;</string>
+              </property>
+              <property name="frame">
+               <bool>false</bool>
+              </property>
+              <property name="readOnly">
+               <bool>true</bool>
+              </property>
+              <property name="placeholderText">
+               <string notr="true">Path to the measurement file</string>
+              </property>
+             </widget>
+            </item>
+            <item alignment="Qt::AlignRight">
+             <widget class="QPushButton" name="pushButtonShowInExplorer">
+              <property name="enabled">
+               <bool>false</bool>
+              </property>
+              <property name="sizePolicy">
+               <sizepolicy hsizetype="Minimum" vsizetype="Preferred">
+                <horstretch>0</horstretch>
+                <verstretch>0</verstretch>
+               </sizepolicy>
+              </property>
+              <property name="text">
+               <string>Show in Explorer</string>
+              </property>
+             </widget>
+            </item>
+           </layout>
+          </item>
+          <item row="2" column="0">
+           <widget class="QLabel" name="labelPMSystem">
+            <property name="text">
+             <string>PM system:</string>
+            </property>
+           </widget>
+          </item>
+          <item row="2" column="1">
+           <widget class="QComboBox" name="comboBoxPMSystem">
             <property name="enabled">
              <bool>false</bool>
             </property>
             <property name="sizePolicy">
-             <sizepolicy hsizetype="Minimum" vsizetype="Preferred">
+             <sizepolicy hsizetype="MinimumExpanding" vsizetype="Preferred">
+              <horstretch>0</horstretch>
+              <verstretch>0</verstretch>
+             </sizepolicy>
+            </property>
+            <property name="minimumSize">
+             <size>
+              <width>0</width>
+              <height>0</height>
+             </size>
+            </property>
+           </widget>
+          </item>
+          <item row="3" column="0">
+           <widget class="QLabel" name="labelBaseValues">
+            <property name="sizePolicy">
+             <sizepolicy hsizetype="Preferred" vsizetype="Expanding">
               <horstretch>0</horstretch>
               <verstretch>0</verstretch>
              </sizepolicy>
             </property>
             <property name="text">
-             <string>Show in Explorer</string>
+             <string>Base Values:</string>
+            </property>
+            <property name="alignment">
+             <set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter</set>
             </property>
            </widget>
           </item>
+          <item row="4" column="0">
+           <widget class="QLabel" name="labelCustomerName">
+            <property name="text">
+             <string>Customer name:</string>
+            </property>
+           </widget>
+          </item>
+          <item row="4" column="1">
+           <widget class="QLineEdit" name="lineEditCustomerName">
+            <property name="enabled">
+             <bool>false</bool>
+            </property>
+            <property name="sizePolicy">
+             <sizepolicy hsizetype="Expanding" vsizetype="Preferred">
+              <horstretch>0</horstretch>
+              <verstretch>0</verstretch>
+             </sizepolicy>
+            </property>
+            <property name="placeholderText">
+             <string>Customer's name</string>
+            </property>
+           </widget>
+          </item>
+          <item row="5" column="0">
+           <widget class="QLabel" name="labelBirthDate">
+            <property name="text">
+             <string>Birth date:</string>
+            </property>
+           </widget>
+          </item>
+          <item row="5" column="1">
+           <widget class="QDateEdit" name="dateEditBirthDate">
+            <property name="enabled">
+             <bool>false</bool>
+            </property>
+            <property name="sizePolicy">
+             <sizepolicy hsizetype="Preferred" vsizetype="Preferred">
+              <horstretch>0</horstretch>
+              <verstretch>0</verstretch>
+             </sizepolicy>
+            </property>
+            <property name="minimumSize">
+             <size>
+              <width>124</width>
+              <height>0</height>
+             </size>
+            </property>
+            <property name="displayFormat">
+             <string notr="true">yyyy-MM-dd</string>
+            </property>
+            <property name="calendarPopup">
+             <bool>true</bool>
+            </property>
+            <property name="currentSectionIndex">
+             <number>0</number>
+            </property>
+            <property name="date">
+             <date>
+              <year>1800</year>
+              <month>1</month>
+              <day>1</day>
+             </date>
+            </property>
+           </widget>
+          </item>
+          <item row="6" column="0">
+           <widget class="QLabel" name="labelGender">
+            <property name="text">
+             <string>Gender:</string>
+            </property>
+           </widget>
+          </item>
+          <item row="6" column="1">
+           <widget class="QComboBox" name="comboBoxGender">
+            <property name="enabled">
+             <bool>false</bool>
+            </property>
+            <property name="sizePolicy">
+             <sizepolicy hsizetype="MinimumExpanding" vsizetype="Preferred">
+              <horstretch>0</horstretch>
+              <verstretch>0</verstretch>
+             </sizepolicy>
+            </property>
+           </widget>
+          </item>
+          <item row="7" column="0">
+           <widget class="QLabel" name="labelEmail">
+            <property name="text">
+             <string>Email:</string>
+            </property>
+           </widget>
+          </item>
+          <item row="7" column="1">
+           <widget class="QLineEdit" name="lineEditEmail">
+            <property name="enabled">
+             <bool>false</bool>
+            </property>
+            <property name="sizePolicy">
+             <sizepolicy hsizetype="Expanding" vsizetype="Preferred">
+              <horstretch>0</horstretch>
+              <verstretch>0</verstretch>
+             </sizepolicy>
+            </property>
+            <property name="placeholderText">
+             <string>Customer's email address</string>
+            </property>
+           </widget>
+          </item>
+          <item row="8" column="0">
+           <widget class="QLabel" name="labelNotes">
+            <property name="text">
+             <string>Notes:</string>
+            </property>
+           </widget>
+          </item>
+          <item row="8" column="1">
+           <widget class="VPlainTextEdit" name="plainTextEditNotes">
+            <property name="enabled">
+             <bool>false</bool>
+            </property>
+            <property name="sizePolicy">
+             <sizepolicy hsizetype="Expanding" vsizetype="Expanding">
+              <horstretch>0</horstretch>
+              <verstretch>1</verstretch>
+             </sizepolicy>
+            </property>
+           </widget>
+          </item>
+          <item row="3" column="1">
+           <widget class="QFrame" name="frameBaseValue">
+            <property name="frameShape">
+             <enum>QFrame::Box</enum>
+            </property>
+            <property name="frameShadow">
+             <enum>QFrame::Sunken</enum>
+            </property>
+            <property name="lineWidth">
+             <number>1</number>
+            </property>
+            <layout class="QFormLayout" name="formLayout_4">
+             <item row="0" column="0">
+              <widget class="QLabel" name="labelDimensionA">
+               <property name="text">
+                <string notr="true">A</string>
+               </property>
+              </widget>
+             </item>
+             <item row="0" column="1">
+              <widget class="QLabel" name="labelDimensionABase">
+               <property name="text">
+                <string notr="true">Base</string>
+               </property>
+              </widget>
+             </item>
+             <item row="1" column="0">
+              <widget class="QLabel" name="labelDimensionB">
+               <property name="text">
+                <string notr="true">B</string>
+               </property>
+              </widget>
+             </item>
+             <item row="1" column="1">
+              <widget class="QLabel" name="labelDimensionBBase">
+               <property name="text">
+                <string notr="true">Base</string>
+               </property>
+              </widget>
+             </item>
+             <item row="2" column="0">
+              <widget class="QLabel" name="labelDimensionC">
+               <property name="text">
+                <string notr="true">C</string>
+               </property>
+              </widget>
+             </item>
+             <item row="2" column="1">
+              <widget class="QLabel" name="labelDimensionCBase">
+               <property name="text">
+                <string notr="true">Base</string>
+               </property>
+              </widget>
+             </item>
+            </layout>
+           </widget>
+          </item>
          </layout>
         </item>
-        <item row="2" column="0">
-         <widget class="QLabel" name="labelPMSystem">
-          <property name="text">
-           <string>PM system:</string>
-          </property>
-         </widget>
-        </item>
-        <item row="2" column="1">
-         <widget class="QComboBox" name="comboBoxPMSystem">
-          <property name="enabled">
-           <bool>false</bool>
-          </property>
-          <property name="sizePolicy">
-           <sizepolicy hsizetype="MinimumExpanding" vsizetype="Preferred">
-            <horstretch>0</horstretch>
-            <verstretch>0</verstretch>
-           </sizepolicy>
-          </property>
-          <property name="minimumSize">
-           <size>
-            <width>0</width>
-            <height>0</height>
-           </size>
-          </property>
-         </widget>
-        </item>
-        <item row="3" column="0">
-         <widget class="QLabel" name="labelBaseSize">
-          <property name="text">
-           <string>Base size:</string>
-          </property>
-         </widget>
-        </item>
-        <item row="3" column="1">
-         <widget class="QLabel" name="labelBaseSizeValue">
-          <property name="text">
-           <string>Base size value</string>
-          </property>
-         </widget>
-        </item>
-        <item row="4" column="0">
-         <widget class="QLabel" name="labelBaseHeight">
-          <property name="text">
-           <string>Base height:</string>
-          </property>
-         </widget>
-        </item>
-        <item row="4" column="1">
-         <widget class="QLabel" name="labelBaseHeightValue">
-          <property name="text">
-           <string>Base height value</string>
-          </property>
-         </widget>
-        </item>
-        <item row="5" column="0">
-         <widget class="QLabel" name="labelCustomerName">
-          <property name="text">
-           <string>Customer name:</string>
-          </property>
-         </widget>
-        </item>
-        <item row="5" column="1">
-         <widget class="QLineEdit" name="lineEditCustomerName">
-          <property name="enabled">
-           <bool>false</bool>
-          </property>
-          <property name="sizePolicy">
-           <sizepolicy hsizetype="Expanding" vsizetype="Preferred">
-            <horstretch>0</horstretch>
-            <verstretch>0</verstretch>
-           </sizepolicy>
-          </property>
-          <property name="placeholderText">
-           <string>Customer's name</string>
-          </property>
-         </widget>
-        </item>
-        <item row="6" column="0">
-         <widget class="QLabel" name="labelBirthDate">
-          <property name="text">
-           <string>Birth date:</string>
-          </property>
-         </widget>
-        </item>
-        <item row="6" column="1">
-         <widget class="QDateEdit" name="dateEditBirthDate">
-          <property name="enabled">
-           <bool>false</bool>
-          </property>
-          <property name="sizePolicy">
-           <sizepolicy hsizetype="MinimumExpanding" vsizetype="Preferred">
-            <horstretch>0</horstretch>
-            <verstretch>0</verstretch>
-           </sizepolicy>
-          </property>
-          <property name="minimumSize">
-           <size>
-            <width>124</width>
-            <height>0</height>
-           </size>
-          </property>
-          <property name="displayFormat">
-           <string notr="true">yyyy-MM-dd</string>
-          </property>
-          <property name="calendarPopup">
-           <bool>true</bool>
-          </property>
-          <property name="currentSectionIndex">
-           <number>0</number>
-          </property>
-          <property name="date">
-           <date>
-            <year>1800</year>
-            <month>1</month>
-            <day>1</day>
-           </date>
-          </property>
-         </widget>
-        </item>
-        <item row="7" column="0">
-         <widget class="QLabel" name="labelGender">
-          <property name="text">
-           <string>Gender:</string>
-          </property>
-         </widget>
-        </item>
-        <item row="7" column="1">
-         <widget class="QComboBox" name="comboBoxGender">
-          <property name="enabled">
-           <bool>false</bool>
-          </property>
-          <property name="sizePolicy">
-           <sizepolicy hsizetype="MinimumExpanding" vsizetype="Preferred">
-            <horstretch>0</horstretch>
-            <verstretch>0</verstretch>
-           </sizepolicy>
-          </property>
-          <property name="minimumSize">
-           <size>
-            <width>0</width>
-            <height>0</height>
-           </size>
-          </property>
-         </widget>
-        </item>
-        <item row="8" column="0">
-         <widget class="QLabel" name="labelEmail">
-          <property name="text">
-           <string>Email:</string>
-          </property>
-         </widget>
-        </item>
-        <item row="8" column="1">
-         <widget class="QLineEdit" name="lineEditEmail">
-          <property name="enabled">
-           <bool>false</bool>
-          </property>
-          <property name="sizePolicy">
-           <sizepolicy hsizetype="Expanding" vsizetype="Preferred">
-            <horstretch>0</horstretch>
-            <verstretch>0</verstretch>
-           </sizepolicy>
-          </property>
-          <property name="placeholderText">
-           <string>Customer's email address</string>
-          </property>
-         </widget>
-        </item>
-        <item row="9" column="0">
-         <widget class="QLabel" name="labelNotes">
-          <property name="text">
-           <string>Notes:</string>
-          </property>
-         </widget>
-        </item>
-        <item row="9" column="1">
-         <widget class="VPlainTextEdit" name="plainTextEditNotes">
-          <property name="enabled">
-           <bool>false</bool>
-          </property>
-          <property name="sizePolicy">
-           <sizepolicy hsizetype="Expanding" vsizetype="Expanding">
-            <horstretch>0</horstretch>
-            <verstretch>1</verstretch>
-           </sizepolicy>
-          </property>
-         </widget>
-        </item>
        </layout>
       </widget>
      </widget>
@@ -838,8 +967,8 @@
     <rect>
      <x>0</x>
      <y>0</y>
-     <width>835</width>
-     <height>22</height>
+     <width>1188</width>
+     <height>21</height>
     </rect>
    </property>
    <widget class="QMenu" name="menuFile">
@@ -857,6 +986,7 @@
     <addaction name="actionSaveAs"/>
     <addaction name="actionExportToCSV"/>
     <addaction name="actionImportFromCSV"/>
+    <addaction name="actionExportToIndividual"/>
     <addaction name="separator"/>
     <addaction name="actionReadOnly"/>
     <addaction name="separator"/>
@@ -885,6 +1015,10 @@
     <addaction name="actionDatabase"/>
     <addaction name="actionImportFromPattern"/>
     <addaction name="actionMeasurementDiagram"/>
+    <addaction name="actionUseFullCircumference"/>
+    <addaction name="actionRestrictSecondDimension"/>
+    <addaction name="actionRestrictThirdDimension"/>
+    <addaction name="actionDimensionLabels"/>
    </widget>
    <addaction name="menuFile"/>
    <addaction name="menuMeasurements"/>
@@ -1075,7 +1209,7 @@
     <bool>false</bool>
    </property>
    <property name="icon">
-    <iconset resource="share/resources/tapeicon.qrc">
+    <iconset>
      <normaloff>:/tapeicon/24x24/red_plus.png</normaloff>:/tapeicon/24x24/red_plus.png</iconset>
    </property>
    <property name="text">
@@ -1090,7 +1224,7 @@
     <bool>false</bool>
    </property>
    <property name="icon">
-    <iconset resource="share/resources/tapeicon.qrc">
+    <iconset>
      <normaloff>:/tapeicon/24x24/orange_plus.png</normaloff>:/tapeicon/24x24/orange_plus.png</iconset>
    </property>
    <property name="text">
@@ -1108,7 +1242,7 @@
     <bool>false</bool>
    </property>
    <property name="icon">
-    <iconset resource="share/resources/tapeicon.qrc">
+    <iconset>
      <normaloff>:/tapeicon/24x24/padlock_opened.png</normaloff>:/tapeicon/24x24/padlock_opened.png</iconset>
    </property>
    <property name="text">
@@ -1216,7 +1350,7 @@
     <bool>true</bool>
    </property>
    <property name="icon">
-    <iconset resource="share/resources/tapeicon.qrc">
+    <iconset>
      <normaloff>:/tapeicon/24x24/mannequin.png</normaloff>:/tapeicon/24x24/mannequin.png</iconset>
    </property>
    <property name="text">
@@ -1226,6 +1360,70 @@
     <enum>QAction::NoRole</enum>
    </property>
   </action>
+  <action name="actionExportToIndividual">
+   <property name="checkable">
+    <bool>false</bool>
+   </property>
+   <property name="enabled">
+    <bool>false</bool>
+   </property>
+   <property name="text">
+    <string>Export to individual</string>
+   </property>
+   <property name="toolTip">
+    <string>Export to individual measurements</string>
+   </property>
+   <property name="visible">
+    <bool>false</bool>
+   </property>
+   <property name="menuRole">
+    <enum>QAction::NoRole</enum>
+   </property>
+  </action>
+  <action name="actionUseFullCircumference">
+   <property name="checkable">
+    <bool>true</bool>
+   </property>
+   <property name="text">
+    <string>Use full circumference</string>
+   </property>
+   <property name="visible">
+    <bool>false</bool>
+   </property>
+  </action>
+  <action name="actionRestrictSecondDimension">
+   <property name="enabled">
+    <bool>false</bool>
+   </property>
+   <property name="text">
+    <string>Restrict second dimension</string>
+   </property>
+   <property name="visible">
+    <bool>false</bool>
+   </property>
+  </action>
+  <action name="actionRestrictThirdDimension">
+   <property name="enabled">
+    <bool>false</bool>
+   </property>
+   <property name="text">
+    <string>Restrict third dimension</string>
+   </property>
+   <property name="visible">
+    <bool>false</bool>
+   </property>
+  </action>
+  <action name="actionDimensionLabels">
+   <property name="enabled">
+    <bool>false</bool>
+   </property>
+   <property name="text">
+    <string>Dimension labels</string>
+   </property>
+   <property name="visible">
+    <bool>false</bool>
+   </property>
+  </action>
  </widget>
  <layoutdefault spacing="6" margin="11"/>
  <customwidgets>
@@ -1235,9 +1433,7 @@
    <header location="global">vplaintextedit.h</header>
   </customwidget>
  </customwidgets>
- <resources>
-  <include location="share/resources/tapeicon.qrc"/>
- </resources>
+ <resources/>
  <connections>
   <connection>
    <sender>actionMeasurementDiagram</sender>
diff --git a/src/app/valentina/core/vapplication.cpp b/src/app/valentina/core/vapplication.cpp
index 4392fd613..e76c3d7ab 100644
--- a/src/app/valentina/core/vapplication.cpp
+++ b/src/app/valentina/core/vapplication.cpp
@@ -150,7 +150,7 @@ inline void noisyFailureMsgHandler(QtMsgType type, const QMessageLogContext &con
     const bool isPatternMessage = qApp->IsPatternMessage(msg);
     if (isPatternMessage)
     {
-        logMsg = logMsg.remove(VAbstractApplication::patternMessageSignature);
+        logMsg = logMsg.remove(VAbstractValApplication::patternMessageSignature);
     }
 
     {
@@ -249,7 +249,7 @@ inline void noisyFailureMsgHandler(QtMsgType type, const QMessageLogContext &con
                             break;
                     }
 
-                    messageBox.setText(VAbstractApplication::ClearMessage(logMsg));
+                    messageBox.setText(VAbstractValApplication::ClearMessage(logMsg));
                     messageBox.setStandardButtons(QMessageBox::Ok);
                     messageBox.setWindowModality(Qt::ApplicationModal);
                     messageBox.setModal(true);
@@ -287,7 +287,7 @@ inline void noisyFailureMsgHandler(QtMsgType type, const QMessageLogContext &con
  * @param argv command line.
  */
 VApplication::VApplication(int &argc, char **argv)
-    : VAbstractApplication(argc, argv),
+    : VAbstractValApplication(argc, argv),
       trVars(nullptr),
       autoSaveTimer(nullptr),
       lockLog(),
diff --git a/src/app/valentina/core/vapplication.h b/src/app/valentina/core/vapplication.h
index d01d0f2ab..b025e82b3 100644
--- a/src/app/valentina/core/vapplication.h
+++ b/src/app/valentina/core/vapplication.h
@@ -29,11 +29,12 @@
 #ifndef VAPPLICATION_H
 #define VAPPLICATION_H
 
-#include "../vmisc/vabstractapplication.h"
+#include "../vmisc/vabstractvalapplication.h"
 #include "../vwidgets/vmaingraphicsview.h"
 #include "../vpatterndb/vtranslatevars.h"
 #include "vsettings.h"
 #include "vcmdexport.h"
+#include "vlockguard.h"
 
 class VApplication;// use in define
 
@@ -45,7 +46,7 @@ class VApplication;// use in define
 /**
  * @brief The VApplication class reimplamentation QApplication class.
  */
-class VApplication : public VAbstractApplication
+class VApplication : public VAbstractValApplication
 {
     Q_OBJECT
 public:
@@ -114,7 +115,5 @@ inline void VApplication::setAutoSaveTimer(QTimer *value)
 {
     autoSaveTimer = value;
 }
-//---------------------------------------------------------------------------------------------------------------------
-
 
 #endif // VAPPLICATION_H
diff --git a/src/app/valentina/core/vcmdexport.cpp b/src/app/valentina/core/vcmdexport.cpp
index e8354c418..3cdde15a6 100644
--- a/src/app/valentina/core/vcmdexport.cpp
+++ b/src/app/valentina/core/vcmdexport.cpp
@@ -506,40 +506,68 @@ bool VCommandLine::IsGuiEnabled() const
 }
 
 //---------------------------------------------------------------------------------------------------------------------
-bool VCommandLine::IsSetGradationSize() const
+bool VCommandLine::IsSetDimensionA() const
 {
-    return IsOptionSet(LONG_OPTION_GRADATIONSIZE);
+    return IsOptionSet(LONG_OPTION_DIMENSION_A);
 }
 
 //---------------------------------------------------------------------------------------------------------------------
-bool VCommandLine::IsSetGradationHeight() const
+bool VCommandLine::IsSetDimensionB() const
 {
-    return IsOptionSet(LONG_OPTION_GRADATIONHEIGHT);
+    return IsOptionSet(LONG_OPTION_DIMENSION_B);
 }
 
 //---------------------------------------------------------------------------------------------------------------------
-QString VCommandLine::OptGradationSize() const
+bool VCommandLine::IsSetDimensionC() const
 {
-    const QString size = OptionValue(LONG_OPTION_GRADATIONSIZE);
-    if (VMeasurement::IsGradationSizeValid(size))
+    return IsOptionSet(LONG_OPTION_DIMENSION_C);
+}
+
+//---------------------------------------------------------------------------------------------------------------------
+int VCommandLine::OptDimensionA() const
+{
+    const QString value = OptionValue(LONG_OPTION_DIMENSION_A);
+
+    bool ok = false;
+    int dimensionAValue = value.toInt(&ok);
+    if(ok && dimensionAValue > 0)
     {
-        return size;
+        return dimensionAValue;
     }
 
-    qCritical() << translate("VCommandLine", "Invalid gradation size value.") << "\n";
+    qCritical() << translate("VCommandLine", "Invalid dimension A value.") << "\n";
     const_cast<VCommandLine*>(this)->parser.showHelp(V_EX_USAGE);
 }
 
 //---------------------------------------------------------------------------------------------------------------------
-QString VCommandLine::OptGradationHeight() const
+int VCommandLine::OptDimensionB() const
 {
-    const QString height = OptionValue(LONG_OPTION_GRADATIONHEIGHT);
-    if (VMeasurement::IsGradationHeightValid(height))
+    const QString value = OptionValue(LONG_OPTION_DIMENSION_B);
+
+    bool ok = false;
+    int dimensionBValue = value.toInt(&ok);
+    if(ok && dimensionBValue > 0)
     {
-        return height;
+        return dimensionBValue;
     }
 
-    qCritical() << translate("VCommandLine", "Invalid gradation height value.") << "\n";
+    qCritical() << translate("VCommandLine", "Invalid dimension B value.") << "\n";
+    const_cast<VCommandLine*>(this)->parser.showHelp(V_EX_USAGE);
+}
+
+//---------------------------------------------------------------------------------------------------------------------
+int VCommandLine::OptDimensionC() const
+{
+    const QString value = OptionValue(LONG_OPTION_DIMENSION_C);
+
+    bool ok = false;
+    int dimensionCValue = value.toInt(&ok);
+    if(ok && dimensionCValue > 0)
+    {
+        return dimensionCValue;
+    }
+
+    qCritical() << translate("VCommandLine", "Invalid dimension C value.") << "\n";
     const_cast<VCommandLine*>(this)->parser.showHelp(V_EX_USAGE);
 }
 
@@ -635,14 +663,19 @@ void VCommandLine::InitCommandLineOptions()
         {LONG_OPTION_EXPORTSUCHDETAILS,
          translate("VCommandLine", "Export only details that match a piece name regex."),
          translate("VCommandLine", "The name regex")},
-        {{SINGLE_OPTION_GRADATIONSIZE, LONG_OPTION_GRADATIONSIZE},
-         translate("VCommandLine", "Set size value for pattern file, that was opened with multisize measurements "
-         "(export mode). Valid values: %1cm.").arg(VMeasurement::WholeListSizes(Unit::Cm) .join(QStringLiteral(", "))),
-         translate("VCommandLine", "The size value")},
-        {{SINGLE_OPTION_GRADATIONHEIGHT, LONG_OPTION_GRADATIONHEIGHT},
-         translate("VCommandLine", "Set height value for pattern file, that was opened with multisize measurements "
-         "(export mode). Valid values: %1cm.").arg(VMeasurement::WholeListHeights(Unit::Cm).join(QStringLiteral(", "))),
-         translate("VCommandLine", "The height value")},
+
+        {LONG_OPTION_DIMENSION_A,
+         translate("VCommandLine", "Set base for dimension A in the multisize measurements units (export mode)."),
+         translate("VCommandLine", "The dimension A base")},
+
+        {LONG_OPTION_DIMENSION_B,
+         translate("VCommandLine", "Set base for dimension B in the multisize measurements units (export mode)."),
+         translate("VCommandLine", "The dimension B base")},
+
+        {LONG_OPTION_DIMENSION_C,
+         translate("VCommandLine", "Set base for dimension C in the multisize measurements units (export mode)."),
+         translate("VCommandLine", "The dimension C base")},
+
         {LONG_OPTION_USER_MATERIAL,
          translate("VCommandLine", "Use this option to override user material defined in pattern. The value must be in "
          "form <number>@<user matrial name>. The number should be in range from 1 to %1. For example, 1@Fabric2. The "
diff --git a/src/app/valentina/core/vcmdexport.h b/src/app/valentina/core/vcmdexport.h
index b4b8057b7..6bd7eb496 100644
--- a/src/app/valentina/core/vcmdexport.h
+++ b/src/app/valentina/core/vcmdexport.h
@@ -115,11 +115,13 @@ public:
 
     bool IsGuiEnabled()const;
 
-    bool IsSetGradationSize() const;
-    bool IsSetGradationHeight() const;
+    bool IsSetDimensionA() const;
+    bool IsSetDimensionB() const;
+    bool IsSetDimensionC() const;
 
-    QString OptGradationSize() const;
-    QString OptGradationHeight() const;
+    int OptDimensionA() const;
+    int OptDimensionB() const;
+    int OptDimensionC() const;
     
     QMarginsF TiledPageMargins() const;
     VAbstractLayoutDialog::PaperSizeTemplate OptTiledPaperSize() const;
diff --git a/src/app/valentina/core/vtooloptionspropertybrowser.cpp b/src/app/valentina/core/vtooloptionspropertybrowser.cpp
index 2c8f9bd16..874c154cc 100644
--- a/src/app/valentina/core/vtooloptionspropertybrowser.cpp
+++ b/src/app/valentina/core/vtooloptionspropertybrowser.cpp
@@ -2318,7 +2318,7 @@ void VToolOptionsPropertyBrowser::ShowOptionsToolSpline(QGraphicsItem *item)
     VFormula length1(spl.GetC1LengthFormula(), i->getData());
     length1.setCheckZero(false);
     length1.setToolId(i->getId());
-    length1.setPostfix(UnitsToStr(qApp->patternUnit()));
+    length1.setPostfix(UnitsToStr(qApp->patternUnits()));
     length1.Eval();
     AddPropertyFormula(tr("C1: length:"), length1, AttrLength1);
 
@@ -2332,7 +2332,7 @@ void VToolOptionsPropertyBrowser::ShowOptionsToolSpline(QGraphicsItem *item)
     VFormula length2(spl.GetC2LengthFormula(), i->getData());
     length2.setCheckZero(false);
     length2.setToolId(i->getId());
-    length2.setPostfix(UnitsToStr(qApp->patternUnit()));
+    length2.setPostfix(UnitsToStr(qApp->patternUnits()));
     length2.Eval();
     AddPropertyFormula(tr("C2: length:"), length2, AttrLength2);
 
@@ -3046,7 +3046,7 @@ void VToolOptionsPropertyBrowser::UpdateOptionsToolSpline()
     VFormula length1F(spl.GetC1LengthFormula(), i->getData());
     length1F.setCheckZero(false);
     length1F.setToolId(i->getId());
-    length1F.setPostfix(UnitsToStr(qApp->patternUnit()));
+    length1F.setPostfix(UnitsToStr(qApp->patternUnits()));
     length1F.Eval();
     QVariant length1;
     length1.setValue(length1F);
@@ -3064,7 +3064,7 @@ void VToolOptionsPropertyBrowser::UpdateOptionsToolSpline()
     VFormula length2F(spl.GetC2LengthFormula(), i->getData());
     length2F.setCheckZero(false);
     length2F.setToolId(i->getId());
-    length2F.setPostfix(UnitsToStr(qApp->patternUnit()));
+    length2F.setPostfix(UnitsToStr(qApp->patternUnits()));
     length2F.Eval();
     QVariant length2;
     length2.setValue(length2F);
diff --git a/src/app/valentina/dialogs/dialogfinalmeasurements.cpp b/src/app/valentina/dialogs/dialogfinalmeasurements.cpp
index eed634d6a..923e22a69 100644
--- a/src/app/valentina/dialogs/dialogfinalmeasurements.cpp
+++ b/src/app/valentina/dialogs/dialogfinalmeasurements.cpp
@@ -373,7 +373,7 @@ void DialogFinalMeasurements::SaveFormula()
     {
         QTableWidgetItem *result = ui->tableWidget->item(row, 1);
         //Show unit in dialog lable (cm, mm or inch)
-        const QString postfix = UnitsToStr(qApp->patternUnit());
+        const QString postfix = UnitsToStr(qApp->patternUnits());
         ui->labelCalculatedValue->setText(result->text() + QChar(QChar::Space) +postfix);
         return;
     }
@@ -381,7 +381,7 @@ void DialogFinalMeasurements::SaveFormula()
     if (text.isEmpty())
     {
         //Show unit in dialog lable (cm, mm or inch)
-        const QString postfix = UnitsToStr(qApp->patternUnit());
+        const QString postfix = UnitsToStr(qApp->patternUnits());
         ui->labelCalculatedValue->setText(tr("Error") + " (" + postfix + "). " + tr("Empty field."));
         return;
     }
@@ -455,7 +455,7 @@ void DialogFinalMeasurements::Fx()
     dialog->setWindowTitle(tr("Edit measurement"));
     dialog->SetFormula(qApp->TrVars()->TryFormulaFromUser(ui->plainTextEditFormula->toPlainText(),
                                                           qApp->Settings()->GetOsSeparator()));
-    const QString postfix = UnitsToStr(qApp->patternUnit(), true);
+    const QString postfix = UnitsToStr(qApp->patternUnits(), true);
     dialog->setPostfix(postfix);//Show unit in dialog lable (cm, mm or inch)
 
     if (dialog->exec() == QDialog::Accepted)
@@ -513,7 +513,7 @@ void DialogFinalMeasurements::FillFinalMeasurements(bool freshCall)
 //---------------------------------------------------------------------------------------------------------------------
 void DialogFinalMeasurements::ShowUnits()
 {
-    const QString unit = UnitsToStr(qApp->patternUnit());
+    const QString unit = UnitsToStr(qApp->patternUnits());
 
     {
         // calculated value
@@ -554,7 +554,7 @@ void DialogFinalMeasurements::AddCell(const QString &text, int row, int column,
 //---------------------------------------------------------------------------------------------------------------------
 bool DialogFinalMeasurements::EvalUserFormula(const QString &formula, bool fromUser)
 {
-    const QString postfix = UnitsToStr(qApp->patternUnit());//Show unit in dialog lable (cm, mm or inch)
+    const QString postfix = UnitsToStr(qApp->patternUnits());//Show unit in dialog lable (cm, mm or inch)
     if (formula.isEmpty())
     {
         ui->labelCalculatedValue->setText(tr("Error") + " (" + postfix + "). " + tr("Empty field."));
diff --git a/src/app/valentina/dialogs/dialogincrements.cpp b/src/app/valentina/dialogs/dialogincrements.cpp
index 890452cb4..da7c69478 100644
--- a/src/app/valentina/dialogs/dialogincrements.cpp
+++ b/src/app/valentina/dialogs/dialogincrements.cpp
@@ -268,7 +268,7 @@ void DialogIncrements::FillAnglesCurves()
 //---------------------------------------------------------------------------------------------------------------------
 void DialogIncrements::ShowUnits()
 {
-    const QString unit = UnitsToStr(qApp->patternUnit());
+    const QString unit = UnitsToStr(qApp->patternUnits());
 
     ShowHeaderUnits(ui->tableWidgetIncrement, 1, unit);// calculated value
     ShowHeaderUnits(ui->tableWidgetIncrement, 2, unit);// formula
@@ -361,7 +361,7 @@ QString DialogIncrements::ClearIncrementName(const QString &name) const
 //---------------------------------------------------------------------------------------------------------------------
 bool DialogIncrements::EvalIncrementFormula(const QString &formula, bool fromUser, VContainer *data, QLabel *label)
 {
-    const QString postfix = UnitsToStr(qApp->patternUnit());//Show unit in dialog lable (cm, mm or inch)
+    const QString postfix = UnitsToStr(qApp->patternUnits());//Show unit in dialog lable (cm, mm or inch)
     if (formula.isEmpty())
     {
         label->setText(tr("Error") + " (" + postfix + "). " + tr("Empty field."));
@@ -1228,7 +1228,7 @@ void DialogIncrements::SaveIncrFormula()
     {
         QTableWidgetItem *result = table->item(row, 1);
         //Show unit in dialog lable (cm, mm or inch)
-        const QString postfix = UnitsToStr(qApp->patternUnit());
+        const QString postfix = UnitsToStr(qApp->patternUnits());
         labelCalculatedValue->setText(result->text() + QChar(QChar::Space) +postfix);
         return;
     }
@@ -1236,7 +1236,7 @@ void DialogIncrements::SaveIncrFormula()
     if (text.isEmpty())
     {
         //Show unit in dialog lable (cm, mm or inch)
-        const QString postfix = UnitsToStr(qApp->patternUnit());
+        const QString postfix = UnitsToStr(qApp->patternUnits());
         labelCalculatedValue->setText(tr("Error") + " (" + postfix + "). " + tr("Empty field."));
         return;
     }
@@ -1374,7 +1374,7 @@ void DialogIncrements::Fx()
 
     dialog->SetFormula(qApp->TrVars()->TryFormulaFromUser(plainTextEditFormula->toPlainText(),
                                                           qApp->Settings()->GetOsSeparator()));
-    const QString postfix = UnitsToStr(qApp->patternUnit(), true);
+    const QString postfix = UnitsToStr(qApp->patternUnits(), true);
     dialog->setPostfix(postfix);//Show unit in dialog lable (cm, mm or inch)
 
     if (dialog->exec() == QDialog::Accepted)
diff --git a/src/app/valentina/dialogs/dialoglayoutscale.cpp b/src/app/valentina/dialogs/dialoglayoutscale.cpp
index 256c66f14..e2d374a9b 100644
--- a/src/app/valentina/dialogs/dialoglayoutscale.cpp
+++ b/src/app/valentina/dialogs/dialoglayoutscale.cpp
@@ -71,7 +71,7 @@ DialogLayoutScale::~DialogLayoutScale()
 void DialogLayoutScale::SetTiledMargins(QMarginsF margins)
 {
     // read Margins top, right, bottom, left
-    margins = UnitConvertor(margins, Unit::Mm, qApp->patternUnit());
+    margins = UnitConvertor(margins, Unit::Mm, qApp->patternUnits());
 
     ui->doubleSpinBoxLeftField->setValue(margins.left());
     ui->doubleSpinBoxTopField->setValue(margins.top());
@@ -89,7 +89,7 @@ QMarginsF DialogLayoutScale::GetTiledMargins() const
         ui->doubleSpinBoxBottomField->value()
         );
 
-    return UnitConvertor(margins, qApp->patternUnit(), Unit::Mm);
+    return UnitConvertor(margins, qApp->patternUnits(), Unit::Mm);
 }
 
 //---------------------------------------------------------------------------------------------------------------------
@@ -181,7 +181,7 @@ void DialogLayoutScale::VerticalScaleChanged(double d)
 void DialogLayoutScale::ReadSettings()
 {
     VSettings *settings = qApp->ValentinaSettings();
-    const Unit unit = qApp->patternUnit();
+    const Unit unit = qApp->patternUnits();
 
     // read Margins top, right, bottom, left
     const QMarginsF margins = settings->GetTiledPDFMargins(unit);
@@ -201,7 +201,7 @@ void DialogLayoutScale::ReadSettings()
 void DialogLayoutScale::WriteSettings() const
 {
     VSettings *settings = qApp->ValentinaSettings();
-    const Unit unit = qApp->patternUnit();
+    const Unit unit = qApp->patternUnits();
 
     // write Margins top, right, bottom, left
     QMarginsF margins = QMarginsF(
diff --git a/src/app/valentina/dialogs/dialogpatternmaterials.cpp b/src/app/valentina/dialogs/dialogpatternmaterials.cpp
index 1fb6019c1..25fc59ba2 100644
--- a/src/app/valentina/dialogs/dialogpatternmaterials.cpp
+++ b/src/app/valentina/dialogs/dialogpatternmaterials.cpp
@@ -82,8 +82,7 @@ void DialogPatternMaterials::SetPatternMaterials(const QMap<int, QString> &list)
 
     for (int i = 0; i < userMaterialPlaceholdersQuantity; ++i)
     {
-        const QString translated = qApp->TrVars()->PlaceholderToUser(pl_userMaterial + QString::number(i + 1));
-        QTableWidgetItem *item = new QTableWidgetItem(per + translated + per);
+        QTableWidgetItem *item = new QTableWidgetItem(per + pl_userMaterial + QString::number(i + 1) + per);
         item->setFlags(item->flags() ^ Qt::ItemIsEditable);
         item->setTextAlignment(Qt::AlignLeft);
 
diff --git a/src/app/valentina/dialogs/dialogpatternproperties.cpp b/src/app/valentina/dialogs/dialogpatternproperties.cpp
index a4a70120a..61b949bbe 100644
--- a/src/app/valentina/dialogs/dialogpatternproperties.cpp
+++ b/src/app/valentina/dialogs/dialogpatternproperties.cpp
@@ -34,6 +34,7 @@
 #include <QMenu>
 #include <QDate>
 #include <QMessageBox>
+#include <QRadioButton>
 
 #include "../xml/vpattern.h"
 #include "../vpatterndb/vcontainer.h"
@@ -42,21 +43,12 @@
 #include "dialogknownmaterials.h"
 #include "dialogpatternmaterials.h"
 
-// calc how many combinations we have
-static const int heightsCount = (static_cast<int>(GHeights::H200) -
-                                (static_cast<int>(GHeights::H50) - heightStep))/heightStep;
-static const int sizesCount = (static_cast<int>(GSizes::S72) - (static_cast<int>(GSizes::S22) - sizeStep))/sizeStep;
-
 //---------------------------------------------------------------------------------------------------------------------
 DialogPatternProperties::DialogPatternProperties(VPattern *doc,  VContainer *pattern, QWidget *parent)
     : QDialog(parent),
       ui(new Ui::DialogPatternProperties),
       doc(doc),
       pattern(pattern),
-      heightsChecked(heightsCount),
-      sizesChecked(sizesCount),
-      heights (QMap<GHeights, bool>()),
-      sizes(QMap<GSizes, bool>()),
       data(QMap<QCheckBox *, int>()),
       descriptionChanged(false),
       gradationChanged(false),
@@ -79,6 +71,8 @@ DialogPatternProperties::DialogPatternProperties(VPattern *doc,  VContainer *pat
     setWindowFlags(Qt::Window);
 #endif
 
+    ui->lineEditCustomerEmail->setClearButtonEnabled(true);
+
     SCASSERT(doc != nullptr)
 
     VSettings *settings = qApp->ValentinaSettings();
@@ -140,44 +134,11 @@ DialogPatternProperties::DialogPatternProperties(VPattern *doc,  VContainer *pat
     connect(bCancel, &QPushButton::clicked, this, &DialogPatternProperties::close);
 
     ui->tabWidget->setCurrentIndex(0);
-    if (qApp->patternType() != MeasurementsType::Multisize)
+    if (qApp->GetMeasurementsType() != MeasurementsType::Multisize)
     {
         ui->tabWidget->setTabEnabled(1, false);
     }
 
-    InitHeights();
-    InitSizes();
-
-    heights = doc->GetGradationHeights();
-    sizes = doc->GetGradationSizes();
-
-    SetOptions(heights);
-    SetOptions(sizes);
-
-    InitComboBox(ui->comboBoxHeight, heights);
-    InitComboBox(ui->comboBoxSize, sizes);
-
-    const QString height = QString().setNum(doc->GetDefCustomHeight());
-    SetDefaultHeight(height);
-
-    const QString size = QString().setNum(doc->GetDefCustomSize());
-    SetDefaultSize(size);
-
-    connect(ui->radioButtonDefFromP, &QRadioButton::toggled, this, [this]()
-    {
-        ui->comboBoxHeight->setEnabled(ui->radioButtonDefFromP->isChecked());
-        ui->comboBoxSize->setEnabled(ui->radioButtonDefFromP->isChecked());
-    });
-
-    auto DefValueChanged = [this](){defaultChanged = true;};
-
-    connect(ui->radioButtonDefFromP, &QRadioButton::toggled, this, DefValueChanged);
-
-    ui->radioButtonDefFromP->setChecked(doc->IsDefCustom());
-
-    connect(ui->comboBoxHeight, QOverload<int>::of(&QComboBox::currentIndexChanged), this, DefValueChanged);
-    connect(ui->comboBoxSize, QOverload<int>::of(&QComboBox::currentIndexChanged), this, DefValueChanged);
-
     const bool readOnly = doc->IsReadOnly();
     ui->checkBoxPatternReadOnly->setChecked(readOnly);
     if (not readOnly)
@@ -198,21 +159,29 @@ DialogPatternProperties::DialogPatternProperties(VPattern *doc,  VContainer *pat
     ui->lineEditPatternNumber->setText(doc->GetPatternNumber());
     ui->lineEditCompanyName->setText(doc->GetCompanyName());
 
-    if (qApp->patternType() == MeasurementsType::Individual)
+    ui->lineEditCustomerName->setText(qApp->GetCustomerName());
+    ui->lineEditCustomerEmail->setText(qApp->CustomerEmail());
+    ui->dateEditCustomerBirthDate->setDate(qApp->GetCustomerBirthDate());
+
+    if (qApp->GetMeasurementsType() == MeasurementsType::Individual)
     {
-        ui->lineEditCustomerName->setText(qApp->GetCustomerName());
         ui->lineEditCustomerName->setReadOnly(true);
         ui->lineEditCustomerName->setToolTip(tr("The customer name from individual measurements"));
-    }
-    else
-    {
-        ui->lineEditCustomerName->setText(doc->GetCustomerName());
+
+        ui->lineEditCustomerEmail->setReadOnly(true);
+        ui->lineEditCustomerEmail->setToolTip(tr("The customer email from individual measurements"));
+
+        ui->dateEditCustomerBirthDate->setReadOnly(true);
+        ui->dateEditCustomerBirthDate->setToolTip(tr("The customer birth date from individual measurements"));
     }
 
     connect(ui->lineEditPatternName, &QLineEdit::editingFinished, this, &DialogPatternProperties::LabelDataChanged);
     connect(ui->lineEditPatternNumber, &QLineEdit::editingFinished, this, &DialogPatternProperties::LabelDataChanged);
     connect(ui->lineEditCompanyName, &QLineEdit::editingFinished, this, &DialogPatternProperties::LabelDataChanged);
     connect(ui->lineEditCustomerName, &QLineEdit::editingFinished, this, &DialogPatternProperties::LabelDataChanged);
+    connect(ui->lineEditCustomerEmail, &QLineEdit::editingFinished, this, &DialogPatternProperties::LabelDataChanged);
+    connect(ui->dateEditCustomerBirthDate, &QDateEdit::editingFinished, this,
+            &DialogPatternProperties::LabelDataChanged);
     connect(ui->pushButtonEditPatternLabel, &QPushButton::clicked, this, &DialogPatternProperties::EditLabel);
     connect(ui->pushButtonPatternMaterials, &QPushButton::clicked, this,
             &DialogPatternProperties::ManagePatternMaterials);
@@ -245,13 +214,9 @@ void DialogPatternProperties::Apply()
             SaveDescription();
             break;
         case 1:
-            SaveGradation();
-            SaveDefValues();
-            break;
-        case 2:
             SaveReadOnlyState();
             break;
-        case 3:
+        case 2:
             SaveLabelData();
             SaveTemplateData();
             SaveMaterialData();
@@ -266,8 +231,6 @@ void DialogPatternProperties::Apply()
 void DialogPatternProperties::Ok()
 {
     SaveDescription();
-    SaveGradation();
-    SaveDefValues();
     SaveReadOnlyState();
     SaveLabelData();
     SaveTemplateData();
@@ -278,143 +241,12 @@ void DialogPatternProperties::Ok()
     close();
 }
 
-//---------------------------------------------------------------------------------------------------------------------
-void DialogPatternProperties::SelectAll(int state)
-{
-    QCheckBox* box = qobject_cast<QCheckBox*>(sender());
-    if (box)
-    {
-        if (box == ui->checkBoxAllHeights)
-        {
-            if (state == Qt::Checked)
-            {
-                SetHeightsChecked(true);
-            }
-            else if (state == Qt::Unchecked)
-            {
-                SetHeightsChecked(false);
-            }
-
-            if (data.contains(box))
-            {
-                heights.insert(static_cast<GHeights>(data.value(box)), box->isChecked());
-            }
-        }
-
-        if (box == ui->checkBoxAllSizes)
-        {
-            if (state == Qt::Checked)
-            {
-                SetSizesChecked(true);
-            }
-            else if (state == Qt::Unchecked)
-            {
-                SetSizesChecked(false);
-            }
-
-            if (data.contains(box))
-            {
-                sizes.insert(static_cast<GSizes>(data.value(box)), box->isChecked());
-            }
-        }
-    }
-}
-
-//---------------------------------------------------------------------------------------------------------------------
-void DialogPatternProperties::CheckStateHeight(int state)
-{
-    QCheckBox* box = qobject_cast<QCheckBox*>(sender());
-    if (box)
-    {
-        if (state == Qt::Checked)
-        {
-            ++heightsChecked;
-            if (heightsChecked == heightsCount)
-            {
-                ui->checkBoxAllHeights->blockSignals(true);//don't touch anothers checkboxes
-                ui->checkBoxAllHeights->setCheckState(Qt::Checked);
-                heights.insert(GHeights::ALL, true);
-                ui->checkBoxAllHeights->blockSignals(false);
-            }
-        }
-        else if (state == Qt::Unchecked)
-        {
-            if (heightsChecked == heightsCount)
-            {
-                ui->checkBoxAllHeights->blockSignals(true);//don't touch anothers checkboxes
-                ui->checkBoxAllHeights->setCheckState(Qt::Unchecked);
-                heights.insert(GHeights::ALL, false);
-                ui->checkBoxAllHeights->blockSignals(false);
-            }
-            --heightsChecked;
-        }
-
-        if (data.contains(box))
-        {
-            heights.insert(static_cast<GHeights>(data.value(box)), box->isChecked());
-        }
-
-        UpdateDefHeight();
-
-        CheckApplyOk();
-        gradationChanged = true;
-    }
-}
-
-//---------------------------------------------------------------------------------------------------------------------
-void DialogPatternProperties::CheckStateSize(int state)
-{
-    QCheckBox* box = qobject_cast<QCheckBox*>(sender());
-    if (box)
-    {
-
-        if (state == Qt::Checked)
-        {
-            ++sizesChecked;
-            if (sizesChecked == sizesCount)
-            {
-                ui->checkBoxAllSizes->blockSignals(true);//don't touch anothers checkboxes
-                ui->checkBoxAllSizes->setCheckState(Qt::Checked);
-                sizes.insert(GSizes::ALL, true);
-                ui->checkBoxAllSizes->blockSignals(false);
-            }
-        }
-        else if (state == Qt::Unchecked)
-        {
-            if (sizesChecked == sizesCount)
-            {
-                ui->checkBoxAllSizes->blockSignals(true);//don't touch anothers checkboxes
-                ui->checkBoxAllSizes->setCheckState(Qt::Unchecked);
-                sizes.insert(GSizes::ALL, false);
-                ui->checkBoxAllSizes->blockSignals(false);
-            }
-            --sizesChecked;
-        }
-
-        if (data.contains(box))
-        {
-            sizes.insert(static_cast<GSizes>(data.value(box)), box->isChecked());
-        }
-
-        UpdateDefSize();
-
-        CheckApplyOk();
-        gradationChanged = true;
-    }
-}
-
 //---------------------------------------------------------------------------------------------------------------------
 void DialogPatternProperties::DescEdited()
 {
     descriptionChanged = true;
 }
 
-//---------------------------------------------------------------------------------------------------------------------
-void DialogPatternProperties::DefValueChanged()
-{
-    defaultChanged = true;
-}
-
 //---------------------------------------------------------------------------------------------------------------------
 void DialogPatternProperties::LabelDataChanged()
 {
@@ -422,134 +254,6 @@ void DialogPatternProperties::LabelDataChanged()
     askSaveLabelData = true;
 }
 
-//---------------------------------------------------------------------------------------------------------------------
-void DialogPatternProperties::SetHeightsChecked(bool enabled)
-{
-    ui->checkBoxH50->setChecked(enabled);
-    ui->checkBoxH56->setChecked(enabled);
-    ui->checkBoxH62->setChecked(enabled);
-    ui->checkBoxH68->setChecked(enabled);
-    ui->checkBoxH74->setChecked(enabled);
-    ui->checkBoxH80->setChecked(enabled);
-    ui->checkBoxH86->setChecked(enabled);
-    ui->checkBoxH92->setChecked(enabled);
-    ui->checkBoxH98->setChecked(enabled);
-    ui->checkBoxH104->setChecked(enabled);
-    ui->checkBoxH110->setChecked(enabled);
-    ui->checkBoxH116->setChecked(enabled);
-    ui->checkBoxH122->setChecked(enabled);
-    ui->checkBoxH128->setChecked(enabled);
-    ui->checkBoxH134->setChecked(enabled);
-    ui->checkBoxH140->setChecked(enabled);
-    ui->checkBoxH146->setChecked(enabled);
-    ui->checkBoxH152->setChecked(enabled);
-    ui->checkBoxH158->setChecked(enabled);
-    ui->checkBoxH164->setChecked(enabled);
-    ui->checkBoxH170->setChecked(enabled);
-    ui->checkBoxH176->setChecked(enabled);
-    ui->checkBoxH182->setChecked(enabled);
-    ui->checkBoxH188->setChecked(enabled);
-    ui->checkBoxH194->setChecked(enabled);
-    ui->checkBoxH200->setChecked(enabled);
-}
-
-//---------------------------------------------------------------------------------------------------------------------
-void DialogPatternProperties::SetSizesChecked(bool enabled)
-{
-    ui->checkBoxS22->setChecked(enabled);
-    ui->checkBoxS24->setChecked(enabled);
-    ui->checkBoxS26->setChecked(enabled);
-    ui->checkBoxS28->setChecked(enabled);
-    ui->checkBoxS30->setChecked(enabled);
-    ui->checkBoxS32->setChecked(enabled);
-    ui->checkBoxS34->setChecked(enabled);
-    ui->checkBoxS36->setChecked(enabled);
-    ui->checkBoxS38->setChecked(enabled);
-    ui->checkBoxS40->setChecked(enabled);
-    ui->checkBoxS42->setChecked(enabled);
-    ui->checkBoxS44->setChecked(enabled);
-    ui->checkBoxS46->setChecked(enabled);
-    ui->checkBoxS48->setChecked(enabled);
-    ui->checkBoxS50->setChecked(enabled);
-    ui->checkBoxS52->setChecked(enabled);
-    ui->checkBoxS54->setChecked(enabled);
-    ui->checkBoxS56->setChecked(enabled);
-    ui->checkBoxS58->setChecked(enabled);
-    ui->checkBoxS60->setChecked(enabled);
-    ui->checkBoxS62->setChecked(enabled);
-    ui->checkBoxS64->setChecked(enabled);
-    ui->checkBoxS66->setChecked(enabled);
-    ui->checkBoxS68->setChecked(enabled);
-    ui->checkBoxS70->setChecked(enabled);
-    ui->checkBoxS72->setChecked(enabled);
-}
-
-//---------------------------------------------------------------------------------------------------------------------
-void DialogPatternProperties::InitHeights()
-{
-    Init(ui->checkBoxAllHeights, static_cast<int>(GHeights::ALL), &DialogPatternProperties::SelectAll);
-
-    Init(ui->checkBoxH50, static_cast<int>(GHeights::H50), &DialogPatternProperties::CheckStateHeight);
-    Init(ui->checkBoxH56, static_cast<int>(GHeights::H56), &DialogPatternProperties::CheckStateHeight);
-    Init(ui->checkBoxH62, static_cast<int>(GHeights::H62), &DialogPatternProperties::CheckStateHeight);
-    Init(ui->checkBoxH68, static_cast<int>(GHeights::H68), &DialogPatternProperties::CheckStateHeight);
-    Init(ui->checkBoxH74, static_cast<int>(GHeights::H74), &DialogPatternProperties::CheckStateHeight);
-    Init(ui->checkBoxH80, static_cast<int>(GHeights::H80), &DialogPatternProperties::CheckStateHeight);
-    Init(ui->checkBoxH86, static_cast<int>(GHeights::H86), &DialogPatternProperties::CheckStateHeight);
-    Init(ui->checkBoxH92, static_cast<int>(GHeights::H92), &DialogPatternProperties::CheckStateHeight);
-    Init(ui->checkBoxH98, static_cast<int>(GHeights::H98), &DialogPatternProperties::CheckStateHeight);
-    Init(ui->checkBoxH104, static_cast<int>(GHeights::H104), &DialogPatternProperties::CheckStateHeight);
-    Init(ui->checkBoxH110, static_cast<int>(GHeights::H110), &DialogPatternProperties::CheckStateHeight);
-    Init(ui->checkBoxH116, static_cast<int>(GHeights::H116), &DialogPatternProperties::CheckStateHeight);
-    Init(ui->checkBoxH122, static_cast<int>(GHeights::H122), &DialogPatternProperties::CheckStateHeight);
-    Init(ui->checkBoxH128, static_cast<int>(GHeights::H128), &DialogPatternProperties::CheckStateHeight);
-    Init(ui->checkBoxH134, static_cast<int>(GHeights::H134), &DialogPatternProperties::CheckStateHeight);
-    Init(ui->checkBoxH140, static_cast<int>(GHeights::H140), &DialogPatternProperties::CheckStateHeight);
-    Init(ui->checkBoxH146, static_cast<int>(GHeights::H146), &DialogPatternProperties::CheckStateHeight);
-    Init(ui->checkBoxH152, static_cast<int>(GHeights::H152), &DialogPatternProperties::CheckStateHeight);
-    Init(ui->checkBoxH158, static_cast<int>(GHeights::H158), &DialogPatternProperties::CheckStateHeight);
-    Init(ui->checkBoxH164, static_cast<int>(GHeights::H164), &DialogPatternProperties::CheckStateHeight);
-    Init(ui->checkBoxH170, static_cast<int>(GHeights::H170), &DialogPatternProperties::CheckStateHeight);
-    Init(ui->checkBoxH176, static_cast<int>(GHeights::H176), &DialogPatternProperties::CheckStateHeight);
-    Init(ui->checkBoxH182, static_cast<int>(GHeights::H182), &DialogPatternProperties::CheckStateHeight);
-    Init(ui->checkBoxH188, static_cast<int>(GHeights::H188), &DialogPatternProperties::CheckStateHeight);
-    Init(ui->checkBoxH194, static_cast<int>(GHeights::H194), &DialogPatternProperties::CheckStateHeight);
-    Init(ui->checkBoxH200, static_cast<int>(GHeights::H200), &DialogPatternProperties::CheckStateHeight);
-}
-
-//---------------------------------------------------------------------------------------------------------------------
-void DialogPatternProperties::InitSizes()
-{
-    Init(ui->checkBoxAllSizes, static_cast<int>(GSizes::ALL), &DialogPatternProperties::SelectAll);
-
-    Init(ui->checkBoxS22, static_cast<int>(GSizes::S22), &DialogPatternProperties::CheckStateSize);
-    Init(ui->checkBoxS24, static_cast<int>(GSizes::S24), &DialogPatternProperties::CheckStateSize);
-    Init(ui->checkBoxS26, static_cast<int>(GSizes::S26), &DialogPatternProperties::CheckStateSize);
-    Init(ui->checkBoxS28, static_cast<int>(GSizes::S28), &DialogPatternProperties::CheckStateSize);
-    Init(ui->checkBoxS30, static_cast<int>(GSizes::S30), &DialogPatternProperties::CheckStateSize);
-    Init(ui->checkBoxS32, static_cast<int>(GSizes::S32), &DialogPatternProperties::CheckStateSize);
-    Init(ui->checkBoxS34, static_cast<int>(GSizes::S34), &DialogPatternProperties::CheckStateSize);
-    Init(ui->checkBoxS36, static_cast<int>(GSizes::S36), &DialogPatternProperties::CheckStateSize);
-    Init(ui->checkBoxS38, static_cast<int>(GSizes::S38), &DialogPatternProperties::CheckStateSize);
-    Init(ui->checkBoxS40, static_cast<int>(GSizes::S40), &DialogPatternProperties::CheckStateSize);
-    Init(ui->checkBoxS42, static_cast<int>(GSizes::S42), &DialogPatternProperties::CheckStateSize);
-    Init(ui->checkBoxS44, static_cast<int>(GSizes::S44), &DialogPatternProperties::CheckStateSize);
-    Init(ui->checkBoxS46, static_cast<int>(GSizes::S46), &DialogPatternProperties::CheckStateSize);
-    Init(ui->checkBoxS48, static_cast<int>(GSizes::S48), &DialogPatternProperties::CheckStateSize);
-    Init(ui->checkBoxS50, static_cast<int>(GSizes::S50), &DialogPatternProperties::CheckStateSize);
-    Init(ui->checkBoxS52, static_cast<int>(GSizes::S52), &DialogPatternProperties::CheckStateSize);
-    Init(ui->checkBoxS54, static_cast<int>(GSizes::S54), &DialogPatternProperties::CheckStateSize);
-    Init(ui->checkBoxS56, static_cast<int>(GSizes::S56), &DialogPatternProperties::CheckStateSize);
-    Init(ui->checkBoxS58, static_cast<int>(GSizes::S58), &DialogPatternProperties::CheckStateSize);
-    Init(ui->checkBoxS60, static_cast<int>(GSizes::S60), &DialogPatternProperties::CheckStateSize);
-    Init(ui->checkBoxS62, static_cast<int>(GSizes::S62), &DialogPatternProperties::CheckStateSize);
-    Init(ui->checkBoxS64, static_cast<int>(GSizes::S64), &DialogPatternProperties::CheckStateSize);
-    Init(ui->checkBoxS66, static_cast<int>(GSizes::S66), &DialogPatternProperties::CheckStateSize);
-    Init(ui->checkBoxS68, static_cast<int>(GSizes::S68), &DialogPatternProperties::CheckStateSize);
-    Init(ui->checkBoxS70, static_cast<int>(GSizes::S70), &DialogPatternProperties::CheckStateSize);
-    Init(ui->checkBoxS72, static_cast<int>(GSizes::S72), &DialogPatternProperties::CheckStateSize);
-}
-
 //---------------------------------------------------------------------------------------------------------------------
 void DialogPatternProperties::InitComboBoxFormats(QComboBox *box, const QStringList &items,
                                                   const QString &currentFormat)
@@ -568,14 +272,6 @@ void DialogPatternProperties::InitComboBoxFormats(QComboBox *box, const QStringL
     }
 }
 
-//---------------------------------------------------------------------------------------------------------------------
-void DialogPatternProperties::CheckApplyOk()
-{
-    bool enable = !(heightsChecked == 0 || sizesChecked == 0);
-    ui->buttonBox->button(QDialogButtonBox::Ok)->setEnabled(enable);
-    ui->buttonBox->button(QDialogButtonBox::Apply)->setEnabled(enable);
-}
-
 //---------------------------------------------------------------------------------------------------------------------
 void DialogPatternProperties::SaveDescription()
 {
@@ -589,38 +285,6 @@ void DialogPatternProperties::SaveDescription()
     }
 }
 
-//---------------------------------------------------------------------------------------------------------------------
-void DialogPatternProperties::SaveGradation()
-{
-    if (gradationChanged)
-    {
-        doc->SetGradationHeights(heights);
-        doc->SetGradationSizes(sizes);
-        emit UpdateGradation();
-        gradationChanged = false;
-    }
-}
-
-//---------------------------------------------------------------------------------------------------------------------
-void DialogPatternProperties::SaveDefValues()
-{
-    if (defaultChanged)
-    {
-        if (ui->radioButtonDefFromM->isChecked())
-        {
-            doc->SetDefCustom(false);
-        }
-        else
-        {
-            doc->SetDefCustom(true);
-            doc->SetDefCustomHeight(ui->comboBoxHeight->currentText().toInt());
-            doc->SetDefCustomSize(ui->comboBoxSize->currentText().toInt());
-        }
-        defaultChanged = false;
-        emit doc->patternChanged(false);
-    }
-}
-
 //---------------------------------------------------------------------------------------------------------------------
 void DialogPatternProperties::SaveLabelData()
 {
@@ -629,9 +293,11 @@ void DialogPatternProperties::SaveLabelData()
         doc->SetPatternName(ui->lineEditPatternName->text());
         doc->SetPatternNumber(ui->lineEditPatternNumber->text());
         doc->SetCompanyName(ui->lineEditCompanyName->text());
-        if (qApp->patternType() != MeasurementsType::Individual)
+        if (qApp->GetMeasurementsType() != MeasurementsType::Individual)
         {
             doc->SetCustomerName(ui->lineEditCustomerName->text());
+            doc->SetCustomerBirthDate(ui->dateEditCustomerBirthDate->date());
+            doc->SetCustomerEmail(ui->lineEditCustomerEmail->text());
         }
         doc->SetLabelDateFormat(ui->comboBoxDateFormat->currentText());
         doc->SetLabelTimeFormat(ui->comboBoxTimeFormat->currentText());
@@ -672,114 +338,6 @@ void DialogPatternProperties::SaveReadOnlyState()
     }
 }
 
-//---------------------------------------------------------------------------------------------------------------------
-void DialogPatternProperties::SetDefaultHeight(const QString &def)
-{
-    int index = ui->comboBoxHeight->findText(def);
-    if (index != -1)
-    {
-        ui->comboBoxHeight->setCurrentIndex(index);
-        defaultChanged = true;
-    }
-    else
-    {
-        const int height = static_cast<int>(pattern->height());
-        index = ui->comboBoxHeight->findText(QString().setNum(height));
-        if (index != -1)
-        {
-            ui->comboBoxHeight->setCurrentIndex(index);
-            defaultChanged = true;
-        }
-    }
-}
-
-//---------------------------------------------------------------------------------------------------------------------
-void DialogPatternProperties::SetDefaultSize(const QString &def)
-{
-    int index = ui->comboBoxSize->findText(def);
-    if (index != -1)
-    {
-        ui->comboBoxSize->setCurrentIndex(index);
-        defaultChanged = true;
-    }
-    else
-    {
-        const int size = static_cast<int>(pattern->size());
-        index = ui->comboBoxSize->findText(QString().setNum(size));
-        if (index != -1)
-        {
-            ui->comboBoxSize->setCurrentIndex(index);
-            defaultChanged = true;
-        }
-    }
-}
-
-//---------------------------------------------------------------------------------------------------------------------
-void DialogPatternProperties::UpdateDefHeight()
-{
-    const QString def = ui->comboBoxHeight->currentText();
-    InitComboBox(ui->comboBoxHeight, heights);
-    SetDefaultHeight(def);
-}
-
-//---------------------------------------------------------------------------------------------------------------------
-void DialogPatternProperties::UpdateDefSize()
-{
-    const QString def = ui->comboBoxSize->currentText();
-    InitComboBox(ui->comboBoxSize, sizes);
-    SetDefaultSize(def);
-}
-
-//---------------------------------------------------------------------------------------------------------------------
-template<typename Func>
-void DialogPatternProperties::Init(QCheckBox *check, int val, Func slot)
-{
-    connect(check, &QCheckBox::stateChanged, this, slot);
-    data.insert(check, val);
-}
-
-//---------------------------------------------------------------------------------------------------------------------
-template<typename GVal>
-void DialogPatternProperties::SetOptions(const QMap<GVal, bool> &option)
-{
-    if (option.value(GVal::ALL) == false)
-    {
-        QMapIterator<GVal, bool> i(option);
-        while (i.hasNext())
-        {
-            i.next();
-            if (i.value() == false && i.key() != GVal::ALL)
-            {
-                QCheckBox *box = data.key(static_cast<int>(i.key()));
-                if (box != nullptr)
-                {
-                    box->setCheckState(Qt::Unchecked);
-                }
-            }
-        }
-    }
-}
-
-//---------------------------------------------------------------------------------------------------------------------
-template<typename GVal>
-void DialogPatternProperties::InitComboBox(QComboBox *box, const QMap<GVal, bool> &option)
-{
-    SCASSERT(box != nullptr)
-
-    box->clear();
-
-    QMapIterator<GVal, bool> i(option);
-    while (i.hasNext())
-    {
-        i.next();
-        if (i.value() && i.key() != GVal::ALL)
-        {
-            box->addItem(QString().setNum(static_cast<int>(UnitConvertor(static_cast<int>(i.key()), Unit::Cm,
-                                                                         *pattern->GetPatternUnit()))));
-        }
-    }
-}
-
 //---------------------------------------------------------------------------------------------------------------------
 QImage DialogPatternProperties::GetImage()
 {
@@ -937,7 +495,7 @@ void DialogPatternProperties::EditLabel()
         }
     }
 
-    DialogEditLabel editor(doc);
+    DialogEditLabel editor(doc, pattern);
 
     templateDataChanged ? editor.SetTemplate(templateLines) : editor.SetTemplate(doc->GetPatternLabelTemplate());
 
diff --git a/src/app/valentina/dialogs/dialogpatternproperties.h b/src/app/valentina/dialogs/dialogpatternproperties.h
index af86959d0..851a05e8c 100644
--- a/src/app/valentina/dialogs/dialogpatternproperties.h
+++ b/src/app/valentina/dialogs/dialogpatternproperties.h
@@ -50,16 +50,10 @@ class DialogPatternProperties : public QDialog
 public:
     explicit DialogPatternProperties(VPattern *doc, VContainer *pattern, QWidget *parent = nullptr);
     virtual ~DialogPatternProperties() override;
-signals:
-    void UpdateGradation();
 private slots:
-    void DefValueChanged();
     void LabelDataChanged();
     void Apply();
     void Ok();
-    void SelectAll(int state);
-    void CheckStateHeight(int state);
-    void CheckStateSize(int state);
     void DescEdited();
     void ChangeImage();
     void SaveImage();
@@ -70,10 +64,6 @@ private:
     Ui::DialogPatternProperties *ui;
     VPattern               *doc;
     VContainer             *pattern;
-    int                    heightsChecked;
-    int                    sizesChecked;
-    QMap<GHeights, bool>   heights;
-    QMap<GSizes, bool>     sizes;
     QMap<QCheckBox *, int> data;
     bool                   descriptionChanged;
     bool                   gradationChanged;
@@ -91,31 +81,13 @@ private:
     QVector<VLabelTemplateLine> templateLines;
     QMap<int, QString>          patternMaterials;
 
-    void         SetHeightsChecked(bool enabled);
-    void         SetSizesChecked(bool enabled);
-    void         InitHeights();
-    void         InitSizes();
-    template<typename Func>
-    void         Init(QCheckBox *check, int val, Func slot);
-    template<typename GVal>
-    void         SetOptions(const QMap<GVal, bool> &option);
-    template<typename GVal>
-    void         InitComboBox(QComboBox *box, const QMap<GVal, bool> &option);
     void         InitComboBoxFormats(QComboBox *box, const QStringList &items, const QString &currentFormat);
-    void         CheckApplyOk();
     void         SaveDescription();
-    void         SaveGradation();
-    void         SaveDefValues();
     void         SaveLabelData();
     void         SaveTemplateData();
     void         SaveMaterialData();
     void         SaveReadOnlyState();
 
-    void         SetDefaultHeight(const QString &def);
-    void         SetDefaultSize(const QString &def);
-
-    void         UpdateDefHeight();
-    void         UpdateDefSize();
     void         InitImage();
     QImage       GetImage();
 };
diff --git a/src/app/valentina/dialogs/dialogpatternproperties.ui b/src/app/valentina/dialogs/dialogpatternproperties.ui
index 4f5631aa7..54b2ccf74 100644
--- a/src/app/valentina/dialogs/dialogpatternproperties.ui
+++ b/src/app/valentina/dialogs/dialogpatternproperties.ui
@@ -7,21 +7,21 @@
     <x>0</x>
     <y>0</y>
     <width>726</width>
-    <height>681</height>
+    <height>507</height>
    </rect>
   </property>
   <property name="windowTitle">
    <string>Pattern properties</string>
   </property>
   <property name="windowIcon">
-   <iconset>
+   <iconset resource="../../../libs/vmisc/share/resources/icon.qrc">
     <normaloff>:/icon/64x64/icon64x64.png</normaloff>:/icon/64x64/icon64x64.png</iconset>
   </property>
   <layout class="QVBoxLayout" name="verticalLayout_4">
    <item>
     <widget class="QTabWidget" name="tabWidget">
      <property name="currentIndex">
-      <number>0</number>
+      <number>2</number>
      </property>
      <widget class="QWidget" name="tab">
       <attribute name="title">
@@ -220,1001 +220,6 @@
        </item>
       </layout>
      </widget>
-     <widget class="QWidget" name="tab_2">
-      <attribute name="title">
-       <string>Heights and Sizes</string>
-      </attribute>
-      <layout class="QVBoxLayout" name="verticalLayout_5">
-       <item>
-        <widget class="QGroupBox" name="groupBox">
-         <property name="title">
-          <string>Default height and size</string>
-         </property>
-         <layout class="QVBoxLayout" name="verticalLayout_9">
-          <item>
-           <widget class="QRadioButton" name="radioButtonDefFromM">
-            <property name="text">
-             <string>From multisize measurements</string>
-            </property>
-            <property name="checked">
-             <bool>true</bool>
-            </property>
-            <attribute name="buttonGroup">
-             <string notr="true">buttonGroup</string>
-            </attribute>
-           </widget>
-          </item>
-          <item>
-           <layout class="QVBoxLayout" name="verticalLayout_8">
-            <item>
-             <widget class="QRadioButton" name="radioButtonDefFromP">
-              <property name="text">
-               <string>Custom</string>
-              </property>
-              <property name="checked">
-               <bool>false</bool>
-              </property>
-              <attribute name="buttonGroup">
-               <string notr="true">buttonGroup</string>
-              </attribute>
-             </widget>
-            </item>
-            <item>
-             <layout class="QHBoxLayout" name="horizontalLayout_5">
-              <item>
-               <layout class="QHBoxLayout" name="horizontalLayout_3">
-                <item>
-                 <widget class="QLabel" name="label_4">
-                  <property name="text">
-                   <string>Height:</string>
-                  </property>
-                 </widget>
-                </item>
-                <item>
-                 <widget class="QComboBox" name="comboBoxHeight">
-                  <property name="enabled">
-                   <bool>false</bool>
-                  </property>
-                 </widget>
-                </item>
-               </layout>
-              </item>
-              <item>
-               <layout class="QHBoxLayout" name="horizontalLayout_4">
-                <item>
-                 <widget class="QLabel" name="label_5">
-                  <property name="text">
-                   <string>Size:</string>
-                  </property>
-                 </widget>
-                </item>
-                <item>
-                 <widget class="QComboBox" name="comboBoxSize">
-                  <property name="enabled">
-                   <bool>false</bool>
-                  </property>
-                 </widget>
-                </item>
-               </layout>
-              </item>
-             </layout>
-            </item>
-           </layout>
-          </item>
-         </layout>
-        </widget>
-       </item>
-       <item>
-        <layout class="QHBoxLayout" name="horizontalLayout_2">
-         <item>
-          <layout class="QVBoxLayout" name="verticalLayout_6">
-           <item>
-            <widget class="QCheckBox" name="checkBoxAllHeights">
-             <property name="text">
-              <string>All heights (cm)</string>
-             </property>
-             <property name="checked">
-              <bool>true</bool>
-             </property>
-            </widget>
-           </item>
-           <item>
-            <widget class="QFrame" name="frame">
-             <property name="frameShape">
-              <enum>QFrame::StyledPanel</enum>
-             </property>
-             <property name="frameShadow">
-              <enum>QFrame::Raised</enum>
-             </property>
-             <layout class="QGridLayout" name="gridLayout_2">
-              <property name="sizeConstraint">
-               <enum>QLayout::SetMaximumSize</enum>
-              </property>
-              <item row="8" column="0">
-               <widget class="QCheckBox" name="checkBoxH98">
-                <property name="enabled">
-                 <bool>true</bool>
-                </property>
-                <property name="sizePolicy">
-                 <sizepolicy hsizetype="Preferred" vsizetype="Preferred">
-                  <horstretch>0</horstretch>
-                  <verstretch>0</verstretch>
-                 </sizepolicy>
-                </property>
-                <property name="text">
-                 <string notr="true">98</string>
-                </property>
-                <property name="checked">
-                 <bool>true</bool>
-                </property>
-               </widget>
-              </item>
-              <item row="0" column="0">
-               <widget class="QCheckBox" name="checkBoxH50">
-                <property name="text">
-                 <string notr="true">50</string>
-                </property>
-                <property name="checked">
-                 <bool>true</bool>
-                </property>
-               </widget>
-              </item>
-              <item row="1" column="0">
-               <widget class="QCheckBox" name="checkBoxH56">
-                <property name="text">
-                 <string notr="true">56</string>
-                </property>
-                <property name="checked">
-                 <bool>true</bool>
-                </property>
-               </widget>
-              </item>
-              <item row="2" column="0">
-               <widget class="QCheckBox" name="checkBoxH62">
-                <property name="text">
-                 <string notr="true">62</string>
-                </property>
-                <property name="checked">
-                 <bool>true</bool>
-                </property>
-               </widget>
-              </item>
-              <item row="3" column="0">
-               <widget class="QCheckBox" name="checkBoxH68">
-                <property name="text">
-                 <string notr="true">68</string>
-                </property>
-                <property name="checked">
-                 <bool>true</bool>
-                </property>
-               </widget>
-              </item>
-              <item row="4" column="0">
-               <widget class="QCheckBox" name="checkBoxH74">
-                <property name="text">
-                 <string notr="true">74</string>
-                </property>
-                <property name="checked">
-                 <bool>true</bool>
-                </property>
-               </widget>
-              </item>
-              <item row="7" column="0">
-               <widget class="QCheckBox" name="checkBoxH92">
-                <property name="enabled">
-                 <bool>true</bool>
-                </property>
-                <property name="sizePolicy">
-                 <sizepolicy hsizetype="Preferred" vsizetype="Preferred">
-                  <horstretch>0</horstretch>
-                  <verstretch>0</verstretch>
-                 </sizepolicy>
-                </property>
-                <property name="text">
-                 <string notr="true">92</string>
-                </property>
-                <property name="checked">
-                 <bool>true</bool>
-                </property>
-               </widget>
-              </item>
-              <item row="6" column="0">
-               <widget class="QCheckBox" name="checkBoxH86">
-                <property name="text">
-                 <string notr="true">86</string>
-                </property>
-                <property name="checked">
-                 <bool>true</bool>
-                </property>
-               </widget>
-              </item>
-              <item row="5" column="0">
-               <widget class="QCheckBox" name="checkBoxH80">
-                <property name="text">
-                 <string notr="true">80</string>
-                </property>
-                <property name="checked">
-                 <bool>true</bool>
-                </property>
-               </widget>
-              </item>
-              <item row="0" column="1">
-               <widget class="QCheckBox" name="checkBoxH104">
-                <property name="enabled">
-                 <bool>true</bool>
-                </property>
-                <property name="sizePolicy">
-                 <sizepolicy hsizetype="Preferred" vsizetype="Preferred">
-                  <horstretch>0</horstretch>
-                  <verstretch>0</verstretch>
-                 </sizepolicy>
-                </property>
-                <property name="minimumSize">
-                 <size>
-                  <width>0</width>
-                  <height>0</height>
-                 </size>
-                </property>
-                <property name="text">
-                 <string notr="true">104</string>
-                </property>
-                <property name="checked">
-                 <bool>true</bool>
-                </property>
-               </widget>
-              </item>
-              <item row="1" column="1">
-               <widget class="QCheckBox" name="checkBoxH110">
-                <property name="enabled">
-                 <bool>true</bool>
-                </property>
-                <property name="sizePolicy">
-                 <sizepolicy hsizetype="Preferred" vsizetype="Preferred">
-                  <horstretch>0</horstretch>
-                  <verstretch>0</verstretch>
-                 </sizepolicy>
-                </property>
-                <property name="text">
-                 <string notr="true">110</string>
-                </property>
-                <property name="checked">
-                 <bool>true</bool>
-                </property>
-               </widget>
-              </item>
-              <item row="2" column="1">
-               <widget class="QCheckBox" name="checkBoxH116">
-                <property name="enabled">
-                 <bool>true</bool>
-                </property>
-                <property name="sizePolicy">
-                 <sizepolicy hsizetype="Preferred" vsizetype="Preferred">
-                  <horstretch>0</horstretch>
-                  <verstretch>0</verstretch>
-                 </sizepolicy>
-                </property>
-                <property name="text">
-                 <string notr="true">116</string>
-                </property>
-                <property name="checked">
-                 <bool>true</bool>
-                </property>
-               </widget>
-              </item>
-              <item row="3" column="1">
-               <widget class="QCheckBox" name="checkBoxH122">
-                <property name="enabled">
-                 <bool>true</bool>
-                </property>
-                <property name="sizePolicy">
-                 <sizepolicy hsizetype="Preferred" vsizetype="Preferred">
-                  <horstretch>0</horstretch>
-                  <verstretch>0</verstretch>
-                 </sizepolicy>
-                </property>
-                <property name="text">
-                 <string notr="true">122</string>
-                </property>
-                <property name="checked">
-                 <bool>true</bool>
-                </property>
-               </widget>
-              </item>
-              <item row="4" column="1">
-               <widget class="QCheckBox" name="checkBoxH128">
-                <property name="enabled">
-                 <bool>true</bool>
-                </property>
-                <property name="sizePolicy">
-                 <sizepolicy hsizetype="Preferred" vsizetype="Preferred">
-                  <horstretch>0</horstretch>
-                  <verstretch>0</verstretch>
-                 </sizepolicy>
-                </property>
-                <property name="text">
-                 <string notr="true">128</string>
-                </property>
-                <property name="checked">
-                 <bool>true</bool>
-                </property>
-               </widget>
-              </item>
-              <item row="5" column="1">
-               <widget class="QCheckBox" name="checkBoxH134">
-                <property name="enabled">
-                 <bool>true</bool>
-                </property>
-                <property name="sizePolicy">
-                 <sizepolicy hsizetype="Preferred" vsizetype="Preferred">
-                  <horstretch>0</horstretch>
-                  <verstretch>0</verstretch>
-                 </sizepolicy>
-                </property>
-                <property name="text">
-                 <string notr="true">134</string>
-                </property>
-                <property name="checked">
-                 <bool>true</bool>
-                </property>
-               </widget>
-              </item>
-              <item row="6" column="1">
-               <widget class="QCheckBox" name="checkBoxH140">
-                <property name="enabled">
-                 <bool>true</bool>
-                </property>
-                <property name="sizePolicy">
-                 <sizepolicy hsizetype="Preferred" vsizetype="Preferred">
-                  <horstretch>0</horstretch>
-                  <verstretch>0</verstretch>
-                 </sizepolicy>
-                </property>
-                <property name="text">
-                 <string notr="true">140</string>
-                </property>
-                <property name="checked">
-                 <bool>true</bool>
-                </property>
-               </widget>
-              </item>
-              <item row="7" column="1">
-               <widget class="QCheckBox" name="checkBoxH146">
-                <property name="enabled">
-                 <bool>true</bool>
-                </property>
-                <property name="sizePolicy">
-                 <sizepolicy hsizetype="Preferred" vsizetype="Preferred">
-                  <horstretch>0</horstretch>
-                  <verstretch>0</verstretch>
-                 </sizepolicy>
-                </property>
-                <property name="text">
-                 <string notr="true">146</string>
-                </property>
-                <property name="checked">
-                 <bool>true</bool>
-                </property>
-               </widget>
-              </item>
-              <item row="8" column="1">
-               <widget class="QCheckBox" name="checkBoxH152">
-                <property name="enabled">
-                 <bool>true</bool>
-                </property>
-                <property name="sizePolicy">
-                 <sizepolicy hsizetype="Preferred" vsizetype="Preferred">
-                  <horstretch>0</horstretch>
-                  <verstretch>0</verstretch>
-                 </sizepolicy>
-                </property>
-                <property name="text">
-                 <string notr="true">152</string>
-                </property>
-                <property name="checked">
-                 <bool>true</bool>
-                </property>
-               </widget>
-              </item>
-              <item row="0" column="2">
-               <widget class="QCheckBox" name="checkBoxH158">
-                <property name="enabled">
-                 <bool>true</bool>
-                </property>
-                <property name="sizePolicy">
-                 <sizepolicy hsizetype="Preferred" vsizetype="Preferred">
-                  <horstretch>0</horstretch>
-                  <verstretch>0</verstretch>
-                 </sizepolicy>
-                </property>
-                <property name="text">
-                 <string notr="true">158</string>
-                </property>
-                <property name="checked">
-                 <bool>true</bool>
-                </property>
-               </widget>
-              </item>
-              <item row="1" column="2">
-               <widget class="QCheckBox" name="checkBoxH164">
-                <property name="enabled">
-                 <bool>true</bool>
-                </property>
-                <property name="sizePolicy">
-                 <sizepolicy hsizetype="Preferred" vsizetype="Preferred">
-                  <horstretch>0</horstretch>
-                  <verstretch>0</verstretch>
-                 </sizepolicy>
-                </property>
-                <property name="text">
-                 <string notr="true">164</string>
-                </property>
-                <property name="checked">
-                 <bool>true</bool>
-                </property>
-               </widget>
-              </item>
-              <item row="2" column="2">
-               <widget class="QCheckBox" name="checkBoxH170">
-                <property name="enabled">
-                 <bool>true</bool>
-                </property>
-                <property name="sizePolicy">
-                 <sizepolicy hsizetype="Preferred" vsizetype="Preferred">
-                  <horstretch>0</horstretch>
-                  <verstretch>0</verstretch>
-                 </sizepolicy>
-                </property>
-                <property name="text">
-                 <string notr="true">170</string>
-                </property>
-                <property name="checked">
-                 <bool>true</bool>
-                </property>
-               </widget>
-              </item>
-              <item row="3" column="2">
-               <widget class="QCheckBox" name="checkBoxH176">
-                <property name="enabled">
-                 <bool>true</bool>
-                </property>
-                <property name="sizePolicy">
-                 <sizepolicy hsizetype="Preferred" vsizetype="Preferred">
-                  <horstretch>0</horstretch>
-                  <verstretch>0</verstretch>
-                 </sizepolicy>
-                </property>
-                <property name="text">
-                 <string notr="true">176</string>
-                </property>
-                <property name="checked">
-                 <bool>true</bool>
-                </property>
-               </widget>
-              </item>
-              <item row="4" column="2">
-               <widget class="QCheckBox" name="checkBoxH182">
-                <property name="enabled">
-                 <bool>true</bool>
-                </property>
-                <property name="sizePolicy">
-                 <sizepolicy hsizetype="Preferred" vsizetype="Preferred">
-                  <horstretch>0</horstretch>
-                  <verstretch>0</verstretch>
-                 </sizepolicy>
-                </property>
-                <property name="text">
-                 <string notr="true">182</string>
-                </property>
-                <property name="checked">
-                 <bool>true</bool>
-                </property>
-               </widget>
-              </item>
-              <item row="5" column="2">
-               <widget class="QCheckBox" name="checkBoxH188">
-                <property name="enabled">
-                 <bool>true</bool>
-                </property>
-                <property name="sizePolicy">
-                 <sizepolicy hsizetype="Preferred" vsizetype="Preferred">
-                  <horstretch>0</horstretch>
-                  <verstretch>0</verstretch>
-                 </sizepolicy>
-                </property>
-                <property name="text">
-                 <string notr="true">188</string>
-                </property>
-                <property name="checked">
-                 <bool>true</bool>
-                </property>
-               </widget>
-              </item>
-              <item row="6" column="2">
-               <widget class="QCheckBox" name="checkBoxH194">
-                <property name="enabled">
-                 <bool>true</bool>
-                </property>
-                <property name="sizePolicy">
-                 <sizepolicy hsizetype="Preferred" vsizetype="Preferred">
-                  <horstretch>0</horstretch>
-                  <verstretch>0</verstretch>
-                 </sizepolicy>
-                </property>
-                <property name="text">
-                 <string notr="true">194</string>
-                </property>
-                <property name="checked">
-                 <bool>true</bool>
-                </property>
-               </widget>
-              </item>
-              <item row="7" column="2">
-               <widget class="QCheckBox" name="checkBoxH200">
-                <property name="text">
-                 <string notr="true">200</string>
-                </property>
-                <property name="checked">
-                 <bool>true</bool>
-                </property>
-               </widget>
-              </item>
-             </layout>
-            </widget>
-           </item>
-          </layout>
-         </item>
-         <item>
-          <layout class="QVBoxLayout" name="verticalLayout_7">
-           <item>
-            <widget class="QCheckBox" name="checkBoxAllSizes">
-             <property name="text">
-              <string>All sizes (cm)</string>
-             </property>
-             <property name="checked">
-              <bool>true</bool>
-             </property>
-            </widget>
-           </item>
-           <item>
-            <widget class="QFrame" name="frame_2">
-             <property name="frameShape">
-              <enum>QFrame::StyledPanel</enum>
-             </property>
-             <property name="frameShadow">
-              <enum>QFrame::Raised</enum>
-             </property>
-             <layout class="QGridLayout" name="gridLayout">
-              <item row="3" column="1">
-               <widget class="QCheckBox" name="checkBoxS46">
-                <property name="enabled">
-                 <bool>true</bool>
-                </property>
-                <property name="sizePolicy">
-                 <sizepolicy hsizetype="Preferred" vsizetype="Preferred">
-                  <horstretch>0</horstretch>
-                  <verstretch>0</verstretch>
-                 </sizepolicy>
-                </property>
-                <property name="text">
-                 <string notr="true">46</string>
-                </property>
-                <property name="checked">
-                 <bool>true</bool>
-                </property>
-               </widget>
-              </item>
-              <item row="4" column="1">
-               <widget class="QCheckBox" name="checkBoxS48">
-                <property name="enabled">
-                 <bool>true</bool>
-                </property>
-                <property name="sizePolicy">
-                 <sizepolicy hsizetype="Preferred" vsizetype="Preferred">
-                  <horstretch>0</horstretch>
-                  <verstretch>0</verstretch>
-                 </sizepolicy>
-                </property>
-                <property name="text">
-                 <string notr="true">48</string>
-                </property>
-                <property name="checked">
-                 <bool>true</bool>
-                </property>
-               </widget>
-              </item>
-              <item row="8" column="0">
-               <widget class="QCheckBox" name="checkBoxS38">
-                <property name="enabled">
-                 <bool>true</bool>
-                </property>
-                <property name="sizePolicy">
-                 <sizepolicy hsizetype="Preferred" vsizetype="Preferred">
-                  <horstretch>0</horstretch>
-                  <verstretch>0</verstretch>
-                 </sizepolicy>
-                </property>
-                <property name="text">
-                 <string notr="true">38</string>
-                </property>
-                <property name="checked">
-                 <bool>true</bool>
-                </property>
-               </widget>
-              </item>
-              <item row="0" column="0">
-               <widget class="QCheckBox" name="checkBoxS22">
-                <property name="enabled">
-                 <bool>true</bool>
-                </property>
-                <property name="sizePolicy">
-                 <sizepolicy hsizetype="Preferred" vsizetype="Preferred">
-                  <horstretch>0</horstretch>
-                  <verstretch>0</verstretch>
-                 </sizepolicy>
-                </property>
-                <property name="text">
-                 <string notr="true">22</string>
-                </property>
-                <property name="checked">
-                 <bool>true</bool>
-                </property>
-               </widget>
-              </item>
-              <item row="1" column="0">
-               <widget class="QCheckBox" name="checkBoxS24">
-                <property name="enabled">
-                 <bool>true</bool>
-                </property>
-                <property name="sizePolicy">
-                 <sizepolicy hsizetype="Preferred" vsizetype="Preferred">
-                  <horstretch>0</horstretch>
-                  <verstretch>0</verstretch>
-                 </sizepolicy>
-                </property>
-                <property name="text">
-                 <string notr="true">24</string>
-                </property>
-                <property name="checked">
-                 <bool>true</bool>
-                </property>
-               </widget>
-              </item>
-              <item row="5" column="1">
-               <widget class="QCheckBox" name="checkBoxS50">
-                <property name="enabled">
-                 <bool>true</bool>
-                </property>
-                <property name="sizePolicy">
-                 <sizepolicy hsizetype="Preferred" vsizetype="Preferred">
-                  <horstretch>0</horstretch>
-                  <verstretch>0</verstretch>
-                 </sizepolicy>
-                </property>
-                <property name="text">
-                 <string notr="true">50</string>
-                </property>
-                <property name="checked">
-                 <bool>true</bool>
-                </property>
-               </widget>
-              </item>
-              <item row="7" column="0">
-               <widget class="QCheckBox" name="checkBoxS36">
-                <property name="enabled">
-                 <bool>true</bool>
-                </property>
-                <property name="sizePolicy">
-                 <sizepolicy hsizetype="Preferred" vsizetype="Preferred">
-                  <horstretch>0</horstretch>
-                  <verstretch>0</verstretch>
-                 </sizepolicy>
-                </property>
-                <property name="text">
-                 <string notr="true">36</string>
-                </property>
-                <property name="checked">
-                 <bool>true</bool>
-                </property>
-               </widget>
-              </item>
-              <item row="8" column="1">
-               <widget class="QCheckBox" name="checkBoxS56">
-                <property name="enabled">
-                 <bool>true</bool>
-                </property>
-                <property name="sizePolicy">
-                 <sizepolicy hsizetype="Preferred" vsizetype="Preferred">
-                  <horstretch>0</horstretch>
-                  <verstretch>0</verstretch>
-                 </sizepolicy>
-                </property>
-                <property name="text">
-                 <string notr="true">56</string>
-                </property>
-                <property name="checked">
-                 <bool>true</bool>
-                </property>
-               </widget>
-              </item>
-              <item row="2" column="0">
-               <widget class="QCheckBox" name="checkBoxS26">
-                <property name="enabled">
-                 <bool>true</bool>
-                </property>
-                <property name="sizePolicy">
-                 <sizepolicy hsizetype="Preferred" vsizetype="Preferred">
-                  <horstretch>0</horstretch>
-                  <verstretch>0</verstretch>
-                 </sizepolicy>
-                </property>
-                <property name="text">
-                 <string notr="true">26</string>
-                </property>
-                <property name="checked">
-                 <bool>true</bool>
-                </property>
-               </widget>
-              </item>
-              <item row="4" column="0">
-               <widget class="QCheckBox" name="checkBoxS30">
-                <property name="enabled">
-                 <bool>true</bool>
-                </property>
-                <property name="sizePolicy">
-                 <sizepolicy hsizetype="Preferred" vsizetype="Preferred">
-                  <horstretch>0</horstretch>
-                  <verstretch>0</verstretch>
-                 </sizepolicy>
-                </property>
-                <property name="text">
-                 <string notr="true">30</string>
-                </property>
-                <property name="checked">
-                 <bool>true</bool>
-                </property>
-               </widget>
-              </item>
-              <item row="7" column="1">
-               <widget class="QCheckBox" name="checkBoxS54">
-                <property name="enabled">
-                 <bool>true</bool>
-                </property>
-                <property name="sizePolicy">
-                 <sizepolicy hsizetype="Preferred" vsizetype="Preferred">
-                  <horstretch>0</horstretch>
-                  <verstretch>0</verstretch>
-                 </sizepolicy>
-                </property>
-                <property name="text">
-                 <string notr="true">54</string>
-                </property>
-                <property name="checked">
-                 <bool>true</bool>
-                </property>
-               </widget>
-              </item>
-              <item row="0" column="1">
-               <widget class="QCheckBox" name="checkBoxS40">
-                <property name="enabled">
-                 <bool>true</bool>
-                </property>
-                <property name="sizePolicy">
-                 <sizepolicy hsizetype="Preferred" vsizetype="Preferred">
-                  <horstretch>0</horstretch>
-                  <verstretch>0</verstretch>
-                 </sizepolicy>
-                </property>
-                <property name="text">
-                 <string notr="true">40</string>
-                </property>
-                <property name="checked">
-                 <bool>true</bool>
-                </property>
-               </widget>
-              </item>
-              <item row="6" column="1">
-               <widget class="QCheckBox" name="checkBoxS52">
-                <property name="enabled">
-                 <bool>true</bool>
-                </property>
-                <property name="sizePolicy">
-                 <sizepolicy hsizetype="Preferred" vsizetype="Preferred">
-                  <horstretch>0</horstretch>
-                  <verstretch>0</verstretch>
-                 </sizepolicy>
-                </property>
-                <property name="text">
-                 <string notr="true">52</string>
-                </property>
-                <property name="checked">
-                 <bool>true</bool>
-                </property>
-               </widget>
-              </item>
-              <item row="5" column="0">
-               <widget class="QCheckBox" name="checkBoxS32">
-                <property name="enabled">
-                 <bool>true</bool>
-                </property>
-                <property name="sizePolicy">
-                 <sizepolicy hsizetype="Preferred" vsizetype="Preferred">
-                  <horstretch>0</horstretch>
-                  <verstretch>0</verstretch>
-                 </sizepolicy>
-                </property>
-                <property name="text">
-                 <string notr="true">32</string>
-                </property>
-                <property name="checked">
-                 <bool>true</bool>
-                </property>
-               </widget>
-              </item>
-              <item row="1" column="1">
-               <widget class="QCheckBox" name="checkBoxS42">
-                <property name="enabled">
-                 <bool>true</bool>
-                </property>
-                <property name="sizePolicy">
-                 <sizepolicy hsizetype="Preferred" vsizetype="Preferred">
-                  <horstretch>0</horstretch>
-                  <verstretch>0</verstretch>
-                 </sizepolicy>
-                </property>
-                <property name="text">
-                 <string notr="true">42</string>
-                </property>
-                <property name="checked">
-                 <bool>true</bool>
-                </property>
-               </widget>
-              </item>
-              <item row="6" column="0">
-               <widget class="QCheckBox" name="checkBoxS34">
-                <property name="enabled">
-                 <bool>true</bool>
-                </property>
-                <property name="sizePolicy">
-                 <sizepolicy hsizetype="Preferred" vsizetype="Preferred">
-                  <horstretch>0</horstretch>
-                  <verstretch>0</verstretch>
-                 </sizepolicy>
-                </property>
-                <property name="text">
-                 <string notr="true">34</string>
-                </property>
-                <property name="checked">
-                 <bool>true</bool>
-                </property>
-               </widget>
-              </item>
-              <item row="2" column="1">
-               <widget class="QCheckBox" name="checkBoxS44">
-                <property name="enabled">
-                 <bool>true</bool>
-                </property>
-                <property name="sizePolicy">
-                 <sizepolicy hsizetype="Preferred" vsizetype="Preferred">
-                  <horstretch>0</horstretch>
-                  <verstretch>0</verstretch>
-                 </sizepolicy>
-                </property>
-                <property name="text">
-                 <string notr="true">44</string>
-                </property>
-                <property name="checked">
-                 <bool>true</bool>
-                </property>
-               </widget>
-              </item>
-              <item row="3" column="0">
-               <widget class="QCheckBox" name="checkBoxS28">
-                <property name="enabled">
-                 <bool>true</bool>
-                </property>
-                <property name="sizePolicy">
-                 <sizepolicy hsizetype="Preferred" vsizetype="Preferred">
-                  <horstretch>0</horstretch>
-                  <verstretch>0</verstretch>
-                 </sizepolicy>
-                </property>
-                <property name="text">
-                 <string notr="true">28</string>
-                </property>
-                <property name="checked">
-                 <bool>true</bool>
-                </property>
-               </widget>
-              </item>
-              <item row="1" column="2">
-               <widget class="QCheckBox" name="checkBoxS60">
-                <property name="text">
-                 <string notr="true">60</string>
-                </property>
-                <property name="checked">
-                 <bool>true</bool>
-                </property>
-               </widget>
-              </item>
-              <item row="2" column="2">
-               <widget class="QCheckBox" name="checkBoxS62">
-                <property name="text">
-                 <string notr="true">62</string>
-                </property>
-                <property name="checked">
-                 <bool>true</bool>
-                </property>
-               </widget>
-              </item>
-              <item row="3" column="2">
-               <widget class="QCheckBox" name="checkBoxS64">
-                <property name="text">
-                 <string notr="true">64</string>
-                </property>
-                <property name="checked">
-                 <bool>true</bool>
-                </property>
-               </widget>
-              </item>
-              <item row="4" column="2">
-               <widget class="QCheckBox" name="checkBoxS66">
-                <property name="text">
-                 <string notr="true">66</string>
-                </property>
-                <property name="checked">
-                 <bool>true</bool>
-                </property>
-               </widget>
-              </item>
-              <item row="5" column="2">
-               <widget class="QCheckBox" name="checkBoxS68">
-                <property name="text">
-                 <string notr="true">68</string>
-                </property>
-                <property name="checked">
-                 <bool>true</bool>
-                </property>
-               </widget>
-              </item>
-              <item row="0" column="2">
-               <widget class="QCheckBox" name="checkBoxS58">
-                <property name="text">
-                 <string notr="true">58</string>
-                </property>
-                <property name="checked">
-                 <bool>true</bool>
-                </property>
-               </widget>
-              </item>
-              <item row="6" column="2">
-               <widget class="QCheckBox" name="checkBoxS70">
-                <property name="text">
-                 <string notr="true">70</string>
-                </property>
-                <property name="checked">
-                 <bool>true</bool>
-                </property>
-               </widget>
-              </item>
-              <item row="7" column="2">
-               <widget class="QCheckBox" name="checkBoxS72">
-                <property name="text">
-                 <string notr="true">72</string>
-                </property>
-                <property name="checked">
-                 <bool>true</bool>
-                </property>
-               </widget>
-              </item>
-             </layout>
-            </widget>
-           </item>
-          </layout>
-         </item>
-        </layout>
-       </item>
-      </layout>
-     </widget>
      <widget class="QWidget" name="tab_3">
       <attribute name="title">
        <string>Security</string>
@@ -1352,26 +357,50 @@
             </property>
            </widget>
           </item>
-          <item row="4" column="0">
+          <item row="6" column="0">
            <widget class="QLabel" name="label">
             <property name="text">
              <string>Date format:</string>
             </property>
            </widget>
           </item>
-          <item row="4" column="1">
+          <item row="6" column="1">
            <widget class="QComboBox" name="comboBoxDateFormat"/>
           </item>
-          <item row="5" column="0">
+          <item row="7" column="0">
            <widget class="QLabel" name="label_11">
             <property name="text">
              <string>Time format:</string>
             </property>
            </widget>
           </item>
-          <item row="5" column="1">
+          <item row="7" column="1">
            <widget class="QComboBox" name="comboBoxTimeFormat"/>
           </item>
+          <item row="4" column="0">
+           <widget class="QLabel" name="label_4">
+            <property name="text">
+             <string>Customer birth date:</string>
+            </property>
+           </widget>
+          </item>
+          <item row="4" column="1">
+           <widget class="QDateEdit" name="dateEditCustomerBirthDate">
+            <property name="displayFormat">
+             <string>yyyy-MM-dd</string>
+            </property>
+           </widget>
+          </item>
+          <item row="5" column="0">
+           <widget class="QLabel" name="label_5">
+            <property name="text">
+             <string>Customer email:</string>
+            </property>
+           </widget>
+          </item>
+          <item row="5" column="1">
+           <widget class="QLineEdit" name="lineEditCustomerEmail"/>
+          </item>
          </layout>
         </widget>
        </item>
@@ -1412,7 +441,7 @@
          <property name="sizeHint" stdset="0">
           <size>
            <width>20</width>
-           <height>90</height>
+           <height>9000</height>
           </size>
          </property>
         </spacer>
@@ -1434,18 +463,20 @@
   </layout>
  </widget>
  <customwidgets>
+  <customwidget>
+   <class>VPlainTextEdit</class>
+   <extends>QPlainTextEdit</extends>
+   <header location="global">vplaintextedit.h</header>
+  </customwidget>
   <customwidget>
    <class>VLineEdit</class>
    <extends>QLineEdit</extends>
    <header>vlineedit.h</header>
   </customwidget>
-  <customwidget>
-   <class>VPlainTextEdit</class>
-   <extends>QPlainTextEdit</extends>
-   <header>vplaintextedit.h</header>
-  </customwidget>
  </customwidgets>
- <resources/>
+ <resources>
+  <include location="../../../libs/vmisc/share/resources/icon.qrc"/>
+ </resources>
  <connections>
   <connection>
    <sender>buttonBox</sender>
@@ -1480,7 +511,4 @@
    </hints>
   </connection>
  </connections>
- <buttongroups>
-  <buttongroup name="buttonGroup"/>
- </buttongroups>
 </ui>
diff --git a/src/app/valentina/dialogs/dialogsavelayout.cpp b/src/app/valentina/dialogs/dialogsavelayout.cpp
index c17f43f19..af2a962c9 100644
--- a/src/app/valentina/dialogs/dialogsavelayout.cpp
+++ b/src/app/valentina/dialogs/dialogsavelayout.cpp
@@ -676,7 +676,7 @@ void DialogSaveLayout::SetTiledExportMode(bool tiledExportMode)
 void DialogSaveLayout::SetTiledMargins(QMarginsF margins)
 {
     // read Margins top, right, bottom, left
-    margins = UnitConvertor(margins, Unit::Mm, qApp->patternUnit());
+    margins = UnitConvertor(margins, Unit::Mm, qApp->patternUnits());
 
     ui->doubleSpinBoxLeftField->setValue(margins.left());
     ui->doubleSpinBoxTopField->setValue(margins.top());
@@ -694,7 +694,7 @@ QMarginsF DialogSaveLayout::GetTiledMargins() const
         ui->doubleSpinBoxBottomField->value()
     );
 
-    return UnitConvertor(margins, qApp->patternUnit(), Unit::Mm);
+    return UnitConvertor(margins, qApp->patternUnits(), Unit::Mm);
 }
 
 //---------------------------------------------------------------------------------------------------------------------
@@ -892,7 +892,7 @@ void DialogSaveLayout::RemoveFormatFromList(LayoutExportFormats format)
 void DialogSaveLayout::ReadSettings()
 {
     VSettings *settings = qApp->ValentinaSettings();
-    const Unit unit = qApp->patternUnit();
+    const Unit unit = qApp->patternUnits();
 
     // read Margins top, right, bottom, left
     const QMarginsF margins = settings->GetTiledPDFMargins(unit);
@@ -946,7 +946,7 @@ void DialogSaveLayout::WriteSettings() const
     }
 
     VSettings *settings = qApp->ValentinaSettings();
-    const Unit unit = qApp->patternUnit();
+    const Unit unit = qApp->patternUnits();
 
     // write Margins top, right, bottom, left
     QMarginsF margins = QMarginsF(
diff --git a/src/app/valentina/dialogs/vwidgetdetails.cpp b/src/app/valentina/dialogs/vwidgetdetails.cpp
index 084ababfa..609d533a9 100644
--- a/src/app/valentina/dialogs/vwidgetdetails.cpp
+++ b/src/app/valentina/dialogs/vwidgetdetails.cpp
@@ -297,7 +297,7 @@ void VWidgetDetails::ShowContextMenu(const QPoint &pos)
         catch (const VExceptionBadId &)
         {
             const QString errorMsg = tr("Cannot find piece by id '%1'").arg(id);
-            qWarning() << VAbstractApplication::patternMessageSignature + errorMsg;
+            qWarning() << VAbstractValApplication::patternMessageSignature + errorMsg;
         }
     }
 
diff --git a/src/app/valentina/dialogs/vwidgetgroups.cpp b/src/app/valentina/dialogs/vwidgetgroups.cpp
index 827bf5ee2..af6bb0c5a 100644
--- a/src/app/valentina/dialogs/vwidgetgroups.cpp
+++ b/src/app/valentina/dialogs/vwidgetgroups.cpp
@@ -230,7 +230,7 @@ void VWidgetGroups::CtxMenu(const QPoint &pos)
     }
     else if (selectedAction == actionPreferences)
     {
-        QScopedPointer<VContainer> fackeContainer(new VContainer(qApp->TrVars(), qApp->patternUnitP(),
+        QScopedPointer<VContainer> fackeContainer(new VContainer(qApp->TrVars(), qApp->patternUnitsP(),
                                                                  VContainer::UniqueNamespace()));
         QScopedPointer<DialogGroup> dialog(new DialogGroup(fackeContainer.data(), NULL_ID, this));
         dialog->SetName(doc->GetGroupName(id));
diff --git a/src/app/valentina/mainwindow.cpp b/src/app/valentina/mainwindow.cpp
index 05eda5ae2..2a8468fbe 100644
--- a/src/app/valentina/mainwindow.cpp
+++ b/src/app/valentina/mainwindow.cpp
@@ -173,7 +173,7 @@ void WarningNotUniquePieceName(const QHash<quint32, VPiece> *allDetails)
         {
             const QString errorMsg = QObject::tr("Piece name '%1' is not unique.").arg(pieceName);
             qApp->IsPedantic() ? throw VException(errorMsg) :
-                               qWarning() << VAbstractApplication::patternMessageSignature + errorMsg;
+                               qWarning() << VAbstractValApplication::patternMessageSignature + errorMsg;
         }
 
         ++i;
@@ -200,23 +200,20 @@ MainWindow::MainWindow(QWidget *parent)
       currentDrawIndex(0), currentToolBoxIndex(0),
       drawMode(true),
       leftGoToStage(nullptr), rightGoToStage(nullptr), autoSaveTimer(nullptr), guiEnabled(true),
-      gradationHeights(nullptr),
-      gradationSizes(nullptr),
-      gradationHeightsLabel(nullptr),
-      gradationSizesLabel(nullptr),
-      zoomScale(nullptr),
-      doubleSpinBoxScale(nullptr),
       toolOptions(nullptr),
       groupsWidget(nullptr),
       detailsWidget(nullptr),
       lock(nullptr),
       toolButtonPointerList(),
       m_progressBar(new QProgressBar(this)),
-      m_statusLabel(new QLabel(this))
+      m_statusLabel(new QLabel(this)),
+      m_gradation(new QTimer(this))
 {
     CreateActions();
     InitScenes();
 
+    connect(m_gradation, &QTimer::timeout, this, &MainWindow::GradationChanged);
+
     doc = new VPattern(pattern, sceneDraw, sceneDetails);
     connect(doc, &VPattern::ClearMainWindow, this, &MainWindow::Clear);
     connect(doc, &VPattern::patternChanged, this, &MainWindow::PatternChangesWereSaved);
@@ -510,33 +507,33 @@ void MainWindow::InitScenes()
 //---------------------------------------------------------------------------------------------------------------------
 bool MainWindow::LoadMeasurements(const QString &path)
 {
-    QSharedPointer<VMeasurements> m = OpenMeasurementFile(path);
+    m = OpenMeasurementFile(path);
 
     if (m->isNull())
     {
         return false;
     }
 
-    if (qApp->patternUnit() == Unit::Inch && m->Type() == MeasurementsType::Multisize)
-    {
-        qWarning()<<tr("Gradation doesn't support inches");
-        return false;
-    }
-
-    const qreal size = UnitConvertor(m->BaseSize(), m->MUnit(), *m->GetData()->GetPatternUnit());
-    const qreal height = UnitConvertor(m->BaseHeight(), m->MUnit(), *m->GetData()->GetPatternUnit());
-
     try
     {
-        qApp->setPatternType(m->Type());
+        qApp->SetMeasurementsType(m->Type());
         if (m->Type() == MeasurementsType::Individual)
         {
             qApp->SetCustomerName(m->Customer());
+            qApp->SetCustomerBirthDate(m->BirthDate());
+            qApp->SetCustomerEmail(m->Email());
+        }
+        else if (m->Type() == MeasurementsType::Multisize)
+        {
+            m_currentDimensionA = m->DimensionABase();
+            m_currentDimensionB = m->DimensionBBase();
+            m_currentDimensionC = m->DimensionCBase();
         }
         ToolBarOption();
+        SetDimensionBases();
         pattern->ClearVariables(VarType::Measurement);
         m->StoreNames(false);
-        m->ReadMeasurements(height, size);
+        m->ReadMeasurements(m_currentDimensionA, m_currentDimensionB, m_currentDimensionC);
     }
     catch (VExceptionEmptyParameter &e)
     {
@@ -551,31 +548,33 @@ bool MainWindow::LoadMeasurements(const QString &path)
 
     if (m->Type() == MeasurementsType::Multisize)
     {
-        pattern->SetSize(size);
-        pattern->SetHeight(height);
+        StoreMultisizeMDimensions();
 
         doc->SetPatternWasChanged(true);
         emit doc->UpdatePatternLabel();
     }
     else if (m->Type() == MeasurementsType::Individual)
     {
-        SetSizeHeightForIndividualM();
+        StoreIndividualMDimensions();
+
+        doc->SetPatternWasChanged(true);
+        emit doc->UpdatePatternLabel();
     }
 
     return true;
 }
 
 //---------------------------------------------------------------------------------------------------------------------
-bool MainWindow::UpdateMeasurements(const QString &path, int size, int height)
+bool MainWindow::UpdateMeasurements(const QString &path, int baseA, int baseB, int baseC)
 {
-    QSharedPointer<VMeasurements> m = OpenMeasurementFile(path);
+    m = OpenMeasurementFile(path);
 
     if (m->isNull())
     {
         return false;
     }
 
-    if (qApp->patternType() != m->Type())
+    if (qApp->GetMeasurementsType() != m->Type())
     {
         qCCritical(vMainWindow, "%s", qUtf8Printable(tr("Measurement files types have not match.")));
         if (not VApplication::IsGUIMode())
@@ -589,10 +588,12 @@ bool MainWindow::UpdateMeasurements(const QString &path, int size, int height)
     {
         pattern->ClearVariables(VarType::Measurement);
         m->StoreNames(false);
-        m->ReadMeasurements(height, size);
+        m->ReadMeasurements(baseA, baseB, baseC);
         if (m->Type() == MeasurementsType::Individual)
         {
             qApp->SetCustomerName(m->Customer());
+            qApp->SetCustomerBirthDate(m->BirthDate());
+            qApp->SetCustomerEmail(m->Email());
         }
     }
     catch (VExceptionEmptyParameter &e)
@@ -608,15 +609,17 @@ bool MainWindow::UpdateMeasurements(const QString &path, int size, int height)
 
     if (m->Type() == MeasurementsType::Multisize)
     {
-        pattern->SetSize(size);
-        pattern->SetHeight(height);
+        StoreMultisizeMDimensions();
 
         doc->SetPatternWasChanged(true);
         emit doc->UpdatePatternLabel();
     }
     else if (m->Type() == MeasurementsType::Individual)
     {
-        SetSizeHeightForIndividualM();
+        StoreIndividualMDimensions();
+
+        doc->SetPatternWasChanged(true);
+        emit doc->UpdatePatternLabel();
     }
 
     return true;
@@ -1570,6 +1573,8 @@ void MainWindow::changeEvent(QEvent *event)
             ui->dockWidgetGroups->setToolTip(tr("Show which details will go in layout"));
         }
 
+        ToolBarOption();
+
         UpdateWindowTitle();
         emit sceneDetails->LanguageChanged();
     }
@@ -1792,14 +1797,14 @@ void MainWindow::LoadMultisize()
     if (not mPath.isEmpty())
     {
         QString hText;
-        if (not gradationHeights.isNull())
+        if (not dimensionA.isNull())
         {
-            hText = gradationHeights->currentText();
+            hText = dimensionA->currentText();
         }
         QString sText;
-        if (not gradationSizes.isNull())
+        if (not dimensionB.isNull())
         {
-            sText = gradationSizes->currentText();
+            sText = dimensionB->currentText();
         }
 
         if(LoadMeasurements(mPath))
@@ -1818,16 +1823,16 @@ void MainWindow::LoadMultisize()
 
             UpdateWindowTitle();
 
-            if (qApp->patternType() == MeasurementsType::Multisize)
+            if (qApp->GetMeasurementsType() == MeasurementsType::Multisize)
             {
-                if (not hText.isEmpty() && not gradationHeights.isNull())
+                if (not hText.isEmpty() && not dimensionA.isNull())
                 {
-                    gradationHeights->setCurrentText(hText);
+                    dimensionA->setCurrentText(hText);
                 }
 
-                if (not sText.isEmpty() && not gradationSizes.isNull())
+                if (not sText.isEmpty() && not dimensionB.isNull())
                 {
-                    gradationSizes->setCurrentText(sText);
+                    dimensionB->setCurrentText(sText);
                 }
             }
         }
@@ -1846,11 +1851,35 @@ void MainWindow::UnloadMeasurements()
     if (doc->ListMeasurements().isEmpty())
     {
         watcher->removePath(AbsoluteMPath(qApp->GetPatternPath(), doc->MPath()));
-        if (qApp->patternType() == MeasurementsType::Multisize)
+
+        const MeasurementsType oldType = qApp->GetMeasurementsType();
+        qApp->SetMeasurementsType(MeasurementsType::Unknown);
+
+        m.clear();
+
+        if (oldType == MeasurementsType::Multisize)
         {
+            m_currentDimensionA = 0;
+            m_currentDimensionB = 0;
+            m_currentDimensionC = 0;
+
             ToolBarOption();
         }
-        qApp->setPatternType(MeasurementsType::Unknown);
+        else if (oldType == MeasurementsType::Individual)
+        {
+            qApp->SetCustomerBirthDate(QDate());
+            qApp->SetCustomerEmail(QString());
+            qApp->SetCustomerName(QString());
+
+            qApp->SetDimensionHeight(0);
+            qApp->SetDimensionSize(0);
+            qApp->SetDimensionHip(0);
+            qApp->SetDimensionWaist(0);
+
+            qApp->SetMeasurementsUnits(Unit::LAST_UNIT_DO_NOT_USE);
+            qApp->SetDimensionSizeUnits(Unit::LAST_UNIT_DO_NOT_USE);
+        }
+
         doc->SetMPath(QString());
         emit doc->UpdatePatternLabel();
         PatternChangesWereSaved(false);
@@ -1875,22 +1904,29 @@ void MainWindow::ShowMeasurements()
         const QString absoluteMPath = AbsoluteMPath(qApp->GetPatternPath(), doc->MPath());
 
         QStringList arguments;
-        if (qApp->patternType() == MeasurementsType::Multisize)
+        arguments.append(absoluteMPath);
+        arguments.append("-u");
+        arguments.append(UnitsToStr(qApp->patternUnits()));
+
+        if (qApp->GetMeasurementsType() == MeasurementsType::Multisize)
         {
-            arguments = QStringList()
-                    << absoluteMPath
-                    << "-u"
-                    << UnitsToStr(qApp->patternUnit())
-                    << "-e"
-                    << QString().setNum(static_cast<int>(UnitConvertor(pattern->height(), doc->MUnit(), Unit::Cm)))
-                    << "-s"
-                    << QString().setNum(static_cast<int>(UnitConvertor(pattern->size(), doc->MUnit(), Unit::Cm)));
-        }
-        else
-        {
-            arguments = QStringList() << absoluteMPath
-                                      << "-u"
-                                      << UnitsToStr(qApp->patternUnit());
+            if (m_currentDimensionA > 0)
+            {
+                arguments.append("-a");
+                arguments.append(QString::number(m_currentDimensionA));
+            }
+
+            if (m_currentDimensionB > 0)
+            {
+                arguments.append("-b");
+                arguments.append(QString::number(m_currentDimensionB));
+            }
+
+            if (m_currentDimensionC > 0)
+            {
+                arguments.append("-c");
+                arguments.append(QString::number(m_currentDimensionC));
+            }
         }
 
         if (isNoScaling)
@@ -1945,7 +1981,7 @@ void MainWindow::SyncMeasurements()
     if (mChanges)
     {
         const QString path = AbsoluteMPath(qApp->GetPatternPath(), doc->MPath());
-        if(UpdateMeasurements(path, static_cast<int>(pattern->size()), static_cast<int>(pattern->height())))
+        if(UpdateMeasurements(path, m_currentDimensionA, m_currentDimensionB, m_currentDimensionC))
         {
             if (not watcher->files().contains(path))
             {
@@ -2031,6 +2067,150 @@ void MainWindow::CleanWaterkmarkEditors()
     }
 }
 
+//---------------------------------------------------------------------------------------------------------------------
+void MainWindow::StoreMultisizeMDimensions()
+{
+    qApp->SetMeasurementsUnits(m->MUnit());
+
+    QList<MeasurementDimension_p> dimensions = m->Dimensions().values();
+
+    auto StoreDimension = [this, dimensions](int index, int currentBase)
+    {
+        if (dimensions.size() > index)
+        {
+            MeasurementDimension_p dimension = dimensions.at(index);
+
+            switch(dimension->Type())
+            {
+                case MeasurementDimension::X:
+                    qApp->SetDimensionHeight(currentBase);
+                    break;
+                case MeasurementDimension::Y:
+                {
+                    const bool fc = m->IsFullCircumference();
+                    qApp->SetDimensionSize(fc ? currentBase*2 : currentBase);
+                    const bool circumference = dimension->IsCircumference();
+                    qApp->SetDimensionSizeUnits(circumference ? m->MUnit() : Unit::LAST_UNIT_DO_NOT_USE);
+                    break;
+                }
+                case MeasurementDimension::W:
+                    Q_FALLTHROUGH();
+                case MeasurementDimension::Z:
+                {
+                    const bool fc = m->IsFullCircumference();
+                    qApp->SetDimensionSize(fc ? currentBase*2 : currentBase);
+                    break;
+                }
+                default:
+                    break;
+            }
+        }
+    };
+
+    StoreDimension(0, m_currentDimensionA);
+    StoreDimension(1, m_currentDimensionB);
+    StoreDimension(2, m_currentDimensionC);
+}
+
+//---------------------------------------------------------------------------------------------------------------------
+void MainWindow::StoreIndividualMDimensions()
+{
+    QMap<QString, QSharedPointer<VMeasurement> > measurements = pattern->DataMeasurements();
+
+    auto StoreDimension = [this, measurements](IMD type)
+    {
+        const QString name = m->MeasurementForDimension(type);
+        if (not name.isEmpty() && measurements.contains(name))
+        {
+            switch(type)
+            {
+                case IMD::X:
+                    qApp->SetDimensionHeight(*measurements.value(name)->GetValue());
+                    break;
+                case IMD::Y:
+                    qApp->SetDimensionSize(*measurements.value(name)->GetValue());
+                    break;
+                case IMD::W:
+                    qApp->SetDimensionHip(*measurements.value(name)->GetValue());
+                    break;
+                case IMD::Z:
+                    qApp->SetDimensionWaist(*measurements.value(name)->GetValue());
+                    break;
+                case IMD::N:
+                default:
+                    break;
+            }
+        }
+    };
+
+    StoreDimension(IMD::X);
+    StoreDimension(IMD::Y);
+    StoreDimension(IMD::W);
+    StoreDimension(IMD::Z);
+}
+
+//---------------------------------------------------------------------------------------------------------------------
+QVector<int> MainWindow::DimensionRestrictedValues(int index, const MeasurementDimension_p &dimension)
+{
+    QPair<int, int> restriction;
+
+    if (index == 0)
+    {
+        return dimension->ValidBases();
+    }
+    else if (index == 1)
+    {
+        restriction = m->Restriction(m_currentDimensionA);
+    }
+    else
+    {
+        restriction = m->Restriction(m_currentDimensionA, m_currentDimensionB);
+    }
+
+    const QVector<int> bases = dimension->ValidBases();
+
+    int min = bases.indexOf(restriction.first) != -1 ? restriction.first : dimension->MinValue();
+    int max = bases.indexOf(restriction.second) != -1 ? restriction.second : dimension->MaxValue();
+
+    if (min > max)
+    {
+        min = dimension->MinValue();
+        max = dimension->MaxValue();
+    }
+
+    return VAbstartMeasurementDimension::ValidBases(min, max, dimension->Step());
+}
+
+//---------------------------------------------------------------------------------------------------------------------
+void MainWindow::SetDimensionBases()
+{
+    const QList<MeasurementDimension_p> dimensions = m->Dimensions().values();
+
+    auto SetBase = [dimensions](int index, QPointer<QComboBox> control, int &value)
+    {
+        if (dimensions.size() > index)
+        {
+            SCASSERT(control != nullptr)
+
+            MeasurementDimension_p dimension = dimensions.at(index);
+
+            const qint32 i = control->findData(value);
+            if (i != -1)
+            {
+                control->setCurrentIndex(i);
+            }
+            else
+            {
+                value = control->currentData().toInt();
+            }
+        }
+    };
+
+    SetBase(0, dimensionA, m_currentDimensionA);
+    SetBase(1, dimensionB, m_currentDimensionB);
+    SetBase(2, dimensionC, m_currentDimensionC);
+}
+
 //---------------------------------------------------------------------------------------------------------------------
 #if defined(Q_OS_MAC)
 void MainWindow::OpenAt(QAction *where)
@@ -2053,22 +2233,7 @@ void MainWindow::OpenAt(QAction *where)
 void MainWindow::ToolBarOption()
 {
     ui->toolBarOption->clear();
-    if (not gradationHeights.isNull())
-    {
-        delete gradationHeights;
-    }
-    if (not gradationSizes.isNull())
-    {
-        delete gradationSizes;
-    }
-    if (not gradationHeightsLabel.isNull())
-    {
-        delete gradationHeightsLabel;
-    }
-    if (not gradationSizesLabel.isNull())
-    {
-        delete gradationSizesLabel;
-    }
+
     if (not zoomScale.isNull())
     {
         delete zoomScale;
@@ -2078,32 +2243,18 @@ void MainWindow::ToolBarOption()
         delete doubleSpinBoxScale;
     }
 
-    if (qApp->patternType() == MeasurementsType::Multisize)
+    if (not m_mouseCoordinate.isNull())
     {
-        const QStringList listHeights = VMeasurement::ListHeights(doc->GetGradationHeights(), qApp->patternUnit());
-        const QStringList listSizes = VMeasurement::ListSizes(doc->GetGradationSizes(), qApp->patternUnit());
-
-        gradationHeightsLabel = new QLabel(tr("Height:"), this);
-        gradationHeights = SetGradationList(gradationHeightsLabel, listHeights);
-
-        // set default height
-        SetDefaultHeight();
-
-        connect(gradationHeights.data(), &QComboBox::currentTextChanged,
-                this, &MainWindow::ChangedHeight);
-
-        gradationSizesLabel = new QLabel(tr("Size:"), this);
-        gradationSizes = SetGradationList(gradationSizesLabel, listSizes);
-
-        // set default size
-        SetDefaultSize();
-
-        connect(gradationSizes.data(), &QComboBox::currentTextChanged,
-                this, &MainWindow::ChangedSize);
-
-        ui->toolBarOption->addSeparator();
+        delete m_mouseCoordinate;
     }
 
+    if (not m_unreadPatternMessage.isNull())
+    {
+        delete m_unreadPatternMessage;
+    }
+
+    InitDimensionControls();
+
     zoomScale = new QLabel(tr("Scale:"), this);
     ui->toolBarOption->addWidget(zoomScale);
 
@@ -2111,13 +2262,13 @@ void MainWindow::ToolBarOption()
     doubleSpinBoxScale->setDecimals(1);
     doubleSpinBoxScale->setSuffix("%");
     ScaleChanged(ui->view->transform().m11());
-    connect(doubleSpinBoxScale.data(), QOverload<double>::of(&QDoubleSpinBox::valueChanged),
+    connect(doubleSpinBoxScale, QOverload<double>::of(&QDoubleSpinBox::valueChanged),
             this, [this](double d){ui->view->Zoom(d/100.0);});
     ui->toolBarOption->addWidget(doubleSpinBoxScale);
 
     ui->toolBarOption->addSeparator();
 
-    m_mouseCoordinate = new QLabel(QString("0, 0 (%1)").arg(UnitsToStr(qApp->patternUnit(), true)));
+    m_mouseCoordinate = new QLabel(QString("0, 0 (%1)").arg(UnitsToStr(qApp->patternUnits(), true)));
     ui->toolBarOption->addWidget(m_mouseCoordinate);
 
     ui->toolBarOption->addSeparator();
@@ -2125,18 +2276,6 @@ void MainWindow::ToolBarOption()
     ui->toolBarOption->addWidget(m_unreadPatternMessage);
 }
 
-//---------------------------------------------------------------------------------------------------------------------
-QComboBox *MainWindow::SetGradationList(QLabel *label, const QStringList &list)
-{
-    ui->toolBarOption->addWidget(label);
-
-    QComboBox *comboBox = new QComboBox(this);
-    comboBox->addItems(list);
-    ui->toolBarOption->addWidget(comboBox);
-
-    return comboBox;
-}
-
 //---------------------------------------------------------------------------------------------------------------------
 void MainWindow::ToolBarStages()
 {
@@ -2363,7 +2502,7 @@ void MainWindow::MouseMove(const QPointF &scenePos)
         m_mouseCoordinate->setText(QStringLiteral("%1, %2 (%3)")
                                    .arg(static_cast<qint32>(qApp->fromPixel(scenePos.x())))
                                    .arg(static_cast<qint32>(qApp->fromPixel(scenePos.y())))
-                                   .arg(UnitsToStr(qApp->patternUnit(), true)));
+                                   .arg(UnitsToStr(qApp->patternUnits(), true)));
     }
 }
 
@@ -2714,7 +2853,7 @@ void MainWindow::ActionDraw(bool checked)
         SetEnableWidgets(true);
         ui->toolBox->setCurrentIndex(currentToolBoxIndex);
 
-        if (qApp->patternType() == MeasurementsType::Multisize)
+        if (qApp->GetMeasurementsType() == MeasurementsType::Multisize)
         {
             ui->toolBarOption->setVisible(true);
         }
@@ -2789,7 +2928,7 @@ void MainWindow::ActionDetails(bool checked)
         SetEnableWidgets(true);
         ui->toolBox->setCurrentIndex(ui->toolBox->indexOf(ui->detailPage));
 
-        if (qApp->patternType() == MeasurementsType::Multisize)
+        if (qApp->GetMeasurementsType() == MeasurementsType::Multisize)
         {
             ui->toolBarOption->setVisible(true);
         }
@@ -2904,7 +3043,7 @@ void MainWindow::ActionLayout(bool checked)
             m_mouseCoordinate->setText(QString());
         }
 
-        if (qApp->patternType() == MeasurementsType::Multisize)
+        if (qApp->GetMeasurementsType() == MeasurementsType::Multisize)
         {
             ui->toolBarOption->setVisible(false);
         }
@@ -3227,8 +3366,8 @@ void MainWindow::Clear()
     ui->actionPreviousPatternPiece->setEnabled(false);
     ui->actionNextPatternPiece->setEnabled(false);
     SetEnableTool(false);
-    qApp->setPatternUnit(Unit::Cm);
-    qApp->setPatternType(MeasurementsType::Unknown);
+    qApp->SetPatternUnits(Unit::Cm);
+    qApp->SetMeasurementsType(MeasurementsType::Unknown);
     ui->toolBarOption->clear();
 #ifndef QT_NO_CURSOR
     QGuiApplication::restoreOverrideCursor();
@@ -3626,56 +3765,6 @@ void MainWindow::SetEnableWidgets(bool enable)
     ui->view->setEnabled(enable);
 }
 
-//---------------------------------------------------------------------------------------------------------------------
-void MainWindow::UpdateHeightsList(const QStringList &list)
-{
-    QString val;
-    if (gradationHeights->currentIndex() != -1)
-    {
-        val = gradationHeights->currentText();
-    }
-
-    gradationHeights->blockSignals(true);
-    gradationHeights->clear();
-    gradationHeights->addItems(list);
-    gradationHeights->blockSignals(false);
-
-    int index = gradationHeights->findText(val);
-    if (index != -1)
-    {
-        gradationHeights->setCurrentIndex(index);
-    }
-    else
-    {
-        ChangedHeight(list.at(0));
-    }
-}
-
-//---------------------------------------------------------------------------------------------------------------------
-void MainWindow::UpdateSizesList(const QStringList &list)
-{
-    QString val;
-    if (gradationSizes->currentIndex() != -1)
-    {
-        val = gradationSizes->currentText();
-    }
-
-    gradationSizes->blockSignals(true);
-    gradationSizes->clear();
-    gradationSizes->addItems(list);
-    gradationSizes->blockSignals(false);
-
-    int index = gradationSizes->findText(val);
-    if (index != -1)
-    {
-        gradationSizes->setCurrentIndex(index);
-    }
-    else
-    {
-        ChangedSize(list.at(0));
-    }
-}
-
 //---------------------------------------------------------------------------------------------------------------------
 /**
  * @brief on_actionNew_triggered create new empty pattern.
@@ -3693,7 +3782,7 @@ void MainWindow::on_actionNew_triggered()
         if (newPattern.exec() == QDialog::Accepted)
         {
             patternPieceName = newPattern.name();
-            qApp->setPatternUnit(newPattern.PatternUnit());
+            qApp->SetPatternUnits(newPattern.PatternUnit());
             qCDebug(vMainWindow, "PP name: %s", qUtf8Printable(patternPieceName));
         }
         else
@@ -3708,7 +3797,7 @@ void MainWindow::on_actionNew_triggered()
 
         AddPP(patternPieceName);
 
-        m_mouseCoordinate = new QLabel(QString("0, 0 (%1)").arg(UnitsToStr(qApp->patternUnit(), true)));
+        m_mouseCoordinate = new QLabel(QString("0, 0 (%1)").arg(UnitsToStr(qApp->patternUnits(), true)));
         ui->toolBarOption->addWidget(m_mouseCoordinate);
 
         m_curFileFormatVersion = VPatternConverter::PatternMaxVer;
@@ -3739,45 +3828,55 @@ void MainWindow::PatternChangesWereSaved(bool saved)
 }
 
 //---------------------------------------------------------------------------------------------------------------------
-/**
- * @brief ChangedSize change new size value.
- * @param text value size.
- */
-void MainWindow::ChangedSize(const QString & text)
+void MainWindow::DimensionABaseChanged()
 {
-    const int size = static_cast<int>(pattern->size());
-    if (UpdateMeasurements(AbsoluteMPath(qApp->GetPatternPath(), doc->MPath()), text.toInt(),
-                           static_cast<int>(pattern->height())))
-    {
-        doc->LiteParseTree(Document::FullLiteParse);
-        emit sceneDetails->DimensionsChanged();
-    }
-    else
-    {
-        qCWarning(vMainWindow, "%s", qUtf8Printable(tr("Couldn't update measurements.")));
+    m_currentDimensionA = dimensionA->currentData().toInt();
 
-        const qint32 index = gradationSizes->findText(QString().setNum(size));
-        if (index != -1)
+    const QList<MeasurementDimension_p> dimensions = m->Dimensions().values();
+    if (dimensions.size() > 1)
+    {
+        MeasurementDimension_p dimension = dimensions.at(1);
+        InitDimensionGradation(1, dimension, dimensionB);
+
+        if (dimensions.size() > 2)
         {
-            gradationSizes->setCurrentIndex(index);
-        }
-        else
-        {
-            qCDebug(vMainWindow, "Couldn't restore size value.");
+            dimension = dimensions.at(2);
+            InitDimensionGradation(2, dimension, dimensionC);
         }
     }
+
+    m_gradation->start();
 }
 
 //---------------------------------------------------------------------------------------------------------------------
-/**
- * @brief ChangedGrowth change new height value.
- * @param text value height.
- */
-void MainWindow::ChangedHeight(const QString &text)
+void MainWindow::DimensionBBaseChanged()
 {
-    const int height = static_cast<int>(pattern->height());
-    if (UpdateMeasurements(AbsoluteMPath(qApp->GetPatternPath(), doc->MPath()), static_cast<int>(pattern->size()),
-                           text.toInt()))
+    m_currentDimensionB = dimensionB->currentData().toInt();
+
+    const QList<MeasurementDimension_p> dimensions = m->Dimensions().values();
+
+    if (dimensions.size() > 2)
+    {
+        MeasurementDimension_p dimension = dimensions.at(2);
+        InitDimensionGradation(2, dimension, dimensionC);
+    }
+
+    m_gradation->start();
+}
+
+//---------------------------------------------------------------------------------------------------------------------
+void MainWindow::DimensionCBaseChanged()
+{
+    m_currentDimensionC = dimensionC->currentData().toInt();
+    m_gradation->start();
+}
+
+//---------------------------------------------------------------------------------------------------------------------
+void MainWindow::GradationChanged()
+{
+    m_gradation->stop();
+    if (UpdateMeasurements(AbsoluteMPath(qApp->GetPatternPath(), doc->MPath()), m_currentDimensionA,
+                           m_currentDimensionB, m_currentDimensionC))
     {
         doc->LiteParseTree(Document::FullLiteParse);
         emit sceneDetails->DimensionsChanged();
@@ -3785,16 +3884,6 @@ void MainWindow::ChangedHeight(const QString &text)
     else
     {
         qCWarning(vMainWindow, "%s", qUtf8Printable(tr("Couldn't update measurements.")));
-
-        const qint32 index = gradationHeights->findText(QString().setNum(height));
-        if (index != -1)
-        {
-            gradationHeights->setCurrentIndex(index);
-        }
-        else
-        {
-            qCDebug(vMainWindow, "Couldn't restore height value.");
-        }
     }
 }
 
@@ -3823,43 +3912,181 @@ void MainWindow::ClearPatternMessages()
 }
 
 //---------------------------------------------------------------------------------------------------------------------
-void MainWindow::SetDefaultHeight()
+void MainWindow::InitDimensionControls()
 {
-    const QString defHeight = QString().setNum(doc->GetDefCustomHeight());
-    int index = gradationHeights->findText(defHeight);
-    if (index != -1)
+    if (not dimensionA.isNull())
     {
-        gradationHeights->setCurrentIndex(index);
+        delete dimensionA;
     }
-    else
+    if (not dimensionALabel.isNull())
     {
-        index = gradationHeights->findText(QString().setNum(pattern->height()));
-        if (index != -1)
+        delete dimensionALabel;
+    }
+
+    if (not dimensionB.isNull())
+    {
+        delete dimensionB;
+    }
+    if (not dimensionBLabel.isNull())
+    {
+        delete dimensionBLabel;
+    }
+
+    if (not dimensionC.isNull())
+    {
+        delete dimensionC;
+    }
+    if (not dimensionCLabel.isNull())
+    {
+        delete dimensionCLabel;
+    }
+
+    if (qApp->GetMeasurementsType() == MeasurementsType::Multisize)
+    {
+        const QList<MeasurementDimension_p> dimensions = m->Dimensions().values();
+        const QString unit = UnitsToStr(qApp->MeasurementsUnits(), true);
+
+        auto InitControl = [this, dimensions, unit](int index, QPointer<QLabel> &name, QPointer<QComboBox> &control)
         {
-            gradationHeights->setCurrentIndex(index);
+            if (dimensions.size() > index)
+            {
+                MeasurementDimension_p dimension = dimensions.at(index);
+
+                if (name.isNull())
+                {
+                    name = new QLabel(VAbstartMeasurementDimension::DimensionName(dimension->Type())+QChar(':'));
+                }
+                else
+                {
+                    name->setText(VAbstartMeasurementDimension::DimensionName(dimension->Type())+QChar(':'));
+                }
+                name->setToolTip(VAbstartMeasurementDimension::DimensionToolTip(dimension->Type(),
+                                                                                dimension->IsCircumference(),
+                                                                                m->IsFullCircumference()));
+
+                if (control.isNull())
+                {
+                    control = new QComboBox;
+                }
+
+                InitDimensionGradation(index, dimension, control);
+
+                ui->toolBarOption->addWidget(name);
+                ui->toolBarOption->addWidget(control);
+            }
+        };
+
+        InitControl(0, dimensionALabel, dimensionA);
+        InitControl(1, dimensionBLabel, dimensionB);
+        InitControl(2, dimensionCLabel, dimensionC);
+
+        if (not dimensionA.isNull())
+        {
+            connect(dimensionA, QOverload<int>::of(&QComboBox::currentIndexChanged),
+                    this, &MainWindow::DimensionABaseChanged);
         }
+
+        if (not dimensionB.isNull())
+        {
+            connect(dimensionB, QOverload<int>::of(&QComboBox::currentIndexChanged),
+                    this, &MainWindow::DimensionBBaseChanged);
+        }
+
+        if (not dimensionC.isNull())
+        {
+            connect(dimensionC, QOverload<int>::of(&QComboBox::currentIndexChanged),
+                    this, &MainWindow::DimensionCBaseChanged);
+        }
+
+        ui->toolBarOption->addSeparator();
     }
-    pattern->SetHeight(gradationHeights->currentText().toInt());
 }
 
 //---------------------------------------------------------------------------------------------------------------------
-void MainWindow::SetDefaultSize()
+void MainWindow::InitDimensionGradation(int index, const MeasurementDimension_p &dimension, QPointer<QComboBox> control)
 {
-    const QString defSize = QString().setNum(doc->GetDefCustomSize());
-    int index = gradationSizes->findText(defSize);
-    if (index != -1)
+    SCASSERT(control != nullptr)
+
+    const bool fc = m->IsFullCircumference();
+    const QString unit = UnitsToStr(qApp->MeasurementsUnits(), true);
+
+    int current = -1;
+    if (control->currentIndex() != -1)
     {
-        gradationSizes->setCurrentIndex(index);
+        current = control->currentData().toInt();
+    }
+
+    control->blockSignals(true);
+    control->clear();
+
+    const QVector<int> bases = DimensionRestrictedValues(index, dimension);
+    const DimesionLabels labels = dimension->Labels();
+
+    if (dimension->Type() == MeasurementDimension::X)
+    {
+        for(auto base : bases)
+        {
+            if (labels.contains(base) && not labels.value(base).isEmpty())
+            {
+                control->addItem(labels.value(base), base);
+            }
+            else
+            {
+                control->addItem(QString("%1 %2").arg(base).arg(unit), base);
+            }
+        }
+    }
+    else if (dimension->Type() == MeasurementDimension::Y)
+    {
+        for(auto base : bases)
+        {
+            if (labels.contains(base) && not labels.value(base).isEmpty())
+            {
+                control->addItem(labels.value(base), base);
+            }
+            else
+            {
+                if (dimension->IsCircumference())
+                {
+                    control->addItem(QString("%1 %2").arg(fc ? base*2 : base).arg(unit), base);
+                }
+                else
+                {
+                    control->addItem(QString::number(base), base);
+                }
+            }
+        }
+    }
+    else if (dimension->Type() == MeasurementDimension::W || dimension->Type() == MeasurementDimension::Z)
+    {
+        for(auto base : bases)
+        {
+            if (labels.contains(base) && not labels.value(base).isEmpty())
+            {
+                control->addItem(labels.value(base), base);
+            }
+            else
+            {
+                control->addItem(QString("%1 %2").arg(fc ? base*2 : base).arg(unit), base);
+            }
+        }
+    }
+
+    // after initialization the current index is 0. The signal for changing the index will not be triggered if not make
+    // it invalid first
+    control->setCurrentIndex(-1);
+
+    int i = control->findData(current);
+    if (i != -1)
+    {
+        control->setCurrentIndex(i);
+        control->blockSignals(false);
     }
     else
     {
-        index = gradationSizes->findText(QString().setNum(pattern->size()));
-        if (index != -1)
-        {
-            gradationSizes->setCurrentIndex(index);
-        }
+        control->blockSignals(false);
+        control->setCurrentIndex(0);
     }
-    pattern->SetSize(gradationSizes->currentText().toInt());
 }
 
 //---------------------------------------------------------------------------------------------------------------------
@@ -4629,11 +4856,6 @@ void MainWindow::CreateActions()
     connect(ui->actionPattern_properties, &QAction::triggered, this, [this]()
     {
         DialogPatternProperties proper(doc, pattern, this);
-        connect(&proper, &DialogPatternProperties::UpdateGradation, this, [this]()
-        {
-            UpdateHeightsList(VMeasurement::ListHeights(doc->GetGradationHeights(), qApp->patternUnit()));
-            UpdateSizesList(VMeasurement::ListSizes(doc->GetGradationSizes(), qApp->patternUnit()));
-        });
         proper.exec();
     });
 
@@ -4725,7 +4947,7 @@ void MainWindow::CreateActions()
 
     connect(ui->actionLabelTemplateEditor, &QAction::triggered, this, [this]()
     {
-        DialogEditLabel editor(doc);
+        DialogEditLabel editor(doc, pattern);
         editor.exec();
     });
 
@@ -4909,7 +5131,7 @@ bool MainWindow::LoadPattern(QString fileName, const QString& customMeasureFile)
         {
             doc->SetMPath(RelativeMPath(fileName, customMeasureFile));
         }
-        qApp->setPatternUnit(doc->MUnit());
+        qApp->SetPatternUnits(doc->MUnit());
 
         QString path = AbsoluteMPath(fileName, doc->MPath());
         QString fixedMPath;
@@ -4976,7 +5198,7 @@ bool MainWindow::LoadPattern(QString fileName, const QString& customMeasureFile)
             }
         }
 
-        if (qApp->patternType() == MeasurementsType::Unknown)
+        if (qApp->GetMeasurementsType() == MeasurementsType::Unknown)
         {// Show toolbar only if was not uploaded any measurements.
             ToolBarOption();
         }
@@ -4996,7 +5218,7 @@ bool MainWindow::LoadPattern(QString fileName, const QString& customMeasureFile)
             {
                 doc->SetMPath(RelativeMPath(fileName, fixedMPath));
             }
-            qApp->setPatternUnit(doc->MUnit());
+            qApp->SetPatternUnits(doc->MUnit());
         }
     }
     catch (VException &e)
@@ -5463,7 +5685,7 @@ QString MainWindow::CheckPathToMeasurements(const QString &patternPath, const QS
 
                     CheckRequiredMeasurements(m.data());
 
-                    qApp->setPatternType(patternType);
+                    qApp->SetMeasurementsType(patternType);
                     doc->SetMPath(RelativeMPath(patternPath, mPath));
                     return mPath;
                 }
@@ -5694,37 +5916,37 @@ bool MainWindow::DoFMExport(const VCommandLinePtr &expParams)
 }
 
 //---------------------------------------------------------------------------------------------------------------------
-bool MainWindow::SetSize(const QString &text)
+bool MainWindow::SetDimensionA(int value)
 {
     if (not VApplication::IsGUIMode())
     {
         if (this->isWindowModified() || not qApp->GetPatternPath().isEmpty())
         {
-            if (qApp->patternType() == MeasurementsType::Multisize)
+            if (qApp->GetMeasurementsType() == MeasurementsType::Multisize)
             {
-                const int size = static_cast<int>(UnitConvertor(text.toInt(), Unit::Cm, *pattern->GetPatternUnit()));
-                const qint32 index = gradationSizes->findText(QString().setNum(size));
+                const qint32 index = dimensionA->findData(value);
                 if (index != -1)
                 {
-                    gradationSizes->setCurrentIndex(index);
+                    dimensionA->setCurrentIndex(index);
                 }
                 else
                 {
                     qCCritical(vMainWindow, "%s",
-                              qUtf8Printable(tr("Not supported size value '%1' for this pattern file.").arg(text)));
+                               qUtf8Printable(tr("Not supported dimension A value '%1' for this pattern file.")
+                                                  .arg(value)));
                     return false;
                 }
             }
             else
             {
                 qCCritical(vMainWindow, "%s",
-                          qUtf8Printable(tr("Couldn't set size. Need a file with multisize measurements.")));
+                           qUtf8Printable(tr("Couldn't set dimension A. Need a file with multisize measurements.")));
                 return false;
             }
         }
         else
         {
-            qCCritical(vMainWindow, "%s", qUtf8Printable(tr("Couldn't set size. File wasn't opened.")));
+            qCCritical(vMainWindow, "%s", qUtf8Printable(tr("Couldn't set dimension A. File wasn't opened.")));
             return false;
         }
     }
@@ -5737,37 +5959,80 @@ bool MainWindow::SetSize(const QString &text)
 }
 
 //---------------------------------------------------------------------------------------------------------------------
-bool MainWindow::SetHeight(const QString &text)
+bool MainWindow::SetDimensionB(int value)
 {
     if (not VApplication::IsGUIMode())
     {
         if (this->isWindowModified() || not qApp->GetPatternPath().isEmpty())
         {
-            if (qApp->patternType() == MeasurementsType::Multisize)
+            if (qApp->GetMeasurementsType() == MeasurementsType::Multisize)
             {
-                const int height = static_cast<int>(UnitConvertor(text.toInt(), Unit::Cm, *pattern->GetPatternUnit()));
-                const qint32 index = gradationHeights->findText(QString().setNum(height));
+                const qint32 index = dimensionB->findData(value);
                 if (index != -1)
                 {
-                    gradationHeights->setCurrentIndex(index);
+                    dimensionB->setCurrentIndex(index);
                 }
                 else
                 {
                     qCCritical(vMainWindow, "%s",
-                              qUtf8Printable(tr("Not supported height value '%1' for this pattern file.").arg(text)));
+                              qUtf8Printable(tr("Not supported dimension B value '%1' for this pattern file.")
+                                                  .arg(value)));
                     return false;
                 }
             }
             else
             {
                 qCCritical(vMainWindow, "%s",
-                          qUtf8Printable(tr("Couldn't set height. Need a file with multisize measurements.")));
+                          qUtf8Printable(tr("Couldn't set dimension B. Need a file with multisize measurements.")));
                 return false;
             }
         }
         else
         {
-            qCCritical(vMainWindow, "%s", qUtf8Printable(tr("Couldn't set height. File wasn't opened.")));
+            qCCritical(vMainWindow, "%s", qUtf8Printable(tr("Couldn't set dimension B. File wasn't opened.")));
+            return false;
+        }
+    }
+    else
+    {
+        qCWarning(vMainWindow, "%s", qUtf8Printable(tr("The method %1 does nothing in GUI mode").arg(Q_FUNC_INFO)));
+        return false;
+    }
+    return true;
+}
+
+//---------------------------------------------------------------------------------------------------------------------
+bool MainWindow::SetDimensionC(int value)
+{
+    if (not VApplication::IsGUIMode())
+    {
+        if (this->isWindowModified() || not qApp->GetPatternPath().isEmpty())
+        {
+            if (qApp->GetMeasurementsType() == MeasurementsType::Multisize)
+            {
+                const qint32 index = dimensionC->findData(value);
+                if (index != -1)
+                {
+                    dimensionC->setCurrentIndex(index);
+                }
+                else
+                {
+                    qCCritical(vMainWindow, "%s",
+                               qUtf8Printable(tr("Not supported dimension C value '%1' for this pattern file.")
+                                                  .arg(value)));
+                    return false;
+                }
+            }
+            else
+            {
+                qCCritical(vMainWindow, "%s",
+                           qUtf8Printable(tr("Couldn't set dimension C. Need a file with multisize measurements.")));
+                return false;
+            }
+        }
+        else
+        {
+            qCCritical(vMainWindow, "%s", qUtf8Printable(tr("Couldn't set dimension C. File wasn't opened.")));
             return false;
         }
     }
@@ -5814,19 +6079,25 @@ void MainWindow::ProcessCMD()
             return; // process only one input file
         }
 
-        bool hSetted = true;
-        bool sSetted = true;
-        if (cmd->IsSetGradationSize())
+        bool aSetted = true;
+        bool bSetted = true;
+        bool cSetted = true;
+        if (cmd->IsSetDimensionA())
         {
-            sSetted = SetSize(cmd->OptGradationSize());
+            aSetted = SetDimensionA(cmd->OptDimensionA());
         }
 
-        if (cmd->IsSetGradationHeight())
+        if (cmd->IsSetDimensionB())
         {
-            hSetted = SetHeight(cmd->OptGradationHeight());
+            bSetted = SetDimensionB(cmd->OptDimensionB());
         }
 
-        if (not (hSetted && sSetted))
+        if (cmd->IsSetDimensionC())
+        {
+            cSetted = SetDimensionB(cmd->OptDimensionC());
+        }
+
+        if (not (aSetted && bSetted && cSetted))
         {
             qApp->exit(V_EX_DATAERR);
             return;
diff --git a/src/app/valentina/mainwindow.h b/src/app/valentina/mainwindow.h
index 1ec84656f..80ff30eda 100644
--- a/src/app/valentina/mainwindow.h
+++ b/src/app/valentina/mainwindow.h
@@ -32,7 +32,9 @@
 #include "mainwindowsnogui.h"
 #include "core/vcmdexport.h"
 #include "../vmisc/vlockguard.h"
+#include "../vformat/vdimensions.h"
 
+#include <QDoubleSpinBox>
 #include <QPointer>
 
 namespace Ui
@@ -51,7 +53,6 @@ class DialogFinalMeasurements;
 class VWidgetGroups;
 class VWidgetDetails;
 class QToolButton;
-class QDoubleSpinBox;
 class QProgressBar;
 class WatermarkWindow;
 
@@ -208,8 +209,11 @@ private slots:
     void OpenAt(QAction *where);
 #endif //defined(Q_OS_MAC)
 
-    void ChangedSize(const QString &text);
-    void ChangedHeight(const QString &text);
+    void DimensionABaseChanged();
+    void DimensionBBaseChanged();
+    void DimensionCBaseChanged();
+
+    void GradationChanged();
 
     void ShowProgress();
     void ClearPatternMessages();
@@ -267,12 +271,14 @@ private:
     QLabel             *rightGoToStage;
     QTimer             *autoSaveTimer;
     bool               guiEnabled;
-    QPointer<QComboBox> gradationHeights;
-    QPointer<QComboBox> gradationSizes;
-    QPointer<QLabel>   gradationHeightsLabel;
-    QPointer<QLabel>   gradationSizesLabel;
-    QPointer<QLabel>   zoomScale;
-    QPointer<QDoubleSpinBox> doubleSpinBoxScale;
+    QPointer<QComboBox> dimensionA{nullptr};
+    QPointer<QComboBox> dimensionB{nullptr};
+    QPointer<QComboBox> dimensionC{nullptr};
+    QPointer<QLabel>   dimensionALabel{nullptr};
+    QPointer<QLabel>   dimensionBLabel{nullptr};
+    QPointer<QLabel>   dimensionCLabel{nullptr};
+    QPointer<QLabel>   zoomScale{nullptr};
+    QPointer<QDoubleSpinBox> doubleSpinBoxScale{nullptr};
     VToolOptionsPropertyBrowser *toolOptions;
     VWidgetGroups *groupsWidget;
     VWidgetDetails *detailsWidget;
@@ -285,8 +291,16 @@ private:
 
     QList<QPointer<WatermarkWindow>> m_watermarkEditors{};
 
-    void               SetDefaultHeight();
-    void               SetDefaultSize();
+    int m_currentDimensionA{0};
+    int m_currentDimensionB{0};
+    int m_currentDimensionC{0};
+
+    QSharedPointer<VMeasurements> m{};
+
+    QTimer *m_gradation;
+
+    void InitDimensionControls();
+    void InitDimensionGradation(int index, const MeasurementDimension_p &dimension, QPointer<QComboBox> control);
 
     void               ToolBarOption();
     void               ToolBarStages();
@@ -338,15 +352,12 @@ private:
     void               InitAutoSave();
     bool               PatternPieceName(QString &name);
     QString            CheckPathToMeasurements(const QString &patternPath, const QString &path);
-    QComboBox          *SetGradationList(QLabel *label, const QStringList &list);
     void               ChangePP(int index, bool zoomBestFit = true);
     /**
      * @brief EndVisualization try show dialog after and working with tool visualization.
      */
     void               EndVisualization(bool click = false);
     void               ZoomFirstShow();
-    void               UpdateHeightsList(const QStringList &list);
-    void               UpdateSizesList(const QStringList &list);
 
     void               AddDocks();
     void               InitDocksContain();
@@ -360,14 +371,15 @@ private:
     void               InitScenes();
 
     bool               LoadMeasurements(const QString &path);
-    bool               UpdateMeasurements(const QString &path, int size, int height);
+    bool               UpdateMeasurements(const QString &path, int baseA, int baseB, int baseC);
 
     void               ReopenFilesAfterCrash(QStringList &args);
     bool               DoExport(const VCommandLinePtr& expParams);
     bool               DoFMExport(const VCommandLinePtr& expParams);
 
-    bool               SetSize(const QString &text);
-    bool               SetHeight(const QString & text);
+    bool               SetDimensionA(int value);
+    bool               SetDimensionB(int value);
+    bool               SetDimensionC(int value);
 
     QString            GetPatternFileName();
     QString            GetMeasurementFileName();
@@ -393,6 +405,12 @@ private:
 
     void OpenWatermark(const QString &path = QString());
     void CleanWaterkmarkEditors();
+
+    void StoreMultisizeMDimensions();
+    void StoreIndividualMDimensions();
+
+    QVector<int> DimensionRestrictedValues(int index, const MeasurementDimension_p &dimension);
+    void SetDimensionBases();
 };
 
 #endif // MAINWINDOW_H
diff --git a/src/app/valentina/mainwindowsnogui.cpp b/src/app/valentina/mainwindowsnogui.cpp
index 559a02dcd..5798faabb 100644
--- a/src/app/valentina/mainwindowsnogui.cpp
+++ b/src/app/valentina/mainwindowsnogui.cpp
@@ -136,7 +136,7 @@ MainWindowsNoGUI::MainWindowsNoGUI(QWidget *parent)
       listDetails(),
       currentScene(nullptr),
       tempSceneLayout(nullptr),
-      pattern(new VContainer(qApp->TrVars(), qApp->patternUnitP(), valentinaNamespace)),
+      pattern(new VContainer(qApp->TrVars(), qApp->patternUnitsP(), valentinaNamespace)),
       doc(nullptr),
       papers(),
       shadows(),
@@ -155,7 +155,6 @@ MainWindowsNoGUI::MainWindowsNoGUI(QWidget *parent)
       margins(),
       paperSize(),
       m_dialogSaveLayout(),
-      m_mouseCoordinate(),
 #if defined(Q_OS_WIN32) && QT_VERSION >= QT_VERSION_CHECK(5, 7, 0)
       m_taskbarButton(new QWinTaskbarButton(this)),
       m_taskbarProgress(nullptr),
@@ -930,7 +929,7 @@ void MainWindowsNoGUI::PrintPages(QPrinter *printer)
         {
             const QString errorMsg = tr("File error.\n\n%1\n\n%2").arg(e.ErrorMessage(), e.DetailedInformation());
             qApp->IsPedantic() ? throw VException(errorMsg) :
-                                 qWarning() << VAbstractApplication::patternMessageSignature + errorMsg;
+                                 qWarning() << VAbstractValApplication::patternMessageSignature + errorMsg;
         }
     }
 
@@ -2047,33 +2046,6 @@ QString MainWindowsNoGUI::FileName() const
     return QFileInfo(fileName).baseName();
 }
 
-//---------------------------------------------------------------------------------------------------------------------
-void MainWindowsNoGUI::SetSizeHeightForIndividualM() const
-{
-    const QHash<QString, QSharedPointer<VInternalVariable> > * vars = pattern->DataVariables();
-
-    if (vars->contains(size_M))
-    {
-        pattern->SetSize(*vars->value(size_M)->GetValue());
-    }
-    else
-    {
-        pattern->SetSize(0);
-    }
-
-    if (vars->contains(height_M))
-    {
-        pattern->SetHeight(*vars->value(height_M)->GetValue());
-    }
-    else
-    {
-        pattern->SetHeight(0);
-    }
-
-    doc->SetPatternWasChanged(true);
-    emit doc->UpdatePatternLabel();
-}
-
 //---------------------------------------------------------------------------------------------------------------------
 bool MainWindowsNoGUI::ExportFMeasurementsToCSVData(const QString &fileName, bool withHeader, int mib,
                                                     const QChar &separator) const
@@ -2191,21 +2163,6 @@ QSharedPointer<VMeasurements> MainWindowsNoGUI::OpenMeasurementFile(const QStrin
         }
 
         CheckRequiredMeasurements(m.data());
-
-        if (m->Type() == MeasurementsType::Multisize)
-        {
-            if (m->MUnit() == Unit::Inch)
-            {
-                qCCritical(vMainNoGUIWindow, "%s\n\n%s", qUtf8Printable(tr("Wrong units.")),
-                          qUtf8Printable(tr("Application doesn't support multisize table with inches.")));
-                m->clear();
-                if (not VApplication::IsGUIMode())
-                {
-                    qApp->exit(V_EX_DATAERR);
-                }
-                return m;
-            }
-        }
     }
     catch (VException &e)
     {
diff --git a/src/app/valentina/mainwindowsnogui.h b/src/app/valentina/mainwindowsnogui.h
index 77a69eb86..409398df6 100644
--- a/src/app/valentina/mainwindowsnogui.h
+++ b/src/app/valentina/mainwindowsnogui.h
@@ -122,8 +122,8 @@ protected:
     QSharedPointer<DialogSaveLayout> m_dialogSaveLayout;
 
     /** @brief mouseCoordinate pointer to label who show mouse coordinate. */
-    QPointer<QLabel> m_mouseCoordinate;
-    QPointer<QLabel> m_unreadPatternMessage{};
+    QPointer<QLabel> m_mouseCoordinate{nullptr};
+    QPointer<QLabel> m_unreadPatternMessage{nullptr};
 
 #if defined(Q_OS_WIN) && QT_VERSION >= QT_VERSION_CHECK(5, 7, 0)
     QWinTaskbarButton *m_taskbarButton;
@@ -142,7 +142,6 @@ protected:
     bool GenerateLayout(VLayoutGenerator& lGenerator);
     int ContinueIfLayoutStale();
     QString FileName() const;
-    void SetSizeHeightForIndividualM() const;
 
     bool ExportFMeasurementsToCSVData(const QString &fileName,
                                       bool withHeader, int mib, const QChar &separator) const;
diff --git a/src/app/valentina/xml/vpattern.cpp b/src/app/valentina/xml/vpattern.cpp
index 763ae9415..33d1a2828 100644
--- a/src/app/valentina/xml/vpattern.cpp
+++ b/src/app/valentina/xml/vpattern.cpp
@@ -127,7 +127,7 @@ void VPattern::CreateEmptyFile()
 
     patternElement.appendChild(createComment(FileComment()));
     patternElement.appendChild(CreateElementWithText(TagVersion, VPatternConverter::PatternMaxVerStr));
-    patternElement.appendChild(CreateElementWithText(TagUnit, UnitsToStr(qApp->patternUnit())));
+    patternElement.appendChild(CreateElementWithText(TagUnit, UnitsToStr(qApp->patternUnits())));
 
     patternElement.appendChild(createElement(TagDescription));
     patternElement.appendChild(createElement(TagNotes));
@@ -4196,164 +4196,6 @@ QString VPattern::GenerateSuffix() const
     return QString();
 }
 
-//---------------------------------------------------------------------------------------------------------------------
-bool VPattern::IsDefCustom() const
-{
-    QDomNodeList tags = elementsByTagName(TagGradation);
-    if (tags.size() == 0)
-    {
-        return false;
-    }
-
-    const QDomNode domNode = tags.at(0);
-    const QDomElement domElement = domNode.toElement();
-    if (domElement.isNull() == false)
-    {
-        return GetParametrBool(domElement, AttrCustom, falseStr);
-    }
-    else
-    {
-        return false;
-    }
-}
-
-//---------------------------------------------------------------------------------------------------------------------
-void VPattern::SetDefCustom(bool value)
-{
-    CheckTagExists(TagGradation);
-    QDomNodeList tags = elementsByTagName(TagGradation);
-    if (tags.isEmpty())
-    {
-        qDebug()<<"Can't save attribute "<<AttrCustom<<Q_FUNC_INFO;
-        return;
-    }
-
-    QDomNode domNode = tags.at(0);
-    QDomElement domElement = domNode.toElement();
-    if (domElement.isNull() == false)
-    {
-        if (value == false)
-        {
-            domElement.removeAttribute(AttrDefHeight);
-            SetDefCustomHeight(0);
-            SetDefCustomSize(0);
-        }
-        else
-        {
-            SetAttribute(domElement, AttrCustom, value);
-        }
-        modified = true;
-    }
-    else
-    {
-        qDebug()<<"Can't save attribute "<<AttrCustom<<Q_FUNC_INFO;
-    }
-}
-
-//---------------------------------------------------------------------------------------------------------------------
-int VPattern::GetDefCustomHeight() const
-{
-    if (IsDefCustom())
-    {
-        QDomNodeList tags = elementsByTagName(TagGradation);
-        if (tags.size() == 0)
-        {
-            return 0;
-        }
-
-        const QDomNode domNode = tags.at(0);
-        const QDomElement domElement = domNode.toElement();
-        if (domElement.isNull() == false)
-        {
-            return static_cast<int>(GetParametrUInt(domElement, AttrDefHeight, QChar('0')));
-        }
-        else
-        {
-            return 0;
-        }
-    }
-    else
-    {
-        return 0;
-    }
-}
-
-//---------------------------------------------------------------------------------------------------------------------
-void VPattern::SetDefCustomHeight(int value)
-{
-    CheckTagExists(TagGradation);
-    QDomNodeList tags = elementsByTagName(TagGradation);
-    if (tags.isEmpty())
-    {
-        qDebug()<<"Can't save attribute "<<AttrDefHeight<<Q_FUNC_INFO;
-        return;
-    }
-
-    QDomNode domNode = tags.at(0);
-    QDomElement domElement = domNode.toElement();
-    if (domElement.isNull() == false)
-    {
-        SetAttributeOrRemoveIf(domElement, AttrDefHeight, value, value == 0);
-        modified = true;
-    }
-    else
-    {
-        qDebug()<<"Can't save attribute "<<AttrDefHeight<<Q_FUNC_INFO;
-    }
-}
-
-//---------------------------------------------------------------------------------------------------------------------
-int VPattern::GetDefCustomSize() const
-{
-    if (IsDefCustom())
-    {
-        QDomNodeList tags = elementsByTagName(TagGradation);
-        if (tags.size() == 0)
-        {
-            return 0;
-        }
-
-        const QDomNode domNode = tags.at(0);
-        const QDomElement domElement = domNode.toElement();
-        if (domElement.isNull() == false)
-        {
-            return static_cast<int>(GetParametrUInt(domElement, AttrDefSize, QChar('0')));
-        }
-        else
-        {
-            return 0;
-        }
-    }
-    else
-    {
-        return 0;
-    }
-}
-
-//---------------------------------------------------------------------------------------------------------------------
-void VPattern::SetDefCustomSize(int value)
-{
-    CheckTagExists(TagGradation);
-    QDomNodeList tags = elementsByTagName(TagGradation);
-    if (tags.isEmpty())
-    {
-        qDebug()<<"Can't save attribute "<<AttrDefSize<<Q_FUNC_INFO;
-        return;
-    }
-
-    QDomNode domNode = tags.at(0);
-    QDomElement domElement = domNode.toElement();
-    if (domElement.isNull() == false)
-    {
-        SetAttributeOrRemoveIf(domElement, AttrDefSize, value, value == 0);
-        modified = true;
-    }
-    else
-    {
-        qDebug()<<"Can't save attribute "<<AttrDefSize<<Q_FUNC_INFO;
-    }
-}
-
 //---------------------------------------------------------------------------------------------------------------------
 bool VPattern::IsReadOnly() const
 {
diff --git a/src/app/valentina/xml/vpattern.h b/src/app/valentina/xml/vpattern.h
index 599b282c6..88c5f17d0 100644
--- a/src/app/valentina/xml/vpattern.h
+++ b/src/app/valentina/xml/vpattern.h
@@ -97,15 +97,6 @@ public:
     virtual QString GenerateLabel(const LabelType &type, const QString &reservedName = QString())const override;
     virtual QString GenerateSuffix() const override;
 
-    bool IsDefCustom() const;
-    void SetDefCustom(bool value);
-
-    int  GetDefCustomHeight() const;
-    void SetDefCustomHeight(int value);
-
-    int  GetDefCustomSize() const;
-    void SetDefCustomSize(int value);
-
     bool IsReadOnly() const;
     void SetReadOnly(bool rOnly);
 
diff --git a/src/libs/fervor/fvupdater.cpp b/src/libs/fervor/fvupdater.cpp
index 854dd46b3..e9ee9128c 100644
--- a/src/libs/fervor/fvupdater.cpp
+++ b/src/libs/fervor/fvupdater.cpp
@@ -48,7 +48,7 @@
 #include "../ifc/exception/vexception.h"
 #include "../ifc/xml/vabstractconverter.h"
 #include "../vmisc/projectversion.h"
-#include "../vmisc/vabstractapplication.h"
+#include "../vmisc/vabstractvalapplication.h"
 #include "../vmisc/vcommonsettings.h"
 #include "fvavailableupdate.h"
 #include "fvupdatewindow.h"
diff --git a/src/libs/ifc/schema.qrc b/src/libs/ifc/schema.qrc
index 5d41d6883..22c1f5128 100644
--- a/src/libs/ifc/schema.qrc
+++ b/src/libs/ifc/schema.qrc
@@ -59,12 +59,14 @@
         <file>schema/pattern/v0.8.5.xsd</file>
         <file>schema/pattern/v0.8.6.xsd</file>
         <file>schema/pattern/v0.8.7.xsd</file>
-        <file>schema/standard_measurements/v0.3.0.xsd</file>
-        <file>schema/standard_measurements/v0.4.0.xsd</file>
-        <file>schema/standard_measurements/v0.4.1.xsd</file>
-        <file>schema/standard_measurements/v0.4.2.xsd</file>
-        <file>schema/standard_measurements/v0.4.3.xsd</file>
-        <file>schema/standard_measurements/v0.4.4.xsd</file>
+        <file>schema/pattern/v0.8.8.xsd</file>
+        <file>schema/multisize_measurements/v0.3.0.xsd</file>
+        <file>schema/multisize_measurements/v0.4.0.xsd</file>
+        <file>schema/multisize_measurements/v0.4.1.xsd</file>
+        <file>schema/multisize_measurements/v0.4.2.xsd</file>
+        <file>schema/multisize_measurements/v0.4.3.xsd</file>
+        <file>schema/multisize_measurements/v0.4.4.xsd</file>
+        <file>schema/multisize_measurements/v0.5.0.xsd</file>
         <file>schema/individual_measurements/v0.2.0.xsd</file>
         <file>schema/individual_measurements/v0.3.0.xsd</file>
         <file>schema/individual_measurements/v0.3.1.xsd</file>
@@ -72,6 +74,7 @@
         <file>schema/individual_measurements/v0.3.3.xsd</file>
         <file>schema/individual_measurements/v0.4.0.xsd</file>
         <file>schema/individual_measurements/v0.5.0.xsd</file>
+        <file>schema/individual_measurements/v0.5.1.xsd</file>
         <file>schema/label_template/v1.0.0.xsd</file>
         <file>schema/watermark/v1.0.0.xsd</file>
     </qresource>
diff --git a/src/libs/ifc/schema/individual_measurements/v0.5.1.xsd b/src/libs/ifc/schema/individual_measurements/v0.5.1.xsd
new file mode 100644
index 000000000..6a174d8f9
--- /dev/null
+++ b/src/libs/ifc/schema/individual_measurements/v0.5.1.xsd
@@ -0,0 +1,83 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" elementFormDefault="qualified" attributeFormDefault="unqualified">
+  <xs:element name="vit">
+    <xs:complexType>
+      <xs:sequence>
+        <xs:element name="version" type="formatVersion"/>
+        <xs:element name="read-only" type="xs:boolean"/>
+        <xs:element name="notes" type="xs:string" minOccurs="0" maxOccurs="1"/>
+        <xs:element name="unit" type="units"/>
+        <xs:element name="pm_system" type="psCode"/>
+        <xs:element name="personal">
+          <xs:complexType>
+            <xs:sequence>
+              <xs:element name="customer" type="xs:string"/>
+              <xs:element name="birth-date" type="xs:date"/>
+              <xs:element name="gender" type="gender"/>
+              <xs:element name="email" type="xs:string"/>
+            </xs:sequence>
+          </xs:complexType>
+        </xs:element>
+        <xs:element name="body-measurements">
+          <xs:complexType>
+            <xs:sequence>
+              <xs:element name="m" minOccurs="0" maxOccurs="unbounded">
+                <xs:complexType>
+                  <xs:attribute name="name" type="shortName" use="required"/>
+                  <xs:attribute name="value" type="xs:string" use="required"/>
+                  <xs:attribute name="full_name" type="xs:string"/>
+                  <xs:attribute name="description" type="xs:string"/>
+                  <xs:attribute name="specialUnits" type="xs:boolean"/>
+                  <xs:attribute name="dimension" type="dimensionType"/>
+                </xs:complexType>
+              </xs:element>
+            </xs:sequence>
+            <xs:attribute name="template" type="xs:string"/>
+          </xs:complexType>
+        </xs:element>
+      </xs:sequence>
+    </xs:complexType>
+    <xs:unique name="measurementName">
+      <xs:selector xpath="body-measurements/m"/>
+      <xs:field xpath="@name"/>
+    </xs:unique>
+  </xs:element>
+  <xs:simpleType name="shortName">
+    <xs:restriction base="xs:string">
+      <xs:pattern value="([^\p{Nd}\p{Zs}*/&amp;|!&lt;&gt;^&#10;\()\-−+.,٫, ٬.’=?:;'\&quot;]){1,1}([^\p{Zs}*/&amp;|!&lt;&gt;^&#10;\()\-−+.,٫, ٬.’=?:;\&quot;]){0,}"/>
+    </xs:restriction>
+  </xs:simpleType>
+  <xs:simpleType name="formatVersion">
+    <xs:restriction base="xs:string">
+      <xs:pattern value="[0-9]{1,}\.[0-9]{1,}\.[0-9]{1,}"/>
+    </xs:restriction>
+  </xs:simpleType>
+  <xs:simpleType name="units">
+    <xs:restriction base="xs:string">
+      <xs:enumeration value="mm"/>
+      <xs:enumeration value="cm"/>
+      <xs:enumeration value="inch"/>
+    </xs:restriction>
+  </xs:simpleType>
+  <xs:simpleType name="gender">
+    <xs:restriction base="xs:string">
+      <xs:enumeration value="unknown"/>
+      <xs:enumeration value="male"/>
+      <xs:enumeration value="female"/>
+    </xs:restriction>
+  </xs:simpleType>
+  <xs:simpleType name="psCode">
+    <xs:restriction base="xs:string">
+      <xs:pattern value="(([0-9]|[1-4][0-9]|5[0-4])|998)"/>
+    </xs:restriction>
+  </xs:simpleType>
+  <xs:simpleType name="dimensionType">
+    <xs:restriction base="xs:string">
+      <xs:enumeration value="n"/>
+      <xs:enumeration value="x"/>
+      <xs:enumeration value="y"/>
+      <xs:enumeration value="w"/>
+      <xs:enumeration value="z"/>
+    </xs:restriction>
+  </xs:simpleType>
+</xs:schema>
diff --git a/src/libs/ifc/schema/standard_measurements/v0.3.0.xsd b/src/libs/ifc/schema/multisize_measurements/v0.3.0.xsd
similarity index 100%
rename from src/libs/ifc/schema/standard_measurements/v0.3.0.xsd
rename to src/libs/ifc/schema/multisize_measurements/v0.3.0.xsd
diff --git a/src/libs/ifc/schema/standard_measurements/v0.4.0.xsd b/src/libs/ifc/schema/multisize_measurements/v0.4.0.xsd
similarity index 100%
rename from src/libs/ifc/schema/standard_measurements/v0.4.0.xsd
rename to src/libs/ifc/schema/multisize_measurements/v0.4.0.xsd
diff --git a/src/libs/ifc/schema/standard_measurements/v0.4.1.xsd b/src/libs/ifc/schema/multisize_measurements/v0.4.1.xsd
similarity index 100%
rename from src/libs/ifc/schema/standard_measurements/v0.4.1.xsd
rename to src/libs/ifc/schema/multisize_measurements/v0.4.1.xsd
diff --git a/src/libs/ifc/schema/standard_measurements/v0.4.2.xsd b/src/libs/ifc/schema/multisize_measurements/v0.4.2.xsd
similarity index 100%
rename from src/libs/ifc/schema/standard_measurements/v0.4.2.xsd
rename to src/libs/ifc/schema/multisize_measurements/v0.4.2.xsd
diff --git a/src/libs/ifc/schema/standard_measurements/v0.4.3.xsd b/src/libs/ifc/schema/multisize_measurements/v0.4.3.xsd
similarity index 100%
rename from src/libs/ifc/schema/standard_measurements/v0.4.3.xsd
rename to src/libs/ifc/schema/multisize_measurements/v0.4.3.xsd
diff --git a/src/libs/ifc/schema/standard_measurements/v0.4.4.xsd b/src/libs/ifc/schema/multisize_measurements/v0.4.4.xsd
similarity index 100%
rename from src/libs/ifc/schema/standard_measurements/v0.4.4.xsd
rename to src/libs/ifc/schema/multisize_measurements/v0.4.4.xsd
diff --git a/src/libs/ifc/schema/multisize_measurements/v0.5.0.xsd b/src/libs/ifc/schema/multisize_measurements/v0.5.0.xsd
new file mode 100644
index 000000000..82ba0a452
--- /dev/null
+++ b/src/libs/ifc/schema/multisize_measurements/v0.5.0.xsd
@@ -0,0 +1,125 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" elementFormDefault="qualified" attributeFormDefault="unqualified">
+  <xs:element name="vst">
+    <xs:complexType>
+      <xs:sequence>
+        <xs:element name="version" type="formatVersion"/>
+        <xs:element name="read-only" type="xs:boolean"/>
+        <xs:element name="notes" type="xs:string" minOccurs="0" maxOccurs="1"/>
+        <xs:element name="unit" type="units"/>
+        <xs:element name="pm_system" type="psCode"/>
+        <xs:element name="dimensions">
+          <xs:complexType>
+            <xs:sequence>
+              <xs:element name="dimension" minOccurs="0" maxOccurs="3">
+                <xs:complexType>
+                  <xs:sequence>
+                    <xs:element name="labels" minOccurs="0" maxOccurs="1">
+                      <xs:complexType>
+                        <xs:sequence>
+                          <xs:element name="label" minOccurs="0" maxOccurs="unbounded">
+                            <xs:complexType>
+                              <xs:attribute name="value" type="dimesionValue" use="required"/>
+                              <xs:attribute name="label" type="xs:string" use="required"/>
+                            </xs:complexType>
+                          </xs:element>
+                        </xs:sequence>
+                      </xs:complexType>
+                    </xs:element>
+                  </xs:sequence>
+                  <xs:attribute name="type" type="dimensionType" use="required"/>
+                  <xs:attribute name="base" type="dimesionValue" use="required"/>
+                  <xs:attribute name="min" type="dimesionValue" use="required"/>
+                  <xs:attribute name="max" type="dimesionValue" use="required"/>
+                  <xs:attribute name="step" type="dimensionStep" use="required"/>
+                  <xs:attribute name="circumference" type="xs:boolean"/>
+                </xs:complexType>
+              </xs:element>
+            </xs:sequence>
+            <xs:attribute name="fullCircumference" type="xs:boolean"/>
+          </xs:complexType>
+        </xs:element>
+        <xs:element name="restrictions">
+        </xs:element>
+        <xs:element name="body-measurements">
+          <xs:complexType>
+            <xs:sequence>
+              <xs:element name="m" minOccurs="0" maxOccurs="unbounded">
+                <xs:complexType>
+                  <xs:sequence>
+                    <xs:element name="corrections" minOccurs="0" maxOccurs="1">
+                      <xs:complexType>
+                        <xs:sequence>
+                          <xs:element name="correction" minOccurs="0" maxOccurs="unbounded">
+                            <xs:complexType>
+                              <xs:attribute name="coordinates" type="xs:string" use="required"/>
+                              <xs:attribute name="correction" type="xs:double" use="required"/> 
+                            </xs:complexType>
+                          </xs:element>
+                        </xs:sequence>
+                      </xs:complexType>
+                    </xs:element>
+                  </xs:sequence>
+                  <xs:attribute name="name" type="shortName" use="required"/>
+                  <xs:attribute name="base" type="xs:double" use="required"/>
+                  <xs:attribute name="shiftA" type="xs:double" use="required"/>
+                  <xs:attribute name="shiftB" type="xs:double"/>
+                  <xs:attribute name="shiftC" type="xs:double"/>
+                  <xs:attribute name="full_name" type="xs:string"/>
+                  <xs:attribute name="description" type="xs:string"/>
+                  <xs:attribute name="specialUnits" type="xs:boolean"/>
+                </xs:complexType>
+              </xs:element>
+            </xs:sequence>
+          </xs:complexType>
+        </xs:element>
+      </xs:sequence>
+    </xs:complexType>
+    <xs:unique name="measurementName">
+      <xs:selector xpath="body-measurements/m"/>
+      <xs:field xpath="@name"/>
+    </xs:unique>
+  </xs:element>
+  <xs:simpleType name="shortName">
+    <xs:restriction base="xs:string">
+      <xs:pattern value="([^\p{Nd}\p{Zs}*/&amp;|!&lt;&gt;^&#10;\()\-−+.,٫, ٬.’=?:;'\&quot;]){1,1}([^\p{Zs}*/&amp;|!&lt;&gt;^&#10;\()\-−+.,٫, ٬.’=?:;\&quot;]){0,}"/>
+    </xs:restriction>
+  </xs:simpleType>
+  <xs:simpleType name="units">
+    <xs:restriction base="xs:string">
+      <xs:enumeration value="mm"/>
+      <xs:enumeration value="cm"/>
+      <xs:enumeration value="inch"/>
+    </xs:restriction>
+  </xs:simpleType>
+  <xs:simpleType name="formatVersion">
+    <xs:restriction base="xs:string">
+      <xs:pattern value="[0-9]{1,}\.[0-9]{1,}\.[0-9]{1,}"/>
+    </xs:restriction>
+  </xs:simpleType>
+  <xs:simpleType name="psCode">
+    <xs:restriction base="xs:string">
+      <xs:pattern value="(([0-9]|[1-4][0-9]|5[0-4])|998)"/>
+    </xs:restriction>
+  </xs:simpleType>
+  <xs:simpleType name="dimensionType">
+    <xs:restriction base="xs:string">
+      <xs:enumeration value="x"/>
+      <xs:enumeration value="y"/>
+      <xs:enumeration value="w"/>
+      <xs:enumeration value="z"/>
+    </xs:restriction>
+  </xs:simpleType>
+  <xs:simpleType name="dimesionValue">
+    <xs:restriction base="xs:unsignedInt">
+      <xs:minInclusive value="6"/>
+      <xs:maxInclusive value="2720"/>
+    </xs:restriction>
+  </xs:simpleType>
+  <xs:simpleType name="dimensionStep">
+    <xs:restriction base="xs:unsignedInt">
+      <xs:minInclusive value="0"/>
+      <xs:maxInclusive value="80"/>
+    </xs:restriction>
+  </xs:simpleType>
+</xs:schema>
diff --git a/src/libs/ifc/schema/pattern/v0.8.8.xsd b/src/libs/ifc/schema/pattern/v0.8.8.xsd
new file mode 100644
index 000000000..93ef3d153
--- /dev/null
+++ b/src/libs/ifc/schema/pattern/v0.8.8.xsd
@@ -0,0 +1,1073 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" elementFormDefault="qualified" attributeFormDefault="unqualified">
+  <!-- XML Schema Generated from XML Document-->
+  <xs:element name="pattern">
+    <xs:complexType>
+      <xs:sequence minOccurs="1" maxOccurs="unbounded">
+        <xs:element name="version" type="formatVersion"/>
+        <xs:element name="unit" type="units"/>
+        <xs:element name="image" minOccurs="0" maxOccurs="1">
+          <xs:complexType>
+            <xs:simpleContent>
+              <xs:extension base="xs:string">
+                <xs:attribute name="extension" type="imageExtension"/>
+              </xs:extension>
+            </xs:simpleContent>
+          </xs:complexType>
+        </xs:element>
+        <xs:element name="description" type="xs:string" minOccurs="0" maxOccurs="1"/>
+        <xs:element name="notes" type="xs:string" minOccurs="0" maxOccurs="1"/>
+        <xs:element name="patternName" type="xs:string" minOccurs="0" maxOccurs="1"/>
+        <xs:element name="patternNumber" type="xs:string" minOccurs="0" maxOccurs="1"/>
+        <xs:element name="company" type="xs:string" minOccurs="0" maxOccurs="1"/>
+        <xs:element name="customer" type="xs:string" minOccurs="0" maxOccurs="1"/>
+        <xs:element name="birthDate" type="xs:string" minOccurs="0" maxOccurs="1"/>
+        <xs:element name="email" type="xs:string" minOccurs="0" maxOccurs="1"/>
+        <xs:element name="patternLabel" minOccurs="0" maxOccurs="1">
+          <xs:complexType>
+            <xs:sequence>
+              <xs:element name="line" type="templateLine" minOccurs="0" maxOccurs="unbounded">
+              </xs:element>
+            </xs:sequence>
+            <xs:attribute name="dateFormat" type="xs:string"/>
+            <xs:attribute name="timeFormat" type="xs:string"/>
+          </xs:complexType>
+        </xs:element>
+        <xs:element name="watermark" type="xs:string" minOccurs="0" maxOccurs="1"/>
+        <xs:element name="patternMaterials" minOccurs="0" maxOccurs="1">
+          <xs:complexType>
+            <xs:sequence>
+              <xs:element name="material" minOccurs="0" maxOccurs="20">
+                <xs:complexType>
+                  <xs:attribute name="number" type="userMaterialType" use="required"/>
+                  <xs:attribute name="name" type="xs:string"/>
+                </xs:complexType>
+              </xs:element>
+            </xs:sequence>
+          </xs:complexType>
+        </xs:element>
+        <xs:element name="finalMeasurements" minOccurs="0" maxOccurs="1">
+          <xs:complexType>
+            <xs:sequence minOccurs="0" maxOccurs="unbounded">
+              <xs:element name="finalMeasurment" minOccurs="0" maxOccurs="unbounded">
+                <xs:complexType>
+                  <xs:attribute name="description" type="xs:string"/>
+                  <xs:attribute name="name" type="shortName" use="required"/>
+                  <xs:attribute name="formula" type="xs:string" use="required"/>
+                </xs:complexType>
+              </xs:element>
+            </xs:sequence>
+          </xs:complexType>
+        </xs:element>
+        <xs:element name="measurements" type="xs:string"/>
+        <xs:element name="increments">
+          <xs:complexType>
+            <xs:sequence minOccurs="0" maxOccurs="unbounded">
+              <xs:element name="increment" minOccurs="0" maxOccurs="unbounded">
+                <xs:complexType>
+                  <xs:attribute name="description" type="xs:string"/>
+                  <xs:attribute name="name" type="shortName" use="required"/>
+                  <xs:attribute name="formula" type="xs:string"/>
+                  <xs:attribute name="type" type="incrementType"/>
+                </xs:complexType>
+              </xs:element>
+            </xs:sequence>
+          </xs:complexType>
+        </xs:element>
+        <xs:element name="previewCalculations">
+          <xs:complexType>
+            <xs:sequence minOccurs="0" maxOccurs="unbounded">
+              <xs:element name="increment" minOccurs="0" maxOccurs="unbounded">
+                <xs:complexType>
+                  <xs:attribute name="description" type="xs:string"/>
+                  <xs:attribute name="name" type="shortName" use="required"/>
+                  <xs:attribute name="formula" type="xs:string"/>
+                  <xs:attribute name="type" type="incrementType"/>
+                </xs:complexType>
+              </xs:element>
+            </xs:sequence>
+          </xs:complexType>
+        </xs:element>
+        <xs:element name="draw" minOccurs="1" maxOccurs="unbounded">
+          <xs:complexType>
+            <xs:sequence>
+              <xs:element name="calculation" minOccurs="1" maxOccurs="unbounded">
+                <xs:complexType>
+                  <xs:sequence>
+                    <xs:choice minOccurs="0" maxOccurs="unbounded">
+                      <xs:element name="point" minOccurs="0" maxOccurs="unbounded">
+                        <xs:complexType>
+                          <xs:attribute name="id" type="xs:unsignedInt" use="required"/>
+                          <xs:attribute name="x" type="xs:double"/>
+                          <xs:attribute name="y" type="xs:double"/>
+                          <xs:attribute name="mx" type="xs:double"/>
+                          <xs:attribute name="my" type="xs:double"/>
+                          <xs:attribute name="type" type="xs:string"/>
+                          <xs:attribute name="name" type="shortName"/>
+                          <xs:attribute name="firstPoint" type="xs:unsignedInt"/>
+                          <xs:attribute name="secondPoint" type="xs:unsignedInt"/>
+                          <xs:attribute name="thirdPoint" type="xs:unsignedInt"/>
+                          <xs:attribute name="basePoint" type="xs:unsignedInt"/>
+                          <xs:attribute name="pShoulder" type="xs:unsignedInt"/>
+                          <xs:attribute name="p1Line" type="xs:unsignedInt"/>
+                          <xs:attribute name="p2Line" type="xs:unsignedInt"/>
+                          <xs:attribute name="length" type="xs:string"/>
+                          <xs:attribute name="angle" type="xs:string"/>
+                          <xs:attribute name="typeLine" type="linePenStyle"/>
+                          <xs:attribute name="splinePath" type="xs:unsignedInt"/>
+                          <xs:attribute name="spline" type="xs:unsignedInt"/>
+                          <xs:attribute name="p1Line1" type="xs:unsignedInt"/>
+                          <xs:attribute name="p1Line2" type="xs:unsignedInt"/>
+                          <xs:attribute name="p2Line1" type="xs:unsignedInt"/>
+                          <xs:attribute name="p2Line2" type="xs:unsignedInt"/>
+                          <xs:attribute name="center" type="xs:unsignedInt"/>
+                          <xs:attribute name="radius" type="xs:string"/>
+                          <xs:attribute name="axisP1" type="xs:unsignedInt"/>
+                          <xs:attribute name="axisP2" type="xs:unsignedInt"/>
+                          <xs:attribute name="arc" type="xs:unsignedInt"/>
+                          <xs:attribute name="elArc" type="xs:unsignedInt"/>
+                          <xs:attribute name="curve" type="xs:unsignedInt"/>
+                          <xs:attribute name="curve1" type="xs:unsignedInt"/>
+                          <xs:attribute name="curve2" type="xs:unsignedInt"/>
+                          <xs:attribute name="lineColor" type="colors"/>
+                          <xs:attribute name="color" type="colors"/>
+                          <xs:attribute name="firstArc" type="xs:unsignedInt"/>
+                          <xs:attribute name="secondArc" type="xs:unsignedInt"/>
+                          <xs:attribute name="crossPoint" type="crossType"/>
+                          <xs:attribute name="vCrossPoint" type="crossType"/>
+                          <xs:attribute name="hCrossPoint" type="crossType"/>
+                          <xs:attribute name="c1Center" type="xs:unsignedInt"/>
+                          <xs:attribute name="c2Center" type="xs:unsignedInt"/>
+                          <xs:attribute name="c1Radius" type="xs:string"/>
+                          <xs:attribute name="c2Radius" type="xs:string"/>
+                          <xs:attribute name="cRadius" type="xs:string"/>
+                          <xs:attribute name="tangent" type="xs:unsignedInt"/>
+                          <xs:attribute name="cCenter" type="xs:unsignedInt"/>
+                          <xs:attribute name="name1" type="shortName"/>
+                          <xs:attribute name="mx1" type="xs:double"/>
+                          <xs:attribute name="my1" type="xs:double"/>
+                          <xs:attribute name="name2" type="shortName"/>
+                          <xs:attribute name="mx2" type="xs:double"/>
+                          <xs:attribute name="my2" type="xs:double"/>
+                          <xs:attribute name="point1" type="xs:unsignedInt"/>
+                          <xs:attribute name="point2" type="xs:unsignedInt"/>
+                          <xs:attribute name="dartP1" type="xs:unsignedInt"/>
+                          <xs:attribute name="dartP2" type="xs:unsignedInt"/>
+                          <xs:attribute name="dartP3" type="xs:unsignedInt"/>
+                          <xs:attribute name="baseLineP1" type="xs:unsignedInt"/>
+                          <xs:attribute name="baseLineP2" type="xs:unsignedInt"/>
+                          <xs:attribute name="showLabel" type="xs:boolean"/>
+                          <xs:attribute name="showLabel1" type="xs:boolean"/>
+                          <xs:attribute name="showLabel2" type="xs:boolean"/>
+                        </xs:complexType>
+                      </xs:element>
+                      <xs:element name="line" minOccurs="0" maxOccurs="unbounded">
+                        <xs:complexType>
+                          <xs:attribute name="id" type="xs:unsignedInt" use="required"/>
+                          <xs:attribute name="firstPoint" type="xs:unsignedInt"/>
+                          <xs:attribute name="secondPoint" type="xs:unsignedInt"/>
+                          <xs:attribute name="typeLine" type="linePenStyle"/>
+                          <xs:attribute name="lineColor" type="colors"/>
+                        </xs:complexType>
+                      </xs:element>
+                      <xs:element name="operation" minOccurs="0" maxOccurs="unbounded">
+                        <xs:complexType>
+                          <xs:sequence>
+                            <xs:element name="source" minOccurs="1" maxOccurs="1">
+                              <xs:complexType>
+                                <xs:sequence>
+                                  <xs:element name="item" minOccurs="1" maxOccurs="unbounded">
+                                    <xs:complexType>
+                                      <xs:attribute name="idObject" type="xs:unsignedInt" use="required"/>
+                                    </xs:complexType>
+                                  </xs:element>
+                                </xs:sequence>
+                              </xs:complexType>
+                            </xs:element>
+                            <xs:element name="destination" minOccurs="1" maxOccurs="1">
+                              <xs:complexType>
+                                <xs:sequence>
+                                  <xs:element name="item" minOccurs="1" maxOccurs="unbounded">
+                                    <xs:complexType>
+                                      <xs:attribute name="idObject" type="xs:unsignedInt" use="required"/>
+                                      <xs:attribute name="mx" type="xs:double"/>
+                                      <xs:attribute name="my" type="xs:double"/>
+                                      <xs:attribute name="showLabel" type="xs:boolean"/>
+                                    </xs:complexType>
+                                  </xs:element>
+                                </xs:sequence>
+                              </xs:complexType>
+                            </xs:element>
+                          </xs:sequence>
+                          <xs:attribute name="id" type="xs:unsignedInt" use="required"/>
+                          <xs:attribute name="center" type="xs:unsignedInt"/>
+                          <xs:attribute name="angle" type="xs:string"/>
+                          <xs:attribute name="rotationAngle" type="xs:string"/>
+                          <xs:attribute name="length" type="xs:string"/>
+                          <xs:attribute name="suffix" type="xs:string"/>
+                          <xs:attribute name="type" type="xs:string" use="required"/>
+                          <xs:attribute name="p1Line" type="xs:unsignedInt"/>
+                          <xs:attribute name="p2Line" type="xs:unsignedInt"/>
+                          <xs:attribute name="axisType" type="axisType"/>
+                        </xs:complexType>
+                      </xs:element>
+                      <xs:element name="arc" minOccurs="0" maxOccurs="unbounded">
+                        <xs:complexType>
+                          <xs:attribute name="angle1" type="xs:string"/>
+                          <xs:attribute name="id" type="xs:unsignedInt" use="required"/>
+                          <xs:attribute name="angle2" type="xs:string"/>
+                          <xs:attribute name="radius" type="xs:string"/>
+                          <xs:attribute name="center" type="xs:unsignedInt"/>
+                          <xs:attribute name="type" type="xs:string"/>
+                          <xs:attribute name="color" type="colors"/>
+                          <xs:attribute name="penStyle" type="curvePenStyle"/>
+                          <xs:attribute name="length" type="xs:string"/>
+                          <xs:attribute name="aScale" type="ApproximationScaleType"/>
+                        </xs:complexType>
+                      </xs:element>
+                      <xs:element name="elArc" minOccurs="0" maxOccurs="unbounded">
+                        <xs:complexType>
+                          <xs:attribute name="angle1" type="xs:string"/>
+                          <xs:attribute name="id" type="xs:unsignedInt" use="required"/>
+                          <xs:attribute name="angle2" type="xs:string"/>
+                          <xs:attribute name="rotationAngle" type="xs:string"/>
+                          <xs:attribute name="radius1" type="xs:string"/>
+                          <xs:attribute name="radius2" type="xs:string"/>
+                          <xs:attribute name="center" type="xs:unsignedInt"/>
+                          <xs:attribute name="type" type="xs:string"/>
+                          <xs:attribute name="color" type="colors"/>
+                          <xs:attribute name="penStyle" type="curvePenStyle"/>
+                          <xs:attribute name="length" type="xs:string"/>
+                          <xs:attribute name="aScale" type="ApproximationScaleType"/>
+                        </xs:complexType>
+                      </xs:element>
+                      <xs:element name="spline" minOccurs="0" maxOccurs="unbounded">
+                        <xs:complexType>
+                          <xs:sequence>
+                            <xs:element name="pathPoint" minOccurs="0" maxOccurs="unbounded">
+                              <xs:complexType>
+                                <xs:attribute name="kAsm2" type="xs:string"/>
+                                <xs:attribute name="pSpline" type="xs:unsignedInt"/>
+                                <xs:attribute name="angle" type="xs:string"/>
+                                <xs:attribute name="angle1" type="xs:string"/>
+                                <xs:attribute name="angle2" type="xs:string"/>
+                                <xs:attribute name="length1" type="xs:string"/>
+                                <xs:attribute name="length2" type="xs:string"/>
+                                <xs:attribute name="kAsm1" type="xs:string"/>
+                              </xs:complexType>
+                            </xs:element>
+                          </xs:sequence>
+                          <xs:attribute name="id" type="xs:unsignedInt" use="required"/>
+                          <xs:attribute name="kCurve" type="xs:double"/>
+                          <xs:attribute name="type" type="xs:string"/>
+                          <xs:attribute name="kAsm1" type="xs:double"/>
+                          <xs:attribute name="kAsm2" type="xs:double"/>
+                          <xs:attribute name="angle1" type="xs:string"/>
+                          <xs:attribute name="angle2" type="xs:string"/>
+                          <xs:attribute name="length1" type="xs:string"/>
+                          <xs:attribute name="length2" type="xs:string"/>
+                          <xs:attribute name="point1" type="xs:unsignedInt"/>
+                          <xs:attribute name="point2" type="xs:unsignedInt"/>
+                          <xs:attribute name="point3" type="xs:unsignedInt"/>
+                          <xs:attribute name="point4" type="xs:unsignedInt"/>
+                          <xs:attribute name="color" type="colors"/>
+                          <xs:attribute name="penStyle" type="curvePenStyle"/>
+                          <xs:attribute name="duplicate" type="xs:unsignedInt"/>
+                          <xs:attribute name="aScale" type="ApproximationScaleType"/>
+                        </xs:complexType>
+                      </xs:element>
+                    </xs:choice>
+                  </xs:sequence>
+                </xs:complexType>
+              </xs:element>
+              <xs:element name="modeling" minOccurs="1" maxOccurs="unbounded">
+                <xs:complexType>
+                  <xs:sequence>
+                    <xs:choice minOccurs="0" maxOccurs="unbounded">
+                      <xs:element name="point" minOccurs="0" maxOccurs="unbounded">
+                        <xs:complexType>
+                          <xs:attribute name="id" type="xs:unsignedInt" use="required"/>
+                          <xs:attribute name="idObject" type="xs:unsignedInt"/>
+                          <xs:attribute name="mx" type="xs:double"/>
+                          <xs:attribute name="my" type="xs:double"/>
+                          <xs:attribute name="type" type="xs:string"/>
+                          <xs:attribute name="idTool" type="xs:unsignedInt"/>
+                          <xs:attribute name="inUse" type="xs:boolean"/>
+                          <xs:attribute name="angle" type="xs:string"/>
+                          <xs:attribute name="width" type="xs:string"/>
+                          <xs:attribute name="height" type="xs:string"/>
+                          <xs:attribute name="placeLabelType" type="placeLabelType"/>
+                          <xs:attribute name="showLabel" type="xs:boolean"/>
+                          <xs:attribute name="visible" type="xs:string"/>
+                          <xs:attribute name="checkWidth" type="xs:string"/>
+                          <xs:attribute name="checkHeight" type="xs:string"/>
+                          <xs:attribute name="checkWidthReference" type="checkReference"/>
+                          <xs:attribute name="checkHeightReference" type="checkReference"/> 
+                          <xs:attribute name="checkStop" type="cuttingStop"/>
+                          <xs:attribute name="cuttingNumber" type="xs:unsignedInt"/>
+                          <xs:attribute name="cuttingMode" type="cuttingMode"/>
+                          <xs:attribute name="cuttingVelocityReduction" type="velocityReduction"/> 
+                        </xs:complexType>
+                      </xs:element>
+                      <xs:element name="arc" minOccurs="0" maxOccurs="unbounded">
+                        <xs:complexType>
+                          <xs:attribute name="id" type="xs:unsignedInt" use="required"/>
+                          <xs:attribute name="idObject" type="xs:unsignedInt"/>
+                          <xs:attribute name="type" type="xs:string"/>
+                          <xs:attribute name="idTool" type="xs:unsignedInt"/>
+                          <xs:attribute name="inUse" type="xs:boolean"/>
+                        </xs:complexType>
+                      </xs:element>
+                      <xs:element name="elArc" minOccurs="0" maxOccurs="unbounded">
+                        <xs:complexType>
+                          <xs:attribute name="id" type="xs:unsignedInt" use="required"/>
+                          <xs:attribute name="idObject" type="xs:unsignedInt"/>
+                          <xs:attribute name="type" type="xs:string"/>
+                          <xs:attribute name="idTool" type="xs:unsignedInt"/>
+                          <xs:attribute name="inUse" type="xs:boolean"/>
+                        </xs:complexType>
+                      </xs:element>
+                      <xs:element name="spline" minOccurs="0" maxOccurs="unbounded">
+                        <xs:complexType>
+                          <xs:attribute name="id" type="xs:unsignedInt" use="required"/>
+                          <xs:attribute name="idObject" type="xs:unsignedInt"/>
+                          <xs:attribute name="type" type="xs:string"/>
+                          <xs:attribute name="idTool" type="xs:unsignedInt"/>
+                          <xs:attribute name="inUse" type="xs:boolean"/>
+                        </xs:complexType>
+                      </xs:element>
+                      <xs:element name="path" minOccurs="0" maxOccurs="unbounded">
+                        <xs:complexType>
+                          <xs:sequence>
+                            <xs:element name="nodes" minOccurs="1" maxOccurs="1">
+                              <xs:complexType>
+                                <xs:sequence>
+                                  <xs:element name="node" minOccurs="1" maxOccurs="unbounded">
+                                    <xs:complexType>
+                                      <xs:attribute name="type" type="xs:string" use="required"/>
+                                      <xs:attribute name="idObject" type="xs:unsignedInt" use="required"/>
+                                      <xs:attribute name="reverse" type="xs:unsignedInt"/>
+                                      <xs:attribute name="excluded" type="xs:boolean"/>
+                                      <xs:attribute name="softExcluded" type="xs:boolean"/>
+                                      <xs:attribute name="bufferSoftExcluded" type="xs:boolean"/>
+                                      <xs:attribute name="checkUniqueness" type="xs:boolean"/>
+                                      <xs:attribute name="before" type="xs:string"/>
+                                      <xs:attribute name="after" type="xs:string"/>
+                                      <xs:attribute name="angle" type="nodeAngle"/>
+                                      <xs:attribute name="passmark" type="xs:boolean"/>
+                                      <xs:attribute name="passmarkLine" type="passmarkLineType"/>
+                                      <xs:attribute name="passmarkAngle" type="passmarkAngleType"/>
+                                      <xs:attribute name="showSecondPassmark" type="xs:boolean"/>
+                                      <xs:attribute name="allowCollapse" type="xs:boolean"/>
+                                      <xs:attribute name="checkWidth" type="xs:string"/>
+                                      <xs:attribute name="checkHeight" type="xs:string"/>
+                                      <xs:attribute name="checkWidthReference" type="checkReference"/>
+                                      <xs:attribute name="checkHeightReference" type="checkReference"/>
+                                      <xs:attribute name="manualPassmarkLength" type="xs:boolean"/>
+                                      <xs:attribute name="passmarkLength" type="xs:string"/> 
+                                      <xs:attribute name="singlePassmarkCuttingStop" type="cuttingStop"/>
+                                      <xs:attribute name="leftPassmarkCuttingStop" type="cuttingStop"/>
+                                      <xs:attribute name="rightPassmarkCuttingStop" type="cuttingStop"/>
+                                      <xs:attribute name="builtInPassmarkCuttingStop" type="cuttingStop"/>
+                                      <xs:attribute name="singlePassmarkCuttingNumber" type="xs:int"/>
+                                      <xs:attribute name="leftPassmarkCuttingNumber" type="xs:int"/>
+                                      <xs:attribute name="rightPassmarkCuttingNumber" type="xs:int"/>
+                                      <xs:attribute name="builtInPassmarkCuttingNumber" type="xs:int"/>
+                                      <xs:attribute name="singlePassmarkCuttingMode" type="cuttingMode"/>
+                                      <xs:attribute name="leftPassmarkCuttingMode" type="cuttingMode"/>
+                                      <xs:attribute name="rightPassmarkCuttingMode" type="cuttingMode"/>
+                                      <xs:attribute name="builtInPassmarkCuttingMode" type="cuttingMode"/>
+                                    </xs:complexType>
+                                  </xs:element>
+                                </xs:sequence>
+                              </xs:complexType>
+                            </xs:element>
+                          </xs:sequence>
+                          <xs:attribute name="id" type="xs:unsignedInt" use="required"/>
+                          <xs:attribute name="type" type="piecePathType"/>
+                          <xs:attribute name="idTool" type="xs:unsignedInt"/>
+                          <xs:attribute name="inUse" type="xs:boolean"/>
+                          <xs:attribute name="name" type="xs:string"/>
+                          <xs:attribute name="typeLine" type="curvePenStyle"/>
+                          <xs:attribute name="cut" type="xs:boolean"/>
+                          <xs:attribute name="visible" type="xs:string"/>
+                          <xs:attribute name="firstToCountour" type="xs:boolean"/>
+                          <xs:attribute name="lastToCountour" type="xs:boolean"/>
+                          <xs:attribute name="cuttingNumber" type="xs:unsignedInt"/>
+                          <xs:attribute name="cuttingVelocityReduction" type="velocityReduction"/>   
+                        </xs:complexType>
+                      </xs:element>
+                      <xs:element name="tools" minOccurs="0" maxOccurs="unbounded">
+                        <xs:complexType>
+                          <xs:sequence>
+                            <xs:element name="det" minOccurs="2" maxOccurs="2">
+                              <xs:complexType>
+                                <xs:sequence>
+                                  <xs:element name="nodes" minOccurs="1" maxOccurs="1">
+                                    <xs:complexType>
+                                      <xs:sequence>
+                                        <xs:element name="node" minOccurs="1" maxOccurs="unbounded">
+                                          <xs:complexType>
+                                            <xs:attribute name="type" type="xs:string" use="required"/>
+                                            <xs:attribute name="idObject" type="xs:unsignedInt" use="required"/>
+                                            <xs:attribute name="reverse" type="xs:unsignedInt"/>
+                                            <xs:attribute name="excluded" type="xs:boolean"/>
+                                            <xs:attribute name="softExcluded" type="xs:boolean"/>
+                                            <xs:attribute name="bufferSoftExcluded" type="xs:boolean"/>
+                                            <xs:attribute name="checkUniqueness" type="xs:boolean"/>
+                                            <xs:attribute name="before" type="xs:string"/>
+                                            <xs:attribute name="after" type="xs:string"/>
+                                            <xs:attribute name="angle" type="nodeAngle"/>
+                                            <xs:attribute name="passmark" type="xs:boolean"/>
+                                            <xs:attribute name="passmarkLine" type="passmarkLineType"/>
+                                            <xs:attribute name="passmarkAngle" type="passmarkAngleType"/>
+                                            <xs:attribute name="showSecondPassmark" type="xs:boolean"/>
+                                            <xs:attribute name="allowCollapse" type="xs:boolean"/>
+                                            <xs:attribute name="manualPassmarkLength" type="xs:boolean"/>
+                                            <xs:attribute name="passmarkLength" type="xs:string"/>
+                                            <xs:attribute name="singlePassmarkCuttingStop" type="cuttingStop"/>
+                                            <xs:attribute name="leftPassmarkCuttingStop" type="cuttingStop"/>
+                                            <xs:attribute name="rightPassmarkCuttingStop" type="cuttingStop"/>
+                                            <xs:attribute name="builtInPassmarkCuttingStop" type="cuttingStop"/>
+                                            <xs:attribute name="singlePassmarkCuttingNumber" type="xs:int"/>
+                                            <xs:attribute name="leftPassmarkCuttingNumber" type="xs:int"/>
+                                            <xs:attribute name="rightPassmarkCuttingNumber" type="xs:int"/>
+                                            <xs:attribute name="builtInPassmarkCuttingNumber" type="xs:int"/>
+                                            <xs:attribute name="singlePassmarkCuttingMode" type="cuttingMode"/>
+                                            <xs:attribute name="leftPassmarkCuttingMode" type="cuttingMode"/>
+                                            <xs:attribute name="rightPassmarkCuttingMode" type="cuttingMode"/>
+                                            <xs:attribute name="builtInPassmarkCuttingMode" type="cuttingMode"/>  
+                                          </xs:complexType>
+                                        </xs:element>
+                                      </xs:sequence>
+                                    </xs:complexType>
+                                  </xs:element>
+                                  <xs:element name="csa" minOccurs="0" maxOccurs="1">
+                                    <xs:complexType>
+                                      <xs:sequence>
+                                        <xs:element name="record" minOccurs="1" maxOccurs="unbounded">
+                                          <xs:complexType>
+                                            <xs:attribute name="start" type="xs:unsignedInt"/>
+                                            <xs:attribute name="path" type="xs:unsignedInt" use="required"/>
+                                            <xs:attribute name="end" type="xs:unsignedInt"/>
+                                            <xs:attribute name="reverse" type="xs:boolean"/>
+                                            <xs:attribute name="includeAs" type="piecePathIncludeType"/>
+                                          </xs:complexType>
+                                        </xs:element>
+                                      </xs:sequence>
+                                    </xs:complexType>
+                                  </xs:element>
+                                  <xs:element name="iPaths" minOccurs="0" maxOccurs="1">
+                                    <xs:complexType>
+                                      <xs:sequence>
+                                        <xs:element name="record" minOccurs="1" maxOccurs="unbounded">
+                                          <xs:complexType>
+                                            <xs:attribute name="path" type="xs:unsignedInt" use="required"/>
+                                          </xs:complexType>
+                                        </xs:element>
+                                      </xs:sequence>
+                                    </xs:complexType>
+                                  </xs:element>
+                                  <xs:element name="pins" minOccurs="0" maxOccurs="1">
+                                    <xs:complexType>
+                                      <xs:sequence>
+                                        <xs:element name="record" type="xs:unsignedInt" minOccurs="1" maxOccurs="unbounded"/>
+                                      </xs:sequence>
+                                    </xs:complexType>
+                                  </xs:element>
+                                  <xs:element name="placeLabels" minOccurs="0" maxOccurs="1">
+                                    <xs:complexType>
+                                      <xs:sequence>
+                                        <xs:element name="record" type="xs:unsignedInt" minOccurs="0" maxOccurs="unbounded"/>
+                                      </xs:sequence>
+                                    </xs:complexType>
+                                  </xs:element>
+                                </xs:sequence>
+                              </xs:complexType>
+                            </xs:element>
+                            <xs:element name="children" minOccurs="1" maxOccurs="1">
+                              <xs:complexType>
+                                <xs:sequence>
+                                  <xs:element name="nodes" minOccurs="0" maxOccurs="1">
+                                    <xs:complexType>
+                                      <xs:sequence>
+                                        <xs:element name="child" type="xs:unsignedInt" minOccurs="1" maxOccurs="unbounded"/>
+                                      </xs:sequence>
+                                    </xs:complexType>
+                                  </xs:element>
+                                  <xs:element name="csa" minOccurs="0" maxOccurs="1">
+                                    <xs:complexType>
+                                      <xs:sequence>
+                                        <xs:element name="child" type="xs:unsignedInt" minOccurs="0" maxOccurs="unbounded"/>
+                                      </xs:sequence>
+                                    </xs:complexType>
+                                  </xs:element>
+                                  <xs:element name="iPaths" minOccurs="0" maxOccurs="1">
+                                    <xs:complexType>
+                                      <xs:sequence>
+                                        <xs:element name="child" type="xs:unsignedInt" minOccurs="0" maxOccurs="unbounded"/>
+                                      </xs:sequence>
+                                    </xs:complexType>
+                                  </xs:element>
+                                  <xs:element name="pins" minOccurs="0" maxOccurs="1">
+                                    <xs:complexType>
+                                      <xs:sequence>
+                                        <xs:element name="child" type="xs:unsignedInt" minOccurs="0" maxOccurs="unbounded"/>
+                                      </xs:sequence>
+                                    </xs:complexType>
+                                  </xs:element>
+                                  <xs:element name="placeLabels" minOccurs="0" maxOccurs="1">
+                                    <xs:complexType>
+                                      <xs:sequence>
+                                        <xs:element name="child" type="xs:unsignedInt" minOccurs="0" maxOccurs="unbounded"/>
+                                      </xs:sequence>
+                                    </xs:complexType>
+                                  </xs:element>
+                                </xs:sequence>
+                              </xs:complexType>
+                            </xs:element>
+                          </xs:sequence>
+                          <xs:attribute name="id" type="xs:unsignedInt" use="required"/>
+                          <xs:attribute name="type" type="xs:string"/>
+                          <xs:attribute name="indexD1" type="xs:unsignedInt"/>
+                          <xs:attribute name="indexD2" type="xs:unsignedInt"/>
+                          <xs:attribute name="inUse" type="xs:boolean"/>
+                          <xs:attribute name="version" type="unionVersion"/>
+                        </xs:complexType>
+                      </xs:element>
+                    </xs:choice>
+                  </xs:sequence>
+                </xs:complexType>
+              </xs:element>
+              <xs:element name="details" minOccurs="1" maxOccurs="unbounded">
+                <xs:complexType>
+                  <xs:sequence>
+                    <xs:element name="detail" minOccurs="0" maxOccurs="unbounded">
+                      <xs:complexType>
+                        <xs:sequence>
+                          <xs:element name="data" minOccurs="0" maxOccurs="1">
+                            <xs:complexType>
+                              <xs:sequence>
+                                <xs:element name="line" type="templateLine" minOccurs="0" maxOccurs="unbounded" />
+                              </xs:sequence>
+                              <xs:attribute name="letter" type="xs:string"/>
+                              <xs:attribute name="annotation" type="xs:string"/>
+                              <xs:attribute name="orientation" type="xs:string"/>
+                              <xs:attribute name="rotationWay" type="xs:string"/>
+                              <xs:attribute name="tilt" type="xs:string"/>
+                              <xs:attribute name="foldPosition" type="xs:string"/>
+                              <xs:attribute name="visible" type="xs:boolean"/>
+                              <xs:attribute name="onFold" type="xs:boolean"/>
+                              <xs:attribute name="fontSize" type="xs:unsignedInt"/>
+                              <xs:attribute name="mx" type="xs:double"/>
+                              <xs:attribute name="my" type="xs:double"/>
+                              <xs:attribute name="width" type="xs:string"/>
+                              <xs:attribute name="height" type="xs:string"/>
+                              <xs:attribute name="rotation" type="xs:string"/>
+                              <xs:attribute name="centerPin" type="xs:unsignedInt"/>
+                              <xs:attribute name="topLeftPin" type="xs:unsignedInt"/>
+                              <xs:attribute name="quantity" type="xs:unsignedInt"/>
+                              <xs:attribute name="bottomRightPin" type="xs:unsignedInt"/>
+                              <xs:attribute name="noBufferMaterial" type="pieceMaterialType"/>
+                              <xs:attribute name="withBufferMaterial" type="pieceMaterialType"/>
+                              <xs:attribute name="bufferMaterial" type="pieceMaterialType"/>
+                            </xs:complexType>
+                          </xs:element>
+                          <xs:element name="patternInfo" minOccurs="0" maxOccurs="1">
+                            <xs:complexType>
+                              <xs:attribute name="visible" type="xs:boolean"/>
+                              <xs:attribute name="fontSize" type="xs:unsignedInt"/>
+                              <xs:attribute name="mx" type="xs:double"/>
+                              <xs:attribute name="my" type="xs:double"/>
+                              <xs:attribute name="width" type="xs:string"/>
+                              <xs:attribute name="height" type="xs:string"/>
+                              <xs:attribute name="rotation" type="xs:string"/>
+                              <xs:attribute name="centerPin" type="xs:unsignedInt"/>
+                              <xs:attribute name="topLeftPin" type="xs:unsignedInt"/>
+                              <xs:attribute name="bottomRightPin" type="xs:unsignedInt"/>
+                            </xs:complexType>
+                          </xs:element>
+                          <xs:element name="grainline" minOccurs="0" maxOccurs="1">
+                            <xs:complexType>
+                              <xs:attribute name="visible" type="xs:boolean"/>
+                              <xs:attribute name="mx" type="xs:double"/>
+                              <xs:attribute name="my" type="xs:double"/>
+                              <xs:attribute name="length" type="xs:string"/>
+                              <xs:attribute name="rotation" type="xs:string"/>
+                              <xs:attribute name="arrows" type="arrowType"/>
+                              <xs:attribute name="centerPin" type="xs:unsignedInt"/>
+                              <xs:attribute name="topPin" type="xs:unsignedInt"/>
+                              <xs:attribute name="bottomPin" type="xs:unsignedInt"/>
+                            </xs:complexType>
+                          </xs:element>
+                          <xs:element name="nodes" minOccurs="1" maxOccurs="1">
+                            <xs:complexType>
+                              <xs:sequence>
+                                <xs:element name="node" minOccurs="1" maxOccurs="unbounded">
+                                  <xs:complexType>
+                                    <xs:attribute name="type" type="xs:string" use="required"/>
+                                    <xs:attribute name="idObject" type="xs:unsignedInt" use="required"/>
+                                    <xs:attribute name="reverse" type="xs:unsignedInt"/>
+                                    <xs:attribute name="excluded" type="xs:boolean"/>
+                                    <xs:attribute name="softExcluded" type="xs:boolean"/>
+                                    <xs:attribute name="bufferSoftExcluded" type="xs:boolean"/>
+                                    <xs:attribute name="checkUniqueness" type="xs:boolean"/>
+                                    <xs:attribute name="before" type="xs:string"/>
+                                    <xs:attribute name="after" type="xs:string"/>
+                                    <xs:attribute name="angle" type="nodeAngle"/>
+                                    <xs:attribute name="mx" type="xs:double"/>
+                                    <xs:attribute name="my" type="xs:double"/>
+                                    <xs:attribute name="passmark" type="xs:boolean"/>
+                                    <xs:attribute name="passmarkLine" type="passmarkLineType"/>
+                                    <xs:attribute name="passmarkAngle" type="passmarkAngleType"/>
+                                    <xs:attribute name="showSecondPassmark" type="xs:boolean"/>
+                                    <xs:attribute name="allowCollapse" type="xs:boolean"/>
+                                    <xs:attribute name="checkWidth" type="xs:string"/>
+                                    <xs:attribute name="checkHeight" type="xs:string"/>
+                                    <xs:attribute name="checkWidthReference" type="checkReference"/>
+                                    <xs:attribute name="checkHeightReference" type="checkReference"/>
+                                    <xs:attribute name="checkStop" type="cuttingStop"/>
+                                    <xs:attribute name="manualPassmarkLength" type="xs:boolean"/>
+                                    <xs:attribute name="passmarkLength" type="xs:string"/>
+                                    <xs:attribute name="singlePassmarkCuttingStop" type="cuttingStop"/>
+                                    <xs:attribute name="leftPassmarkCuttingStop" type="cuttingStop"/>
+                                    <xs:attribute name="rightPassmarkCuttingStop" type="cuttingStop"/>
+                                    <xs:attribute name="builtInPassmarkCuttingStop" type="cuttingStop"/>
+                                    <xs:attribute name="singlePassmarkCuttingNumber" type="xs:int"/>
+                                    <xs:attribute name="leftPassmarkCuttingNumber" type="xs:int"/>
+                                    <xs:attribute name="rightPassmarkCuttingNumber" type="xs:int"/>
+                                    <xs:attribute name="builtInPassmarkCuttingNumber" type="xs:int"/>
+                                    <xs:attribute name="singlePassmarkCuttingMode" type="cuttingMode"/>
+                                    <xs:attribute name="leftPassmarkCuttingMode" type="cuttingMode"/>
+                                    <xs:attribute name="rightPassmarkCuttingMode" type="cuttingMode"/>
+                                    <xs:attribute name="builtInPassmarkCuttingMode" type="cuttingMode"/>
+                                  </xs:complexType>
+                                </xs:element>
+                              </xs:sequence>
+                            </xs:complexType>
+                          </xs:element>
+                          <xs:element name="csa" minOccurs="0" maxOccurs="1">
+                            <xs:complexType>
+                              <xs:sequence>
+                                <xs:element name="record" minOccurs="1" maxOccurs="unbounded">
+                                  <xs:complexType>
+                                    <xs:attribute name="start" type="xs:unsignedInt"/>
+                                    <xs:attribute name="path" type="xs:unsignedInt" use="required"/>
+                                    <xs:attribute name="end" type="xs:unsignedInt"/>
+                                    <xs:attribute name="reverse" type="xs:boolean"/>
+                                    <xs:attribute name="includeAs" type="piecePathIncludeType"/>
+                                  </xs:complexType>
+                                </xs:element>
+                              </xs:sequence>
+                            </xs:complexType>
+                          </xs:element>
+                          <xs:element name="iPaths" minOccurs="0" maxOccurs="1">
+                            <xs:complexType>
+                              <xs:sequence>
+                                <xs:element name="record" minOccurs="1" maxOccurs="unbounded">
+                                  <xs:complexType>
+                                    <xs:attribute name="path" type="xs:unsignedInt" use="required"/>
+                                  </xs:complexType>
+                                </xs:element>
+                              </xs:sequence>
+                            </xs:complexType>
+                          </xs:element>
+                          <xs:element name="pins" minOccurs="0" maxOccurs="1">
+                            <xs:complexType>
+                              <xs:sequence>
+                                <xs:element name="record" type="xs:unsignedInt" minOccurs="0" maxOccurs="unbounded"/>
+                              </xs:sequence>
+                            </xs:complexType>
+                          </xs:element>
+                          <xs:element name="placeLabels" minOccurs="0" maxOccurs="1">
+                            <xs:complexType>
+                              <xs:sequence>
+                                <xs:element name="record" type="xs:unsignedInt" minOccurs="0" maxOccurs="unbounded"/>
+                              </xs:sequence>
+                            </xs:complexType>
+                          </xs:element>
+                        </xs:sequence>
+                        <xs:attribute name="id" type="xs:unsignedInt" use="required"/>
+                        <xs:attribute name="version" type="pieceVersion"/>
+                        <xs:attribute name="mx" type="xs:double"/>
+                        <xs:attribute name="my" type="xs:double"/>
+                        <xs:attribute name="name" type="xs:string"/>
+                        <xs:attribute name="bufferName" type="xs:string"/>
+                        <xs:attribute name="inLayout" type="xs:boolean"/>
+                        <xs:attribute name="bufferInLayout" type="xs:boolean"/>
+                        <xs:attribute name="forbidFlipping" type="xs:boolean"/>
+                        <xs:attribute name="forceFlipping" type="xs:boolean"/>
+                        <xs:attribute name="width" type="xs:string"/>
+                        <xs:attribute name="bufferVisible" type="xs:string"/>
+                        <xs:attribute name="bufferWidth" type="xs:string"/>
+                        <xs:attribute name="seamAllowance" type="xs:boolean"/>
+                        <xs:attribute name="seamAllowanceBuiltIn" type="xs:boolean"/>
+                        <xs:attribute name="united" type="xs:boolean"/>
+                        <xs:attribute name="closed" type="xs:unsignedInt"/>
+                        <xs:attribute name="hideMainPath" type="xs:boolean"/>
+                        <xs:attribute name="priority" type="piecePriorityType"/>
+                        <xs:attribute name="gravity" type="layoutSideGravityType"/>
+                        <xs:attribute name="cuttingTime" type="cuttingTime"/>
+                        <xs:attribute name="nestTogethWithNext" type="xs:boolean"/>
+                      </xs:complexType>
+                    </xs:element>
+                  </xs:sequence>
+                </xs:complexType>
+              </xs:element>
+              <xs:element name="groups" minOccurs="0" maxOccurs="1">
+                <xs:complexType>
+                  <xs:sequence>
+                    <xs:element name="group" minOccurs="0" maxOccurs="unbounded">
+                      <xs:complexType>
+                        <xs:sequence>
+                          <xs:element name="item" minOccurs="0" maxOccurs="unbounded">
+                            <xs:complexType>
+                              <xs:attribute name="object" type="xs:unsignedInt"/>
+                              <xs:attribute name="tool" type="xs:unsignedInt"/>
+                            </xs:complexType>
+                          </xs:element>
+                        </xs:sequence>
+                        <xs:attribute name="id" type="xs:unsignedInt" use="required"/>
+                        <xs:attribute name="name" type="xs:string"/>
+                        <xs:attribute name="visible" type="xs:boolean"/>
+                        <xs:attribute name="tool" type="xs:unsignedInt"/>
+                        <xs:attribute name="tags" type="xs:string"/>
+                      </xs:complexType>
+                    </xs:element>
+                  </xs:sequence>
+                </xs:complexType>
+              </xs:element>
+            </xs:sequence>
+            <xs:attribute name="name" type="xs:string"/>
+          </xs:complexType>
+        </xs:element>
+      </xs:sequence>
+      <xs:attribute name="readOnly" type="xs:boolean"/>
+      <xs:attribute name="labelPrefix" type="labelPrefixType"/>
+    </xs:complexType>
+    <xs:unique name="incrementName">
+      <xs:selector xpath=".//increment"/>
+      <xs:field xpath="@name"/>
+    </xs:unique>
+    <xs:unique name="uniqueDrawName">
+      <xs:selector xpath="draw"/>
+      <xs:field xpath="@name"/>
+    </xs:unique>
+    <xs:unique name="uniquePatternMaterialNumber">
+      <xs:selector xpath="patternMaterials/material"/>
+      <xs:field xpath="@number"/>
+    </xs:unique>
+  </xs:element>
+  <xs:simpleType name="shortName">
+    <xs:restriction base="xs:string">
+      <xs:pattern value="([^\p{Nd}\p{Zs}*/&amp;|!&lt;&gt;^&#10;\()\-−+.,٫, ٬.’=?:;'\&quot;]){1,1}([^\p{Zs}*/&amp;|!&lt;&gt;^&#10;\()\-−+.,٫, ٬.’=?:;\&quot;]){0,}"/>
+    </xs:restriction>
+  </xs:simpleType>
+  <xs:simpleType name="units">
+    <xs:restriction base="xs:string">
+      <xs:enumeration value="mm"/>
+      <xs:enumeration value="cm"/>
+      <xs:enumeration value="inch"/>
+    </xs:restriction>
+  </xs:simpleType>
+  <xs:simpleType name="measurementsTypes">
+    <xs:restriction base="xs:string">
+      <xs:enumeration value="standard"/>
+      <xs:enumeration value="individual"/>
+    </xs:restriction>
+  </xs:simpleType>
+  <xs:simpleType name="formatVersion">
+    <xs:restriction base="xs:string">
+      <xs:pattern value="[0-9]{1,}\.[0-9]{1,}\.[0-9]{1,}"/>
+    </xs:restriction>
+  </xs:simpleType>
+  <xs:simpleType name="imageExtension">
+    <xs:restriction base="xs:string">
+      <xs:enumeration value="PNG"/>
+      <xs:enumeration value="JPG"/>
+      <xs:enumeration value="BMP"/>
+    </xs:restriction>
+  </xs:simpleType>
+  <xs:simpleType name="colors">
+    <xs:restriction base="xs:string">
+      <xs:enumeration value="black"/>
+      <xs:enumeration value="green"/>
+      <xs:enumeration value="blue"/>
+      <xs:enumeration value="darkRed"/>
+      <xs:enumeration value="darkGreen"/>
+      <xs:enumeration value="darkBlue"/>
+      <xs:enumeration value="yellow"/>
+      <xs:enumeration value="lightsalmon"/>
+      <xs:enumeration value="goldenrod"/>
+      <xs:enumeration value="orange"/>
+      <xs:enumeration value="deeppink"/>
+      <xs:enumeration value="violet"/>
+      <xs:enumeration value="darkviolet"/>
+      <xs:enumeration value="mediumseagreen"/>
+      <xs:enumeration value="lime"/>
+      <xs:enumeration value="deepskyblue"/>
+      <xs:enumeration value="cornflowerblue"/>
+    </xs:restriction>
+  </xs:simpleType>
+  <xs:simpleType name="linePenStyle">
+    <xs:restriction base="xs:string">
+      <xs:enumeration value="none"/>
+      <xs:enumeration value="hair"/>
+      <xs:enumeration value="dashLine"/>
+      <xs:enumeration value="dotLine"/>
+      <xs:enumeration value="dashDotLine"/>
+      <xs:enumeration value="dashDotDotLine"/>
+    </xs:restriction>
+  </xs:simpleType>
+  <xs:simpleType name="curvePenStyle">
+    <xs:restriction base="xs:string">
+      <xs:enumeration value="hair"/>
+      <xs:enumeration value="dashLine"/>
+      <xs:enumeration value="dotLine"/>
+      <xs:enumeration value="dashDotLine"/>
+      <xs:enumeration value="dashDotDotLine"/>
+    </xs:restriction>
+  </xs:simpleType>
+  <xs:simpleType name="crossType">
+    <xs:restriction base="xs:unsignedInt">
+      <xs:enumeration value="1"/>
+      <xs:enumeration value="2"/>
+    </xs:restriction>
+  </xs:simpleType>
+  <xs:simpleType name="axisType">
+    <xs:restriction base="xs:unsignedInt">
+      <xs:enumeration value="1"/>
+      <xs:enumeration value="2"/>
+    </xs:restriction>
+  </xs:simpleType>
+  <xs:simpleType name="arrowType">
+    <xs:restriction base="xs:unsignedInt">
+      <xs:enumeration value="0"/>
+      <!--Both-->
+      <xs:enumeration value="1"/>
+      <!--Front-->
+      <xs:enumeration value="2"/>
+      <!--Rear-->
+    </xs:restriction>
+  </xs:simpleType>
+  <xs:simpleType name="pieceVersion">
+    <xs:restriction base="xs:unsignedInt">
+      <xs:enumeration value="1"/>
+      <!--Old version-->
+      <xs:enumeration value="2"/>
+      <!--New version-->
+    </xs:restriction>
+  </xs:simpleType>
+  <xs:simpleType name="nodeAngle">
+    <xs:restriction base="xs:unsignedInt">
+      <xs:enumeration value="0"/>
+      <!--by length-->
+      <xs:enumeration value="1"/>
+      <!--by points intersections-->
+      <xs:enumeration value="2"/>
+      <!--by first edge symmetry-->
+      <xs:enumeration value="3"/>
+      <!--by second edge symmetry-->
+      <xs:enumeration value="4"/>
+      <!--by first edge right angle-->
+      <xs:enumeration value="5"/>
+      <!--by second edge right angle-->
+    </xs:restriction>
+  </xs:simpleType>
+  <xs:simpleType name="piecePathType">
+    <xs:restriction base="xs:unsignedInt">
+      <xs:enumeration value="1"/>
+      <!--custom seam allowance-->
+      <xs:enumeration value="2"/>
+      <!--internal path-->
+    </xs:restriction>
+  </xs:simpleType>
+  <xs:simpleType name="piecePathIncludeType">
+    <xs:restriction base="xs:unsignedInt">
+      <xs:enumeration value="0"/>
+      <!--as main path-->
+      <xs:enumeration value="1"/>
+      <!--as custom seam allowance-->
+    </xs:restriction>
+  </xs:simpleType>
+  <xs:simpleType name="passmarkLineType">
+    <xs:restriction base="xs:string">
+      <xs:enumeration value="one"/>
+      <xs:enumeration value="two"/>
+      <xs:enumeration value="three"/>
+      <xs:enumeration value="tMark"/>
+      <xs:enumeration value="vMark"/>
+      <xs:enumeration value="vMark2"/>
+      <xs:enumeration value="uMark"/>
+      <xs:enumeration value="boxMark"/>
+    </xs:restriction>
+  </xs:simpleType>
+  <xs:simpleType name="passmarkAngleType">
+    <xs:restriction base="xs:string">
+      <xs:enumeration value="straightforward"/>
+      <xs:enumeration value="bisector"/>
+      <xs:enumeration value="intersection"/>
+      <xs:enumeration value="intersectionLeft"/>
+      <xs:enumeration value="intersectionRight"/>
+      <xs:enumeration value="intersection2"/>
+      <xs:enumeration value="intersection2Left"/>
+      <xs:enumeration value="intersection2Right"/>  
+    </xs:restriction>
+  </xs:simpleType>
+  <xs:simpleType name="alignmentType">
+    <xs:restriction base="xs:unsignedInt">
+      <xs:enumeration value="0"/><!--default (no aligns)-->
+      <xs:enumeration value="1"/><!--aligns with the left edge-->
+      <xs:enumeration value="2"/><!--aligns with the right edge-->
+      <xs:enumeration value="4"/><!--Centers horizontally in the available space-->
+    </xs:restriction>
+  </xs:simpleType>
+  <xs:simpleType name="userMaterialType">
+    <xs:restriction base="xs:unsignedInt">
+      <xs:minInclusive value="1"/>
+      <xs:maxInclusive value="20"/>
+    </xs:restriction>
+  </xs:simpleType>
+  <xs:simpleType name="pieceMaterialType">
+    <xs:restriction base="xs:unsignedInt">
+      <xs:minInclusive value="0"/>
+      <xs:maxInclusive value="20"/><!--keep syncr with userMaterialType -->
+    </xs:restriction>
+  </xs:simpleType>
+  <xs:simpleType name="ApproximationScaleType">
+    <xs:restriction base="xs:double">
+      <xs:minInclusive value="0"/>
+      <xs:maxInclusive value="10"/>
+    </xs:restriction>
+  </xs:simpleType>
+  <xs:simpleType name="placeLabelType">
+    <xs:restriction base="xs:unsignedInt">
+      <xs:enumeration value="0"/><!--Segment-->
+      <xs:enumeration value="1"/><!--Rectangle-->
+      <xs:enumeration value="2"/><!--Cross-->
+      <xs:enumeration value="3"/><!--Tshaped-->
+      <xs:enumeration value="4"/><!--Doubletree-->
+      <xs:enumeration value="5"/><!--Corner-->
+      <xs:enumeration value="6"/><!--Triangle-->
+      <xs:enumeration value="7"/><!--Hshaped-->
+      <xs:enumeration value="8"/><!--Button-->
+      <xs:enumeration value="9"/><!--Circle-->
+    </xs:restriction>
+  </xs:simpleType>
+  <xs:simpleType name="unionVersion">
+    <xs:restriction base="xs:unsignedInt">
+      <xs:enumeration value="1"/>
+      <!--Old version-->
+      <xs:enumeration value="2"/>
+      <!--New version-->
+    </xs:restriction>
+  </xs:simpleType>
+  <xs:simpleType name="labelPrefixType">
+    <xs:restriction base="xs:string">
+      <xs:enumeration value="de"/>
+      <xs:enumeration value="en"/>
+      <xs:enumeration value="fr"/>
+      <xs:enumeration value="ru"/>
+      <xs:enumeration value="uk"/>
+      <xs:enumeration value="hr"/>
+      <xs:enumeration value="sr"/>
+      <xs:enumeration value="bs"/>
+    </xs:restriction>
+  </xs:simpleType>
+  <xs:simpleType name="incrementType">
+    <xs:restriction base="xs:string">
+      <xs:enumeration value="increment"/>
+      <xs:enumeration value="separator"/>
+      <xs:enumeration value="checkWidth"/>
+      <xs:enumeration value="checkHeight"/>
+    </xs:restriction>
+  </xs:simpleType>
+  <xs:simpleType name="checkReference">
+    <xs:restriction base="xs:string">
+      <xs:pattern value="[1-9]+[0-9]*&lt;\*&gt;[1-9]+[0-9]*"/>
+    </xs:restriction>
+  </xs:simpleType>
+  <xs:simpleType name="cuttingStop">
+    <xs:restriction base="xs:unsignedInt">
+      <xs:enumeration value="0"/>
+      <!--No-->
+      <xs:enumeration value="1"/>
+      <!--Yes-->
+      <xs:enumeration value="2"/>
+      <!--With Confirmation-->
+    </xs:restriction>
+  </xs:simpleType>
+  <xs:simpleType name="cuttingTime">
+    <xs:restriction base="xs:unsignedInt">
+      <xs:enumeration value="0"/>
+      <!--Before-->
+      <xs:enumeration value="1"/>
+      <!--Together-->
+      <xs:enumeration value="2"/>
+      <!--After-->
+    </xs:restriction>
+  </xs:simpleType>
+  <xs:simpleType name="cuttingMode">
+    <xs:restriction base="xs:unsignedInt">
+      <xs:enumeration value="0"/>
+      <!--Draw-->
+      <xs:enumeration value="1"/>
+      <!--Cut-->
+      <xs:enumeration value="2"/>
+      <!--Punch-->
+      <xs:enumeration value="3"/>
+      <!--Drill-->
+      <xs:enumeration value="4"/>
+      <!--AuxDrill-->
+     <xs:enumeration value="5"/>
+      <!--Quality-->
+     <xs:enumeration value="6"/>
+      <!--None-->
+    </xs:restriction>
+  </xs:simpleType>
+  <xs:simpleType name="velocityReduction">
+    <xs:restriction base="xs:int">
+      <xs:enumeration value="-1"/>
+      <!--NONE-->
+      <xs:enumeration value="5"/>
+      <!--5%-->
+      <xs:enumeration value="10"/>
+      <!--10%-->
+      <xs:enumeration value="15"/>
+      <!--15%-->
+      <xs:enumeration value="20"/>
+      <!--20%-->
+      <xs:enumeration value="25"/>
+      <!--25%-->
+      <xs:enumeration value="30"/>
+      <!--30%-->
+      <xs:enumeration value="35"/>
+      <!--35%-->
+      <xs:enumeration value="40"/>
+      <!--40%-->
+    </xs:restriction>
+  </xs:simpleType>
+  <xs:simpleType name="piecePriorityType">
+    <xs:restriction base="xs:unsignedInt">
+      <xs:minInclusive value="0"/>
+      <xs:maxInclusive value="99"/>
+    </xs:restriction>
+  </xs:simpleType>
+  <xs:simpleType name="layoutSideGravityType">
+    <xs:restriction base="xs:int">
+      <xs:enumeration value="-1"/>
+      <!--Negative-->
+      <xs:enumeration value="0"/>
+      <!--Neutral-->
+      <xs:enumeration value="1"/>
+      <!--Positive-->
+    </xs:restriction>
+  </xs:simpleType>
+  <xs:complexType name="templateLine">
+    <xs:attribute name="text" type="xs:string" use="required"/>
+    <xs:attribute name="bold" type="xs:boolean"/>
+    <xs:attribute name="italic" type="xs:boolean"/>
+    <xs:attribute name="alignment" type="alignmentType"/>
+    <xs:attribute name="sfIncrement" type="xs:unsignedInt"/>
+  </xs:complexType>
+</xs:schema>
diff --git a/src/libs/ifc/xml/vabstractpattern.cpp b/src/libs/ifc/xml/vabstractpattern.cpp
index c45c7a026..c12bf9233 100644
--- a/src/libs/ifc/xml/vabstractpattern.cpp
+++ b/src/libs/ifc/xml/vabstractpattern.cpp
@@ -54,7 +54,7 @@
 #include "vpatternconverter.h"
 #include "vdomdocument.h"
 #include "vtoolrecord.h"
-#include "../vmisc/vabstractapplication.h"
+#include "../vmisc/vabstractvalapplication.h"
 #include "../vmisc/compatibility.h"
 #include "../vlayout/vtextmanager.h"
 
@@ -82,14 +82,13 @@ const QString VAbstractPattern::TagArc              = QStringLiteral("arc");
 const QString VAbstractPattern::TagElArc            = QStringLiteral("elArc");
 const QString VAbstractPattern::TagTools            = QStringLiteral("tools");
 const QString VAbstractPattern::TagOperation        = QStringLiteral("operation");
-const QString VAbstractPattern::TagGradation        = QStringLiteral("gradation");
-const QString VAbstractPattern::TagHeights          = QStringLiteral("heights");
-const QString VAbstractPattern::TagSizes            = QStringLiteral("sizes");
 const QString VAbstractPattern::TagData             = QStringLiteral("data");
 const QString VAbstractPattern::TagPatternInfo      = QStringLiteral("patternInfo");
 const QString VAbstractPattern::TagPatternName      = QStringLiteral("patternName");
 const QString VAbstractPattern::TagPatternNum       = QStringLiteral("patternNumber");
 const QString VAbstractPattern::TagCustomerName     = QStringLiteral("customer");
+const QString VAbstractPattern::TagCustomerBirthDate = QStringLiteral("birthDate");
+const QString VAbstractPattern::TagCustomerEmail     = QStringLiteral("email");
 const QString VAbstractPattern::TagCompanyName      = QStringLiteral("company");
 const QString VAbstractPattern::TagPatternLabel     = QStringLiteral("patternLabel");
 const QString VAbstractPattern::TagWatermark        = QStringLiteral("watermark");
@@ -138,65 +137,6 @@ const QString VAbstractPattern::AttrPassmarkLength    = QStringLiteral("passmark
 const QString VAbstractPattern::AttrOpacity           = QStringLiteral("opacity");
 const QString VAbstractPattern::AttrTags              = QStringLiteral("tags");
 
-const QString VAbstractPattern::AttrAll             = QStringLiteral("all");
-
-const QString VAbstractPattern::AttrH50             = QStringLiteral("h50");
-const QString VAbstractPattern::AttrH56             = QStringLiteral("h56");
-const QString VAbstractPattern::AttrH62             = QStringLiteral("h62");
-const QString VAbstractPattern::AttrH68             = QStringLiteral("h68");
-const QString VAbstractPattern::AttrH74             = QStringLiteral("h74");
-const QString VAbstractPattern::AttrH80             = QStringLiteral("h80");
-const QString VAbstractPattern::AttrH86             = QStringLiteral("h86");
-const QString VAbstractPattern::AttrH92             = QStringLiteral("h92");
-const QString VAbstractPattern::AttrH98             = QStringLiteral("h98");
-const QString VAbstractPattern::AttrH104            = QStringLiteral("h104");
-const QString VAbstractPattern::AttrH110            = QStringLiteral("h110");
-const QString VAbstractPattern::AttrH116            = QStringLiteral("h116");
-const QString VAbstractPattern::AttrH122            = QStringLiteral("h122");
-const QString VAbstractPattern::AttrH128            = QStringLiteral("h128");
-const QString VAbstractPattern::AttrH134            = QStringLiteral("h134");
-const QString VAbstractPattern::AttrH140            = QStringLiteral("h140");
-const QString VAbstractPattern::AttrH146            = QStringLiteral("h146");
-const QString VAbstractPattern::AttrH152            = QStringLiteral("h152");
-const QString VAbstractPattern::AttrH158            = QStringLiteral("h158");
-const QString VAbstractPattern::AttrH164            = QStringLiteral("h164");
-const QString VAbstractPattern::AttrH170            = QStringLiteral("h170");
-const QString VAbstractPattern::AttrH176            = QStringLiteral("h176");
-const QString VAbstractPattern::AttrH182            = QStringLiteral("h182");
-const QString VAbstractPattern::AttrH188            = QStringLiteral("h188");
-const QString VAbstractPattern::AttrH194            = QStringLiteral("h194");
-const QString VAbstractPattern::AttrH200            = QStringLiteral("h200");
-
-const QString VAbstractPattern::AttrS22             = QStringLiteral("s22");
-const QString VAbstractPattern::AttrS24             = QStringLiteral("s24");
-const QString VAbstractPattern::AttrS26             = QStringLiteral("s26");
-const QString VAbstractPattern::AttrS28             = QStringLiteral("s28");
-const QString VAbstractPattern::AttrS30             = QStringLiteral("s30");
-const QString VAbstractPattern::AttrS32             = QStringLiteral("s32");
-const QString VAbstractPattern::AttrS34             = QStringLiteral("s34");
-const QString VAbstractPattern::AttrS36             = QStringLiteral("s36");
-const QString VAbstractPattern::AttrS38             = QStringLiteral("s38");
-const QString VAbstractPattern::AttrS40             = QStringLiteral("s40");
-const QString VAbstractPattern::AttrS42             = QStringLiteral("s42");
-const QString VAbstractPattern::AttrS44             = QStringLiteral("s44");
-const QString VAbstractPattern::AttrS46             = QStringLiteral("s46");
-const QString VAbstractPattern::AttrS48             = QStringLiteral("s48");
-const QString VAbstractPattern::AttrS50             = QStringLiteral("s50");
-const QString VAbstractPattern::AttrS52             = QStringLiteral("s52");
-const QString VAbstractPattern::AttrS54             = QStringLiteral("s54");
-const QString VAbstractPattern::AttrS56             = QStringLiteral("s56");
-const QString VAbstractPattern::AttrS58             = QStringLiteral("s58");
-const QString VAbstractPattern::AttrS60             = QStringLiteral("s60");
-const QString VAbstractPattern::AttrS62             = QStringLiteral("s62");
-const QString VAbstractPattern::AttrS64             = QStringLiteral("s64");
-const QString VAbstractPattern::AttrS66             = QStringLiteral("s66");
-const QString VAbstractPattern::AttrS68             = QStringLiteral("s68");
-const QString VAbstractPattern::AttrS70             = QStringLiteral("s70");
-const QString VAbstractPattern::AttrS72             = QStringLiteral("s72");
-
-const QString VAbstractPattern::AttrCustom          = QStringLiteral("custom");
-const QString VAbstractPattern::AttrDefHeight       = QStringLiteral("defHeight");
-const QString VAbstractPattern::AttrDefSize         = QStringLiteral("defSize");
 const QString VAbstractPattern::AttrExtension       = QStringLiteral("extension");
 
 const QString VAbstractPattern::AttrFormula     = QStringLiteral("formula");
@@ -953,395 +893,6 @@ QStringList VAbstractPattern::getPatternPieces() const
     return patternPieces;
 }
 
-//---------------------------------------------------------------------------------------------------------------------
-QMap<GHeights, bool> VAbstractPattern::GetGradationHeights() const
-{
-    QMap<GHeights, bool> map;
-
-    map.insert(GHeights::ALL, true);
-    map.insert(GHeights::H50, true);
-    map.insert(GHeights::H56, true);
-    map.insert(GHeights::H62, true);
-    map.insert(GHeights::H68, true);
-    map.insert(GHeights::H74, true);
-    map.insert(GHeights::H80, true);
-    map.insert(GHeights::H86, true);
-    map.insert(GHeights::H92, true);
-    map.insert(GHeights::H98, true);
-    map.insert(GHeights::H104, true);
-    map.insert(GHeights::H110, true);
-    map.insert(GHeights::H116, true);
-    map.insert(GHeights::H122, true);
-    map.insert(GHeights::H128, true);
-    map.insert(GHeights::H134, true);
-    map.insert(GHeights::H140, true);
-    map.insert(GHeights::H146, true);
-    map.insert(GHeights::H152, true);
-    map.insert(GHeights::H158, true);
-    map.insert(GHeights::H164, true);
-    map.insert(GHeights::H170, true);
-    map.insert(GHeights::H176, true);
-    map.insert(GHeights::H182, true);
-    map.insert(GHeights::H188, true);
-    map.insert(GHeights::H194, true);
-    map.insert(GHeights::H200, true);
-
-    QDomNodeList tags = elementsByTagName(TagGradation);
-    if (tags.size() == 0)
-    {
-        return map;
-    }
-
-    QStringList gTags = QStringList() << TagHeights << TagSizes;
-    QDomNode domNode = tags.at(0).firstChild();
-    while (domNode.isNull() == false)
-    {
-        if (domNode.isElement())
-        {
-            const QDomElement domElement = domNode.toElement();
-            if (domElement.isNull() == false)
-            {
-                const QString defValue = trueStr;
-                switch (gTags.indexOf(domElement.tagName()))
-                {
-                    case 0: // TagHeights
-                        if (GetParametrBool(domElement, AttrAll, defValue))
-                        {
-                            return map;
-                        }
-                        else
-                        {
-                            map.insert(GHeights::ALL, false);
-                        }
-
-                        map.insert(GHeights::H50, GetParametrBool(domElement, AttrH50, defValue));
-                        map.insert(GHeights::H56, GetParametrBool(domElement, AttrH56, defValue));
-                        map.insert(GHeights::H62, GetParametrBool(domElement, AttrH62, defValue));
-                        map.insert(GHeights::H68, GetParametrBool(domElement, AttrH68, defValue));
-                        map.insert(GHeights::H74, GetParametrBool(domElement, AttrH74, defValue));
-                        map.insert(GHeights::H80, GetParametrBool(domElement, AttrH80, defValue));
-                        map.insert(GHeights::H86, GetParametrBool(domElement, AttrH86, defValue));
-                        map.insert(GHeights::H92, GetParametrBool(domElement, AttrH92, defValue));
-                        map.insert(GHeights::H98, GetParametrBool(domElement, AttrH98, defValue));
-                        map.insert(GHeights::H104, GetParametrBool(domElement, AttrH104, defValue));
-                        map.insert(GHeights::H110, GetParametrBool(domElement, AttrH110, defValue));
-                        map.insert(GHeights::H116, GetParametrBool(domElement, AttrH116, defValue));
-                        map.insert(GHeights::H122, GetParametrBool(domElement, AttrH122, defValue));
-                        map.insert(GHeights::H128, GetParametrBool(domElement, AttrH128, defValue));
-                        map.insert(GHeights::H134, GetParametrBool(domElement, AttrH134, defValue));
-                        map.insert(GHeights::H140, GetParametrBool(domElement, AttrH140, defValue));
-                        map.insert(GHeights::H146, GetParametrBool(domElement, AttrH146, defValue));
-                        map.insert(GHeights::H152, GetParametrBool(domElement, AttrH152, defValue));
-                        map.insert(GHeights::H158, GetParametrBool(domElement, AttrH158, defValue));
-                        map.insert(GHeights::H164, GetParametrBool(domElement, AttrH164, defValue));
-                        map.insert(GHeights::H170, GetParametrBool(domElement, AttrH170, defValue));
-                        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));
-                        map.insert(GHeights::H200, GetParametrBool(domElement, AttrH200, defValue));
-                        return map;
-                    case 1: // TagSizes
-                    default:
-                        break;
-                }
-            }
-        }
-        domNode = domNode.nextSibling();
-    }
-    return map;
-}
-
-//---------------------------------------------------------------------------------------------------------------------
-void VAbstractPattern::SetGradationHeights(const QMap<GHeights, bool> &options)
-{
-    CheckTagExists(TagGradation);
-    QDomNodeList tags = elementsByTagName(TagGradation);
-    if (tags.isEmpty())
-    {
-        qDebug()<<"Can't save tag "<<TagGradation<<Q_FUNC_INFO;
-        return;
-    }
-
-    QStringList gTags = QStringList() << TagHeights << TagSizes;
-    QDomNode domNode = tags.at(0).firstChild();
-    while (domNode.isNull() == false)
-    {
-        if (domNode.isElement())
-        {
-            QDomElement domElement = domNode.toElement();
-            if (domElement.isNull() == false)
-            {
-                switch (gTags.indexOf(domElement.tagName()))
-                {
-                    case 0: // TagHeights
-                        SetAttribute(domElement, AttrAll, options.value(GHeights::ALL));
-                        if (options.value(GHeights::ALL))
-                        {
-                            domElement.removeAttribute(AttrH50);
-                            domElement.removeAttribute(AttrH56);
-                            domElement.removeAttribute(AttrH62);
-                            domElement.removeAttribute(AttrH68);
-                            domElement.removeAttribute(AttrH74);
-                            domElement.removeAttribute(AttrH80);
-                            domElement.removeAttribute(AttrH86);
-                            domElement.removeAttribute(AttrH92);
-                            domElement.removeAttribute(AttrH98);
-                            domElement.removeAttribute(AttrH104);
-                            domElement.removeAttribute(AttrH110);
-                            domElement.removeAttribute(AttrH116);
-                            domElement.removeAttribute(AttrH122);
-                            domElement.removeAttribute(AttrH128);
-                            domElement.removeAttribute(AttrH134);
-                            domElement.removeAttribute(AttrH140);
-                            domElement.removeAttribute(AttrH146);
-                            domElement.removeAttribute(AttrH152);
-                            domElement.removeAttribute(AttrH158);
-                            domElement.removeAttribute(AttrH164);
-                            domElement.removeAttribute(AttrH170);
-                            domElement.removeAttribute(AttrH176);
-                            domElement.removeAttribute(AttrH182);
-                            domElement.removeAttribute(AttrH188);
-                            domElement.removeAttribute(AttrH194);
-                            domElement.removeAttribute(AttrH200);
-                        }
-                        else
-                        {
-                            SetAttribute(domElement, AttrH50, options.value(GHeights::H50));
-                            SetAttribute(domElement, AttrH56, options.value(GHeights::H56));
-                            SetAttribute(domElement, AttrH62, options.value(GHeights::H62));
-                            SetAttribute(domElement, AttrH68, options.value(GHeights::H68));
-                            SetAttribute(domElement, AttrH74, options.value(GHeights::H74));
-                            SetAttribute(domElement, AttrH80, options.value(GHeights::H80));
-                            SetAttribute(domElement, AttrH86, options.value(GHeights::H86));
-                            SetAttribute(domElement, AttrH92, options.value(GHeights::H92));
-                            SetAttribute(domElement, AttrH98, options.value(GHeights::H98));
-                            SetAttribute(domElement, AttrH104, options.value(GHeights::H104));
-                            SetAttribute(domElement, AttrH110, options.value(GHeights::H110));
-                            SetAttribute(domElement, AttrH116, options.value(GHeights::H116));
-                            SetAttribute(domElement, AttrH122, options.value(GHeights::H122));
-                            SetAttribute(domElement, AttrH128, options.value(GHeights::H128));
-                            SetAttribute(domElement, AttrH134, options.value(GHeights::H134));
-                            SetAttribute(domElement, AttrH140, options.value(GHeights::H140));
-                            SetAttribute(domElement, AttrH146, options.value(GHeights::H146));
-                            SetAttribute(domElement, AttrH152, options.value(GHeights::H152));
-                            SetAttribute(domElement, AttrH158, options.value(GHeights::H158));
-                            SetAttribute(domElement, AttrH164, options.value(GHeights::H164));
-                            SetAttribute(domElement, AttrH170, options.value(GHeights::H170));
-                            SetAttribute(domElement, AttrH176, options.value(GHeights::H176));
-                            SetAttribute(domElement, AttrH182, options.value(GHeights::H182));
-                            SetAttribute(domElement, AttrH188, options.value(GHeights::H188));
-                            SetAttribute(domElement, AttrH194, options.value(GHeights::H194));
-                            SetAttribute(domElement, AttrH200, options.value(GHeights::H200));
-                        }
-
-                        modified = true;
-                        emit patternChanged(false);
-                        return;
-                    case 1: // TagSizes
-                    default:
-                        break;
-                }
-            }
-        }
-        domNode = domNode.nextSibling();
-    }
-}
-
-//---------------------------------------------------------------------------------------------------------------------
-QMap<GSizes, bool> VAbstractPattern::GetGradationSizes() const
-{
-    QMap<GSizes, bool> map;
-    map.insert(GSizes::ALL, true);
-    map.insert(GSizes::S22, true);
-    map.insert(GSizes::S24, true);
-    map.insert(GSizes::S26, true);
-    map.insert(GSizes::S28, true);
-    map.insert(GSizes::S30, true);
-    map.insert(GSizes::S32, true);
-    map.insert(GSizes::S34, true);
-    map.insert(GSizes::S36, true);
-    map.insert(GSizes::S38, true);
-    map.insert(GSizes::S40, true);
-    map.insert(GSizes::S42, true);
-    map.insert(GSizes::S44, true);
-    map.insert(GSizes::S46, true);
-    map.insert(GSizes::S48, true);
-    map.insert(GSizes::S50, true);
-    map.insert(GSizes::S52, true);
-    map.insert(GSizes::S54, true);
-    map.insert(GSizes::S56, true);
-    map.insert(GSizes::S58, true);
-    map.insert(GSizes::S60, true);
-    map.insert(GSizes::S62, true);
-    map.insert(GSizes::S64, true);
-    map.insert(GSizes::S66, true);
-    map.insert(GSizes::S68, true);
-    map.insert(GSizes::S70, true);
-    map.insert(GSizes::S72, true);
-
-    QDomNodeList tags = elementsByTagName(TagGradation);
-    if (tags.size() == 0)
-    {
-        return map;
-    }
-
-    QStringList gTags = QStringList() << TagHeights << TagSizes;
-    QDomNode domNode = tags.at(0).firstChild();
-    while (domNode.isNull() == false)
-    {
-        if (domNode.isElement())
-        {
-            const QDomElement domElement = domNode.toElement();
-            if (domElement.isNull() == false)
-            {
-                const QString defValue = trueStr;
-                switch (gTags.indexOf(domElement.tagName()))
-                {
-                    case 1: // TagSizes
-                        if (GetParametrBool(domElement, AttrAll, defValue))
-                        {
-                            return map;
-                        }
-                        else
-                        {
-                            map.insert(GSizes::ALL, false);
-                        }
-
-                        map.insert(GSizes::S22, GetParametrBool(domElement, AttrS22, defValue));
-                        map.insert(GSizes::S24, GetParametrBool(domElement, AttrS24, defValue));
-                        map.insert(GSizes::S26, GetParametrBool(domElement, AttrS26, defValue));
-                        map.insert(GSizes::S28, GetParametrBool(domElement, AttrS28, defValue));
-                        map.insert(GSizes::S30, GetParametrBool(domElement, AttrS30, defValue));
-                        map.insert(GSizes::S32, GetParametrBool(domElement, AttrS32, defValue));
-                        map.insert(GSizes::S34, GetParametrBool(domElement, AttrS34, defValue));
-                        map.insert(GSizes::S36, GetParametrBool(domElement, AttrS36, defValue));
-                        map.insert(GSizes::S38, GetParametrBool(domElement, AttrS38, defValue));
-                        map.insert(GSizes::S40, GetParametrBool(domElement, AttrS40, defValue));
-                        map.insert(GSizes::S42, GetParametrBool(domElement, AttrS42, defValue));
-                        map.insert(GSizes::S44, GetParametrBool(domElement, AttrS44, defValue));
-                        map.insert(GSizes::S46, GetParametrBool(domElement, AttrS46, defValue));
-                        map.insert(GSizes::S48, GetParametrBool(domElement, AttrS48, defValue));
-                        map.insert(GSizes::S50, GetParametrBool(domElement, AttrS50, defValue));
-                        map.insert(GSizes::S52, GetParametrBool(domElement, AttrS52, defValue));
-                        map.insert(GSizes::S54, GetParametrBool(domElement, AttrS54, defValue));
-                        map.insert(GSizes::S56, GetParametrBool(domElement, AttrS56, defValue));
-                        map.insert(GSizes::S58, GetParametrBool(domElement, AttrS58, defValue));
-                        map.insert(GSizes::S60, GetParametrBool(domElement, AttrS60, defValue));
-                        map.insert(GSizes::S62, GetParametrBool(domElement, AttrS62, defValue));
-                        map.insert(GSizes::S64, GetParametrBool(domElement, AttrS64, defValue));
-                        map.insert(GSizes::S66, GetParametrBool(domElement, AttrS66, defValue));
-                        map.insert(GSizes::S68, GetParametrBool(domElement, AttrS68, defValue));
-                        map.insert(GSizes::S70, GetParametrBool(domElement, AttrS70, defValue));
-                        map.insert(GSizes::S72, GetParametrBool(domElement, AttrS72, defValue));
-                        return map;
-                    case 0: // TagHeights
-                    default:
-                        break;
-                }
-            }
-        }
-        domNode = domNode.nextSibling();
-    }
-    return map;
-}
-
-//---------------------------------------------------------------------------------------------------------------------
-void VAbstractPattern::SetGradationSizes(const QMap<GSizes, bool> &options)
-{
-    CheckTagExists(TagGradation);
-    QDomNodeList tags = elementsByTagName(TagGradation);
-    if (tags.isEmpty())
-    {
-        qDebug()<<"Can't save tag "<<TagGradation<<Q_FUNC_INFO;
-        return;
-    }
-
-    QStringList gTags = QStringList() << TagHeights << TagSizes;
-    QDomNode domNode = tags.at(0).firstChild();
-    while (domNode.isNull() == false)
-    {
-        if (domNode.isElement())
-        {
-            QDomElement domElement = domNode.toElement();
-            if (domElement.isNull() == false)
-            {
-                switch (gTags.indexOf(domElement.tagName()))
-                {
-                    case 1: // TagSizes
-                        SetAttribute(domElement, AttrAll, options.value(GSizes::ALL));
-                        if (options.value(GSizes::ALL))
-                        {
-                            domElement.removeAttribute(AttrS22);
-                            domElement.removeAttribute(AttrS24);
-                            domElement.removeAttribute(AttrS26);
-                            domElement.removeAttribute(AttrS28);
-                            domElement.removeAttribute(AttrS30);
-                            domElement.removeAttribute(AttrS32);
-                            domElement.removeAttribute(AttrS34);
-                            domElement.removeAttribute(AttrS36);
-                            domElement.removeAttribute(AttrS38);
-                            domElement.removeAttribute(AttrS40);
-                            domElement.removeAttribute(AttrS42);
-                            domElement.removeAttribute(AttrS44);
-                            domElement.removeAttribute(AttrS46);
-                            domElement.removeAttribute(AttrS48);
-                            domElement.removeAttribute(AttrS50);
-                            domElement.removeAttribute(AttrS52);
-                            domElement.removeAttribute(AttrS54);
-                            domElement.removeAttribute(AttrS56);
-                            domElement.removeAttribute(AttrS58);
-                            domElement.removeAttribute(AttrS60);
-                            domElement.removeAttribute(AttrS62);
-                            domElement.removeAttribute(AttrS64);
-                            domElement.removeAttribute(AttrS66);
-                            domElement.removeAttribute(AttrS68);
-                            domElement.removeAttribute(AttrS70);
-                            domElement.removeAttribute(AttrS72);
-                        }
-                        else
-                        {
-                            SetAttribute(domElement, AttrS22, options.value(GSizes::S22));
-                            SetAttribute(domElement, AttrS24, options.value(GSizes::S24));
-                            SetAttribute(domElement, AttrS26, options.value(GSizes::S26));
-                            SetAttribute(domElement, AttrS28, options.value(GSizes::S28));
-                            SetAttribute(domElement, AttrS30, options.value(GSizes::S30));
-                            SetAttribute(domElement, AttrS32, options.value(GSizes::S32));
-                            SetAttribute(domElement, AttrS34, options.value(GSizes::S34));
-                            SetAttribute(domElement, AttrS36, options.value(GSizes::S36));
-                            SetAttribute(domElement, AttrS38, options.value(GSizes::S38));
-                            SetAttribute(domElement, AttrS40, options.value(GSizes::S40));
-                            SetAttribute(domElement, AttrS42, options.value(GSizes::S42));
-                            SetAttribute(domElement, AttrS44, options.value(GSizes::S44));
-                            SetAttribute(domElement, AttrS46, options.value(GSizes::S46));
-                            SetAttribute(domElement, AttrS48, options.value(GSizes::S48));
-                            SetAttribute(domElement, AttrS50, options.value(GSizes::S50));
-                            SetAttribute(domElement, AttrS52, options.value(GSizes::S52));
-                            SetAttribute(domElement, AttrS54, options.value(GSizes::S54));
-                            SetAttribute(domElement, AttrS56, options.value(GSizes::S56));
-                            SetAttribute(domElement, AttrS58, options.value(GSizes::S58));
-                            SetAttribute(domElement, AttrS60, options.value(GSizes::S60));
-                            SetAttribute(domElement, AttrS62, options.value(GSizes::S62));
-                            SetAttribute(domElement, AttrS64, options.value(GSizes::S64));
-                            SetAttribute(domElement, AttrS66, options.value(GSizes::S66));
-                            SetAttribute(domElement, AttrS68, options.value(GSizes::S68));
-                            SetAttribute(domElement, AttrS70, options.value(GSizes::S70));
-                            SetAttribute(domElement, AttrS72, options.value(GSizes::S72));
-                        }
-
-                        modified = true;
-                        emit patternChanged(false);
-                        return;
-                    case 0: // TagHeights
-                    default:
-                        break;
-                }
-            }
-        }
-        domNode = domNode.nextSibling();
-    }
-}
-
 //---------------------------------------------------------------------------------------------------------------------
 QString VAbstractPattern::GetDescription() const
 {
@@ -1451,6 +1002,38 @@ void VAbstractPattern::SetCustomerName(const QString& qsName)
     emit patternChanged(false);
 }
 
+//---------------------------------------------------------------------------------------------------------------------
+QDate VAbstractPattern::GetCustomerBirthDate() const
+{
+    return QDate::fromString(UniqueTagText(TagCustomerBirthDate), "yyyy-MM-dd");
+}
+
+//---------------------------------------------------------------------------------------------------------------------
+void VAbstractPattern::SetCustomerBirthDate(const QDate &date)
+{
+    CheckTagExists(TagCustomerBirthDate);
+    setTagText(TagCustomerBirthDate, date.toString("yyyy-MM-dd"));
+    patternLabelWasChanged = true;
+    modified = true;
+    emit patternChanged(false);
+}
+
+//---------------------------------------------------------------------------------------------------------------------
+QString VAbstractPattern::GetCustomerEmail() const
+{
+    return UniqueTagText(TagCustomerEmail);
+}
+
+//---------------------------------------------------------------------------------------------------------------------
+void VAbstractPattern::SetCustomerEmail(const QString &email)
+{
+    CheckTagExists(TagCustomerEmail);
+    setTagText(TagCustomerEmail, email);
+    patternLabelWasChanged = true;
+    modified = true;
+    emit patternChanged(false);
+}
+
 //---------------------------------------------------------------------------------------------------------------------
 QString VAbstractPattern::GetLabelDateFormat() const
 {
@@ -1798,15 +1381,16 @@ QDomElement VAbstractPattern::CheckTagExists(const QString &tag)
             TagImage, // 1
             TagDescription, // 2
             TagNotes, // 3
-            TagGradation, // 4
-            TagPatternName, // 5
-            TagPatternNum, // 6
-            TagCompanyName, // 7
-            TagCustomerName, // 8
-            TagPatternLabel, // 9
-            TagWatermark, // 10
-            TagPatternMaterials, // 11
-            TagFinalMeasurements // 12
+            TagPatternName, // 4
+            TagPatternNum, // 5
+            TagCompanyName, // 6
+            TagCustomerName, // 7
+            TagCustomerBirthDate, // 8
+            TagCustomerEmail, // 9
+            TagPatternLabel, // 10
+            TagWatermark, // 11
+            TagPatternMaterials, // 12
+            TagFinalMeasurements // 13
         };
 
         switch (tags.indexOf(tag))
@@ -1820,41 +1404,34 @@ QDomElement VAbstractPattern::CheckTagExists(const QString &tag)
             case 3: //TagNotes
                 element = createElement(TagNotes);
                 break;
-            case 4: //TagGradation
-            {
-                element = createElement(TagGradation);
-
-                QDomElement heights = createElement(TagHeights);
-                heights.setAttribute(AttrAll, trueStr);
-                element.appendChild(heights);
-
-                QDomElement sizes = createElement(TagSizes);
-                sizes.setAttribute(AttrAll, trueStr);
-                element.appendChild(sizes);
-                break;
-            }
-            case 5: // TagPatternName
+            case 4: // TagPatternName
                 element = createElement(TagPatternName);
                 break;
-            case 6: // TagPatternNum
+            case 5: // TagPatternNum
                 element = createElement(TagPatternNum);
                 break;
-            case 7: // TagCompanyName
+            case 6: // TagCompanyName
                 element = createElement(TagCompanyName);
                 break;
-            case 8: // TagCustomerName
+            case 7: // TagCustomerName
                 element = createElement(TagCustomerName);
                 break;
-            case 9: // TagPatternLabel
+            case 8: // TagCustomerBirthDate
+                element = createElement(TagCustomerBirthDate);
+                break;
+            case 9: // TagCustomerEmail
+                element = createElement(TagCustomerEmail);
+                break;
+            case 10: // TagPatternLabel
                 element = createElement(TagPatternLabel);
                 break;
-            case 10: // TagWatermark
+            case 11: // TagWatermark
                 element = createElement(TagWatermark);
                 break;
-            case 11: // TagPatternMaterials
+            case 12: // TagPatternMaterials
                 element = createElement(TagPatternMaterials);
                 break;
-            case 12: // TagFinalMeasurements
+            case 13: // TagFinalMeasurements
                 element = createElement(TagFinalMeasurements);
                 break;
             case 0: //TagUnit (Mandatory tag)
diff --git a/src/libs/ifc/xml/vabstractpattern.h b/src/libs/ifc/xml/vabstractpattern.h
index 6a3b7a981..7c008fe82 100644
--- a/src/libs/ifc/xml/vabstractpattern.h
+++ b/src/libs/ifc/xml/vabstractpattern.h
@@ -147,12 +147,6 @@ public:
 
     QStringList    getPatternPieces() const;
 
-    QMap<GHeights, bool> GetGradationHeights() const;
-    void                 SetGradationHeights(const QMap<GHeights, bool> &options);
-
-    QMap<GSizes, bool>   GetGradationSizes() const;
-    void                 SetGradationSizes(const QMap<GSizes, bool> &options);
-
     QString        GetDescription() const;
     void           SetDescription(const QString &text);
 
@@ -171,6 +165,12 @@ public:
     QString        GetCustomerName() const;
     void           SetCustomerName(const QString& qsName);
 
+    QDate          GetCustomerBirthDate() const;
+    void           SetCustomerBirthDate(const QDate& date);
+
+    QString        GetCustomerEmail() const;
+    void           SetCustomerEmail(const QString& email);
+
     QString        GetLabelDateFormat() const;
     void           SetLabelDateFormat(const QString &format);
 
@@ -252,15 +252,14 @@ public:
     static const QString TagElArc;
     static const QString TagTools;
     static const QString TagOperation;
-    static const QString TagGradation;
-    static const QString TagHeights;
-    static const QString TagSizes;
     static const QString TagData;
     static const QString TagPatternInfo;
     static const QString TagPatternName;
     static const QString TagPatternNum;
     static const QString TagCompanyName;
     static const QString TagCustomerName;
+    static const QString TagCustomerBirthDate;
+    static const QString TagCustomerEmail;
     static const QString TagPatternLabel;
     static const QString TagWatermark;
     static const QString TagPatternMaterials;
@@ -308,65 +307,6 @@ public:
     static const QString AttrOpacity;
     static const QString AttrTags;
 
-    static const QString AttrAll;
-
-    static const QString AttrH50;
-    static const QString AttrH56;
-    static const QString AttrH62;
-    static const QString AttrH68;
-    static const QString AttrH74;
-    static const QString AttrH80;
-    static const QString AttrH86;
-    static const QString AttrH92;
-    static const QString AttrH98;
-    static const QString AttrH104;
-    static const QString AttrH110;
-    static const QString AttrH116;
-    static const QString AttrH122;
-    static const QString AttrH128;
-    static const QString AttrH134;
-    static const QString AttrH140;
-    static const QString AttrH146;
-    static const QString AttrH152;
-    static const QString AttrH158;
-    static const QString AttrH164;
-    static const QString AttrH170;
-    static const QString AttrH176;
-    static const QString AttrH182;
-    static const QString AttrH188;
-    static const QString AttrH194;
-    static const QString AttrH200;
-
-    static const QString AttrS22;
-    static const QString AttrS24;
-    static const QString AttrS26;
-    static const QString AttrS28;
-    static const QString AttrS30;
-    static const QString AttrS32;
-    static const QString AttrS34;
-    static const QString AttrS36;
-    static const QString AttrS38;
-    static const QString AttrS40;
-    static const QString AttrS42;
-    static const QString AttrS44;
-    static const QString AttrS46;
-    static const QString AttrS48;
-    static const QString AttrS50;
-    static const QString AttrS52;
-    static const QString AttrS54;
-    static const QString AttrS56;
-    static const QString AttrS58;
-    static const QString AttrS60;
-    static const QString AttrS62;
-    static const QString AttrS64;
-    static const QString AttrS66;
-    static const QString AttrS68;
-    static const QString AttrS70;
-    static const QString AttrS72;
-
-    static const QString AttrCustom;
-    static const QString AttrDefHeight;
-    static const QString AttrDefSize;
     static const QString AttrExtension;
 
     static const QString AttrFormula;
diff --git a/src/libs/ifc/xml/vpatternconverter.cpp b/src/libs/ifc/xml/vpatternconverter.cpp
index a38a9dbfc..a995660a6 100644
--- a/src/libs/ifc/xml/vpatternconverter.cpp
+++ b/src/libs/ifc/xml/vpatternconverter.cpp
@@ -59,8 +59,8 @@ class QDomElement;
  */
 
 const QString VPatternConverter::PatternMinVerStr = QStringLiteral("0.1.4");
-const QString VPatternConverter::PatternMaxVerStr = QStringLiteral("0.8.7");
-const QString VPatternConverter::CurrentSchema    = QStringLiteral("://schema/pattern/v0.8.7.xsd");
+const QString VPatternConverter::PatternMaxVerStr = QStringLiteral("0.8.8");
+const QString VPatternConverter::CurrentSchema    = QStringLiteral("://schema/pattern/v0.8.8.xsd");
 
 //VPatternConverter::PatternMinVer; // <== DON'T FORGET TO UPDATE TOO!!!!
 //VPatternConverter::PatternMaxVer; // <== DON'T FORGET TO UPDATE TOO!!!!
@@ -237,7 +237,8 @@ QString VPatternConverter::XSDSchema(int ver) const
         std::make_pair(FORMAT_VERSION(0, 8, 4), QStringLiteral("://schema/pattern/v0.8.4.xsd")),
         std::make_pair(FORMAT_VERSION(0, 8, 5), QStringLiteral("://schema/pattern/v0.8.5.xsd")),
         std::make_pair(FORMAT_VERSION(0, 8, 6), QStringLiteral("://schema/pattern/v0.8.6.xsd")),
-        std::make_pair(FORMAT_VERSION(0, 8, 7), CurrentSchema)
+        std::make_pair(FORMAT_VERSION(0, 8, 7), QStringLiteral("://schema/pattern/v0.8.7.xsd")),
+        std::make_pair(FORMAT_VERSION(0, 8, 8), CurrentSchema)
     };
 
     if (schemas.contains(ver))
@@ -486,6 +487,10 @@ void VPatternConverter::ApplyPatches()
             ValidateXML(XSDSchema(FORMAT_VERSION(0, 8, 7)));
             Q_FALLTHROUGH();
         case (FORMAT_VERSION(0, 8, 7)):
+            ToV0_8_8();
+            ValidateXML(XSDSchema(FORMAT_VERSION(0, 8, 8)));
+            Q_FALLTHROUGH();
+        case (FORMAT_VERSION(0, 8, 8)):
             break;
         default:
             InvalidVersion(m_ver);
@@ -503,7 +508,7 @@ void VPatternConverter::DowngradeToCurrentMaxVersion()
 bool VPatternConverter::IsReadOnly() const
 {
     // Check if attribute readOnly was not changed in file format
-    Q_STATIC_ASSERT_X(VPatternConverter::PatternMaxVer == FORMAT_VERSION(0, 8, 7),
+    Q_STATIC_ASSERT_X(VPatternConverter::PatternMaxVer == FORMAT_VERSION(0, 8, 8),
                       "Check attribute readOnly.");
 
     // Possibly in future attribute readOnly will change position etc.
@@ -1143,6 +1148,17 @@ void VPatternConverter::ToV0_8_7()
     Save();
 }
 
+//---------------------------------------------------------------------------------------------------------------------
+void VPatternConverter::ToV0_8_8()
+{
+    // TODO. Delete if minimal supported version is 0.8.8
+    Q_STATIC_ASSERT_X(VPatternConverter::PatternMinVer < FORMAT_VERSION(0, 8, 8),
+                      "Time to refactor the code.");
+    SetVersion(QStringLiteral("0.8.8"));
+    RemoveGradationV0_8_8();
+    Save();
+}
+
 //---------------------------------------------------------------------------------------------------------------------
 void VPatternConverter::TagUnitToV0_2_0()
 {
@@ -2662,6 +2678,20 @@ void VPatternConverter::AddTagPreviewCalculationsV0_6_2()
     }
 }
 
+//---------------------------------------------------------------------------------------------------------------------
+void VPatternConverter::RemoveGradationV0_8_8()
+{
+    QDomElement patternElement = documentElement();
+    if (patternElement.isElement())
+    {
+        QDomElement gradationTag = patternElement.firstChildElement(*strGradation);
+        if (gradationTag.isElement())
+        {
+            patternElement.removeChild(gradationTag);
+        }
+    }
+}
+
 //---------------------------------------------------------------------------------------------------------------------
 void VPatternConverter::TagUnionDetailsToV0_4_0()
 {
diff --git a/src/libs/ifc/xml/vpatternconverter.h b/src/libs/ifc/xml/vpatternconverter.h
index 1adaabee3..6280b53c8 100644
--- a/src/libs/ifc/xml/vpatternconverter.h
+++ b/src/libs/ifc/xml/vpatternconverter.h
@@ -53,7 +53,7 @@ public:
     static const QString PatternMaxVerStr;
     static const QString CurrentSchema;
     static Q_DECL_CONSTEXPR const int PatternMinVer = FORMAT_VERSION(0, 1, 4);
-    static Q_DECL_CONSTEXPR const int PatternMaxVer = FORMAT_VERSION(0, 8, 7);
+    static Q_DECL_CONSTEXPR const int PatternMaxVer = FORMAT_VERSION(0, 8, 8);
 
 protected:
     virtual int     MinVer() const override;
@@ -130,6 +130,7 @@ private:
     void ToV0_8_5();
     void ToV0_8_6();
     void ToV0_8_7();
+    void ToV0_8_8();
 
     void          TagUnitToV0_2_0();
     void          TagIncrementToV0_2_0();
@@ -182,6 +183,8 @@ private:
     void RemoveUniqueTagV0_6_0(const QString &tag);
 
     void AddTagPreviewCalculationsV0_6_2();
+
+    void RemoveGradationV0_8_8();
 };
 
 //---------------------------------------------------------------------------------------------------------------------
diff --git a/src/libs/ifc/xml/vvitconverter.cpp b/src/libs/ifc/xml/vvitconverter.cpp
index a9e9c2bdd..c4da6193a 100644
--- a/src/libs/ifc/xml/vvitconverter.cpp
+++ b/src/libs/ifc/xml/vvitconverter.cpp
@@ -54,8 +54,8 @@
  */
 
 const QString VVITConverter::MeasurementMinVerStr = QStringLiteral("0.2.0");
-const QString VVITConverter::MeasurementMaxVerStr = QStringLiteral("0.5.0");
-const QString VVITConverter::CurrentSchema        = QStringLiteral("://schema/individual_measurements/v0.5.0.xsd");
+const QString VVITConverter::MeasurementMaxVerStr = QStringLiteral("0.5.1");
+const QString VVITConverter::CurrentSchema        = QStringLiteral("://schema/individual_measurements/v0.5.1.xsd");
 
 //VVITConverter::MeasurementMinVer; // <== DON'T FORGET TO UPDATE TOO!!!!
 //VVITConverter::MeasurementMaxVer; // <== DON'T FORGET TO UPDATE TOO!!!!
@@ -89,7 +89,8 @@ QString VVITConverter::XSDSchema(int ver) const
         std::make_pair(FORMAT_VERSION(0, 3, 2), QStringLiteral("://schema/individual_measurements/v0.3.2.xsd")),
         std::make_pair(FORMAT_VERSION(0, 3, 3), QStringLiteral("://schema/individual_measurements/v0.3.3.xsd")),
         std::make_pair(FORMAT_VERSION(0, 4, 0), QStringLiteral("://schema/individual_measurements/v0.4.0.xsd")),
-        std::make_pair(FORMAT_VERSION(0, 5, 0), CurrentSchema),
+        std::make_pair(FORMAT_VERSION(0, 5, 0), QStringLiteral("://schema/individual_measurements/v0.5.0.xsd")),
+        std::make_pair(FORMAT_VERSION(0, 5, 1), CurrentSchema),
     };
 
     if (schemas.contains(ver))
@@ -132,6 +133,10 @@ void VVITConverter::ApplyPatches()
             ValidateXML(XSDSchema(FORMAT_VERSION(0, 5, 0)));
             Q_FALLTHROUGH();
         case (FORMAT_VERSION(0, 5, 0)):
+            ToV0_5_1();
+            ValidateXML(XSDSchema(FORMAT_VERSION(0, 5, 1)));
+            Q_FALLTHROUGH();
+        case (FORMAT_VERSION(0, 5, 1)):
             break;
         default:
             InvalidVersion(m_ver);
@@ -150,7 +155,7 @@ void VVITConverter::DowngradeToCurrentMaxVersion()
 bool VVITConverter::IsReadOnly() const
 {
     // Check if attribute read-only was not changed in file format
-    Q_STATIC_ASSERT_X(VVITConverter::MeasurementMaxVer == FORMAT_VERSION(0, 5, 0),
+    Q_STATIC_ASSERT_X(VVITConverter::MeasurementMaxVer == FORMAT_VERSION(0, 5, 1),
                       "Check attribute read-only.");
 
     // Possibly in future attribute read-only will change position etc.
@@ -428,3 +433,14 @@ void VVITConverter::ToV0_5_0()
     SetVersion(QStringLiteral("0.5.0"));
     Save();
 }
+
+//---------------------------------------------------------------------------------------------------------------------
+void VVITConverter::ToV0_5_1()
+{
+    // TODO. Delete if minimal supported version is 0.5.1
+    Q_STATIC_ASSERT_X(VVITConverter::MeasurementMinVer < FORMAT_VERSION(0, 5, 1),
+                      "Time to refactor the code.");
+
+    SetVersion(QStringLiteral("0.5.1"));
+    Save();
+}
diff --git a/src/libs/ifc/xml/vvitconverter.h b/src/libs/ifc/xml/vvitconverter.h
index fa7a8bba0..aa7360f71 100644
--- a/src/libs/ifc/xml/vvitconverter.h
+++ b/src/libs/ifc/xml/vvitconverter.h
@@ -49,7 +49,7 @@ public:
     static const QString MeasurementMaxVerStr;
     static const QString CurrentSchema;
     static Q_DECL_CONSTEXPR const int MeasurementMinVer = FORMAT_VERSION(0, 2, 0);
-    static Q_DECL_CONSTEXPR const int MeasurementMaxVer = FORMAT_VERSION(0, 5, 0);
+    static Q_DECL_CONSTEXPR const int MeasurementMaxVer = FORMAT_VERSION(0, 5, 1);
 
 protected:
     virtual int     MinVer() const override;
@@ -82,6 +82,7 @@ private:
     void ToV0_3_3();
     void ToV0_4_0();
     void ToV0_5_0();
+    void ToV0_5_1();
 };
 
 //---------------------------------------------------------------------------------------------------------------------
diff --git a/src/libs/ifc/xml/vvstconverter.cpp b/src/libs/ifc/xml/vvstconverter.cpp
index e6bc9c2d9..2c2cb0b7a 100644
--- a/src/libs/ifc/xml/vvstconverter.cpp
+++ b/src/libs/ifc/xml/vvstconverter.cpp
@@ -54,8 +54,8 @@
  */
 
 const QString VVSTConverter::MeasurementMinVerStr = QStringLiteral("0.3.0");
-const QString VVSTConverter::MeasurementMaxVerStr = QStringLiteral("0.4.4");
-const QString VVSTConverter::CurrentSchema        = QStringLiteral("://schema/standard_measurements/v0.4.4.xsd");
+const QString VVSTConverter::MeasurementMaxVerStr = QStringLiteral("0.5.0");
+const QString VVSTConverter::CurrentSchema        = QStringLiteral("://schema/multisize_measurements/v0.5.0.xsd");
 
 //VVSTConverter::MeasurementMinVer; // <== DON'T FORGET TO UPDATE TOO!!!!
 //VVSTConverter::MeasurementMaxVer; // <== DON'T FORGET TO UPDATE TOO!!!!
@@ -75,25 +75,25 @@ VVSTConverter::VVSTConverter(const QString &fileName)
 //---------------------------------------------------------------------------------------------------------------------
 QString VVSTConverter::XSDSchema(int ver) const
 {
-    switch (ver)
+    QHash <int, QString> schemas =
     {
-        case (0x000300):
-            return QStringLiteral("://schema/standard_measurements/v0.3.0.xsd");
-        case (0x000400):
-            return QStringLiteral("://schema/standard_measurements/v0.4.0.xsd");
-        case (0x000401):
-            return QStringLiteral("://schema/standard_measurements/v0.4.1.xsd");
-        case (0x000402):
-            return QStringLiteral("://schema/standard_measurements/v0.4.2.xsd");
-        case (0x000403):
-            return QStringLiteral("://schema/standard_measurements/v0.4.3.xsd");
-        case (0x000404):
-            return CurrentSchema;
-        default:
-            InvalidVersion(ver);
-            break;
+        std::make_pair(FORMAT_VERSION(0, 3, 0), QStringLiteral("://schema/multisize_measurements/v0.3.0.xsd")),
+        std::make_pair(FORMAT_VERSION(0, 4, 0), QStringLiteral("://schema/multisize_measurements/v0.4.0.xsd")),
+        std::make_pair(FORMAT_VERSION(0, 4, 1), QStringLiteral("://schema/multisize_measurements/v0.4.1.xsd")),
+        std::make_pair(FORMAT_VERSION(0, 4, 2), QStringLiteral("://schema/multisize_measurements/v0.4.2.xsd")),
+        std::make_pair(FORMAT_VERSION(0, 4, 3), QStringLiteral("://schema/multisize_measurements/v0.4.3.xsd")),
+        std::make_pair(FORMAT_VERSION(0, 4, 4), QStringLiteral("://schema/multisize_measurements/v0.4.4.xsd")),
+        std::make_pair(FORMAT_VERSION(0, 5, 0), CurrentSchema),
+    };
+
+    if (schemas.contains(ver))
+    {
+        return schemas.value(ver);
+    }
+    else
+    {
+        InvalidVersion(ver);
     }
-    return QString();//unreachable code
 }
 
 //---------------------------------------------------------------------------------------------------------------------
@@ -101,27 +101,31 @@ void VVSTConverter::ApplyPatches()
 {
     switch (m_ver)
     {
-        case (0x000300):
+        case (FORMAT_VERSION(0, 3, 0)):
             ToV0_4_0();
-            ValidateXML(XSDSchema(0x000400));
+            ValidateXML(XSDSchema(FORMAT_VERSION(0, 4, 0)));
             Q_FALLTHROUGH();
-        case (0x000400):
+        case (FORMAT_VERSION(0, 4, 0)):
             ToV0_4_1();
-            ValidateXML(XSDSchema(0x000401));
+            ValidateXML(XSDSchema(FORMAT_VERSION(0, 4, 1)));
             Q_FALLTHROUGH();
-        case (0x000401):
+        case (FORMAT_VERSION(0, 4, 1)):
             ToV0_4_2();
-            ValidateXML(XSDSchema(0x000402));
+            ValidateXML(XSDSchema(FORMAT_VERSION(0, 4, 2)));
             Q_FALLTHROUGH();
-        case (0x000402):
+        case (FORMAT_VERSION(0, 4, 2)):
             ToV0_4_3();
-            ValidateXML(XSDSchema(0x000403));
+            ValidateXML(XSDSchema(FORMAT_VERSION(0, 4, 3)));
             Q_FALLTHROUGH();
-        case (0x000403):
+        case (FORMAT_VERSION(0, 4, 3)):
             ToV0_4_4();
-            ValidateXML(XSDSchema(0x000404));
+            ValidateXML(XSDSchema(FORMAT_VERSION(0, 4, 4)));
             Q_FALLTHROUGH();
-        case (0x000404):
+        case (FORMAT_VERSION(0, 4, 4)):
+            ToV0_5_0();
+            ValidateXML(XSDSchema(FORMAT_VERSION(0, 5, 0)));
+            Q_FALLTHROUGH();
+        case (FORMAT_VERSION(0, 5, 0)):
             break;
         default:
             InvalidVersion(m_ver);
@@ -140,7 +144,7 @@ void VVSTConverter::DowngradeToCurrentMaxVersion()
 bool VVSTConverter::IsReadOnly() const
 {
     // Check if attribute read-only was not changed in file format
-    Q_STATIC_ASSERT_X(VVSTConverter::MeasurementMaxVer == FORMAT_VERSION(0, 4, 4),
+    Q_STATIC_ASSERT_X(VVSTConverter::MeasurementMaxVer == FORMAT_VERSION(0, 5, 0),
                       "Check attribute read-only.");
 
     // Possibly in future attribute read-only will change position etc.
@@ -308,6 +312,112 @@ void VVSTConverter::ConvertMeasurementsToV0_4_2()
     }
 }
 
+//---------------------------------------------------------------------------------------------------------------------
+void VVSTConverter::AddNewTagsForV0_5_0()
+{
+    // TODO. Delete if minimal supported version is 0.5.0
+    Q_STATIC_ASSERT_X(VVSTConverter::MeasurementMinVer < FORMAT_VERSION(0, 5, 0),
+                      "Time to refactor the code.");
+
+    QDomElement root = documentElement();
+    const QDomElement pmSystemTag = root.firstChildElement(QStringLiteral("pm_system"));
+    if (pmSystemTag.isNull())
+    {
+        return;
+    }
+
+    QDomElement dimensionsTag = createElement(QStringLiteral("dimensions"));
+
+    auto Base = [this](const QString &base)
+    {
+        const QDomElement root = documentElement();
+        const QDomElement baseTag = root.firstChildElement(base);
+        if (baseTag.isNull())
+        {
+            return 0;
+        }
+
+        return GetParametrInt(baseTag, QStringLiteral("base"), QChar('0'));
+    };
+
+    const Unit units = MUnit();
+
+    {
+        const int step = static_cast<int>(UnitConvertor(6, Unit::Cm, units));
+        const int min = static_cast<int>(UnitConvertor(50, Unit::Cm, units));
+        const int max = static_cast<int>(UnitConvertor(200, Unit::Cm, units));
+
+        QDomElement dimensionX = createElement(QStringLiteral("dimension"));
+        SetAttribute(dimensionX, QStringLiteral("type"), QChar('x'));
+        SetAttribute(dimensionX, QStringLiteral("step"), step);
+        SetAttribute(dimensionX, QStringLiteral("min"), min);
+        SetAttribute(dimensionX, QStringLiteral("max"), max);
+        SetAttribute(dimensionX, QStringLiteral("base"), Base(QStringLiteral("height")));
+        dimensionsTag.appendChild(dimensionX);
+    }
+
+    {
+        const int step = static_cast<int>(UnitConvertor(2, Unit::Cm, units));
+        const int min = static_cast<int>(UnitConvertor(22, Unit::Cm, units));
+        const int max = static_cast<int>(UnitConvertor(72, Unit::Cm, units));
+
+        QDomElement dimensionY = createElement(QStringLiteral("dimension"));
+        SetAttribute(dimensionY, QStringLiteral("type"), QChar('y'));
+        SetAttribute(dimensionY, QStringLiteral("step"), step);
+        SetAttribute(dimensionY, QStringLiteral("min"), min);
+        SetAttribute(dimensionY, QStringLiteral("max"), max);
+        SetAttribute(dimensionY, QStringLiteral("base"), Base(QStringLiteral("size")));
+        SetAttribute(dimensionY, QStringLiteral("circumference"), true);
+        dimensionsTag.appendChild(dimensionY);
+    }
+
+    root.insertAfter(dimensionsTag, pmSystemTag);
+
+    root.insertAfter(createElement(QStringLiteral("restrictions")), dimensionsTag);
+}
+
+//---------------------------------------------------------------------------------------------------------------------
+void VVSTConverter::RemoveTagsForV0_5_0()
+{
+    // TODO. Delete if minimal supported version is 0.5.0
+    Q_STATIC_ASSERT_X(VVSTConverter::MeasurementMinVer < FORMAT_VERSION(0, 5, 0),
+                      "Time to refactor the code.");
+
+    QDomElement root = documentElement();
+
+    const QDomElement sizeTag = root.firstChildElement(QStringLiteral("size"));
+    if (not sizeTag.isNull())
+    {
+        root.removeChild(sizeTag);
+    }
+
+    const QDomElement heightTag = root.firstChildElement(QStringLiteral("height"));
+    if (not heightTag.isNull())
+    {
+        root.removeChild(heightTag);
+    }
+}
+
+//---------------------------------------------------------------------------------------------------------------------
+void VVSTConverter::ConvertMeasurementsToV0_5_0()
+{
+    // TODO. Delete if minimal supported version is 0.5.0
+    Q_STATIC_ASSERT_X(VVSTConverter::MeasurementMinVer < FORMAT_VERSION(0, 5, 0),
+                      "Time to refactor the code.");
+
+    const QDomNodeList measurements = elementsByTagName(QStringLiteral("m"));
+    for (int i = 0; i < measurements.size(); ++i)
+    {
+        QDomElement m = measurements.at(i).toElement();
+
+        SetAttribute(m, QStringLiteral("shiftA"), GetParametrString(m, QStringLiteral("height_increase")));
+        m.removeAttribute(QStringLiteral("height_increase"));
+
+        SetAttribute(m, QStringLiteral("shiftB"), GetParametrString(m, QStringLiteral("size_increase")));
+        m.removeAttribute(QStringLiteral("size_increase"));
+    }
+}
+
 //---------------------------------------------------------------------------------------------------------------------
 void VVSTConverter::ToV0_4_0()
 {
@@ -368,3 +478,17 @@ void VVSTConverter::ToV0_4_4()
     SetVersion(QStringLiteral("0.4.4"));
     Save();
 }
+
+//---------------------------------------------------------------------------------------------------------------------
+void VVSTConverter::ToV0_5_0()
+{
+    // TODO. Delete if minimal supported version is 0.5.0
+    Q_STATIC_ASSERT_X(VVSTConverter::MeasurementMinVer < FORMAT_VERSION(0, 5, 0),
+                      "Time to refactor the code.");
+
+    SetVersion(QStringLiteral("0.5.0"));
+    AddNewTagsForV0_5_0();
+    RemoveTagsForV0_5_0();
+    ConvertMeasurementsToV0_5_0();
+    Save();
+}
diff --git a/src/libs/ifc/xml/vvstconverter.h b/src/libs/ifc/xml/vvstconverter.h
index e7daed282..869679bca 100644
--- a/src/libs/ifc/xml/vvstconverter.h
+++ b/src/libs/ifc/xml/vvstconverter.h
@@ -51,10 +51,10 @@ public:
 // GCC 4.6 doesn't allow constexpr and const together
 #if !defined(__INTEL_COMPILER) && !defined(__clang__) && defined(__GNUC__) && (__GNUC__ * 100 + __GNUC_MINOR__) <= 406
     static Q_DECL_CONSTEXPR int MeasurementMinVer = FORMAT_VERSION(0, 3, 0);
-    static Q_DECL_CONSTEXPR int MeasurementMaxVer = FORMAT_VERSION(0, 4, 4);
+    static Q_DECL_CONSTEXPR int MeasurementMaxVer = FORMAT_VERSION(0, 5, 0);
 #else
     static Q_DECL_CONSTEXPR const int MeasurementMinVer = FORMAT_VERSION(0, 3, 0);
-    static Q_DECL_CONSTEXPR const int MeasurementMaxVer = FORMAT_VERSION(0, 4, 4);
+    static Q_DECL_CONSTEXPR const int MeasurementMaxVer = FORMAT_VERSION(0, 5, 0);
 #endif
 
 protected:
@@ -80,11 +80,16 @@ private:
     void PM_SystemV0_4_1();
     void ConvertMeasurementsToV0_4_2();
 
+    void AddNewTagsForV0_5_0();
+    void RemoveTagsForV0_5_0();
+    void ConvertMeasurementsToV0_5_0();
+
     void ToV0_4_0();
     void ToV0_4_1();
     void ToV0_4_2();
     void ToV0_4_3();
     void ToV0_4_4();
+    void ToV0_5_0();
 };
 
 //---------------------------------------------------------------------------------------------------------------------
diff --git a/src/libs/vdxf/libdxfrw/intern/drw_textcodec.cpp b/src/libs/vdxf/libdxfrw/intern/drw_textcodec.cpp
index 796b41bb6..3cfd120c0 100644
--- a/src/libs/vdxf/libdxfrw/intern/drw_textcodec.cpp
+++ b/src/libs/vdxf/libdxfrw/intern/drw_textcodec.cpp
@@ -4,8 +4,9 @@
 #include <algorithm>
 #include <QString>
 #include <QTextCodec>
+#include <QDebug>
 #include "../drw_base.h"
-#include "../vmisc/vabstractapplication.h"
+#include "../vmisc/vabstractvalapplication.h"
 #include "../ifc/exception/vexception.h"
 
 namespace
@@ -112,7 +113,7 @@ void DRW_TextCodec::setCodePage(const std::string *c, bool dxfFormat){
         const QString errorMsg = QCoreApplication::translate("DRW_TextCodec", "No available codec for code page '%1'.")
                 .arg(cp.c_str());
         qApp->IsPedantic() ? throw VException(errorMsg) :
-                             qWarning() << VAbstractApplication::patternMessageSignature + errorMsg;
+                             qWarning() << VAbstractValApplication::patternMessageSignature + errorMsg;
 
         if (version < DRW::AC1021 && cp == "UTF-8")
         {
diff --git a/src/libs/vformat/vdimensions.cpp b/src/libs/vformat/vdimensions.cpp
new file mode 100644
index 000000000..46ff44d87
--- /dev/null
+++ b/src/libs/vformat/vdimensions.cpp
@@ -0,0 +1,415 @@
+/************************************************************************
+ **
+ **  @file   vdimensions.cpp
+ **  @author Roman Telezhynskyi <dismine(at)gmail.com>
+ **  @date   25 9, 2020
+ **
+ **  @brief
+ **  @copyright
+ **  This source code is part of the Valentina project, a pattern making
+ **  program, whose allow create and modeling patterns of clothing.
+ **  Copyright (C) 2020 Valentina project
+ **  <https://gitlab.com/smart-pattern/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 "vdimensions.h"
+
+#include <QSet>
+#include <QVector>
+
+//---------------------------------------------------------------------------------------------------------------------
+VAbstartMeasurementDimension::VAbstartMeasurementDimension(Unit units)
+    : m_units(units)
+{}
+
+//---------------------------------------------------------------------------------------------------------------------
+VAbstartMeasurementDimension::VAbstartMeasurementDimension(Unit units, int min, int max, int step)
+    : m_units(units),
+      m_minValue(min),
+      m_maxValue(max),
+      m_step(step)
+{}
+
+//---------------------------------------------------------------------------------------------------------------------
+bool VAbstartMeasurementDimension::IsValid()
+{
+    m_error.clear();
+    return IsUnitsValid() && IsRangeValid() && IsStepValid() && IsBaseValid();
+}
+
+//---------------------------------------------------------------------------------------------------------------------
+QVector<int> VAbstartMeasurementDimension::ValidSteps() const
+{
+    QVector<int> steps;
+
+    const int diff = m_maxValue - m_minValue;
+    if (diff == 0)
+    {
+        steps.append(0); // only one possible value
+    }
+    else if (diff > 0)
+    {
+        for (int i=1; i < 9; ++i)
+        {
+            const int step = (m_units == Unit::Mm ? i * 10 : i);
+            if (diff % step == 0)
+            {
+                steps.append(step);
+            }
+        }
+    }
+
+    return steps;
+}
+
+//---------------------------------------------------------------------------------------------------------------------
+QVector<int> VAbstartMeasurementDimension::ValidBases() const
+{
+    return VAbstartMeasurementDimension::ValidBases(m_minValue, m_maxValue, m_step);
+}
+
+//---------------------------------------------------------------------------------------------------------------------
+QStringList VAbstartMeasurementDimension::ValidBasesList() const
+{
+    QVector<int> bases = ValidBases();
+    QStringList list;
+    for(auto &base : bases)
+    {
+        list.append(QString::number(base));
+    }
+    return list;
+
+}
+
+//---------------------------------------------------------------------------------------------------------------------
+QVector<int> VAbstartMeasurementDimension::ValidBases(int min, int max, int step)
+{
+    QVector<int> validBases;
+
+    if (step < 0)
+    {
+        return validBases;
+    }
+    else if (step == 0)
+    {
+        step = 1;
+    }
+
+    for (int value = min; value <= max; value += step)
+    {
+        validBases.append(value);
+    }
+
+    return validBases;
+}
+
+//---------------------------------------------------------------------------------------------------------------------
+bool VAbstartMeasurementDimension::IsRangeValid()
+{
+    bool valid = m_minValue > 0 && m_maxValue > 0 && m_minValue >= RangeMin() && m_minValue <= RangeMax()
+                 && m_minValue <= m_maxValue;
+
+    if (not valid)
+    {
+        m_error = tr("Invalid min/max range");
+    }
+
+    return valid;
+}
+
+//---------------------------------------------------------------------------------------------------------------------
+bool VAbstartMeasurementDimension::IsStepValid()
+{
+    bool valid = ValidSteps().indexOf(m_step) != -1;
+    if (not valid)
+    {
+        m_error = tr("Invalid step");
+    }
+
+    return valid;
+}
+
+//---------------------------------------------------------------------------------------------------------------------
+bool VAbstartMeasurementDimension::IsBaseValid()
+{
+    bool valid = ValidBases().indexOf(m_baseValue) != -1;
+    if (not valid)
+    {
+        m_error = tr("Base value invalid");
+    }
+
+    return valid;
+}
+
+//---------------------------------------------------------------------------------------------------------------------
+bool VAbstartMeasurementDimension::IsUnitsValid()
+{
+    return m_units == Unit::Cm || m_units == Unit::Mm || m_units == Unit::Inch;
+}
+
+//---------------------------------------------------------------------------------------------------------------------
+QString VAbstartMeasurementDimension::DimensionName(MeasurementDimension type)
+{
+    switch(type)
+    {
+        case MeasurementDimension::X:
+            return tr("Height");
+        case MeasurementDimension::Y:
+            return tr("Size");
+        case MeasurementDimension::W:
+            return tr("Hip");
+        case MeasurementDimension::Z:
+            return tr("Waist");
+        default:
+            return QString();
+    }
+}
+
+//---------------------------------------------------------------------------------------------------------------------
+QString VAbstartMeasurementDimension::DimensionToolTip(MeasurementDimension type, bool circumference, bool fc)
+{
+    switch(type)
+    {
+    case MeasurementDimension::X:
+        return tr("Height");
+    case MeasurementDimension::Y:
+        if (circumference)
+        {
+            return fc ? tr("Chest full circumference") : tr("Chest half circumference");
+        }
+        else
+        {
+            return tr("Size");
+        }
+        return circumference ? tr("Chest circumference") : tr("Size");
+    case MeasurementDimension::W:
+        return fc ? tr("Hip full circumference") : tr("Hip half circumference");
+    case MeasurementDimension::Z:
+        return fc ? tr("Waist full circumference") : tr("Waist half circumference");
+    default:
+        return QString();
+    }
+}
+
+// VXMeasurementDimension
+//---------------------------------------------------------------------------------------------------------------------
+VXMeasurementDimension::VXMeasurementDimension(Unit units)
+    : VAbstartMeasurementDimension(units)
+{}
+
+//---------------------------------------------------------------------------------------------------------------------
+VXMeasurementDimension::VXMeasurementDimension(Unit units, int min, int max, int step)
+    : VAbstartMeasurementDimension(units, min, max, step)
+{}
+
+//---------------------------------------------------------------------------------------------------------------------
+MeasurementDimension VXMeasurementDimension::Type() const
+{
+    return MeasurementDimension::X;
+}
+
+//---------------------------------------------------------------------------------------------------------------------
+int VXMeasurementDimension::RangeMin() const
+{
+    switch(m_units)
+    {
+        case Unit::Cm:
+            return 50;
+        case Unit::Mm:
+            return 500;
+        case Unit::Inch:
+            return 19;
+        default:
+            return 0;
+    }
+}
+
+//---------------------------------------------------------------------------------------------------------------------
+int VXMeasurementDimension::RangeMax() const
+{
+    switch(m_units)
+    {
+        case Unit::Cm:
+            return 272;
+        case Unit::Mm:
+            return 2720;
+        case Unit::Inch:
+            return 107;
+        default:
+            return 0;
+    }
+}
+
+// VYMeasurementDimension
+//---------------------------------------------------------------------------------------------------------------------
+VYMeasurementDimension::VYMeasurementDimension(Unit units)
+    : VAbstartMeasurementDimension(units)
+{}
+
+//---------------------------------------------------------------------------------------------------------------------
+VYMeasurementDimension::VYMeasurementDimension(Unit units, int min, int max, int step)
+    : VAbstartMeasurementDimension(units, min, max, step)
+{}
+
+//---------------------------------------------------------------------------------------------------------------------
+MeasurementDimension VYMeasurementDimension::Type() const
+{
+    return MeasurementDimension::Y;
+}
+
+//---------------------------------------------------------------------------------------------------------------------
+int VYMeasurementDimension::RangeMin() const
+{
+    if (m_circumference)
+    {
+        switch(m_units)
+        {
+            case Unit::Cm:
+                return 22;
+            case Unit::Mm:
+                return 220;
+            case Unit::Inch:
+                return 8;
+            default:
+                return 0;
+        }
+    }
+    else
+    {
+        return 6;
+    }
+}
+
+//---------------------------------------------------------------------------------------------------------------------
+int VYMeasurementDimension::RangeMax() const
+{
+    if (m_circumference)
+    {
+        switch(m_units)
+        {
+            case Unit::Cm:
+                return 72;
+            case Unit::Mm:
+                return 720;
+            case Unit::Inch:
+                return 29;
+            default:
+                return 0;
+        }
+    }
+    else
+    {
+        return 58;
+    }
+}
+
+// VWMeasurementDimension
+//---------------------------------------------------------------------------------------------------------------------
+VWMeasurementDimension::VWMeasurementDimension(Unit units)
+    : VAbstartMeasurementDimension(units)
+{}
+
+//---------------------------------------------------------------------------------------------------------------------
+VWMeasurementDimension::VWMeasurementDimension(Unit units, int min, int max, int step)
+    : VAbstartMeasurementDimension(units, min, max, step)
+{}
+
+//---------------------------------------------------------------------------------------------------------------------
+MeasurementDimension VWMeasurementDimension::Type() const
+{
+    return MeasurementDimension::W;
+}
+
+//---------------------------------------------------------------------------------------------------------------------
+int VWMeasurementDimension::RangeMin() const
+{
+    switch(m_units)
+    {
+        case Unit::Cm:
+            return 33;
+        case Unit::Mm:
+            return 330;
+        case Unit::Inch:
+            return 12;
+        default:
+            return 0;
+    }
+}
+
+//---------------------------------------------------------------------------------------------------------------------
+int VWMeasurementDimension::RangeMax() const
+{
+    switch(m_units)
+    {
+        case Unit::Cm:
+            return 63;
+        case Unit::Mm:
+            return 630;
+        case Unit::Inch:
+            return 25;
+        default:
+            return 0;
+    }
+}
+
+// VZMeasurementDimension
+//---------------------------------------------------------------------------------------------------------------------
+VZMeasurementDimension::VZMeasurementDimension(Unit units)
+    : VAbstartMeasurementDimension(units)
+{}
+
+//---------------------------------------------------------------------------------------------------------------------
+VZMeasurementDimension::VZMeasurementDimension(Unit units, int min, int max, int step)
+    : VAbstartMeasurementDimension(units, min, max, step)
+{}
+
+//---------------------------------------------------------------------------------------------------------------------
+MeasurementDimension VZMeasurementDimension::Type() const
+{
+    return MeasurementDimension::Z;
+}
+
+//---------------------------------------------------------------------------------------------------------------------
+int VZMeasurementDimension::RangeMin() const
+{
+    switch(m_units)
+    {
+        case Unit::Cm:
+            return 33;
+        case Unit::Mm:
+            return 330;
+        case Unit::Inch:
+            return 12;
+        default:
+            return 0;
+    }
+}
+
+//---------------------------------------------------------------------------------------------------------------------
+int VZMeasurementDimension::RangeMax() const
+{
+    switch(m_units)
+    {
+        case Unit::Cm:
+            return 63;
+        case Unit::Mm:
+            return 630;
+        case Unit::Inch:
+            return 25;
+        default:
+            return 0;
+    }
+}
diff --git a/src/libs/vformat/vdimensions.h b/src/libs/vformat/vdimensions.h
new file mode 100644
index 000000000..69b4461fd
--- /dev/null
+++ b/src/libs/vformat/vdimensions.h
@@ -0,0 +1,274 @@
+/************************************************************************
+ **
+ **  @file   vdimensions.h
+ **  @author Roman Telezhynskyi <dismine(at)gmail.com>
+ **  @date   25 9, 2020
+ **
+ **  @brief
+ **  @copyright
+ **  This source code is part of the Valentina project, a pattern making
+ **  program, whose allow create and modeling patterns of clothing.
+ **  Copyright (C) 2020 Valentina project
+ **  <https://gitlab.com/smart-pattern/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 VDIMENSIONS_H
+#define VDIMENSIONS_H
+
+#include <QCoreApplication>
+#include <QMap>
+
+#include "../vmisc/def.h"
+
+enum class MeasurementDimension: qint8
+{
+    X = 0, // height
+    Y = 1, // size (chest half circumference)
+    W = 2, // hip half circumference
+    Z = 3  // waist half circumference
+};
+
+class VAbstartMeasurementDimension;
+template <class T> class QSharedPointer;
+
+using MeasurementDimension_p = QSharedPointer<VAbstartMeasurementDimension>;
+using DimesionLabels = QMap<int, QString>;
+
+class VAbstartMeasurementDimension
+{
+    Q_DECLARE_TR_FUNCTIONS(VAbstartMeasurementDimension)
+public:
+    VAbstartMeasurementDimension() =default;
+    explicit VAbstartMeasurementDimension(Unit units);
+    VAbstartMeasurementDimension(Unit units, int min, int max, int step);
+    virtual ~VAbstartMeasurementDimension() =default;
+
+    virtual MeasurementDimension Type() const =0;
+
+    virtual bool IsValid();
+
+    int  MinValue() const;
+    void SetMinValue(int minValue);
+
+    int  MaxValue() const;
+    void SetMaxValue(int maxValue);
+
+    int  Step() const;
+    void SetStep(int step);
+
+    int  BaseValue() const;
+    void SetBaseValue(int baseValue);
+
+    QString Error() const;
+
+    Unit Units() const;
+
+    virtual bool IsCircumference() const;
+
+    virtual int RangeMin() const =0;
+    virtual int RangeMax() const =0;
+
+    QVector<int> ValidSteps() const;
+    QVector<int> ValidBases() const;
+    QStringList  ValidBasesList() const;
+
+    static QVector<int> ValidBases(int min, int max, int step);
+    static QString DimensionName(MeasurementDimension type);
+    static QString DimensionToolTip(MeasurementDimension type, bool circumference, bool fc);
+
+    DimesionLabels Labels() const;
+    void           SetLabels(const DimesionLabels &labels);
+
+protected:
+    Unit           m_units{Unit::Cm};
+    int            m_minValue{0};
+    int            m_maxValue{0};
+    int            m_step{-1};
+    int            m_baseValue{0};
+    QString        m_error{};
+    DimesionLabels m_labels{};
+
+    bool IsRangeValid();
+    bool IsStepValid();
+    bool IsBaseValid();
+    bool IsUnitsValid();
+};
+
+//---------------------------------------------------------------------------------------------------------------------
+inline int VAbstartMeasurementDimension::MinValue() const
+{
+    return m_minValue;
+}
+
+//---------------------------------------------------------------------------------------------------------------------
+inline void VAbstartMeasurementDimension::SetMinValue(int minValue)
+{
+    m_minValue = minValue;
+}
+
+//---------------------------------------------------------------------------------------------------------------------
+inline int VAbstartMeasurementDimension::MaxValue() const
+{
+    return m_maxValue;
+}
+
+//---------------------------------------------------------------------------------------------------------------------
+inline void VAbstartMeasurementDimension::SetMaxValue(int maxValue)
+{
+    m_maxValue = maxValue;
+}
+
+//---------------------------------------------------------------------------------------------------------------------
+inline int VAbstartMeasurementDimension::Step() const
+{
+    return m_step;
+}
+
+//---------------------------------------------------------------------------------------------------------------------
+inline void VAbstartMeasurementDimension::SetStep(int step)
+{
+    m_step = step;
+}
+
+//---------------------------------------------------------------------------------------------------------------------
+inline int VAbstartMeasurementDimension::BaseValue() const
+{
+    return m_baseValue;
+}
+
+//---------------------------------------------------------------------------------------------------------------------
+inline void VAbstartMeasurementDimension::SetBaseValue(int baseValue)
+{
+    m_baseValue = baseValue;
+}
+
+//---------------------------------------------------------------------------------------------------------------------
+inline QString VAbstartMeasurementDimension::Error() const
+{
+    return m_error;
+}
+
+//---------------------------------------------------------------------------------------------------------------------
+inline Unit VAbstartMeasurementDimension::Units() const
+{
+    return m_units;
+}
+
+//---------------------------------------------------------------------------------------------------------------------
+inline bool VAbstartMeasurementDimension::IsCircumference() const
+{
+    return true;
+}
+
+//---------------------------------------------------------------------------------------------------------------------
+inline DimesionLabels VAbstartMeasurementDimension::Labels() const
+{
+    return m_labels;
+}
+
+//---------------------------------------------------------------------------------------------------------------------
+inline void VAbstartMeasurementDimension::SetLabels(const DimesionLabels &labels)
+{
+    m_labels = labels;
+}
+
+// VXMeasurementDimension
+//---------------------------------------------------------------------------------------------------------------------
+class VXMeasurementDimension : public VAbstartMeasurementDimension
+{
+public:
+    VXMeasurementDimension() =default;
+    explicit VXMeasurementDimension(Unit units);
+    VXMeasurementDimension(Unit units, int min, int max, int step);
+
+    virtual MeasurementDimension Type() const override;
+
+    virtual int RangeMin() const override;
+    virtual int RangeMax() const override;
+
+    virtual bool IsCircumference() const override;
+};
+
+//---------------------------------------------------------------------------------------------------------------------
+inline bool VXMeasurementDimension::IsCircumference() const
+{
+    return false;
+}
+
+// VYMeasurementDimension
+//---------------------------------------------------------------------------------------------------------------------
+class VYMeasurementDimension : public VAbstartMeasurementDimension
+{
+public:
+    VYMeasurementDimension() =default;
+    explicit VYMeasurementDimension(Unit units);
+    VYMeasurementDimension(Unit units, int min, int max, int step);
+
+    virtual MeasurementDimension Type() const override;
+
+    virtual int RangeMin() const override;
+    virtual int RangeMax() const override;
+
+    virtual bool IsCircumference() const override;
+    void SetCircumference(bool circumference);
+
+private:
+    bool m_circumference{true};
+};
+
+//---------------------------------------------------------------------------------------------------------------------
+inline bool VYMeasurementDimension::IsCircumference() const
+{
+    return m_circumference;
+}
+
+//---------------------------------------------------------------------------------------------------------------------
+inline void VYMeasurementDimension::SetCircumference(bool circumference)
+{
+    m_circumference = circumference;
+}
+
+// VWMeasurementDimension
+//---------------------------------------------------------------------------------------------------------------------
+class VWMeasurementDimension : public VAbstartMeasurementDimension
+{
+public:
+    VWMeasurementDimension() =default;
+    explicit VWMeasurementDimension(Unit units);
+    VWMeasurementDimension(Unit units, int min, int max, int step);
+
+    virtual MeasurementDimension Type() const override;
+
+    virtual int RangeMin() const override;
+    virtual int RangeMax() const override;
+};
+
+// VZMeasurementDimension
+//---------------------------------------------------------------------------------------------------------------------
+class VZMeasurementDimension : public VAbstartMeasurementDimension
+{
+public:
+    VZMeasurementDimension() =default;
+    explicit VZMeasurementDimension(Unit units);
+    VZMeasurementDimension(Unit units, int min, int max, int step);
+
+    virtual MeasurementDimension Type() const override;
+
+    virtual int RangeMin() const override;
+    virtual int RangeMax() const override;
+};
+
+#endif // VDIMENSIONS_H
diff --git a/src/libs/vformat/vformat.pri b/src/libs/vformat/vformat.pri
index 77773b0b9..50b3cae4c 100644
--- a/src/libs/vformat/vformat.pri
+++ b/src/libs/vformat/vformat.pri
@@ -2,6 +2,7 @@
 # This need for corect working file translations.pro
 
 SOURCES += \
+    $$PWD/vdimensions.cpp \
     $$PWD/vmeasurements.cpp \
     $$PWD/vlabeltemplate.cpp \
     $$PWD/vpatternrecipe.cpp \
@@ -10,6 +11,7 @@ SOURCES += \
 *msvc*:SOURCES += $$PWD/stable.cpp
 
 HEADERS += \
+    $$PWD/vdimensions.h \
     $$PWD/vmeasurements.h \
     $$PWD/stable.h \
     $$PWD/vlabeltemplate.h \
diff --git a/src/libs/vformat/vmeasurements.cpp b/src/libs/vformat/vmeasurements.cpp
index e99373c08..d0da8a185 100644
--- a/src/libs/vformat/vmeasurements.cpp
+++ b/src/libs/vformat/vmeasurements.cpp
@@ -60,8 +60,6 @@ const QString VMeasurements::TagVST              = QStringLiteral("vst");
 const QString VMeasurements::TagVIT              = QStringLiteral("vit");
 const QString VMeasurements::TagBodyMeasurements = QStringLiteral("body-measurements");
 const QString VMeasurements::TagNotes            = QStringLiteral("notes");
-const QString VMeasurements::TagSize             = QStringLiteral("size");
-const QString VMeasurements::TagHeight           = QStringLiteral("height");
 const QString VMeasurements::TagPersonal         = QStringLiteral("personal");
 const QString VMeasurements::TagCustomer         = QStringLiteral("customer");
 const QString VMeasurements::TagBirthDate        = QStringLiteral("birth-date");
@@ -70,22 +68,50 @@ const QString VMeasurements::TagPMSystem         = QStringLiteral("pm_system");
 const QString VMeasurements::TagEmail            = QStringLiteral("email");
 const QString VMeasurements::TagReadOnly         = QStringLiteral("read-only");
 const QString VMeasurements::TagMeasurement      = QStringLiteral("m");
+const QString VMeasurements::TagDimensions       = QStringLiteral("dimensions");
+const QString VMeasurements::TagDimension        = QStringLiteral("dimension");
+const QString VMeasurements::TagRestrictions     = QStringLiteral("restrictions");
+const QString VMeasurements::TagRestriction      = QStringLiteral("restriction");
+const QString VMeasurements::TagCorrections      = QStringLiteral("corrections");
+const QString VMeasurements::TagCorrection       = QStringLiteral("correction");
+const QString VMeasurements::TagLabels           = QStringLiteral("labels");
+const QString VMeasurements::TagLabel            = QStringLiteral("label");
 
-const QString VMeasurements::AttrBase           = QStringLiteral("base");
-const QString VMeasurements::AttrValue          = QStringLiteral("value");
-const QString VMeasurements::AttrSizeIncrease   = QStringLiteral("size_increase");
-const QString VMeasurements::AttrHeightIncrease = QStringLiteral("height_increase");
-const QString VMeasurements::AttrDescription    = QStringLiteral("description");
-const QString VMeasurements::AttrName           = QStringLiteral("name");
-const QString VMeasurements::AttrFullName       = QStringLiteral("full_name");
+const QString VMeasurements::AttrBase              = QStringLiteral("base");
+const QString VMeasurements::AttrValue             = QStringLiteral("value");
+const QString VMeasurements::AttrShiftA            = QStringLiteral("shiftA");
+const QString VMeasurements::AttrShiftB            = QStringLiteral("shiftB");
+const QString VMeasurements::AttrShiftC            = QStringLiteral("shiftC");
+const QString VMeasurements::AttrCorrection        = QStringLiteral("correction");
+const QString VMeasurements::AttrCoordinates       = QStringLiteral("coordinates");
+const QString VMeasurements::AttrSpecialUnits      = QStringLiteral("specialUnits");
+const QString VMeasurements::AttrDescription       = QStringLiteral("description");
+const QString VMeasurements::AttrName              = QStringLiteral("name");
+const QString VMeasurements::AttrFullName          = QStringLiteral("full_name");
+const QString VMeasurements::AttrMin               = QStringLiteral("min");
+const QString VMeasurements::AttrMax               = QStringLiteral("max");
+const QString VMeasurements::AttrStep              = QStringLiteral("step");
+const QString VMeasurements::AttrCircumference     = QStringLiteral("circumference");
+const QString VMeasurements::AttrFullCircumference = QStringLiteral("fullCircumference");
+const QString VMeasurements::AttrLabel             = QStringLiteral("label");
+const QString VMeasurements::AttrDimension         = QStringLiteral("dimension");
 
 const QString VMeasurements::GenderMale    = QStringLiteral("male");
 const QString VMeasurements::GenderFemale  = QStringLiteral("female");
 const QString VMeasurements::GenderUnknown = QStringLiteral("unknown");
 
+const QString VMeasurements::DimensionN    = QStringLiteral("n");
+const QString VMeasurements::DimensionX    = QStringLiteral("x");
+const QString VMeasurements::DimensionY    = QStringLiteral("y");
+const QString VMeasurements::DimensionW    = QStringLiteral("w");
+const QString VMeasurements::DimensionZ    = QStringLiteral("z");
+
 namespace
 {
+using VDimensions = QMap<MeasurementDimension, MeasurementDimension_p>;
+
 Q_GLOBAL_STATIC_WITH_ARGS(const QString, defBirthDate, (QLatin1String("1800-01-01")))
+Q_GLOBAL_STATIC(VDimensions, dimensionsCached)
 
 //---------------------------------------------------------------------------------------------------------------------
 QString FileComment()
@@ -116,14 +142,15 @@ VMeasurements::VMeasurements(Unit unit, VContainer *data)
 }
 
 //---------------------------------------------------------------------------------------------------------------------
-VMeasurements::VMeasurements(Unit unit, int baseSize, int baseHeight, VContainer *data)
+VMeasurements::VMeasurements(Unit unit, const QVector<MeasurementDimension_p > &dimensions,
+                             VContainer *data)
     :VDomDocument(),
-      data(data),
-      type(MeasurementsType::Multisize)
+    data(data),
+    type(MeasurementsType::Multisize)
 {
     SCASSERT(data != nullptr)
 
-    CreateEmptyMultisizeFile(unit, baseSize, baseHeight);
+    CreateEmptyMultisizeFile(unit, dimensions);
 }
 
 //---------------------------------------------------------------------------------------------------------------------
@@ -256,14 +283,19 @@ void VMeasurements::StoreNames(bool store)
 }
 
 //---------------------------------------------------------------------------------------------------------------------
-void VMeasurements::ReadMeasurements(qreal height, qreal size) const
+void VMeasurements::ReadMeasurements(qreal baseA, qreal baseB, qreal baseC) const
 {
     // For conversion values we must first calculate all data in measurement file's unit.
     // That's why we need two containers: one for converted values, second for real data.
 
     // Container for values in measurement file's unit
-    QScopedPointer<VContainer> tempData(new VContainer(data->GetTrVars(), data->GetPatternUnit(),
-                                                       VContainer::UniqueNamespace()));
+    QSharedPointer<VContainer> tempData;
+
+    if (type == MeasurementsType::Individual)
+    {
+        tempData = QSharedPointer<VContainer>::create(data->GetTrVars(), data->GetPatternUnit(),
+                                                      VContainer::UniqueNamespace());
+    }
 
     const QDomNodeList list = elementsByTagName(TagMeasurement);
     for (int i=0; i < list.size(); ++i)
@@ -273,55 +305,104 @@ void VMeasurements::ReadMeasurements(qreal height, qreal size) const
         const QString name = GetParametrString(dom, AttrName).simplified();
         const QString description = GetParametrEmptyString(dom, AttrDescription);
         const QString fullName = GetParametrEmptyString(dom, AttrFullName);
+        const bool specialUnits = GetParametrBool(dom, AttrSpecialUnits, falseStr);
 
         QSharedPointer<VMeasurement> meash;
         QSharedPointer<VMeasurement> tempMeash;
         if (type == MeasurementsType::Multisize)
         {
             qreal base = GetParametrDouble(dom, AttrBase, QChar('0'));
-            qreal ksize = GetParametrDouble(dom, AttrSizeIncrease, QChar('0'));
-            qreal kheight = GetParametrDouble(dom, AttrHeightIncrease, QChar('0'));
+            qreal shiftA = GetParametrDouble(dom, AttrShiftA, QChar('0'));
+            qreal shiftB = GetParametrDouble(dom, AttrShiftB, QChar('0'));
+            qreal shiftC = GetParametrDouble(dom, AttrShiftC, QChar('0'));
+            QMap<QString, qreal> corrections = ReadCorrections(dom);
 
-            tempMeash = QSharedPointer<VMeasurement>(new VMeasurement(static_cast<quint32>(i), name, BaseSize(),
-                                                                      BaseHeight(), base, ksize, kheight));
-            tempMeash->SetSize(size);
-            tempMeash->SetHeight(height);
-            tempMeash->SetUnit(data->GetPatternUnit());
+            qreal convertedBaseA = DimensionABase();
+            qreal convertedBaseB = DimensionBBase();
+            qreal convertedBaseC = DimensionCBase();
+            qreal convertedStepA = DimensionAStep();
+            qreal convertedStepB = DimensionBStep();
+            qreal convertedStepC = DimensionCStep();
 
-            base = UnitConvertor(base, MUnit(), *data->GetPatternUnit());
-            ksize = UnitConvertor(ksize, MUnit(), *data->GetPatternUnit());
-            kheight = UnitConvertor(kheight, MUnit(), *data->GetPatternUnit());
+            if (not specialUnits)
+            {
+                base = UnitConvertor(base, MUnit(), *data->GetPatternUnit());
+                shiftA = UnitConvertor(shiftA, MUnit(), *data->GetPatternUnit());
+                shiftB = UnitConvertor(shiftB, MUnit(), *data->GetPatternUnit());
+                shiftC = UnitConvertor(shiftC, MUnit(), *data->GetPatternUnit());
 
-            const qreal baseSize = UnitConvertor(BaseSize(), MUnit(), *data->GetPatternUnit());
-            const qreal baseHeight = UnitConvertor(BaseHeight(), MUnit(), *data->GetPatternUnit());
+                QMutableMapIterator<QString, qreal> iterator(corrections);
+                while (iterator.hasNext())
+                {
+                    iterator.next();
+                    iterator.setValue(UnitConvertor(iterator.value(), MUnit(), *data->GetPatternUnit()));
+                }
 
-            meash = QSharedPointer<VMeasurement>(new VMeasurement(static_cast<quint32>(i), name, baseSize, baseHeight,
-                                                                  base, ksize, kheight, fullName, description));
-            meash->SetSize(size);
-            meash->SetHeight(height);
-            meash->SetUnit(data->GetPatternUnit());
+                convertedBaseA = UnitConvertor(convertedBaseA, MUnit(), *data->GetPatternUnit());
+                convertedBaseB = UnitConvertor(convertedBaseB, MUnit(), *data->GetPatternUnit());
+                convertedBaseC = UnitConvertor(convertedBaseC, MUnit(), *data->GetPatternUnit());
+
+                convertedStepA = UnitConvertor(convertedStepA, MUnit(), *data->GetPatternUnit());
+                convertedStepB = UnitConvertor(convertedStepB, MUnit(), *data->GetPatternUnit());
+                convertedStepC = UnitConvertor(convertedStepC, MUnit(), *data->GetPatternUnit());
+            }
+
+            meash = QSharedPointer<VMeasurement>::create(static_cast<quint32>(i), name,
+                                                         convertedBaseA, convertedBaseB, convertedBaseC, base);
+            meash->SetBaseA(baseA);
+            meash->SetBaseB(baseB);
+            meash->SetBaseC(baseC);
+
+            meash->SetShiftA(shiftA);
+            meash->SetShiftB(shiftB);
+            meash->SetShiftC(shiftC);
+
+            meash->SetStepA(convertedStepA);
+            meash->SetStepB(convertedStepB);
+            meash->SetStepC(convertedStepC);
+
+            meash->SetSpecialUnits(specialUnits);
+            meash->SetCorrections(corrections);
+            meash->SetGuiText(fullName);
+            meash->SetDescription(description);
         }
         else
         {
+            const IMD dimension =
+                VMeasurements::StrToIMD(GetParametrString(dom, AttrDimension, VMeasurements::IMDToStr(IMD::N)));
             const QString formula = GetParametrString(dom, AttrValue, QChar('0'));
             bool ok = false;
             qreal value = EvalFormula(tempData.data(), formula, &ok);
 
-            tempMeash = QSharedPointer<VMeasurement>(new VMeasurement(tempData.data(), static_cast<quint32>(i), name,
-                                                                      value, formula, ok));
+            tempMeash = QSharedPointer<VMeasurement>::create(tempData.data(), static_cast<quint32>(i), name, value,
+                                                             formula, ok);
 
-            value = UnitConvertor(value, MUnit(), *data->GetPatternUnit());
-            meash = QSharedPointer<VMeasurement>(new VMeasurement(data, static_cast<quint32>(i), name, value, formula,
-                                                                  ok, fullName, description));
+            if (not specialUnits)
+            {
+                value = UnitConvertor(value, MUnit(), *data->GetPatternUnit());
+            }
+
+            meash = QSharedPointer<VMeasurement>::create(data, static_cast<quint32>(i), name, value, formula, ok);
+            meash->SetGuiText(fullName);
+            meash->SetDescription(description);
+            meash->SetSpecialUnits(specialUnits);
+            meash->SetDimension(dimension);
         }
+
         if (m_keepNames)
         {
-            tempData->AddUniqueVariable(tempMeash);
+            if (not tempData.isNull())
+            {
+                tempData->AddUniqueVariable(tempMeash);
+            }
             data->AddUniqueVariable(meash);
         }
         else
         {
-            tempData->AddVariable(tempMeash);
+            if (not tempData.isNull())
+            {
+                tempData->AddVariable(tempMeash);
+            }
             data->AddVariable(meash);
         }
     }
@@ -352,29 +433,93 @@ MeasurementsType VMeasurements::Type() const
 }
 
 //---------------------------------------------------------------------------------------------------------------------
-int VMeasurements::BaseSize() const
+int VMeasurements::DimensionABase() const
 {
     if (type == MeasurementsType::Multisize)
     {
-        return static_cast<int>(UniqueTagAttr(TagSize, AttrBase, 50));
-    }
-    else
-    {
-        return 0;
+        const auto dimensions = Dimensions();
+        if (not dimensions.isEmpty())
+        {
+            return dimensions.first()->BaseValue();
+        }
     }
+
+    return 0;
 }
 
 //---------------------------------------------------------------------------------------------------------------------
-int VMeasurements::BaseHeight() const
+int VMeasurements::DimensionBBase() const
 {
     if (type == MeasurementsType::Multisize)
     {
-        return static_cast<int>(UniqueTagAttr(TagHeight, AttrBase, 176));
+        const auto dimensions = Dimensions();
+        if (not dimensions.isEmpty() && dimensions.size() >= 2)
+        {
+            return dimensions.values().at(1)->BaseValue();
+        }
     }
-    else
+
+    return 0;
+}
+
+//---------------------------------------------------------------------------------------------------------------------
+int VMeasurements::DimensionCBase() const
+{
+    if (type == MeasurementsType::Multisize)
     {
-        return 0;
+        const auto dimensions = Dimensions();
+        if (not dimensions.isEmpty() && dimensions.size() == 3)
+        {
+            return dimensions.last()->BaseValue();
+        }
     }
+
+    return 0;
+}
+
+//---------------------------------------------------------------------------------------------------------------------
+int VMeasurements::DimensionAStep() const
+{
+    if (type == MeasurementsType::Multisize)
+    {
+        const auto dimensions = Dimensions();
+        if (not dimensions.isEmpty())
+        {
+            return dimensions.first()->Step();
+        }
+    }
+
+    return 0;
+}
+
+//---------------------------------------------------------------------------------------------------------------------
+int VMeasurements::DimensionBStep() const
+{
+    if (type == MeasurementsType::Multisize)
+    {
+        const auto dimensions = Dimensions();
+        if (not dimensions.isEmpty() && dimensions.size() >= 2)
+        {
+            return dimensions.values().at(1)->Step();
+        }
+    }
+
+    return 0;
+}
+
+//---------------------------------------------------------------------------------------------------------------------
+int VMeasurements::DimensionCStep() const
+{
+    if (type == MeasurementsType::Multisize)
+    {
+        const auto dimensions = Dimensions();
+        if (not dimensions.isEmpty() && dimensions.size() == 3)
+        {
+            return dimensions.last()->Step();
+        }
+    }
+
+    return 0;
 }
 
 //---------------------------------------------------------------------------------------------------------------------
@@ -479,6 +624,36 @@ void VMeasurements::SetReadOnly(bool ro)
     setTagText(TagReadOnly, ro ? trueStr : falseStr);
 }
 
+//---------------------------------------------------------------------------------------------------------------------
+bool VMeasurements::IsFullCircumference() const
+{
+    QDomElement dimenstionsTag = documentElement().firstChildElement(TagDimensions);
+    if (not dimenstionsTag.isNull())
+    {
+        return GetParametrBool(dimenstionsTag, AttrFullCircumference, falseStr);
+    }
+    else
+    {
+        qDebug()<<"Can't read full circumference "<<Q_FUNC_INFO;
+    }
+
+    return false;
+}
+
+//---------------------------------------------------------------------------------------------------------------------
+void VMeasurements::SetFullCircumference(bool fc)
+{
+    QDomElement dimenstionsTag = documentElement().firstChildElement(TagDimensions);
+    if (not dimenstionsTag.isNull())
+    {
+        SetAttributeOrRemoveIf(dimenstionsTag, AttrFullCircumference, fc, not fc);
+    }
+    else
+    {
+        qDebug()<<"Can't save full circumference "<<Q_FUNC_INFO;
+    }
+}
+
 //---------------------------------------------------------------------------------------------------------------------
 void VMeasurements::SetMName(const QString &name, const QString &text)
 {
@@ -522,12 +697,12 @@ void VMeasurements::SetMBaseValue(const QString &name, double value)
 }
 
 //---------------------------------------------------------------------------------------------------------------------
-void VMeasurements::SetMSizeIncrease(const QString &name, double value)
+void VMeasurements::SetMShiftA(const QString &name, double value)
 {
     QDomElement node = FindM(name);
     if (not node.isNull())
     {
-        SetAttribute(node, AttrSizeIncrease, value);
+        SetAttribute(node, AttrShiftA, value);
     }
     else
     {
@@ -536,12 +711,69 @@ void VMeasurements::SetMSizeIncrease(const QString &name, double value)
 }
 
 //---------------------------------------------------------------------------------------------------------------------
-void VMeasurements::SetMHeightIncrease(const QString &name, double value)
+void VMeasurements::SetMShiftB(const QString &name, double value)
 {
     QDomElement node = FindM(name);
     if (not node.isNull())
     {
-        SetAttribute(node, AttrHeightIncrease, value);
+        SetAttribute(node, AttrShiftB, value);
+    }
+    else
+    {
+        qWarning() << tr("Can't find measurement '%1'").arg(name);
+    }
+}
+
+//---------------------------------------------------------------------------------------------------------------------
+void VMeasurements::SetMShiftC(const QString &name, double value)
+{
+    QDomElement node = FindM(name);
+    if (not node.isNull())
+    {
+        SetAttribute(node, AttrShiftC, value);
+    }
+    else
+    {
+        qWarning() << tr("Can't find measurement '%1'").arg(name);
+    }
+}
+
+//---------------------------------------------------------------------------------------------------------------------
+void VMeasurements::SetMSpecialUnits(const QString &name, bool special)
+{
+    QDomElement node = FindM(name);
+    if (not node.isNull())
+    {
+        SetAttributeOrRemoveIf(node, AttrSpecialUnits, special, not special);
+    }
+    else
+    {
+        qWarning() << tr("Can't find measurement '%1'").arg(name);
+    }
+}
+
+//---------------------------------------------------------------------------------------------------------------------
+void VMeasurements::SetMCorrectionValue(const QString &name, qreal baseA, qreal baseB, qreal baseC, double value)
+{
+    QDomElement mElement = FindM(name);
+    if (not mElement.isNull())
+    {
+        QMap<QString, qreal> corrections = ReadCorrections(mElement);
+        const QString hash = VMeasurement::CorrectionHash(baseA, baseB, baseC);
+
+        if (not qFuzzyIsNull(value))
+        {
+            corrections.insert(hash, value);
+        }
+        else
+        {
+            if (corrections.contains(hash))
+            {
+                corrections.remove(hash);
+            }
+        }
+
+        WriteCorrections(mElement, corrections);
     }
     else
     {
@@ -577,6 +809,172 @@ void VMeasurements::SetMFullName(const QString &name, const QString &text)
     }
 }
 
+//---------------------------------------------------------------------------------------------------------------------
+void VMeasurements::SetMDimension(const QString &name, IMD type)
+{
+    ClearDimension(type);
+    QDomElement node = FindM(name);
+    if (not node.isNull())
+    {
+        SetAttributeOrRemoveIf(node, AttrDimension, VMeasurements::IMDToStr(type), type == IMD::N);
+    }
+    else
+    {
+        qWarning() << tr("Can't find measurement '%1'").arg(name);
+    }
+}
+
+//---------------------------------------------------------------------------------------------------------------------
+QString VMeasurements::MeasurementForDimension(IMD type) const
+{
+    const QString d = VMeasurements::IMDToStr(type);
+    QDomNodeList list = elementsByTagName(TagMeasurement);
+
+    for (int i=0; i < list.size(); ++i)
+    {
+        const QDomElement domElement = list.at(i).toElement();
+        if (domElement.isNull() == false)
+        {
+            if (domElement.attribute(AttrDimension) == d)
+            {
+                return domElement.attribute(AttrName);
+            }
+        }
+    }
+    return QString();
+}
+
+//---------------------------------------------------------------------------------------------------------------------
+QMap<MeasurementDimension, MeasurementDimension_p > VMeasurements::Dimensions() const
+{
+    if (type != MeasurementsType::Multisize)
+    {
+        return QMap<MeasurementDimension, MeasurementDimension_p>();
+    }
+
+    if (dimensionsCached->isEmpty())
+    {
+        const Unit units = MUnit();
+        const QDomNodeList list = elementsByTagName(TagDimension);
+        for (int i=0; i < list.size(); ++i)
+        {
+            const QDomElement dom = list.at(i).toElement();
+            const MeasurementDimension type = StrToDimensionType(GetParametrString(dom, AttrType));
+            const int min = GetParametrInt(dom, AttrMin, QChar('0'));
+            const int max = GetParametrInt(dom, AttrMax, QChar('0'));
+            const int step = GetParametrInt(dom, AttrStep, QString("-1"));
+            const int base = GetParametrInt(dom, AttrBase, QChar('0'));
+
+            const DimesionLabels labels = ReadDimensionLabels(dom);
+
+            if (type == MeasurementDimension::X)
+            {
+                auto dimension = QSharedPointer<VXMeasurementDimension>::create(units, min, max, step);
+                dimension->SetBaseValue(base);
+                dimension->SetLabels(labels);
+                dimensionsCached->insert(type, dimension);
+            }
+            else if (type == MeasurementDimension::Y)
+            {
+                auto dimension = QSharedPointer<VYMeasurementDimension>::create(units, min, max, step);
+                dimension->SetBaseValue(base);
+                dimension->SetCircumference(GetParametrBool(dom, AttrCircumference, trueStr));
+                dimension->SetLabels(labels);
+                dimensionsCached->insert(type, dimension);
+            }
+            else if (type == MeasurementDimension::W)
+            {
+                auto dimension = QSharedPointer<VWMeasurementDimension>::create(units, min, max, step);
+                dimension->SetBaseValue(base);
+                dimension->SetLabels(labels);
+                dimensionsCached->insert(type, dimension);
+            }
+            else if (type == MeasurementDimension::Z)
+            {
+                auto dimension = QSharedPointer<VZMeasurementDimension>::create(units, min, max, step);
+                dimension->SetBaseValue(base);
+                dimension->SetLabels(labels);
+                dimensionsCached->insert(type, dimension);
+            }
+        }
+    }
+
+    return *dimensionsCached;
+}
+
+//---------------------------------------------------------------------------------------------------------------------
+QMap<QString, QPair<int, int> > VMeasurements::GetRestrictions() const
+{
+    QMap<QString, QPair<int, int> > restrictions;
+
+    const QDomNodeList list = elementsByTagName(TagRestriction);
+    for (int i=0; i < list.size(); ++i)
+    {
+        const QDomElement res = list.at(i).toElement();
+
+        QString coordinates = GetParametrString(res, AttrCoordinates);
+        const int min = GetParametrInt(res, AttrMin, QChar('0'));
+        const int max = GetParametrInt(res, AttrMax, QChar('0'));
+
+        restrictions.insert(coordinates, qMakePair(min, max));
+    }
+
+    return restrictions;
+}
+
+//---------------------------------------------------------------------------------------------------------------------
+void VMeasurements::SetRestrictions(const QMap<QString, QPair<int, int> > &restrictions)
+{
+    QDomElement root = documentElement();
+    QDomElement restrictionsTag = root.firstChildElement(TagRestrictions);
+
+    if (restrictionsTag.isNull())
+    {
+        qDebug() << "Can't find restrictions tag";
+    }
+
+    RemoveAllChildren(restrictionsTag);
+
+    QMap<QString, QPair<int, int> >::const_iterator i = restrictions.constBegin();
+    while (i != restrictions.constEnd())
+    {
+        QDomElement restrictionTag = createElement(TagRestriction);
+
+        SetAttribute(restrictionTag, AttrCoordinates, i.key());
+        SetAttribute(restrictionTag, AttrMin, i.value().first);
+        SetAttribute(restrictionTag, AttrMax, i.value().second);
+
+        restrictionsTag.appendChild(restrictionTag);
+        ++i;
+    }
+}
+
+//---------------------------------------------------------------------------------------------------------------------
+QPair<int, int> VMeasurements::Restriction(int base, int base2) const
+{
+    const QMap<QString, QPair<int, int> > restrictions = GetRestrictions();
+    const QString hash = VMeasurement::CorrectionHash(base, base2, 0);
+    return restrictions.value(hash, QPair<int, int>(0, 0));
+}
+
+//---------------------------------------------------------------------------------------------------------------------
+void VMeasurements::SetDimensionLabels(const QMap<MeasurementDimension, DimesionLabels> &labels)
+{
+    const QDomNodeList list = elementsByTagName(TagDimension);
+    for (int i=0; i < list.size(); ++i)
+    {
+        QDomElement dom = list.at(i).toElement();
+        const MeasurementDimension type = StrToDimensionType(GetParametrString(dom, AttrType));
+
+        if (labels.contains(type))
+        {
+            SaveDimesionLabels(dom, labels.value(type));
+        }
+    }
+
+    dimensionsCached->clear(); // Invalidate cache
+}
+
 //---------------------------------------------------------------------------------------------------------------------
 QString VMeasurements::GenderToStr(const GenderType &sex)
 {
@@ -608,6 +1006,100 @@ GenderType VMeasurements::StrToGender(const QString &sex)
     }
 }
 
+//---------------------------------------------------------------------------------------------------------------------
+QString VMeasurements::DimensionTypeToStr(const MeasurementDimension &type)
+{
+    switch (type)
+    {
+        case MeasurementDimension::Y:
+            return DimensionY;
+        case MeasurementDimension::W:
+            return DimensionW;
+        case MeasurementDimension::Z:
+            return DimensionZ;
+        case MeasurementDimension::X:
+        default:
+            return DimensionX;
+    }
+}
+
+//---------------------------------------------------------------------------------------------------------------------
+MeasurementDimension VMeasurements::StrToDimensionType(const QString &type)
+{
+    const QStringList dimensions = QStringList{DimensionX, DimensionY, DimensionW, DimensionZ};
+    switch (dimensions.indexOf(type))
+    {
+        case 1: // DimensionY
+            return MeasurementDimension::Y;
+        case 2: // DimensionW
+            return MeasurementDimension::W;
+        case 3: // DimensionZ
+            return MeasurementDimension::Z;
+        case 0: // DimensionX
+        default:
+            return MeasurementDimension::X;
+    }
+}
+
+//---------------------------------------------------------------------------------------------------------------------
+QString VMeasurements::IMDToStr(const IMD &type)
+{
+    switch (type)
+    {
+        case IMD::X:
+            return DimensionX;
+        case IMD::Y:
+            return DimensionY;
+        case IMD::W:
+            return DimensionW;
+        case IMD::Z:
+            return DimensionZ;
+        case IMD::N:
+        default:
+            return DimensionN;
+    }
+}
+
+//---------------------------------------------------------------------------------------------------------------------
+IMD VMeasurements::StrToIMD(const QString &type)
+{
+    const QStringList dimensions = QStringList{DimensionN, DimensionX, DimensionY, DimensionW, DimensionZ};
+    switch (dimensions.indexOf(type))
+    {
+        case 1: // DimensionX
+            return IMD::X;
+        case 2: // DimensionY
+            return IMD::Y;
+        case 3: // DimensionW
+            return IMD::W;
+        case 4: // DimensionZ
+            return IMD::Z;
+        case 0: // DimensionN
+        default:
+            return IMD::N;
+    }
+}
+
+//---------------------------------------------------------------------------------------------------------------------
+QString VMeasurements::IMDName(IMD type)
+{
+    switch(type)
+    {
+        case IMD::N:
+            return tr("None");
+        case IMD::X:
+            return tr("Height");
+        case IMD::Y:
+            return tr("Size");
+        case IMD::W:
+            return tr("Hip");
+        case IMD::Z:
+            return tr("Waist");
+        default:
+            return QString();
+    }
+}
+
 //---------------------------------------------------------------------------------------------------------------------
 QStringList VMeasurements::ListAll() const
 {
@@ -672,7 +1164,8 @@ VContainer *VMeasurements::GetData() const
 }
 
 //---------------------------------------------------------------------------------------------------------------------
-void VMeasurements::CreateEmptyMultisizeFile(Unit unit, int baseSize, int baseHeight)
+void VMeasurements::CreateEmptyMultisizeFile(Unit unit,
+                                             const QVector<MeasurementDimension_p > &dimensions)
 {
     this->clear();
     QDomElement mElement = this->createElement(TagVST);
@@ -683,15 +1176,8 @@ void VMeasurements::CreateEmptyMultisizeFile(Unit unit, int baseSize, int baseHe
     mElement.appendChild(createElement(TagNotes));
     mElement.appendChild(CreateElementWithText(TagUnit, UnitsToStr(unit)));
     mElement.appendChild(CreateElementWithText(TagPMSystem, ClearPMCode(p998_S)));
-
-    QDomElement size = createElement(TagSize);
-    SetAttribute(size, AttrBase, QString().setNum(baseSize));
-    mElement.appendChild(size);
-
-    QDomElement height = createElement(TagHeight);
-    SetAttribute(height, AttrBase, QString().setNum(baseHeight));
-    mElement.appendChild(height);
-
+    mElement.appendChild(CreateDimensions(dimensions));
+    mElement.appendChild(createElement(TagRestrictions));
     mElement.appendChild(createElement(TagBodyMeasurements));
 
     this->appendChild(mElement);
@@ -727,6 +1213,32 @@ void VMeasurements::CreateEmptyIndividualFile(Unit unit)
                                              QStringLiteral("version=\"1.0\" encoding=\"UTF-8\"")), this->firstChild());
 }
 
+//---------------------------------------------------------------------------------------------------------------------
+QDomElement VMeasurements::CreateDimensions(const QVector<MeasurementDimension_p > &dimensions)
+{
+    QDomElement dimensionsTag = createElement(TagDimensions);
+
+    for(auto &dimension : dimensions)
+    {
+        QDomElement dimensionTag = createElement(TagDimension);
+
+        SetAttribute(dimensionTag, AttrType, DimensionTypeToStr(dimension->Type()));
+        SetAttribute(dimensionTag, AttrBase, dimension->BaseValue());
+        SetAttribute(dimensionTag, AttrMin, dimension->MinValue());
+        SetAttribute(dimensionTag, AttrMax, dimension->MaxValue());
+        SetAttribute(dimensionTag, AttrStep, dimension->Step());
+
+        if (dimension->Type() == MeasurementDimension::Y)
+        {
+            SetAttribute(dimensionTag, AttrCircumference, dimension->IsCircumference());
+        }
+
+        dimensionsTag.appendChild(dimensionTag);
+    }
+
+    return dimensionsTag;
+}
+
 //---------------------------------------------------------------------------------------------------------------------
 qreal VMeasurements::UniqueTagAttr(const QString &tag, const QString &attr, qreal defValue) const
 {
@@ -762,8 +1274,7 @@ QDomElement VMeasurements::MakeEmpty(const QString &name, const QString &formula
     if (type == MeasurementsType::Multisize)
     {
         SetAttribute(element, AttrBase, QChar('0'));
-        SetAttribute(element, AttrSizeIncrease, QChar('0'));
-        SetAttribute(element, AttrHeightIncrease, QChar('0'));
+        SetAttribute(element, AttrShiftA, QChar('0'));
     }
     else
     {
@@ -856,3 +1367,173 @@ QString VMeasurements::ClearPMCode(const QString &code) const
     }
     return clear;
 }
+
+//---------------------------------------------------------------------------------------------------------------------
+QMap<QString, qreal> VMeasurements::ReadCorrections(const QDomElement &mElement) const
+{
+    if (mElement.isNull())
+    {
+        return QMap<QString, qreal>();
+    }
+
+    QDomElement correctionsTag = mElement.firstChildElement(TagCorrections);
+    if (correctionsTag.isNull())
+    {
+        return QMap<QString, qreal>();
+    }
+
+    QMap<QString, qreal> corrections;
+
+    QDomNode correctionTag = correctionsTag.firstChild();
+    while (not correctionTag.isNull())
+    {
+        if (correctionTag.isElement())
+        {
+            const QDomElement c = correctionTag.toElement();
+            const QString hash = GetParametrString(c, AttrCoordinates);
+            const qreal correction = GetParametrDouble(c, AttrCorrection, QChar('0'));
+
+            corrections.insert(hash, correction);
+        }
+        correctionTag = correctionTag.nextSibling();
+    }
+
+    return corrections;
+}
+
+//---------------------------------------------------------------------------------------------------------------------
+void VMeasurements::WriteCorrections(QDomElement &mElement, const QMap<QString, qreal> &corrections)
+{
+    QDomElement correctionsTag = mElement.firstChildElement(TagCorrections);
+    if (not corrections.isEmpty())
+    {
+        if (not correctionsTag.isNull())
+        {
+            RemoveAllChildren(correctionsTag);
+        }
+        else
+        {
+            correctionsTag = createElement(TagCorrections);
+            mElement.appendChild(correctionsTag);
+        }
+
+        QMap<QString, qreal>::const_iterator i = corrections.constBegin();
+        while (i != corrections.constEnd())
+        {
+            QDomElement correctionTag = createElement(TagCorrection);
+
+            SetAttribute(correctionTag, AttrCorrection, i.value());
+            SetAttribute(correctionTag, AttrCoordinates, i.key());
+
+            correctionsTag.appendChild(correctionTag);
+            ++i;
+        }
+    }
+    else
+    {
+        if (not correctionsTag.isNull())
+        {
+            mElement.removeChild(correctionsTag);
+        }
+    }
+}
+
+//---------------------------------------------------------------------------------------------------------------------
+void VMeasurements::SaveDimesionLabels(QDomElement &dElement, const DimesionLabels &labels)
+{
+    if (dElement.isNull())
+    {
+        qDebug() << "Invalid dimension tag";
+    }
+
+    QDomElement labelsTag = dElement.firstChildElement(TagLabels);
+    if (not labels.isEmpty())
+    {
+        if (not labelsTag.isNull())
+        {
+            RemoveAllChildren(labelsTag);
+        }
+        else
+        {
+            labelsTag = createElement(TagLabels);
+            dElement.appendChild(labelsTag);
+        }
+
+        DimesionLabels::const_iterator i = labels.constBegin();
+        while (i != labels.constEnd())
+        {
+            if (not i.value().isEmpty())
+            {
+                QDomElement labelTag = createElement(TagLabel);
+
+                SetAttribute(labelTag, AttrValue, i.key());
+                SetAttribute(labelTag, AttrLabel, i.value());
+
+                labelsTag.appendChild(labelTag);
+            }
+            ++i;
+        }
+    }
+    else
+    {
+        if (not labelsTag.isNull())
+        {
+            dElement.removeChild(labelsTag);
+        }
+    }
+}
+
+//---------------------------------------------------------------------------------------------------------------------
+DimesionLabels VMeasurements::ReadDimensionLabels(const QDomElement &dElement) const
+{
+    if (dElement.isNull())
+    {
+        return DimesionLabels();
+    }
+
+    QDomElement labelsTag = dElement.firstChildElement(TagLabels);
+    if (labelsTag.isNull())
+    {
+        return DimesionLabels();
+    }
+
+    DimesionLabels labels;
+
+    QDomNode labelTag = labelsTag.firstChild();
+    while (not labelTag.isNull())
+    {
+        if (labelTag.isElement())
+        {
+            const QDomElement l = labelTag.toElement();
+            const int value = GetParametrInt(l, AttrValue, QChar('0'));
+            const QString label = GetParametrEmptyString(l, AttrLabel);
+
+            if (value > 0 && not label.isEmpty())
+            {
+                labels.insert(value, label);
+            }
+        }
+        labelTag = labelTag.nextSibling();
+    }
+
+    return labels;
+}
+
+//---------------------------------------------------------------------------------------------------------------------
+void VMeasurements::ClearDimension(IMD type)
+{
+    const QString d = VMeasurements::IMDToStr(type);
+    QDomNodeList list = elementsByTagName(TagMeasurement);
+
+    for (int i=0; i < list.size(); ++i)
+    {
+        QDomElement domElement = list.at(i).toElement();
+        if (domElement.isNull() == false)
+        {
+            if (domElement.attribute(AttrDimension) == d)
+            {
+                domElement.removeAttribute(AttrDimension);
+            }
+        }
+    }
+}
diff --git a/src/libs/vformat/vmeasurements.h b/src/libs/vformat/vmeasurements.h
index 277470b9b..b8415e621 100644
--- a/src/libs/vformat/vmeasurements.h
+++ b/src/libs/vformat/vmeasurements.h
@@ -38,6 +38,7 @@
 
 #include "../ifc/xml/vdomdocument.h"
 #include "../vmisc/def.h"
+#include "vdimensions.h"
 
 class VContainer;
 
@@ -49,7 +50,8 @@ class VMeasurements : public VDomDocument
 public:
     explicit VMeasurements(VContainer *data);
     VMeasurements(Unit unit, VContainer *data);
-    VMeasurements(Unit unit, int baseSize, int baseHeight, VContainer *data);
+    VMeasurements(Unit unit, const QVector<MeasurementDimension_p > &dimensions,
+                  VContainer *data);
     virtual ~VMeasurements() Q_DECL_EQ_DEFAULT;
 
     virtual void setXMLContent(const QString &fileName) override;
@@ -65,12 +67,17 @@ public:
 
     void StoreNames(bool store);
 
-    void ReadMeasurements(qreal height, qreal size) const;
+    void ReadMeasurements(qreal baseA, qreal baseB=0, qreal baseC=0) const;
     void ClearForExport();
 
     MeasurementsType Type() const;
-    int BaseSize() const;
-    int BaseHeight() const;
+    int DimensionABase() const;
+    int DimensionBBase() const;
+    int DimensionCBase() const;
+
+    int DimensionAStep() const;
+    int DimensionBStep() const;
+    int DimensionCStep() const;
 
     QString Notes() const;
     void    SetNotes(const QString &text);
@@ -82,7 +89,7 @@ public:
     void    SetBirthDate(const QDate &date);
 
     GenderType Gender() const;
-    void    SetGender(const GenderType &gender);
+    void       SetGender(const GenderType &gender);
 
     QString PMSystem() const;
     void    SetPMSystem(const QString &system);
@@ -93,20 +100,36 @@ public:
     bool    IsReadOnly() const;
     void    SetReadOnly(bool ro);
 
+    bool    IsFullCircumference() const;
+    void    SetFullCircumference(bool fc);
+
     void SetMName(const QString &name, const QString &text);
     void SetMValue(const QString &name, const QString &text);
     void SetMBaseValue(const QString &name, double value);
-    void SetMSizeIncrease(const QString &name, double value);
-    void SetMHeightIncrease(const QString &name, double value);
+    void SetMShiftA(const QString &name, double value);
+    void SetMShiftB(const QString &name, double value);
+    void SetMShiftC(const QString &name, double value);
+    void SetMSpecialUnits(const QString &name, bool special);
+    void SetMCorrectionValue(const QString &name, qreal baseA, qreal baseB, qreal baseC, double value);
     void SetMDescription(const QString &name, const QString &text);
     void SetMFullName(const QString &name, const QString &text);
+    void SetMDimension(const QString &name, IMD type);
+
+    QString MeasurementForDimension(IMD type) const;
+
+    QMap<MeasurementDimension, MeasurementDimension_p > Dimensions() const;
+
+    QMap<QString, QPair<int, int> > GetRestrictions() const;
+    void                            SetRestrictions(const QMap<QString, QPair<int, int> > &restrictions);
+
+    QPair<int, int> Restriction(int base, int base2=0) const;
+
+    void SetDimensionLabels(const QMap<MeasurementDimension, DimesionLabels> &labels);
 
     static const QString TagVST;
     static const QString TagVIT;
     static const QString TagBodyMeasurements;
     static const QString TagNotes;
-    static const QString TagSize;
-    static const QString TagHeight;
     static const QString TagPersonal;
     static const QString TagCustomer;
     static const QString TagBirthDate;
@@ -115,22 +138,55 @@ public:
     static const QString TagEmail;
     static const QString TagReadOnly;
     static const QString TagMeasurement;
+    static const QString TagDimensions;
+    static const QString TagDimension;
+    static const QString TagRestrictions;
+    static const QString TagRestriction;
+    static const QString TagCorrections;
+    static const QString TagCorrection;
+    static const QString TagLabels;
+    static const QString TagLabel;
 
     static const QString AttrBase;
     static const QString AttrValue;
-    static const QString AttrSizeIncrease;
-    static const QString AttrHeightIncrease;
+    static const QString AttrShiftA;
+    static const QString AttrShiftB;
+    static const QString AttrShiftC;
+    static const QString AttrCorrection;
+    static const QString AttrCoordinates;
+    static const QString AttrSpecialUnits;
     static const QString AttrDescription;
     static const QString AttrName;
     static const QString AttrFullName;
+    static const QString AttrMin;
+    static const QString AttrMax;
+    static const QString AttrStep;
+    static const QString AttrCircumference;
+    static const QString AttrFullCircumference;
+    static const QString AttrLabel;
+    static const QString AttrDimension;
 
     static const QString GenderMale;
     static const QString GenderFemale;
     static const QString GenderUnknown;
 
+    static const QString DimensionN;
+    static const QString DimensionX;
+    static const QString DimensionY;
+    static const QString DimensionW;
+    static const QString DimensionZ;
+
     static QString GenderToStr(const GenderType &sex);
     static GenderType StrToGender(const QString &sex);
 
+    static QString DimensionTypeToStr(const MeasurementDimension &type);
+    static MeasurementDimension StrToDimensionType(const QString &type);
+
+    static QString IMDToStr(const IMD &type);
+    static IMD StrToIMD(const QString &type);
+
+    static QString IMDName(IMD type);
+
     QStringList ListAll() const;
     QStringList ListKnown() const;
 
@@ -148,9 +204,11 @@ private:
     /** @brief m_keepNames store names in container to check uniqueness. */
     bool m_keepNames{true};
 
-    void CreateEmptyMultisizeFile(Unit unit, int baseSize, int baseHeight);
+    void CreateEmptyMultisizeFile(Unit unit, const QVector<MeasurementDimension_p > &dimensions);
     void CreateEmptyIndividualFile(Unit unit);
 
+    QDomElement CreateDimensions(const QVector<MeasurementDimension_p > &dimensions);
+
     qreal UniqueTagAttr(const QString &tag, const QString &attr, qreal defValue) const;
 
     QDomElement MakeEmpty(const QString &name, const QString &formula);
@@ -160,6 +218,14 @@ private:
     qreal EvalFormula(VContainer *data, const QString &formula, bool *ok) const;
 
     QString ClearPMCode(const QString &code) const;
+
+    QMap<QString, qreal> ReadCorrections(const QDomElement &mElement) const;
+    void                 WriteCorrections(QDomElement &mElement, const QMap<QString, qreal> &corrections);
+
+    void           SaveDimesionLabels(QDomElement &dElement, const DimesionLabels &labels);
+    DimesionLabels ReadDimensionLabels(const QDomElement &dElement) const;
+
+    void ClearDimension(IMD type);
 };
 
 #endif // VMEASUREMENTS_H
diff --git a/src/libs/vformat/vpatternrecipe.cpp b/src/libs/vformat/vpatternrecipe.cpp
index 6a2756448..921781aa6 100644
--- a/src/libs/vformat/vpatternrecipe.cpp
+++ b/src/libs/vformat/vpatternrecipe.cpp
@@ -118,7 +118,7 @@ QDomElement VPatternRecipe::Prerequisite()
     QDomElement prerequisiteElement = createElement(QStringLiteral("prerequisite"));
 
     prerequisiteElement.appendChild(CreateElementWithText(QStringLiteral("valentina"), APP_VERSION_STR));
-    prerequisiteElement.appendChild(CreateElementWithText(QStringLiteral("unit"), UnitsToStr(qApp->patternUnit())));
+    prerequisiteElement.appendChild(CreateElementWithText(QStringLiteral("unit"), UnitsToStr(qApp->patternUnits())));
     prerequisiteElement.appendChild(CreateElementWithText(QStringLiteral("author"), m_pattern->GetCompanyName()));
     prerequisiteElement.appendChild(CreateElementWithText(QStringLiteral("pattenName"), m_pattern->GetPatternName()));
     prerequisiteElement.appendChild(CreateElementWithText(QStringLiteral("description"), m_pattern->GetDescription()));
@@ -437,7 +437,7 @@ QDomElement VPatternRecipe::FinalMeasurement(const VFinalMeasurement &fm)
                                                          tr("Value for final measurtement '%1' is infinite or NaN. "
                                                             "Please, check your calculations.").arg(fm.name));
         qApp->IsPedantic() ? throw VException(errorMsg) :
-                           qWarning() << VAbstractApplication::patternMessageSignature + errorMsg;
+                           qWarning() << VAbstractValApplication::patternMessageSignature + errorMsg;
     }
 
     SetAttribute(recipeFinalMeasurement, QStringLiteral("value"), result);
diff --git a/src/libs/vgeometry/vabstractcurve.cpp b/src/libs/vgeometry/vabstractcurve.cpp
index f46ba0409..8a818a165 100644
--- a/src/libs/vgeometry/vabstractcurve.cpp
+++ b/src/libs/vgeometry/vabstractcurve.cpp
@@ -36,7 +36,7 @@
 #include <QtDebug>
 
 #include "vabstractcurve_p.h"
-#include "../vmisc/vabstractapplication.h"
+#include "../vmisc/vabstractvalapplication.h"
 #include "../vmisc/compatibility.h"
 #include "../ifc/exception/vexceptionobjecterror.h"
 
@@ -146,7 +146,7 @@ QVector<QPointF> VAbstractCurve::GetSegmentPoints(const QPointF &begin, const QP
                            .arg(piece, name(), error);
         }
         qApp->IsPedantic() ? throw VExceptionObjectError(errorMsg) :
-                           qWarning() << VAbstractApplication::patternMessageSignature + errorMsg;
+                           qWarning() << VAbstractValApplication::patternMessageSignature + errorMsg;
     }
 
     return segment;
diff --git a/src/libs/vgeometry/varc_p.h b/src/libs/vgeometry/varc_p.h
index 53f6289d1..4530b02a2 100644
--- a/src/libs/vgeometry/varc_p.h
+++ b/src/libs/vgeometry/varc_p.h
@@ -31,7 +31,7 @@
 
 #include <QSharedData>
 #include "vgeometrydef.h"
-#include "../vmisc/vabstractapplication.h"
+#include "../vmisc/vabstractvalapplication.h"
 #include "../vmisc/diagnostic.h"
 
 QT_WARNING_PUSH
diff --git a/src/libs/vgeometry/vellipticalarc_p.h b/src/libs/vgeometry/vellipticalarc_p.h
index 869ba0945..ee00d533d 100644
--- a/src/libs/vgeometry/vellipticalarc_p.h
+++ b/src/libs/vgeometry/vellipticalarc_p.h
@@ -2,7 +2,7 @@
 #define VELLIPTICALARC_P
 
 #include <QSharedData>
-#include "../vmisc/vabstractapplication.h"
+#include "../vmisc/vabstractvalapplication.h"
 #include "../vmisc/diagnostic.h"
 #include "vpointf.h"
 
diff --git a/src/libs/vgeometry/vspline_p.h b/src/libs/vgeometry/vspline_p.h
index 0c76aa5b3..1b71ca5a6 100644
--- a/src/libs/vgeometry/vspline_p.h
+++ b/src/libs/vgeometry/vspline_p.h
@@ -33,7 +33,7 @@
 #include <QLineF>
 
 #include "vpointf.h"
-#include "../vmisc/vabstractapplication.h"
+#include "../vmisc/vabstractvalapplication.h"
 #include "../vmisc/vmath.h"
 
 QT_WARNING_PUSH
diff --git a/src/libs/vlayout/vabstractpiece.cpp b/src/libs/vlayout/vabstractpiece.cpp
index 4ba2d8b78..85f9d0d16 100644
--- a/src/libs/vlayout/vabstractpiece.cpp
+++ b/src/libs/vlayout/vabstractpiece.cpp
@@ -28,7 +28,7 @@
 
 #include "vabstractpiece.h"
 #include "vabstractpiece_p.h"
-#include "../vmisc/vabstractapplication.h"
+#include "../vmisc/vabstractvalapplication.h"
 #include "../vgeometry/vpointf.h"
 #include "../ifc/exception/vexception.h"
 #include "../vmisc/vmath.h"
@@ -1072,7 +1072,7 @@ QVector<QPointF> VAbstractPiece::Equidistant(QVector<VSAPoint> points, qreal wid
     {
         const QString errorMsg = tr("Piece '%1'. Not enough points to build seam allowance.").arg(name);
         qApp->IsPedantic() ? throw VException(errorMsg) :
-                             qWarning() << VAbstractApplication::patternMessageSignature + errorMsg;
+                             qWarning() << VAbstractValApplication::patternMessageSignature + errorMsg;
         return QVector<QPointF>();
     }
 
diff --git a/src/libs/vlayout/vbank.cpp b/src/libs/vlayout/vbank.cpp
index 1df82536c..12861e401 100644
--- a/src/libs/vlayout/vbank.cpp
+++ b/src/libs/vlayout/vbank.cpp
@@ -32,7 +32,7 @@
 #include <QLoggingCategory>
 
 #include "../vmisc/diagnostic.h"
-#include "../vmisc/vabstractapplication.h"
+#include "../vmisc/vabstractvalapplication.h"
 #include "../vmisc/compatibility.h"
 #include "vlayoutdef.h"
 #include "../ifc/exception/vexception.h"
@@ -335,7 +335,7 @@ bool VBank::PrepareUnsorted()
         const qint64 square = details.at(i).Square();
         if (square <= 0)
         {
-            qCCritical(lBank) << VAbstractApplication::patternMessageSignature +
+            qCCritical(lBank) << VAbstractValApplication::patternMessageSignature +
                                      tr("Preparing data for layout error: Detail '%1' square <= 0")
                                          .arg(details.at(i).GetName());
             prepare = false;
@@ -360,7 +360,7 @@ bool VBank::PrepareDetails()
 {
     if (layoutWidth <= 0)
     {
-        qCCritical(lBank) << VAbstractApplication::patternMessageSignature +
+        qCCritical(lBank) << VAbstractValApplication::patternMessageSignature +
                                  tr("Preparing data for layout error: Layout paper sheet <= 0");
         prepare = false;
         return prepare;
@@ -368,7 +368,7 @@ bool VBank::PrepareDetails()
 
     if (details.isEmpty())
     {
-        qCCritical(lBank) << VAbstractApplication::patternMessageSignature +
+        qCCritical(lBank) << VAbstractValApplication::patternMessageSignature +
                                  tr("Preparing data for layout error: List of details is empty");
         prepare = false;
         return prepare;
@@ -391,7 +391,7 @@ bool VBank::PrepareDetails()
             const QString errorMsg = QObject::tr("Piece '%1' has invalid layout allowance. Please, check seam allowance"
                                                  " to check how seam allowance behave.").arg(details.at(i).GetName());
             qApp->IsPedantic() ? throw VException(errorMsg) :
-                                 qWarning() << VAbstractApplication::patternMessageSignature + errorMsg;
+                                 qWarning() << VAbstractValApplication::patternMessageSignature + errorMsg;
         }
 
         const qreal d = details.at(i).Diagonal();
diff --git a/src/libs/vlayout/vlayoutpiece.cpp b/src/libs/vlayout/vlayoutpiece.cpp
index b9fc0c890..917bfad9a 100644
--- a/src/libs/vlayout/vlayoutpiece.cpp
+++ b/src/libs/vlayout/vlayoutpiece.cpp
@@ -48,7 +48,7 @@
 #include "../vpatterndb/floatItemData/vpatternlabeldata.h"
 #include "../vpatterndb/floatItemData/vpiecelabeldata.h"
 #include "../vmisc/vmath.h"
-#include "../vmisc/vabstractapplication.h"
+#include "../vmisc/vabstractvalapplication.h"
 #include "../vmisc/compatibility.h"
 #include "../vpatterndb/vcontainer.h"
 #include "../vpatterndb/calculator.h"
@@ -269,7 +269,7 @@ QVector<VLayoutPassmark> ConvertPassmarks(const VPiece &piece, const VContainer
                             QObject::tr("Cannot prepare builtin passmark '%1' for piece '%2'. Passmark is empty.")
                                 .arg(pData.nodeName, piece.GetName());
                         qApp->IsPedantic() ? throw VException(errorMsg) :
-                                           qWarning() << VAbstractApplication::patternMessageSignature + errorMsg;
+                                           qWarning() << VAbstractValApplication::patternMessageSignature + errorMsg;
                         return;
                     }
 
@@ -283,7 +283,7 @@ QVector<VLayoutPassmark> ConvertPassmarks(const VPiece &piece, const VContainer
                                         "empty.")
                                 .arg(pData.nodeName, piece.GetName());
                         qApp->IsPedantic() ? throw VException(errorMsg) :
-                                           qWarning() << VAbstractApplication::patternMessageSignature + errorMsg;
+                                           qWarning() << VAbstractValApplication::patternMessageSignature + errorMsg;
                         return;
                     }
                     layoutPassmark.baseLine = ConstFirst (baseLines);
@@ -300,7 +300,7 @@ QVector<VLayoutPassmark> ConvertPassmarks(const VPiece &piece, const VContainer
                             QObject::tr("Passmark '%1' is not part of piece '%2'.")
                             .arg(pData.nodeName, piece.GetName());
                     qApp->IsPedantic() ? throw VException(errorMsg) :
-                                         qWarning() << VAbstractApplication::patternMessageSignature + errorMsg;
+                                         qWarning() << VAbstractValApplication::patternMessageSignature + errorMsg;
                 }
             };
 
@@ -326,7 +326,7 @@ QVector<VLayoutPassmark> ConvertPassmarks(const VPiece &piece, const VContainer
                             QObject::tr("Cannot prepare passmark '%1' for piece '%2'. Passmark base line is empty.")
                                 .arg(pData.nodeName, piece.GetName());
                         qApp->IsPedantic() ? throw VException(errorMsg) :
-                                           qWarning() << VAbstractApplication::patternMessageSignature + errorMsg;
+                                           qWarning() << VAbstractValApplication::patternMessageSignature + errorMsg;
                         return;
                     }
 
@@ -346,7 +346,7 @@ QVector<VLayoutPassmark> ConvertPassmarks(const VPiece &piece, const VContainer
                             QObject::tr("Cannot prepare passmark '%1' for piece '%2'. Passmark is empty.")
                                 .arg(pData.nodeName, piece.GetName());
                         qApp->IsPedantic() ? throw VException(errorMsg) :
-                                           qWarning() << VAbstractApplication::patternMessageSignature + errorMsg;
+                                           qWarning() << VAbstractValApplication::patternMessageSignature + errorMsg;
                         return;
                     }
 
@@ -362,7 +362,7 @@ QVector<VLayoutPassmark> ConvertPassmarks(const VPiece &piece, const VContainer
                             QObject::tr("Passmark '%1' is not part of piece '%2'.")
                             .arg(pData.nodeName, piece.GetName());
                     qApp->IsPedantic() ? throw VException(errorMsg) :
-                                         qWarning() << VAbstractApplication::patternMessageSignature + errorMsg;
+                                         qWarning() << VAbstractValApplication::patternMessageSignature + errorMsg;
                 }
             };
 
@@ -508,7 +508,7 @@ VLayoutPiece VLayoutPiece::Create(const VPiece &piece, vidtype id, const VContai
         const QString errorMsg = QObject::tr("Piece '%1'. Seam allowance is not valid.")
                 .arg(piece.GetName());
         qApp->IsPedantic() ? throw VException(errorMsg) :
-                             qWarning() << VAbstractApplication::patternMessageSignature + errorMsg;
+                             qWarning() << VAbstractValApplication::patternMessageSignature + errorMsg;
     }
 
     det.SetCountourPoints(futureMainPath.result(),
@@ -697,7 +697,7 @@ void VLayoutPiece::SetPieceText(const QString& qsName, const VPieceLabelData& da
     // generate text
     d->m_tmDetail.SetFont(font);
     d->m_tmDetail.SetFontSize(data.GetFontSize());
-    d->m_tmDetail.Update(qsName, data);
+    d->m_tmDetail.Update(qsName, data, pattern);
     // this will generate the lines of text
     d->m_tmDetail.SetFontSize(data.GetFontSize());
     d->m_tmDetail.FitFontSize(labelWidth, labelHeight);
@@ -754,7 +754,7 @@ void VLayoutPiece::SetPatternInfo(VAbstractPattern* pDoc, const VPatternLabelDat
     d->m_tmPattern.SetFont(font);
     d->m_tmPattern.SetFontSize(geom.GetFontSize());
 
-    d->m_tmPattern.Update(pDoc);
+    d->m_tmPattern.Update(pDoc, pattern);
 
     // generate lines of text
     d->m_tmPattern.SetFontSize(geom.GetFontSize());
diff --git a/src/libs/vlayout/vposter.cpp b/src/libs/vlayout/vposter.cpp
index 82069b214..f7d73c80e 100644
--- a/src/libs/vlayout/vposter.cpp
+++ b/src/libs/vlayout/vposter.cpp
@@ -43,10 +43,11 @@
 #include <QImageReader>
 #include <QPixmapCache>
 #include <QPainter>
+#include <QFileInfo>
 
 #include "../vmisc/vmath.h"
 #include "../vmisc/def.h"
-#include "../vmisc/vabstractapplication.h"
+#include "../vmisc/vabstractvalapplication.h"
 #include "../ifc/exception/vexception.h"
 
 namespace
@@ -309,7 +310,7 @@ QVector<QGraphicsItem *> VPoster::ImageWatermark(QGraphicsItem *parent, const Po
         {
             const QString errorMsg = tr("Cannot open the watermark image.") + QChar(' ') + error;
             qApp->IsPedantic() ? throw VException(errorMsg) :
-                                 qWarning() << VAbstractApplication::patternMessageSignature + errorMsg;
+                                 qWarning() << VAbstractValApplication::patternMessageSignature + errorMsg;
             return data;
         }
 
@@ -319,7 +320,7 @@ QVector<QGraphicsItem *> VPoster::ImageWatermark(QGraphicsItem *parent, const Po
     {
         const QString errorMsg = tr("Not supported file suffix '%1'").arg(f.suffix());
         qApp->IsPedantic() ? throw VException(errorMsg) :
-                             qWarning() << VAbstractApplication::patternMessageSignature + errorMsg;
+                             qWarning() << VAbstractValApplication::patternMessageSignature + errorMsg;
         return data;
     }
 
@@ -455,7 +456,7 @@ void VPoster::Ruler(QVector<QGraphicsItem *> &data, QGraphicsItem *parent, QRect
 
     const qreal notchHeight = ToPixel(3); // mm
     const qreal shortNotchHeight = ToPixel(1.1); // mm
-    Unit patternUnits = qApp->patternUnit();
+    Unit patternUnits = qApp->patternUnits();
     const qreal step = UnitConvertor(1, patternUnits, Unit::Px);
     double marksCount = rec.width() / step;
     int i = 0;
diff --git a/src/libs/vlayout/vtextmanager.cpp b/src/libs/vlayout/vtextmanager.cpp
index ec1300081..66753588f 100644
--- a/src/libs/vlayout/vtextmanager.cpp
+++ b/src/libs/vlayout/vtextmanager.cpp
@@ -37,7 +37,7 @@
 
 #include "../ifc/xml/vabstractpattern.h"
 #include "../vpatterndb/floatItemData/vpiecelabeldata.h"
-#include "../vmisc/vabstractapplication.h"
+#include "../vmisc/vabstractvalapplication.h"
 #include "../vmisc/vmath.h"
 #if QT_VERSION < QT_VERSION_CHECK(5, 14, 0)
 #   include "../vmisc/vdatastreamenum.h"
@@ -166,9 +166,10 @@ namespace
 {
 
 //---------------------------------------------------------------------------------------------------------------------
-QMap<QString, QString> PreparePlaceholders(const VAbstractPattern *doc)
+QMap<QString, QString> PreparePlaceholders(const VAbstractPattern *doc, const VContainer *data)
 {
     SCASSERT(doc != nullptr)
+    SCASSERT(data != nullptr)
 
     QMap<QString, QString> placeholders;
 
@@ -185,38 +186,39 @@ QMap<QString, QString> PreparePlaceholders(const VAbstractPattern *doc)
     placeholders.insert(pl_patternNumber, doc->GetPatternNumber());
     placeholders.insert(pl_author, doc->GetCompanyName());
 
-    if (qApp->patternType() == MeasurementsType::Individual)
+    placeholders.insert(pl_mUnits, UnitsToStr(qApp->MeasurementsUnits(), true));
+    placeholders.insert(pl_pUnits, UnitsToStr(qApp->patternUnits(), true));
+    placeholders.insert(pl_mSizeUnits, UnitsToStr(qApp->DimensionSizeUnits(), true));
+
+    if (qApp->GetMeasurementsType() == MeasurementsType::Individual)
     {
         placeholders.insert(pl_customer, qApp->GetCustomerName());
+
+        const QString birthDate = locale.toString(qApp->GetCustomerBirthDate(), doc->GetLabelDateFormat());
+        placeholders.insert(pl_birthDate, birthDate);
+
+        placeholders.insert(pl_email, qApp->CustomerEmail());
     }
     else
     {
         placeholders.insert(pl_customer, doc->GetCustomerName());
+
+        const QString birthDate = locale.toString(doc->GetCustomerBirthDate(), doc->GetLabelDateFormat());
+        placeholders.insert(pl_birthDate, birthDate);
+
+        placeholders.insert(pl_email, doc->GetCustomerEmail());
     }
 
     placeholders.insert(pl_pExt, QStringLiteral("val"));
     placeholders.insert(pl_pFileName, QFileInfo(qApp->GetPatternPath()).baseName());
     placeholders.insert(pl_mFileName, QFileInfo(doc->MPath()).baseName());
 
-    QString curSize;
-    QString curHeight;
-    QString mExt;
-    if (qApp->patternType() == MeasurementsType::Multisize)
-    {
-        curSize = QString::number(VContainer::size(valentinaNamespace));
-        curHeight = QString::number(VContainer::height(valentinaNamespace));
-        mExt = QStringLiteral("vst");
-    }
-    else if (qApp->patternType() == MeasurementsType::Individual)
-    {
-        curSize = QString::number(VContainer::size(valentinaNamespace));
-        curHeight = QString::number(VContainer::height(valentinaNamespace));
-        mExt = QStringLiteral("vit");
-    }
-
-    placeholders.insert(pl_size, curSize);
-    placeholders.insert(pl_height, curHeight);
-    placeholders.insert(pl_mExt, mExt);
+    placeholders.insert(pl_height, QString::number(qApp->GetDimensionHeight()));
+    placeholders.insert(pl_size, QString::number(qApp->GetDimensionSize()));
+    placeholders.insert(pl_hip, QString::number(qApp->GetDimensionHip()));
+    placeholders.insert(pl_waist, QString::number(qApp->GetDimensionWaist()));
+    placeholders.insert(pl_mExt, qApp->GetMeasurementsType() == MeasurementsType::Multisize ? QString("vst")
+                                                                                            : QString("vit"));
 
     const QMap<int, QString> materials = doc->GetPatternMaterials();
     for (int i = 0; i < userMaterialPlaceholdersQuantity; ++i)
@@ -232,6 +234,15 @@ QMap<QString, QString> PreparePlaceholders(const VAbstractPattern *doc)
         placeholders.insert(pl_userMaterial + number, value);
     }
 
+    const QMap<QString, QSharedPointer<VMeasurement> > measurements = data->DataMeasurements();
+    auto i = measurements.constBegin();
+    while (i != measurements.constEnd())
+    {
+        QString description = i.value()->GetGuiText().isEmpty() ? i.key() : i.value()->GetGuiText();
+        placeholders.insert(pl_measurement + i.key(), QString::number(*i.value()->GetValue()));
+        ++i;
+    }
+
     // Piece tags
     placeholders.insert(pl_pLetter, QString());
     placeholders.insert(pl_pAnnotation, QString());
@@ -473,11 +484,11 @@ void VTextManager::FitFontSize(qreal fW, qreal fH)
  * @param qsName detail name
  * @param data reference to the detail data
  */
-void VTextManager::Update(const QString& qsName, const VPieceLabelData& data)
+void VTextManager::Update(const QString& qsName, const VPieceLabelData& data, const VContainer *pattern)
 {
     m_liLines.clear();
 
-    QMap<QString, QString> placeholders = PreparePlaceholders(qApp->getCurrentDocument());
+    QMap<QString, QString> placeholders = PreparePlaceholders(qApp->getCurrentDocument(), pattern);
     InitPiecePlaceholders(placeholders, qsName, data);
 
     QVector<VLabelTemplateLine> lines = data.GetLabelTemplate();
@@ -495,7 +506,7 @@ void VTextManager::Update(const QString& qsName, const VPieceLabelData& data)
  * @brief VTextManager::Update updates the text lines with pattern info
  * @param pDoc pointer to the abstract pattern object
  */
-void VTextManager::Update(VAbstractPattern *pDoc)
+void VTextManager::Update(VAbstractPattern *pDoc, const VContainer *pattern)
 {
     m_liLines.clear();
 
@@ -507,7 +518,7 @@ void VTextManager::Update(VAbstractPattern *pDoc)
             return; // Nothing to parse
         }
 
-        const QMap<QString, QString> placeholders = PreparePlaceholders(pDoc);
+        const QMap<QString, QString> placeholders = PreparePlaceholders(pDoc, pattern);
 
         for (int i=0; i<lines.size(); ++i)
         {
diff --git a/src/libs/vlayout/vtextmanager.h b/src/libs/vlayout/vtextmanager.h
index 726544db1..9728d9e15 100644
--- a/src/libs/vlayout/vtextmanager.h
+++ b/src/libs/vlayout/vtextmanager.h
@@ -41,6 +41,7 @@
 
 class VPieceLabelData;
 class VAbstractPattern;
+class VContainer;
 
 #define MIN_FONT_SIZE               5
 #define MAX_FONT_SIZE               128
@@ -88,8 +89,8 @@ public:
     int               GetSourceLinesCount() const;
     const TextLine&   GetSourceLine(int i) const;
 
-    void Update(const QString& qsName, const VPieceLabelData& data);
-    void Update(VAbstractPattern* pDoc);
+    void Update(const QString& qsName, const VPieceLabelData& data, const VContainer *pattern);
+    void Update(VAbstractPattern* pDoc, const VContainer *pattern);
 
     friend QDataStream& operator<<(QDataStream& dataStream, const VTextManager& data);
     friend QDataStream& operator>>(QDataStream& dataStream, VTextManager& data);
diff --git a/src/libs/vmisc/commandoptions.cpp b/src/libs/vmisc/commandoptions.cpp
index 6499f46d5..208fa0cf3 100644
--- a/src/libs/vmisc/commandoptions.cpp
+++ b/src/libs/vmisc/commandoptions.cpp
@@ -90,11 +90,9 @@ const QString SINGLE_OPTION_TEST            = QStringLiteral("t");
 
 const QString LONG_OPTION_PENDANTIC         = QStringLiteral("pedantic");
 
-const QString LONG_OPTION_GRADATIONSIZE     = QStringLiteral("gsize");
-const QString SINGLE_OPTION_GRADATIONSIZE   = QStringLiteral("x");
-
-const QString LONG_OPTION_GRADATIONHEIGHT   = QStringLiteral("gheight");
-const QString SINGLE_OPTION_GRADATIONHEIGHT = QStringLiteral("e");
+const QString LONG_OPTION_DIMENSION_A       = QStringLiteral("dimensionA");
+const QString LONG_OPTION_DIMENSION_B       = QStringLiteral("dimensionB");
+const QString LONG_OPTION_DIMENSION_C       = QStringLiteral("dimensionC");
 
 const QString LONG_OPTION_USER_MATERIAL     = QStringLiteral("userMaterial");
 
@@ -170,8 +168,9 @@ QStringList AllKeys()
         LONG_OPTION_GROUPPING, SINGLE_OPTION_GROUPPING,
         LONG_OPTION_TEST, SINGLE_OPTION_TEST,
         LONG_OPTION_PENDANTIC,
-        LONG_OPTION_GRADATIONSIZE, SINGLE_OPTION_GRADATIONSIZE,
-        LONG_OPTION_GRADATIONHEIGHT, SINGLE_OPTION_GRADATIONHEIGHT,
+        LONG_OPTION_DIMENSION_A,
+        LONG_OPTION_DIMENSION_B,
+        LONG_OPTION_DIMENSION_C,
         LONG_OPTION_USER_MATERIAL,
         LONG_OPTION_IGNORE_MARGINS, SINGLE_OPTION_IGNORE_MARGINS,
         LONG_OPTION_LEFT_MARGIN, SINGLE_OPTION_LEFT_MARGIN,
diff --git a/src/libs/vmisc/commandoptions.h b/src/libs/vmisc/commandoptions.h
index a4737440e..3589f9d6c 100644
--- a/src/libs/vmisc/commandoptions.h
+++ b/src/libs/vmisc/commandoptions.h
@@ -87,11 +87,9 @@ extern const QString SINGLE_OPTION_TEST;
 
 extern const QString LONG_OPTION_PENDANTIC;
 
-extern const QString LONG_OPTION_GRADATIONSIZE;
-extern const QString SINGLE_OPTION_GRADATIONSIZE;
-
-extern const QString LONG_OPTION_GRADATIONHEIGHT;
-extern const QString SINGLE_OPTION_GRADATIONHEIGHT;
+extern const QString LONG_OPTION_DIMENSION_A;
+extern const QString LONG_OPTION_DIMENSION_B;
+extern const QString LONG_OPTION_DIMENSION_C;
 
 extern const QString LONG_OPTION_USER_MATERIAL;
 
diff --git a/src/libs/vmisc/def.cpp b/src/libs/vmisc/def.cpp
index 7584da3af..e7289a6d7 100644
--- a/src/libs/vmisc/def.cpp
+++ b/src/libs/vmisc/def.cpp
@@ -149,17 +149,24 @@ const QStringList builInFunctions = QStringList() << degTorad_F
 
 const QString pl_size          = QStringLiteral("size");
 const QString pl_height        = QStringLiteral("height");
+const QString pl_hip           = QStringLiteral("hip");
+const QString pl_waist         = QStringLiteral("waist");
 const QString pl_date          = QStringLiteral("date");
 const QString pl_time          = QStringLiteral("time");
+const QString pl_birthDate     = QStringLiteral("birthDate");
 const QString pl_patternName   = QStringLiteral("patternName");
 const QString pl_patternNumber = QStringLiteral("patternNumber");
 const QString pl_author        = QStringLiteral("author");
 const QString pl_customer      = QStringLiteral("customer");
+const QString pl_email         = QStringLiteral("email");
 const QString pl_userMaterial  = QStringLiteral("userMaterial");
 const QString pl_pExt          = QStringLiteral("pExt");
+const QString pl_pUnits        = QStringLiteral("pUnits");
 const QString pl_pFileName     = QStringLiteral("pFileName");
 const QString pl_mFileName     = QStringLiteral("mFileName");
 const QString pl_mExt          = QStringLiteral("mExt");
+const QString pl_mUnits        = QStringLiteral("mUnits");
+const QString pl_mSizeUnits    = QStringLiteral("mSizeUnits");
 const QString pl_pLetter       = QStringLiteral("pLetter");
 const QString pl_pAnnotation   = QStringLiteral("pAnnotation");
 const QString pl_pOrientation  = QStringLiteral("pOrientation");
@@ -174,34 +181,7 @@ const QString pl_mInterfacing  = QStringLiteral("mInterfacing");
 const QString pl_mInterlining  = QStringLiteral("mInterlining");
 const QString pl_wCut          = QStringLiteral("wCut");
 const QString pl_wOnFold       = QStringLiteral("wOnFold");
-
-const QStringList labelTemplatePlaceholders = QStringList() << pl_size
-                                                            << pl_height
-                                                            << pl_date
-                                                            << pl_time
-                                                            << pl_patternName
-                                                            << pl_patternNumber
-                                                            << pl_author
-                                                            << pl_customer
-                                                            << pl_userMaterial
-                                                            << pl_pExt
-                                                            << pl_pFileName
-                                                            << pl_mFileName
-                                                            << pl_mExt
-                                                            << pl_pLetter
-                                                            << pl_pAnnotation
-                                                            << pl_pOrientation
-                                                            << pl_pRotation
-                                                            << pl_pTilt
-                                                            << pl_pFoldPosition
-                                                            << pl_pName
-                                                            << pl_pQuantity
-                                                            << pl_mFabric
-                                                            << pl_mLining
-                                                            << pl_mInterfacing
-                                                            << pl_mInterlining
-                                                            << pl_wCut
-                                                            << pl_wOnFold;
+const QString pl_measurement   = QStringLiteral("measurement_");
 
 const QString cursorArrowOpenHand = QStringLiteral("://cursor/cursor-arrow-openhand.png");
 const QString cursorArrowCloseHand = QStringLiteral("://cursor/cursor-arrow-closehand.png");
@@ -639,6 +619,8 @@ QString UnitsToStr(const Unit &unit, const bool translate)
         case Unit::Px:
             translate ? result = QObject::tr("px") : result = unitPX;
             break;
+        case Unit::LAST_UNIT_DO_NOT_USE:
+            break;
         case Unit::Cm:
         default:
             translate ? result = QObject::tr("cm") : result = unitCM;
diff --git a/src/libs/vmisc/def.h b/src/libs/vmisc/def.h
index 384af6fb2..10ee1dfe1 100644
--- a/src/libs/vmisc/def.h
+++ b/src/libs/vmisc/def.h
@@ -82,7 +82,7 @@ extern const int maxLabelFontSize;
 
 enum class NodeDetail : qint8 { Contour, Modeling };
 enum class SceneObject : qint8 { Point, Line, Spline, Arc, ElArc, SplinePath, Detail, Unknown };
-enum class MeasurementsType : qint8 { Multisize, Individual , Unknown};
+enum class MeasurementsType : qint8 { Multisize, Individual, Unknown};
 enum class Unit : qint8 { Mm = 0, Cm, Inch, Px, LAST_UNIT_DO_NOT_USE};
 enum class Source : qint8 { FromGui, FromFile, FromTool };
 enum class NodeUsage : bool {NotInUse = false, InUse = true};
@@ -275,18 +275,14 @@ enum class IncrementType : qint8 { Increment, Separator };
 QString       IncrementTypeToString(IncrementType type);
 IncrementType StringToIncrementType(const QString &value);
 
-static const int heightStep = 6;
-enum class GHeights : quint8 { ALL,
-                               H50=50,   H56=56,   H62=62,   H68=68,   H74=74,   H80=80,   H86=86,   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,
-                               H194=194, H200=200};
-
-static const int sizeStep = 2;
-enum class GSizes : quint8 { ALL,
-                             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, S58=58, S60=60,
-                             S62=62, S64=64, S66=66, S68=68, S70=70, S72=72 };
+enum class IMD: qint8 // Individual measurement dimension
+{
+    N, // None
+    X, // height
+    Y, // size (chest half circumference)
+    W, // hip half circumference
+    Z  // waist half circumference
+};
 
 /* QImage supports a maximum of 32768x32768 px images (signed short).
  * This follows from the condition: width * height * colordepth < INT_MAX (4 billion) -> 32768 * 32768 * 4 = 4 billion.
@@ -407,17 +403,24 @@ extern const QStringList builInFunctions;
 // Placeholders
 extern const QString pl_size;
 extern const QString pl_height;
+extern const QString pl_hip;
+extern const QString pl_waist;
 extern const QString pl_date;
 extern const QString pl_time;
+extern const QString pl_birthDate;
 extern const QString pl_patternName;
 extern const QString pl_patternNumber;
 extern const QString pl_author;
 extern const QString pl_customer;
+extern const QString pl_email;
 extern const QString pl_userMaterial;
 extern const QString pl_pExt;
+extern const QString pl_pUnits;
 extern const QString pl_pFileName;
 extern const QString pl_mFileName;
 extern const QString pl_mExt;
+extern const QString pl_mUnits;
+extern const QString pl_mSizeUnits;
 extern const QString pl_pLetter;
 extern const QString pl_pAnnotation;
 extern const QString pl_pOrientation;
@@ -432,12 +435,11 @@ extern const QString pl_mInterfacing;
 extern const QString pl_mInterlining;
 extern const QString pl_wCut;
 extern const QString pl_wOnFold;
+extern const QString pl_measurement;
 
 // Don't forget to syncronize with XSD schema.
 const int userMaterialPlaceholdersQuantity = 20;
 
-extern const QStringList labelTemplatePlaceholders;
-
 extern const QString cursorArrowOpenHand;
 extern const QString cursorArrowCloseHand;
 
diff --git a/src/libs/vmisc/dialogs/dialogexporttocsv.cpp b/src/libs/vmisc/dialogs/dialogexporttocsv.cpp
index afe54328d..c6ae57e5d 100644
--- a/src/libs/vmisc/dialogs/dialogexporttocsv.cpp
+++ b/src/libs/vmisc/dialogs/dialogexporttocsv.cpp
@@ -36,6 +36,7 @@
 #include <QPushButton>
 #include <QShowEvent>
 #include <QTextCodec>
+#include <QDebug>
 
 //---------------------------------------------------------------------------------------------------------------------
 DialogExportToCSV::DialogExportToCSV(QWidget *parent)
diff --git a/src/libs/vmisc/share/resources/icon.qrc b/src/libs/vmisc/share/resources/icon.qrc
index f4cff9ed5..72ed1fe0f 100644
--- a/src/libs/vmisc/share/resources/icon.qrc
+++ b/src/libs/vmisc/share/resources/icon.qrc
@@ -89,5 +89,9 @@
         <file>icon/32x32/broken_link@2x.png</file>
         <file>icon/32x32/link.png</file>
         <file>icon/32x32/link@2x.png</file>
+        <file>icon/24x24/star.png</file>
+        <file>icon/24x24/star@2x.png</file>
+        <file>icon/24x24/close.png</file>
+        <file>icon/24x24/close@2x.png</file>
     </qresource>
 </RCC>
diff --git a/src/libs/vmisc/share/resources/icon/24x24/close.png b/src/libs/vmisc/share/resources/icon/24x24/close.png
new file mode 100644
index 000000000..6847dbcad
Binary files /dev/null and b/src/libs/vmisc/share/resources/icon/24x24/close.png differ
diff --git a/src/libs/vmisc/share/resources/icon/24x24/close@2x.png b/src/libs/vmisc/share/resources/icon/24x24/close@2x.png
new file mode 100644
index 000000000..2b077e626
Binary files /dev/null and b/src/libs/vmisc/share/resources/icon/24x24/close@2x.png differ
diff --git a/src/libs/vmisc/share/resources/icon/24x24/star.png b/src/libs/vmisc/share/resources/icon/24x24/star.png
new file mode 100644
index 000000000..cfe569427
Binary files /dev/null and b/src/libs/vmisc/share/resources/icon/24x24/star.png differ
diff --git a/src/libs/vmisc/share/resources/icon/24x24/star@2x.png b/src/libs/vmisc/share/resources/icon/24x24/star@2x.png
new file mode 100644
index 000000000..608044078
Binary files /dev/null and b/src/libs/vmisc/share/resources/icon/24x24/star@2x.png differ
diff --git a/src/libs/vmisc/testvapplication.h b/src/libs/vmisc/testvapplication.h
index b19c21541..a4eea8699 100644
--- a/src/libs/vmisc/testvapplication.h
+++ b/src/libs/vmisc/testvapplication.h
@@ -31,6 +31,7 @@
 
 #include "vabstractapplication.h"
 #include "projectversion.h"
+#include "../vmisc/vsettings.h"
 
 #if defined(qApp)
 #undef qApp
diff --git a/src/libs/vmisc/vabstractapplication.cpp b/src/libs/vmisc/vabstractapplication.cpp
index f201134e7..78d06a864 100644
--- a/src/libs/vmisc/vabstractapplication.cpp
+++ b/src/libs/vmisc/vabstractapplication.cpp
@@ -42,9 +42,6 @@
 #include <QWidget>
 #include <QStandardPaths>
 
-#include "../vmisc/def.h"
-#include "../vmisc/customevents.h"
-
 #ifdef Q_OS_UNIX
 #  include <unistd.h>
 #endif
@@ -53,29 +50,10 @@
 #   include "appimage.h"
 #endif // defined(APPIMAGE) && defined(Q_OS_LINUX)
 
-const QString VAbstractApplication::patternMessageSignature = QStringLiteral("[PATTERN MESSAGE]");
-
 //---------------------------------------------------------------------------------------------------------------------
 VAbstractApplication::VAbstractApplication(int &argc, char **argv)
     :QApplication(argc, argv),
-      undoStack(new QUndoStack(this)),
-      mainWindow(nullptr),
-      settings(nullptr),
-      qtTranslator(nullptr),
-      qtxmlTranslator(nullptr),
-      qtBaseTranslator(nullptr),
-      appTranslator(nullptr),
-      pmsTranslator(nullptr),
-      _patternUnit(Unit::Cm),
-      _patternType(MeasurementsType::Unknown),
-      patternFilePath(),
-      currentScene(nullptr),
-      sceneView(nullptr),
-      doc(nullptr),
-      m_customerName(),
-      m_userMaterials(),
-      openingPattern(false),
-      mode(Draw::Calculation)
+      undoStack(new QUndoStack(this))
 {
     QString rules;
 
@@ -121,10 +99,6 @@ VAbstractApplication::VAbstractApplication(int &argc, char **argv)
     connect(this, &QApplication::aboutToQuit, this, &VAbstractApplication::AboutToQuit);
 }
 
-//---------------------------------------------------------------------------------------------------------------------
-VAbstractApplication::~VAbstractApplication()
-{}
-
 //---------------------------------------------------------------------------------------------------------------------
 /**
  * @brief translationsPath return path to the root directory that contain QM files.
@@ -189,56 +163,6 @@ QString VAbstractApplication::translationsPath(const QString &locale) const
 #endif
 }
 
-//---------------------------------------------------------------------------------------------------------------------
-MeasurementsType VAbstractApplication::patternType() const
-{
-    return _patternType;
-}
-
-//---------------------------------------------------------------------------------------------------------------------
-void VAbstractApplication::setPatternType(const MeasurementsType &patternType)
-{
-    _patternType = patternType;
-}
-
-//---------------------------------------------------------------------------------------------------------------------
-void VAbstractApplication::setCurrentDocument(VAbstractPattern *doc)
-{
-    this->doc = doc;
-}
-
-//---------------------------------------------------------------------------------------------------------------------
-VAbstractPattern *VAbstractApplication::getCurrentDocument() const
-{
-    SCASSERT(doc != nullptr)
-    return doc;
-}
-
-//---------------------------------------------------------------------------------------------------------------------
-bool VAbstractApplication::getOpeningPattern() const
-{
-    return openingPattern;
-}
-
-//---------------------------------------------------------------------------------------------------------------------
-void VAbstractApplication::setOpeningPattern()
-{
-    openingPattern = !openingPattern;
-}
-
-//---------------------------------------------------------------------------------------------------------------------
-QWidget *VAbstractApplication::getMainWindow() const
-{
-    return mainWindow;
-}
-
-//---------------------------------------------------------------------------------------------------------------------
-void VAbstractApplication::setMainWindow(QWidget *value)
-{
-    SCASSERT(value != nullptr)
-    mainWindow = value;
-}
-
 //---------------------------------------------------------------------------------------------------------------------
 QUndoStack *VAbstractApplication::getUndoStack() const
 {
@@ -251,47 +175,6 @@ bool VAbstractApplication::IsPedantic() const
     return false;
 }
 
-//---------------------------------------------------------------------------------------------------------------------
-/**
- * @brief ClearMessage helps to clear a message string from standard Qt function.
- * @param msg the message that contains '"' at the start and at the end
- * @return cleared string
- */
-QString VAbstractApplication::ClearMessage(QString msg)
-{
-    if (msg.startsWith('"') && msg.endsWith('"'))
-    {
-        msg.remove(0, 1);
-        msg.chop(1);
-    }
-
-    return msg;
-}
-
-//---------------------------------------------------------------------------------------------------------------------
-const Draw &VAbstractApplication::GetDrawMode() const
-{
-    return mode;
-}
-
-//---------------------------------------------------------------------------------------------------------------------
-void VAbstractApplication::SetDrawMode(const Draw &value)
-{
-    mode = value;
-}
-
-//---------------------------------------------------------------------------------------------------------------------
-void VAbstractApplication::PostPatternMessage(const QString &message, QtMsgType severity) const
-{
-    QApplication::postEvent(mainWindow, new PatternMessageEvent(VAbstractApplication::ClearMessage(message), severity));
-}
-
-//---------------------------------------------------------------------------------------------------------------------
-bool VAbstractApplication::IsPatternMessage(const QString &message) const
-{
-    return VAbstractApplication::ClearMessage(message).startsWith(patternMessageSignature);
-}
-
 //---------------------------------------------------------------------------------------------------------------------
 #if defined(Q_OS_WIN)
 void VAbstractApplication::WinAttachConsole()
@@ -312,24 +195,6 @@ void VAbstractApplication::WinAttachConsole()
 }
 #endif
 
-//---------------------------------------------------------------------------------------------------------------------
-Unit VAbstractApplication::patternUnit() const
-{
-    return _patternUnit;
-}
-
-//---------------------------------------------------------------------------------------------------------------------
-const Unit *VAbstractApplication::patternUnitP() const
-{
-    return &_patternUnit;
-}
-
-//---------------------------------------------------------------------------------------------------------------------
-void VAbstractApplication::setPatternUnit(const Unit &patternUnit)
-{
-    _patternUnit = patternUnit;
-}
-
 //---------------------------------------------------------------------------------------------------------------------
 /**
  * @brief getSettings hide settings constructor.
@@ -341,43 +206,6 @@ VCommonSettings *VAbstractApplication::Settings()
     return settings;
 }
 
-//---------------------------------------------------------------------------------------------------------------------
-QGraphicsScene *VAbstractApplication::getCurrentScene() const
-{
-    SCASSERT(*currentScene != nullptr)
-    return *currentScene;
-}
-
-//---------------------------------------------------------------------------------------------------------------------
-void VAbstractApplication::setCurrentScene(QGraphicsScene **value)
-{
-    currentScene = value;
-}
-
-//---------------------------------------------------------------------------------------------------------------------
-VMainGraphicsView *VAbstractApplication::getSceneView() const
-{
-    return sceneView;
-}
-
-//---------------------------------------------------------------------------------------------------------------------
-void VAbstractApplication::setSceneView(VMainGraphicsView *value)
-{
-    sceneView = value;
-}
-
-//---------------------------------------------------------------------------------------------------------------------
-double VAbstractApplication::toPixel(double val) const
-{
-    return ToPixel(val, _patternUnit);
-}
-
-//---------------------------------------------------------------------------------------------------------------------
-double VAbstractApplication::fromPixel(double pix) const
-{
-    return FromPixel(pix, _patternUnit);
-}
-
 //---------------------------------------------------------------------------------------------------------------------
 void VAbstractApplication::LoadTranslation(const QString &locale)
 {
diff --git a/src/libs/vmisc/vabstractapplication.h b/src/libs/vmisc/vabstractapplication.h
index d3e16cd5a..b7f9e5231 100644
--- a/src/libs/vmisc/vabstractapplication.h
+++ b/src/libs/vmisc/vabstractapplication.h
@@ -32,25 +32,21 @@
 #include <qcompilerdetection.h>
 #include <QApplication>
 #include <QCoreApplication>
-#include <QGraphicsScene>
 #include <QLocale>
 #include <QMetaObject>
 #include <QObject>
 #include <QPointer>
 #include <QString>
 #include <QtGlobal>
+#include <QTranslator>
 
 #include "../vmisc/def.h"
 #include "../vpatterndb/vtranslatevars.h"
-#include "def.h"
 #include "vcommonsettings.h"
-#include "vlockguard.h"
-#include "vsettings.h"
 
 class QUndoStack;
 class VAbstractApplication;// use in define
-class VAbstractPattern;
-class VMainGraphicsView;
+class VCommonSettings;
 
 #if defined(qApp)
 #undef qApp
@@ -62,92 +58,42 @@ class VAbstractApplication : public QApplication
     Q_OBJECT
 public:
     VAbstractApplication(int &argc, char ** argv);
-    virtual ~VAbstractApplication() override;
+    virtual ~VAbstractApplication() =default;
 
     virtual const VTranslateVars *TrVars()=0;
 
-    QString          translationsPath(const QString &locale = QString()) const;
+    QString translationsPath(const QString &locale = QString()) const;
 
-    void             LoadTranslation(const QString &locale);
-
-    Unit             patternUnit() const;
-    const Unit      *patternUnitP() const;
-    void             setPatternUnit(const Unit &patternUnit);
-
-    MeasurementsType patternType() const;
-    void             setPatternType(const MeasurementsType &patternType);
-
-    QString GetCustomerName() const;
-    void    SetCustomerName(const QString &name);
+    void LoadTranslation(const QString &locale);
 
     virtual void     OpenSettings()=0;
     VCommonSettings *Settings();
 
     template <typename T>
-    QString          LocaleToString(const T &value);
+    QString LocaleToString(const T &value);
 
-    QGraphicsScene  *getCurrentScene() const;
-    void             setCurrentScene(QGraphicsScene **value);
+    QUndoStack *getUndoStack() const;
 
-    VMainGraphicsView *getSceneView() const;
-    void               setSceneView(VMainGraphicsView *value);
-
-    double           toPixel(double val) const;
-    double           fromPixel(double pix) const;
-
-    void             setCurrentDocument(VAbstractPattern *doc);
-    VAbstractPattern *getCurrentDocument()const;
-
-    bool             getOpeningPattern() const;
-    void             setOpeningPattern();
-
-    QWidget         *getMainWindow() const;
-    void             setMainWindow(QWidget *value);
-
-    QUndoStack      *getUndoStack() const;
-
-    virtual bool     IsAppInGUIMode()const =0;
-    virtual bool     IsPedantic() const;
-
-    QString         GetPatternPath() const;
-    void            SetPatternPath(const QString &value);
+    virtual bool IsAppInGUIMode()const =0;
+    virtual bool IsPedantic() const;
 
 #if defined(Q_OS_WIN)
     static void WinAttachConsole();
 #endif
 
-    static QString ClearMessage(QString msg);
-
-    QMap<int, QString> GetUserMaterials() const;
-    void               SetUserMaterials(const QMap<int, QString> &userMaterials);
-
-    const Draw &GetDrawMode() const;
-    void        SetDrawMode(const Draw &value);
-
-    void PostPatternMessage(const QString &message, QtMsgType severity) const;
-
-    static const QString patternMessageSignature;
-    bool IsPatternMessage(const QString &message) const;
-
 protected:
-    QUndoStack         *undoStack;
-
-    /**
-     * @brief mainWindow pointer to main window. Usefull if need create modal dialog. Without pointer to main window
-     * modality doesn't work.
-     */
-    QWidget            *mainWindow;
+    QUndoStack *undoStack;
 
     /**
      * @brief settings pointer to settings. Help hide constructor creation settings. Make make code more readable.
      */
-    VCommonSettings    *settings;
+    VCommonSettings *settings{nullptr};
 
-    QPointer<QTranslator> qtTranslator;
-    QPointer<QTranslator> qtxmlTranslator;
-    QPointer<QTranslator> qtBaseTranslator;
-    QPointer<QTranslator> appTranslator;
-    QPointer<QTranslator> pmsTranslator;
+    QPointer<QTranslator> qtTranslator{nullptr};
+    QPointer<QTranslator> qtxmlTranslator{nullptr};
+    QPointer<QTranslator> qtBaseTranslator{nullptr};
+    QPointer<QTranslator> appTranslator{nullptr};
+    QPointer<QTranslator> pmsTranslator{nullptr};
 
     virtual void InitTrVars()=0;
 
@@ -156,66 +102,10 @@ protected slots:
 
 private:
     Q_DISABLE_COPY(VAbstractApplication)
-    Unit               _patternUnit;
-    MeasurementsType   _patternType;
-    QString            patternFilePath;
-
-    QGraphicsScene     **currentScene;
-    VMainGraphicsView  *sceneView;
-
-    VAbstractPattern   *doc;
-    QString            m_customerName;
-
-    QMap<int, QString> m_userMaterials;
-
-    /**
-     * @brief openingPattern true when we opening pattern. If something will be wrong in formula this help understand if
-     * we can allow user use Undo option.
-     */
-    bool               openingPattern;
-
-    /** @brief mode keep current draw mode. */
-    Draw               mode;
 
     void ClearTranslation();
 };
 
-//---------------------------------------------------------------------------------------------------------------------
-inline QString VAbstractApplication::GetCustomerName() const
-{
-    return m_customerName;
-}
-
-//---------------------------------------------------------------------------------------------------------------------
-inline void VAbstractApplication::SetCustomerName(const QString &name)
-{
-    m_customerName = name;
-}
-
-//---------------------------------------------------------------------------------------------------------------------
-inline QString VAbstractApplication::GetPatternPath() const
-{
-    return patternFilePath;
-}
-
-//---------------------------------------------------------------------------------------------------------------------
-inline void VAbstractApplication::SetPatternPath(const QString &value)
-{
-    patternFilePath = value;
-}
-
-//---------------------------------------------------------------------------------------------------------------------
-inline QMap<int, QString> VAbstractApplication::GetUserMaterials() const
-{
-    return m_userMaterials;
-}
-
-//---------------------------------------------------------------------------------------------------------------------
-inline void VAbstractApplication::SetUserMaterials(const QMap<int, QString> &userMaterials)
-{
-    m_userMaterials = userMaterials;
-}
-
 //---------------------------------------------------------------------------------------------------------------------
 template <typename T>
 inline QString VAbstractApplication::LocaleToString(const T &value)
diff --git a/src/libs/vmisc/vabstractvalapplication.cpp b/src/libs/vmisc/vabstractvalapplication.cpp
new file mode 100644
index 000000000..f9bec265a
--- /dev/null
+++ b/src/libs/vmisc/vabstractvalapplication.cpp
@@ -0,0 +1,80 @@
+/************************************************************************
+ **
+ **  @file   vabstractvalapplication.cpp
+ **  @author Roman Telezhynskyi <dismine(at)gmail.com>
+ **  @date   15 10, 2020
+ **
+ **  @brief
+ **  @copyright
+ **  This source code is part of the Valentina project, a pattern making
+ **  program, whose allow create and modeling patterns of clothing.
+ **  Copyright (C) 2020 Valentina project
+ **  <https://gitlab.com/smart-pattern/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 "vabstractvalapplication.h"
+#include "../vmisc/customevents.h"
+
+#include <QWidget>
+
+const QString VAbstractValApplication::patternMessageSignature = QStringLiteral("[PATTERN MESSAGE]");
+
+//---------------------------------------------------------------------------------------------------------------------
+VAbstractValApplication::VAbstractValApplication(int &argc, char **argv)
+    : VAbstractApplication(argc, argv)
+{}
+
+//---------------------------------------------------------------------------------------------------------------------
+double VAbstractValApplication::toPixel(double val) const
+{
+    return ToPixel(val, m_patternUnits);
+}
+
+//---------------------------------------------------------------------------------------------------------------------
+double VAbstractValApplication::fromPixel(double pix) const
+{
+    return FromPixel(pix, m_patternUnits);
+}
+
+//---------------------------------------------------------------------------------------------------------------------
+void VAbstractValApplication::PostPatternMessage(const QString &message, QtMsgType severity) const
+{
+    QApplication::postEvent(mainWindow,
+                            new PatternMessageEvent(VAbstractValApplication::ClearMessage(message), severity));
+}
+
+//---------------------------------------------------------------------------------------------------------------------
+/**
+ * @brief ClearMessage helps to clear a message string from standard Qt function.
+ * @param msg the message that contains '"' at the start and at the end
+ * @return cleared string
+ */
+QString VAbstractValApplication::ClearMessage(QString msg)
+{
+    if (msg.startsWith('"') && msg.endsWith('"'))
+    {
+        msg.remove(0, 1);
+        msg.chop(1);
+    }
+
+    return msg;
+}
+
+//---------------------------------------------------------------------------------------------------------------------
+bool VAbstractValApplication::IsPatternMessage(const QString &message) const
+{
+    return VAbstractValApplication::ClearMessage(message).startsWith(patternMessageSignature);
+}
diff --git a/src/libs/vmisc/vabstractvalapplication.h b/src/libs/vmisc/vabstractvalapplication.h
new file mode 100644
index 000000000..105040311
--- /dev/null
+++ b/src/libs/vmisc/vabstractvalapplication.h
@@ -0,0 +1,394 @@
+/************************************************************************
+ **
+ **  @file   vabstractvalapplication.h
+ **  @author Roman Telezhynskyi <dismine(at)gmail.com>
+ **  @date   15 10, 2020
+ **
+ **  @brief
+ **  @copyright
+ **  This source code is part of the Valentina project, a pattern making
+ **  program, whose allow create and modeling patterns of clothing.
+ **  Copyright (C) 2020 Valentina project
+ **  <https://gitlab.com/smart-pattern/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 VABSTRACTVALAPPLICATION_H
+#define VABSTRACTVALAPPLICATION_H
+
+#include "vabstractapplication.h"
+
+#include <QDate>
+
+class VAbstractValApplication;// use in define
+class VAbstractPattern;
+class VMainGraphicsView;
+class QGraphicsScene;
+
+#if defined(qApp)
+#undef qApp
+#endif
+#define qApp (static_cast<VAbstractValApplication*>(QCoreApplication::instance()))
+
+class VAbstractValApplication : public VAbstractApplication
+{
+    Q_OBJECT
+public:
+    VAbstractValApplication(int &argc, char **argv);
+    virtual ~VAbstractValApplication() =default;
+
+    QString GetCustomerName() const;
+    void    SetCustomerName(const QString &name);
+
+    QDate   GetCustomerBirthDate() const;
+    void    SetCustomerBirthDate(const QDate &date);
+
+    QString CustomerEmail() const;
+    void    SetCustomerEmail(const QString &email);
+
+    Unit        patternUnits() const;
+    const Unit *patternUnitsP() const;
+    void        SetPatternUnits(const Unit &patternUnit);
+
+    MeasurementsType GetMeasurementsType() const;
+    void             SetMeasurementsType(const MeasurementsType &patternType);
+
+    Unit MeasurementsUnits() const;
+    void SetMeasurementsUnits(const Unit &measurementsUnits);
+
+    Unit DimensionSizeUnits() const;
+    void SetDimensionSizeUnits(const Unit &sizeUnits);
+
+    double toPixel(double val) const;
+    double fromPixel(double pix) const;
+
+    void              setCurrentDocument(VAbstractPattern *doc);
+    VAbstractPattern *getCurrentDocument() const;
+
+    VMainGraphicsView *getSceneView() const;
+    void               setSceneView(VMainGraphicsView *value);
+
+    QGraphicsScene *getCurrentScene() const;
+    void            setCurrentScene(QGraphicsScene **value);
+
+    QWidget *getMainWindow() const;
+    void     setMainWindow(QWidget *value);
+
+    QString GetPatternPath() const;
+    void    SetPatternPath(const QString &value);
+
+    QMap<int, QString> GetUserMaterials() const;
+    void               SetUserMaterials(const QMap<int, QString> &userMaterials);
+
+    const Draw &GetDrawMode() const;
+    void        SetDrawMode(const Draw &value);
+
+    bool getOpeningPattern() const;
+    void setOpeningPattern();
+
+    void PostPatternMessage(const QString &message, QtMsgType severity) const;
+
+    static QString ClearMessage(QString msg);
+
+    static const QString patternMessageSignature;
+    bool IsPatternMessage(const QString &message) const;
+
+    qreal GetDimensionHeight() const;
+    void  SetDimensionHeight(qreal dimensionHeight);
+
+    qreal GetDimensionSize() const;
+    void  SetDimensionSize(qreal dimensionSize);
+
+    qreal GetDimensionHip() const;
+    void  SetDimensionHip(qreal dimensionHip);
+
+    qreal GetDimensionWaist() const;
+    void  SetDimensionWaist(qreal dimensionWaist);
+
+protected:
+    QString m_customerName{};
+    QDate   m_customerBirthDate{};
+    QString m_customerEmail{};
+
+    Unit                m_patternUnits{Unit::Cm};
+    MeasurementsType    m_measurementsType{MeasurementsType::Unknown};
+    Unit                m_measurementsUnits{Unit::Cm};
+    VAbstractPattern   *m_doc{nullptr};
+    VMainGraphicsView  *m_sceneView{nullptr};
+    QGraphicsScene    **m_currentScene{nullptr};
+    QString             m_patternFilePath{};
+    QMap<int, QString>  m_userMaterials{};
+
+    qreal m_dimensionHeight{0};
+    qreal m_dimensionSize{0};
+    qreal m_dimensionHip{0};
+    qreal m_dimensionWaist{0};
+
+    Unit m_dimensionSizeUnits{Unit::Cm};
+
+    /**
+     * @brief mainWindow pointer to main window. Usefull if need create modal dialog. Without pointer to main window
+     * modality doesn't work.
+     */
+    QWidget *mainWindow{nullptr};
+
+    /** @brief mode keep current draw mode. */
+    Draw m_mode{Draw::Calculation};
+
+    /**
+     * @brief openingPattern true when we opening pattern. If something will be wrong in formula this help understand if
+     * we can allow user use Undo option.
+     */
+    bool openingPattern{false};
+
+private:
+    Q_DISABLE_COPY(VAbstractValApplication)
+};
+
+//---------------------------------------------------------------------------------------------------------------------
+inline QString VAbstractValApplication::GetCustomerName() const
+{
+    return m_customerName;
+}
+
+//---------------------------------------------------------------------------------------------------------------------
+inline void VAbstractValApplication::SetCustomerName(const QString &name)
+{
+    m_customerName = name;
+}
+
+//---------------------------------------------------------------------------------------------------------------------
+inline Unit VAbstractValApplication::patternUnits() const
+{
+    return m_patternUnits;
+}
+
+//---------------------------------------------------------------------------------------------------------------------
+inline const Unit *VAbstractValApplication::patternUnitsP() const
+{
+    return &m_patternUnits;
+}
+
+//---------------------------------------------------------------------------------------------------------------------
+inline void VAbstractValApplication::SetPatternUnits(const Unit &patternUnit)
+{
+    m_patternUnits = patternUnit;
+}
+
+//---------------------------------------------------------------------------------------------------------------------
+inline MeasurementsType VAbstractValApplication::GetMeasurementsType() const
+{
+    return m_measurementsType;
+}
+
+//---------------------------------------------------------------------------------------------------------------------
+inline void VAbstractValApplication::SetMeasurementsType(const MeasurementsType &patternType)
+{
+    m_measurementsType = patternType;
+}
+
+//---------------------------------------------------------------------------------------------------------------------
+inline Unit VAbstractValApplication::MeasurementsUnits() const
+{
+    return m_measurementsUnits;
+}
+
+//---------------------------------------------------------------------------------------------------------------------
+inline void VAbstractValApplication::SetMeasurementsUnits(const Unit &measurementsUnits)
+{
+    m_measurementsUnits = measurementsUnits;
+}
+
+//---------------------------------------------------------------------------------------------------------------------
+inline Unit VAbstractValApplication::DimensionSizeUnits() const
+{
+    return m_dimensionSizeUnits;
+}
+
+//---------------------------------------------------------------------------------------------------------------------
+inline void VAbstractValApplication::SetDimensionSizeUnits(const Unit &sizeUnits)
+{
+    m_dimensionSizeUnits = sizeUnits;
+}
+
+//---------------------------------------------------------------------------------------------------------------------
+inline void VAbstractValApplication::setCurrentDocument(VAbstractPattern *doc)
+{
+    m_doc = doc;
+}
+
+//---------------------------------------------------------------------------------------------------------------------
+inline VAbstractPattern *VAbstractValApplication::getCurrentDocument() const
+{
+    return m_doc;
+}
+
+//---------------------------------------------------------------------------------------------------------------------
+inline VMainGraphicsView *VAbstractValApplication::getSceneView() const
+{
+    return m_sceneView;
+}
+
+//---------------------------------------------------------------------------------------------------------------------
+inline void VAbstractValApplication::setSceneView(VMainGraphicsView *value)
+{
+    m_sceneView = value;
+}
+
+//---------------------------------------------------------------------------------------------------------------------
+inline QGraphicsScene *VAbstractValApplication::getCurrentScene() const
+{
+    return *m_currentScene;
+}
+
+//---------------------------------------------------------------------------------------------------------------------
+inline void VAbstractValApplication::setCurrentScene(QGraphicsScene **value)
+{
+    m_currentScene = value;
+}
+
+//---------------------------------------------------------------------------------------------------------------------
+inline QWidget *VAbstractValApplication::getMainWindow() const
+{
+    return mainWindow;
+}
+
+//---------------------------------------------------------------------------------------------------------------------
+inline void VAbstractValApplication::setMainWindow(QWidget *value)
+{
+    mainWindow = value;
+}
+
+//---------------------------------------------------------------------------------------------------------------------
+inline QString VAbstractValApplication::GetPatternPath() const
+{
+    return m_patternFilePath;
+}
+
+//---------------------------------------------------------------------------------------------------------------------
+inline void VAbstractValApplication::SetPatternPath(const QString &value)
+{
+    m_patternFilePath = value;
+}
+
+//---------------------------------------------------------------------------------------------------------------------
+inline QMap<int, QString> VAbstractValApplication::GetUserMaterials() const
+{
+    return m_userMaterials;
+}
+
+//---------------------------------------------------------------------------------------------------------------------
+inline void VAbstractValApplication::SetUserMaterials(const QMap<int, QString> &userMaterials)
+{
+    m_userMaterials = userMaterials;
+}
+
+//---------------------------------------------------------------------------------------------------------------------
+inline const Draw &VAbstractValApplication::GetDrawMode() const
+{
+    return m_mode;
+}
+
+//---------------------------------------------------------------------------------------------------------------------
+inline void VAbstractValApplication::SetDrawMode(const Draw &value)
+{
+    m_mode = value;
+}
+
+//---------------------------------------------------------------------------------------------------------------------
+inline bool VAbstractValApplication::getOpeningPattern() const
+{
+    return openingPattern;
+}
+
+//---------------------------------------------------------------------------------------------------------------------
+inline void VAbstractValApplication::setOpeningPattern()
+{
+    openingPattern = !openingPattern;
+}
+
+//---------------------------------------------------------------------------------------------------------------------
+inline qreal VAbstractValApplication::GetDimensionHeight() const
+{
+    return m_dimensionHeight;
+}
+
+//---------------------------------------------------------------------------------------------------------------------
+inline void VAbstractValApplication::SetDimensionHeight(qreal dimensionHeight)
+{
+    m_dimensionHeight = dimensionHeight;
+}
+
+//---------------------------------------------------------------------------------------------------------------------
+inline qreal VAbstractValApplication::GetDimensionSize() const
+{
+    return m_dimensionSize;
+}
+
+//---------------------------------------------------------------------------------------------------------------------
+inline void VAbstractValApplication::SetDimensionSize(qreal dimensionSize)
+{
+    m_dimensionSize = dimensionSize;
+}
+
+//---------------------------------------------------------------------------------------------------------------------
+inline qreal VAbstractValApplication::GetDimensionHip() const
+{
+    return m_dimensionHip;
+}
+
+//---------------------------------------------------------------------------------------------------------------------
+inline void VAbstractValApplication::SetDimensionHip(qreal dimensionHip)
+{
+    m_dimensionHip = dimensionHip;
+}
+
+//---------------------------------------------------------------------------------------------------------------------
+inline qreal VAbstractValApplication::GetDimensionWaist() const
+{
+    return m_dimensionWaist;
+}
+
+//---------------------------------------------------------------------------------------------------------------------
+inline void VAbstractValApplication::SetDimensionWaist(qreal dimensionWaist)
+{
+    m_dimensionWaist = dimensionWaist;
+}
+
+//---------------------------------------------------------------------------------------------------------------------
+inline QDate VAbstractValApplication::GetCustomerBirthDate() const
+{
+    return m_customerBirthDate;
+}
+
+//---------------------------------------------------------------------------------------------------------------------
+inline void VAbstractValApplication::SetCustomerBirthDate(const QDate &date)
+{
+    m_customerBirthDate = date;
+}
+
+//---------------------------------------------------------------------------------------------------------------------
+inline QString VAbstractValApplication::CustomerEmail() const
+{
+    return m_customerEmail;
+}
+
+//---------------------------------------------------------------------------------------------------------------------
+inline void VAbstractValApplication::SetCustomerEmail(const QString &email)
+{
+    m_customerEmail = email;
+}
+
+#endif // VABSTRACTVALAPPLICATION_H
diff --git a/src/libs/vmisc/vmisc.pri b/src/libs/vmisc/vmisc.pri
index e62231411..0381a3d48 100644
--- a/src/libs/vmisc/vmisc.pri
+++ b/src/libs/vmisc/vmisc.pri
@@ -3,6 +3,7 @@
 
 SOURCES += \
     $$PWD/def.cpp \
+    $$PWD/vabstractvalapplication.cpp \
     $$PWD/vsettings.cpp \
     $$PWD/vabstractapplication.cpp \
     $$PWD/projectversion.cpp \
@@ -27,6 +28,7 @@ HEADERS += \
     $$PWD/compatibility.h \
     $$PWD/stable.h \
     $$PWD/def.h \
+    $$PWD/vabstractvalapplication.h \
     $$PWD/vmath.h \
     $$PWD/vsettings.h \
     $$PWD/vabstractapplication.h \
diff --git a/src/libs/vmisc/vtapesettings.cpp b/src/libs/vmisc/vtapesettings.cpp
index 4fef2e705..283becaac 100644
--- a/src/libs/vmisc/vtapesettings.cpp
+++ b/src/libs/vmisc/vtapesettings.cpp
@@ -37,9 +37,6 @@
 namespace
 {
 Q_GLOBAL_STATIC_WITH_ARGS(const QString, settingDataBaseGeometry, (QLatin1String("database/geometry")))
-
-Q_GLOBAL_STATIC_WITH_ARGS(const QString, settingDefHeight, (QLatin1String("gradation/defHeight")))
-Q_GLOBAL_STATIC_WITH_ARGS(const QString, settingDefSize, (QLatin1String("gradation/defSize")))
 }
 
 //---------------------------------------------------------------------------------------------------------------------
@@ -60,27 +57,3 @@ void VTapeSettings::SetDataBaseGeometry(const QByteArray &value)
 {
     setValue(*settingDataBaseGeometry, value);
 }
-
-//---------------------------------------------------------------------------------------------------------------------
-void VTapeSettings::SetDefHeight(int value)
-{
-    setValue(*settingDefHeight, value);
-}
-
-//---------------------------------------------------------------------------------------------------------------------
-int VTapeSettings::GetDefHeight() const
-{
-    return value(*settingDefHeight, 176).toInt();
-}
-
-//---------------------------------------------------------------------------------------------------------------------
-void VTapeSettings::SetDefSize(int value)
-{
-    setValue(*settingDefSize, value);
-}
-
-//---------------------------------------------------------------------------------------------------------------------
-int VTapeSettings::GetDefSize() const
-{
-    return value(*settingDefSize, 50).toInt();
-}
diff --git a/src/libs/vmisc/vtapesettings.h b/src/libs/vmisc/vtapesettings.h
index 8624fe07e..752267303 100644
--- a/src/libs/vmisc/vtapesettings.h
+++ b/src/libs/vmisc/vtapesettings.h
@@ -49,12 +49,6 @@ public:
     QByteArray GetDataBaseGeometry() const;
     void SetDataBaseGeometry(const QByteArray &value);
 
-    void SetDefHeight(int value);
-    int  GetDefHeight() const;
-
-    void SetDefSize(int value);
-    int  GetDefSize() const;
-
 private:
     Q_DISABLE_COPY(VTapeSettings)
 };
diff --git a/src/libs/vpatterndb/variables/vmeasurement.cpp b/src/libs/vpatterndb/variables/vmeasurement.cpp
index fa9126cd6..8e6413f15 100644
--- a/src/libs/vpatterndb/variables/vmeasurement.cpp
+++ b/src/libs/vpatterndb/variables/vmeasurement.cpp
@@ -40,36 +40,25 @@
 /**
  * @brief VMeasurement create measurement for multisize table
  * @param name measurement's name
- * @param base value in base size and height
- * @param ksize increment in sizes
- * @param kheight increment in heights
- * @param gui_text shor tooltip for user
- * @param description measurement full description
- * @param tagName measurement's tag name in file
+ * @param base measurement's base value
  */
-VMeasurement::VMeasurement(quint32 index, const QString &name, qreal baseSize, qreal baseHeight, const qreal &base,
-                           const qreal &ksize, const qreal &kheight, const QString &gui_text,
-                           const QString &description, const QString &tagName)
-    :VVariable(name, description),
-      d(new VMeasurementData(index, gui_text, tagName, baseSize, baseHeight, base, ksize, kheight))
+VMeasurement::VMeasurement(quint32 index, const QString &name, qreal baseA, qreal baseB, qreal baseC, qreal base)
+    :VVariable(name),
+      d(new VMeasurementData(index, baseA, baseB, baseC, base))
 {
     SetType(VarType::Measurement);
-    VInternalVariable::SetValue(d->base);
+    VInternalVariable::SetValue(d->shiftBase);
 }
 
 //---------------------------------------------------------------------------------------------------------------------
 /**
  * @brief VMeasurement create measurement for individual table
- * @param name measurement's name
+ * @param name measurement's base value
  * @param base value in base size and height
- * @param gui_text shor tooltip for user
- * @param description measurement full description
- * @param tagName measurement's tag name in file
  */
 VMeasurement::VMeasurement(VContainer *data, quint32 index, const QString &name, const qreal &base,
-                           const QString &formula, bool ok, const QString &gui_text, const QString &description,
-                           const QString &tagName)
-    :VVariable(name, description), d(new VMeasurementData(data, index, formula, ok, gui_text, tagName, base))
+                           const QString &formula, bool ok)
+    :VVariable(name), d(new VMeasurementData(data, index, formula, ok, base))
 {
     SetType(VarType::Measurement);
     VInternalVariable::SetValue(base);
@@ -112,146 +101,48 @@ VMeasurement::~VMeasurement()
 {}
 
 //---------------------------------------------------------------------------------------------------------------------
-QStringList VMeasurement::ListHeights(const QMap<GHeights, bool> &heights, Unit patternUnit)
+QString VMeasurement::CorrectionHash(qreal baseA, qreal baseB, qreal baseC)
 {
-    QStringList list;
-    if (patternUnit == Unit::Inch)
+    QStringList hashBlocks{QString::number(baseA)};
+
+    if (baseB > 0)
     {
-        qWarning()<<"Multisize table doesn't support inches.";
-        return list;
+        hashBlocks.append(QString::number(baseB));
     }
 
-    QMap<GHeights, bool>::const_iterator i = heights.constBegin();
-    while (i != heights.constEnd())
+    if (baseC > 0)
     {
-        if (i.value() && i.key() != GHeights::ALL)
-        {
-            list.append(QString::number(UnitConvertor(static_cast<int>(i.key()), Unit::Cm, patternUnit)));
-        }
-        ++i;
-    }
-
-    if (list.isEmpty())
-    {
-        list = VMeasurement::WholeListHeights(patternUnit);
-    }
-    return list;
-}
-
-//---------------------------------------------------------------------------------------------------------------------
-QStringList VMeasurement::ListSizes(const QMap<GSizes, bool> &sizes, Unit patternUnit)
-{
-    QStringList list;
-    if (patternUnit == Unit::Inch)
-    {
-        qWarning()<<"Multisize table doesn't support inches.";
-        return list;
-    }
-
-    QMap<GSizes, bool>::const_iterator i = sizes.constBegin();
-    while (i != sizes.constEnd())
-    {
-        if (i.value() && i.key() != GSizes::ALL)
-        {
-            list.append(QString::number(UnitConvertor(static_cast<int>(i.key()), Unit::Cm, patternUnit)));
-        }
-        ++i;
-    }
-
-    if (list.isEmpty())
-    {
-        list = VMeasurement::WholeListSizes(patternUnit);
-    }
-    return list;
-}
-
-//---------------------------------------------------------------------------------------------------------------------
-QStringList VMeasurement::WholeListHeights(Unit patternUnit)
-{
-    QStringList list;
-    if (patternUnit == Unit::Inch)
-    {
-        qWarning()<<"Multisize table doesn't support inches.";
-        return list;
-    }
-
-    list.reserve((static_cast<int>(GHeights::H200) - static_cast<int>(GHeights::H50))/heightStep);
-    for (int i = static_cast<int>(GHeights::H50); i<= static_cast<int>(GHeights::H200); i = i+heightStep)
-    {
-        list.append(QString::number(UnitConvertor(i, Unit::Cm, patternUnit)));
-    }
-
-    return list;
-}
-
-//---------------------------------------------------------------------------------------------------------------------
-QStringList VMeasurement::WholeListSizes(Unit patternUnit)
-{
-    QStringList list;
-    if (patternUnit == Unit::Inch)
-    {
-        qWarning()<<"Multisize table doesn't support inches.";
-        return list;
-    }
-
-    list.reserve((static_cast<int>(GSizes::S72) - static_cast<int>(GSizes::S22))/sizeStep);
-    for (int i = static_cast<int>(GSizes::S22); i<= static_cast<int>(GSizes::S72); i = i+sizeStep)
-    {
-       list.append(QString::number(UnitConvertor(i, Unit::Cm, patternUnit)));
-    }
-
-    return list;
-}
-
-//---------------------------------------------------------------------------------------------------------------------
-bool VMeasurement::IsGradationSizeValid(const QString &size)
-{
-    if (not size.isEmpty())
-    {
-        const QStringList sizes = VMeasurement::WholeListSizes(Unit::Cm);
-        return sizes.contains(size);
-    }
-    else
-    {
-        return false;
-    }
-}
-
-//---------------------------------------------------------------------------------------------------------------------
-bool VMeasurement::IsGradationHeightValid(const QString &height)
-{
-    if (not height.isEmpty())
-    {
-        const QStringList heights = VMeasurement::WholeListHeights(Unit::Cm);
-        return heights.contains(height);
-    }
-    else
-    {
-        return false;
+        hashBlocks.append(QString::number(baseC));
     }
+    return hashBlocks.join(';');
 }
 
 //---------------------------------------------------------------------------------------------------------------------
 qreal VMeasurement::CalcValue() const
 {
-    if (d->currentUnit == nullptr || qFuzzyIsNull(d->currentSize) || qFuzzyIsNull(d->currentHeight))
+    if (qFuzzyIsNull(d->currentBaseA))
     {
         return VInternalVariable::GetValue();
     }
 
-    if (*d->currentUnit == Unit::Inch)
+    // Formula for calculation gradation
+    const qreal kA = d->stepA > 0 ? (d->currentBaseA - d->baseA) / d->stepA : 0;
+    const qreal kB = d->stepB > 0 ? (d->currentBaseB - d->baseB) / d->stepB : 0;
+    const qreal kC = d->stepC > 0 ? (d->currentBaseC - d->baseC) / d->stepC : 0;
+
+    return d->shiftBase + kA * d->shiftA + kB * d->shiftB + kC * d->shiftC + Correction();
+}
+
+//---------------------------------------------------------------------------------------------------------------------
+qreal VMeasurement::Correction() const
+{
+    const QString hash = CorrectionHash(d->currentBaseA, d->currentBaseB, d->currentBaseC);
+    if (d->corrections.contains(hash))
     {
-        qWarning("Gradation doesn't support inches");
-        return 0;
+        return d->corrections.value(hash);
     }
 
-    const qreal sizeIncrement = UnitConvertor(2.0, Unit::Cm, *d->currentUnit);
-    const qreal heightIncrement = UnitConvertor(6.0, Unit::Cm, *d->currentUnit);
-
-    // Formula for calculation gradation
-    const qreal k_size    = ( d->currentSize - d->baseSize ) / sizeIncrement;
-    const qreal k_height  = ( d->currentHeight - d->baseHeight ) / heightIncrement;
-    return d->base + k_size * d->ksize + k_height * d->kheight;
+    return 0;
 }
 
 //---------------------------------------------------------------------------------------------------------------------
@@ -265,15 +156,9 @@ QString VMeasurement::GetGuiText() const
 }
 
 //---------------------------------------------------------------------------------------------------------------------
-QString VMeasurement::TagName() const
+void VMeasurement::SetGuiText(const QString &guiText)
 {
-    return d->_tagName;
-}
-
-//---------------------------------------------------------------------------------------------------------------------
-void VMeasurement::setTagName(const QString &tagName)
-{
-    d->_tagName = tagName;
+    d->gui_text = guiText;
 }
 
 //---------------------------------------------------------------------------------------------------------------------
@@ -303,7 +188,7 @@ bool VMeasurement::IsFormulaOk() const
 //---------------------------------------------------------------------------------------------------------------------
 bool VMeasurement::IsNotUsed() const
 {
-    return qFuzzyIsNull(d->base) && qFuzzyIsNull(d->ksize) && qFuzzyIsNull(d->kheight);
+    return qFuzzyIsNull(d->shiftBase) && qFuzzyIsNull(d->shiftB) && qFuzzyIsNull(d->shiftA);
 }
 
 //---------------------------------------------------------------------------------------------------------------------
@@ -326,21 +211,21 @@ VContainer *VMeasurement::GetData()
 }
 
 //---------------------------------------------------------------------------------------------------------------------
-void VMeasurement::SetSize(qreal size)
+void VMeasurement::SetBaseA(qreal base)
 {
-    d->currentSize = size;
+    d->currentBaseA = base;
 }
 
 //---------------------------------------------------------------------------------------------------------------------
-void VMeasurement::SetHeight(qreal height)
+void VMeasurement::SetBaseB(qreal base)
 {
-    d->currentHeight = height;
+    d->currentBaseB = base;
 }
 
 //---------------------------------------------------------------------------------------------------------------------
-void VMeasurement::SetUnit(const Unit *unit)
+void VMeasurement::SetBaseC(qreal base)
 {
-    d->currentUnit = unit;
+    d->currentBaseC = base;
 }
 
 //---------------------------------------------------------------------------------------------------------------------
@@ -350,30 +235,13 @@ void VMeasurement::SetUnit(const Unit *unit)
  */
 qreal VMeasurement::GetBase() const
 {
-    return d->base;
+    return d->shiftBase;
 }
 
 //---------------------------------------------------------------------------------------------------------------------
-void VMeasurement::SetBase(const qreal &value)
+void VMeasurement::SetBase(qreal value)
 {
-    d->base = value;
-}
-
-//---------------------------------------------------------------------------------------------------------------------
-/**
- * @brief GetKsize return increment in sizes
- * @return increment
- */
-qreal VMeasurement::GetKsize() const
-{
-    return d->ksize;
-}
-
-//---------------------------------------------------------------------------------------------------------------------
-// cppcheck-suppress unusedFunction
-void VMeasurement::SetKsize(const qreal &value)
-{
-    d->ksize = value;
+    d->shiftBase = value;
 }
 
 //---------------------------------------------------------------------------------------------------------------------
@@ -381,14 +249,121 @@ void VMeasurement::SetKsize(const qreal &value)
  * @brief GetKheight return increment in heights
  * @return increment
  */
-qreal VMeasurement::GetKheight() const
+qreal VMeasurement::GetShiftA() const
 {
-    return d->kheight;
+    return d->shiftA;
 }
 
 //---------------------------------------------------------------------------------------------------------------------
 // cppcheck-suppress unusedFunction
-void VMeasurement::SetKheight(const qreal &value)
+void VMeasurement::SetShiftA(qreal value)
 {
-    d->kheight = value;
+    d->shiftA = value;
+}
+
+//---------------------------------------------------------------------------------------------------------------------
+/**
+ * @brief GetKsize return increment in sizes
+ * @return increment
+ */
+qreal VMeasurement::GetShiftB() const
+{
+    return d->shiftB;
+}
+
+//---------------------------------------------------------------------------------------------------------------------
+// cppcheck-suppress unusedFunction
+void VMeasurement::SetShiftB(qreal value)
+{
+    d->shiftB = value;
+}
+
+//---------------------------------------------------------------------------------------------------------------------
+qreal VMeasurement::GetShiftC() const
+{
+    return d->shiftC;
+}
+
+//---------------------------------------------------------------------------------------------------------------------
+void VMeasurement::SetShiftC(qreal value)
+{
+    d->shiftC = value;
+}
+
+//---------------------------------------------------------------------------------------------------------------------
+qreal VMeasurement::GetStepA() const
+{
+    return d->shiftA;
+}
+
+//---------------------------------------------------------------------------------------------------------------------
+void VMeasurement::SetStepA(qreal value)
+{
+    d->stepA = value;
+}
+
+//---------------------------------------------------------------------------------------------------------------------
+qreal VMeasurement::GetStepB() const
+{
+    return d->stepB;
+}
+
+//---------------------------------------------------------------------------------------------------------------------
+void VMeasurement::SetStepB(qreal value)
+{
+    d->stepB = value;
+}
+
+//---------------------------------------------------------------------------------------------------------------------
+qreal VMeasurement::GetStepC() const
+{
+    return d->stepC;
+}
+
+//---------------------------------------------------------------------------------------------------------------------
+void VMeasurement::SetStepC(qreal value)
+{
+    d->stepC = value;
+}
+
+//---------------------------------------------------------------------------------------------------------------------
+bool VMeasurement::IsSpecialUnits() const
+{
+    return d->specialUnits;
+}
+
+//---------------------------------------------------------------------------------------------------------------------
+void VMeasurement::SetSpecialUnits(bool special)
+{
+    d->specialUnits = special;
+}
+
+//---------------------------------------------------------------------------------------------------------------------
+IMD VMeasurement::GetDimension() const
+{
+    return d->dimension;
+}
+
+//---------------------------------------------------------------------------------------------------------------------
+void VMeasurement::SetDimension(IMD type)
+{
+    d->dimension = type;
+}
+
+//---------------------------------------------------------------------------------------------------------------------
+qreal VMeasurement::GetCorrection(int baseA, int baseB, int baseC) const
+{
+    return d->corrections.value(VMeasurement::CorrectionHash(baseA, baseB, baseC), 0);
+}
+
+//---------------------------------------------------------------------------------------------------------------------
+QMap<QString, qreal> VMeasurement::GetCorrections() const
+{
+    return d->corrections;
+}
+
+//---------------------------------------------------------------------------------------------------------------------
+void VMeasurement::SetCorrections(const QMap<QString, qreal> &corrections)
+{
+    d->corrections = corrections;
 }
diff --git a/src/libs/vpatterndb/variables/vmeasurement.h b/src/libs/vpatterndb/variables/vmeasurement.h
index fe542ca71..28ecc483e 100644
--- a/src/libs/vpatterndb/variables/vmeasurement.h
+++ b/src/libs/vpatterndb/variables/vmeasurement.h
@@ -50,12 +50,9 @@ class VMeasurementData;
 class VMeasurement :public VVariable
 {
 public:
-    VMeasurement(quint32 index, const QString &name, qreal baseSize, qreal baseHeight, const qreal &base,
-                 const qreal &ksize, const qreal &kheight, const QString &gui_text = QString(),
-                 const QString &description = QString(), const QString &tagName = QString());
+    VMeasurement(quint32 index, const QString &name, qreal baseA, qreal baseB, qreal baseC, qreal base);
     VMeasurement(VContainer *data, quint32 index, const QString &name, const qreal &base, const QString &formula,
-                 bool ok, const QString &gui_text = QString(), const QString &description = QString(),
-                 const QString &tagName = QString());
+                 bool ok);
     VMeasurement(const VMeasurement &m);
 
     virtual ~VMeasurement() override;
@@ -67,9 +64,7 @@ public:
 #endif
 
     QString GetGuiText() const;
-
-    QString TagName() const;
-    void    setTagName(const QString &tagName);
+    void    SetGuiText(const QString &guiText);
 
     QString GetFormula() const;
 
@@ -85,30 +80,48 @@ public:
 
     VContainer *GetData();
 
-    void SetSize(qreal size);
-    void SetHeight(qreal height);
+    void SetBaseA(qreal base);
+    void SetBaseB(qreal base);
+    void SetBaseC(qreal base);
 
-    void SetUnit(const Unit *unit);
+    qreal GetBase() const;
+    void  SetBase(qreal value);
 
-    qreal   GetBase() const;
-    void    SetBase(const qreal &value);
+    qreal GetShiftA() const;
+    void  SetShiftA(qreal value);
 
-    qreal   GetKsize() const;
-    void    SetKsize(const qreal &value);
+    qreal GetShiftB() const;
+    void  SetShiftB(qreal value);
 
-    qreal   GetKheight() const;
-    void    SetKheight(const qreal &value);
+    qreal GetShiftC() const;
+    void  SetShiftC(qreal value);
 
-    static QStringList ListHeights(const QMap<GHeights, bool> &heights, Unit patternUnit);
-    static QStringList ListSizes(const QMap<GSizes, bool> &sizes, Unit patternUnit);
-    static QStringList WholeListHeights(Unit patternUnit);
-    static QStringList WholeListSizes(Unit patternUnit);
-    static bool IsGradationSizeValid(const QString &size);
-    static bool IsGradationHeightValid(const QString &height);
+    qreal GetStepA() const;
+    void  SetStepA(qreal value);
+
+    qreal GetStepB() const;
+    void  SetStepB(qreal value);
+
+    qreal GetStepC() const;
+    void  SetStepC(qreal value);
+
+    bool IsSpecialUnits() const;
+    void SetSpecialUnits(bool special);
+
+    IMD  GetDimension() const;
+    void SetDimension(IMD type);
+
+    qreal GetCorrection(int baseA, int baseB, int baseC) const;
+
+    QMap<QString, qreal> GetCorrections() const;
+    void  SetCorrections(const QMap<QString, qreal> &corrections);
+
+    static QString CorrectionHash(qreal baseA, qreal baseB=0, qreal baseC=0);
 private:
     QSharedDataPointer<VMeasurementData> d;
 
     qreal CalcValue() const;
+    qreal Correction() const;
 };
 
 Q_DECLARE_TYPEINFO(VMeasurement, Q_MOVABLE_TYPE);
diff --git a/src/libs/vpatterndb/variables/vmeasurement_p.h b/src/libs/vpatterndb/variables/vmeasurement_p.h
index 9a7329fc2..132360f74 100644
--- a/src/libs/vpatterndb/variables/vmeasurement_p.h
+++ b/src/libs/vpatterndb/variables/vmeasurement_p.h
@@ -42,40 +42,20 @@ class VMeasurementData : public QSharedData
 {
 public:
 
-    VMeasurementData(quint32 index, const QString &gui_text, const QString &tagName, qreal baseSize, qreal baseHeight,
-                     qreal base, qreal ksize, qreal kheight )
-        : data(),
-          index(index),
-          formula(),
-          gui_text(gui_text),
-          _tagName(tagName),
-          formulaOk(true),
-          currentSize(0),
-          currentHeight(0),
-          currentUnit(nullptr),
-          base(base),
-          ksize(ksize),
-          kheight(kheight),
-          baseSize(baseSize),
-          baseHeight(baseHeight)
+    VMeasurementData(quint32 index, qreal baseA, qreal baseB, qreal baseC, qreal base)
+        : index(index),
+          shiftBase(base),
+          baseA(baseA),
+          baseB(baseB),
+          baseC(baseC)
     {}
 
-    VMeasurementData(VContainer *data, quint32 index, const QString &formula, bool ok, const QString &gui_text,
-                     const QString &tagName, qreal base)
+    VMeasurementData(VContainer *data, quint32 index, const QString &formula, bool ok, qreal base)
         : data(QSharedPointer<VContainer>(new VContainer(*data))),
           index(index),
           formula(formula),
-          gui_text(gui_text),
-          _tagName(tagName),
           formulaOk(ok),
-          currentSize(0),
-          currentHeight(0),
-          currentUnit(nullptr),
-          base(base),
-          ksize(0),
-          kheight(0),
-          baseSize(0),
-          baseHeight(0)
+          shiftBase(base)
     {}
 
     VMeasurementData(const VMeasurementData &m)
@@ -84,42 +64,56 @@ public:
           index(m.index),
           formula(m.formula),
           gui_text(m.gui_text),
-          _tagName(m._tagName),
           formulaOk(m.formulaOk),
-          currentSize(m.currentSize),
-          currentHeight(m.currentHeight),
-          currentUnit(m.currentUnit),
-          base(m.base),
-          ksize(m.ksize),
-          kheight(m.kheight),
-          baseSize(m.baseSize),
-          baseHeight(m.baseHeight)
+          currentBaseA(m.currentBaseA),
+          currentBaseB(m.currentBaseB),
+          currentBaseC(m.currentBaseC),
+          shiftBase(m.shiftBase),
+          shiftA(m.shiftA),
+          shiftB(m.shiftB),
+          shiftC(m.shiftC),
+          stepA(m.stepA),
+          stepB(m.stepB),
+          stepC(m.stepC),
+          baseA(m.baseA),
+          baseB(m.baseB),
+          baseC(m.baseC),
+          corrections(m.corrections),
+          specialUnits(m.specialUnits),
+          dimension(m.dimension)
     {}
 
     virtual  ~VMeasurementData();
 
-    QSharedPointer<VContainer> data;
+    QSharedPointer<VContainer> data{};
     quint32 index;
-    QString formula;
-    QString gui_text;
-    QString _tagName;
-    bool formulaOk;
+    QString formula{};
+    QString gui_text{};
+    bool formulaOk{true};
 
-    qreal currentSize;
-    qreal currentHeight;
-    const Unit *currentUnit;
+    qreal currentBaseA{0};
+    qreal currentBaseB{0};
+    qreal currentBaseC{0};
 
-    /** @brief base value in base size and height */
-    qreal   base;
+    qreal shiftBase{0};
 
-    /** @brief ksize increment in sizes */
-    qreal   ksize;
+    qreal shiftA{0};
+    qreal shiftB{0};
+    qreal shiftC{0};
 
-    /** @brief kgrowth increment in heights */
-    qreal   kheight;
+    qreal stepA{0};
+    qreal stepB{0};
+    qreal stepC{0};
 
-    qreal baseSize;
-    qreal baseHeight;
+    qreal baseA{0};
+    qreal baseB{0};
+    qreal baseC{0};
+
+    QMap<QString, qreal> corrections{};
+
+    bool specialUnits{false};
+
+    IMD dimension{IMD::N};
 
 private:
     Q_DISABLE_ASSIGN(VMeasurementData)
diff --git a/src/libs/vpatterndb/variables/vvariable.h b/src/libs/vpatterndb/variables/vvariable.h
index 759924be8..04d35d750 100644
--- a/src/libs/vpatterndb/variables/vvariable.h
+++ b/src/libs/vpatterndb/variables/vvariable.h
@@ -45,7 +45,7 @@ class VVariable :public VInternalVariable
 {
 public:
     VVariable();
-    VVariable(const QString &name, const QString &description = QString());
+    explicit VVariable(const QString &name, const QString &description = QString());
     VVariable(const VVariable &var);
 
     virtual ~VVariable() override;
diff --git a/src/libs/vpatterndb/vcontainer.cpp b/src/libs/vpatterndb/vcontainer.cpp
index 81f797bf4..2a4169ece 100644
--- a/src/libs/vpatterndb/vcontainer.cpp
+++ b/src/libs/vpatterndb/vcontainer.cpp
@@ -65,8 +65,6 @@ Q_LOGGING_CATEGORY(vCon, "v.container")
 QT_WARNING_POP
 
 QMap<QString, quint32> VContainer::_id = QMap<QString, quint32>();
-QMap<QString, qreal> VContainer::_size = QMap<QString, qreal>();
-QMap<QString, qreal> VContainer::_height = QMap<QString, qreal>();
 QMap<QString, QSet<QString>> VContainer::uniqueNames = QMap<QString, QSet<QString>>();
 QMap<QString, quint32> VContainer::copyCounter = QMap<QString, quint32>();
 
@@ -92,16 +90,6 @@ VContainer::VContainer(const VTranslateVars *trVars, const Unit *patternUnit, co
         _id[d->nspace] = NULL_ID;
     }
 
-    if (not _size.contains(d->nspace))
-    {
-        _size[d->nspace] = 50;
-    }
-
-    if (not _height.contains(d->nspace))
-    {
-        _height[d->nspace] = 176;
-    }
-
     if (not uniqueNames.contains(d->nspace))
     {
         uniqueNames[d->nspace] = QSet<QString>();
@@ -167,7 +155,7 @@ QString VContainer::UniqueNamespace()
     {
         candidate = QUuid::createUuid().toString();
     }
-    while(_size.contains(candidate));
+    while(_id.contains(candidate));
 
     return candidate;
 }
@@ -176,8 +164,6 @@ QString VContainer::UniqueNamespace()
 void VContainer::ClearNamespace(const QString &nspace)
 {
     _id.remove(nspace);
-    _size.remove(nspace);
-    _height.remove(nspace);
     uniqueNames.remove(nspace);
 }
 
@@ -734,72 +720,6 @@ void VContainer::ClearExceptUniqueIncrementNames() const
     }
 }
 
-//---------------------------------------------------------------------------------------------------------------------
-/**
- * @brief SetSize set value of size
- * @param size value of size
- */
-void VContainer::SetSize(qreal size) const
-{
-    _size[d->nspace] = size;
-}
-
-//---------------------------------------------------------------------------------------------------------------------
-/**
- * @brief SetGrowth set value of growth
- * @param height value of height
- */
-void VContainer::SetHeight(qreal height) const
-{
-    _height[d->nspace] = height;
-}
-
-//---------------------------------------------------------------------------------------------------------------------
-/**
- * @brief size return size
- * @return size in mm
- */
-qreal VContainer::size() const
-{
-    return VContainer::size(d->nspace);
-}
-
-//---------------------------------------------------------------------------------------------------------------------
-qreal VContainer::size(const QString &nspace)
-{
-    if (_size.contains(nspace))
-    {
-        return _size.value(nspace);
-    }
-    else
-    {
-        throw VException(QStringLiteral("Unknown namespace"));
-    }
-}
-
-//---------------------------------------------------------------------------------------------------------------------
-/**
- * @brief height return height
- * @return height in pattern units
- */
-qreal VContainer::height() const
-{
-    return VContainer::height(d->nspace);
-}
-
-//---------------------------------------------------------------------------------------------------------------------
-qreal VContainer::height(const QString &nspace)
-{
-    if (_height.contains(nspace))
-    {
-        return _height.value(nspace);
-    }
-    else
-    {
-        throw VException(QStringLiteral("Unknown namespace"));
-    }
-}
-
 //---------------------------------------------------------------------------------------------------------------------
 /**
  * @brief data container with datagObjects return container of gObjects
diff --git a/src/libs/vpatterndb/vcontainer.h b/src/libs/vpatterndb/vcontainer.h
index 03f6bcd9e..a4e987da1 100644
--- a/src/libs/vpatterndb/vcontainer.h
+++ b/src/libs/vpatterndb/vcontainer.h
@@ -190,13 +190,6 @@ public:
     void               ClearUniqueIncrementNames() const;
     void               ClearExceptUniqueIncrementNames() const;
 
-    void               SetSize(qreal size) const;
-    void               SetHeight(qreal height) const;
-    qreal              size() const;
-    static qreal       size(const QString &nspace);
-    qreal              height() const;
-    static qreal       height(const QString &nspace);
-
     void               RemoveIncrement(const QString& name);
 
     const QHash<quint32, QSharedPointer<VGObject> >         *CalculationGObjects() const;
@@ -227,8 +220,6 @@ private:
      * @brief _id current id. New object will have value +1. For empty class equal 0.
      */
     static QMap<QString, quint32> _id;
-    static QMap<QString, qreal>   _size;
-    static QMap<QString, qreal>   _height;
     static QMap<QString, QSet<QString>> uniqueNames;
     static QMap<QString, quint32> copyCounter;
 
diff --git a/src/libs/vpatterndb/vpassmark.cpp b/src/libs/vpatterndb/vpassmark.cpp
index 2dd0998de..f9ccf0085 100644
--- a/src/libs/vpatterndb/vpassmark.cpp
+++ b/src/libs/vpatterndb/vpassmark.cpp
@@ -29,7 +29,7 @@
 #include <QPainterPath>
 
 #include "vpassmark.h"
-#include "../vmisc/vabstractapplication.h"
+#include "../vmisc/vabstractvalapplication.h"
 #include "../ifc/exception/vexceptioninvalidnotch.h"
 #include "../vgeometry/vabstractcurve.h"
 #include "../vgeometry/varc.h"
@@ -579,7 +579,7 @@ QVector<QLineF> PassmarkBisectorBaseLine(PassmarkStatus seamPassmarkType, const
                                              "than minimal allowed.")
                 .arg(passmarkData.nodeName, passmarkData.pieceName);
         qApp->IsPedantic() ? throw VException(errorMsg) :
-                             qWarning() << VAbstractApplication::patternMessageSignature + errorMsg;
+                             qWarning() << VAbstractValApplication::patternMessageSignature + errorMsg;
         return QVector<QLineF>();
     }
 
@@ -788,7 +788,7 @@ QVector<QLineF> VPassmark::BuiltInSAPassmarkBaseLine(const VPiece &piece) const
                                                  "than minimal allowed.")
                     .arg(m_data.nodeName, m_data.pieceName);
             qApp->IsPedantic() ? throw VExceptionInvalidNotch(errorMsg) :
-                                 qWarning() << VAbstractApplication::patternMessageSignature + errorMsg;
+                                 qWarning() << VAbstractValApplication::patternMessageSignature + errorMsg;
             return QVector<QLineF>();
         }
     }
@@ -804,7 +804,7 @@ QVector<QLineF> VPassmark::BuiltInSAPassmarkBaseLine(const VPiece &piece) const
                                                  "seam allowance. User must manually provide length.")
                     .arg(m_data.nodeName, m_data.pieceName);
             qApp->IsPedantic() ? throw VExceptionInvalidNotch(errorMsg) :
-                                 qWarning() << VAbstractApplication::patternMessageSignature + errorMsg;
+                                 qWarning() << VAbstractValApplication::patternMessageSignature + errorMsg;
             return QVector<QLineF>();
         }
     }
@@ -848,7 +848,7 @@ QVector<QLineF> VPassmark::SAPassmarkBaseLine(const QVector<QPointF> &seamAllowa
         const QString errorMsg = QObject::tr("Cannot calculate a notch for point '%1' in piece '%2'. Seam allowance is "
                                              "empty.").arg(m_data.nodeName, m_data.pieceName);
         qApp->IsPedantic() ? throw VExceptionInvalidNotch(errorMsg) :
-                             qWarning() << VAbstractApplication::patternMessageSignature + errorMsg;
+                             qWarning() << VAbstractValApplication::patternMessageSignature + errorMsg;
         return QVector<QLineF>(); // Something wrong
     }
 
@@ -860,7 +860,7 @@ QVector<QLineF> VPassmark::SAPassmarkBaseLine(const QVector<QPointF> &seamAllowa
                                              "position for a notch.")
                 .arg(m_data.nodeName, m_data.pieceName);
         qApp->IsPedantic() ? throw VExceptionInvalidNotch(errorMsg) :
-                             qWarning() << VAbstractApplication::patternMessageSignature + errorMsg;
+                             qWarning() << VAbstractValApplication::patternMessageSignature + errorMsg;
         return QVector<QLineF>(); // Something wrong
     }
 
@@ -870,7 +870,7 @@ QVector<QLineF> VPassmark::SAPassmarkBaseLine(const QVector<QPointF> &seamAllowa
                                              "notch position.")
                 .arg(m_data.nodeName, m_data.pieceName);
         qApp->IsPedantic() ? throw VExceptionInvalidNotch(errorMsg) :
-                             qWarning() << VAbstractApplication::patternMessageSignature + errorMsg;
+                             qWarning() << VAbstractValApplication::patternMessageSignature + errorMsg;
     }
 
     auto PassmarkIntersection = [this, seamAllowance] (QLineF line, qreal width)
@@ -897,7 +897,7 @@ QVector<QLineF> VPassmark::SAPassmarkBaseLine(const QVector<QPointF> &seamAllowa
                                                              "less than minimal allowed.")
                                 .arg(m_data.nodeName, m_data.pieceName);
                         qApp->IsPedantic() ? throw VException(errorMsg) :
-                                             qWarning() << VAbstractApplication::patternMessageSignature + errorMsg;
+                                             qWarning() << VAbstractValApplication::patternMessageSignature + errorMsg;
                         return QLineF();
                     }
                     line.setLength(length);
@@ -914,7 +914,7 @@ QVector<QLineF> VPassmark::SAPassmarkBaseLine(const QVector<QPointF> &seamAllowa
                                                      "collapse.")
                         .arg(m_data.nodeName, m_data.pieceName);
                 qApp->IsPedantic() ? throw VExceptionInvalidNotch(errorMsg) :
-                                     qWarning() << VAbstractApplication::patternMessageSignature + errorMsg;
+                                     qWarning() << VAbstractValApplication::patternMessageSignature + errorMsg;
             }
         }
         else
@@ -923,7 +923,7 @@ QVector<QLineF> VPassmark::SAPassmarkBaseLine(const QVector<QPointF> &seamAllowa
                                                  "intersection.")
                     .arg(m_data.nodeName, m_data.pieceName);
             qApp->IsPedantic() ? throw VExceptionInvalidNotch(errorMsg) :
-                                 qWarning() << VAbstractApplication::patternMessageSignature + errorMsg;
+                                 qWarning() << VAbstractValApplication::patternMessageSignature + errorMsg;
         }
 
         return QLineF();
@@ -938,7 +938,7 @@ QVector<QLineF> VPassmark::SAPassmarkBaseLine(const QVector<QPointF> &seamAllowa
                                                  "than minimal allowed.")
                     .arg(m_data.nodeName, m_data.pieceName);
             qApp->IsPedantic() ? throw VExceptionInvalidNotch(errorMsg) :
-                                 qWarning() << VAbstractApplication::patternMessageSignature + errorMsg;
+                                 qWarning() << VAbstractValApplication::patternMessageSignature + errorMsg;
         }
         else
         {
diff --git a/src/libs/vpatterndb/vpiece.cpp b/src/libs/vpatterndb/vpiece.cpp
index 44ee8202a..b5c7ff486 100644
--- a/src/libs/vpatterndb/vpiece.cpp
+++ b/src/libs/vpatterndb/vpiece.cpp
@@ -34,7 +34,7 @@
 #include "../vgeometry/vplacelabelitem.h"
 #include "../vgeometry/varc.h"
 #include "vcontainer.h"
-#include "../vmisc/vabstractapplication.h"
+#include "../vmisc/vabstractvalapplication.h"
 #include "../vmisc/compatibility.h"
 #include "../ifc/exception/vexceptioninvalidnotch.h"
 #include "../vlayout/testpath.h"
@@ -937,7 +937,7 @@ bool VPiece::GetPassmarkPreviousSAPoints(const QVector<VPieceNode> &path, int in
         const QString errorMsg = tr("Cannot calculate a notch for point '%1' in piece '%2'.")
                 .arg(VPiecePath::NodeName(path, passmarkIndex, data), GetName());
         qApp->IsPedantic() ? throw VExceptionInvalidNotch(errorMsg) :
-                             qWarning() << VAbstractApplication::patternMessageSignature + errorMsg;
+                             qWarning() << VAbstractValApplication::patternMessageSignature + errorMsg;
         return false; // Something wrong
     }
 
@@ -976,7 +976,7 @@ bool VPiece::GetPassmarkNextSAPoints(const QVector<VPieceNode> &path, int index,
         const QString errorMsg = tr("Cannot calculate a notch for point '%1' in piece '%2'.")
                 .arg(VPiecePath::NodeName(path, passmarkIndex, data), GetName());
         qApp->IsPedantic() ? throw VExceptionInvalidNotch(errorMsg) :
-                             qWarning() << VAbstractApplication::patternMessageSignature + errorMsg;
+                             qWarning() << VAbstractValApplication::patternMessageSignature + errorMsg;
         return false; // Something wrong
     }
 
@@ -1060,7 +1060,7 @@ VPassmark VPiece::CreatePassmark(const QVector<VPieceNode> &path, int previousIn
         const QString errorMsg = tr("Cannot calculate a notch for point '%1' in piece '%2'.")
                 .arg(VPiecePath::NodeName(path, passmarkIndex, data), GetName());
         qApp->IsPedantic() ? throw VExceptionInvalidNotch(errorMsg) :
-                             qWarning() << VAbstractApplication::patternMessageSignature + errorMsg;
+                             qWarning() << VAbstractValApplication::patternMessageSignature + errorMsg;
         return VPassmark();
     }
 
@@ -1089,7 +1089,7 @@ VPassmark VPiece::CreatePassmark(const QVector<VPieceNode> &path, int previousIn
         const QString infoMsg = tr("Notch for point '%1' in piece '%2' will be disabled. Manual length is less than "
                                     "allowed value.")
                 .arg(VPiecePath::NodeName(path, passmarkIndex, data), GetName());
-        qInfo() << VAbstractApplication::patternMessageSignature + infoMsg;
+        qInfo() << VAbstractValApplication::patternMessageSignature + infoMsg;
         return VPassmark();
     }
 
diff --git a/src/libs/vpatterndb/vpiecenode.cpp b/src/libs/vpatterndb/vpiecenode.cpp
index db9b995bb..1798f2a02 100644
--- a/src/libs/vpatterndb/vpiecenode.cpp
+++ b/src/libs/vpatterndb/vpiecenode.cpp
@@ -31,7 +31,7 @@
 #include "vcontainer.h"
 #include "calculator.h"
 #include "vformula.h"
-#include "../vmisc/vabstractapplication.h"
+#include "../vmisc/vabstractvalapplication.h"
 
 #include <QDataStream>
 #include <QtNumeric>
@@ -162,7 +162,7 @@ qreal VPieceNode::GetSABefore(const VContainer *data) const
         const QString errorMsg = QObject::tr("Cannot calculate seam allowance before for point '%1'. Reason: %2.")
                 .arg(nodeName, formula.Reason());
         qApp->IsPedantic() ? throw VException(errorMsg) :
-                             qWarning() << VAbstractApplication::patternMessageSignature + errorMsg;
+                             qWarning() << VAbstractValApplication::patternMessageSignature + errorMsg;
         return -1;
     }
     return formula.getDoubleValue();
@@ -193,7 +193,7 @@ qreal VPieceNode::GetSABefore(const VContainer *data, Unit unit) const
         const QString errorMsg = QObject::tr("Cannot calculate seam allowance before for point '%1'. Reason: %2.")
                 .arg(nodeName, formula.Reason());
         qApp->IsPedantic() ? throw VException(errorMsg) :
-                             qWarning() << VAbstractApplication::patternMessageSignature + errorMsg;
+                             qWarning() << VAbstractValApplication::patternMessageSignature + errorMsg;
         return -1;
     }
 
@@ -245,7 +245,7 @@ qreal VPieceNode::GetSAAfter(const VContainer *data) const
         const QString errorMsg = QObject::tr("Cannot calculate seam allowance after for point '%1'. Reason: %2.")
                 .arg(nodeName, formula.Reason());
         qApp->IsPedantic() ? throw VException(errorMsg) :
-                             qWarning() << VAbstractApplication::patternMessageSignature + errorMsg;
+                             qWarning() << VAbstractValApplication::patternMessageSignature + errorMsg;
         return -1;
     }
 
@@ -277,7 +277,7 @@ qreal VPieceNode::GetSAAfter(const VContainer *data, Unit unit) const
         const QString errorMsg = QObject::tr("Cannot calculate seam allowance after for point '%1'. Reason: ")
                 .arg(nodeName, formula.Reason());
         qApp->IsPedantic() ? throw VException(errorMsg) :
-                             qWarning() << VAbstractApplication::patternMessageSignature + errorMsg;
+                             qWarning() << VAbstractValApplication::patternMessageSignature + errorMsg;
         return -1;
     }
 
@@ -343,7 +343,7 @@ qreal VPieceNode::GetPassmarkLength(const VContainer *data, Unit unit) const
             const QString errorMsg = QObject::tr("Cannot calculate passmark length for point '%1'. Reason: %2.")
                     .arg(nodeName, formula.Reason());
             qApp->IsPedantic() ? throw VException(errorMsg) :
-                                 qWarning() << VAbstractApplication::patternMessageSignature + errorMsg;
+                                 qWarning() << VAbstractValApplication::patternMessageSignature + errorMsg;
             return VSAPoint::maxPassmarkLength;
         }
 
diff --git a/src/libs/vpatterndb/vpiecepath.cpp b/src/libs/vpatterndb/vpiecepath.cpp
index 9ba8fa888..59c2ebb73 100644
--- a/src/libs/vpatterndb/vpiecepath.cpp
+++ b/src/libs/vpatterndb/vpiecepath.cpp
@@ -32,7 +32,7 @@
 #include "../vgeometry/vpointf.h"
 #include "../vlayout/vabstractpiece.h"
 #include "calculator.h"
-#include "../vmisc/vabstractapplication.h"
+#include "../vmisc/vabstractvalapplication.h"
 #include "../vmisc/compatibility.h"
 #include "../ifc/exception/vexceptionobjecterror.h"
 
@@ -385,7 +385,7 @@ QVector<QPointF> VPiecePath::PathPoints(const VContainer *data, const QVector<QP
                                                      "point with cutting countour")
                         .arg(GetName());
                 qApp->IsPedantic() ? throw VExceptionObjectError(errorMsg) :
-                                     qWarning() << VAbstractApplication::patternMessageSignature + errorMsg;
+                                     qWarning() << VAbstractValApplication::patternMessageSignature + errorMsg;
             }
         }
 
@@ -402,7 +402,7 @@ QVector<QPointF> VPiecePath::PathPoints(const VContainer *data, const QVector<QP
                                                      "point with cutting countour")
                         .arg(GetName());
                 qApp->IsPedantic() ? throw VExceptionObjectError(errorMsg) :
-                                     qWarning() << VAbstractApplication::patternMessageSignature + errorMsg;
+                                     qWarning() << VAbstractValApplication::patternMessageSignature + errorMsg;
             }
         }
 
diff --git a/src/libs/vpatterndb/vtranslatevars.cpp b/src/libs/vpatterndb/vtranslatevars.cpp
index aa4870654..0931a12b2 100644
--- a/src/libs/vpatterndb/vtranslatevars.cpp
+++ b/src/libs/vpatterndb/vtranslatevars.cpp
@@ -52,7 +52,6 @@ VTranslateVars::VTranslateVars()
     InitPatternMakingSystems();
     InitVariables();
     InitFunctions();
-    InitPlaceholder();
 
     PrepareFunctionTranslations();
 }
@@ -536,38 +535,6 @@ void VTranslateVars::InitFunctions()
                                                   "function fmod"));
 }
 
-//---------------------------------------------------------------------------------------------------------------------
-void VTranslateVars::InitPlaceholder()
-{
-    placeholders.insert(pl_size,          translate("VTranslateVars", "size",          "placeholder"));
-    placeholders.insert(pl_height,        translate("VTranslateVars", "height",        "placeholder"));
-    placeholders.insert(pl_date,          translate("VTranslateVars", "date",          "placeholder"));
-    placeholders.insert(pl_time,          translate("VTranslateVars", "time",          "placeholder"));
-    placeholders.insert(pl_patternName,   translate("VTranslateVars", "patternName",   "placeholder"));
-    placeholders.insert(pl_patternNumber, translate("VTranslateVars", "patternNumber", "placeholder"));
-    placeholders.insert(pl_author,        translate("VTranslateVars", "author",        "placeholder"));
-    placeholders.insert(pl_customer,      translate("VTranslateVars", "customer",      "placeholder"));
-    placeholders.insert(pl_userMaterial,  translate("VTranslateVars", "userMaterial",  "placeholder"));
-    placeholders.insert(pl_pExt,          translate("VTranslateVars", "pExt",          "placeholder"));
-    placeholders.insert(pl_pFileName,     translate("VTranslateVars", "pFileName",     "placeholder"));
-    placeholders.insert(pl_mFileName,     translate("VTranslateVars", "mFileName",     "placeholder"));
-    placeholders.insert(pl_mExt,          translate("VTranslateVars", "mExt",          "placeholder"));
-    placeholders.insert(pl_pLetter,       translate("VTranslateVars", "pLetter",       "placeholder"));
-    placeholders.insert(pl_pAnnotation,   translate("VTranslateVars", "pAnnotation",   "placeholder"));
-    placeholders.insert(pl_pOrientation,  translate("VTranslateVars", "pOrientation",  "placeholder"));
-    placeholders.insert(pl_pRotation,     translate("VTranslateVars", "pRotation",     "placeholder"));
-    placeholders.insert(pl_pTilt,         translate("VTranslateVars", "pTilt",         "placeholder"));
-    placeholders.insert(pl_pFoldPosition, translate("VTranslateVars", "pFoldPosition", "placeholder"));
-    placeholders.insert(pl_pName,         translate("VTranslateVars", "pName",         "placeholder"));
-    placeholders.insert(pl_pQuantity,     translate("VTranslateVars", "pQuantity",     "placeholder"));
-    placeholders.insert(pl_mFabric,       translate("VTranslateVars", "mFabric",       "placeholder"));
-    placeholders.insert(pl_mLining,       translate("VTranslateVars", "mLining",       "placeholder"));
-    placeholders.insert(pl_mInterfacing,  translate("VTranslateVars", "mInterfacing",  "placeholder"));
-    placeholders.insert(pl_mInterlining,  translate("VTranslateVars", "mInterlining",  "placeholder"));
-    placeholders.insert(pl_wCut,          translate("VTranslateVars", "wCut",          "placeholder"));
-    placeholders.insert(pl_wOnFold,       translate("VTranslateVars", "wOnFold",       "placeholder"));
-}
-
 #undef translate
 
 //---------------------------------------------------------------------------------------------------------------------
@@ -761,101 +728,6 @@ QString VTranslateVars::InternalVarToUser(const QString &var) const
     }
 }
 
-//---------------------------------------------------------------------------------------------------------------------
-QString VTranslateVars::PlaceholderToUser(QString var) const
-{
-    QString number;
-    if (var.startsWith(pl_userMaterial) && var.length() > pl_userMaterial.length())
-    {
-        number = var.right(var.length() - pl_userMaterial.length());
-        var = pl_userMaterial;
-    }
-
-    if (placeholders.contains(var))
-    {
-        return placeholders.value(var).translate(qApp->Settings()->GetLocale()) + number;
-    }
-
-    return var;
-}
-
-//---------------------------------------------------------------------------------------------------------------------
-QString VTranslateVars::PlaceholderToUserText(QString text) const
-{
-    QChar per('%');
-    auto i = placeholders.constBegin();
-    while (i != placeholders.constEnd())
-    {
-        if (i.key() != pl_userMaterial)
-        {
-            const QString translated = per + i.value().translate(qApp->Settings()->GetLocale()) + per;
-            const QString original = per + i.key() + per;
-
-            if (translated != original)
-            {
-                text.replace(original, translated);
-            }
-        }
-        else
-        {
-            const QString material_translated = i.value().translate(qApp->Settings()->GetLocale());
-            if (text.indexOf(i.key()) != -1)
-            {
-                for (int n = 0; n < userMaterialPlaceholdersQuantity; ++n)
-                {
-                    const QString number = QString::number(n + 1);
-                    const QString original = per + i.key() + number + per;
-                    const QString translated = per + material_translated + number + per;
-                    if (translated != original)
-                    {
-                        text.replace(original, translated);
-                    }
-                }
-            }
-        }
-        ++i;
-    }
-    return text;
-}
-
-//---------------------------------------------------------------------------------------------------------------------
-QString VTranslateVars::PlaceholderFromUserText(QString text) const
-{
-    QChar per('%');
-    auto i = placeholders.constBegin();
-    while (i != placeholders.constEnd())
-    {
-        if (i.key() != pl_userMaterial)
-        {
-            const QString original = per + i.key() + per;
-            const QString translated = per + i.value().translate(qApp->Settings()->GetLocale()) + per;
-            if (translated != original)
-            {
-                text.replace(translated, original);
-            }
-        }
-        else
-        {
-            const QString material_translated = i.value().translate(qApp->Settings()->GetLocale());
-            if (text.indexOf(material_translated) != -1)
-            {
-                for (int n = 0; n < userMaterialPlaceholdersQuantity; ++n)
-                {
-                    const QString number = QString::number(n + 1);
-                    const QString original = per + i.key() + number + per;
-                    const QString translated = per + material_translated + number + per;
-                    if (translated != original)
-                    {
-                        text.replace(translated, original);
-                    }
-                }
-            }
-        }
-        ++i;
-    }
-    return text;
-}
-
 //---------------------------------------------------------------------------------------------------------------------
 QString VTranslateVars::VarToUser(const QString &var) const
 {
@@ -1187,7 +1059,6 @@ void VTranslateVars::Retranslate()
     InitPatternMakingSystems();
     InitVariables();
     InitFunctions();
-    InitPlaceholder();
 
     PrepareFunctionTranslations();
 }
diff --git a/src/libs/vpatterndb/vtranslatevars.h b/src/libs/vpatterndb/vtranslatevars.h
index c5d02c94d..9b68c1a2f 100644
--- a/src/libs/vpatterndb/vtranslatevars.h
+++ b/src/libs/vpatterndb/vtranslatevars.h
@@ -45,10 +45,6 @@ public:
     bool VariablesToUser(QString &newFormula, int position, const QString &token, int &bias) const;
 
     QString InternalVarToUser(const QString &var) const;
-    QString PlaceholderToUser(QString var) const;
-
-    QString PlaceholderToUserText(QString text) const;
-    QString PlaceholderFromUserText(QString text) const;
 
     QString VarToUser(const QString &var) const;
     QString VarFromUser(const QString &var) const;
@@ -79,14 +75,12 @@ private:
     QMap<QString, qmu::QmuTranslation> variables{};
     QMap<QString, qmu::QmuTranslation> functions{};
     QMap<QString, qmu::QmuTranslation> functionsDescriptions{};
-    QMap<QString, qmu::QmuTranslation> placeholders{};
     QMap<QString, qmu::QmuTranslation> stDescriptions{};
     QMap<QString, QString> translatedFunctions{};
 
     void InitPatternMakingSystems();
     void InitVariables();
     void InitFunctions();
-    void InitPlaceholder();
 
     void PrepareFunctionTranslations();
 
diff --git a/src/libs/vtools/dialogs/support/dialogeditlabel.cpp b/src/libs/vtools/dialogs/support/dialogeditlabel.cpp
index 8dd194a58..e5a7655ea 100644
--- a/src/libs/vtools/dialogs/support/dialogeditlabel.cpp
+++ b/src/libs/vtools/dialogs/support/dialogeditlabel.cpp
@@ -45,11 +45,12 @@
 #include <QDate>
 
 //---------------------------------------------------------------------------------------------------------------------
-DialogEditLabel::DialogEditLabel(VAbstractPattern *doc, QWidget *parent)
+DialogEditLabel::DialogEditLabel(VAbstractPattern *doc, const VContainer *data, QWidget *parent)
     : QDialog(parent),
       ui(new Ui::DialogEditLabel),
       m_placeholdersMenu(new QMenu(this)),
       m_doc(doc),
+      m_data(data),
       m_placeholders()
 {
     ui->setupUi(this);
@@ -478,7 +479,7 @@ void DialogEditLabel::InitPlaceholdersMenu()
     {
         auto value = i.value();
         QAction *action = m_placeholdersMenu->addAction(value.first);
-        action->setData(per + qApp->TrVars()->PlaceholderToUser(i.key()) + per);
+        action->setData(per + i.key() + per);
         connect(action, &QAction::triggered, this, &DialogEditLabel::InsertPlaceholder);
         ++i;
     }
@@ -500,13 +501,27 @@ void DialogEditLabel::InitPlaceholders()
     m_placeholders.insert(pl_patternNumber, qMakePair(tr("Pattern number"), m_doc->GetPatternNumber()));
     m_placeholders.insert(pl_author, qMakePair(tr("Company name or designer name"), m_doc->GetCompanyName()));
 
-    if (qApp->patternType() == MeasurementsType::Individual)
+    m_placeholders.insert(pl_mUnits, qMakePair(tr("Measurements units"), UnitsToStr(qApp->MeasurementsUnits(), true)));
+    m_placeholders.insert(pl_pUnits, qMakePair(tr("Pattern units"), UnitsToStr(qApp->patternUnits(), true)));
+    m_placeholders.insert(pl_mSizeUnits, qMakePair(tr("Size units"), UnitsToStr(qApp->DimensionSizeUnits(), true)));
+
+    if (qApp->GetMeasurementsType() == MeasurementsType::Individual)
     {
         m_placeholders.insert(pl_customer, qMakePair(tr("Customer name"), qApp->GetCustomerName()));
+
+        const QString birthDate = locale.toString(qApp->GetCustomerBirthDate(), m_doc->GetLabelDateFormat());
+        m_placeholders.insert(pl_birthDate, qMakePair(tr("Customer birth date"), birthDate));
+
+        m_placeholders.insert(pl_email, qMakePair(tr("Customer email"), qApp->CustomerEmail()));
     }
     else
     {
         m_placeholders.insert(pl_customer, qMakePair(tr("Customer name"), m_doc->GetCustomerName()));
+
+        const QString birthDate = locale.toString(m_doc->GetCustomerBirthDate(), m_doc->GetLabelDateFormat());
+        m_placeholders.insert(pl_birthDate, qMakePair(tr("Customer birth date"), birthDate));
+
+        m_placeholders.insert(pl_email, qMakePair(tr("Customer email"), m_doc->GetCustomerEmail()));
     }
 
     m_placeholders.insert(pl_pExt, qMakePair(tr("Pattern extension"), QString("val")));
@@ -517,25 +532,14 @@ void DialogEditLabel::InitPlaceholders()
     const QString measurementsFilePath = QFileInfo(m_doc->MPath()).baseName();
     m_placeholders.insert(pl_mFileName, qMakePair(tr("Measurments file name"), measurementsFilePath));
 
-    QString curSize;
-    QString curHeight;
-    QString mExt;
-    if (qApp->patternType() == MeasurementsType::Multisize)
-    {
-        curSize = QString::number(VContainer::size(valentinaNamespace));
-        curHeight = QString::number(VContainer::height(valentinaNamespace));
-        mExt = "vst";
-    }
-    else if (qApp->patternType() == MeasurementsType::Individual)
-    {
-        curSize = QString::number(VContainer::size(valentinaNamespace));
-        curHeight = QString::number(VContainer::height(valentinaNamespace));
-        mExt = "vit";
-    }
-
-    m_placeholders.insert(pl_size, qMakePair(tr("Size"), curSize));
-    m_placeholders.insert(pl_height, qMakePair(tr("Height"), curHeight));
-    m_placeholders.insert(pl_mExt, qMakePair(tr("Measurments extension"), mExt));
+    m_placeholders.insert(pl_height, qMakePair(tr("Height"), QString::number(qApp->GetDimensionHeight())));
+    m_placeholders.insert(pl_size, qMakePair(tr("Size"), QString::number(qApp->GetDimensionSize())));
+    m_placeholders.insert(pl_hip, qMakePair(tr("Hip"), QString::number(qApp->GetDimensionHip())));
+    m_placeholders.insert(pl_waist, qMakePair(tr("Waist"), QString::number(qApp->GetDimensionWaist())));
+    m_placeholders.insert(pl_mExt,
+                          qMakePair(tr("Measurments extension"),
+                                    qApp->GetMeasurementsType() == MeasurementsType::Multisize ? QString("vst")
+                                                                                               : QString("vit")));
 
     const QString materialDescription = tr("User material");
     const QMap<int, QString> materials = m_doc->GetPatternMaterials();
@@ -552,21 +556,31 @@ void DialogEditLabel::InitPlaceholders()
         m_placeholders.insert(pl_userMaterial + number, qMakePair(materialDescription + number, value));
     }
 
+    const QMap<QString, QSharedPointer<VMeasurement> > measurements = m_data->DataMeasurements();
+    auto i = measurements.constBegin();
+    while (i != measurements.constEnd())
+    {
+        QString description = i.value()->GetGuiText().isEmpty() ? i.key() : i.value()->GetGuiText();
+        m_placeholders.insert(pl_measurement + i.key(), qMakePair(tr("Measurement: %1").arg(description),
+                                                                  QString::number(*i.value()->GetValue())));
+        ++i;
+    }
+
     // Piece tags
-    m_placeholders.insert(pl_pLetter, qMakePair(tr("Piece letter"), QString(QString())));
-    m_placeholders.insert(pl_pAnnotation, qMakePair(tr("Piece annotation"), QString(QString())));
-    m_placeholders.insert(pl_pOrientation, qMakePair(tr("Piece orientation"), QString(QString())));
-    m_placeholders.insert(pl_pRotation, qMakePair(tr("Piece rotation"), QString(QString())));
-    m_placeholders.insert(pl_pTilt, qMakePair(tr("Piece tilt"), QString(QString())));
-    m_placeholders.insert(pl_pFoldPosition, qMakePair(tr("Piece fold position"), QString(QString())));
-    m_placeholders.insert(pl_pName, qMakePair(tr("Piece name"), QString(QString())));
-    m_placeholders.insert(pl_pQuantity, qMakePair(tr("Quantity"), QString(QString())));
+    m_placeholders.insert(pl_pLetter, qMakePair(tr("Piece letter"), QString()));
+    m_placeholders.insert(pl_pAnnotation, qMakePair(tr("Piece annotation"), QString()));
+    m_placeholders.insert(pl_pOrientation, qMakePair(tr("Piece orientation"), QString()));
+    m_placeholders.insert(pl_pRotation, qMakePair(tr("Piece rotation"), QString()));
+    m_placeholders.insert(pl_pTilt, qMakePair(tr("Piece tilt"), QString()));
+    m_placeholders.insert(pl_pFoldPosition, qMakePair(tr("Piece fold position"), QString()));
+    m_placeholders.insert(pl_pName, qMakePair(tr("Piece name"), QString()));
+    m_placeholders.insert(pl_pQuantity, qMakePair(tr("Quantity"), QString()));
     m_placeholders.insert(pl_mFabric, qMakePair(tr("Material: Fabric"), tr("Fabric")));
     m_placeholders.insert(pl_mLining, qMakePair(tr("Material: Lining"), tr("Lining")));
     m_placeholders.insert(pl_mInterfacing, qMakePair(tr("Material: Interfacing"), tr("Interfacing")));
     m_placeholders.insert(pl_mInterlining, qMakePair(tr("Material: Interlining"), tr("Interlining")));
     m_placeholders.insert(pl_wCut, qMakePair(tr("Word: Cut"), tr("Cut")));
-    m_placeholders.insert(pl_wOnFold, qMakePair(tr("Word: on fold"), QString(QString())));// By default should be empty
+    m_placeholders.insert(pl_wOnFold, qMakePair(tr("Word: on fold"), QString()));// By default should be empty
 }
 
 //---------------------------------------------------------------------------------------------------------------------
@@ -592,7 +606,7 @@ QVector<VLabelTemplateLine> DialogEditLabel::GetTemplate() const
         if (lineItem)
         {
             VLabelTemplateLine line;
-            line.line = qApp->TrVars()->PlaceholderFromUserText(lineItem->text());
+            line.line = lineItem->text();
             line.alignment = lineItem->textAlignment();
             line.fontSizeIncrement = lineItem->data(Qt::UserRole).toInt();
 
@@ -617,7 +631,7 @@ void DialogEditLabel::SetTemplate(const QVector<VLabelTemplateLine> &lines)
 
     for (auto &line : lines)
     {
-        QListWidgetItem *item = new QListWidgetItem(qApp->TrVars()->PlaceholderToUserText(line.line));
+        QListWidgetItem *item = new QListWidgetItem(line.line);
         item->setTextAlignment(line.alignment);
         item->setData(Qt::UserRole, line.fontSizeIncrement);
 
diff --git a/src/libs/vtools/dialogs/support/dialogeditlabel.h b/src/libs/vtools/dialogs/support/dialogeditlabel.h
index 1232177d8..d663ebe29 100644
--- a/src/libs/vtools/dialogs/support/dialogeditlabel.h
+++ b/src/libs/vtools/dialogs/support/dialogeditlabel.h
@@ -42,13 +42,14 @@ struct VLabelTemplateLine;
 class QMenu;
 class VAbstractPattern;
 class VPiece;
+class VContainer;
 
 class DialogEditLabel : public QDialog
 {
     Q_OBJECT
 
 public:
-    explicit DialogEditLabel(VAbstractPattern *doc, QWidget *parent = nullptr);
+    explicit DialogEditLabel(VAbstractPattern *doc, const VContainer *data, QWidget *parent = nullptr);
     virtual ~DialogEditLabel();
 
     QVector<VLabelTemplateLine> GetTemplate() const;
@@ -75,6 +76,7 @@ private:
     Ui::DialogEditLabel *ui;
     QMenu               *m_placeholdersMenu;
     VAbstractPattern    *m_doc;
+    const VContainer    *m_data;
 
     QMap<QString, QPair<QString, QString>> m_placeholders;
 
diff --git a/src/libs/vtools/dialogs/support/dialogeditwrongformula.cpp b/src/libs/vtools/dialogs/support/dialogeditwrongformula.cpp
index a7d3663ab..7a09bdb0e 100644
--- a/src/libs/vtools/dialogs/support/dialogeditwrongformula.cpp
+++ b/src/libs/vtools/dialogs/support/dialogeditwrongformula.cpp
@@ -191,44 +191,48 @@ void DialogEditWrongFormula::ValChanged(int row)
         if (ui->radioButtonStandardTable->isChecked())
         {
             const QSharedPointer<VMeasurement> stable = data->GetVariable<VMeasurement>(name);
-            SetDescription(item->text(), *stable->GetValue(), UnitsToStr(qApp->patternUnit(), true),
-                           stable->GetGuiText());
+            SetDescription(item->text(), *stable->GetValue(), stable->IsSpecialUnits(), stable->GetGuiText());
         }
         else if (ui->radioButtonIncrements->isChecked())
         {
             const QSharedPointer<VIncrement> incr = data->GetVariable<VIncrement>(name);
-            SetDescription(item->text(), *incr->GetValue(), UnitsToStr(qApp->patternUnit(), true),
-                           incr->GetDescription());
+            const bool specialUnits = false;
+            SetDescription(item->text(), *incr->GetValue(), specialUnits, incr->GetDescription());
         }
         else if (ui->radioButtonPC->isChecked())
         {
             const QSharedPointer<VIncrement> incr = data->GetVariable<VIncrement>(name);
-            SetDescription(item->text(), *incr->GetValue(), UnitsToStr(qApp->patternUnit(), true),
-                           incr->GetDescription());
+            const bool specialUnits = false;
+            SetDescription(item->text(), *incr->GetValue(), specialUnits, incr->GetDescription());
         }
         else if (ui->radioButtonLengthLine->isChecked())
         {
-            SetDescription(item->text(), *data->GetVariable<VLengthLine>(name)->GetValue(),
-                           UnitsToStr(qApp->patternUnit(), true), tr("Line length"));
+            const bool specialUnits = false;
+            SetDescription(item->text(), *data->GetVariable<VLengthLine>(name)->GetValue(), specialUnits,
+                           tr("Line length"));
         }
         else if (ui->radioButtonLengthSpline->isChecked())
         {
-            SetDescription(item->text(), *data->GetVariable<VCurveLength>(name)->GetValue(),
-                           UnitsToStr(qApp->patternUnit(), true), tr("Curve length"));
+            const bool specialUnits = false;
+            SetDescription(item->text(), *data->GetVariable<VCurveLength>(name)->GetValue(), specialUnits,
+                           tr("Curve length"));
         }
         else if (ui->radioButtonAngleLine->isChecked())
         {
-            SetDescription(item->text(), *data->GetVariable<VLineAngle>(name)->GetValue(), degreeSymbol,
+            const bool specialUnits = true;
+            SetDescription(item->text(), *data->GetVariable<VLineAngle>(name)->GetValue(), specialUnits,
                            tr("Line Angle"));
         }
         else if (ui->radioButtonRadiusesArcs->isChecked())
         {
-            SetDescription(item->text(), *data->GetVariable<VArcRadius>(name)->GetValue(),
-                           UnitsToStr(qApp->patternUnit(), true), tr("Arc radius"));
+            const bool specialUnits = false;
+            SetDescription(item->text(), *data->GetVariable<VArcRadius>(name)->GetValue(), specialUnits,
+                           tr("Arc radius"));
         }
         else if (ui->radioButtonAnglesCurves->isChecked())
         {
-            SetDescription(item->text(), *data->GetVariable<VCurveAngle>(name)->GetValue(), degreeSymbol,
+            const bool specialUnits = true;
+            SetDescription(item->text(), *data->GetVariable<VCurveAngle>(name)->GetValue(), specialUnits,
                            tr("Curve angle"));
         }
         else if (ui->radioButtonFunctions->isChecked())
@@ -503,10 +507,11 @@ void DialogEditWrongFormula::InitVariables()
 }
 
 //---------------------------------------------------------------------------------------------------------------------
-void DialogEditWrongFormula::SetDescription(const QString &name, qreal value, const QString &unit,
+void DialogEditWrongFormula::SetDescription(const QString &name, qreal value, bool specialUnits,
                                             const QString &description)
 {
-    const QString desc = QStringLiteral("%1(%2 %3) - %4").arg(name).arg(value).arg(unit, description);
+    const QString unit = specialUnits ? degreeSymbol : " " + UnitsToStr(qApp->patternUnits(), true);
+    const QString desc = QStringLiteral("%1(%2%3) - %4").arg(name).arg(value).arg(unit, description);
     ui->labelDescription->setText(desc);
 }
 
diff --git a/src/libs/vtools/dialogs/support/dialogeditwrongformula.h b/src/libs/vtools/dialogs/support/dialogeditwrongformula.h
index c228163f1..677802c1e 100644
--- a/src/libs/vtools/dialogs/support/dialogeditwrongformula.h
+++ b/src/libs/vtools/dialogs/support/dialogeditwrongformula.h
@@ -121,7 +121,7 @@ private:
     void ShowFunctions();
     void ShowIncrementsInPreviewCalculation(bool show);
 
-    void SetDescription(const QString &name, qreal value, const QString &unit, const QString &description);
+    void SetDescription(const QString &name, qreal value, bool specialUnits, const QString &description);
 };
 
 //---------------------------------------------------------------------------------------------------------------------
diff --git a/src/libs/vtools/dialogs/support/dialogundo.cpp b/src/libs/vtools/dialogs/support/dialogundo.cpp
index 658ca7041..ba6d48eec 100644
--- a/src/libs/vtools/dialogs/support/dialogundo.cpp
+++ b/src/libs/vtools/dialogs/support/dialogundo.cpp
@@ -33,7 +33,7 @@
 #include <QPushButton>
 #include <Qt>
 
-#include "../vmisc/vabstractapplication.h"
+#include "../vmisc/vabstractvalapplication.h"
 #include "../vmisc/vcommonsettings.h"
 #include "ui_dialogundo.h"
 
diff --git a/src/libs/vtools/dialogs/tools/dialogalongline.cpp b/src/libs/vtools/dialogs/tools/dialogalongline.cpp
index 787dad156..7a3da95c7 100644
--- a/src/libs/vtools/dialogs/tools/dialogalongline.cpp
+++ b/src/libs/vtools/dialogs/tools/dialogalongline.cpp
@@ -141,7 +141,7 @@ void DialogAlongLine::FXLength()
     DialogEditWrongFormula *dialog = new DialogEditWrongFormula(data, toolId, this);
     dialog->setWindowTitle(tr("Edit length"));
     dialog->SetFormula(GetFormula());
-    dialog->setPostfix(UnitsToStr(qApp->patternUnit(), true));
+    dialog->setPostfix(UnitsToStr(qApp->patternUnits(), true));
     if (dialog->exec() == QDialog::Accepted)
     {
         SetFormula(dialog->GetFormula());
@@ -157,7 +157,7 @@ void DialogAlongLine::EvalFormula()
     formulaData.variables = data->DataVariables();
     formulaData.labelEditFormula = ui->labelEditFormula;
     formulaData.labelResult = ui->labelResultCalculation;
-    formulaData.postfix = UnitsToStr(qApp->patternUnit(), true);
+    formulaData.postfix = UnitsToStr(qApp->patternUnits(), true);
     formulaData.checkZero = false;
 
     Eval(formulaData, flagFormula);
diff --git a/src/libs/vtools/dialogs/tools/dialogarc.cpp b/src/libs/vtools/dialogs/tools/dialogarc.cpp
index beaed8f44..b69adf174 100644
--- a/src/libs/vtools/dialogs/tools/dialogarc.cpp
+++ b/src/libs/vtools/dialogs/tools/dialogarc.cpp
@@ -328,7 +328,7 @@ void DialogArc::FXRadius()
     DialogEditWrongFormula *dialog = new DialogEditWrongFormula(data, toolId, this);
     dialog->setWindowTitle(tr("Edit radius"));
     dialog->SetFormula(GetRadius());
-    dialog->setPostfix(UnitsToStr(qApp->patternUnit(), true));
+    dialog->setPostfix(UnitsToStr(qApp->patternUnits(), true));
     if (dialog->exec() == QDialog::Accepted)
     {
         SetRadius(dialog->GetFormula());
@@ -375,7 +375,7 @@ void DialogArc::EvalRadius()
     formulaData.variables = data->DataVariables();
     formulaData.labelEditFormula = ui->labelEditRadius;
     formulaData.labelResult = ui->labelResultRadius;
-    formulaData.postfix = UnitsToStr(qApp->patternUnit(), true);
+    formulaData.postfix = UnitsToStr(qApp->patternUnits(), true);
 
     const qreal radius = Eval(formulaData, flagRadius);
 
diff --git a/src/libs/vtools/dialogs/tools/dialogarcwithlength.cpp b/src/libs/vtools/dialogs/tools/dialogarcwithlength.cpp
index ee683aa07..36c8f9126 100644
--- a/src/libs/vtools/dialogs/tools/dialogarcwithlength.cpp
+++ b/src/libs/vtools/dialogs/tools/dialogarcwithlength.cpp
@@ -290,7 +290,7 @@ void DialogArcWithLength::FXRadius()
     DialogEditWrongFormula *dialog = new DialogEditWrongFormula(data, toolId, this);
     dialog->setWindowTitle(tr("Edit radius"));
     dialog->SetFormula(GetRadius());
-    dialog->setPostfix(UnitsToStr(qApp->patternUnit(), true));
+    dialog->setPostfix(UnitsToStr(qApp->patternUnits(), true));
     if (dialog->exec() == QDialog::Accepted)
     {
         SetRadius(dialog->GetFormula());
@@ -318,7 +318,7 @@ void DialogArcWithLength::FXLength()
     DialogEditWrongFormula *dialog = new DialogEditWrongFormula(data, toolId, this);
     dialog->setWindowTitle(tr("Edit the arc length"));
     dialog->SetFormula(GetLength());
-    dialog->setPostfix(UnitsToStr(qApp->patternUnit(), true));
+    dialog->setPostfix(UnitsToStr(qApp->patternUnits(), true));
     if (dialog->exec() == QDialog::Accepted)
     {
         SetLength(dialog->GetFormula());
@@ -367,7 +367,7 @@ void DialogArcWithLength::Radius()
     formulaData.variables = data->DataVariables();
     formulaData.labelEditFormula = ui->labelEditRadius;
     formulaData.labelResult = ui->labelResultRadius;
-    formulaData.postfix = UnitsToStr(qApp->patternUnit(), true);
+    formulaData.postfix = UnitsToStr(qApp->patternUnits(), true);
     formulaData.checkLessThanZero = true;
 
     Eval(formulaData, flagRadius);
@@ -381,7 +381,7 @@ void DialogArcWithLength::Length()
     formulaData.variables = data->DataVariables();
     formulaData.labelEditFormula = ui->labelEditLength;
     formulaData.labelResult = ui->labelResultLength;
-    formulaData.postfix = UnitsToStr(qApp->patternUnit(), true);
+    formulaData.postfix = UnitsToStr(qApp->patternUnits(), true);
 
     Eval(formulaData, flagLength);
 }
diff --git a/src/libs/vtools/dialogs/tools/dialogbisector.cpp b/src/libs/vtools/dialogs/tools/dialogbisector.cpp
index 802538840..02149eb73 100644
--- a/src/libs/vtools/dialogs/tools/dialogbisector.cpp
+++ b/src/libs/vtools/dialogs/tools/dialogbisector.cpp
@@ -139,7 +139,7 @@ void DialogBisector::FXLength()
     DialogEditWrongFormula *dialog = new DialogEditWrongFormula(data, toolId, this);
     dialog->setWindowTitle(tr("Edit length"));
     dialog->SetFormula(GetFormula());
-    dialog->setPostfix(UnitsToStr(qApp->patternUnit(), true));
+    dialog->setPostfix(UnitsToStr(qApp->patternUnits(), true));
     if (dialog->exec() == QDialog::Accepted)
     {
         SetFormula(dialog->GetFormula());
@@ -155,7 +155,7 @@ void DialogBisector::EvalFormula()
     formulaData.variables = data->DataVariables();
     formulaData.labelEditFormula = ui->labelEditFormula;
     formulaData.labelResult = ui->labelResultCalculation;
-    formulaData.postfix = UnitsToStr(qApp->patternUnit(), true);
+    formulaData.postfix = UnitsToStr(qApp->patternUnits(), true);
     formulaData.checkZero = false;
 
     Eval(formulaData, flagFormula);
diff --git a/src/libs/vtools/dialogs/tools/dialogcutarc.cpp b/src/libs/vtools/dialogs/tools/dialogcutarc.cpp
index f69231475..58a4e1132 100644
--- a/src/libs/vtools/dialogs/tools/dialogcutarc.cpp
+++ b/src/libs/vtools/dialogs/tools/dialogcutarc.cpp
@@ -102,7 +102,7 @@ void DialogCutArc::FXLength()
     DialogEditWrongFormula *dialog = new DialogEditWrongFormula(data, toolId, this);
     dialog->setWindowTitle(tr("Edit length"));
     dialog->SetFormula(GetFormula());
-    dialog->setPostfix(UnitsToStr(qApp->patternUnit(), true));
+    dialog->setPostfix(UnitsToStr(qApp->patternUnits(), true));
     if (dialog->exec() == QDialog::Accepted)
     {
         SetFormula(dialog->GetFormula());
@@ -118,7 +118,7 @@ void DialogCutArc::EvalFormula()
     formulaData.variables = data->DataVariables();
     formulaData.labelEditFormula = ui->labelEditFormula;
     formulaData.labelResult = ui->labelResultCalculation;
-    formulaData.postfix = UnitsToStr(qApp->patternUnit(), true);
+    formulaData.postfix = UnitsToStr(qApp->patternUnits(), true);
     formulaData.checkZero = false;
 
     Eval(formulaData, flagFormula);
diff --git a/src/libs/vtools/dialogs/tools/dialogcutspline.cpp b/src/libs/vtools/dialogs/tools/dialogcutspline.cpp
index 9b6c00ec0..57eca1a02 100644
--- a/src/libs/vtools/dialogs/tools/dialogcutspline.cpp
+++ b/src/libs/vtools/dialogs/tools/dialogcutspline.cpp
@@ -217,7 +217,7 @@ void DialogCutSpline::FXLength()
     DialogEditWrongFormula *dialog = new DialogEditWrongFormula(data, toolId, this);
     dialog->setWindowTitle(tr("Edit length"));
     dialog->SetFormula(GetFormula());
-    dialog->setPostfix(UnitsToStr(qApp->patternUnit(), true));
+    dialog->setPostfix(UnitsToStr(qApp->patternUnits(), true));
     if (dialog->exec() == QDialog::Accepted)
     {
         SetFormula(dialog->GetFormula());
@@ -233,7 +233,7 @@ void DialogCutSpline::EvalFormula()
     formulaData.variables = data->DataVariables();
     formulaData.labelEditFormula = ui->labelEditFormula;
     formulaData.labelResult = ui->labelResultCalculation;
-    formulaData.postfix = UnitsToStr(qApp->patternUnit(), true);
+    formulaData.postfix = UnitsToStr(qApp->patternUnits(), true);
     formulaData.checkZero = false;
 
     Eval(formulaData, flagFormula);
diff --git a/src/libs/vtools/dialogs/tools/dialogcutsplinepath.cpp b/src/libs/vtools/dialogs/tools/dialogcutsplinepath.cpp
index 3492f4dcd..500c44bd4 100644
--- a/src/libs/vtools/dialogs/tools/dialogcutsplinepath.cpp
+++ b/src/libs/vtools/dialogs/tools/dialogcutsplinepath.cpp
@@ -217,7 +217,7 @@ void DialogCutSplinePath::FXLength()
     DialogEditWrongFormula *dialog = new DialogEditWrongFormula(data, toolId, this);
     dialog->setWindowTitle(tr("Edit length"));
     dialog->SetFormula(GetFormula());
-    dialog->setPostfix(UnitsToStr(qApp->patternUnit(), true));
+    dialog->setPostfix(UnitsToStr(qApp->patternUnits(), true));
     if (dialog->exec() == QDialog::Accepted)
     {
         SetFormula(dialog->GetFormula());
@@ -233,7 +233,7 @@ void DialogCutSplinePath::EvalFormula()
     formulaData.variables = data->DataVariables();
     formulaData.labelEditFormula = ui->labelEditFormula;
     formulaData.labelResult = ui->labelResultCalculation;
-    formulaData.postfix = UnitsToStr(qApp->patternUnit(), true);
+    formulaData.postfix = UnitsToStr(qApp->patternUnits(), true);
     formulaData.checkZero = false;
 
     Eval(formulaData, flagFormula);
diff --git a/src/libs/vtools/dialogs/tools/dialogellipticalarc.cpp b/src/libs/vtools/dialogs/tools/dialogellipticalarc.cpp
index 03284d2c5..6c5a409a6 100644
--- a/src/libs/vtools/dialogs/tools/dialogellipticalarc.cpp
+++ b/src/libs/vtools/dialogs/tools/dialogellipticalarc.cpp
@@ -387,7 +387,7 @@ void DialogEllipticalArc::EvalRadiuses()
     formulaData.variables = data->DataVariables();
     formulaData.labelEditFormula = ui->labelEditRadius1;
     formulaData.labelResult = ui->labelResultRadius1;
-    formulaData.postfix = UnitsToStr(qApp->patternUnit(), true);
+    formulaData.postfix = UnitsToStr(qApp->patternUnits(), true);
     formulaData.checkLessThanZero = true;
 
     Eval(formulaData, flagRadius1);
@@ -434,7 +434,7 @@ void DialogEllipticalArc::FXRadius1()
     DialogEditWrongFormula *dialog = new DialogEditWrongFormula(data, toolId, this);
     dialog->setWindowTitle(tr("Edit radius1"));
     dialog->SetFormula(GetRadius1());
-    dialog->setPostfix(UnitsToStr(qApp->patternUnit(), true));
+    dialog->setPostfix(UnitsToStr(qApp->patternUnits(), true));
     if (dialog->exec() == QDialog::Accepted)
     {
         SetRadius1(dialog->GetFormula());
@@ -448,7 +448,7 @@ void DialogEllipticalArc::FXRadius2()
     DialogEditWrongFormula *dialog = new DialogEditWrongFormula(data, toolId, this);
     dialog->setWindowTitle(tr("Edit radius2"));
     dialog->SetFormula(GetRadius2());
-    dialog->setPostfix(UnitsToStr(qApp->patternUnit(), true));
+    dialog->setPostfix(UnitsToStr(qApp->patternUnits(), true));
     if (dialog->exec() == QDialog::Accepted)
     {
         SetRadius2(dialog->GetFormula());
diff --git a/src/libs/vtools/dialogs/tools/dialogendline.cpp b/src/libs/vtools/dialogs/tools/dialogendline.cpp
index b8cef020f..89f1e4801 100644
--- a/src/libs/vtools/dialogs/tools/dialogendline.cpp
+++ b/src/libs/vtools/dialogs/tools/dialogendline.cpp
@@ -150,7 +150,7 @@ void DialogEndLine::EvalLength()
     formulaData.variables = data->DataVariables();
     formulaData.labelEditFormula = ui->labelEditFormula;
     formulaData.labelResult = ui->labelResultCalculation;
-    formulaData.postfix = UnitsToStr(qApp->patternUnit(), true);
+    formulaData.postfix = UnitsToStr(qApp->patternUnits(), true);
     formulaData.checkLessThanZero = false;
 
     Eval(formulaData, flagFormula);
@@ -188,7 +188,7 @@ void DialogEndLine::FXLength()
     DialogEditWrongFormula *dialog = new DialogEditWrongFormula(data, toolId, this);
     dialog->setWindowTitle(tr("Edit length"));
     dialog->SetFormula(GetFormula());
-    dialog->setPostfix(UnitsToStr(qApp->patternUnit(), true));
+    dialog->setPostfix(UnitsToStr(qApp->patternUnits(), true));
     if (dialog->exec() == QDialog::Accepted)
     {
         SetFormula(dialog->GetFormula());
diff --git a/src/libs/vtools/dialogs/tools/dialogmove.cpp b/src/libs/vtools/dialogs/tools/dialogmove.cpp
index c079a97a5..0105f8e4b 100644
--- a/src/libs/vtools/dialogs/tools/dialogmove.cpp
+++ b/src/libs/vtools/dialogs/tools/dialogmove.cpp
@@ -479,7 +479,7 @@ void DialogMove::FXLength()
     DialogEditWrongFormula *dialog = new DialogEditWrongFormula(data, toolId, this);
     dialog->setWindowTitle(tr("Edit length"));
     dialog->SetFormula(GetLength());
-    dialog->setPostfix(UnitsToStr(qApp->patternUnit(), true));
+    dialog->setPostfix(UnitsToStr(qApp->patternUnits(), true));
     if (dialog->exec() == QDialog::Accepted)
     {
         SetLength(dialog->GetFormula());
@@ -630,7 +630,7 @@ void DialogMove::EvalLength()
     formulaData.variables = data->DataVariables();
     formulaData.labelEditFormula = ui->labelEditLength;
     formulaData.labelResult = ui->labelResultLength;
-    formulaData.postfix = UnitsToStr(qApp->patternUnit(), true);
+    formulaData.postfix = UnitsToStr(qApp->patternUnits(), true);
 
     Eval(formulaData, flagLength);
 }
diff --git a/src/libs/vtools/dialogs/tools/dialognormal.cpp b/src/libs/vtools/dialogs/tools/dialognormal.cpp
index 749d0931d..3c727291f 100644
--- a/src/libs/vtools/dialogs/tools/dialognormal.cpp
+++ b/src/libs/vtools/dialogs/tools/dialognormal.cpp
@@ -141,7 +141,7 @@ void DialogNormal::FXLength()
     DialogEditWrongFormula *dialog = new DialogEditWrongFormula(data, toolId, this);
     dialog->setWindowTitle(tr("Edit length"));
     dialog->SetFormula(GetFormula());
-    dialog->setPostfix(UnitsToStr(qApp->patternUnit(), true));
+    dialog->setPostfix(UnitsToStr(qApp->patternUnits(), true));
     if (dialog->exec() == QDialog::Accepted)
     {
         SetFormula(dialog->GetFormula());
@@ -157,7 +157,7 @@ void DialogNormal::EvalFormula()
     formulaData.variables = data->DataVariables();
     formulaData.labelEditFormula = ui->labelEditFormula;
     formulaData.labelResult = ui->labelResultCalculation;
-    formulaData.postfix = UnitsToStr(qApp->patternUnit(), true);
+    formulaData.postfix = UnitsToStr(qApp->patternUnits(), true);
 
     Eval(formulaData, flagFormula);
 }
diff --git a/src/libs/vtools/dialogs/tools/dialogpointfromcircleandtangent.cpp b/src/libs/vtools/dialogs/tools/dialogpointfromcircleandtangent.cpp
index 1ea5dc7d6..cf7e656c1 100644
--- a/src/libs/vtools/dialogs/tools/dialogpointfromcircleandtangent.cpp
+++ b/src/libs/vtools/dialogs/tools/dialogpointfromcircleandtangent.cpp
@@ -272,7 +272,7 @@ void DialogPointFromCircleAndTangent::FXCircleRadius()
     DialogEditWrongFormula *dialog = new DialogEditWrongFormula(data, toolId, this);
     dialog->setWindowTitle(tr("Edit radius"));
     dialog->SetFormula(GetCircleRadius());
-    dialog->setPostfix(UnitsToStr(qApp->patternUnit(), true));
+    dialog->setPostfix(UnitsToStr(qApp->patternUnits(), true));
     if (dialog->exec() == QDialog::Accepted)
     {
         SetCircleRadius(dialog->GetFormula());
@@ -288,7 +288,7 @@ void DialogPointFromCircleAndTangent::EvalCircleRadius()
     formulaData.variables = data->DataVariables();
     formulaData.labelEditFormula = ui->labelEditRadius;
     formulaData.labelResult = ui->labelResultCircleRadius;
-    formulaData.postfix = UnitsToStr(qApp->patternUnit(), true);
+    formulaData.postfix = UnitsToStr(qApp->patternUnits(), true);
 
     const qreal radius = Eval(formulaData, flagCircleRadius);
 
diff --git a/src/libs/vtools/dialogs/tools/dialogpointofcontact.cpp b/src/libs/vtools/dialogs/tools/dialogpointofcontact.cpp
index 74743ca3a..36f303936 100644
--- a/src/libs/vtools/dialogs/tools/dialogpointofcontact.cpp
+++ b/src/libs/vtools/dialogs/tools/dialogpointofcontact.cpp
@@ -149,7 +149,7 @@ void DialogPointOfContact::FXRadius()
     DialogEditWrongFormula *dialog = new DialogEditWrongFormula(data, toolId, this);
     dialog->setWindowTitle(tr("Edit radius"));
     dialog->SetFormula(getRadius());
-    dialog->setPostfix(UnitsToStr(qApp->patternUnit(), true));
+    dialog->setPostfix(UnitsToStr(qApp->patternUnits(), true));
     if (dialog->exec() == QDialog::Accepted)
     {
         setRadius(dialog->GetFormula());
@@ -165,7 +165,7 @@ void DialogPointOfContact::EvalFormula()
     formulaData.variables = data->DataVariables();
     formulaData.labelEditFormula = ui->labelEditFormula;
     formulaData.labelResult = ui->labelResultCalculation;
-    formulaData.postfix = UnitsToStr(qApp->patternUnit(), true);
+    formulaData.postfix = UnitsToStr(qApp->patternUnits(), true);
 
     Eval(formulaData, flagFormula);
 }
diff --git a/src/libs/vtools/dialogs/tools/dialogpointofintersectioncircles.cpp b/src/libs/vtools/dialogs/tools/dialogpointofintersectioncircles.cpp
index 9691d0775..ee63bcc80 100644
--- a/src/libs/vtools/dialogs/tools/dialogpointofintersectioncircles.cpp
+++ b/src/libs/vtools/dialogs/tools/dialogpointofintersectioncircles.cpp
@@ -323,7 +323,7 @@ void DialogPointOfIntersectionCircles::FXCircle1Radius()
     DialogEditWrongFormula *dialog = new DialogEditWrongFormula(data, toolId, this);
     dialog->setWindowTitle(tr("Edit first circle radius"));
     dialog->SetFormula(GetFirstCircleRadius());
-    dialog->setPostfix(UnitsToStr(qApp->patternUnit(), true));
+    dialog->setPostfix(UnitsToStr(qApp->patternUnits(), true));
     if (dialog->exec() == QDialog::Accepted)
     {
         SetFirstCircleRadius(dialog->GetFormula());
@@ -337,7 +337,7 @@ void DialogPointOfIntersectionCircles::FXCircle2Radius()
     DialogEditWrongFormula *dialog = new DialogEditWrongFormula(data, toolId, this);
     dialog->setWindowTitle(tr("Edit second circle radius"));
     dialog->SetFormula(GetSecondCircleRadius());
-    dialog->setPostfix(UnitsToStr(qApp->patternUnit(), true));
+    dialog->setPostfix(UnitsToStr(qApp->patternUnits(), true));
     if (dialog->exec() == QDialog::Accepted)
     {
         SetSecondCircleRadius(dialog->GetFormula());
@@ -353,7 +353,7 @@ void DialogPointOfIntersectionCircles::EvalCircle1Radius()
     formulaData.variables = data->DataVariables();
     formulaData.labelEditFormula = ui->labelEditCircle1Radius;
     formulaData.labelResult = ui->labelResultCircle1Radius;
-    formulaData.postfix = UnitsToStr(qApp->patternUnit(), true);
+    formulaData.postfix = UnitsToStr(qApp->patternUnits(), true);
 
     const qreal radius = Eval(formulaData, flagCircle1Radius);
 
@@ -376,7 +376,7 @@ void DialogPointOfIntersectionCircles::EvalCircle2Radius()
     formulaData.variables = data->DataVariables();
     formulaData.labelEditFormula = ui->labelEditCircle2Radius;
     formulaData.labelResult = ui->labelResultCircle2Radius;
-    formulaData.postfix = UnitsToStr(qApp->patternUnit(), true);
+    formulaData.postfix = UnitsToStr(qApp->patternUnits(), true);
 
     const qreal radius = Eval(formulaData, flagCircle2Radius);
 
diff --git a/src/libs/vtools/dialogs/tools/dialogshoulderpoint.cpp b/src/libs/vtools/dialogs/tools/dialogshoulderpoint.cpp
index affd4479d..8c8d6b5d4 100644
--- a/src/libs/vtools/dialogs/tools/dialogshoulderpoint.cpp
+++ b/src/libs/vtools/dialogs/tools/dialogshoulderpoint.cpp
@@ -139,7 +139,7 @@ void DialogShoulderPoint::FXLength()
     DialogEditWrongFormula *dialog = new DialogEditWrongFormula(data, toolId, this);
     dialog->setWindowTitle(tr("Edit length"));
     dialog->SetFormula(GetFormula());
-    dialog->setPostfix(UnitsToStr(qApp->patternUnit(), true));
+    dialog->setPostfix(UnitsToStr(qApp->patternUnits(), true));
     if (dialog->exec() == QDialog::Accepted)
     {
         SetFormula(dialog->GetFormula());
@@ -155,7 +155,7 @@ void DialogShoulderPoint::EvalFormula()
     formulaData.variables = data->DataVariables();
     formulaData.labelEditFormula = ui->labelEditFormula;
     formulaData.labelResult = ui->labelResultCalculation;
-    formulaData.postfix = UnitsToStr(qApp->patternUnit(), true);
+    formulaData.postfix = UnitsToStr(qApp->patternUnits(), true);
 
     Eval(formulaData, flagFormula);
 }
diff --git a/src/libs/vtools/dialogs/tools/dialogspline.cpp b/src/libs/vtools/dialogs/tools/dialogspline.cpp
index e6da0a10f..0cda9f9da 100644
--- a/src/libs/vtools/dialogs/tools/dialogspline.cpp
+++ b/src/libs/vtools/dialogs/tools/dialogspline.cpp
@@ -321,7 +321,7 @@ void DialogSpline::FXLength1()
     QString length1F = qApp->TrVars()->TryFormulaFromUser(ui->plainTextEditLength1F->toPlainText(),
                                                           qApp->Settings()->GetOsSeparator());
     dialog->SetFormula(length1F);
-    dialog->setPostfix(UnitsToStr(qApp->patternUnit(), true));
+    dialog->setPostfix(UnitsToStr(qApp->patternUnits(), true));
     if (dialog->exec() == QDialog::Accepted)
     {
         length1F = qApp->TrVars()->FormulaToUser(dialog->GetFormula(), qApp->Settings()->GetOsSeparator());
@@ -344,7 +344,7 @@ void DialogSpline::FXLength2()
     QString length2F = qApp->TrVars()->TryFormulaFromUser(ui->plainTextEditLength2F->toPlainText(),
                                                           qApp->Settings()->GetOsSeparator());
     dialog->SetFormula(length2F);
-    dialog->setPostfix(UnitsToStr(qApp->patternUnit(), true));
+    dialog->setPostfix(UnitsToStr(qApp->patternUnits(), true));
     if (dialog->exec() == QDialog::Accepted)
     {
         length2F = qApp->TrVars()->FormulaToUser(dialog->GetFormula(), qApp->Settings()->GetOsSeparator());
@@ -407,7 +407,7 @@ void DialogSpline::EvalLength1()
     formulaData.variables = data->DataVariables();
     formulaData.labelEditFormula = ui->labelEditLength1;
     formulaData.labelResult = ui->labelResultLength1;
-    formulaData.postfix = UnitsToStr(qApp->patternUnit(), true);
+    formulaData.postfix = UnitsToStr(qApp->patternUnits(), true);
     formulaData.checkZero = false;
     formulaData.checkLessThanZero = true;
 
@@ -422,7 +422,7 @@ void DialogSpline::EvalLength2()
     formulaData.variables = data->DataVariables();
     formulaData.labelEditFormula = ui->labelEditLength2;
     formulaData.labelResult = ui->labelResultLength2;
-    formulaData.postfix = UnitsToStr(qApp->patternUnit(), true);
+    formulaData.postfix = UnitsToStr(qApp->patternUnits(), true);
     formulaData.checkZero = false;
     formulaData.checkLessThanZero = true;
 
diff --git a/src/libs/vtools/dialogs/tools/dialogsplinepath.cpp b/src/libs/vtools/dialogs/tools/dialogsplinepath.cpp
index ab2f9694a..232e2c6c3 100644
--- a/src/libs/vtools/dialogs/tools/dialogsplinepath.cpp
+++ b/src/libs/vtools/dialogs/tools/dialogsplinepath.cpp
@@ -447,7 +447,7 @@ void DialogSplinePath::FXLength1()
                                                           qApp->Settings()->GetOsSeparator());
 
     dialog->SetFormula(length1F);
-    dialog->setPostfix(UnitsToStr(qApp->patternUnit(), true));
+    dialog->setPostfix(UnitsToStr(qApp->patternUnits(), true));
     if (dialog->exec() == QDialog::Accepted)
     {
         length1F = VTranslateVars::TryFormulaToUser(dialog->GetFormula(), qApp->Settings()->GetOsSeparator());
@@ -472,7 +472,7 @@ void DialogSplinePath::FXLength2()
                                                           qApp->Settings()->GetOsSeparator());
 
     dialog->SetFormula(length2F);
-    dialog->setPostfix(UnitsToStr(qApp->patternUnit(), true));
+    dialog->setPostfix(UnitsToStr(qApp->patternUnits(), true));
     if (dialog->exec() == QDialog::Accepted)
     {
         length2F = VTranslateVars::TryFormulaToUser(dialog->GetFormula(), qApp->Settings()->GetOsSeparator());
@@ -553,7 +553,7 @@ void DialogSplinePath::EvalLength1()
     formulaData.variables = data->DataVariables();
     formulaData.labelEditFormula = ui->labelEditLength1;
     formulaData.labelResult = ui->labelResultLength1;
-    formulaData.postfix = UnitsToStr(qApp->patternUnit(), true);
+    formulaData.postfix = UnitsToStr(qApp->patternUnits(), true);
     formulaData.checkZero = false;
     formulaData.checkLessThanZero = true;
 
@@ -580,7 +580,7 @@ void DialogSplinePath::EvalLength2()
     formulaData.variables = data->DataVariables();
     formulaData.labelEditFormula = ui->labelEditLength2;
     formulaData.labelResult = ui->labelResultLength2;
-    formulaData.postfix = UnitsToStr(qApp->patternUnit(), true);
+    formulaData.postfix = UnitsToStr(qApp->patternUnits(), true);
     formulaData.checkZero = false;
     formulaData.checkLessThanZero = true;
 
diff --git a/src/libs/vtools/dialogs/tools/piece/dialogpiecepath.cpp b/src/libs/vtools/dialogs/tools/piece/dialogpiecepath.cpp
index d87813835..19ec44b48 100644
--- a/src/libs/vtools/dialogs/tools/piece/dialogpiecepath.cpp
+++ b/src/libs/vtools/dialogs/tools/piece/dialogpiecepath.cpp
@@ -545,7 +545,7 @@ void DialogPiecePath::PassmarkChanged(int index)
 
                 if (passmarkLength.isEmpty())
                 {
-                    qreal length = UnitConvertor(1, Unit::Cm, qApp->patternUnit());
+                    qreal length = UnitConvertor(1, Unit::Cm, qApp->patternUnits());
                     ui->plainTextEditPassmarkLength->setPlainText(qApp->LocaleToString(length));
                 }
                 else
@@ -555,7 +555,7 @@ void DialogPiecePath::PassmarkChanged(int index)
             }
             else
             {
-                qreal length = UnitConvertor(1, Unit::Cm, qApp->patternUnit());
+                qreal length = UnitConvertor(1, Unit::Cm, qApp->patternUnits());
                 ui->plainTextEditPassmarkLength->setPlainText(qApp->LocaleToString(length));
             }
 
@@ -796,7 +796,7 @@ void DialogPiecePath::EvalWidth()
     formulaData.variables = data->DataVariables();
     formulaData.labelEditFormula = ui->labelEditWidth;
     formulaData.labelResult = ui->labelResultWidth;
-    formulaData.postfix = UnitsToStr(qApp->patternUnit(), true);
+    formulaData.postfix = UnitsToStr(qApp->patternUnits(), true);
     formulaData.checkZero = false;
     formulaData.checkLessThanZero = true;
 
@@ -827,7 +827,7 @@ void DialogPiecePath::EvalWidthBefore()
         formulaData.variables = data->DataVariables();
         formulaData.labelEditFormula = ui->labelEditBefore;
         formulaData.labelResult = ui->labelResultBefore;
-        formulaData.postfix = UnitsToStr(qApp->patternUnit(), true);
+        formulaData.postfix = UnitsToStr(qApp->patternUnits(), true);
         formulaData.checkZero = false;
         formulaData.checkLessThanZero = true;
 
@@ -862,7 +862,7 @@ void DialogPiecePath::EvalWidthAfter()
         formulaData.variables = data->DataVariables();
         formulaData.labelEditFormula = ui->labelEditAfter;
         formulaData.labelResult = ui->labelResultAfter;
-        formulaData.postfix = UnitsToStr(qApp->patternUnit(), true);
+        formulaData.postfix = UnitsToStr(qApp->patternUnits(), true);
         formulaData.checkZero = false;
         formulaData.checkLessThanZero = true;
 
@@ -910,7 +910,7 @@ void DialogPiecePath::EvalPassmarkLength()
     formulaData.variables = data->DataVariables();
     formulaData.labelEditFormula = ui->labelEditPassmarkLength;
     formulaData.labelResult = ui->labelResultPassmarkLength;
-    formulaData.postfix = UnitsToStr(qApp->patternUnit(), true);
+    formulaData.postfix = UnitsToStr(qApp->patternUnits(), true);
     formulaData.checkZero = false;
     formulaData.checkLessThanZero = false;
 
@@ -927,7 +927,7 @@ void DialogPiecePath::FXWidth()
     dialog->setWindowTitle(tr("Edit seam allowance width"));
     dialog->SetFormula(GetFormulaSAWidth());
     dialog->setCheckLessThanZero(true);
-    dialog->setPostfix(UnitsToStr(qApp->patternUnit(), true));
+    dialog->setPostfix(UnitsToStr(qApp->patternUnits(), true));
     if (dialog->exec() == QDialog::Accepted)
     {
         SetFormulaSAWidth(dialog->GetFormula());
@@ -941,7 +941,7 @@ void DialogPiecePath::FXWidthBefore()
     dialog->setWindowTitle(tr("Edit seam allowance width before"));
     dialog->SetFormula(GetFormulaSAWidthBefore());
     dialog->setCheckLessThanZero(true);
-    dialog->setPostfix(UnitsToStr(qApp->patternUnit(), true));
+    dialog->setPostfix(UnitsToStr(qApp->patternUnits(), true));
     if (dialog->exec() == QDialog::Accepted)
     {
         SetCurrentSABefore(dialog->GetFormula());
@@ -955,7 +955,7 @@ void DialogPiecePath::FXWidthAfter()
     dialog->setWindowTitle(tr("Edit seam allowance width after"));
     dialog->SetFormula(GetFormulaSAWidthAfter());
     dialog->setCheckLessThanZero(true);
-    dialog->setPostfix(UnitsToStr(qApp->patternUnit(), true));
+    dialog->setPostfix(UnitsToStr(qApp->patternUnits(), true));
     if (dialog->exec() == QDialog::Accepted)
     {
         SetCurrentSAAfter(dialog->GetFormula());
@@ -980,7 +980,7 @@ void DialogPiecePath::FXPassmarkLength()
     QScopedPointer<DialogEditWrongFormula> dialog(new DialogEditWrongFormula(data, toolId, this));
     dialog->setWindowTitle(tr("Edit passmark length"));
     dialog->SetFormula(GetFormulaPassmarkLength());
-    dialog->setPostfix(UnitsToStr(qApp->patternUnit(), true));
+    dialog->setPostfix(UnitsToStr(qApp->patternUnits(), true));
     if (dialog->exec() == QDialog::Accepted)
     {
         SetFormulaPassmarkLength(dialog->GetFormula());
@@ -1099,7 +1099,7 @@ void DialogPiecePath::InitSeamAllowanceTab()
     connect(m_timerWidthAfter, &QTimer::timeout, this, &DialogPiecePath::EvalWidthAfter);
 
     // Default value for seam allowence is 1 cm. But pattern have different units, so just set 1 in dialog not enough.
-    m_saWidth = UnitConvertor(1, Unit::Cm, qApp->patternUnit());
+    m_saWidth = UnitConvertor(1, Unit::Cm, qApp->patternUnits());
     ui->plainTextEditFormulaWidth->setPlainText(qApp->LocaleToString(m_saWidth));
 
     InitNodesList();
diff --git a/src/libs/vtools/dialogs/tools/piece/dialogplacelabel.cpp b/src/libs/vtools/dialogs/tools/piece/dialogplacelabel.cpp
index da2049771..b5e4e59b4 100644
--- a/src/libs/vtools/dialogs/tools/piece/dialogplacelabel.cpp
+++ b/src/libs/vtools/dialogs/tools/piece/dialogplacelabel.cpp
@@ -315,7 +315,7 @@ void DialogPlaceLabel::EvalWidth()
     formulaData.variables = data->DataVariables();
     formulaData.labelEditFormula = ui->labelEditFormulaWidth;
     formulaData.labelResult = ui->labelResultCalculationWidth;
-    formulaData.postfix = UnitsToStr(qApp->patternUnit(), true);
+    formulaData.postfix = UnitsToStr(qApp->patternUnits(), true);
     formulaData.checkLessThanZero = true;
 
     Eval(formulaData, m_flagWidth);
@@ -329,7 +329,7 @@ void DialogPlaceLabel::EvalHeight()
     formulaData.variables = data->DataVariables();
     formulaData.labelEditFormula = ui->labelEditFormulaHeight;
     formulaData.labelResult = ui->labelResultCalculationHeight;
-    formulaData.postfix = UnitsToStr(qApp->patternUnit(), true);
+    formulaData.postfix = UnitsToStr(qApp->patternUnits(), true);
     formulaData.checkLessThanZero = true;
 
     Eval(formulaData, m_flagHeight);
@@ -370,7 +370,7 @@ void DialogPlaceLabel::FXWidth()
     QScopedPointer<DialogEditWrongFormula> dialog(new DialogEditWrongFormula(data, toolId, this));
     dialog->setWindowTitle(tr("Edit rectangle width"));
     dialog->SetFormula(GetWidth());
-    dialog->setPostfix(UnitsToStr(qApp->patternUnit(), true));
+    dialog->setPostfix(UnitsToStr(qApp->patternUnits(), true));
     if (dialog->exec() == QDialog::Accepted)
     {
         SetWidth(dialog->GetFormula());
@@ -383,7 +383,7 @@ void DialogPlaceLabel::FXHeight()
     QScopedPointer<DialogEditWrongFormula> dialog(new DialogEditWrongFormula(data, toolId, this));
     dialog->setWindowTitle(tr("Edit rectangle width"));
     dialog->SetFormula(GetHeight());
-    dialog->setPostfix(UnitsToStr(qApp->patternUnit(), true));
+    dialog->setPostfix(UnitsToStr(qApp->patternUnits(), true));
     if (dialog->exec() == QDialog::Accepted)
     {
         SetHeight(dialog->GetFormula());
@@ -429,8 +429,8 @@ void DialogPlaceLabel::InitPlaceLabelTab()
     ui->plainTextEditFormulaHeight->installEventFilter(this);
     ui->plainTextEditFormulaAngle->installEventFilter(this);
 
-    ui->plainTextEditFormulaWidth->setPlainText(QString::number(UnitConvertor(1, Unit::Cm, qApp->patternUnit())));
-    ui->plainTextEditFormulaHeight->setPlainText(QString::number(UnitConvertor(1, Unit::Cm, qApp->patternUnit())));
+    ui->plainTextEditFormulaWidth->setPlainText(QString::number(UnitConvertor(1, Unit::Cm, qApp->patternUnits())));
+    ui->plainTextEditFormulaHeight->setPlainText(QString::number(UnitConvertor(1, Unit::Cm, qApp->patternUnits())));
 
     connect(ui->toolButtonExprWidth, &QPushButton::clicked, this, &DialogPlaceLabel::FXWidth);
     connect(ui->toolButtonExprHeight, &QPushButton::clicked, this, &DialogPlaceLabel::FXHeight);
diff --git a/src/libs/vtools/dialogs/tools/piece/dialogseamallowance.cpp b/src/libs/vtools/dialogs/tools/piece/dialogseamallowance.cpp
index 964493504..48e8dc058 100644
--- a/src/libs/vtools/dialogs/tools/piece/dialogseamallowance.cpp
+++ b/src/libs/vtools/dialogs/tools/piece/dialogseamallowance.cpp
@@ -1050,7 +1050,7 @@ void DialogSeamAllowance::PassmarkChanged(int index)
 
                 if (passmarkLength.isEmpty())
                 {
-                    qreal length = UnitConvertor(1, Unit::Cm, qApp->patternUnit());
+                    qreal length = UnitConvertor(1, Unit::Cm, qApp->patternUnits());
                     uiTabPassmarks->plainTextEditPassmarkLength->setPlainText(qApp->LocaleToString(length));
                 }
                 else
@@ -1060,7 +1060,7 @@ void DialogSeamAllowance::PassmarkChanged(int index)
             }
             else
             {
-                qreal length = UnitConvertor(1, Unit::Cm, qApp->patternUnit());
+                qreal length = UnitConvertor(1, Unit::Cm, qApp->patternUnits());
                 uiTabPassmarks->plainTextEditPassmarkLength->setPlainText(qApp->LocaleToString(length));
             }
 
@@ -1598,7 +1598,7 @@ void DialogSeamAllowance::UpdateGrainlineValues()
         {
             plbVal = uiTabGrainline->labelLen;
             plbText = uiTabGrainline->labelEditLen;
-            qsUnit = QChar(QChar::Space) + UnitsToStr(qApp->patternUnit());
+            qsUnit = QChar(QChar::Space) + UnitsToStr(qApp->patternUnits());
         }
 
         plbVal->setToolTip(tr("Value"));
@@ -1667,13 +1667,13 @@ void DialogSeamAllowance::UpdateDetailLabelValues()
         {
             plbVal = uiTabLabels->labelDLWidth;
             plbText = uiTabLabels->labelEditDLWidth;
-            qsUnit = QChar(QChar::Space) + UnitsToStr(qApp->patternUnit());
+            qsUnit = QChar(QChar::Space) + UnitsToStr(qApp->patternUnits());
         }
         else if (i == 1)
         {
             plbVal = uiTabLabels->labelDLHeight;
             plbText = uiTabLabels->labelEditDLHeight;
-            qsUnit = QChar(QChar::Space) + UnitsToStr(qApp->patternUnit());
+            qsUnit = QChar(QChar::Space) + UnitsToStr(qApp->patternUnits());
         }
         else
         {
@@ -1753,13 +1753,13 @@ void DialogSeamAllowance::UpdatePatternLabelValues()
         {
             plbVal = uiTabLabels->labelPLWidth;
             plbText = uiTabLabels->labelEditPLWidth;
-            qsUnit = QChar(QChar::Space) + UnitsToStr(qApp->patternUnit());
+            qsUnit = QChar(QChar::Space) + UnitsToStr(qApp->patternUnits());
         }
         else if (i == 1)
         {
             plbVal = uiTabLabels->labelPLHeight;
             plbText = uiTabLabels->labelEditPLHeight;
-            qsUnit = QChar(QChar::Space) + UnitsToStr(qApp->patternUnit());
+            qsUnit = QChar(QChar::Space) + UnitsToStr(qApp->patternUnits());
         }
         else
         {
@@ -2133,7 +2133,7 @@ void DialogSeamAllowance::EvalWidth()
     formulaData.variables = data->DataVariables();
     formulaData.labelEditFormula = uiTabPaths->labelEditWidth;
     formulaData.labelResult = uiTabPaths->labelResultWidth;
-    formulaData.postfix = UnitsToStr(qApp->patternUnit(), true);
+    formulaData.postfix = UnitsToStr(qApp->patternUnits(), true);
     formulaData.checkZero = false;
     formulaData.checkLessThanZero = true;
 
@@ -2166,7 +2166,7 @@ void DialogSeamAllowance::EvalWidthBefore()
             formulaData.variables = data->DataVariables();
             formulaData.labelEditFormula = uiTabPaths->labelEditBefore;
             formulaData.labelResult = uiTabPaths->labelResultBefore;
-            formulaData.postfix = UnitsToStr(qApp->patternUnit(), true);
+            formulaData.postfix = UnitsToStr(qApp->patternUnits(), true);
             formulaData.checkZero = false;
             formulaData.checkLessThanZero = true;
 
@@ -2197,7 +2197,7 @@ void DialogSeamAllowance::EvalWidthAfter()
             formulaData.variables = data->DataVariables();
             formulaData.labelEditFormula = uiTabPaths->labelEditAfter;
             formulaData.labelResult = uiTabPaths->labelResultAfter;
-            formulaData.postfix = UnitsToStr(qApp->patternUnit(), true);
+            formulaData.postfix = UnitsToStr(qApp->patternUnits(), true);
             formulaData.checkZero = false;
             formulaData.checkLessThanZero = true;
 
@@ -2228,7 +2228,7 @@ void DialogSeamAllowance::EvalPassmarkLength()
             formulaData.variables = data->DataVariables();
             formulaData.labelEditFormula = uiTabPassmarks->labelEditPassmarkLength;
             formulaData.labelResult = uiTabPassmarks->labelResultPassmarkLength;
-            formulaData.postfix = UnitsToStr(qApp->patternUnit(), true);
+            formulaData.postfix = UnitsToStr(qApp->patternUnits(), true);
             formulaData.checkZero = false;
             formulaData.checkLessThanZero = false;
 
@@ -2252,7 +2252,7 @@ void DialogSeamAllowance::FXWidth()
     dialog->setWindowTitle(tr("Edit seam allowance width"));
     dialog->SetFormula(GetFormulaSAWidth());
     dialog->setCheckLessThanZero(true);
-    dialog->setPostfix(UnitsToStr(qApp->patternUnit(), true));
+    dialog->setPostfix(UnitsToStr(qApp->patternUnits(), true));
     if (dialog->exec() == QDialog::Accepted)
     {
         SetFormulaSAWidth(dialog->GetFormula());
@@ -2266,7 +2266,7 @@ void DialogSeamAllowance::FXWidthBefore()
     dialog->setWindowTitle(tr("Edit seam allowance width before"));
     dialog->SetFormula(GetFormulaFromUser(uiTabPaths->plainTextEditFormulaWidthBefore));
     dialog->setCheckLessThanZero(true);
-    dialog->setPostfix(UnitsToStr(qApp->patternUnit(), true));
+    dialog->setPostfix(UnitsToStr(qApp->patternUnits(), true));
     if (dialog->exec() == QDialog::Accepted)
     {
         SetCurrentSABefore(dialog->GetFormula());
@@ -2280,7 +2280,7 @@ void DialogSeamAllowance::FXWidthAfter()
     dialog->setWindowTitle(tr("Edit seam allowance width after"));
     dialog->SetFormula(GetFormulaFromUser(uiTabPaths->plainTextEditFormulaWidthAfter));
     dialog->setCheckLessThanZero(true);
-    dialog->setPostfix(UnitsToStr(qApp->patternUnit(), true));
+    dialog->setPostfix(UnitsToStr(qApp->patternUnits(), true));
     if (dialog->exec() == QDialog::Accepted)
     {
         SetCurrentSAAfter(dialog->GetFormula());
@@ -2293,7 +2293,7 @@ void DialogSeamAllowance::FXPassmarkLength()
     QScopedPointer<DialogEditWrongFormula> dialog(new DialogEditWrongFormula(data, toolId, this));
     dialog->setWindowTitle(tr("Edit passmark length"));
     dialog->SetFormula(GetFormulaFromUser(uiTabPassmarks->plainTextEditPassmarkLength));
-    dialog->setPostfix(UnitsToStr(qApp->patternUnit(), true));
+    dialog->setPostfix(UnitsToStr(qApp->patternUnits(), true));
     if (dialog->exec() == QDialog::Accepted)
     {
         SetFormularPassmarkLength(dialog->GetFormula());
@@ -2428,7 +2428,7 @@ void DialogSeamAllowance::PatternPinPointChanged()
 //---------------------------------------------------------------------------------------------------------------------
 void DialogSeamAllowance::EditLabel()
 {
-    DialogEditLabel editor(qApp->getCurrentDocument());
+    DialogEditLabel editor(qApp->getCurrentDocument(), data);
     editor.SetTemplate(m_templateLines);
     editor.SetPiece(GetPiece());
 
@@ -2923,7 +2923,7 @@ void DialogSeamAllowance::InitSeamAllowanceTab()
 
     // init the default seam allowance, convert the value if app unit is different than pattern unit
     m_saWidth = UnitConvertor(qApp->Settings()->GetDefaultSeamAllowance(),
-                              StrToUnits(qApp->Settings()->GetUnit()), qApp->patternUnit());
+                              StrToUnits(qApp->Settings()->GetUnit()), qApp->patternUnits());
 
     uiTabPaths->plainTextEditFormulaWidth->setPlainText(qApp->LocaleToString(m_saWidth));
 
diff --git a/src/libs/vtools/tools/drawTools/operation/vabstractoperation.cpp b/src/libs/vtools/tools/drawTools/operation/vabstractoperation.cpp
index cda19cca6..434741545 100644
--- a/src/libs/vtools/tools/drawTools/operation/vabstractoperation.cpp
+++ b/src/libs/vtools/tools/drawTools/operation/vabstractoperation.cpp
@@ -890,7 +890,7 @@ QString VAbstractOperation::ComplexCurveToolTip(quint32 itemId) const
                                     "</table>")
             .arg(tr("Label"), curve->name(), tr("Length"))
             .arg(qApp->fromPixel(curve->GetLength()))
-            .arg(UnitsToStr(qApp->patternUnit(), true), MakeToolTip());
+            .arg(UnitsToStr(qApp->patternUnits(), true), MakeToolTip());
     return toolTip;
 }
 
diff --git a/src/libs/vtools/tools/drawTools/operation/vtoolmove.cpp b/src/libs/vtools/tools/drawTools/operation/vtoolmove.cpp
index 1e494a755..37621d7a7 100644
--- a/src/libs/vtools/tools/drawTools/operation/vtoolmove.cpp
+++ b/src/libs/vtools/tools/drawTools/operation/vtoolmove.cpp
@@ -398,7 +398,7 @@ VFormula VToolMove::GetFormulaLength() const
     VFormula fLength(formulaLength, getData());
     fLength.setCheckZero(true);
     fLength.setToolId(m_id);
-    fLength.setPostfix(UnitsToStr(qApp->patternUnit()));
+    fLength.setPostfix(UnitsToStr(qApp->patternUnits()));
     fLength.Eval();
     return fLength;
 }
@@ -523,7 +523,7 @@ QString VToolMove::MakeToolTip() const
             .arg(GetFormulaAngle().getDoubleValue())         // 2
             .arg(tr("Length"))                               // 3
             .arg(GetFormulaLength().getDoubleValue())        // 4
-            .arg(UnitsToStr(qApp->patternUnit(), true),      // 5
+            .arg(UnitsToStr(qApp->patternUnits(), true),      // 5
                  tr("Rotation angle"))                       // 6
             .arg(GetFormulaRotationAngle().getDoubleValue()) // 7
             .arg(tr("Rotation origin point"),                // 8
diff --git a/src/libs/vtools/tools/drawTools/toolcurve/vabstractspline.cpp b/src/libs/vtools/tools/drawTools/toolcurve/vabstractspline.cpp
index ccf490ad5..39963cb20 100644
--- a/src/libs/vtools/tools/drawTools/toolcurve/vabstractspline.cpp
+++ b/src/libs/vtools/tools/drawTools/toolcurve/vabstractspline.cpp
@@ -202,7 +202,7 @@ QString VAbstractSpline::MakeToolTip() const
                                     "</table>")
             .arg(tr("Length"))
             .arg(qApp->fromPixel(curve->GetLength()))
-            .arg(UnitsToStr(qApp->patternUnit(), true), tr("Label"), curve->name());
+            .arg(UnitsToStr(qApp->patternUnits(), true), tr("Label"), curve->name());
     return toolTip;
 }
 
diff --git a/src/libs/vtools/tools/drawTools/toolcurve/vtoolarc.cpp b/src/libs/vtools/tools/drawTools/toolcurve/vtoolarc.cpp
index 2331135d7..801137749 100644
--- a/src/libs/vtools/tools/drawTools/toolcurve/vtoolarc.cpp
+++ b/src/libs/vtools/tools/drawTools/toolcurve/vtoolarc.cpp
@@ -192,7 +192,7 @@ VFormula VToolArc::GetFormulaRadius() const
     VFormula radius(arc->GetFormulaRadius(), getData());
     radius.setCheckZero(true);
     radius.setToolId(m_id);
-    radius.setPostfix(UnitsToStr(qApp->patternUnit()));
+    radius.setPostfix(UnitsToStr(qApp->patternUnits()));
     radius.Eval();
     return radius;
 }
@@ -387,7 +387,7 @@ QString VToolArc::MakeToolTip() const
                                     "</table>")
             .arg(tr("Length"))
             .arg(qApp->fromPixel(arc->GetLength()))
-            .arg(UnitsToStr(qApp->patternUnit(), true), tr("Radius"))
+            .arg(UnitsToStr(qApp->patternUnits(), true), tr("Radius"))
             .arg(qApp->fromPixel(arc->GetRadius()))
             .arg(tr("Start angle"))
             .arg(arc->GetStartAngle())
diff --git a/src/libs/vtools/tools/drawTools/toolcurve/vtoolarcwithlength.cpp b/src/libs/vtools/tools/drawTools/toolcurve/vtoolarcwithlength.cpp
index 466066be4..dfa297148 100644
--- a/src/libs/vtools/tools/drawTools/toolcurve/vtoolarcwithlength.cpp
+++ b/src/libs/vtools/tools/drawTools/toolcurve/vtoolarcwithlength.cpp
@@ -173,7 +173,7 @@ VFormula VToolArcWithLength::GetFormulaRadius() const
     VFormula radius(arc->GetFormulaRadius(), getData());
     radius.setCheckZero(true);
     radius.setToolId(m_id);
-    radius.setPostfix(UnitsToStr(qApp->patternUnit()));
+    radius.setPostfix(UnitsToStr(qApp->patternUnits()));
     radius.Eval();
     return radius;
 }
@@ -232,7 +232,7 @@ VFormula VToolArcWithLength::GetFormulaLength() const
     VFormula radius(arc->GetFormulaLength(), getData());
     radius.setCheckZero(true);
     radius.setToolId(m_id);
-    radius.setPostfix(UnitsToStr(qApp->patternUnit()));
+    radius.setPostfix(UnitsToStr(qApp->patternUnits()));
     radius.Eval();
     return radius;
 }
@@ -366,7 +366,7 @@ QString VToolArcWithLength::MakeToolTip() const
                                     "</table>")
             .arg(tr("Length"))
             .arg(qApp->fromPixel(arc->GetLength()))
-            .arg(UnitsToStr(qApp->patternUnit(), true), tr("Radius"))
+            .arg(UnitsToStr(qApp->patternUnits(), true), tr("Radius"))
             .arg(qApp->fromPixel(arc->GetRadius()))
             .arg(tr("Start angle"))
             .arg(arc->GetStartAngle())
diff --git a/src/libs/vtools/tools/drawTools/toolcurve/vtoolellipticalarc.cpp b/src/libs/vtools/tools/drawTools/toolcurve/vtoolellipticalarc.cpp
index 3f0ba3fab..556faf696 100644
--- a/src/libs/vtools/tools/drawTools/toolcurve/vtoolellipticalarc.cpp
+++ b/src/libs/vtools/tools/drawTools/toolcurve/vtoolellipticalarc.cpp
@@ -201,7 +201,7 @@ VFormula VToolEllipticalArc::GetFormulaRadius1() const
     VFormula radius1(elArc->GetFormulaRadius1(), getData());
     radius1.setCheckZero(true);
     radius1.setToolId(m_id);
-    radius1.setPostfix(UnitsToStr(qApp->patternUnit()));
+    radius1.setPostfix(UnitsToStr(qApp->patternUnits()));
     radius1.Eval();
     return radius1;
 }
@@ -230,7 +230,7 @@ VFormula VToolEllipticalArc::GetFormulaRadius2() const
     VFormula radius2(elArc->GetFormulaRadius2(), getData());
     radius2.setCheckZero(true);
     radius2.setToolId(m_id);
-    radius2.setPostfix(UnitsToStr(qApp->patternUnit()));
+    radius2.setPostfix(UnitsToStr(qApp->patternUnits()));
     radius2.Eval();
     return radius2;
 }
@@ -440,7 +440,7 @@ QString VToolEllipticalArc::MakeToolTip() const
                                     "</table>")
             .arg(tr("Length"))                          // 1
             .arg(qApp->fromPixel(elArc->GetLength()))   // 2
-            .arg(UnitsToStr(qApp->patternUnit(), true), // 3
+            .arg(UnitsToStr(qApp->patternUnits(), true), // 3
                  tr("Radius") + QLatin1Char('1'))       // 4
             .arg(qApp->fromPixel(elArc->GetRadius1()))  // 5
             .arg(tr("Radius") + QLatin1Char('2'))       // 6
diff --git a/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/toolcut/vtoolcut.cpp b/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/toolcut/vtoolcut.cpp
index 8977b5fe1..f0de213d4 100644
--- a/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/toolcut/vtoolcut.cpp
+++ b/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/toolcut/vtoolcut.cpp
@@ -83,7 +83,7 @@ VFormula VToolCut::GetFormula() const
     VFormula val(formula, getData());
     val.setCheckZero(true);
     val.setToolId(m_id);
-    val.setPostfix(UnitsToStr(qApp->patternUnit()));
+    val.setPostfix(UnitsToStr(qApp->patternUnits()));
     val.Eval();
     return val;
 }
diff --git a/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/toolcut/vtoolcutarc.cpp b/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/toolcut/vtoolcutarc.cpp
index 96d8c3a6d..9231b893d 100644
--- a/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/toolcut/vtoolcutarc.cpp
+++ b/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/toolcut/vtoolcutarc.cpp
@@ -283,7 +283,7 @@ QString VToolCutArc::MakeToolTip() const
                            "<tr> <td><b>%8:</b> %9°</td> </tr>")
                     .arg(arcStr + arcNumber + QChar(QChar::Space) + lengthStr)
                     .arg(qApp->fromPixel(arc.GetLength()))
-                    .arg(UnitsToStr(qApp->patternUnit(), true), arcStr + arcNumber + QChar(QChar::Space) + radiusStr)
+                    .arg(UnitsToStr(qApp->patternUnits(), true), arcStr + arcNumber + QChar(QChar::Space) + radiusStr)
                     .arg(qApp->fromPixel(arc.GetRadius()))
                     .arg(arcStr + arcNumber + QChar(QChar::Space) + startAngleStr)
                     .arg(arc.GetStartAngle())
diff --git a/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/toolcut/vtoolcutspline.cpp b/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/toolcut/vtoolcutspline.cpp
index 5468ff2ce..9e056c490 100644
--- a/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/toolcut/vtoolcutspline.cpp
+++ b/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/toolcut/vtoolcutspline.cpp
@@ -277,7 +277,7 @@ QString VToolCutSpline::MakeToolTip() const
                                     "</table>")
             .arg(curveStr + QLatin1String("1 ") + lengthStr)
             .arg(qApp->fromPixel(spline1.GetLength()))
-            .arg(UnitsToStr(qApp->patternUnit(), true), curveStr + QLatin1String("2 ") + lengthStr)
+            .arg(UnitsToStr(qApp->patternUnits(), true), curveStr + QLatin1String("2 ") + lengthStr)
             .arg(qApp->fromPixel(spline2.GetLength()))
             .arg(curveStr + QLatin1String(" 1") + tr("label"), spline1.name(),
                  curveStr + QLatin1String(" 2") + tr("label"), spline2.name());
diff --git a/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/toolcut/vtoolcutsplinepath.cpp b/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/toolcut/vtoolcutsplinepath.cpp
index 4bd33786f..d37b00fa2 100644
--- a/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/toolcut/vtoolcutsplinepath.cpp
+++ b/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/toolcut/vtoolcutsplinepath.cpp
@@ -367,7 +367,7 @@ QString VToolCutSplinePath::MakeToolTip() const
                                     "</table>")
             .arg(curveStr + QLatin1String("1 ") + lengthStr)
             .arg(qApp->fromPixel(splPath1->GetLength()))
-            .arg(UnitsToStr(qApp->patternUnit(), true), curveStr + QLatin1String("2 ") + lengthStr)
+            .arg(UnitsToStr(qApp->patternUnits(), true), curveStr + QLatin1String("2 ") + lengthStr)
             .arg(qApp->fromPixel(splPath2->GetLength()))
             .arg(curveStr + QLatin1String(" 1") + tr("label"), splPath1->name(),
                  curveStr + QLatin1String(" 2") + tr("label"), splPath2->name());
diff --git a/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/toollinepoint/vtoolalongline.cpp b/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/toollinepoint/vtoolalongline.cpp
index 206cfe524..9e1cffc36 100644
--- a/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/toollinepoint/vtoolalongline.cpp
+++ b/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/toollinepoint/vtoolalongline.cpp
@@ -162,7 +162,7 @@ QString VToolAlongLine::MakeToolTip() const
                                     "</table>")
             .arg(tr("Length"))
             .arg(qApp->fromPixel(curLine.length()))
-            .arg(UnitsToStr(qApp->patternUnit(), true), tr("Angle"))
+            .arg(UnitsToStr(qApp->patternUnits(), true), tr("Angle"))
             .arg(curLine.angle())
             .arg(QStringLiteral("%1->%2").arg(basePoint->name(), current->name()),
                  QStringLiteral("%1->%2").arg(current->name(), secondPoint->name()))
diff --git a/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/toollinepoint/vtoolcurveintersectaxis.cpp b/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/toollinepoint/vtoolcurveintersectaxis.cpp
index 6e5735029..1ea2ef245 100644
--- a/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/toollinepoint/vtoolcurveintersectaxis.cpp
+++ b/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/toollinepoint/vtoolcurveintersectaxis.cpp
@@ -143,7 +143,7 @@ VToolCurveIntersectAxis *VToolCurveIntersectAxis::Create(VToolCurveIntersectAxis
                                     " through point '%3' with angle %4°")
                 .arg(initData.name, curve->name(), basePoint->name()).arg(angle);
         qApp->IsPedantic() ? throw VExceptionObjectError(errorMsg) :
-                             qWarning() << VAbstractApplication::patternMessageSignature + errorMsg;
+                             qWarning() << VAbstractValApplication::patternMessageSignature + errorMsg;
     }
 
     const qreal segLength = curve->GetLengthByPoint(fPoint);
diff --git a/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/toollinepoint/vtoolheight.cpp b/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/toollinepoint/vtoolheight.cpp
index b6e02024b..40c28fd76 100644
--- a/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/toollinepoint/vtoolheight.cpp
+++ b/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/toollinepoint/vtoolheight.cpp
@@ -281,7 +281,7 @@ QString VToolHeight::MakeToolTip() const
                                     "</table>")
             .arg(tr("Length"))
             .arg(qApp->fromPixel(curLine.length()))
-            .arg(UnitsToStr(qApp->patternUnit(), true), tr("Angle"))
+            .arg(UnitsToStr(qApp->patternUnits(), true), tr("Angle"))
             .arg(curLine.angle())
             .arg(QString("%1->%2").arg(p1Line->name(), current->name()))
             .arg(qApp->fromPixel(p1ToCur.length()))
diff --git a/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/toollinepoint/vtoollineintersectaxis.cpp b/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/toollinepoint/vtoollineintersectaxis.cpp
index 7c9cc6b96..a154972ba 100644
--- a/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/toollinepoint/vtoollineintersectaxis.cpp
+++ b/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/toollinepoint/vtoollineintersectaxis.cpp
@@ -135,7 +135,7 @@ VToolLineIntersectAxis *VToolLineIntersectAxis::Create(VToolLineIntersectAxisIni
                                     "through point '%4' and angle %5°")
                       .arg(initData.name, firstPoint->name(), secondPoint->name(), basePoint->name()).arg(axis.angle());
         qApp->IsPedantic() ? throw VExceptionObjectError(errorMsg) :
-                             qWarning() << VAbstractApplication::patternMessageSignature + errorMsg;
+                             qWarning() << VAbstractValApplication::patternMessageSignature + errorMsg;
     }
 
     VPointF *p = new VPointF(fPoint, initData.name, initData.mx, initData.my);
@@ -342,7 +342,7 @@ QString VToolLineIntersectAxis::MakeToolTip() const
                                     "</table>")
             .arg(tr("Length"))
             .arg(qApp->fromPixel(curLine.length()))
-            .arg(UnitsToStr(qApp->patternUnit(), true), tr("Angle"))
+            .arg(UnitsToStr(qApp->patternUnits(), true), tr("Angle"))
             .arg(curLine.angle())
             .arg(QString("%1->%2").arg(firstPoint->name(), current->name()))
             .arg(qApp->fromPixel(firstToCur.length()))
diff --git a/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/toollinepoint/vtoollinepoint.cpp b/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/toollinepoint/vtoollinepoint.cpp
index 9e36108f4..eff502941 100644
--- a/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/toollinepoint/vtoollinepoint.cpp
+++ b/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/toollinepoint/vtoollinepoint.cpp
@@ -158,7 +158,7 @@ QString VToolLinePoint::MakeToolTip() const
                                     "</table>")
             .arg(tr("Length"))
             .arg(qApp->fromPixel(line.length()))
-            .arg(UnitsToStr(qApp->patternUnit(), true), tr("Angle"))
+            .arg(UnitsToStr(qApp->patternUnits(), true), tr("Angle"))
             .arg(line.angle())
             .arg(tr("Label"), second->name());
     return toolTip;
@@ -217,7 +217,7 @@ VFormula VToolLinePoint::GetFormulaLength() const
     VFormula fLength(formulaLength, this->getData());
     fLength.setCheckZero(false);
     fLength.setToolId(m_id);
-    fLength.setPostfix(UnitsToStr(qApp->patternUnit()));
+    fLength.setPostfix(UnitsToStr(qApp->patternUnits()));
     fLength.Eval();
 
     return fLength;
diff --git a/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/toollinepoint/vtoolshoulderpoint.cpp b/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/toollinepoint/vtoolshoulderpoint.cpp
index e85768593..bd87e2e88 100644
--- a/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/toollinepoint/vtoolshoulderpoint.cpp
+++ b/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/toollinepoint/vtoolshoulderpoint.cpp
@@ -339,7 +339,7 @@ QString VToolShoulderPoint::MakeToolTip() const
                                     "</table>")
             .arg(tr("Length"))
             .arg(qApp->fromPixel(firstToCur.length()))
-            .arg(UnitsToStr(qApp->patternUnit(), true), tr("Angle"))
+            .arg(UnitsToStr(qApp->patternUnits(), true), tr("Angle"))
             .arg(firstToCur.angle())
             .arg(QString("%1->%2").arg(second->name(), current->name()))
             .arg(qApp->fromPixel(secondToCur.length()))
diff --git a/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/vtoollineintersect.cpp b/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/vtoollineintersect.cpp
index 99b269d9e..5a34b2776 100644
--- a/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/vtoollineintersect.cpp
+++ b/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/vtoollineintersect.cpp
@@ -150,7 +150,7 @@ VToolLineIntersect* VToolLineIntersect::Create(VToolLineIntersectInitData initDa
                                     "intersection")
                 .arg(initData.name, p1Line1->name(), p2Line1->name(), p1Line2->name(), p2Line2->name());
         qApp->IsPedantic() ? throw VExceptionObjectError(errorMsg) :
-                             qWarning() << VAbstractApplication::patternMessageSignature + errorMsg;
+                             qWarning() << VAbstractValApplication::patternMessageSignature + errorMsg;
     }
 
     VPointF *p = new VPointF(fPoint, initData.name, initData.mx, initData.my);
@@ -321,7 +321,7 @@ QString VToolLineIntersect::MakeToolTip() const
                                     "</table>")
             .arg(QString("%1->%2").arg(p1L1->name(), current->name()))
             .arg(qApp->fromPixel(p1L1ToCur.length()))
-            .arg(UnitsToStr(qApp->patternUnit(), true), QString("%1->%2").arg(current->name(), p2L1->name()))
+            .arg(UnitsToStr(qApp->patternUnits(), true), QString("%1->%2").arg(current->name(), p2L1->name()))
             .arg(qApp->fromPixel(curToP2L1.length()))
             .arg(QString("%1->%2").arg(p1L2->name(), current->name()))
             .arg(qApp->fromPixel(p1L2ToCur.length()))
diff --git a/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/vtoolpointfromarcandtangent.cpp b/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/vtoolpointfromarcandtangent.cpp
index b9974f66e..f99b82692 100644
--- a/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/vtoolpointfromarcandtangent.cpp
+++ b/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/vtoolpointfromarcandtangent.cpp
@@ -122,7 +122,7 @@ VToolPointFromArcAndTangent *VToolPointFromArcAndTangent::Create(VToolPointFromA
         const QString errorMsg = tr("Error calculating point '%1'. Tangent to arc '%2' from point '%3' cannot be found")
                 .arg(initData.name, arc.name(), tPoint.name());
         qApp->IsPedantic() ? throw VExceptionObjectError(errorMsg) :
-                             qWarning() << VAbstractApplication::patternMessageSignature + errorMsg;
+                             qWarning() << VAbstractValApplication::patternMessageSignature + errorMsg;
     }
 
     VPointF *p = new VPointF(point, initData.name, initData.mx, initData.my);
diff --git a/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/vtoolpointfromcircleandtangent.cpp b/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/vtoolpointfromcircleandtangent.cpp
index 53acddb37..230df2356 100644
--- a/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/vtoolpointfromcircleandtangent.cpp
+++ b/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/vtoolpointfromcircleandtangent.cpp
@@ -131,7 +131,7 @@ VToolPointFromCircleAndTangent *VToolPointFromCircleAndTangent::Create(VToolPoin
                 .arg(initData.name, cPoint.name()).arg(radius).arg(tPoint.name());
 
         qApp->IsPedantic() ? throw VExceptionObjectError(errorMsg) :
-                             qWarning() << VAbstractApplication::patternMessageSignature + errorMsg;
+                             qWarning() << VAbstractValApplication::patternMessageSignature + errorMsg;
     }
 
     VPointF *p = new VPointF(point, initData.name, initData.mx, initData.my);
@@ -206,7 +206,7 @@ VFormula VToolPointFromCircleAndTangent::GetCircleRadius() const
     VFormula radius(circleRadius, getData());
     radius.setCheckZero(true);
     radius.setToolId(m_id);
-    radius.setPostfix(UnitsToStr(qApp->patternUnit()));
+    radius.setPostfix(UnitsToStr(qApp->patternUnits()));
     radius.Eval();
     return radius;
 }
diff --git a/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/vtoolpointofcontact.cpp b/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/vtoolpointofcontact.cpp
index d771b059b..9aa1ad7ac 100644
--- a/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/vtoolpointofcontact.cpp
+++ b/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/vtoolpointofcontact.cpp
@@ -217,7 +217,7 @@ VToolPointOfContact* VToolPointOfContact::Create(VToolPointOfContactInitData &in
                                     "intersection with line (%4;%5)")
                 .arg(initData.name, centerP->name()).arg(result).arg(firstP->name(), secondP->name());
         qApp->IsPedantic() ? throw VExceptionObjectError(errorMsg) :
-                             qWarning() << VAbstractApplication::patternMessageSignature + errorMsg;
+                             qWarning() << VAbstractValApplication::patternMessageSignature + errorMsg;
     }
 
     VPointF *p = new VPointF(fPoint, initData.name, initData.mx, initData.my);
@@ -373,7 +373,7 @@ QString VToolPointOfContact::MakeToolTip() const
                                     "</table>")
             .arg(QStringLiteral("%1->%2").arg(p1->name(), current->name()))
             .arg(qApp->fromPixel(p1ToCur.length()))
-            .arg(UnitsToStr(qApp->patternUnit(), true), QStringLiteral("%1->%2").arg(p2->name(), current->name()))
+            .arg(UnitsToStr(qApp->patternUnits(), true), QStringLiteral("%1->%2").arg(p2->name(), current->name()))
             .arg(qApp->fromPixel(p2ToCur.length()))
             .arg(QStringLiteral("%1 %2->%3").arg(tr("Length"), centerP->name(), current->name()))
             .arg(qApp->fromPixel(centerToCur.length()))
@@ -409,7 +409,7 @@ VFormula VToolPointOfContact::getArcRadius() const
     VFormula radius(arcRadius, this->getData());
     radius.setCheckZero(true);
     radius.setToolId(m_id);
-    radius.setPostfix(UnitsToStr(qApp->patternUnit()));
+    radius.setPostfix(UnitsToStr(qApp->patternUnits()));
     radius.Eval();
 
     return radius;
diff --git a/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/vtoolpointofintersectionarcs.cpp b/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/vtoolpointofintersectionarcs.cpp
index 8e258a64b..081c3b8d4 100644
--- a/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/vtoolpointofintersectionarcs.cpp
+++ b/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/vtoolpointofintersectionarcs.cpp
@@ -121,7 +121,7 @@ VToolPointOfIntersectionArcs *VToolPointOfIntersectionArcs::Create(VToolPointOfI
         const QString errorMsg = tr("Error calculating point '%1'. Arcs '%2' and '%3' have no point of intersection")
                       .arg(initData.name, firstArc->name(), secondArc->name());
         qApp->IsPedantic() ? throw VExceptionObjectError(errorMsg) :
-                             qWarning() << VAbstractApplication::patternMessageSignature + errorMsg;
+                             qWarning() << VAbstractValApplication::patternMessageSignature + errorMsg;
     }
 
     VPointF *p = new VPointF(point, initData.name, initData.mx, initData.my);
diff --git a/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/vtoolpointofintersectioncircles.cpp b/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/vtoolpointofintersectioncircles.cpp
index 61e5a68a0..80cd70d7c 100644
--- a/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/vtoolpointofintersectioncircles.cpp
+++ b/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/vtoolpointofintersectioncircles.cpp
@@ -135,7 +135,7 @@ VToolPointOfIntersectionCircles::Create(VToolPointOfIntersectionCirclesInitData
         const QString errorMsg = tr("Error calculating point '%1'. Circles with centers in points '%2' and '%3' have "
                                     "no point of intersection").arg(initData.name, c1Point.name(), c2Point.name());
         qApp->IsPedantic() ? throw VExceptionObjectError(errorMsg) :
-                             qWarning() << VAbstractApplication::patternMessageSignature + errorMsg;
+                             qWarning() << VAbstractValApplication::patternMessageSignature + errorMsg;
     }
 
     VPointF *p = new VPointF(point, initData.name, initData.mx, initData.my);
@@ -219,7 +219,7 @@ VFormula VToolPointOfIntersectionCircles::GetFirstCircleRadius() const
     VFormula radius(firstCircleRadius, getData());
     radius.setCheckZero(true);
     radius.setToolId(m_id);
-    radius.setPostfix(UnitsToStr(qApp->patternUnit()));
+    radius.setPostfix(UnitsToStr(qApp->patternUnits()));
     radius.Eval();
     return radius;
 }
@@ -244,7 +244,7 @@ VFormula VToolPointOfIntersectionCircles::GetSecondCircleRadius() const
     VFormula radius(secondCircleRadius, getData());
     radius.setCheckZero(true);
     radius.setToolId(m_id);
-    radius.setPostfix(UnitsToStr(qApp->patternUnit()));
+    radius.setPostfix(UnitsToStr(qApp->patternUnits()));
     radius.Eval();
     return radius;
 }
diff --git a/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/vtoolpointofintersectioncurves.cpp b/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/vtoolpointofintersectioncurves.cpp
index 1c1f23e07..9927b79d0 100644
--- a/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/vtoolpointofintersectioncurves.cpp
+++ b/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/vtoolpointofintersectioncurves.cpp
@@ -126,7 +126,7 @@ VToolPointOfIntersectionCurves *VToolPointOfIntersectionCurves::Create(VToolPoin
         const QString errorMsg = tr("Error calculating point '%1'. Curves '%2' and '%3' have no point of intersection")
                 .arg(initData.name, curve1->name(), curve2->name());
         qApp->IsPedantic() ? throw VExceptionObjectError(errorMsg) :
-                             qWarning() << VAbstractApplication::patternMessageSignature + errorMsg;
+                             qWarning() << VAbstractValApplication::patternMessageSignature + errorMsg;
     }
 
     VPointF *p = new VPointF(point, initData.name, initData.mx, initData.my);
diff --git a/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/vtooltriangle.cpp b/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/vtooltriangle.cpp
index 67b0c80dd..d71ee141c 100644
--- a/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/vtooltriangle.cpp
+++ b/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/vtooltriangle.cpp
@@ -148,7 +148,7 @@ VToolTriangle* VToolTriangle::Create(VToolTriangleInitData initData)
         const QString errorMsg = tr("Error calculating point '%1'. Point of intersection cannot be found")
                       .arg(initData.name);
         qApp->IsPedantic() ? throw VExceptionObjectError(errorMsg) :
-                             qWarning() << VAbstractApplication::patternMessageSignature + errorMsg;
+                             qWarning() << VAbstractValApplication::patternMessageSignature + errorMsg;
     }
 
     VPointF *p = new VPointF(point, initData.name, initData.mx, initData.my);
diff --git a/src/libs/vtools/tools/drawTools/vtoolline.cpp b/src/libs/vtools/tools/drawTools/vtoolline.cpp
index c6db258d9..b054c4edd 100644
--- a/src/libs/vtools/tools/drawTools/vtoolline.cpp
+++ b/src/libs/vtools/tools/drawTools/vtoolline.cpp
@@ -442,7 +442,7 @@ QString VToolLine::MakeToolTip() const
                                     "</table>")
             .arg(tr("Length"))
             .arg(qApp->fromPixel(line.length()))
-            .arg(UnitsToStr(qApp->patternUnit(), true), tr("Angle"))
+            .arg(UnitsToStr(qApp->patternUnits(), true), tr("Angle"))
             .arg(line.angle());
     return toolTip;
 }
diff --git a/src/libs/vtools/tools/vtoolseamallowance.cpp b/src/libs/vtools/tools/vtoolseamallowance.cpp
index 261691386..e69c12bab 100644
--- a/src/libs/vtools/tools/vtoolseamallowance.cpp
+++ b/src/libs/vtools/tools/vtoolseamallowance.cpp
@@ -614,7 +614,7 @@ void VToolSeamAllowance::UpdateDetailLabel()
 
         if (PrepareLabelData(labelData, pins, m_dataLabel, pos, labelAngle))
         {
-            m_dataLabel->UpdateData(detail.GetName(), labelData);
+            m_dataLabel->UpdateData(detail.GetName(), labelData, getData());
             UpdateLabelItem(m_dataLabel, pos, labelAngle);
         }
     }
@@ -641,7 +641,7 @@ void VToolSeamAllowance::UpdatePatternInfo()
 
         if (PrepareLabelData(geom, pins, m_patternInfo, pos, labelAngle))
         {
-            m_patternInfo->UpdateData(doc);
+            m_patternInfo->UpdateData(doc, getData());
             UpdateLabelItem(m_patternInfo, pos, labelAngle);
         }
     }
@@ -1321,7 +1321,7 @@ void VToolSeamAllowance::RefreshGeometry(bool updateChildren)
             const QString errorMsg = QObject::tr("Piece '%1'. Seam allowance is not valid.")
                     .arg(detail.GetName());
             qApp->IsPedantic() ? throw VException(errorMsg) :
-                                 qWarning() << VAbstractApplication::patternMessageSignature + errorMsg;
+                                 qWarning() << VAbstractValApplication::patternMessageSignature + errorMsg;
         }
         path.addPath(detail.SeamAllowancePath(futureSeamAllowance.result()));
         path.setFillRule(Qt::OddEvenFill);
diff --git a/src/libs/vtools/undocommands/addtocalc.cpp b/src/libs/vtools/undocommands/addtocalc.cpp
index af22114b7..a91bc142c 100644
--- a/src/libs/vtools/undocommands/addtocalc.cpp
+++ b/src/libs/vtools/undocommands/addtocalc.cpp
@@ -33,7 +33,7 @@
 #include "../vwidgets/vmaingraphicsview.h"
 #include "../ifc/xml/vabstractpattern.h"
 #include "../ifc/ifcdef.h"
-#include "../vmisc/vabstractapplication.h"
+#include "../vmisc/vabstractvalapplication.h"
 #include "../vmisc/customevents.h"
 #include "vundocommand.h"
 
diff --git a/src/libs/vtools/undocommands/deletepatternpiece.cpp b/src/libs/vtools/undocommands/deletepatternpiece.cpp
index 240906984..43f930a5b 100644
--- a/src/libs/vtools/undocommands/deletepatternpiece.cpp
+++ b/src/libs/vtools/undocommands/deletepatternpiece.cpp
@@ -31,7 +31,7 @@
 #include <QDomNode>
 #include <QDomNodeList>
 
-#include "../vmisc/vabstractapplication.h"
+#include "../vmisc/vabstractvalapplication.h"
 #include "../ifc/xml/vabstractpattern.h"
 #include "vundocommand.h"
 
diff --git a/src/libs/vtools/undocommands/deltool.cpp b/src/libs/vtools/undocommands/deltool.cpp
index 30e89c96c..cf4642163 100644
--- a/src/libs/vtools/undocommands/deltool.cpp
+++ b/src/libs/vtools/undocommands/deltool.cpp
@@ -32,7 +32,7 @@
 
 #include "../ifc/ifcdef.h"
 #include "../ifc/xml/vabstractpattern.h"
-#include "../vmisc/vabstractapplication.h"
+#include "../vmisc/vabstractvalapplication.h"
 #include "vundocommand.h"
 
 //---------------------------------------------------------------------------------------------------------------------
diff --git a/src/libs/vtools/undocommands/movespline.cpp b/src/libs/vtools/undocommands/movespline.cpp
index 785f01a69..170839705 100644
--- a/src/libs/vtools/undocommands/movespline.cpp
+++ b/src/libs/vtools/undocommands/movespline.cpp
@@ -32,7 +32,7 @@
 
 #include "../ifc/ifcdef.h"
 #include "../ifc/xml/vabstractpattern.h"
-#include "../vmisc/vabstractapplication.h"
+#include "../vmisc/vabstractvalapplication.h"
 #include "../vmisc/def.h"
 #include "../vwidgets/vmaingraphicsview.h"
 #include "../vgeometry/vpointf.h"
diff --git a/src/libs/vtools/undocommands/movespoint.cpp b/src/libs/vtools/undocommands/movespoint.cpp
index 2ba0029a7..123ecf020 100644
--- a/src/libs/vtools/undocommands/movespoint.cpp
+++ b/src/libs/vtools/undocommands/movespoint.cpp
@@ -32,7 +32,7 @@
 
 #include "../ifc/xml/vabstractpattern.h"
 #include "../ifc/ifcdef.h"
-#include "../vmisc/vabstractapplication.h"
+#include "../vmisc/vabstractvalapplication.h"
 #include "../vmisc/def.h"
 #include "vundocommand.h"
 
diff --git a/src/libs/vtools/undocommands/undogroup.cpp b/src/libs/vtools/undocommands/undogroup.cpp
index 1ef1cec28..3dde2498a 100644
--- a/src/libs/vtools/undocommands/undogroup.cpp
+++ b/src/libs/vtools/undocommands/undogroup.cpp
@@ -31,7 +31,7 @@
 #include <QDomNode>
 #include <QDomNodeList>
 
-#include "../vmisc/vabstractapplication.h"
+#include "../vmisc/vabstractvalapplication.h"
 #include "../vmisc/def.h"
 #include "../vwidgets/vmaingraphicsview.h"
 #include "../ifc/xml/vabstractpattern.h"
diff --git a/src/libs/vtools/visualization/line/operation/vistoolmove.cpp b/src/libs/vtools/visualization/line/operation/vistoolmove.cpp
index 627df2a79..984540d0f 100644
--- a/src/libs/vtools/visualization/line/operation/vistoolmove.cpp
+++ b/src/libs/vtools/visualization/line/operation/vistoolmove.cpp
@@ -170,7 +170,7 @@ void VisToolMove::RefreshGeometry()
     DrawLine(this, line, supportColor2, Qt::DashLine);
     DrawPoint(pointFinish, line.p2(), supportColor);
 
-    static const QString prefix = UnitsToStr(qApp->patternUnit(), true);
+    static const QString prefix = UnitsToStr(qApp->patternUnits(), true);
     if (qFuzzyIsNull(length))
     {
         Visualization::toolTip = tr("Length = %1%2, angle = %3°, <b>%4</b> - sticking angle, "
diff --git a/src/libs/vtools/visualization/line/vistoolendline.cpp b/src/libs/vtools/visualization/line/vistoolendline.cpp
index 654f9275c..88e9e6906 100644
--- a/src/libs/vtools/visualization/line/vistoolendline.cpp
+++ b/src/libs/vtools/visualization/line/vistoolendline.cpp
@@ -79,7 +79,7 @@ void VisToolEndLine::RefreshGeometry()
         DrawPoint(point, line.p2(), mainColor);
     }
     DrawLine(this, line, mainColor, lineStyle);
-    static const QString prefix = UnitsToStr(qApp->patternUnit(), true);
+    static const QString prefix = UnitsToStr(qApp->patternUnits(), true);
     Visualization::toolTip = tr("<b>Point at distance and angle</b>: angle = %1°, length = %2%3; "
                                 "<b>%4</b> - sticking angle, <b>%5</b> - finish creation")
             .arg(this->line().angle())
diff --git a/src/libs/vtools/visualization/visualization.h b/src/libs/vtools/visualization/visualization.h
index 1a302820e..8c7014411 100644
--- a/src/libs/vtools/visualization/visualization.h
+++ b/src/libs/vtools/visualization/visualization.h
@@ -36,7 +36,7 @@
 #include <QLoggingCategory>
 
 #include "../vmisc/def.h"
-#include "../vmisc/vabstractapplication.h"
+#include "../vmisc/vabstractvalapplication.h"
 #include "../vwidgets/vmaingraphicsscene.h"
 #include "../vwidgets/vcurvepathitem.h"
 #include "../vwidgets/global.h"
diff --git a/src/libs/vwidgets/vcomboboxdelegate.h b/src/libs/vwidgets/vcomboboxdelegate.h
index 1cd27652d..301a39918 100644
--- a/src/libs/vwidgets/vcomboboxdelegate.h
+++ b/src/libs/vwidgets/vcomboboxdelegate.h
@@ -34,7 +34,7 @@ class VComboBoxDelegate : public QItemDelegate
 {
     Q_OBJECT
 public:
-    VComboBoxDelegate(const QStringList &items, QObject *parent = nullptr);
+    explicit VComboBoxDelegate(const QStringList &items, QObject *parent = nullptr);
 
     virtual QWidget *createEditor(QWidget *parent, const QStyleOptionViewItem &option,
                                   const QModelIndex &index) const override;
diff --git a/src/libs/vwidgets/vdecorationaligningdelegate.cpp b/src/libs/vwidgets/vdecorationaligningdelegate.cpp
new file mode 100644
index 000000000..f81974444
--- /dev/null
+++ b/src/libs/vwidgets/vdecorationaligningdelegate.cpp
@@ -0,0 +1,48 @@
+/************************************************************************
+ **
+ **  @file   vdecorationaligningdelegate.cpp
+ **  @author Roman Telezhynskyi <dismine(at)gmail.com>
+ **  @date   6 10, 2020
+ **
+ **  @brief
+ **  @copyright
+ **  This source code is part of the Valentina project, a pattern making
+ **  program, whose allow create and modeling patterns of clothing.
+ **  Copyright (C) 2020 Valentina project
+ **  <https://gitlab.com/smart-pattern/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 "vdecorationaligningdelegate.h"
+
+#include <QPainter>
+
+//---------------------------------------------------------------------------------------------------------------------
+VDecorationAligningDelegate::VDecorationAligningDelegate(Qt::Alignment alignment, QObject *parent)
+    : QStyledItemDelegate(parent), m_alignment(alignment)
+{}
+
+//---------------------------------------------------------------------------------------------------------------------
+void VDecorationAligningDelegate::paint(QPainter *painter, const QStyleOptionViewItem &option, const QModelIndex &index) const
+{
+    QIcon icon = QIcon(qvariant_cast<QIcon>(index.data(Qt::DecorationRole)));
+
+    if (option.state & QStyle::State_Selected)
+    {
+        painter->fillRect(option.rect, option.palette.highlight());
+    }
+
+    icon.paint(painter, option.rect, m_alignment);
+}
diff --git a/src/libs/vwidgets/vdecorationaligningdelegate.h b/src/libs/vwidgets/vdecorationaligningdelegate.h
new file mode 100644
index 000000000..2bfb424ac
--- /dev/null
+++ b/src/libs/vwidgets/vdecorationaligningdelegate.h
@@ -0,0 +1,57 @@
+/************************************************************************
+ **
+ **  @file   vdecorationaligningdelegate.h
+ **  @author Roman Telezhynskyi <dismine(at)gmail.com>
+ **  @date   6 10, 2020
+ **
+ **  @brief
+ **  @copyright
+ **  This source code is part of the Valentina project, a pattern making
+ **  program, whose allow create and modeling patterns of clothing.
+ **  Copyright (C) 2020 Valentina project
+ **  <https://gitlab.com/smart-pattern/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 VDECORATIONALIGNINGDELEGATE_H
+#define VDECORATIONALIGNINGDELEGATE_H
+
+#include <QStyledItemDelegate>
+
+
+
+class VDecorationAligningDelegate : public QStyledItemDelegate
+{
+    Q_OBJECT
+
+public:
+    explicit VDecorationAligningDelegate(Qt::Alignment alignment, QObject *parent = nullptr);
+
+    Qt::Alignment Alignment() const;
+
+    void paint(QPainter *painter, const QStyleOptionViewItem &option, const QModelIndex &index) const;
+
+private:
+    Q_DISABLE_COPY(VDecorationAligningDelegate)
+    Qt::Alignment const m_alignment;
+};
+
+//---------------------------------------------------------------------------------------------------------------------
+inline Qt::Alignment VDecorationAligningDelegate::Alignment() const
+{
+    return m_alignment;
+}
+
+#endif // VDECORATIONALIGNINGDELEGATE_H
diff --git a/src/libs/vwidgets/vgraphicssimpletextitem.cpp b/src/libs/vwidgets/vgraphicssimpletextitem.cpp
index 370bc876f..3d3762187 100644
--- a/src/libs/vwidgets/vgraphicssimpletextitem.cpp
+++ b/src/libs/vwidgets/vgraphicssimpletextitem.cpp
@@ -48,7 +48,7 @@
 #include "global.h"
 #include "vscenepoint.h"
 #include "../vmisc/vmath.h"
-#include "../vmisc/vabstractapplication.h"
+#include "../vmisc/vabstractvalapplication.h"
 
 //---------------------------------------------------------------------------------------------------------------------
 /**
diff --git a/src/libs/vwidgets/vmaingraphicsview.cpp b/src/libs/vwidgets/vmaingraphicsview.cpp
index 8351784c7..1e9a3c65a 100644
--- a/src/libs/vwidgets/vmaingraphicsview.cpp
+++ b/src/libs/vwidgets/vmaingraphicsview.cpp
@@ -55,7 +55,7 @@
 #include "vmaingraphicsscene.h"
 #include "vsimplecurve.h"
 #include "vcontrolpointspline.h"
-#include "../vmisc/vabstractapplication.h"
+#include "../vmisc/vabstractvalapplication.h"
 #include "../vmisc/vsettings.h"
 #include "vabstractmainwindow.h"
 #include "global.h"
diff --git a/src/libs/vwidgets/vtextgraphicsitem.cpp b/src/libs/vwidgets/vtextgraphicsitem.cpp
index 9501e5e1e..bf1e79a67 100644
--- a/src/libs/vwidgets/vtextgraphicsitem.cpp
+++ b/src/libs/vwidgets/vtextgraphicsitem.cpp
@@ -317,9 +317,9 @@ bool VTextGraphicsItem::IsContained(QRectF rectBB, qreal dRot, qreal &dX, qreal
  * @param qsName name of detail
  * @param data reference to VPatternPieceData
  */
-void VTextGraphicsItem::UpdateData(const QString &qsName, const VPieceLabelData &data)
+void VTextGraphicsItem::UpdateData(const QString &qsName, const VPieceLabelData &data, const VContainer *pattern)
 {
-    m_tm.Update(qsName, data);
+    m_tm.Update(qsName, data, pattern);
 }
 
 //---------------------------------------------------------------------------------------------------------------------
@@ -327,9 +327,9 @@ void VTextGraphicsItem::UpdateData(const QString &qsName, const VPieceLabelData
  * @brief VTextGraphicsItem::UpdateData Updates the pattern label
  * @param pDoc pointer to the pattern object
  */
-void VTextGraphicsItem::UpdateData(VAbstractPattern* pDoc)
+void VTextGraphicsItem::UpdateData(VAbstractPattern* pDoc, const VContainer *pattern)
 {
-    m_tm.Update(pDoc);
+    m_tm.Update(pDoc, pattern);
 }
 
 //---------------------------------------------------------------------------------------------------------------------
diff --git a/src/libs/vwidgets/vtextgraphicsitem.h b/src/libs/vwidgets/vtextgraphicsitem.h
index 60f5d9228..cbbd09f47 100644
--- a/src/libs/vwidgets/vtextgraphicsitem.h
+++ b/src/libs/vwidgets/vtextgraphicsitem.h
@@ -65,8 +65,8 @@ public:
     int  GetFontSize() const;
     void SetSize(qreal fW, qreal fH);
     bool IsContained(QRectF rectBB, qreal dRot, qreal& dX, qreal& dY) const;
-    void UpdateData(const QString& qsName, const VPieceLabelData& data);
-    void UpdateData(VAbstractPattern* pDoc);
+    void UpdateData(const QString& qsName, const VPieceLabelData& data, const VContainer *pattern);
+    void UpdateData(VAbstractPattern* pDoc, const VContainer *pattern);
     int  GetTextLines() const;
 
 protected:
diff --git a/src/libs/vwidgets/vwidgets.pri b/src/libs/vwidgets/vwidgets.pri
index 602602a14..eaf29bd78 100644
--- a/src/libs/vwidgets/vwidgets.pri
+++ b/src/libs/vwidgets/vwidgets.pri
@@ -3,6 +3,7 @@
 
 SOURCES += \
     $$PWD/vcomboboxdelegate.cpp \
+    $$PWD/vdecorationaligningdelegate.cpp \
     $$PWD/velidedlabel.cpp \
     $$PWD/vmaingraphicsscene.cpp \
     $$PWD/vmaingraphicsview.cpp \
@@ -33,6 +34,7 @@ SOURCES += \
 HEADERS += \
     $$PWD/stable.h \
     $$PWD/vcomboboxdelegate.h \
+    $$PWD/vdecorationaligningdelegate.h \
     $$PWD/velidedlabel.h \
     $$PWD/vmaingraphicsscene.h \
     $$PWD/vmaingraphicsview.h \
diff --git a/src/test/TranslationsTest/tst_buitinregexp.cpp b/src/test/TranslationsTest/tst_buitinregexp.cpp
index 59967a330..0975d9952 100644
--- a/src/test/TranslationsTest/tst_buitinregexp.cpp
+++ b/src/test/TranslationsTest/tst_buitinregexp.cpp
@@ -225,43 +225,6 @@ void TST_BuitInRegExp::TestCheckInternalVaribleRegExp()
     }
 }
 
-//---------------------------------------------------------------------------------------------------------------------
-void TST_BuitInRegExp::TestTemplatePlaceholders()
-{
-    QSet<QString> originals;
-    QSet<QString> translations;
-    QStringList issue;
-
-    for (auto &placeholder : labelTemplatePlaceholders)
-    {
-        originals.insert(placeholder);
-        const QString translated = m_trMs->PlaceholderToUser(placeholder);
-
-        const QRegularExpression re(QLatin1String("^[^\\s]+$"));
-        if (re.match(translated).hasMatch())
-        {
-            if (not translations.contains(translated))
-            {
-                translations.insert(translated);
-            }
-            else
-            {
-                issue << QString("Duplicate translation '%1' for placeholder '%2' in locale '%3'.\n")
-                         .arg(translated, placeholder, m_locale);
-            }
-        }
-        else
-        {
-            issue << QString("Invalid translation '%1' for placeholder '%2' in locale '%3'.\n")
-                     .arg(translated, placeholder, m_locale);
-        }
-    }
-
-    QVERIFY2(issue.isEmpty(), qUtf8Printable(issue.join("")));
-    QCOMPARE(originals.size(), labelTemplatePlaceholders.size()); // All tags are unique
-    QCOMPARE(translations.size(), labelTemplatePlaceholders.size()); // All translated tags are unique
-}
-
 //---------------------------------------------------------------------------------------------------------------------
 void TST_BuitInRegExp::TestForValidChars_data()
 {
diff --git a/src/test/TranslationsTest/tst_buitinregexp.h b/src/test/TranslationsTest/tst_buitinregexp.h
index c2dcaa5f1..8cef450ff 100644
--- a/src/test/TranslationsTest/tst_buitinregexp.h
+++ b/src/test/TranslationsTest/tst_buitinregexp.h
@@ -61,7 +61,6 @@ private slots:
     void TestCheckUnderlineExists();
     void TestCheckInternalVaribleRegExp_data();
     void TestCheckInternalVaribleRegExp();
-    void TestTemplatePlaceholders();
     void TestForValidChars_data();
     void TestForValidChars();
     void cleanupTestCase();
diff --git a/src/test/ValentinaTest/tst_vmeasurements.cpp b/src/test/ValentinaTest/tst_vmeasurements.cpp
index 8a749a379..4fa0dd187 100644
--- a/src/test/ValentinaTest/tst_vmeasurements.cpp
+++ b/src/test/ValentinaTest/tst_vmeasurements.cpp
@@ -48,16 +48,20 @@ TST_VMeasurements::TST_VMeasurements(QObject *parent) :
 void TST_VMeasurements::CreateEmptyMultisizeFile()
 {
     Unit mUnit = Unit::Cm;
-    const int height = 176;
-    const int size = 50;
 
     QSharedPointer<VContainer> data = QSharedPointer<VContainer>(new VContainer(nullptr, &mUnit,
                                                                                 VContainer::UniqueNamespace()));
-    data->SetHeight(height);
-    data->SetSize(size);
+    auto m_xDimension = QSharedPointer<VXMeasurementDimension>::create(mUnit, 50, 200, 6);
+    m_xDimension->SetBaseValue(176);
+
+    auto m_yDimension = QSharedPointer<VYMeasurementDimension>::create(mUnit, 22, 72, 2);
+    m_yDimension->SetBaseValue(50);
+    m_yDimension->SetCircumference(true);
+
+    QVector<MeasurementDimension_p > dimensions{m_xDimension, m_yDimension};
 
     QSharedPointer<VMeasurements> m =
-            QSharedPointer<VMeasurements>(new VMeasurements(mUnit, size, height, data.data()));
+            QSharedPointer<VMeasurements>(new VMeasurements(mUnit, dimensions, data.data()));
 
     QTemporaryFile file;
     QString fileName;
@@ -138,16 +142,21 @@ void TST_VMeasurements::CreateEmptyIndividualFile()
 void TST_VMeasurements::ValidPMCodesMultisizeFile()
 {
     Unit mUnit = Unit::Cm;
-    const int height = 176;
-    const int size = 50;
 
     QSharedPointer<VContainer> data = QSharedPointer<VContainer>(new VContainer(nullptr, &mUnit,
                                                                                 VContainer::UniqueNamespace()));
-    data->SetHeight(height);
-    data->SetSize(size);
+
+    auto m_xDimension = QSharedPointer<VXMeasurementDimension>::create(mUnit, 50, 200, 6);
+    m_xDimension->SetBaseValue(176);
+
+    auto m_yDimension = QSharedPointer<VYMeasurementDimension>::create(mUnit, 22, 72, 2);
+    m_yDimension->SetBaseValue(50);
+    m_yDimension->SetCircumference(true);
+
+    QVector<MeasurementDimension_p > dimensions{m_xDimension, m_yDimension};
 
     QSharedPointer<VMeasurements> m =
-            QSharedPointer<VMeasurements>(new VMeasurements(mUnit, size, height, data.data()));
+            QSharedPointer<VMeasurements>(new VMeasurements(mUnit, dimensions, data.data()));
 
     const QStringList listSystems = ListPMSystems();
     for (int i = 0; i < listSystems.size(); ++i)
diff --git a/src/test/ValentinaTest/tst_vpiece.cpp b/src/test/ValentinaTest/tst_vpiece.cpp
index 0db6fcee6..26f816a35 100644
--- a/src/test/ValentinaTest/tst_vpiece.cpp
+++ b/src/test/ValentinaTest/tst_vpiece.cpp
@@ -33,7 +33,7 @@
 #include "../vpatterndb/vpiecenode.h"
 #include "../vpatterndb/vpiecepath.h"
 #include "../vgeometry/vsplinepath.h"
-#include "../vmisc/vabstractapplication.h"
+#include "../vmisc/vabstractvalapplication.h"
 
 #include <QtTest>
 #include "../vpatterndb/vpiece.h"
@@ -51,7 +51,7 @@ void TST_VPiece::Issue620()
     // Check main path
     const Unit unit = Unit::Cm;
     QSharedPointer<VContainer> data(new VContainer(nullptr, &unit, VContainer::UniqueNamespace()));
-    qApp->setPatternUnit(unit);
+    qApp->SetPatternUnits(unit);
 
     VPiece detail;
     AbstractTest::PieceFromJson(QStringLiteral("://Issue_620/input.json"), detail, data);