Next try to fix problem with tests.

Because different compilers and even different version from same vendor may
produce little bit different result this cause of test fails because it expect
too accurate result. We don't need such accuracy and can use variable
VGObject::accuracyPointOnLine to compare two points.

--HG--
branch : develop

src/app/tape/dialogs/configpages/tapepreferencesconfigurationpage.cpp

@@ -31,6 +31,7 @@
 #include "../../mapplication.h"
 #include "../vmisc/vtapesettings.h"
 #include "../vpatterndb/variables/vmeasurement.h"
+#include "../vpatterndb/pmsystems.h"
 
 //---------------------------------------------------------------------------------------------------------------------
 TapePreferencesConfigurationPage::TapePreferencesConfigurationPage(QWidget *parent)

src/app/tape/dialogs/dialogmdatabase.cpp

@@ -29,6 +29,7 @@
 #include "dialogmdatabase.h"
 #include "ui_dialogmdatabase.h"
 #include "../mapplication.h"
+#include "../vpatterndb/measurements.h"
 
 #include <QKeyEvent>
 #include <QMenu>

src/app/tape/tmainwindow.cpp

@@ -34,6 +34,7 @@
 #include "dialogs/dialogtapepreferences.h"
 #include "dialogs/dialogexporttocsv.h"
 #include "../vpatterndb/calculator.h"
+#include "../vpatterndb/pmsystems.h"
 #include "../ifc/ifcdef.h"
 #include "../ifc/xml/vvitconverter.h"
 #include "../ifc/xml/vvstconverter.h"

src/app/valentina/dialogs/configpages/preferencesconfigurationpage.cpp

@@ -29,6 +29,7 @@
 #include "preferencesconfigurationpage.h"
 #include "ui_preferencesconfigurationpage.h"
 #include "../../core/vapplication.h"
+#include "../vpatterndb/pmsystems.h"
 
 #include <QDir>
 #include <QDirIterator>

src/libs/libs.pri

@@ -30,3 +30,6 @@ INCLUDEPATH += $${PWD}/qmuparser
 
 #VPropertyExplorer library
 INCLUDEPATH += $${PWD}/vpropertyexplorer
+
+#VTools static library
+INCLUDEPATH += $${PWD}/vtest

src/libs/libs.pro

@@ -12,4 +12,5 @@ SUBDIRS = \
     vwidgets \
     vtools \
     vformat \
-    fervor
+    fervor \
+    vtest

src/libs/vformat/vmeasurements.cpp

@@ -52,6 +52,8 @@
 #include "../vpatterndb/calculator.h"
 #include "../vpatterndb/variables/vmeasurement.h"
 #include "../vpatterndb/vcontainer.h"
+#include "../vpatterndb/measurements.h"
+#include "../vpatterndb/pmsystems.h"
 #include "../vmisc/projectversion.h"
 
 const QString VMeasurements::TagVST              = QStringLiteral("vst");

src/libs/vmisc/def.h

@@ -292,351 +292,6 @@ extern const QString LONG_OPTION_NO_HDPI_SCALING;
 bool IsOptionSet(int argc, char *argv[], const char *option);
 void InitHighDpiScaling(int argc, char *argv[]);
 
-// measurements
-// A
-extern const QString height_M;                    // A01
-extern const QString heightNeckBack_M;            // A02
-extern const QString heightScapula_M;             // A03
-extern const QString heightArmpit_M;              // A04
-extern const QString heightWaistSide_M;           // A05
-extern const QString heightHip_M;                 // A06
-extern const QString heightGlutealFold_M;         // A07
-extern const QString heightKnee_M;                // A08
-extern const QString heightCalf_M;                // A09
-extern const QString heightAnkleHigh_M;           // A10
-extern const QString heightAnkle_M;               // A11
-extern const QString heightHighhip_M;             // A12
-extern const QString heightWaistFront_M;          // A13
-extern const QString heightBustpoint_M;           // A14
-extern const QString heightShoulderTip_M;         // A15
-extern const QString heightNeckFront_M;           // A16
-extern const QString heightNeckSide_M;            // A17
-extern const QString heightNeckBackToKnee_M;      // A18
-extern const QString heightWaistSideToKnee_M;     // A19
-extern const QString heightWaistSideToHip_M;      // A20
-extern const QString heightKneeToAnkle_M;         // A21
-extern const QString heightNeckBackToWaistSide_M; // A22
-extern const QString heightWaistBack_M;           // A23
-// B
-extern const QString widthShoulder_M;     // B01
-extern const QString widthBust_M;         // B02
-extern const QString widthWaist_M;        // B03
-extern const QString widthHip_M;          // B04
-extern const QString widthAbdomenToHip_M; // B05
-// C
-extern const QString indentNeckBack_M;  // C01
-extern const QString indentWaistBack_M; // C02
-extern const QString indentAnkleHigh_M; // C03
-// D
-extern const QString handPalmLength_M; // D01
-extern const QString handLength_M;     // D02
-extern const QString handPalmWidth_M;  // D03
-extern const QString handPalmCirc_M;   // D04
-extern const QString handCirc_M;       // D05
-// E
-extern const QString footWidth_M;      // E01
-extern const QString footLength_M;     // E02
-extern const QString footCirc_M;       // E03
-extern const QString footInstepCirc_M; // E04
-// F
-extern const QString headCirc_M;	        // F01
-extern const QString headLength_M;          // F02
-extern const QString headDepth_M;	        // F03
-extern const QString headWidth_M;	        // F04
-extern const QString headCrownToNeckBack_M; // F05
-extern const QString headChinToNeckBack_M;  // F06
-// G
-extern const QString neckMidCirc_M;        // G01
-extern const QString neckCirc_M;           // G02
-extern const QString highbustCirc_M;       // G03
-extern const QString bustCirc_M;           // G04
-extern const QString lowbustCirc_M;        // G05
-extern const QString ribCirc_M;            // G06
-extern const QString waistCirc_M;          // G07
-extern const QString highhipCirc_M;        // G08
-extern const QString hipCirc_M;            // G09
-extern const QString neckArcF_M;           // G10
-extern const QString highbustArcF_M;       // G11
-extern const QString bustArcF_M;           // G12
-extern const QString lowbustArcF_M;        // G13
-extern const QString ribArcF_M;            // G14
-extern const QString waistArcF_M;          // G15
-extern const QString highhipArcF_M;        // G16
-extern const QString hipArcF_M;            // G17
-extern const QString neckArcHalfF_M;       // G18
-extern const QString highbustArcHalfF_M;   // G19
-extern const QString bustArcHalfF_M;       // G20
-extern const QString lowbustArcHalfF_M;    // G21
-extern const QString ribArcHalfF_M;        // G22
-extern const QString waistArcHalfF_M;      // G23
-extern const QString highhipArcHalfF_M;    // G24
-extern const QString hipArcHalfF_M;        // G25
-extern const QString neckArcB_M;           // G26
-extern const QString highbustArcB_M;       // G27
-extern const QString bustArcB_M;           // G28
-extern const QString lowbustArcB_M;        // G29
-extern const QString ribArcB_M;            // G30
-extern const QString waistArcB_M;          // G31
-extern const QString highhipArcB_M;        // G32
-extern const QString hipArcB_M;            // G33
-extern const QString neckArcHalfB_M;       // G34
-extern const QString highbustArcHalfB_M;   // G35
-extern const QString bustArcHalfB_M;       // G36
-extern const QString lowbustArcHalfB_M;    // G37
-extern const QString ribArcHalfB_M;        // G38
-extern const QString waistArcHalfB_M;      // G39
-extern const QString highhipArcHalfB_M;    // G40
-extern const QString hipArcHalfB_M;        // G41
-extern const QString hipWithAbdomenArcF_M; // G42
-extern const QString bodyArmfoldCirc_M;    // G43
-extern const QString bodyBustCirc_M;       // G44
-extern const QString bodyTorsoCirc_M;      // G45
-extern const QString hipCircWithAbdomen_M; // G46
-// H
-extern const QString neckFrontToWaistF_M;             // H01
-extern const QString neckFrontToWaistFlatF_M;         // H02
-extern const QString armpitToWaistSide_M;             // H03
-extern const QString shoulderTipToWaistSideF_M;       // H04
-extern const QString neckSideToWaistF_M;              // H05
-extern const QString neckSideToWaistBustpointF_M;     // H06
-extern const QString neckFrontToHighbustF_M;          // H07
-extern const QString highbustToWaistF_M;              // H08
-extern const QString neckFrontToBustF_M;              // H09
-extern const QString bustToWaistF_M;                  // H10
-extern const QString lowbustToWaistF_M;               // H11
-extern const QString ribToWaistSide_M;                // H12
-extern const QString shoulderTipToArmfoldF_M;         // H13
-extern const QString neckSideToBustF_M;               // H14
-extern const QString neckSideToHighbustF_M;           // H15
-extern const QString shoulderCenterToHighbustF_M;     // H16
-extern const QString shoulderTipToWaistSideB_M;       // H17
-extern const QString neckSideToWaistB_M;              // H18
-extern const QString neckBackToWaistB_M;              // H19
-extern const QString neckSideToWaistScapulaB_M;       // H20
-extern const QString neckBackToHighbustB_M;           // H21
-extern const QString highbustToWaistB_M;              // H22
-extern const QString neckBackToBustB_M;               // H23
-extern const QString bustToWaistB_M;                  // H24
-extern const QString lowbustToWaistB_M;               // H25
-extern const QString shoulderTipToArmfoldB_M;         // H26
-extern const QString neckSideToBustB_M;               // H27
-extern const QString neckSideToHighbustB_M;           // H28
-extern const QString shoulderCenterToHighbustB_M;     // H29
-extern const QString waistToHighhipF_M;               // H30
-extern const QString waistToHipF_M;                   // H31
-extern const QString waistToHighhipSide_M;            // H32
-extern const QString waistToHighhipB_M;               // H33
-extern const QString waistToHipB_M;                   // H34
-extern const QString waistToHipSide_M;                // H35
-extern const QString shoulderSlopeNeckSideAngle_M;    // H36
-extern const QString shoulderSlopeNeckSideLength_M;   // H37
-extern const QString shoulderSlopeNeckBackAngle_M;    // H38
-extern const QString shoulderSlopeNeckBackHeight_M;   // H39
-extern const QString shoulderSlopeShoulderTipAngle_M; // H40
-extern const QString neckBackToAcrossBack_M;          // H41
-extern const QString acrossBackToWaistB_M;            // H42
-// I
-extern const QString shoulderLength_M;                // I01
-extern const QString shoulderTipToShoulderTipF_M;     // I02
-extern const QString acrossChestF_M;                  // I03
-extern const QString armfoldToArmfoldF_M;             // I04
-extern const QString shoulderTipToShoulderTipHalfF_M; // I05
-extern const QString acrossChestHalfF_M;              // I06
-extern const QString shoulderTipToShoulderTipB_M;     // I07
-extern const QString acrossBackB_M;                   // I08
-extern const QString armfoldToArmfoldB_M;             // I09
-extern const QString shoulderTipToShoulderTipHalfB_M; // I10
-extern const QString acrossBackHalfB_M;               // I11
-extern const QString neckFrontToShoulderTipF_M;       // I12
-extern const QString neckBackToShoulderTipB_M;        // I13
-extern const QString neckWidth_M;                     // I14
-// J
-extern const QString bustpointToBustpoint_M;       // J01
-extern const QString bustpointToNeckSide_M;        // J02
-extern const QString bustpointToLowbust_M;         // J03
-extern const QString bustpointToWaist_M;           // J04
-extern const QString bustpointToBustpointHalf_M;   // J05
-extern const QString bustpointNeckSideToWaist_M;   // J06
-extern const QString bustpointToShoulderTip_M;     // J07
-extern const QString bustpointToWaistFront_M;      // J08
-extern const QString bustpointToBustpointHalter_M; // J09
-extern const QString bustpointToShoulderCenter_M;  // J10
-// K
-extern const QString shoulderTipToWaistFront_M;       // K01
-extern const QString neckFrontToWaistSide_M;          // K02
-extern const QString neckSideToWaistSideF_M;          // K03
-extern const QString shoulderTipToWaistBack_M;        // K04
-extern const QString shoulderTipToWaistB_1inOffset_M; // K05
-extern const QString neckBackToWaistSide_M;           // K06
-extern const QString neckSideToWaistSideB_M;          // K07
-extern const QString neckSideToArmfoldF_M;            // K08
-extern const QString neckSideToArmpitF_M;             // K09
-extern const QString neckSideToBustSideF_M;           // K10
-extern const QString neckSideToArmfoldB_M;            // K11
-extern const QString neckSideToArmpitB_M;             // K12
-extern const QString neckSideToBustSideB_M;           // K13
-// L
-extern const QString armShoulderTipToWristBent_M;   // L01
-extern const QString armShoulderTipToElbowBent_M;   // L02
-extern const QString armElbowToWristBent_M;         // L03
-extern const QString armElbowCircBent_M;            // L04
-extern const QString armShoulderTipToWrist_M;       // L05
-extern const QString armShoulderTipToElbow_M;       // L06
-extern const QString armElbowToWrist_M;             // L07
-extern const QString armArmpitToWrist_M;            // L08
-extern const QString armArmpitToElbow_M;            // L09
-extern const QString armElbowToWristInside_M;       // L10
-extern const QString armUpperCirc_M;                // L11
-extern const QString armAboveElbowCirc_M;           // L12
-extern const QString armElbowCirc_M;                // L13
-extern const QString armLowerCirc_M;                // L14
-extern const QString armWristCirc_M;                // L15
-extern const QString armShoulderTipToArmfoldLine_M; // L16
-extern const QString armNeckSideToWrist_M;          // L17
-extern const QString armNeckSideToFingerTip_M;      // L18
-extern const QString armscyeCirc_M;                 // L19
-extern const QString armscyeLength_M;               // L20
-extern const QString armscyeWidth_M;	            // L21
-extern const QString armNeckSideToOuterElbow_M;     // L22
-// M
-extern const QString legCrotchToFloor_M;    // M01
-extern const QString legWaistSideToFloor_M; // M02
-extern const QString legThighUpperCirc_M;	// M03
-extern const QString legThighMidCirc_M;     // M04
-extern const QString legKneeCirc_M;	        // M05
-extern const QString legKneeSmallCirc_M;    // M06
-extern const QString legCalfCirc_M;	        // M07
-extern const QString legAnkleHighCirc_M;    // M08
-extern const QString legAnkleCirc_M;        // M09
-extern const QString legKneeCircBent_M;	    // M10
-extern const QString legAnkleDiagCirc_M;    // M11
-extern const QString legCrotchToAnkle_M;    // M12
-extern const QString legWaistSideToAnkle_M; // M13
-extern const QString legWaistSideToKnee_M;  // M14
-// N
-extern const QString crotchLength_M;          // N01
-extern const QString crotchLengthB_M;         // N02
-extern const QString crotchLengthF_M;         // N03
-extern const QString riseLengthSideSitting_M; // N04
-extern const QString riseLengthDiag_M;        // N05
-extern const QString riseLengthB_M;           // N06
-extern const QString riseLengthF_M;           // N07
-extern const QString riseLengthSide_M;        // N08
-// O
-extern const QString neckBackToWaistFront_M;	        // O01
-extern const QString waistToWaistHalter_M;	            // O02
-extern const QString waistNaturalCirc_M;	            // O03
-extern const QString waistNaturalArcF_M;                // O04
-extern const QString waistNaturalArcB_M;                // O05
-extern const QString waistToNaturalWaistF_M;            // O06
-extern const QString waistToNaturalWaistB_M;            // O07
-extern const QString armNeckBackToElbowBent_M;          // O08
-extern const QString armNeckBackToWristBent_M;          // O09
-extern const QString armNeckSideToElbowBent_M;	        // O10
-extern const QString armNeckSideToWristBent_M;	        // O11
-extern const QString armAcrossBackCenterToElbowBent_M;  // O12
-extern const QString armAcrossBackCenterToWristBent_M;  // O13
-extern const QString armArmscyeBackCenterToWristBent_M; // O14
-// P
-extern const QString neckBackToBustFront_M;	                             // P01
-extern const QString neckBackToArmfoldFront_M;                           // P02
-extern const QString neckBackToArmfoldFrontToWaistSide_M;                // P03
-extern const QString highbustBackOverShoulderToArmfoldFront_M;           // P04
-extern const QString highbustBackOverShoulderToWaistFront_M;             // P05
-extern const QString neckBackToArmfoldFrontToNeckBack_M;                 // P06
-extern const QString acrossBackCenterToArmfoldFrontToAcrossBackCenter_M; // P07
-extern const QString neckBackToArmfoldFrontToHighbustBack_M;             // P08
-extern const QString armfoldToArmfoldBust_M;                             // P09
-extern const QString armfoldToBustFront_M;	                             // P10
-extern const QString highbustBOverShoulderToHighbustF_M;                 // P11
-extern const QString armscyeArc_M;	                                     // P12
-// Q
-extern const QString dartWidthShoulder_M; // Q01
-extern const QString dartWidthBust_M;	  // Q02
-extern const QString dartWidthWaist_M;    // Q03
-
-QStringList ListGroupA();
-QStringList ListGroupB();
-QStringList ListGroupC();
-QStringList ListGroupD();
-QStringList ListGroupE();
-QStringList ListGroupF();
-QStringList ListGroupG();
-QStringList ListGroupH();
-QStringList ListGroupI();
-QStringList ListGroupJ();
-QStringList ListGroupK();
-QStringList ListGroupL();
-QStringList ListGroupM();
-QStringList ListGroupN();
-QStringList ListGroupO();
-QStringList ListGroupP();
-QStringList ListGroupQ();
-
-QStringList ListNumbers(const VTranslateMeasurements *trM, const QStringList & listMeasurements);
-QString MapDiagrams(const VTranslateMeasurements *trM, const QString &number);
-
-// pattern making systems codes
-extern const QString p0_S;
-extern const QString p1_S;
-extern const QString p2_S;
-extern const QString p3_S;
-extern const QString p4_S;
-extern const QString p5_S;
-extern const QString p6_S;
-extern const QString p7_S;
-extern const QString p8_S;
-extern const QString p9_S;
-extern const QString p10_S;
-extern const QString p11_S;
-extern const QString p12_S;
-extern const QString p13_S;
-extern const QString p14_S;
-extern const QString p15_S;
-extern const QString p16_S;
-extern const QString p17_S;
-extern const QString p18_S;
-extern const QString p19_S;
-extern const QString p20_S;
-extern const QString p21_S;
-extern const QString p22_S;
-extern const QString p23_S;
-extern const QString p24_S;
-extern const QString p25_S;
-extern const QString p26_S;
-extern const QString p27_S;
-extern const QString p28_S;
-extern const QString p29_S;
-extern const QString p30_S;
-extern const QString p31_S;
-extern const QString p32_S;
-extern const QString p33_S;
-extern const QString p34_S;
-extern const QString p35_S;
-extern const QString p36_S;
-extern const QString p37_S;
-extern const QString p38_S;
-extern const QString p39_S;
-extern const QString p40_S;
-extern const QString p41_S;
-extern const QString p42_S;
-extern const QString p43_S;
-extern const QString p44_S;
-extern const QString p45_S;
-extern const QString p46_S;
-extern const QString p47_S;
-extern const QString p48_S;
-extern const QString p49_S;
-extern const QString p50_S;
-extern const QString p51_S;
-extern const QString p52_S;
-extern const QString p53_S;
-extern const QString p54_S;
-extern const QString p998_S;
-
-QStringList ListPMSystems();
-void InitPMSystems(QComboBox *systemCombo);
-
 // functions
 extern const QString degTorad_F;
 extern const QString radTodeg_F;
@@ -717,7 +372,6 @@ void CheckFactor(qreal &oldFactor, const qreal &Newfactor);
 
 void InitLanguages(QComboBox *combobox);
 QStringList SupportedLocales() Q_REQUIRED_RESULT;
-QStringList AllGroupNames() Q_REQUIRED_RESULT;
 
 QString StrippedName(const QString &fullFileName) Q_REQUIRED_RESULT;
 QString RelativeMPath(const QString &patternPath, const QString &absoluteMPath) Q_REQUIRED_RESULT;

src/libs/vmisc/vcommonsettings.cpp

@@ -42,6 +42,7 @@
 
 #include "../vmisc/def.h"
 #include "../vmisc/vmath.h"
+#include "../vpatterndb/pmsystems.h"
 
 const QString settingPathsIndividualMeasurements = QStringLiteral("paths/individual_measurements");
 const QString settingPathsStandardMeasurements   = QStringLiteral("paths/standard_measurements");
@@ -367,7 +368,7 @@ void VCommonSettings::SetLocale(const QString &value)
 //---------------------------------------------------------------------------------------------------------------------
 QString VCommonSettings::GetPMSystemCode() const
 {
-    return value(settingPMSystemCode, p0_S).toString();
+    return value(settingPMSystemCode, "p998").toString();
 }
 
 //---------------------------------------------------------------------------------------------------------------------

src/libs/vmisc/vmisc.pri

@@ -12,7 +12,6 @@ SOURCES += \
     $$PWD/commandoptions.cpp \
     $$PWD/qxtcsvmodel.cpp \
     $$PWD/vtablesearch.cpp \
-    $$PWD/abstracttest.cpp \
     $$PWD/dialogs/dialogexporttocsv.cpp
 
 win32-msvc*:SOURCES += $$PWD/stable.cpp
@@ -34,7 +33,6 @@ HEADERS += \
     $$PWD/commandoptions.h \
     $$PWD/qxtcsvmodel.h \
     $$PWD/vtablesearch.h \
-    $$PWD/abstracttest.h \
     $$PWD/diagnostic.h \
     $$PWD/dialogs/dialogexporttocsv.h
 

src/libs/vmisc/vmisc.pro

@@ -15,9 +15,15 @@ TARGET = vmisc
 # We want to create a library
 TEMPLATE = lib
 
-CONFIG += \
+CONFIG += staticlib # Making static library
-    staticlib \# Making static library
+
-    c++11 # We use C++11 standard
+# Since Q5.4 available support C++14
+greaterThan(QT_MAJOR_VERSION, 4):greaterThan(QT_MINOR_VERSION, 3) {
+    CONFIG += c++14
+} else {
+    # We use C++11 standard
+    CONFIG += c++11
+}
 
 # Use out-of-source builds (shadow builds)
 CONFIG -= debug_and_release debug_and_release_target

src/libs/vpatterndb/measurements.h

@@ -0,0 +1,321 @@
+/************************************************************************
+ **
+ **  @file
+ **  @author Roman Telezhynskyi <dismine(at)gmail.com>
+ **  @date   1 6, 2017
+ **
+ **  @brief
+ **  @copyright
+ **  This source code is part of the Valentine project, a pattern making
+ **  program, whose allow create and modeling patterns of clothing.
+ **  Copyright (C) 2017 Valentina project
+ **  <https://bitbucket.org/dismine/valentina> All Rights Reserved.
+ **
+ **  Valentina is free software: you can redistribute it and/or modify
+ **  it under the terms of the GNU General Public License as published by
+ **  the Free Software Foundation, either version 3 of the License, or
+ **  (at your option) any later version.
+ **
+ **  Valentina is distributed in the hope that it will be useful,
+ **  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ **  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ **  GNU General Public License for more details.
+ **
+ **  You should have received a copy of the GNU General Public License
+ **  along with Valentina.  If not, see <http://www.gnu.org/licenses/>.
+ **
+ *************************************************************************/
+
+#ifndef MEASUREMENTS_H
+#define MEASUREMENTS_H
+
+#include <QStringList>
+
+class VTranslateMeasurements;
+
+// measurements
+// A
+extern const QString height_M;                    // A01
+extern const QString heightNeckBack_M;            // A02
+extern const QString heightScapula_M;             // A03
+extern const QString heightArmpit_M;              // A04
+extern const QString heightWaistSide_M;           // A05
+extern const QString heightHip_M;                 // A06
+extern const QString heightGlutealFold_M;         // A07
+extern const QString heightKnee_M;                // A08
+extern const QString heightCalf_M;                // A09
+extern const QString heightAnkleHigh_M;           // A10
+extern const QString heightAnkle_M;               // A11
+extern const QString heightHighhip_M;             // A12
+extern const QString heightWaistFront_M;          // A13
+extern const QString heightBustpoint_M;           // A14
+extern const QString heightShoulderTip_M;         // A15
+extern const QString heightNeckFront_M;           // A16
+extern const QString heightNeckSide_M;            // A17
+extern const QString heightNeckBackToKnee_M;      // A18
+extern const QString heightWaistSideToKnee_M;     // A19
+extern const QString heightWaistSideToHip_M;      // A20
+extern const QString heightKneeToAnkle_M;         // A21
+extern const QString heightNeckBackToWaistSide_M; // A22
+extern const QString heightWaistBack_M;           // A23
+// B
+extern const QString widthShoulder_M;     // B01
+extern const QString widthBust_M;         // B02
+extern const QString widthWaist_M;        // B03
+extern const QString widthHip_M;          // B04
+extern const QString widthAbdomenToHip_M; // B05
+// C
+extern const QString indentNeckBack_M;  // C01
+extern const QString indentWaistBack_M; // C02
+extern const QString indentAnkleHigh_M; // C03
+// D
+extern const QString handPalmLength_M; // D01
+extern const QString handLength_M;     // D02
+extern const QString handPalmWidth_M;  // D03
+extern const QString handPalmCirc_M;   // D04
+extern const QString handCirc_M;       // D05
+// E
+extern const QString footWidth_M;      // E01
+extern const QString footLength_M;     // E02
+extern const QString footCirc_M;       // E03
+extern const QString footInstepCirc_M; // E04
+// F
+extern const QString headCirc_M;	        // F01
+extern const QString headLength_M;          // F02
+extern const QString headDepth_M;	        // F03
+extern const QString headWidth_M;	        // F04
+extern const QString headCrownToNeckBack_M; // F05
+extern const QString headChinToNeckBack_M;  // F06
+// G
+extern const QString neckMidCirc_M;        // G01
+extern const QString neckCirc_M;           // G02
+extern const QString highbustCirc_M;       // G03
+extern const QString bustCirc_M;           // G04
+extern const QString lowbustCirc_M;        // G05
+extern const QString ribCirc_M;            // G06
+extern const QString waistCirc_M;          // G07
+extern const QString highhipCirc_M;        // G08
+extern const QString hipCirc_M;            // G09
+extern const QString neckArcF_M;           // G10
+extern const QString highbustArcF_M;       // G11
+extern const QString bustArcF_M;           // G12
+extern const QString lowbustArcF_M;        // G13
+extern const QString ribArcF_M;            // G14
+extern const QString waistArcF_M;          // G15
+extern const QString highhipArcF_M;        // G16
+extern const QString hipArcF_M;            // G17
+extern const QString neckArcHalfF_M;       // G18
+extern const QString highbustArcHalfF_M;   // G19
+extern const QString bustArcHalfF_M;       // G20
+extern const QString lowbustArcHalfF_M;    // G21
+extern const QString ribArcHalfF_M;        // G22
+extern const QString waistArcHalfF_M;      // G23
+extern const QString highhipArcHalfF_M;    // G24
+extern const QString hipArcHalfF_M;        // G25
+extern const QString neckArcB_M;           // G26
+extern const QString highbustArcB_M;       // G27
+extern const QString bustArcB_M;           // G28
+extern const QString lowbustArcB_M;        // G29
+extern const QString ribArcB_M;            // G30
+extern const QString waistArcB_M;          // G31
+extern const QString highhipArcB_M;        // G32
+extern const QString hipArcB_M;            // G33
+extern const QString neckArcHalfB_M;       // G34
+extern const QString highbustArcHalfB_M;   // G35
+extern const QString bustArcHalfB_M;       // G36
+extern const QString lowbustArcHalfB_M;    // G37
+extern const QString ribArcHalfB_M;        // G38
+extern const QString waistArcHalfB_M;      // G39
+extern const QString highhipArcHalfB_M;    // G40
+extern const QString hipArcHalfB_M;        // G41
+extern const QString hipWithAbdomenArcF_M; // G42
+extern const QString bodyArmfoldCirc_M;    // G43
+extern const QString bodyBustCirc_M;       // G44
+extern const QString bodyTorsoCirc_M;      // G45
+extern const QString hipCircWithAbdomen_M; // G46
+// H
+extern const QString neckFrontToWaistF_M;             // H01
+extern const QString neckFrontToWaistFlatF_M;         // H02
+extern const QString armpitToWaistSide_M;             // H03
+extern const QString shoulderTipToWaistSideF_M;       // H04
+extern const QString neckSideToWaistF_M;              // H05
+extern const QString neckSideToWaistBustpointF_M;     // H06
+extern const QString neckFrontToHighbustF_M;          // H07
+extern const QString highbustToWaistF_M;              // H08
+extern const QString neckFrontToBustF_M;              // H09
+extern const QString bustToWaistF_M;                  // H10
+extern const QString lowbustToWaistF_M;               // H11
+extern const QString ribToWaistSide_M;                // H12
+extern const QString shoulderTipToArmfoldF_M;         // H13
+extern const QString neckSideToBustF_M;               // H14
+extern const QString neckSideToHighbustF_M;           // H15
+extern const QString shoulderCenterToHighbustF_M;     // H16
+extern const QString shoulderTipToWaistSideB_M;       // H17
+extern const QString neckSideToWaistB_M;              // H18
+extern const QString neckBackToWaistB_M;              // H19
+extern const QString neckSideToWaistScapulaB_M;       // H20
+extern const QString neckBackToHighbustB_M;           // H21
+extern const QString highbustToWaistB_M;              // H22
+extern const QString neckBackToBustB_M;               // H23
+extern const QString bustToWaistB_M;                  // H24
+extern const QString lowbustToWaistB_M;               // H25
+extern const QString shoulderTipToArmfoldB_M;         // H26
+extern const QString neckSideToBustB_M;               // H27
+extern const QString neckSideToHighbustB_M;           // H28
+extern const QString shoulderCenterToHighbustB_M;     // H29
+extern const QString waistToHighhipF_M;               // H30
+extern const QString waistToHipF_M;                   // H31
+extern const QString waistToHighhipSide_M;            // H32
+extern const QString waistToHighhipB_M;               // H33
+extern const QString waistToHipB_M;                   // H34
+extern const QString waistToHipSide_M;                // H35
+extern const QString shoulderSlopeNeckSideAngle_M;    // H36
+extern const QString shoulderSlopeNeckSideLength_M;   // H37
+extern const QString shoulderSlopeNeckBackAngle_M;    // H38
+extern const QString shoulderSlopeNeckBackHeight_M;   // H39
+extern const QString shoulderSlopeShoulderTipAngle_M; // H40
+extern const QString neckBackToAcrossBack_M;          // H41
+extern const QString acrossBackToWaistB_M;            // H42
+// I
+extern const QString shoulderLength_M;                // I01
+extern const QString shoulderTipToShoulderTipF_M;     // I02
+extern const QString acrossChestF_M;                  // I03
+extern const QString armfoldToArmfoldF_M;             // I04
+extern const QString shoulderTipToShoulderTipHalfF_M; // I05
+extern const QString acrossChestHalfF_M;              // I06
+extern const QString shoulderTipToShoulderTipB_M;     // I07
+extern const QString acrossBackB_M;                   // I08
+extern const QString armfoldToArmfoldB_M;             // I09
+extern const QString shoulderTipToShoulderTipHalfB_M; // I10
+extern const QString acrossBackHalfB_M;               // I11
+extern const QString neckFrontToShoulderTipF_M;       // I12
+extern const QString neckBackToShoulderTipB_M;        // I13
+extern const QString neckWidth_M;                     // I14
+// J
+extern const QString bustpointToBustpoint_M;       // J01
+extern const QString bustpointToNeckSide_M;        // J02
+extern const QString bustpointToLowbust_M;         // J03
+extern const QString bustpointToWaist_M;           // J04
+extern const QString bustpointToBustpointHalf_M;   // J05
+extern const QString bustpointNeckSideToWaist_M;   // J06
+extern const QString bustpointToShoulderTip_M;     // J07
+extern const QString bustpointToWaistFront_M;      // J08
+extern const QString bustpointToBustpointHalter_M; // J09
+extern const QString bustpointToShoulderCenter_M;  // J10
+// K
+extern const QString shoulderTipToWaistFront_M;       // K01
+extern const QString neckFrontToWaistSide_M;          // K02
+extern const QString neckSideToWaistSideF_M;          // K03
+extern const QString shoulderTipToWaistBack_M;        // K04
+extern const QString shoulderTipToWaistB_1inOffset_M; // K05
+extern const QString neckBackToWaistSide_M;           // K06
+extern const QString neckSideToWaistSideB_M;          // K07
+extern const QString neckSideToArmfoldF_M;            // K08
+extern const QString neckSideToArmpitF_M;             // K09
+extern const QString neckSideToBustSideF_M;           // K10
+extern const QString neckSideToArmfoldB_M;            // K11
+extern const QString neckSideToArmpitB_M;             // K12
+extern const QString neckSideToBustSideB_M;           // K13
+// L
+extern const QString armShoulderTipToWristBent_M;   // L01
+extern const QString armShoulderTipToElbowBent_M;   // L02
+extern const QString armElbowToWristBent_M;         // L03
+extern const QString armElbowCircBent_M;            // L04
+extern const QString armShoulderTipToWrist_M;       // L05
+extern const QString armShoulderTipToElbow_M;       // L06
+extern const QString armElbowToWrist_M;             // L07
+extern const QString armArmpitToWrist_M;            // L08
+extern const QString armArmpitToElbow_M;            // L09
+extern const QString armElbowToWristInside_M;       // L10
+extern const QString armUpperCirc_M;                // L11
+extern const QString armAboveElbowCirc_M;           // L12
+extern const QString armElbowCirc_M;                // L13
+extern const QString armLowerCirc_M;                // L14
+extern const QString armWristCirc_M;                // L15
+extern const QString armShoulderTipToArmfoldLine_M; // L16
+extern const QString armNeckSideToWrist_M;          // L17
+extern const QString armNeckSideToFingerTip_M;      // L18
+extern const QString armscyeCirc_M;                 // L19
+extern const QString armscyeLength_M;               // L20
+extern const QString armscyeWidth_M;	            // L21
+extern const QString armNeckSideToOuterElbow_M;     // L22
+// M
+extern const QString legCrotchToFloor_M;    // M01
+extern const QString legWaistSideToFloor_M; // M02
+extern const QString legThighUpperCirc_M;	// M03
+extern const QString legThighMidCirc_M;     // M04
+extern const QString legKneeCirc_M;	        // M05
+extern const QString legKneeSmallCirc_M;    // M06
+extern const QString legCalfCirc_M;	        // M07
+extern const QString legAnkleHighCirc_M;    // M08
+extern const QString legAnkleCirc_M;        // M09
+extern const QString legKneeCircBent_M;	    // M10
+extern const QString legAnkleDiagCirc_M;    // M11
+extern const QString legCrotchToAnkle_M;    // M12
+extern const QString legWaistSideToAnkle_M; // M13
+extern const QString legWaistSideToKnee_M;  // M14
+// N
+extern const QString crotchLength_M;          // N01
+extern const QString crotchLengthB_M;         // N02
+extern const QString crotchLengthF_M;         // N03
+extern const QString riseLengthSideSitting_M; // N04
+extern const QString riseLengthDiag_M;        // N05
+extern const QString riseLengthB_M;           // N06
+extern const QString riseLengthF_M;           // N07
+extern const QString riseLengthSide_M;        // N08
+// O
+extern const QString neckBackToWaistFront_M;	        // O01
+extern const QString waistToWaistHalter_M;	            // O02
+extern const QString waistNaturalCirc_M;	            // O03
+extern const QString waistNaturalArcF_M;                // O04
+extern const QString waistNaturalArcB_M;                // O05
+extern const QString waistToNaturalWaistF_M;            // O06
+extern const QString waistToNaturalWaistB_M;            // O07
+extern const QString armNeckBackToElbowBent_M;          // O08
+extern const QString armNeckBackToWristBent_M;          // O09
+extern const QString armNeckSideToElbowBent_M;	        // O10
+extern const QString armNeckSideToWristBent_M;	        // O11
+extern const QString armAcrossBackCenterToElbowBent_M;  // O12
+extern const QString armAcrossBackCenterToWristBent_M;  // O13
+extern const QString armArmscyeBackCenterToWristBent_M; // O14
+// P
+extern const QString neckBackToBustFront_M;	                             // P01
+extern const QString neckBackToArmfoldFront_M;                           // P02
+extern const QString neckBackToArmfoldFrontToWaistSide_M;                // P03
+extern const QString highbustBackOverShoulderToArmfoldFront_M;           // P04
+extern const QString highbustBackOverShoulderToWaistFront_M;             // P05
+extern const QString neckBackToArmfoldFrontToNeckBack_M;                 // P06
+extern const QString acrossBackCenterToArmfoldFrontToAcrossBackCenter_M; // P07
+extern const QString neckBackToArmfoldFrontToHighbustBack_M;             // P08
+extern const QString armfoldToArmfoldBust_M;                             // P09
+extern const QString armfoldToBustFront_M;	                             // P10
+extern const QString highbustBOverShoulderToHighbustF_M;                 // P11
+extern const QString armscyeArc_M;	                                     // P12
+// Q
+extern const QString dartWidthShoulder_M; // Q01
+extern const QString dartWidthBust_M;	  // Q02
+extern const QString dartWidthWaist_M;    // Q03
+
+QStringList ListGroupA();
+QStringList ListGroupB();
+QStringList ListGroupC();
+QStringList ListGroupD();
+QStringList ListGroupE();
+QStringList ListGroupF();
+QStringList ListGroupG();
+QStringList ListGroupH();
+QStringList ListGroupI();
+QStringList ListGroupJ();
+QStringList ListGroupK();
+QStringList ListGroupL();
+QStringList ListGroupM();
+QStringList ListGroupN();
+QStringList ListGroupO();
+QStringList ListGroupP();
+QStringList ListGroupQ();
+
+QStringList ListNumbers(const VTranslateMeasurements *trM, const QStringList & listMeasurements);
+QString MapDiagrams(const VTranslateMeasurements *trM, const QString &number);
+QStringList AllGroupNames() Q_REQUIRED_RESULT;
+
+#endif // MEASUREMENTS_H

src/libs/vpatterndb/pmsystems.cpp

@@ -0,0 +1,180 @@
+/************************************************************************
+ **
+ **  @file
+ **  @author Roman Telezhynskyi <dismine(at)gmail.com>
+ **  @date   1 6, 2017
+ **
+ **  @brief
+ **  @copyright
+ **  This source code is part of the Valentine project, a pattern making
+ **  program, whose allow create and modeling patterns of clothing.
+ **  Copyright (C) 2017 Valentina project
+ **  <https://bitbucket.org/dismine/valentina> All Rights Reserved.
+ **
+ **  Valentina is free software: you can redistribute it and/or modify
+ **  it under the terms of the GNU General Public License as published by
+ **  the Free Software Foundation, either version 3 of the License, or
+ **  (at your option) any later version.
+ **
+ **  Valentina is distributed in the hope that it will be useful,
+ **  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ **  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ **  GNU General Public License for more details.
+ **
+ **  You should have received a copy of the GNU General Public License
+ **  along with Valentina.  If not, see <http://www.gnu.org/licenses/>.
+ **
+ *************************************************************************/
+
+#include "pmsystems.h"
+#include "../vmisc/def.h"
+#include "../vmisc/vabstractapplication.h"
+
+#include <QComboBox>
+
+// pattern making systems codes
+const QString p0_S = QStringLiteral("p0");
+const QString p1_S = QStringLiteral("p1");
+const QString p2_S = QStringLiteral("p2");
+const QString p3_S = QStringLiteral("p3");
+const QString p4_S = QStringLiteral("p4");
+const QString p5_S = QStringLiteral("p5");
+const QString p6_S = QStringLiteral("p6");
+const QString p7_S = QStringLiteral("p7");
+const QString p8_S = QStringLiteral("p8");
+const QString p9_S = QStringLiteral("p9");
+const QString p10_S = QStringLiteral("p10");
+const QString p11_S = QStringLiteral("p11");
+const QString p12_S = QStringLiteral("p12");
+const QString p13_S = QStringLiteral("p13");
+const QString p14_S = QStringLiteral("p14");
+const QString p15_S = QStringLiteral("p15");
+const QString p16_S = QStringLiteral("p16");
+const QString p17_S = QStringLiteral("p17");
+const QString p18_S = QStringLiteral("p18");
+const QString p19_S = QStringLiteral("p19");
+const QString p20_S = QStringLiteral("p20");
+const QString p21_S = QStringLiteral("p21");
+const QString p22_S = QStringLiteral("p22");
+const QString p23_S = QStringLiteral("p23");
+const QString p24_S = QStringLiteral("p24");
+const QString p25_S = QStringLiteral("p25");
+const QString p26_S = QStringLiteral("p26");
+const QString p27_S = QStringLiteral("p27");
+const QString p28_S = QStringLiteral("p28");
+const QString p29_S = QStringLiteral("p29");
+const QString p30_S = QStringLiteral("p30");
+const QString p31_S = QStringLiteral("p31");
+const QString p32_S = QStringLiteral("p32");
+const QString p33_S = QStringLiteral("p33");
+const QString p34_S = QStringLiteral("p34");
+const QString p35_S = QStringLiteral("p35");
+const QString p36_S = QStringLiteral("p36");
+const QString p37_S = QStringLiteral("p37");
+const QString p38_S = QStringLiteral("p38");
+const QString p39_S = QStringLiteral("p39");
+const QString p40_S = QStringLiteral("p40");
+const QString p41_S = QStringLiteral("p41");
+const QString p42_S = QStringLiteral("p42");
+const QString p43_S = QStringLiteral("p43");
+const QString p44_S = QStringLiteral("p44");
+const QString p45_S = QStringLiteral("p45");
+const QString p46_S = QStringLiteral("p46");
+const QString p47_S = QStringLiteral("p47");
+const QString p48_S = QStringLiteral("p48");
+const QString p49_S = QStringLiteral("p49");
+const QString p50_S = QStringLiteral("p50");
+const QString p51_S = QStringLiteral("p51");
+const QString p52_S = QStringLiteral("p52");
+const QString p53_S = QStringLiteral("p53");
+const QString p54_S = QStringLiteral("p54");
+const QString p998_S = QStringLiteral("p998");
+
+//---------------------------------------------------------------------------------------------------------------------
+QStringList ListPMSystems()
+{
+    QStringList list;
+    list << p0_S
+         << p1_S
+         << p2_S
+         << p3_S
+         << p4_S
+         << p5_S
+         << p6_S
+         << p7_S
+         << p8_S
+         << p9_S
+         << p10_S
+         << p11_S
+         << p12_S
+         << p13_S
+         << p14_S
+         << p15_S
+         << p16_S
+         << p17_S
+         << p18_S
+         << p19_S
+         << p20_S
+         << p21_S
+         << p22_S
+         << p23_S
+         << p24_S
+         << p25_S
+         << p26_S
+         << p27_S
+         << p28_S
+         << p29_S
+         << p30_S
+         << p31_S
+         << p32_S
+         << p33_S
+         << p34_S
+         << p35_S
+         << p36_S
+         << p37_S
+         << p38_S
+         << p39_S
+         << p40_S
+         << p41_S
+         << p42_S
+         << p43_S
+         << p44_S
+         << p45_S
+         << p46_S
+         << p47_S
+         << p48_S
+         << p49_S
+         << p50_S
+         << p51_S
+         << p52_S
+         << p53_S
+         << p54_S
+         << p998_S;
+
+    return list;
+}
+
+//---------------------------------------------------------------------------------------------------------------------
+void InitPMSystems(QComboBox *systemCombo)
+{
+    const QStringList listSystems = ListPMSystems();
+    QMap<QString, QString> systems;
+    for (int i = 0; i < listSystems.size()-1; ++i)
+    {
+        systems.insert(qApp->TrVars()->PMSystemName(listSystems.at(i)) + " ("+listSystems.at(i)+")", listSystems.at(i));
+    }
+
+// * The default option (blank field or 'None') should appear at the top of the list.
+// * The list should be sorted alphabetically so users can find their system easily.
+
+    SCASSERT(systemCombo != nullptr)
+    systemCombo->addItem(qApp->TrVars()->PMSystemName(listSystems.at(listSystems.size()-1)),
+                         listSystems.at(listSystems.size()-1));
+
+    QMap<QString, QString>::const_iterator i = systems.constBegin();
+    while (i != systems.constEnd())
+    {
+        systemCombo->addItem(i.key(), i.value());
+        ++i;
+    }
+}

src/libs/vpatterndb/pmsystems.h

@@ -0,0 +1,97 @@
+/************************************************************************
+ **
+ **  @file
+ **  @author Roman Telezhynskyi <dismine(at)gmail.com>
+ **  @date   1 6, 2017
+ **
+ **  @brief
+ **  @copyright
+ **  This source code is part of the Valentine project, a pattern making
+ **  program, whose allow create and modeling patterns of clothing.
+ **  Copyright (C) 2017 Valentina project
+ **  <https://bitbucket.org/dismine/valentina> All Rights Reserved.
+ **
+ **  Valentina is free software: you can redistribute it and/or modify
+ **  it under the terms of the GNU General Public License as published by
+ **  the Free Software Foundation, either version 3 of the License, or
+ **  (at your option) any later version.
+ **
+ **  Valentina is distributed in the hope that it will be useful,
+ **  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ **  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ **  GNU General Public License for more details.
+ **
+ **  You should have received a copy of the GNU General Public License
+ **  along with Valentina.  If not, see <http://www.gnu.org/licenses/>.
+ **
+ *************************************************************************/
+
+#ifndef PMSYSTEMS_H
+#define PMSYSTEMS_H
+
+#include <QStringList>
+
+class QComboBox;
+
+// pattern making systems codes
+extern const QString p0_S;
+extern const QString p1_S;
+extern const QString p2_S;
+extern const QString p3_S;
+extern const QString p4_S;
+extern const QString p5_S;
+extern const QString p6_S;
+extern const QString p7_S;
+extern const QString p8_S;
+extern const QString p9_S;
+extern const QString p10_S;
+extern const QString p11_S;
+extern const QString p12_S;
+extern const QString p13_S;
+extern const QString p14_S;
+extern const QString p15_S;
+extern const QString p16_S;
+extern const QString p17_S;
+extern const QString p18_S;
+extern const QString p19_S;
+extern const QString p20_S;
+extern const QString p21_S;
+extern const QString p22_S;
+extern const QString p23_S;
+extern const QString p24_S;
+extern const QString p25_S;
+extern const QString p26_S;
+extern const QString p27_S;
+extern const QString p28_S;
+extern const QString p29_S;
+extern const QString p30_S;
+extern const QString p31_S;
+extern const QString p32_S;
+extern const QString p33_S;
+extern const QString p34_S;
+extern const QString p35_S;
+extern const QString p36_S;
+extern const QString p37_S;
+extern const QString p38_S;
+extern const QString p39_S;
+extern const QString p40_S;
+extern const QString p41_S;
+extern const QString p42_S;
+extern const QString p43_S;
+extern const QString p44_S;
+extern const QString p45_S;
+extern const QString p46_S;
+extern const QString p47_S;
+extern const QString p48_S;
+extern const QString p49_S;
+extern const QString p50_S;
+extern const QString p51_S;
+extern const QString p52_S;
+extern const QString p53_S;
+extern const QString p54_S;
+extern const QString p998_S;
+
+QStringList ListPMSystems();
+void InitPMSystems(QComboBox *systemCombo);
+
+#endif // PMSYSTEMS_H

src/libs/vpatterndb/vpatterndb.pri

@@ -24,7 +24,9 @@ SOURCES += \
     $$PWD/floatItemData/vpiecelabeldata.cpp \
     $$PWD/floatItemData/vpatternlabeldata.cpp \
     $$PWD/floatItemData/vgrainlinedata.cpp \
-    $$PWD/floatItemData/vabstractfloatitemdata.cpp
+    $$PWD/floatItemData/vabstractfloatitemdata.cpp \
+    $$PWD/measurements.cpp \
+    $$PWD/pmsystems.cpp
 
 win32-msvc*:SOURCES += $$PWD/stable.cpp
 
@@ -70,4 +72,6 @@ HEADERS += \
     $$PWD/floatItemData/vgrainlinedata_p.h \
     $$PWD/floatItemData/floatitemdef.h \
     $$PWD/floatItemData/vpatternlabeldata_p.h \
-    $$PWD/floatItemData/vpiecelabeldata_p.h
+    $$PWD/floatItemData/vpiecelabeldata_p.h \
+    $$PWD/measurements.h \
+    $$PWD/pmsystems.h

src/libs/vpatterndb/vtranslatemeasurements.cpp

@@ -29,7 +29,7 @@
 #include "vtranslatemeasurements.h"
 
 #include "../qmuparser/qmutranslation.h"
-#include "../vmisc/def.h"
+#include "measurements.h"
 
 //---------------------------------------------------------------------------------------------------------------------
 VTranslateMeasurements::VTranslateMeasurements()

src/libs/vpatterndb/vtranslatevars.cpp

@@ -43,6 +43,7 @@
 #include "../vmisc/def.h"
 #include "../vmisc/vabstractapplication.h"
 #include "vtranslatemeasurements.h"
+#include "pmsystems.h"
 
 //---------------------------------------------------------------------------------------------------------------------
 VTranslateVars::VTranslateVars()

src/libs/vtest/abstracttest.cpp

@@ -49,6 +49,7 @@
 
 #include "logging.h"
 #include "vsysexits.h"
+#include "../vgeometry/vgobject.h"
 
 //---------------------------------------------------------------------------------------------------------------------
 AbstractTest::AbstractTest(QObject *parent) :
@@ -61,14 +62,16 @@ void AbstractTest::Comparison(const QVector<QPointF> &ekv, const QVector<QPointF
 {
     // Begin comparison
     QCOMPARE(ekv.size(), ekvOrig.size());// First check if sizes equal
+
     for (int i=0; i < ekv.size(); i++)
     {
-        const QPoint p1 = ekv.at(i).toPoint();
+        const QPointF p1 = ekv.at(i);
-        const QPoint p2 = ekvOrig.at(i).toPoint();
+        const QPointF p2 = ekvOrig.at(i);
         const QString msg = QString("Index: %1. Got '%2;%3', Expected '%4;%5'.")
                 .arg(i).arg(p1.x()).arg(p1.y()).arg(p2.x()).arg(p2.y());
         // Check each point. Don't use comparison float values
-        QVERIFY2(p1 == p2, qUtf8Printable(msg));
+        QVERIFY2((qAbs(p1.x() - p2.x()) <= VGObject::accuracyPointOnLine)
+                 && (qAbs(p1.y() - p2.y()) <= VGObject::accuracyPointOnLine), qUtf8Printable(msg));
     }
 }
 

src/libs/vtest/stable.cpp

@@ -0,0 +1,30 @@
+/************************************************************************
+ **
+ **  @file   stable.cpp
+ **  @author Roman Telezhynskyi <dismine(at)gmail.com>
+ **  @date   10 12, 2014
+ **
+ **  @brief
+ **  @copyright
+ **  This source code is part of the Valentine project, a pattern making
+ **  program, whose allow create and modeling patterns of clothing.
+ **  Copyright (C) 2013-2015 Valentina project
+ **  <https://bitbucket.org/dismine/valentina> All Rights Reserved.
+ **
+ **  Valentina is free software: you can redistribute it and/or modify
+ **  it under the terms of the GNU General Public License as published by
+ **  the Free Software Foundation, either version 3 of the License, or
+ **  (at your option) any later version.
+ **
+ **  Valentina is distributed in the hope that it will be useful,
+ **  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ **  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ **  GNU General Public License for more details.
+ **
+ **  You should have received a copy of the GNU General Public License
+ **  along with Valentina.  If not, see <http://www.gnu.org/licenses/>.
+ **
+ *************************************************************************/
+
+// Build the precompiled headers.
+#include "stable.h"

src/libs/vtest/stable.h

@@ -0,0 +1,50 @@
+/************************************************************************
+ **
+ **  @file   stable.h
+ **  @author Roman Telezhynskyi <dismine(at)gmail.com>
+ **  @date   10 12, 2014
+ **
+ **  @brief
+ **  @copyright
+ **  This source code is part of the Valentine project, a pattern making
+ **  program, whose allow create and modeling patterns of clothing.
+ **  Copyright (C) 2013-2015 Valentina project
+ **  <https://bitbucket.org/dismine/valentina> All Rights Reserved.
+ **
+ **  Valentina is free software: you can redistribute it and/or modify
+ **  it under the terms of the GNU General Public License as published by
+ **  the Free Software Foundation, either version 3 of the License, or
+ **  (at your option) any later version.
+ **
+ **  Valentina is distributed in the hope that it will be useful,
+ **  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ **  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ **  GNU General Public License for more details.
+ **
+ **  You should have received a copy of the GNU General Public License
+ **  along with Valentina.  If not, see <http://www.gnu.org/licenses/>.
+ **
+ *************************************************************************/
+
+#ifndef STABLE_H
+#define STABLE_H
+
+/* I like to include this pragma too, so the build log indicates if pre-compiled headers were in use. */
+#pragma message("Compiling precompiled headers for VTest library.\n")
+
+/* Add C includes here */
+
+#if defined __cplusplus
+/* Add C++ includes here */
+
+#ifdef QT_CORE_LIB
+#include <QtCore>
+#endif
+
+#ifdef QT_GUI_LIB
+#   include <QtGui>
+#endif
+
+#endif/*__cplusplus*/
+
+#endif // STABLE_H

src/libs/vtest/vtest.cpp

@@ -0,0 +1,34 @@
+/************************************************************************
+ **
+ **  @file   vtest.cpp
+ **  @author Roman Telezhynskyi <dismine(at)gmail.com>
+ **  @date   1 6, 2017
+ **
+ **  @brief
+ **  @copyright
+ **  This source code is part of the Valentine project, a pattern making
+ **  program, whose allow create and modeling patterns of clothing.
+ **  Copyright (C) 2017 Valentina project
+ **  <https://bitbucket.org/dismine/valentina> All Rights Reserved.
+ **
+ **  Valentina is free software: you can redistribute it and/or modify
+ **  it under the terms of the GNU General Public License as published by
+ **  the Free Software Foundation, either version 3 of the License, or
+ **  (at your option) any later version.
+ **
+ **  Valentina is distributed in the hope that it will be useful,
+ **  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ **  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ **  GNU General Public License for more details.
+ **
+ **  You should have received a copy of the GNU General Public License
+ **  along with Valentina.  If not, see <http://www.gnu.org/licenses/>.
+ **
+ *************************************************************************/
+
+#include "vtest.h"
+
+
+VTest::VTest()
+{
+}

src/libs/vtest/vtest.h

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

src/libs/vtest/vtest.pri

@@ -0,0 +1,11 @@
+# ADD TO EACH PATH $$PWD VARIABLE!!!!!!
+# This need for corect working file translations.pro
+
+SOURCES += \
+    $$PWD/abstracttest.cpp
+
+win32-msvc*:SOURCES += $$PWD/stable.cpp
+
+HEADERS += \
+    $$PWD/stable.h \
+    $$PWD/abstracttest.h

src/libs/vtest/vtest.pro

@@ -0,0 +1,92 @@
+#-------------------------------------------------
+#
+# Project created by QtCreator 2017-06-01T10:07:06
+#
+#-------------------------------------------------
+
+# File with common stuff for whole project
+include(../../../common.pri)
+
+QT += testlib widgets
+
+# Name of library
+TARGET = vtest
+
+# We want to create a library
+TEMPLATE = lib
+
+CONFIG += staticlib # Making static library
+
+# Since Q5.4 available support C++14
+greaterThan(QT_MAJOR_VERSION, 4):greaterThan(QT_MINOR_VERSION, 3) {
+    CONFIG += c++14
+} else {
+    # We use C++11 standard
+    CONFIG += c++11
+}
+
+# Use out-of-source builds (shadow builds)
+CONFIG -= debug_and_release debug_and_release_target
+
+# Since Qt 5.4.0 the source code location is recorded only in debug builds.
+# We need this information also in release builds. For this need define QT_MESSAGELOGCONTEXT.
+DEFINES += QT_MESSAGELOGCONTEXT
+
+include(vtest.pri)
+
+# This is static library so no need in "make install"
+
+# directory for executable file
+DESTDIR = bin
+
+# files created moc
+MOC_DIR = moc
+
+# objecs files
+OBJECTS_DIR = obj
+
+# Set using ccache. Function enable_ccache() defined in common.pri.
+$$enable_ccache()
+
+include(warnings.pri)
+
+CONFIG(debug, debug|release){
+    # Debug mode
+    #Calculate latest tag distance and build revision only in release mode. Change number each time requare
+    #recompilation precompiled headers file.
+    DEFINES += "LATEST_TAG_DISTANCE=0"
+}else{
+    # Release mode
+    !win32-msvc*:CONFIG += silent
+    DEFINES += V_NO_ASSERT
+    !unix:*-g++{
+        QMAKE_CXXFLAGS += -fno-omit-frame-pointer # Need for exchndl.dll
+    }
+
+    noDebugSymbols{ # For enable run qmake with CONFIG+=noDebugSymbols
+        # do nothing
+    } else {
+        !macx:!win32-msvc*{
+            # Turn on debug symbols in release mode on Unix systems.
+            # On Mac OS X temporarily disabled. TODO: find way how to strip binary file.
+            QMAKE_CXXFLAGS_RELEASE += -g -gdwarf-3
+            QMAKE_CFLAGS_RELEASE += -g -gdwarf-3
+            QMAKE_LFLAGS_RELEASE =
+        }
+    }
+
+    macx{
+        HG = /usr/local/bin/hg # Can't defeat PATH variable on Mac OS.
+    }else {
+        HG = hg # All other platforms all OK.
+    }
+    #latest tag distance number for using in version
+    HG_DISTANCE=$$system($${HG} log -r. --template '{latesttagdistance}')
+    isEmpty(HG_DISTANCE){
+        HG_DISTANCE = 0 # if we can't find local revision left 0.
+    }
+    message("Latest tag distance:" $${HG_DISTANCE})
+    DEFINES += "LATEST_TAG_DISTANCE=$${HG_DISTANCE}" # Make available latest tag distance number in sources.
+}
+
+include (../libs.pri)

src/libs/vtest/warnings.pri

@@ -0,0 +1,83 @@
+#Turn on compilers warnings.
+unix {
+    *-g++{
+        QMAKE_CXXFLAGS += \
+            # Key -isystem disable checking errors in system headers.
+            -isystem "$${OUT_PWD}/$${MOC_DIR}" \
+            $$GCC_DEBUG_CXXFLAGS # See common.pri for more details.
+
+        checkWarnings{ # For enable run qmake with CONFIG+=checkWarnings
+            QMAKE_CXXFLAGS += -Werror
+        }
+
+        noAddressSanitizer{ # For enable run qmake with CONFIG+=noAddressSanitizer
+            # do nothing
+        } else {
+            CONFIG(debug, debug|release){
+                # Debug mode
+                #gcc’s 4.8.0 Address Sanitizer
+                #http://blog.qt.digia.com/blog/2013/04/17/using-gccs-4-8-0-address-sanitizer-with-qt/
+                QMAKE_CXXFLAGS += -fsanitize=address -fno-omit-frame-pointer
+                QMAKE_CFLAGS += -fsanitize=address -fno-omit-frame-pointer
+                QMAKE_LFLAGS += -fsanitize=address
+            }
+        }
+
+        gccUbsan{ # For enable run qmake with CONFIG+=gccUbsan
+            CONFIG(debug, debug|release){
+                # Debug mode
+                #gcc’s 4.9.0 Undefined Behavior Sanitizer (ubsan)
+                QMAKE_CXXFLAGS += -fsanitize=undefined
+                QMAKE_CFLAGS += -fsanitize=undefined
+                QMAKE_LFLAGS += -fsanitize=undefined
+            }
+        }
+
+        # -isystem key works only for headers. In some cases it's not enough. But we can't delete this warnings and
+        # want them in global list. Compromise decision delete them from local list.
+        QMAKE_CXXFLAGS -= \
+            -Wswitch-default
+    }
+
+    clang*{
+        QMAKE_CXXFLAGS += \
+            # Key -isystem disable checking errors in system headers.
+            -isystem "$${OUT_PWD}/$${MOC_DIR}" \
+            $$CLANG_DEBUG_CXXFLAGS # See common.pri for more details.
+
+        checkWarnings{ # For enable run qmake with CONFIG+=checkWarnings
+            QMAKE_CXXFLAGS += -Werror
+        }
+
+        # -isystem key works only for headers. In some cases it's not enough. But we can't delete these warnings and
+        # want them in global list. Compromise decision delete them from local list.
+        QMAKE_CXXFLAGS -= \
+            -Wundefined-reinterpret-cast
+    }
+
+    *-icc-*{
+        QMAKE_CXXFLAGS += \
+            -isystem "$${OUT_PWD}/$${MOC_DIR}" \
+            $$ICC_DEBUG_CXXFLAGS
+
+        checkWarnings{ # For enable run qmake with CONFIG+=checkWarnings
+            QMAKE_CXXFLAGS += -Werror
+        }
+    }
+} else { # Windows
+    *-g++{
+        QMAKE_CXXFLAGS += $$GCC_DEBUG_CXXFLAGS # See common.pri for more details.
+
+        checkWarnings{ # For enable run qmake with CONFIG+=checkWarnings
+            QMAKE_CXXFLAGS += -Werror
+        }
+    }
+
+    win32-msvc*{
+        QMAKE_CXXFLAGS += $$MSVC_DEBUG_CXXFLAGS # See common.pri for more details.
+
+        checkWarnings{ # For enable run qmake with CONFIG+=checkWarnings
+            QMAKE_CXXFLAGS += -WX
+        }
+    }
+}

src/test/CollectionTest/CollectionTest.pro

@@ -4,7 +4,7 @@
 #
 #-------------------------------------------------
 
-QT       += testlib widgets
+QT       += testlib widgets printsupport
 
 QT       -= gui
 
@@ -80,41 +80,68 @@ CONFIG(release, debug|release){
     }
 }
 
-##VTools static library (depend on VWidgets, VMisc, VPatternDB)
+#VTools static library (depend on VWidgets, VMisc, VPatternDB)
-#unix|win32: LIBS += -L$$OUT_PWD/../../libs/vtools/$${DESTDIR}/ -lvtools
+unix|win32: LIBS += -L$$OUT_PWD/../../libs/vtools/$${DESTDIR}/ -lvtools
 
-#INCLUDEPATH += $$PWD/../../libs/vtools
+INCLUDEPATH += $$PWD/../../libs/vtools
-#DEPENDPATH += $$PWD/../../libs/vtools
+DEPENDPATH += $$PWD/../../libs/vtools
 
-#win32:!win32-g++: PRE_TARGETDEPS += $$OUT_PWD/../../libs/vtools/$${DESTDIR}/vtools.lib
+win32:!win32-g++: PRE_TARGETDEPS += $$OUT_PWD/../../libs/vtools/$${DESTDIR}/vtools.lib
-#else:unix|win32-g++: PRE_TARGETDEPS += $$OUT_PWD/../../libs/vtools/$${DESTDIR}/libvtools.a
+else:unix|win32-g++: PRE_TARGETDEPS += $$OUT_PWD/../../libs/vtools/$${DESTDIR}/libvtools.a
 
-##VWidgets static library
+#VWidgets static library
-#unix|win32: LIBS += -L$$OUT_PWD/../../libs/vwidgets/$${DESTDIR}/ -lvwidgets
+unix|win32: LIBS += -L$$OUT_PWD/../../libs/vwidgets/$${DESTDIR}/ -lvwidgets
 
-#INCLUDEPATH += $$PWD/../../libs/vwidgets
+INCLUDEPATH += $$PWD/../../libs/vwidgets
-#DEPENDPATH += $$PWD/../../libs/vwidgets
+DEPENDPATH += $$PWD/../../libs/vwidgets
 
-#win32:!win32-g++: PRE_TARGETDEPS += $$OUT_PWD/../../libs/vwidgets/$${DESTDIR}/vwidgets.lib
+win32:!win32-g++: PRE_TARGETDEPS += $$OUT_PWD/../../libs/vwidgets/$${DESTDIR}/vwidgets.lib
-#else:unix|win32-g++: PRE_TARGETDEPS += $$OUT_PWD/../../libs/vwidgets/$${DESTDIR}/libvwidgets.a
+else:unix|win32-g++: PRE_TARGETDEPS += $$OUT_PWD/../../libs/vwidgets/$${DESTDIR}/libvwidgets.a
 
-## VFormat static library (depend on VPatternDB, IFC)
+# VFormat static library (depend on VPatternDB, IFC)
-#unix|win32: LIBS += -L$$OUT_PWD/../../libs/vformat/$${DESTDIR}/ -lvformat
+unix|win32: LIBS += -L$$OUT_PWD/../../libs/vformat/$${DESTDIR}/ -lvformat
 
-#INCLUDEPATH += $$PWD/../../libs/vformat
+INCLUDEPATH += $$PWD/../../libs/vformat
-#DEPENDPATH += $$PWD/../../libs/vformat
+DEPENDPATH += $$PWD/../../libs/vformat
 
-#win32:!win32-g++: PRE_TARGETDEPS += $$OUT_PWD/../../libs/vformat/$${DESTDIR}/vformat.lib
+win32:!win32-g++: PRE_TARGETDEPS += $$OUT_PWD/../../libs/vformat/$${DESTDIR}/vformat.lib
-#else:unix|win32-g++: PRE_TARGETDEPS += $$OUT_PWD/../../libs/vformat/$${DESTDIR}/libvformat.a
+else:unix|win32-g++: PRE_TARGETDEPS += $$OUT_PWD/../../libs/vformat/$${DESTDIR}/libvformat.a
 
 #VPatternDB static library (depend on vgeometry, vmisc, VLayout)
-#unix|win32: LIBS += -L$$OUT_PWD/../../libs/vpatterndb/$${DESTDIR} -lvpatterndb
+unix|win32: LIBS += -L$$OUT_PWD/../../libs/vpatterndb/$${DESTDIR} -lvpatterndb
 
-#INCLUDEPATH += $$PWD/../../libs/vpatterndb
+INCLUDEPATH += $$PWD/../../libs/vpatterndb
-#DEPENDPATH += $$PWD/../../libs/vpatterndb
+DEPENDPATH += $$PWD/../../libs/vpatterndb
 
-#win32:!win32-g++: PRE_TARGETDEPS += $$OUT_PWD/../../libs/vpatterndb/$${DESTDIR}/vpatterndb.lib
+win32:!win32-g++: PRE_TARGETDEPS += $$OUT_PWD/../../libs/vpatterndb/$${DESTDIR}/vpatterndb.lib
-#else:unix|win32-g++: PRE_TARGETDEPS += $$OUT_PWD/../../libs/vpatterndb/$${DESTDIR}/libvpatterndb.a
+else:unix|win32-g++: PRE_TARGETDEPS += $$OUT_PWD/../../libs/vpatterndb/$${DESTDIR}/libvpatterndb.a
+
+#VTest static library
+unix|win32: LIBS += -L$$OUT_PWD/../../libs/vtest/$${DESTDIR} -lvtest
+
+INCLUDEPATH += $$PWD/../../libs/vtest
+DEPENDPATH += $$PWD/../../libs/vtest
+
+win32:!win32-g++: PRE_TARGETDEPS += $$OUT_PWD/../../libs/vtest/$${DESTDIR}/vtest.lib
+else:unix|win32-g++: PRE_TARGETDEPS += $$OUT_PWD/../../libs/vtest/$${DESTDIR}/libvtest.a
+
+# VGeometry static library (depend on ifc)
+unix|win32: LIBS += -L$$OUT_PWD/../../libs/vgeometry/$${DESTDIR} -lvgeometry
+
+INCLUDEPATH += $$PWD/../../libs/vgeometry
+DEPENDPATH += $$PWD/../../libs/vgeometry
+
+win32:!win32-g++: PRE_TARGETDEPS += $$OUT_PWD/../../libs/vgeometry/$${DESTDIR}/vgeometry.lib
+else:unix|win32-g++: PRE_TARGETDEPS += $$OUT_PWD/../../libs/vgeometry/$${DESTDIR}/libvgeometry.a
+
+# IFC static library (depend on QMuParser)
+unix|win32: LIBS += -L$$OUT_PWD/../../libs/ifc/$${DESTDIR}/ -lifc
+
+INCLUDEPATH += $$PWD/../../libs/ifc
+DEPENDPATH += $$PWD/../../libs/ifc
+
+win32:!win32-g++: PRE_TARGETDEPS += $$OUT_PWD/../../libs/ifc/$${DESTDIR}/ifc.lib
+else:unix|win32-g++: PRE_TARGETDEPS += $$OUT_PWD/../../libs/ifc/$${DESTDIR}/libifc.a
 
 #VMisc static library
 unix|win32: LIBS += -L$$OUT_PWD/../../libs/vmisc/$${DESTDIR} -lvmisc
@@ -125,49 +152,31 @@ DEPENDPATH += $$PWD/../../libs/vmisc
 win32:!win32-g++: PRE_TARGETDEPS += $$OUT_PWD/../../libs/vmisc/$${DESTDIR}/vmisc.lib
 else:unix|win32-g++: PRE_TARGETDEPS += $$OUT_PWD/../../libs/vmisc/$${DESTDIR}/libvmisc.a
 
-## VGeometry static library (depend on ifc)
+# VLayout static library
-#unix|win32: LIBS += -L$$OUT_PWD/../../libs/vgeometry/$${DESTDIR} -lvgeometry
+unix|win32: LIBS += -L$$OUT_PWD/../../libs/vlayout/$${DESTDIR} -lvlayout
 
-#INCLUDEPATH += $$PWD/../../libs/vgeometry
+INCLUDEPATH += $$PWD/../../libs/vlayout
-#DEPENDPATH += $$PWD/../../libs/vgeometry
+DEPENDPATH += $$PWD/../../libs/vlayout
 
-#win32:!win32-g++: PRE_TARGETDEPS += $$OUT_PWD/../../libs/vgeometry/$${DESTDIR}/vgeometry.lib
+win32:!win32-g++: PRE_TARGETDEPS += $$OUT_PWD/../../libs/vlayout/$${DESTDIR}/vlayout.lib
-#else:unix|win32-g++: PRE_TARGETDEPS += $$OUT_PWD/../../libs/vgeometry/$${DESTDIR}/libvgeometry.a
+else:unix|win32-g++: PRE_TARGETDEPS += $$OUT_PWD/../../libs/vlayout/$${DESTDIR}/libvlayout.a
-
-# IFC static library (depend on QMuParser)
-#unix|win32: LIBS += -L$$OUT_PWD/../../libs/ifc/$${DESTDIR}/ -lifc
-
-#INCLUDEPATH += $$PWD/../../libs/ifc
-#DEPENDPATH += $$PWD/../../libs/ifc
-
-#win32:!win32-g++: PRE_TARGETDEPS += $$OUT_PWD/../../libs/ifc/$${DESTDIR}/ifc.lib
-#else:unix|win32-g++: PRE_TARGETDEPS += $$OUT_PWD/../../libs/ifc/$${DESTDIR}/libifc.a
-
-## VLayout static library
-#unix|win32: LIBS += -L$$OUT_PWD/../../libs/vlayout/$${DESTDIR} -lvlayout
-
-#INCLUDEPATH += $$PWD/../../libs/vlayout
-#DEPENDPATH += $$PWD/../../libs/vlayout
-
-#win32:!win32-g++: PRE_TARGETDEPS += $$OUT_PWD/../../libs/vlayout/$${DESTDIR}/vlayout.lib
-#else:unix|win32-g++: PRE_TARGETDEPS += $$OUT_PWD/../../libs/vlayout/$${DESTDIR}/libvlayout.a
 
 # QMuParser library
-#win32:CONFIG(release, debug|release): LIBS += -L$${OUT_PWD}/../../libs/qmuparser/$${DESTDIR} -lqmuparser2
+win32:CONFIG(release, debug|release): LIBS += -L$${OUT_PWD}/../../libs/qmuparser/$${DESTDIR} -lqmuparser2
-#else:win32:CONFIG(debug, debug|release): LIBS += -L$${OUT_PWD}/../../libs/qmuparser/$${DESTDIR} -lqmuparser2
+else:win32:CONFIG(debug, debug|release): LIBS += -L$${OUT_PWD}/../../libs/qmuparser/$${DESTDIR} -lqmuparser2
-#else:unix: LIBS += -L$${OUT_PWD}/../../libs/qmuparser/$${DESTDIR} -lqmuparser
+else:unix: LIBS += -L$${OUT_PWD}/../../libs/qmuparser/$${DESTDIR} -lqmuparser
 
-#INCLUDEPATH += $${PWD}/../../libs/qmuparser
+INCLUDEPATH += $${PWD}/../../libs/qmuparser
-#DEPENDPATH += $${PWD}/../../libs/qmuparser
+DEPENDPATH += $${PWD}/../../libs/qmuparser
 
-## Only for adding path to LD_LIBRARY_PATH
+# Only for adding path to LD_LIBRARY_PATH
-## VPropertyExplorer library
+# VPropertyExplorer library
-#win32:CONFIG(release, debug|release): LIBS += -L$${OUT_PWD}/../../libs/vpropertyexplorer/$${DESTDIR} -lvpropertyexplorer
+win32:CONFIG(release, debug|release): LIBS += -L$${OUT_PWD}/../../libs/vpropertyexplorer/$${DESTDIR} -lvpropertyexplorer
-#else:win32:CONFIG(debug, debug|release): LIBS += -L$${OUT_PWD}/../../libs/vpropertyexplorer/$${DESTDIR} -lvpropertyexplorer
+else:win32:CONFIG(debug, debug|release): LIBS += -L$${OUT_PWD}/../../libs/vpropertyexplorer/$${DESTDIR} -lvpropertyexplorer
-#else:unix: LIBS += -L$${OUT_PWD}/../../libs/vpropertyexplorer/$${DESTDIR} -lvpropertyexplorer
+else:unix: LIBS += -L$${OUT_PWD}/../../libs/vpropertyexplorer/$${DESTDIR} -lvpropertyexplorer
 
-#INCLUDEPATH += $${PWD}/../../libs/vpropertyexplorer
+INCLUDEPATH += $${PWD}/../../libs/vpropertyexplorer
-#DEPENDPATH += $${PWD}/../../libs/vpropertyexplorer
+DEPENDPATH += $${PWD}/../../libs/vpropertyexplorer
 
 TAPE_TEST_FILES += \
     tst_tape/keiko.vit \

src/test/CollectionTest/tst_tapecommandline.cpp

@@ -28,7 +28,7 @@
 
 #include "tst_tapecommandline.h"
 #include "../vmisc/vsysexits.h"
-#include "logging.h"
+#include "../vmisc/logging.h"
 
 #include <QtTest>
 

src/test/CollectionTest/tst_tapecommandline.h

@@ -29,7 +29,7 @@
 #ifndef TST_TAPECOMMANDLINE_H
 #define TST_TAPECOMMANDLINE_H
 
-#include "../vmisc/abstracttest.h"
+#include "../vtest/abstracttest.h"
 
 class TST_TapeCommandLine : public AbstractTest
 {

src/test/CollectionTest/tst_valentinacommandline.cpp

@@ -28,7 +28,7 @@
 
 #include "tst_valentinacommandline.h"
 #include "../vmisc/vsysexits.h"
-#include "logging.h"
+#include "../vmisc/logging.h"
 
 #include <QtTest>
 

src/test/CollectionTest/tst_valentinacommandline.h

@@ -29,7 +29,7 @@
 #ifndef TST_VALENTINACOMMANDLINE_H
 #define TST_VALENTINACOMMANDLINE_H
 
-#include "../vmisc/abstracttest.h"
+#include "../vtest/abstracttest.h"
 
 class TST_ValentinaCommandLine : public AbstractTest
 {

src/test/TranslationsTest/TranslationsTest.pro

@@ -124,6 +124,15 @@ DEPENDPATH += $$PWD/../../libs/vpatterndb
 win32:!win32-g++: PRE_TARGETDEPS += $$OUT_PWD/../../libs/vpatterndb/$${DESTDIR}/vpatterndb.lib
 else:unix|win32-g++: PRE_TARGETDEPS += $$OUT_PWD/../../libs/vpatterndb/$${DESTDIR}/libvpatterndb.a
 
+#VTest static library (depend on VGeometry)
+unix|win32: LIBS += -L$$OUT_PWD/../../libs/vtest/$${DESTDIR} -lvtest
+
+INCLUDEPATH += $$PWD/../../libs/vtest
+DEPENDPATH += $$PWD/../../libs/vtest
+
+win32:!win32-g++: PRE_TARGETDEPS += $$OUT_PWD/../../libs/vtest/$${DESTDIR}/vtest.lib
+else:unix|win32-g++: PRE_TARGETDEPS += $$OUT_PWD/../../libs/vtest/$${DESTDIR}/libvtest.a
+
 #VMisc static library
 unix|win32: LIBS += -L$$OUT_PWD/../../libs/vmisc/$${DESTDIR} -lvmisc
 
@@ -134,13 +143,13 @@ win32:!win32-g++: PRE_TARGETDEPS += $$OUT_PWD/../../libs/vmisc/$${DESTDIR}/vmisc
 else:unix|win32-g++: PRE_TARGETDEPS += $$OUT_PWD/../../libs/vmisc/$${DESTDIR}/libvmisc.a
 
 ## VGeometry static library (depend on ifc)
-#unix|win32: LIBS += -L$$OUT_PWD/../../libs/vgeometry/$${DESTDIR} -lvgeometry
+unix|win32: LIBS += -L$$OUT_PWD/../../libs/vgeometry/$${DESTDIR} -lvgeometry
 
-#INCLUDEPATH += $$PWD/../../libs/vgeometry
+INCLUDEPATH += $$PWD/../../libs/vgeometry
-#DEPENDPATH += $$PWD/../../libs/vgeometry
+DEPENDPATH += $$PWD/../../libs/vgeometry
 
-#win32:!win32-g++: PRE_TARGETDEPS += $$OUT_PWD/../../libs/vgeometry/$${DESTDIR}/vgeometry.lib
+win32:!win32-g++: PRE_TARGETDEPS += $$OUT_PWD/../../libs/vgeometry/$${DESTDIR}/vgeometry.lib
-#else:unix|win32-g++: PRE_TARGETDEPS += $$OUT_PWD/../../libs/vgeometry/$${DESTDIR}/libvgeometry.a
+else:unix|win32-g++: PRE_TARGETDEPS += $$OUT_PWD/../../libs/vgeometry/$${DESTDIR}/libvgeometry.a
 
 # IFC static library (depend on QMuParser)
 unix|win32: LIBS += -L$$OUT_PWD/../../libs/ifc/$${DESTDIR}/ -lifc

src/test/TranslationsTest/tst_abstractregexp.h

@@ -29,7 +29,7 @@
 #ifndef TST_ABSTRACTREGEXP_H
 #define TST_ABSTRACTREGEXP_H
 
-#include "../vmisc/abstracttest.h"
+#include "../vtest/abstracttest.h"
 
 #include <QPointer>
 

src/test/TranslationsTest/tst_measurementregexp.cpp

@@ -31,6 +31,7 @@
 
 #include "../vmisc/logging.h"
 #include "../vpatterndb/vtranslatevars.h"
+#include "../vpatterndb/measurements.h"
 #include "../ifc/ifcdef.h"
 
 #include <QtTest>

src/test/TranslationsTest/tst_qmuparsererrormsg.h

@@ -29,7 +29,7 @@
 #ifndef TST_QMUPARSERERRORMSG_H
 #define TST_QMUPARSERERRORMSG_H
 
-#include "../vmisc/abstracttest.h"
+#include "../vtest/abstracttest.h"
 #include "../qmuparser/qmuparsererror.h"
 
 #include <QTranslator>

src/test/ValentinaTest/ValentinaTest.pro

@@ -161,6 +161,15 @@ DEPENDPATH += $$PWD/../../libs/ifc
 win32:!win32-g++: PRE_TARGETDEPS += $$OUT_PWD/../../libs/ifc/$${DESTDIR}/ifc.lib
 else:unix|win32-g++: PRE_TARGETDEPS += $$OUT_PWD/../../libs/ifc/$${DESTDIR}/libifc.a
 
+#VTest static library
+unix|win32: LIBS += -L$$OUT_PWD/../../libs/vtest/$${DESTDIR} -lvtest
+
+INCLUDEPATH += $$PWD/../../libs/vtest
+DEPENDPATH += $$PWD/../../libs/vtest
+
+win32:!win32-g++: PRE_TARGETDEPS += $$OUT_PWD/../../libs/vtest/$${DESTDIR}/vtest.lib
+else:unix|win32-g++: PRE_TARGETDEPS += $$OUT_PWD/../../libs/vtest/$${DESTDIR}/libvtest.a
+
 #VMisc static library
 unix|win32: LIBS += -L$$OUT_PWD/../../libs/vmisc/$${DESTDIR}/ -lvmisc
 

src/test/ValentinaTest/tst_nameregexp.cpp

@@ -28,8 +28,8 @@
 
 #include "tst_nameregexp.h"
 #include "../qmuparser/qmudef.h"
-#include "../vmisc/def.h"
 #include "../vmisc/logging.h"
+#include "../vpatterndb/measurements.h"
 
 #include <QtTest>
 

src/test/ValentinaTest/tst_vabstractcurve.h

@@ -29,7 +29,7 @@
 #ifndef TST_VABSTRACTCURVE_H
 #define TST_VABSTRACTCURVE_H
 
-#include "../vmisc/abstracttest.h"
+#include "../vtest/abstracttest.h"
 
 class TST_VAbstractCurve : public AbstractTest
 {

src/test/ValentinaTest/tst_vabstractpiece.h

@@ -29,7 +29,7 @@
 #ifndef TST_VABSTRACTPIECE_H
 #define TST_VABSTRACTPIECE_H
 
-#include "../vmisc/abstracttest.h"
+#include "../vtest/abstracttest.h"
 
 class VSAPoint;
 

src/test/ValentinaTest/tst_vlayoutdetail.h

@@ -29,7 +29,7 @@
 #ifndef TST_VLAYOUTDETAIL_H
 #define TST_VLAYOUTDETAIL_H
 
-#include "../vmisc/abstracttest.h"
+#include "../vtest/abstracttest.h"
 
 class TST_VLayoutDetail : public AbstractTest
 {

src/test/ValentinaTest/tst_vmeasurements.cpp

@@ -30,6 +30,7 @@
 #include "../vformat/vmeasurements.h"
 #include "../ifc/xml/vvstconverter.h"
 #include "../ifc/xml/vvitconverter.h"
+#include "../vpatterndb/pmsystems.h"
 
 #include <QtTest>
 

src/test/ValentinaTest/tst_vpiece.h

@@ -29,7 +29,7 @@
 #ifndef TST_VDETAIL_H
 #define TST_VDETAIL_H
 
-#include "../vmisc/abstracttest.h"
+#include "../vtest/abstracttest.h"
 
 class TST_VPiece : public AbstractTest
 {

src/test/ValentinaTest/tst_vspline.h

@@ -29,7 +29,7 @@
 #ifndef TST_VSPLINE_H
 #define TST_VSPLINE_H
 
-#include "../vmisc/abstracttest.h"
+#include "../vtest/abstracttest.h"
 
 class VSpline;