diff --git a/Valentina.pri b/Valentina.pri index 854a22269..655e16261 100644 --- a/Valentina.pri +++ b/Valentina.pri @@ -27,6 +27,8 @@ defineTest(copyToDestdir) { DDIR = $$2 mkpath($$DDIR) + message("----------------------------------------------begin------------------------------------------------") + message("Copy to" $$DDIR "after link") for(FILE, files) { # Replace slashes in paths with backslashes for Windows @@ -35,9 +37,11 @@ defineTest(copyToDestdir) { DDIR ~= s,/,\\,g } QMAKE_POST_LINK += $$QMAKE_COPY $$quote($$FILE) $$quote($$DDIR) $$escape_expand(\\n\\t) + message("Command:" $$QMAKE_COPY $$quote($$FILE) $$quote($$DDIR) $$escape_expand(\\n\\t)) } export(QMAKE_POST_LINK) + message("----------------------------------------------end---------------------------------------------------") } # We use precompiled headers for more fast compilation source code. @@ -525,10 +529,12 @@ GCC_DEBUG_CXXFLAGS += \ -Wall \ -Wextra \ -pedantic \ + -fno-omit-frame-pointer # Need for exchndl.dll CLANG_DEBUG_CXXFLAGS += \ -O0 \ -Wall \ -Wextra \ -pedantic \ + -fno-omit-frame-pointer # Need for exchndl.dll } diff --git a/dist/nsis/headers/fileversion.nsh b/dist/nsis/headers/fileversion.nsh new file mode 100644 index 000000000..258e0d64d --- /dev/null +++ b/dist/nsis/headers/fileversion.nsh @@ -0,0 +1,30 @@ +; fileversion.nsh +; Source http://nsis.sourceforge.net/GetDLLVersionLocal_as_define +; +; GetDLLVersionLocal only gives you two packed 32bit numbers, but +; sometimes you might need the unpacked numbers at compile time. This is +; where this ugly thing comes in. +; +; Example usage +; !insertmacro GetPEVersionLocal "$%windir%\system32\kernel32.dll" myver +; Outfile "$%temp%\hello ${myver_1}.${myver_2}.${myver_3}.${myver_4}.exe" + +!macro GetPEVersionLocal file defbase +!verbose push +!verbose 2 +!tempfile GetPEVersionLocal_nsi +!tempfile GetPEVersionLocal_exe +!define GetPEVersionLocal_doll "$" +!appendfile "${GetPEVersionLocal_nsi}" 'SilentInstall silent$\nRequestExecutionLevel user$\nOutFile "${GetPEVersionLocal_exe}"$\nPage instfiles$\nSection' +!appendfile "${GetPEVersionLocal_nsi}" '$\nFileOpen $0 "${GetPEVersionLocal_nsi}" w$\nGetDllVersion "${file}" $R0 $R1$\nIntOp $R2 $R0 / 0x00010000$\nIntOp $R3 $R0 & 0x0000FFFF$\nIntOp $R4 $R1 / 0x00010000$\nIntOp $R5 $R1 & 0x0000FFFF' +!appendfile "${GetPEVersionLocal_nsi}" '$\nFileWrite $0 "!define ${defbase}_1 $R2${GetPEVersionLocal_doll}\n"$\nFileWrite $0 "!define ${defbase}_2 $R3${GetPEVersionLocal_doll}\n"$\nFileWrite $0 "!define ${defbase}_3 $R4${GetPEVersionLocal_doll}\n"$\nFileWrite $0 "!define ${defbase}_4 $R5${GetPEVersionLocal_doll}\n"$\nFileClose $0$\nSectionEnd' +!system '"${NSISDIR}\makensis" /V2 "${GetPEVersionLocal_nsi}"' = 0 +!system '"${GetPEVersionLocal_exe}"' = 0 +!include "${GetPEVersionLocal_nsi}" +!delfile "${GetPEVersionLocal_nsi}" +!delfile "${GetPEVersionLocal_exe}" +!undef GetPEVersionLocal_nsi +!undef GetPEVersionLocal_exe +!undef GetPEVersionLocal_doll +!verbose pop +!macroend diff --git a/dist/nsis/valentina.nsi b/dist/nsis/valentina.nsi index ba1867829..09b811912 100644 --- a/dist/nsis/valentina.nsi +++ b/dist/nsis/valentina.nsi @@ -2,6 +2,7 @@ ; --------------- Headers -------------- !include "MUI2.nsh" !include "headers\fileassoc.nsh" +!include "headers\fileversion.nsh" !include "FileFunc.nsh" ; --------------- General -------------- @@ -11,7 +12,10 @@ SetCompressor /FINAL /SOLID lzma !define MUI_PRODUCT "Valentina" !define MUI_FILE "valentina" -!define MUI_VERSION "0.2.8-alpha" + +!insertmacro GetPEVersionLocal "c:\pack\valentina\valentina.exe" ver +!define MUI_VERSION "${ver_1}.${ver_2}.${ver_3}-alpha" + !define MUI_BRANDINGTEXT "Valentina ${MUI_VERSION}" !define WEBSITE_LINK "http://www.valentina-project.org/" !define PUBLISHER "Roman Telezhynskyi" @@ -20,7 +24,10 @@ InstallDir "$LOCALAPPDATA\${MUI_PRODUCT}" ; Default installation Name "${MUI_BRANDINGTEXT}" ; Name displayed on installer Icon "valentina\${MUI_FILE}.ico" Caption "${MUI_BRANDINGTEXT}" -OutFile "${MUI_FILE}-install-v.${MUI_VERSION}_32bit.exe" ; Resulting installer filename + +!define /date MYTIMESTAMP "%Y%m%d%H%M%S" +OutFile "${MUI_FILE}_${MUI_VERSION}-${MYTIMESTAMP}_i386.exe" ; Resulting installer filename + InstallDirRegKey HKCU "$LOCALAPPDATA\${MUI_PRODUCT}" "" ; Get installation folder from registry if available LicenseData "valentina\LICENSE_GPL.txt" RequestExecutionLevel user ; Request application privileges for Windows Vista diff --git a/src/app/app.pro b/src/app/app.pro index 90b980a3f..127dde53f 100644 --- a/src/app/app.pro +++ b/src/app/app.pro @@ -1,3 +1,4 @@ + #------------------------------------------------- # # Project created by QtCreator 2013-06-18T12:36:43 @@ -107,7 +108,7 @@ TRANSLATIONS += share/translations/valentina.ts \ share/translations/valentina_nl_NL.ts # Set using ccache. Function enable_ccache() defined in Valentina.pri. -#$$enable_ccache() +$$enable_ccache() # Set precompiled headers. Function set_PCH() defined in Valentina.pri. $$set_PCH() @@ -145,9 +146,17 @@ CONFIG(debug, debug|release){ # Release mode DEFINES += QT_NO_DEBUG_OUTPUT + !unix:*-g++{ + QMAKE_CXXFLAGS += -fno-omit-frame-pointer # Need for exchndl.dll + } + # Turn on debug symbols in release mode on Unix systems. # On Mac OS X temporarily disabled. Need find way how to strip binary file. - unix:!macx:QMAKE_CXXFLAGS_RELEASE += -g -gdwarf-3 + !macx:!win32-msvc*{ + QMAKE_CXXFLAGS_RELEASE += -g -gdwarf-3 + QMAKE_CFLAGS_RELEASE += -g -gdwarf-3 + QMAKE_LFLAGS_RELEASE = + } #local revision number for using in version HG_REV=$$system(hg parents --template '{rev}') @@ -174,137 +183,135 @@ message(Examples: $$[QT_INSTALL_EXAMPLES]) # Path to recource file. win32:RC_FILE = share/resources/valentina.rc -# Set "make install" command for Unix-like systems. -unix{ -isEmpty(PREFIX){ - PREFIX = $$DEFAULT_PREFIX -} - # Keep path to all files with standard measurements we support right now INSTALL_STANDARD_MEASHUREMENTS += share/resources/tables/standard/GOST_man_ru.vst -# Prefix for binary file. -unix:!macx{ - # Add to this variable all translation files that you want install with program. - # For generation *.qm file first you need create *.ts. See section TRANSLATIONS. - INSTALL_TRANSLATIONS += \ - share/translations/valentina_ru_RU.qm \ - share/translations/valentina_uk_UA.qm \ - share/translations/valentina_de_DE.qm \ - share/translations/valentina_cs_CZ.qm \ - share/translations/valentina_he_IL.qm \ - share/translations/valentina_fr_FR.qm \ - share/translations/valentina_it_IT.qm \ - share/translations/valentina_nl_NL.qm +# Add to this variable all translation files that you want install with program. +# For generation *.qm file first you need create *.ts. See section TRANSLATIONS. +INSTALL_TRANSLATIONS += \ + share/translations/valentina_ru_RU.qm \ + share/translations/valentina_uk_UA.qm \ + share/translations/valentina_de_DE.qm \ + share/translations/valentina_cs_CZ.qm \ + share/translations/valentina_he_IL.qm \ + share/translations/valentina_fr_FR.qm \ + share/translations/valentina_it_IT.qm \ + share/translations/valentina_nl_NL.qm - - - DATADIR =$$PREFIX/share - DEFINES += DATADIR=\\\"$$DATADIR\\\" PKGDATADIR=\\\"$$PKGDATADIR\\\" - - # Path to bin file after installation - target.path = $$PREFIX/bin - - # .desctop file - desktop.path = $$DATADIR/applications/ - desktop.files += ../../dist/$${TARGET}.desktop - - # logo - pixmaps.path = $$DATADIR/pixmaps/ - pixmaps.files += ../../dist/$${TARGET}.png - - # Path to translation files after installation - translations.path = $$DATADIR/$${TARGET}/translations/ - translations.files = $$INSTALL_TRANSLATIONS - - # Path to standard measurement after installation - standard.path = $$DATADIR/$${TARGET}/tables/standard/ - standard.files = $$INSTALL_STANDARD_MEASHUREMENTS - - INSTALLS += \ - target \ - desktop \ - pixmaps \ - translations \ - standard - } -} -macx{ - # Some macx stuff - QMAKE_MAC_SDK = macosx - - QMAKE_MACOSX_DEPLOYMENT_TARGET = 10.6 - # Path to resources in app bundle - RESOURCES_DIR = "Contents/Resources" - FRAMEWORKS_DIR = "Contents/Frameworks" - # On macx we will use app bundle. Bundle doesn't need bin directory inside. - # See issue #166: Creating OSX Homebrew (Mac OS X package manager) formula. - target.path = $$PREFIX/ - - # Copy in bundle translation files. - exists(share/translations/valentina_ru_RU.qm){ - TRANSLATION_ru_RU.files += \ - share/translations/valentina_ru_RU.qm \ - share/translations/Localizable.strings - TRANSLATION_ru_RU.path = "$$RESOURCES_DIR/translations/ru_RU.lproj" - QMAKE_BUNDLE_DATA += TRANSLATION_ru_RU +# Set "make install" command for Unix-like systems. +unix{ + # Prefix for binary file. + isEmpty(PREFIX){ + PREFIX = $$DEFAULT_PREFIX } - exists(share/translations/valentina_uk_UA.qm){ - TRANSLATION_uk_UA.files += \ - share/translations/valentina_uk_UA.qm \ - share/translations/Localizable.strings - TRANSLATION_uk_UA.path = "$$RESOURCES_DIR/translations/uk_UA.lproj" - QMAKE_BUNDLE_DATA += TRANSLATION_uk_UA - } + unix:!macx{ + DATADIR =$$PREFIX/share + DEFINES += DATADIR=\\\"$$DATADIR\\\" PKGDATADIR=\\\"$$PKGDATADIR\\\" - exists(share/translations/valentina_de_DE.qm){ - TRANSLATION_de_DE.files += \ - share/translations/valentina_de_DE.qm \ - share/translations/Localizable.strings - TRANSLATION_de_DE.path = "$$RESOURCES_DIR/translations/de_DE.lproj" - QMAKE_BUNDLE_DATA += TRANSLATION_de_DE - } + # Path to bin file after installation + target.path = $$PREFIX/bin - exists(share/translations/valentina_cs_CZ.qm){ - TRANSLATION_cs_CZ.files += \ - share/translations/valentina_cs_CZ.qm \ - share/translations/Localizable.strings - TRANSLATION_cs_CZ.path = "$$RESOURCES_DIR/translations/cs_CZ.lproj" - QMAKE_BUNDLE_DATA += TRANSLATION_cs_CZ - } + # .desctop file + desktop.path = $$DATADIR/applications/ + desktop.files += ../../dist/$${TARGET}.desktop - exists(share/translations/valentina_he_IL.qm){ - TRANSLATION_he_IL.files += \ - share/translations/valentina_he_IL.qm \ - share/translations/Localizable.strings - TRANSLATION_he_IL.path = "$$RESOURCES_DIR/translations/he_IL.lproj" - QMAKE_BUNDLE_DATA += TRANSLATION_he_IL - } + # logo + pixmaps.path = $$DATADIR/pixmaps/ + pixmaps.files += ../../dist/$${TARGET}.png - exists(share/translations/valentina_fr_FR.qm){ - TRANSLATION_fr_FR.files += \ - share/translations/valentina_fr_FR.qm \ - share/translations/Localizable.strings - TRANSLATION_fr_FR.path = "$$RESOURCES_DIR/translations/fr_FR.lproj" - QMAKE_BUNDLE_DATA += TRANSLATION_fr_FR - } + # Path to translation files after installation + translations.path = $$DATADIR/$${TARGET}/translations/ + translations.files = $$INSTALL_TRANSLATIONS - exists(share/translations/valentina_it_IT.qm){ - TRANSLATION_it_IT.files += \ - share/translations/valentina_it_IT.qm \ - share/translations/Localizable.strings - TRANSLATION_it_IT.path = "$$RESOURCES_DIR/translations/it_IT.lproj" - QMAKE_BUNDLE_DATA += TRANSLATION_it_IT - } + # Path to standard measurement after installation + standard.path = $$DATADIR/$${TARGET}/tables/standard/ + standard.files = $$INSTALL_STANDARD_MEASHUREMENTS - exists(share/translations/valentina_nl_NL.qm){ - TRANSLATION_nl_NL.files += \ - share/translations/valentina_nl_NL.qm \ - share/translations/Localizable.strings - TRANSLATION_nl_NL.path = "$$RESOURCES_DIR/translations/nl_NL.lproj" - QMAKE_BUNDLE_DATA += TRANSLATION_nl_NL + INSTALLS += \ + target \ + desktop \ + pixmaps \ + translations \ + standard } + macx{ + # Some macx stuff + QMAKE_MAC_SDK = macosx + + QMAKE_MACOSX_DEPLOYMENT_TARGET = 10.6 + # Path to resources in app bundle + RESOURCES_DIR = "Contents/Resources" + FRAMEWORKS_DIR = "Contents/Frameworks" + # On macx we will use app bundle. Bundle doesn't need bin directory inside. + # See issue #166: Creating OSX Homebrew (Mac OS X package manager) formula. + target.path = $$PREFIX/ + + # Copy in bundle translation files. + exists(share/translations/valentina_ru_RU.qm){ + TRANSLATION_ru_RU.files += \ + share/translations/valentina_ru_RU.qm \ + share/translations/Localizable.strings + TRANSLATION_ru_RU.path = "$$RESOURCES_DIR/translations/ru_RU.lproj" + QMAKE_BUNDLE_DATA += TRANSLATION_ru_RU + } + + exists(share/translations/valentina_uk_UA.qm){ + TRANSLATION_uk_UA.files += \ + share/translations/valentina_uk_UA.qm \ + share/translations/Localizable.strings + TRANSLATION_uk_UA.path = "$$RESOURCES_DIR/translations/uk_UA.lproj" + QMAKE_BUNDLE_DATA += TRANSLATION_uk_UA + } + + exists(share/translations/valentina_de_DE.qm){ + TRANSLATION_de_DE.files += \ + share/translations/valentina_de_DE.qm \ + share/translations/Localizable.strings + TRANSLATION_de_DE.path = "$$RESOURCES_DIR/translations/de_DE.lproj" + QMAKE_BUNDLE_DATA += TRANSLATION_de_DE + } + + exists(share/translations/valentina_cs_CZ.qm){ + TRANSLATION_cs_CZ.files += \ + share/translations/valentina_cs_CZ.qm \ + share/translations/Localizable.strings + TRANSLATION_cs_CZ.path = "$$RESOURCES_DIR/translations/cs_CZ.lproj" + QMAKE_BUNDLE_DATA += TRANSLATION_cs_CZ + } + + exists(share/translations/valentina_he_IL.qm){ + TRANSLATION_he_IL.files += \ + share/translations/valentina_he_IL.qm \ + share/translations/Localizable.strings + TRANSLATION_he_IL.path = "$$RESOURCES_DIR/translations/he_IL.lproj" + QMAKE_BUNDLE_DATA += TRANSLATION_he_IL + } + + exists(share/translations/valentina_fr_FR.qm){ + TRANSLATION_fr_FR.files += \ + share/translations/valentina_fr_FR.qm \ + share/translations/Localizable.strings + TRANSLATION_fr_FR.path = "$$RESOURCES_DIR/translations/fr_FR.lproj" + QMAKE_BUNDLE_DATA += TRANSLATION_fr_FR + } + + exists(share/translations/valentina_it_IT.qm){ + TRANSLATION_it_IT.files += \ + share/translations/valentina_it_IT.qm \ + share/translations/Localizable.strings + TRANSLATION_it_IT.path = "$$RESOURCES_DIR/translations/it_IT.lproj" + QMAKE_BUNDLE_DATA += TRANSLATION_it_IT + } + + exists(share/translations/valentina_nl_NL.qm){ + TRANSLATION_nl_NL.files += \ + share/translations/valentina_nl_NL.qm \ + share/translations/Localizable.strings + TRANSLATION_nl_NL.path = "$$RESOURCES_DIR/translations/nl_NL.lproj" + QMAKE_BUNDLE_DATA += TRANSLATION_nl_NL + } + qmuparser.path = $$FRAMEWORKS_DIR qmuparser.files = $${OUT_PWD}/../libs/qmuparser/$${DESTDIR}/ vpropertyexplorer.path = $$FRAMEWORKS_DIR @@ -323,7 +330,7 @@ macx{ qmuparser \ vpropertyexplorer - + } } # Run generation *.qm file for available *.ts files each time you run qmake. @@ -338,6 +345,7 @@ macx{ for(DIR, INSTALL_TRANSLATIONS) { #add these absolute paths to a variable which #ends up as 'mkcommands = path1 path2 path3 ...' + tr_path += $${PWD}/$$DIR } @@ -371,11 +379,18 @@ DEPENDPATH += $${PWD}/../libs/vpropertyexplorer # Strip after you link all libaries. CONFIG(release, debug|release){ + win32:!win32-msvc*{ + # Strip debug symbols. + QMAKE_POST_LINK += objcopy --only-keep-debug bin/${TARGET} bin/${TARGET}.dbg && + QMAKE_POST_LINK += objcopy --strip-debug bin/${TARGET} && + QMAKE_POST_LINK += objcopy --add-gnu-debuglink="bin/${TARGET}.dbg" bin/${TARGET} + } + unix:!macx{ # Strip debug symbols. - QMAKE_POST_LINK += objcopy --only-keep-debug $(TARGET) $(TARGET).debug && - QMAKE_POST_LINK += strip --strip-debug --strip-unneeded $(TARGET) && - QMAKE_POST_LINK += objcopy --add-gnu-debuglink $(TARGET).debug $(TARGET) + QMAKE_POST_LINK += objcopy --only-keep-debug ${TARGET} ${TARGET}.dbg && + QMAKE_POST_LINK += objcopy --strip-debug ${TARGET} && + QMAKE_POST_LINK += objcopy --add-gnu-debuglink="${TARGET}.dbg" ${TARGET} } } diff --git a/src/app/container/calculator.cpp b/src/app/container/calculator.cpp index 0178def70..6d04df791 100644 --- a/src/app/container/calculator.cpp +++ b/src/app/container/calculator.cpp @@ -110,6 +110,10 @@ qreal Calculator::EvalFormula(const QString &formula) result = Eval(); QMap tokens = this->GetTokens(); + + // Remove "-" from tokens list if exist. If don't do that unary minus operation will broken. + RemoveAll(tokens, "-"); + if (tokens.isEmpty()) { return result; @@ -194,7 +198,7 @@ void Calculator::InitCharacterSets() // Defining identifier character sets DefineNameChars(QStringLiteral("0123456789_") + symbols.join("")); - DefineOprtChars(symbols.join("") + QStringLiteral("+-*^/?<>=#!$%&|~'_")); + DefineOprtChars(symbols.join("") + QStringLiteral("+-*^/?<>=#!$%&|~_")); } //--------------------------------------------------------------------------------------------------------------------- @@ -243,3 +247,16 @@ void Calculator::SetSepForTr(bool fromUser) SetDecSep('.'); } } + +//--------------------------------------------------------------------------------------------------------------------- +void Calculator::RemoveAll(QMap &map, const QString &val) +{ + QList listKeys = map.keys(val); + if (listKeys.size() > 0) + { + for (int i = 0; i < listKeys.size(); ++i) + { + map.remove(listKeys.at(i)); + } + } +} diff --git a/src/app/container/calculator.h b/src/app/container/calculator.h index 4431edf3c..c71cae22b 100644 --- a/src/app/container/calculator.h +++ b/src/app/container/calculator.h @@ -68,6 +68,7 @@ private: static qreal* AddVariable(const QString &a_szName, void *a_pUserData); void SetSepForEval(); void SetSepForTr(bool fromUser); + void RemoveAll(QMap &map, const QString &val); }; #endif // CALCULATOR_H diff --git a/src/app/core/vapplication.cpp b/src/app/core/vapplication.cpp index fdbbdcf01..37847fe83 100644 --- a/src/app/core/vapplication.cpp +++ b/src/app/core/vapplication.cpp @@ -34,6 +34,7 @@ #include "../exception/vexceptionwrongid.h" #include "vmaingraphicsview.h" #include "../container/calculator.h" +#include "../version.h" #include #include @@ -45,6 +46,10 @@ const qreal VApplication::PrintDPI = 96.0; +#if defined(Q_OS_WIN) && defined(Q_CC_GNU) +const QString VApplication::GistFileName = QStringLiteral("gist.json"); +#endif // defined(Q_OS_WIN) && defined(Q_CC_GNU) + #define DefWidth 1.2//mm //--------------------------------------------------------------------------------------------------------------------- @@ -1848,3 +1853,152 @@ bool VApplication::SafeCopy(const QString &source, const QString &destination, Q return result; } + +#if defined(Q_OS_WIN) && defined(Q_CC_GNU) +//--------------------------------------------------------------------------------------------------------------------- +// Catch exception and create report. Use if program build with Mingw compiler. +// See more about catcher https://github.com/jrfonseca/drmingw/blob/master/README.md +void VApplication::DrMingw() +{ + QFile drmingw("exchndl.dll"); + if(drmingw.exists()) + {// If don't want create reports just delete exchndl.dll from installer + LoadLibrary(L"exchndl.dll"); + } +} + +//--------------------------------------------------------------------------------------------------------------------- +void VApplication::CollectReports() const +{ + // Seek file "binary_name.RPT" + const QString reportName = QString("%1/%2.RPT").arg(applicationDirPath()) + .arg(QFileInfo(arguments().at(0)).baseName()); + QFile reportFile(reportName); + if (reportFile.exists()) + { // Hooray we have found crash + if (settings == nullptr) + { + return;// Settings was not opened. + } + + if (settings->value("configuration/send_report/state", 1).toBool()) + { // Try send report + // Remove gist.json file before close app. + connect(this, &VApplication::aboutToQuit, this, &VApplication::CleanGist, Qt::UniqueConnection); + SendReport(reportName); + } + else + { // Just collect report to /reports directory + CollectReport(reportName); + } + } +} + +//--------------------------------------------------------------------------------------------------------------------- +void VApplication::CollectReport(const QString &reportName) const +{ + const QString reportsDir = QString("%1/reports").arg(qApp->applicationDirPath()); + QDir reports(reportsDir); + if (reports.exists() == false) + { + reports.mkpath("."); // Create directory for reports if need + } + + const QDateTime now = QDateTime::currentDateTime(); + const QString timestamp = now.toString(QLatin1String("yyyyMMdd-hhmmsszzz")); + const QString filename = QString("%1/reports/crash-%2.RPT").arg(qApp->applicationDirPath()).arg(timestamp); + + QFile reportFile(reportName); + reportFile.copy(filename); // Collect new crash + reportFile.remove(); // Clear after yourself +} + +//--------------------------------------------------------------------------------------------------------------------- +void VApplication::CleanGist() const +{ + QFile gistFile(GistFileName); + if (gistFile.exists()) + { + gistFile.remove(); + } +} + +//--------------------------------------------------------------------------------------------------------------------- +void VApplication::SendReport(const QString &reportName) const +{ + QString content; + QFile reportFile(reportName); + if (!reportFile.open(QIODevice::ReadOnly | QIODevice::Text)) + { + return; + } + + QTextStream in(&reportFile); + while (!in.atEnd()) + { + content.append(in.readLine()+"\r\n");// Windows end of line + } + reportFile.close(); + + // Additional information + content.append(QString("-------------------------------")+"\r\n"); + content.append(QString("Version:%1").arg(APP_VERSION)+"\r\n"); + content.append(QString("Based on Qt %2 (32 bit)").arg(QT_VERSION_STR)+"\r\n"); + content.append(QString("Built on %3 at %4").arg(__DATE__).arg(__TIME__)+"\r\n"); + + // Creating json with report + // Example: + //{ + // "description":"Crash report", + // "public":"true", + // "files":{ + // "file1.txt":{ + // "content":"Report text here" + // } + // } + //} + + // Useful to know when crash was created + const QDateTime now = QDateTime::currentDateTime(); + const QString timestamp = now.toString(QLatin1String("yyyy/MM/dd hh:mm:ss:zzz")); + const QString report = QString("Crash report was created %2").arg(timestamp); + + QJsonObject reportObject; + reportObject.insert(QStringLiteral("description"), QJsonValue(report)); + reportObject.insert(QStringLiteral("public"), QJsonValue(QString("true"))); + + QJsonObject contentObject; + contentObject.insert(QStringLiteral("content"), QJsonValue(content)); + + QJsonObject fileObject; + fileObject.insert(QFileInfo(reportName).fileName(), QJsonValue(contentObject)); + reportObject.insert(QStringLiteral("files"), QJsonValue(fileObject)); + + QFile gistFile(GistFileName); + if (!gistFile.open(QIODevice::WriteOnly | QIODevice::Truncate | QIODevice::Text)) + { + qDebug("Couldn't open gist file."); + return; + } + + // Save data to file + QJsonDocument saveRep(reportObject); + gistFile.write(saveRep.toJson()); + gistFile.close(); + + QFile curlFile("curl.exe"); + if (curlFile.exists()) + {// Trying send report + // Change token 28df778e0ef75e3724f7b9622fb70b9c69187779 if need + QString arg = QString("curl.exe -k -H \"Authorization: bearer 28df778e0ef75e3724f7b9622fb70b9c69187779\" " + "-H \"Accept: application/json\" -H \"Content-type: application/json\" -X POST " + "--data @gist.json https://api.github.com/gists"); + QProcess::startDetached(arg); + reportFile.remove();// Clear after yourself + } + else + {// We can not send than just collect + CollectReport(reportName); + } +} +#endif //defined(Q_OS_WIN) && defined(Q_CC_GNU) diff --git a/src/app/core/vapplication.h b/src/app/core/vapplication.h index a92a08e9f..eeb1138cc 100644 --- a/src/app/core/vapplication.h +++ b/src/app/core/vapplication.h @@ -103,6 +103,13 @@ public: static QStringList LabelLanguages(); QString STDescription(const QString &id)const; static bool SafeCopy(const QString &source, const QString &destination, QString &error); + +#if defined(Q_OS_WIN) && defined(Q_CC_GNU) + static void DrMingw(); + void CollectReports() const; +private slots: + void CleanGist() const; +#endif // defined(Q_OS_WIN) && defined(Q_CC_GNU) private: Q_DISABLE_COPY(VApplication) Unit _patternUnit; @@ -153,6 +160,13 @@ private: void BiasTokens(int position, int bias, QMap &tokens) const; void InitMeasurement(const QString &name, const VTranslation &m, const VTranslation &g, const VTranslation &d); + +#if defined(Q_OS_WIN) && defined(Q_CC_GNU) + static const QString GistFileName; + + void CollectReport(const QString &reportName) const; + void SendReport(const QString &reportName) const; +#endif // defined(Q_OS_WIN) && defined(Q_CC_GNU) }; //--------------------------------------------------------------------------------------------------------------------- diff --git a/src/app/dialogs/app/configpages/configurationpage.cpp b/src/app/dialogs/app/configpages/configurationpage.cpp index 5f14491c2..8e1d13bca 100644 --- a/src/app/dialogs/app/configpages/configurationpage.cpp +++ b/src/app/dialogs/app/configpages/configurationpage.cpp @@ -44,14 +44,17 @@ //--------------------------------------------------------------------------------------------------------------------- ConfigurationPage::ConfigurationPage(QWidget *parent) : QWidget(parent), autoSaveCheck(nullptr), autoTime(nullptr), langCombo(nullptr), labelCombo(nullptr), - unitCombo(nullptr), osOptionCheck(nullptr), langChanged(false), unitChanged(false), labelLangChanged(false) + unitCombo(nullptr), osOptionCheck(nullptr), langChanged(false), unitChanged(false), labelLangChanged(false), + sendReportCheck(nullptr) { QGroupBox *saveGroup = SaveGroup(); QGroupBox *langGroup = LangGroup(); + QGroupBox *sendGroup = SendGroup(); QVBoxLayout *mainLayout = new QVBoxLayout; mainLayout->addWidget(saveGroup); mainLayout->addWidget(langGroup); + mainLayout->addWidget(sendGroup); mainLayout->addStretch(1); setLayout(mainLayout); } @@ -76,6 +79,8 @@ void ConfigurationPage::Apply() qApp->getSettings()->setValue("configuration/osSeparator", osOptionCheck->isChecked()); + qApp->getSettings()->setValue("configuration/send_report/state", sendReportCheck->isChecked()); + if (langChanged) { QString locale = qvariant_cast(langCombo->itemData(langCombo->currentIndex())); @@ -273,6 +278,35 @@ QGroupBox *ConfigurationPage::LangGroup() return langGroup; } +//--------------------------------------------------------------------------------------------------------------------- +QGroupBox *ConfigurationPage::SendGroup() +{ + QSettings *settings = qApp->getSettings(); + SCASSERT(settings != nullptr); + + QGroupBox *sendGroup = new QGroupBox(tr("Send crash reports")); + + sendReportCheck = new QCheckBox(tr("Send crash reports (recommended)")); + bool sendReportValue = settings->value("configuration/send_report/state", 1).toBool(); + sendReportCheck->setChecked(sendReportValue); + + QLabel *description = new QLabel(tr("After each crash Valentina collect information that may help us fix a " + "problem. We do not collect any personal information. Find more about what " + "kind of information we collect.")); + description->setTextFormat(Qt::RichText); + description->setTextInteractionFlags(Qt::TextBrowserInteraction); + description->setOpenExternalLinks(true); + description->setWordWrap(true); + + QVBoxLayout *sendLayout = new QVBoxLayout; + sendLayout->addWidget(sendReportCheck); + sendLayout->addWidget(description); + + sendGroup->setLayout(sendLayout); + return sendGroup; +} + //--------------------------------------------------------------------------------------------------------------------- void ConfigurationPage::SetLabelComboBox(const QStringList &list) { diff --git a/src/app/dialogs/app/configpages/configurationpage.h b/src/app/dialogs/app/configpages/configurationpage.h index 0bad4043c..3b83e2996 100644 --- a/src/app/dialogs/app/configpages/configurationpage.h +++ b/src/app/dialogs/app/configpages/configurationpage.h @@ -58,9 +58,11 @@ private: bool langChanged; bool unitChanged; bool labelLangChanged; + QCheckBox *sendReportCheck; QGroupBox *SaveGroup(); QGroupBox *LangGroup(); + QGroupBox *SendGroup(); void SetLabelComboBox(const QStringList &list); }; diff --git a/src/app/dialogs/app/dialoghistory.cpp b/src/app/dialogs/app/dialoghistory.cpp index d0950ed16..81ff33926 100644 --- a/src/app/dialogs/app/dialoghistory.cpp +++ b/src/app/dialogs/app/dialoghistory.cpp @@ -57,7 +57,6 @@ DialogHistory::DialogHistory(VContainer *data, VPattern *doc, QWidget *parent) connect(this, &DialogHistory::ShowHistoryTool, doc, &VPattern::ShowHistoryTool); connect(doc, &VPattern::ChangedCursor, this, &DialogHistory::ChangedCursor); connect(doc, &VPattern::patternChanged, this, &DialogHistory::UpdateHistory); - connect(doc, &VPattern::ChangedActivPP, this, &DialogHistory::UpdateHistory); ShowPoint(); } @@ -115,7 +114,7 @@ void DialogHistory::cellClicked(int row, int column) //--------------------------------------------------------------------------------------------------------------------- /** - * @brief ChangedCursor changed cursor of input. Cursor show after what record we will insert new object + * @brief ChangedCursor changed cursor of input. Cursor show after which record we will insert new object * @param id id of object */ void DialogHistory::ChangedCursor(quint32 id) @@ -151,18 +150,13 @@ void DialogHistory::UpdateHistory() void DialogHistory::FillTable() { ui->tableWidget->clear(); - const QVector *history = doc->getHistory(); - SCASSERT(history != nullptr); + QVector history = doc->getLocalHistory(); qint32 currentRow = -1; qint32 count = 0; - ui->tableWidget->setRowCount(history->size()); - for (qint32 i = 0; i< history->size(); ++i) + ui->tableWidget->setRowCount(history.size());//Make row count max possible number + for (qint32 i = 0; i< history.size(); ++i) { - const VToolRecord tool = history->at(i); - if (tool.getNameDraw() != doc->GetNameActivPP()) - { - continue; - } + const VToolRecord tool = history.at(i); const QString historyRecord = Record(tool); if (historyRecord.isEmpty() ==false) { @@ -182,8 +176,8 @@ void DialogHistory::FillTable() ++count; } } - ui->tableWidget->setRowCount(count); - if (history->size()>0) + ui->tableWidget->setRowCount(count);//Real row count + if (count>0) { cursorRow = currentRow; QTableWidgetItem *item = ui->tableWidget->item(cursorRow, 0); @@ -373,6 +367,20 @@ QString DialogHistory::Record(const VToolRecord &tool) } return record; } + case Tool::LineIntersectAxis: + { + return QString(tr("%1 - point of intersection line %2_%3 and axis through point %4")) + .arg(PointName(tool.getId())) + .arg(PointName(AttrUInt(domElem, VAbstractTool::AttrP1Line))) + .arg(PointName(AttrUInt(domElem, VAbstractTool::AttrP2Line))) + .arg(PointName(AttrUInt(domElem, VAbstractTool::AttrBasePoint))); + } + case Tool::CurveIntersectAxis: + { + return QString(tr("%1 - point of intersection curve and axis through point %2")) + .arg(PointName(tool.getId())) + .arg(PointName(AttrUInt(domElem, VAbstractTool::AttrBasePoint))); + } //Because "history" not only show history of pattern, but help restore current data for each pattern's //piece, we need add record about details and nodes, but don't show them. case Tool::Detail: @@ -418,7 +426,7 @@ void DialogHistory::InitialTable() */ void DialogHistory::ShowPoint() { - QVector *history = doc->getHistory(); + const QVector *history = doc->getHistory(); if (history->size()>0) { QTableWidgetItem *item = ui->tableWidget->item(0, 1); diff --git a/src/app/dialogs/app/dialogmeasurements.ui b/src/app/dialogs/app/dialogmeasurements.ui index 1ba3fd547..7a8bc92f9 100644 --- a/src/app/dialogs/app/dialogmeasurements.ui +++ b/src/app/dialogs/app/dialogmeasurements.ui @@ -9,19 +9,19 @@ 0 0 - 385 + 448 244 - 385 + 448 244 - 385 + 529 244 @@ -35,138 +35,124 @@ true - + - - - - 0 - 0 - - - - <html><head/><body><p><span style=" font-size:18pt;">Please, choose pattern type.</span></p></body></html> - - - Qt::AlignCenter - - - - - - - 13 - + - - - 5 + + + + 0 + 0 + - - 5 + + <html><head/><body><p><span style=" font-size:18pt;">Please, choose pattern type.</span></p></body></html> - - 5 + + Qt::AlignCenter - - 5 - - - - - - 166 - 123 - - - - - 166 - 123 - - - - Graduation - - - - :/icon/Graduation.png:/icon/Graduation.png - - - - 160 - 120 - - - - - - - - Use for creation pattern standard measurement table - - - true - - - - + - - - 6 - - - 5 - - - 5 - - - 5 - - - 5 - + - - - - 166 - 123 - - - - - 166 - 123 - - - - Individual - - - - :/icon/individual.png:/icon/individual.png - - - - 160 - 120 - - - + + + + + + 166 + 123 + + + + + 166 + 123 + + + + Graduation + + + + :/icon/Graduation.png:/icon/Graduation.png + + + + 160 + 120 + + + + + + + + + 0 + 0 + + + + Use for creation pattern standard measurement table + + + true + + + + - - - Use for creation pattern individual measurements - - - true - - + + + + + + 166 + 123 + + + + + 166 + 123 + + + + Individual + + + + :/icon/individual.png:/icon/individual.png + + + + 160 + 120 + + + + + + + + + 0 + 0 + + + + Use for creation pattern individual measurements + + + true + + + + @@ -175,7 +161,6 @@ - toolButtonIndividual toolButtonStandard diff --git a/src/app/dialogs/tools/dialogalongline.cpp b/src/app/dialogs/tools/dialogalongline.cpp index 3ccc55d5a..66a45239f 100644 --- a/src/app/dialogs/tools/dialogalongline.cpp +++ b/src/app/dialogs/tools/dialogalongline.cpp @@ -52,6 +52,7 @@ DialogAlongLine::DialogAlongLine(const VContainer *data, const quint32 &toolId, labelEditNamePoint = ui->labelEditNamePoint; this->formulaBaseHeight = ui->plainTextEditFormula->height(); + ui->plainTextEditFormula->installEventFilter(this); InitOkCancelApply(ui); flagFormula = false; @@ -138,10 +139,11 @@ void DialogAlongLine::ChosenObject(quint32 id, const SceneObject &type) { if (type == SceneObject::Point) { + const QString toolTip = tr("Select second point of line"); switch (number) { case 0: - if (SetObject(id, ui->comboBoxFirstPoint, tr("Select second point of line"))) + if (SetObject(id, ui->comboBoxFirstPoint, toolTip)) { number++; line->VisualMode(id); @@ -150,11 +152,18 @@ void DialogAlongLine::ChosenObject(quint32 id, const SceneObject &type) case 1: if (SetObject(id, ui->comboBoxSecondPoint, "")) { - line->setPoint2Id(id); - line->RefreshGeometry(); - prepare = true; - this->setModal(true); - this->show(); + if (flagError) + { + line->setPoint2Id(id); + line->RefreshGeometry(); + prepare = true; + this->setModal(true); + this->show(); + } + else + { + emit ToolTip(toolTip); + } } break; default: @@ -218,6 +227,7 @@ void DialogAlongLine::setFormula(const QString &value) } ui->plainTextEditFormula->setPlainText(formula); line->setLength(formula); + MoveCursorToEnd(ui->plainTextEditFormula); } //--------------------------------------------------------------------------------------------------------------------- diff --git a/src/app/dialogs/tools/dialogalongline.ui b/src/app/dialogs/tools/dialogalongline.ui index 0c8df48de..ccefaa068 100644 --- a/src/app/dialogs/tools/dialogalongline.ui +++ b/src/app/dialogs/tools/dialogalongline.ui @@ -315,7 +315,7 @@ - Standard table + Measurements @@ -443,13 +443,22 @@ + plainTextEditFormula + toolButtonPutHere toolButtonEqual + pushButtonGrowLength + lineEditNamePoint + comboBoxFirstPoint + comboBoxSecondPoint + comboBoxLineType radioButtonSizeGrowth radioButtonStandardTable radioButtonIncrements radioButtonLengthLine radioButtonLengthArc radioButtonLengthSpline + radioButtonAngleLine + checkBoxHideEmpty listWidget buttonBox diff --git a/src/app/dialogs/tools/dialogarc.cpp b/src/app/dialogs/tools/dialogarc.cpp index fded0782b..b0ba3332b 100644 --- a/src/app/dialogs/tools/dialogarc.cpp +++ b/src/app/dialogs/tools/dialogarc.cpp @@ -57,6 +57,10 @@ DialogArc::DialogArc(const VContainer *data, const quint32 &toolId, QWidget *par this->formulaBaseHeightF1 = ui->plainTextEditF1->height(); this->formulaBaseHeightF2 = ui->plainTextEditF2->height(); + ui->plainTextEditFormula->installEventFilter(this); + ui->plainTextEditF1->installEventFilter(this); + ui->plainTextEditF2->installEventFilter(this); + timerRadius = new QTimer(this); connect(timerRadius, &QTimer::timeout, this, &DialogArc::EvalRadius); @@ -143,6 +147,7 @@ void DialogArc::SetF2(const QString &value) } ui->plainTextEditF2->setPlainText(f2); path->setF2(f2); + MoveCursorToEnd(ui->plainTextEditF2); } //--------------------------------------------------------------------------------------------------------------------- @@ -160,6 +165,7 @@ void DialogArc::SetF1(const QString &value) } ui->plainTextEditF1->setPlainText(f1); path->setF1(f1); + MoveCursorToEnd(ui->plainTextEditF1); } //--------------------------------------------------------------------------------------------------------------------- @@ -177,6 +183,7 @@ void DialogArc::SetRadius(const QString &value) } ui->plainTextEditFormula->setPlainText(radius); path->setRadius(radius); + MoveCursorToEnd(ui->plainTextEditFormula); } //--------------------------------------------------------------------------------------------------------------------- diff --git a/src/app/dialogs/tools/dialogarc.ui b/src/app/dialogs/tools/dialogarc.ui index 834036032..4bf89a0cc 100644 --- a/src/app/dialogs/tools/dialogarc.ui +++ b/src/app/dialogs/tools/dialogarc.ui @@ -525,9 +525,6 @@ - - 9 - @@ -644,7 +641,7 @@ - Standard table + Measurements @@ -775,6 +772,16 @@ + plainTextEditFormula + toolButtonPutHereRadius + toolButtonEqualRadius + pushButtonGrowLength + plainTextEditF1 + toolButtonPutHereF1 + toolButtonEqualF1 + pushButtonGrowLengthF1 + toolButtonPutHereF2 + toolButtonEqualF2 comboBoxBasePoint radioButtonSizeGrowth radioButtonStandardTable @@ -783,13 +790,8 @@ radioButtonLengthArc radioButtonLengthSpline radioButtonAngleLine + checkBoxHideEmpty listWidget - toolButtonPutHereRadius - toolButtonPutHereF1 - toolButtonPutHereF2 - toolButtonEqualRadius - toolButtonEqualF1 - toolButtonEqualF2 buttonBox diff --git a/src/app/dialogs/tools/dialogbisector.cpp b/src/app/dialogs/tools/dialogbisector.cpp index 7b7ed07ad..b2a9a8535 100644 --- a/src/app/dialogs/tools/dialogbisector.cpp +++ b/src/app/dialogs/tools/dialogbisector.cpp @@ -52,6 +52,7 @@ DialogBisector::DialogBisector(const VContainer *data, const quint32 &toolId, QW ui->lineEditNamePoint->setText(qApp->getCurrentDocument()->GenerateLabel(LabelType::NewLabel)); labelEditNamePoint = ui->labelEditNamePoint; this->formulaBaseHeight = ui->plainTextEditFormula->height(); + ui->plainTextEditFormula->installEventFilter(this); InitOkCancelApply(ui); flagFormula = false; @@ -157,22 +158,35 @@ void DialogBisector::ChosenObject(quint32 id, const SceneObject &type) } break; case 1: - if (SetObject(id, ui->comboBoxSecondPoint, tr("Select third point of angle"))) + if (getCurrentObjectId(ui->comboBoxFirstPoint) != id) { - number++; - line->setPoint2Id(id); - line->RefreshGeometry(); + if (SetObject(id, ui->comboBoxSecondPoint, tr("Select third point of angle"))) + { + number++; + line->setPoint2Id(id); + line->RefreshGeometry(); + } } break; case 2: - if (SetObject(id, ui->comboBoxThirdPoint, "")) + { + QSet set; + set.insert(getCurrentObjectId(ui->comboBoxFirstPoint)); + set.insert(getCurrentObjectId(ui->comboBoxSecondPoint)); + set.insert(id); + + if (set.size() == 3) { - line->setPoint3Id(id); - line->RefreshGeometry(); - prepare = true; - this->setModal(true); - this->show(); + if (SetObject(id, ui->comboBoxThirdPoint, "")) + { + line->setPoint3Id(id); + line->RefreshGeometry(); + prepare = true; + this->setModal(true); + this->show(); + } } + } break; default: break; @@ -219,6 +233,7 @@ void DialogBisector::setFormula(const QString &value) } ui->plainTextEditFormula->setPlainText(formula); line->setLength(formula); + MoveCursorToEnd(ui->plainTextEditFormula); } //--------------------------------------------------------------------------------------------------------------------- diff --git a/src/app/dialogs/tools/dialogbisector.ui b/src/app/dialogs/tools/dialogbisector.ui index 425736c65..ec777b431 100644 --- a/src/app/dialogs/tools/dialogbisector.ui +++ b/src/app/dialogs/tools/dialogbisector.ui @@ -341,7 +341,7 @@ - Standard table + Measurements @@ -475,14 +475,24 @@ + plainTextEditFormula + toolButtonPutHere + toolButtonEqual + pushButtonGrowLength + lineEditNamePoint + comboBoxFirstPoint + comboBoxSecondPoint + comboBoxThirdPoint + comboBoxLineType radioButtonSizeGrowth radioButtonStandardTable radioButtonIncrements radioButtonLengthLine radioButtonLengthArc radioButtonLengthSpline + radioButtonAngleLine + checkBoxHideEmpty listWidget - toolButtonEqual buttonBox diff --git a/src/app/dialogs/tools/dialogcurveintersectaxis.cpp b/src/app/dialogs/tools/dialogcurveintersectaxis.cpp index f51e476ec..65f0c54d2 100644 --- a/src/app/dialogs/tools/dialogcurveintersectaxis.cpp +++ b/src/app/dialogs/tools/dialogcurveintersectaxis.cpp @@ -48,6 +48,7 @@ DialogCurveIntersectAxis::DialogCurveIntersectAxis(const VContainer *data, const ui->lineEditNamePoint->setText(qApp->getCurrentDocument()->GenerateLabel(LabelType::NewLabel)); labelEditNamePoint = ui->labelEditNamePoint; this->formulaBaseHeightAngle = ui->plainTextEditFormula->height(); + ui->plainTextEditFormula->installEventFilter(this); InitOkCancelApply(ui); flagFormula = false; @@ -120,6 +121,7 @@ void DialogCurveIntersectAxis::setAngle(const QString &value) } ui->plainTextEditFormula->setPlainText(formulaAngle); line->setAngle(formulaAngle); + MoveCursorToEnd(ui->plainTextEditFormula); } //--------------------------------------------------------------------------------------------------------------------- diff --git a/src/app/dialogs/tools/dialogcurveintersectaxis.ui b/src/app/dialogs/tools/dialogcurveintersectaxis.ui index d01402535..4fe305a4f 100644 --- a/src/app/dialogs/tools/dialogcurveintersectaxis.ui +++ b/src/app/dialogs/tools/dialogcurveintersectaxis.ui @@ -11,7 +11,7 @@ - Dialog + Curve intersect axis @@ -324,7 +324,7 @@ - Standard table + Measurements @@ -460,6 +460,26 @@ + + plainTextEditFormula + toolButtonPutHereAngle + toolButtonEqualAngle + pushButtonGrowLengthAngle + comboBoxAxisPoint + comboBoxCurve + lineEditNamePoint + comboBoxLineType + radioButtonSizeGrowth + radioButtonStandardTable + radioButtonIncrements + radioButtonLengthLine + radioButtonLengthArc + radioButtonLengthSpline + radioButtonAngleLine + checkBoxHideEmpty + listWidget + buttonBox + diff --git a/src/app/dialogs/tools/dialogcutarc.cpp b/src/app/dialogs/tools/dialogcutarc.cpp index 312354b2c..748ff0501 100644 --- a/src/app/dialogs/tools/dialogcutarc.cpp +++ b/src/app/dialogs/tools/dialogcutarc.cpp @@ -51,6 +51,7 @@ DialogCutArc::DialogCutArc(const VContainer *data, const quint32 &toolId, QWidge ui->lineEditNamePoint->setText(qApp->getCurrentDocument()->GenerateLabel(LabelType::NewLabel)); labelEditNamePoint = ui->labelEditNamePoint; this->formulaBaseHeight = ui->plainTextEditFormula->height(); + ui->plainTextEditFormula->installEventFilter(this); InitOkCancelApply(ui); flagFormula = false; @@ -162,6 +163,7 @@ void DialogCutArc::setFormula(const QString &value) } ui->plainTextEditFormula->setPlainText(formula); path->setLength(formula); + MoveCursorToEnd(ui->plainTextEditFormula); } //--------------------------------------------------------------------------------------------------------------------- diff --git a/src/app/dialogs/tools/dialogcutarc.ui b/src/app/dialogs/tools/dialogcutarc.ui index 5a5222544..8313e5784 100644 --- a/src/app/dialogs/tools/dialogcutarc.ui +++ b/src/app/dialogs/tools/dialogcutarc.ui @@ -284,7 +284,7 @@ - Standard table + Measurements @@ -414,6 +414,24 @@ + + plainTextEditFormula + toolButtonPutHere + toolButtonEqual + pushButtonGrowLength + comboBoxArc + lineEditNamePoint + radioButtonSizeGrowth + radioButtonStandardTable + radioButtonIncrements + radioButtonLengthLine + radioButtonLengthArc + radioButtonLengthSpline + radioButtonAngleLine + checkBoxHideEmpty + listWidget + buttonBox + diff --git a/src/app/dialogs/tools/dialogcutspline.cpp b/src/app/dialogs/tools/dialogcutspline.cpp index c99c3338c..ebfb4e5a9 100644 --- a/src/app/dialogs/tools/dialogcutspline.cpp +++ b/src/app/dialogs/tools/dialogcutspline.cpp @@ -50,6 +50,7 @@ DialogCutSpline::DialogCutSpline(const VContainer *data, const quint32 &toolId, ui->lineEditNamePoint->setText(qApp->getCurrentDocument()->GenerateLabel(LabelType::NewLabel)); labelEditNamePoint = ui->labelEditNamePoint; this->formulaBaseHeight = ui->plainTextEditFormula->height(); + ui->plainTextEditFormula->installEventFilter(this); InitOkCancelApply(ui); flagFormula = false; @@ -101,6 +102,7 @@ void DialogCutSpline::setFormula(const QString &value) } ui->plainTextEditFormula->setPlainText(formula); path->setLength(formula); + MoveCursorToEnd(ui->plainTextEditFormula); } //--------------------------------------------------------------------------------------------------------------------- diff --git a/src/app/dialogs/tools/dialogcutspline.ui b/src/app/dialogs/tools/dialogcutspline.ui index 0609044e8..3107db846 100644 --- a/src/app/dialogs/tools/dialogcutspline.ui +++ b/src/app/dialogs/tools/dialogcutspline.ui @@ -284,7 +284,7 @@ - Standard table + Measurements @@ -414,6 +414,24 @@ + + plainTextEditFormula + toolButtonPutHere + toolButtonEqual + pushButtonGrowLength + comboBoxSpline + lineEditNamePoint + radioButtonSizeGrowth + radioButtonStandardTable + radioButtonIncrements + radioButtonLengthLine + radioButtonLengthArc + radioButtonLengthSpline + radioButtonAngleLine + checkBoxHideEmpty + listWidget + buttonBox + diff --git a/src/app/dialogs/tools/dialogcutsplinepath.cpp b/src/app/dialogs/tools/dialogcutsplinepath.cpp index 6c01dd21d..a5abc37e1 100644 --- a/src/app/dialogs/tools/dialogcutsplinepath.cpp +++ b/src/app/dialogs/tools/dialogcutsplinepath.cpp @@ -50,6 +50,7 @@ DialogCutSplinePath::DialogCutSplinePath(const VContainer *data, const quint32 & ui->lineEditNamePoint->setText(qApp->getCurrentDocument()->GenerateLabel(LabelType::NewLabel)); labelEditNamePoint = ui->labelEditNamePoint; this->formulaBaseHeight = ui->plainTextEditFormula->height(); + ui->plainTextEditFormula->installEventFilter(this); InitOkCancelApply(ui); flagFormula = false; @@ -101,6 +102,7 @@ void DialogCutSplinePath::setFormula(const QString &value) } ui->plainTextEditFormula->setPlainText(formula); path->setLength(formula); + MoveCursorToEnd(ui->plainTextEditFormula); } //--------------------------------------------------------------------------------------------------------------------- diff --git a/src/app/dialogs/tools/dialogcutsplinepath.ui b/src/app/dialogs/tools/dialogcutsplinepath.ui index 087a13934..f5d497074 100644 --- a/src/app/dialogs/tools/dialogcutsplinepath.ui +++ b/src/app/dialogs/tools/dialogcutsplinepath.ui @@ -284,7 +284,7 @@ - Standard table + Measurements @@ -414,6 +414,24 @@ + + plainTextEditFormula + toolButtonPutHere + toolButtonEqual + pushButtonGrowLength + comboBoxSplinePath + lineEditNamePoint + radioButtonSizeGrowth + radioButtonStandardTable + radioButtonIncrements + radioButtonLengthLine + radioButtonLengthArc + radioButtonLengthSpline + radioButtonAngleLine + checkBoxHideEmpty + listWidget + buttonBox + diff --git a/src/app/dialogs/tools/dialogdetail.ui b/src/app/dialogs/tools/dialogdetail.ui index 959c21672..4dcd40f8b 100644 --- a/src/app/dialogs/tools/dialogdetail.ui +++ b/src/app/dialogs/tools/dialogdetail.ui @@ -60,12 +60,18 @@ 0 + + -900.990000000000009 + 900.990000000000009 0.100000000000000 + + 0.000000000000000 + @@ -100,6 +106,9 @@ 0 + + -900.990000000000009 + 900.990000000000009 @@ -295,8 +304,14 @@ - lineEditNameDetail listWidget + doubleSpinBoxBiasX + doubleSpinBoxBiasY + lineEditNameDetail + checkBoxSeams + doubleSpinBoxSeams + checkBoxClosed + toolButtonDelete buttonBox diff --git a/src/app/dialogs/tools/dialogeditwrongformula.cpp b/src/app/dialogs/tools/dialogeditwrongformula.cpp index 85ec8beee..fa7170e39 100644 --- a/src/app/dialogs/tools/dialogeditwrongformula.cpp +++ b/src/app/dialogs/tools/dialogeditwrongformula.cpp @@ -38,6 +38,7 @@ DialogEditWrongFormula::DialogEditWrongFormula(const VContainer *data, const qui InitVariables(ui); InitFormulaUI(ui); this->formulaBaseHeight = ui->plainTextEditFormula->height(); + ui->plainTextEditFormula->installEventFilter(this); InitOkCancel(ui); flagFormula = false; @@ -123,6 +124,7 @@ void DialogEditWrongFormula::setFormula(const QString &value) this->DeployFormulaTextEdit(); } ui->plainTextEditFormula->setPlainText(formula); + MoveCursorToEnd(ui->plainTextEditFormula); } //--------------------------------------------------------------------------------------------------------------------- diff --git a/src/app/dialogs/tools/dialogeditwrongformula.ui b/src/app/dialogs/tools/dialogeditwrongformula.ui index 214b4fb2c..47d43dd6a 100644 --- a/src/app/dialogs/tools/dialogeditwrongformula.ui +++ b/src/app/dialogs/tools/dialogeditwrongformula.ui @@ -259,7 +259,7 @@ - Standard table + Measurements @@ -389,6 +389,22 @@ + + plainTextEditFormula + toolButtonPutHere + toolButtonEqual + pushButtonGrowLength + radioButtonSizeGrowth + radioButtonStandardTable + radioButtonIncrements + radioButtonLengthLine + radioButtonLengthArc + radioButtonLengthSpline + radioButtonAngleLine + checkBoxHideEmpty + listWidget + buttonBox + diff --git a/src/app/dialogs/tools/dialogendline.cpp b/src/app/dialogs/tools/dialogendline.cpp index 5e901182e..76ef75132 100644 --- a/src/app/dialogs/tools/dialogendline.cpp +++ b/src/app/dialogs/tools/dialogendline.cpp @@ -55,6 +55,9 @@ DialogEndLine::DialogEndLine(const VContainer *data, const quint32 &toolId, QWid this->formulaBaseHeight = ui->plainTextEditFormula->height(); this->formulaBaseHeightAngle = ui->plainTextEditAngle->height(); + ui->plainTextEditFormula->installEventFilter(this); + ui->plainTextEditAngle->installEventFilter(this); + InitOkCancelApply(ui); flagFormula = false; CheckState(); @@ -189,6 +192,7 @@ void DialogEndLine::setFormula(const QString &value) } ui->plainTextEditFormula->setPlainText(formulaLength); line->setLength(formulaLength); + MoveCursorToEnd(ui->plainTextEditFormula); } //--------------------------------------------------------------------------------------------------------------------- @@ -207,6 +211,7 @@ void DialogEndLine::setAngle(const QString &value) } ui->plainTextEditAngle->setPlainText(formulaAngle); line->setAngle(formulaAngle); + MoveCursorToEnd(ui->plainTextEditAngle); } //--------------------------------------------------------------------------------------------------------------------- diff --git a/src/app/dialogs/tools/dialogendline.ui b/src/app/dialogs/tools/dialogendline.ui index c05c5d77a..a34de47cc 100644 --- a/src/app/dialogs/tools/dialogendline.ui +++ b/src/app/dialogs/tools/dialogendline.ui @@ -495,7 +495,7 @@ - Standard table + Measurements @@ -632,14 +632,26 @@ + plainTextEditFormula + toolButtonPutHereLength + toolButtonEqualLength + pushButtonGrowLength + plainTextEditAngle + toolButtonPutHereAngle + toolButtonEqualAngle + pushButtonGrowLengthAngle + comboBoxBasePoint + lineEditNamePoint + comboBoxLineType radioButtonSizeGrowth radioButtonStandardTable radioButtonIncrements radioButtonLengthLine radioButtonLengthArc radioButtonLengthSpline + radioButtonAngleLine + checkBoxHideEmpty listWidget - toolButtonEqualLength buttonBox diff --git a/src/app/dialogs/tools/dialogheight.cpp b/src/app/dialogs/tools/dialogheight.cpp index 01c17f079..510096af3 100644 --- a/src/app/dialogs/tools/dialogheight.cpp +++ b/src/app/dialogs/tools/dialogheight.cpp @@ -151,22 +151,35 @@ void DialogHeight::ChosenObject(quint32 id, const SceneObject &type) } break; case (1): - if (SetObject(id, ui->comboBoxP1Line, tr("Select second point of line"))) + if (getCurrentObjectId(ui->comboBoxBasePoint) != id) { - number++; - line->setLineP1Id(id); - line->RefreshGeometry(); + if (SetObject(id, ui->comboBoxP1Line, tr("Select second point of line"))) + { + number++; + line->setLineP1Id(id); + line->RefreshGeometry(); + } } break; case (2): - if (SetObject(id, ui->comboBoxP2Line, "")) + { + QSet set; + set.insert(getCurrentObjectId(ui->comboBoxBasePoint)); + set.insert(getCurrentObjectId(ui->comboBoxP1Line)); + set.insert(id); + + if (set.size() == 3) { - line->setLineP2Id(id); - line->RefreshGeometry(); - prepare = true; - this->setModal(true); - this->show(); + if (SetObject(id, ui->comboBoxP2Line, "")) + { + line->setLineP2Id(id); + line->RefreshGeometry(); + prepare = true; + this->setModal(true); + this->show(); + } } + } break; default: break; diff --git a/src/app/dialogs/tools/dialogheight.ui b/src/app/dialogs/tools/dialogheight.ui index 1cd139e37..be8edb8cf 100644 --- a/src/app/dialogs/tools/dialogheight.ui +++ b/src/app/dialogs/tools/dialogheight.ui @@ -130,6 +130,14 @@ + + lineEditNamePoint + comboBoxBasePoint + comboBoxP1Line + comboBoxP2Line + comboBoxLineType + buttonBox + diff --git a/src/app/dialogs/tools/dialogline.ui b/src/app/dialogs/tools/dialogline.ui index ad072a5c4..b02ea2911 100644 --- a/src/app/dialogs/tools/dialogline.ui +++ b/src/app/dialogs/tools/dialogline.ui @@ -145,6 +145,12 @@ + + comboBoxFirstPoint + comboBoxSecondPoint + comboBoxLineType + buttonBox + diff --git a/src/app/dialogs/tools/dialoglineintersect.cpp b/src/app/dialogs/tools/dialoglineintersect.cpp index 4de620302..030d66b38 100644 --- a/src/app/dialogs/tools/dialoglineintersect.cpp +++ b/src/app/dialogs/tools/dialoglineintersect.cpp @@ -99,12 +99,15 @@ void DialogLineIntersect::ChosenObject(quint32 id, const SceneObject &type) } break; case 1: - if (SetObject(id, ui->comboBoxP2Line1, tr("Select first point of second line"))) + if (getCurrentObjectId(ui->comboBoxP1Line1) != id) { - number++; - p2Line1 = id; - line->setLine1P2Id(id); - line->RefreshGeometry(); + if (SetObject(id, ui->comboBoxP2Line1, tr("Select first point of second line"))) + { + number++; + p2Line1 = id; + line->setLine1P2Id(id); + line->RefreshGeometry(); + } } break; case 2: @@ -117,29 +120,40 @@ void DialogLineIntersect::ChosenObject(quint32 id, const SceneObject &type) } break; case 3: - if (SetObject(id, ui->comboBoxP2Line2, "")) + { + QSet set; + set.insert(getCurrentObjectId(ui->comboBoxP1Line1)); + set.insert(getCurrentObjectId(ui->comboBoxP2Line1)); + set.insert(getCurrentObjectId(ui->comboBoxP1Line2)); + set.insert(id); + + if (set.size() >= 3) { - p2Line2 = id; - line->setLine2P2Id(id); - line->RefreshGeometry(); - prepare = true; - flagPoint = CheckIntersecion(); - CheckState(); - this->setModal(true); - this->show(); - connect(ui->comboBoxP1Line1, - static_cast(&QComboBox::currentIndexChanged), this, - &DialogLineIntersect::P1Line1Changed); - connect(ui->comboBoxP2Line1, - static_cast(&QComboBox::currentIndexChanged), this, - &DialogLineIntersect::P2Line1Changed); - connect(ui->comboBoxP1Line2, - static_cast(&QComboBox::currentIndexChanged), this, - &DialogLineIntersect::P1Line2Changed); - connect(ui->comboBoxP2Line2, - static_cast(&QComboBox::currentIndexChanged), this, - &DialogLineIntersect::P2Line2Changed); + if (SetObject(id, ui->comboBoxP2Line2, "")) + { + p2Line2 = id; + line->setLine2P2Id(id); + line->RefreshGeometry(); + prepare = true; + flagPoint = CheckIntersecion(); + CheckState(); + this->setModal(true); + this->show(); + connect(ui->comboBoxP1Line1, + static_cast(&QComboBox::currentIndexChanged), this, + &DialogLineIntersect::P1Line1Changed); + connect(ui->comboBoxP2Line1, + static_cast(&QComboBox::currentIndexChanged), this, + &DialogLineIntersect::P2Line1Changed); + connect(ui->comboBoxP1Line2, + static_cast(&QComboBox::currentIndexChanged), this, + &DialogLineIntersect::P1Line2Changed); + connect(ui->comboBoxP2Line2, + static_cast(&QComboBox::currentIndexChanged), this, + &DialogLineIntersect::P2Line2Changed); + } } + } break; default: break; diff --git a/src/app/dialogs/tools/dialoglineintersectaxis.cpp b/src/app/dialogs/tools/dialoglineintersectaxis.cpp index 3936e7228..30ac4d701 100644 --- a/src/app/dialogs/tools/dialoglineintersectaxis.cpp +++ b/src/app/dialogs/tools/dialoglineintersectaxis.cpp @@ -48,6 +48,7 @@ DialogLineIntersectAxis::DialogLineIntersectAxis(const VContainer *data, const q ui->lineEditNamePoint->setText(qApp->getCurrentDocument()->GenerateLabel(LabelType::NewLabel)); labelEditNamePoint = ui->labelEditNamePoint; this->formulaBaseHeightAngle = ui->plainTextEditFormula->height(); + ui->plainTextEditFormula->installEventFilter(this); InitOkCancelApply(ui); flagFormula = false; @@ -65,6 +66,14 @@ DialogLineIntersectAxis::DialogLineIntersectAxis(const VContainer *data, const q connect(ui->plainTextEditFormula, &QPlainTextEdit::textChanged, this, &DialogLineIntersectAxis::AngleTextChanged); connect(ui->pushButtonGrowLengthAngle, &QPushButton::clicked, this, &DialogLineIntersectAxis::DeployAngleTextEdit); connect(timerFormula, &QTimer::timeout, this, &DialogLineIntersectAxis::EvalAngle); + connect(ui->comboBoxFirstLinePoint, + static_cast(&QComboBox::currentIndexChanged), + this, &DialogLineIntersectAxis::PointNameChanged); + connect(ui->comboBoxSecondLinePoint, + static_cast(&QComboBox::currentIndexChanged), + this, &DialogLineIntersectAxis::PointNameChanged); + connect(ui->comboBoxAxisPoint, static_cast(&QComboBox::currentIndexChanged), + this, &DialogLineIntersectAxis::PointNameChanged); line = new VisToolLineIntersectAxis(data); } @@ -121,6 +130,7 @@ void DialogLineIntersectAxis::setAngle(const QString &value) } ui->plainTextEditFormula->setPlainText(formulaAngle); line->setAngle(formulaAngle); + MoveCursorToEnd(ui->plainTextEditFormula); } //--------------------------------------------------------------------------------------------------------------------- @@ -208,21 +218,34 @@ void DialogLineIntersectAxis::ChosenObject(quint32 id, const SceneObject &type) } break; case (1): - if (SetObject(id, ui->comboBoxSecondLinePoint, tr("Select axis point"))) + if (getCurrentObjectId(ui->comboBoxFirstLinePoint) != id) { - number++; - line->setPoint2Id(id); - line->RefreshGeometry(); + if (SetObject(id, ui->comboBoxSecondLinePoint, tr("Select axis point"))) + { + number++; + line->setPoint2Id(id); + line->RefreshGeometry(); + } } break; case (2): - if (SetObject(id, ui->comboBoxAxisPoint, "")) + { + QSet set; + set.insert(getCurrentObjectId(ui->comboBoxFirstLinePoint)); + set.insert(getCurrentObjectId(ui->comboBoxSecondLinePoint)); + set.insert(id); + + if (set.size() == 3) { - basePointId = id; - line->setAxisPointId(id); - line->RefreshGeometry(); - prepare = true; + if (SetObject(id, ui->comboBoxAxisPoint, "")) + { + basePointId = id; + line->setAxisPointId(id); + line->RefreshGeometry(); + prepare = true; + } } + } break; default: break; @@ -255,6 +278,31 @@ void DialogLineIntersectAxis::DeployAngleTextEdit() DeployFormula(ui->plainTextEditFormula, ui->pushButtonGrowLengthAngle, formulaBaseHeightAngle); } +//--------------------------------------------------------------------------------------------------------------------- +void DialogLineIntersectAxis::PointNameChanged() +{ + QSet set; + set.insert(getCurrentObjectId(ui->comboBoxFirstLinePoint)); + set.insert(getCurrentObjectId(ui->comboBoxSecondLinePoint)); + set.insert(getCurrentObjectId(ui->comboBoxAxisPoint)); + + QColor color = okColor; + if (set.size() != 3) + { + flagError = false; + color = errorColor; + } + else + { + flagError = true; + color = okColor; + } + ChangeColor(ui->labelFirstLinePoint, color); + ChangeColor(ui->labelSecondLinePoint, color); + ChangeColor(ui->labelAxisPoint, color); + CheckState(); +} + //--------------------------------------------------------------------------------------------------------------------- void DialogLineIntersectAxis::ShowVisualization() { diff --git a/src/app/dialogs/tools/dialoglineintersectaxis.h b/src/app/dialogs/tools/dialoglineintersectaxis.h index f4bbbd5e8..cc287c199 100644 --- a/src/app/dialogs/tools/dialoglineintersectaxis.h +++ b/src/app/dialogs/tools/dialoglineintersectaxis.h @@ -70,6 +70,7 @@ public slots: void EvalAngle(); void AngleTextChanged(); void DeployAngleTextEdit(); + virtual void PointNameChanged(); protected: virtual void ShowVisualization(); /** diff --git a/src/app/dialogs/tools/dialoglineintersectaxis.ui b/src/app/dialogs/tools/dialoglineintersectaxis.ui index 49ed688cf..31909167f 100644 --- a/src/app/dialogs/tools/dialoglineintersectaxis.ui +++ b/src/app/dialogs/tools/dialoglineintersectaxis.ui @@ -11,7 +11,7 @@ - Dialog + Line intersect axis @@ -211,7 +211,7 @@ - + 0 @@ -231,7 +231,7 @@ - + 0 @@ -251,7 +251,7 @@ - + 0 @@ -341,7 +341,7 @@ - Standard table + Measurements @@ -479,9 +479,9 @@ plainTextEditFormula - pushButtonGrowLengthAngle toolButtonPutHereAngle toolButtonEqualAngle + pushButtonGrowLengthAngle comboBoxAxisPoint comboBoxFirstLinePoint comboBoxSecondLinePoint diff --git a/src/app/dialogs/tools/dialognormal.cpp b/src/app/dialogs/tools/dialognormal.cpp index 01dd8bdde..f6b508aad 100644 --- a/src/app/dialogs/tools/dialognormal.cpp +++ b/src/app/dialogs/tools/dialognormal.cpp @@ -48,6 +48,7 @@ DialogNormal::DialogNormal(const VContainer *data, const quint32 &toolId, QWidge ui->lineEditNamePoint->setText(qApp->getCurrentDocument()->GenerateLabel(LabelType::NewLabel)); labelEditNamePoint = ui->labelEditNamePoint; this->formulaBaseHeight = ui->plainTextEditFormula->height(); + ui->plainTextEditFormula->installEventFilter(this); InitOkCancelApply(ui); flagFormula = false; @@ -145,13 +146,16 @@ void DialogNormal::ChosenObject(quint32 id, const SceneObject &type) } break; case 1: - if (SetObject(id, ui->comboBoxSecondPoint, "")) + if (getCurrentObjectId(ui->comboBoxFirstPoint) != id) { - line->setPoint2Id(id); - line->RefreshGeometry(); - prepare = true; - this->setModal(true); - this->show(); + if (SetObject(id, ui->comboBoxSecondPoint, "")) + { + line->setPoint2Id(id); + line->RefreshGeometry(); + prepare = true; + this->setModal(true); + this->show(); + } } break; default: @@ -229,6 +233,7 @@ void DialogNormal::setFormula(const QString &value) } ui->plainTextEditFormula->setPlainText(formula); line->setLength(formula); + MoveCursorToEnd(ui->plainTextEditFormula); } //--------------------------------------------------------------------------------------------------------------------- diff --git a/src/app/dialogs/tools/dialognormal.ui b/src/app/dialogs/tools/dialognormal.ui index 4352b93e8..492531abe 100644 --- a/src/app/dialogs/tools/dialognormal.ui +++ b/src/app/dialogs/tools/dialognormal.ui @@ -524,7 +524,7 @@ - Standard table + Measurements @@ -655,15 +655,22 @@ + plainTextEditFormula + toolButtonPutHere + toolButtonEqual + pushButtonGrowLength + lineEditNamePoint + comboBoxFirstPoint + comboBoxSecondPoint doubleSpinBoxAngle - toolButtonArrowRight - toolButtonArrowRightUp toolButtonArrowUp - toolButtonArrowLeftUp - toolButtonArrowLeft - toolButtonArrowLeftDown - toolButtonArrowDown + toolButtonArrowRightUp + toolButtonArrowRight toolButtonArrowRightDown + toolButtonArrowDown + toolButtonArrowLeftDown + toolButtonArrowLeft + toolButtonArrowLeftUp comboBoxLineType radioButtonSizeGrowth radioButtonStandardTable @@ -671,8 +678,9 @@ radioButtonLengthLine radioButtonLengthArc radioButtonLengthSpline + radioButtonAngleLine + checkBoxHideEmpty listWidget - toolButtonEqual buttonBox diff --git a/src/app/dialogs/tools/dialogpointofcontact.cpp b/src/app/dialogs/tools/dialogpointofcontact.cpp index a4f6331c8..4af6aa7cc 100644 --- a/src/app/dialogs/tools/dialogpointofcontact.cpp +++ b/src/app/dialogs/tools/dialogpointofcontact.cpp @@ -50,6 +50,7 @@ DialogPointOfContact::DialogPointOfContact(const VContainer *data, const quint32 ui->lineEditNamePoint->setText(qApp->getCurrentDocument()->GenerateLabel(LabelType::NewLabel)); labelEditNamePoint = ui->labelEditNamePoint; this->formulaBaseHeight = ui->plainTextEditFormula->height(); + ui->plainTextEditFormula->installEventFilter(this); InitOkCancelApply(ui); flagFormula = false; @@ -170,22 +171,35 @@ void DialogPointOfContact::ChosenObject(quint32 id, const SceneObject &type) } break; case 1: - if (SetObject(id, ui->comboBoxSecondPoint, tr("Select point of center of arc"))) + if (getCurrentObjectId(ui->comboBoxFirstPoint) != id) { - number++; - line->setLineP2Id(id); - line->RefreshGeometry(); + if (SetObject(id, ui->comboBoxSecondPoint, tr("Select point of center of arc"))) + { + number++; + line->setLineP2Id(id); + line->RefreshGeometry(); + } } break; case 2: - if (SetObject(id, ui->comboBoxCenter, "")) + { + QSet set; + set.insert(getCurrentObjectId(ui->comboBoxFirstPoint)); + set.insert(getCurrentObjectId(ui->comboBoxSecondPoint)); + set.insert(id); + + if (set.size() == 3) { - line->setRadiusId(id); - line->RefreshGeometry(); - prepare = true; - this->setModal(true); - this->show(); + if (SetObject(id, ui->comboBoxCenter, "")) + { + line->setRadiusId(id); + line->RefreshGeometry(); + prepare = true; + this->setModal(true); + this->show(); + } } + } break; default: break; @@ -259,6 +273,7 @@ void DialogPointOfContact::setRadius(const QString &value) } ui->plainTextEditFormula->setPlainText(radius); line->setRadius(radius); + MoveCursorToEnd(ui->plainTextEditFormula); } //--------------------------------------------------------------------------------------------------------------------- diff --git a/src/app/dialogs/tools/dialogpointofcontact.ui b/src/app/dialogs/tools/dialogpointofcontact.ui index 393a9d735..e74fd80ca 100644 --- a/src/app/dialogs/tools/dialogpointofcontact.ui +++ b/src/app/dialogs/tools/dialogpointofcontact.ui @@ -357,7 +357,7 @@ - Standard table + Measurements @@ -488,14 +488,23 @@ + plainTextEditFormula + toolButtonPutHere + toolButtonEqual + pushButtonGrowLength + lineEditNamePoint + comboBoxCenter + comboBoxFirstPoint + comboBoxSecondPoint radioButtonSizeGrowth radioButtonStandardTable radioButtonIncrements radioButtonLengthLine radioButtonLengthArc radioButtonLengthSpline + radioButtonAngleLine + checkBoxHideEmpty listWidget - toolButtonEqual buttonBox diff --git a/src/app/dialogs/tools/dialogpointofintersection.cpp b/src/app/dialogs/tools/dialogpointofintersection.cpp index 0788a791c..37661b4e3 100644 --- a/src/app/dialogs/tools/dialogpointofintersection.cpp +++ b/src/app/dialogs/tools/dialogpointofintersection.cpp @@ -104,13 +104,16 @@ void DialogPointOfIntersection::ChosenObject(quint32 id, const SceneObject &type } break; case 1: - if (SetObject(id, ui->comboBoxSecondPoint, "")) + if (getCurrentObjectId(ui->comboBoxFirstPoint) != id) { - line->setPoint2Id(id); - line->RefreshGeometry(); - prepare = true; - this->setModal(true); - this->show(); + if (SetObject(id, ui->comboBoxSecondPoint, "")) + { + line->setPoint2Id(id); + line->RefreshGeometry(); + prepare = true; + this->setModal(true); + this->show(); + } } break; default: diff --git a/src/app/dialogs/tools/dialogpointofintersection.ui b/src/app/dialogs/tools/dialogpointofintersection.ui index c50bacf1f..d79a9035a 100644 --- a/src/app/dialogs/tools/dialogpointofintersection.ui +++ b/src/app/dialogs/tools/dialogpointofintersection.ui @@ -103,6 +103,12 @@ + + lineEditNamePoint + comboBoxFirstPoint + comboBoxSecondPoint + buttonBox + diff --git a/src/app/dialogs/tools/dialogshoulderpoint.cpp b/src/app/dialogs/tools/dialogshoulderpoint.cpp index 731d05a03..55c062a67 100644 --- a/src/app/dialogs/tools/dialogshoulderpoint.cpp +++ b/src/app/dialogs/tools/dialogshoulderpoint.cpp @@ -52,6 +52,7 @@ DialogShoulderPoint::DialogShoulderPoint(const VContainer *data, const quint32 & ui->lineEditNamePoint->setText(qApp->getCurrentDocument()->GenerateLabel(LabelType::NewLabel)); labelEditNamePoint = ui->labelEditNamePoint; this->formulaBaseHeight = ui->plainTextEditFormula->height(); + ui->plainTextEditFormula->installEventFilter(this); InitOkCancelApply(ui); flagFormula = false; @@ -156,22 +157,35 @@ void DialogShoulderPoint::ChosenObject(quint32 id, const SceneObject &type) } break; case 1: - if (SetObject(id, ui->comboBoxP1Line, tr("Select second point of line"))) + if (getCurrentObjectId(ui->comboBoxP3) != id) { - number++; - line->setLineP1Id(id); - line->RefreshGeometry(); + if (SetObject(id, ui->comboBoxP1Line, tr("Select second point of line"))) + { + number++; + line->setLineP1Id(id); + line->RefreshGeometry(); + } } break; case 2: - if (SetObject(id, ui->comboBoxP2Line, "")) + { + QSet set; + set.insert(getCurrentObjectId(ui->comboBoxP3)); + set.insert(getCurrentObjectId(ui->comboBoxP1Line)); + set.insert(id); + + if (set.size() == 3) { - line->setLineP2Id(id); - line->RefreshGeometry(); - prepare = true; - this->setModal(true); - this->show(); + if (SetObject(id, ui->comboBoxP2Line, "")) + { + line->setLineP2Id(id); + line->RefreshGeometry(); + prepare = true; + this->setModal(true); + this->show(); + } } + } break; default: break; @@ -247,6 +261,7 @@ void DialogShoulderPoint::setFormula(const QString &value) } ui->plainTextEditFormula->setPlainText(formula); line->setLength(formula); + MoveCursorToEnd(ui->plainTextEditFormula); } //--------------------------------------------------------------------------------------------------------------------- diff --git a/src/app/dialogs/tools/dialogshoulderpoint.ui b/src/app/dialogs/tools/dialogshoulderpoint.ui index 3596daf18..996d5cbee 100644 --- a/src/app/dialogs/tools/dialogshoulderpoint.ui +++ b/src/app/dialogs/tools/dialogshoulderpoint.ui @@ -380,7 +380,7 @@ - Standard table + Measurements @@ -511,14 +511,24 @@ + plainTextEditFormula + toolButtonPutHere + toolButtonEqual + pushButtonGrowLength + lineEditNamePoint + comboBoxP1Line + comboBoxP2Line + comboBoxP3 + comboBoxLineType radioButtonSizeGrowth radioButtonStandardTable radioButtonIncrements radioButtonLengthLine radioButtonLengthArc radioButtonLengthSpline + radioButtonAngleLine + checkBoxHideEmpty listWidget - toolButtonEqual buttonBox diff --git a/src/app/dialogs/tools/dialogspline.cpp b/src/app/dialogs/tools/dialogspline.cpp index cd9f9ab29..5f8ea4f10 100644 --- a/src/app/dialogs/tools/dialogspline.cpp +++ b/src/app/dialogs/tools/dialogspline.cpp @@ -97,29 +97,32 @@ void DialogSpline::ChosenObject(quint32 id, const SceneObject &type) break; case 1: { - const QSharedPointer point = data->GeometricObject(id); - qint32 index = ui->comboBoxP4->findText(point->name()); - if ( index != -1 ) - { // -1 for not found - ui->comboBoxP4->setCurrentIndex(index); - emit ToolTip(""); - index = ui->comboBoxP1->currentIndex(); - quint32 p1Id = qvariant_cast(ui->comboBoxP1->itemData(index)); - - QPointF p1 = data->GeometricObject(p1Id)->toQPointF(); - QPointF p4 = data->GeometricObject(id)->toQPointF(); - - ui->spinBoxAngle1->setValue(static_cast(QLineF(p1, p4).angle())); - ui->spinBoxAngle2->setValue(static_cast(QLineF(p4, p1).angle())); - - path->setPoint4Id(id); - path->RefreshGeometry(); - prepare = true; - DialogAccepted(); - } - else + if (getCurrentObjectId(ui->comboBoxP1) != id) { - qWarning()<<"Can't find object by name"<name(); + const QSharedPointer point = data->GeometricObject(id); + qint32 index = ui->comboBoxP4->findText(point->name()); + if ( index != -1 ) + { // -1 for not found + ui->comboBoxP4->setCurrentIndex(index); + emit ToolTip(""); + index = ui->comboBoxP1->currentIndex(); + quint32 p1Id = qvariant_cast(ui->comboBoxP1->itemData(index)); + + QPointF p1 = data->GeometricObject(p1Id)->toQPointF(); + QPointF p4 = data->GeometricObject(id)->toQPointF(); + + ui->spinBoxAngle1->setValue(static_cast(QLineF(p1, p4).angle())); + ui->spinBoxAngle2->setValue(static_cast(QLineF(p4, p1).angle())); + + path->setPoint4Id(id); + path->RefreshGeometry(); + prepare = true; + DialogAccepted(); + } + else + { + qWarning()<<"Can't find object by name"<name(); + } } break; } diff --git a/src/app/dialogs/tools/dialogspline.ui b/src/app/dialogs/tools/dialogspline.ui index f8bda5f49..580268256 100644 --- a/src/app/dialogs/tools/dialogspline.ui +++ b/src/app/dialogs/tools/dialogspline.ui @@ -210,10 +210,10 @@ comboBoxP1 - comboBoxP4 doubleSpinBoxKasm1 - doubleSpinBoxKasm2 spinBoxAngle1 + comboBoxP4 + doubleSpinBoxKasm2 spinBoxAngle2 doubleSpinBoxKcurve buttonBox diff --git a/src/app/dialogs/tools/dialogsplinepath.ui b/src/app/dialogs/tools/dialogsplinepath.ui index e620b6de0..44c1b3459 100644 --- a/src/app/dialogs/tools/dialogsplinepath.ui +++ b/src/app/dialogs/tools/dialogsplinepath.ui @@ -11,7 +11,7 @@ - Curve path + Curved path @@ -203,8 +203,8 @@ doubleSpinBoxAngle1 doubleSpinBoxKasm2 doubleSpinBoxAngle2 - doubleSpinBoxKcurve listWidget + doubleSpinBoxKcurve buttonBox diff --git a/src/app/dialogs/tools/dialogtool.cpp b/src/app/dialogs/tools/dialogtool.cpp index acec39c50..dca1e7965 100644 --- a/src/app/dialogs/tools/dialogtool.cpp +++ b/src/app/dialogs/tools/dialogtool.cpp @@ -388,9 +388,40 @@ void DialogTool::PutValHere(QPlainTextEdit *plainTextEdit, QListWidget *listWidg QTextCursor cursor = plainTextEdit->textCursor(); cursor.insertText(item->text()); plainTextEdit->setTextCursor(cursor); + plainTextEdit->setFocus(); } } +//--------------------------------------------------------------------------------------------------------------------- +void DialogTool::MoveCursorToEnd(QPlainTextEdit *plainTextEdit) +{ + SCASSERT(plainTextEdit != nullptr); + QTextCursor cursor = plainTextEdit->textCursor(); + cursor.movePosition(QTextCursor::End, QTextCursor::MoveAnchor); + plainTextEdit->setTextCursor(cursor); +} + +//--------------------------------------------------------------------------------------------------------------------- +bool DialogTool::eventFilter(QObject *object, QEvent *event) +{ + QPlainTextEdit *plainTextEdit = qobject_cast(object); + if (plainTextEdit != nullptr) + { + QKeyEvent *keyEvent = static_cast(event); + if ((keyEvent->key() == Qt::Key_Enter) || (keyEvent->key() == Qt::Key_Return)) + { + // Ignore Enter key + return true; + } + } + else + { + // pass the event on to the parent class + return QDialog::eventFilter(object, event); + } + return false; +} + //--------------------------------------------------------------------------------------------------------------------- /** * @brief ValFormulaChanged handle change formula @@ -701,7 +732,10 @@ void DialogTool::NamePointChanged() { QString name = edit->text(); name.replace(" ", ""); - if (name.isEmpty() || (pointName != name && data->IsUnique(name) == false)) + QRegExpValidator v(QRegExp(nameRegExp), this); + int pos = 0; + if (name.isEmpty() || (pointName != name && data->IsUnique(name) == false) || + v.validate(name, pos) == QValidator::Invalid) { flagName = false; ChangeColor(labelEditNamePoint, Qt::red); diff --git a/src/app/dialogs/tools/dialogtool.h b/src/app/dialogs/tools/dialogtool.h index c5a93281a..0cf27043d 100644 --- a/src/app/dialogs/tools/dialogtool.h +++ b/src/app/dialogs/tools/dialogtool.h @@ -333,6 +333,8 @@ protected: * @brief SaveData Put dialog data in local variables */ virtual void SaveData(){} + void MoveCursorToEnd(QPlainTextEdit *plainTextEdit); + bool eventFilter(QObject *object, QEvent *event); private: void FillList(QComboBox *box, const QMap &list)const; }; diff --git a/src/app/dialogs/tools/dialogtriangle.cpp b/src/app/dialogs/tools/dialogtriangle.cpp index 065b03093..9948f90f0 100644 --- a/src/app/dialogs/tools/dialogtriangle.cpp +++ b/src/app/dialogs/tools/dialogtriangle.cpp @@ -98,30 +98,54 @@ void DialogTriangle::ChosenObject(quint32 id, const SceneObject &type) } break; case (1): - if (SetObject(id, ui->comboBoxAxisP2, tr("Select first point"))) + if (getCurrentObjectId(ui->comboBoxAxisP1) != id) { - number++; - line->setPoint2Id(id); - line->RefreshGeometry(); + if (SetObject(id, ui->comboBoxAxisP2, tr("Select first point"))) + { + number++; + line->setPoint2Id(id); + line->RefreshGeometry(); + } } break; case (2): - if (SetObject(id, ui->comboBoxFirstPoint, tr("Select second point"))) + { + QSet set; + set.insert(getCurrentObjectId(ui->comboBoxAxisP1)); + set.insert(getCurrentObjectId(ui->comboBoxAxisP2)); + set.insert(id); + + if (set.size() == 3) { - number++; - line->setHypotenuseP1Id(id); - line->RefreshGeometry(); + if (SetObject(id, ui->comboBoxFirstPoint, tr("Select second point"))) + { + number++; + line->setHypotenuseP1Id(id); + line->RefreshGeometry(); + } } + } break; case (3): - if (SetObject(id, ui->comboBoxSecondPoint, "")) + { + QSet set; + set.insert(getCurrentObjectId(ui->comboBoxAxisP1)); + set.insert(getCurrentObjectId(ui->comboBoxAxisP2)); + set.insert(getCurrentObjectId(ui->comboBoxFirstPoint)); + set.insert(id); + + if (set.size() == 4) { - line->setHypotenuseP2Id(id); - line->RefreshGeometry(); - prepare = true; - this->setModal(true); - this->show(); + if (SetObject(id, ui->comboBoxSecondPoint, "")) + { + line->setHypotenuseP2Id(id); + line->RefreshGeometry(); + prepare = true; + this->setModal(true); + this->show(); + } } + } break; default: break; diff --git a/src/app/dialogs/tools/dialogtriangle.ui b/src/app/dialogs/tools/dialogtriangle.ui index f4bff6bf3..f56958fd4 100644 --- a/src/app/dialogs/tools/dialogtriangle.ui +++ b/src/app/dialogs/tools/dialogtriangle.ui @@ -133,6 +133,14 @@ + + lineEditNamePoint + comboBoxAxisP1 + comboBoxAxisP2 + comboBoxFirstPoint + comboBoxSecondPoint + buttonBox + diff --git a/src/app/dialogs/tools/dialoguniondetails.ui b/src/app/dialogs/tools/dialoguniondetails.ui index b403236b2..4729a4b5a 100644 --- a/src/app/dialogs/tools/dialoguniondetails.ui +++ b/src/app/dialogs/tools/dialoguniondetails.ui @@ -55,6 +55,9 @@ + + buttonBox + diff --git a/src/app/exception/vexceptionconversionerror.cpp b/src/app/exception/vexceptionconversionerror.cpp index e220a17c4..f30cbc8a5 100644 --- a/src/app/exception/vexceptionconversionerror.cpp +++ b/src/app/exception/vexceptionconversionerror.cpp @@ -60,6 +60,6 @@ VExceptionConversionError::~VExceptionConversionError() V_NOEXCEPT_EXPR (true) */ QString VExceptionConversionError::ErrorMessage() const { - QString error = QString("ExceptionConversionError: %1 %2").arg(what, str); + QString error = QString("ExceptionConversionError: %1 \"%2\"").arg(what, str); return error; } diff --git a/src/app/geometry/vgobject.cpp b/src/app/geometry/vgobject.cpp index 360b7e318..dcf3280cc 100644 --- a/src/app/geometry/vgobject.cpp +++ b/src/app/geometry/vgobject.cpp @@ -33,6 +33,7 @@ #include #include #include +#include //--------------------------------------------------------------------------------------------------------------------- /** @@ -183,25 +184,32 @@ QLineF VGObject::BuildLine(const QPointF &p1, const qreal &length, const qreal & { QLineF line = QLineF(); line.setP1(p1); + line.setAngle(angle);// First set angle than length. Length can have negative value. line.setLength(length); - line.setAngle(angle); return line; } //--------------------------------------------------------------------------------------------------------------------- QPointF VGObject::BuildRay(const QPointF &firstPoint, const qreal &angle, const QRectF &scRect) { - qreal diagonal = qSqrt(pow(scRect.height(), 2) + pow(scRect.width(), 2)); - QLineF line = BuildLine(firstPoint, diagonal, angle); + QRectF rect = scRect; + if (rect.contains(firstPoint) == false) + { + // If point outside of scene rect use the biggest rect that can be. + QRectF rectangle(INT_MIN, INT_MIN, INT_MAX, INT_MAX); + rect = rect.united(rectangle); + } + const qreal diagonal = qSqrt(pow(rect.height(), 2) + pow(rect.width(), 2)); + const QLineF line = BuildLine(firstPoint, diagonal, angle); - return LineIntersectRect(scRect, line); + return LineIntersectRect(rect, line); } //--------------------------------------------------------------------------------------------------------------------- QLineF VGObject::BuildAxis(const QPointF &p, const qreal &angle, const QRectF &scRect) { - QPointF endP1 = BuildRay(p, angle+180, scRect); - QPointF endP2 = BuildRay(p, angle, scRect); + const QPointF endP1 = BuildRay(p, angle+180, scRect); + const QPointF endP2 = BuildRay(p, angle, scRect); return QLineF(endP1, endP2); } @@ -219,7 +227,7 @@ QLineF VGObject::BuildAxis(const QPointF &p1, const QPointF &p2, const QRectF &s * @param line line. * @return point intersection. */ -QPointF VGObject::LineIntersectRect(QRectF rec, QLineF line) +QPointF VGObject::LineIntersectRect(const QRectF &rec, const QLineF &line) { qreal x1, y1, x2, y2; rec.getCoords(&x1, &y1, &x2, &y2); @@ -244,7 +252,6 @@ QPointF VGObject::LineIntersectRect(QRectF rec, QLineF line) { return point; } - Q_ASSERT_X(type != QLineF::BoundedIntersection, Q_FUNC_INFO, "There is no point of intersection."); return point; } diff --git a/src/app/geometry/vgobject.h b/src/app/geometry/vgobject.h index 45ff5e227..04e963fa0 100644 --- a/src/app/geometry/vgobject.h +++ b/src/app/geometry/vgobject.h @@ -71,7 +71,7 @@ public: static QLineF BuildAxis(const QPointF &p, const qreal &angle, const QRectF &scRect); static QLineF BuildAxis(const QPointF &p1, const QPointF &p2, const QRectF &scRect); - static QPointF LineIntersectRect(QRectF rec, QLineF line); + static QPointF LineIntersectRect(const QRectF &rec, const QLineF &line); static qint32 LineIntersectCircle(const QPointF ¢er, qreal radius, const QLineF &line, QPointF &p1, QPointF &p2); static QPointF ClosestPoint(const QLineF &line, const QPointF &point); diff --git a/src/app/main.cpp b/src/app/main.cpp index 36fa72ab6..101bca7d4 100644 --- a/src/app/main.cpp +++ b/src/app/main.cpp @@ -133,6 +133,7 @@ int main(int argc, char *argv[]) QT_REQUIRE_VERSION(argc, argv, "5.0.2"); VApplication app(argc, argv); + #ifdef QT_DEBUG // Because our "noisy" message handler uses the GUI subsystem for message // boxes, we can't install it until after the QApplication is constructed. But it @@ -150,6 +151,11 @@ int main(int argc, char *argv[]) app.OpenSettings(); +#if defined(Q_OS_WIN) && defined(Q_CC_GNU) + VApplication::DrMingw(); + app.CollectReports(); +#endif + QString checkedLocale = qApp->getSettings()->value("configuration/locale", QLocale::system().name()).toString(); QTranslator qtTranslator; @@ -187,12 +193,12 @@ int main(int argc, char *argv[]) parser.addVersionOption(); parser.addPositionalArgument("filename", QCoreApplication::translate("main", "Pattern file.")); parser.process(app); - const QStringList args = parser.positionalArguments(); + QStringList args = parser.positionalArguments(); //Before we load pattern show window. w.show(); - w.ReopenFilesAfterCrash(); + w.ReopenFilesAfterCrash(args); for (int i=0;i #include #include +#include //--------------------------------------------------------------------------------------------------------------------- /** @@ -114,6 +115,7 @@ MainWindow::MainWindow(QWidget *parent) connect(doc, &VPattern::UndoCommand, this, &MainWindow::FullParseFile); connect(doc, &VPattern::SetEnabledGUI, this, &MainWindow::SetEnabledGUI); connect(doc, &VPattern::CheckLayout, this, &MainWindow::Layout); + connect(doc, &VPattern::SetCurrentPP, this, &MainWindow::GlobalChangePP); qApp->setCurrentDocument(doc); connect(qApp->getUndoStack(), &QUndoStack::cleanChanged, this, &MainWindow::PatternWasModified); @@ -164,6 +166,17 @@ void MainWindow::ActionNewPP() } else { + QMessageBox::StandardButton ret; + ret = QMessageBox::question(this, tr("Individual measurements is under development"), + tr("There is no way create individual measurements file independent on the " + "pattern file.\nFor opening pattern need keep both files: pattern and " + "measurements. Do you want continue?"), + QMessageBox::Yes | QMessageBox::No, QMessageBox::Yes); + if (ret == QMessageBox::No) + { + return; + } + qApp->setPatternType(MeasurementsType::Individual); DialogIndividualMeasurements indMeasurements(pattern, patternPieceName, this); if (indMeasurements.exec() == QDialog::Accepted) @@ -723,7 +736,6 @@ void MainWindow::ShowToolTip(const QString &toolTip) void MainWindow::tableClosed() { show(); - MinimumScrollBar(); } //--------------------------------------------------------------------------------------------------------------------- @@ -785,19 +797,7 @@ void MainWindow::closeEvent(QCloseEvent *event) { if (MaybeSave()) { - WriteSettings(); - - //File was closed correct. - QStringList restoreFiles = qApp->getSettings()->value("restoreFileList").toStringList(); - restoreFiles.removeAll(curFile); - qApp->getSettings()->setValue("restoreFileList", restoreFiles); - - // Remove autosave file - QFile autofile(curFile +".autosave"); - if (autofile.exists()) - { - autofile.remove(); - } + FileClosedCorrect(); event->accept(); qApp->closeAllWindows(); @@ -1374,12 +1374,22 @@ void MainWindow::Preferences() } } +//--------------------------------------------------------------------------------------------------------------------- +void MainWindow::RepotBug() +{ + QDesktopServices::openUrl(QUrl("https://bitbucket.org/dismine/valentina/issues/new")); +} + //--------------------------------------------------------------------------------------------------------------------- /** * @brief Clear reset to default window. */ void MainWindow::Clear() { + ui->actionDetails->setChecked(false); + ui->actionDetails->setEnabled(false); + ui->actionDraw->setChecked(true); + ui->actionDraw->setEnabled(false); setCurrentFile(""); pattern->Clear(); doc->clear(); @@ -1389,9 +1399,15 @@ void MainWindow::Clear() comboBoxDraws->clear(); ui->actionOptionDraw->setEnabled(false); ui->actionSave->setEnabled(false); + ui->actionSaveAs->setEnabled(false); ui->actionPattern_properties->setEnabled(false); ui->actionZoomIn->setEnabled(false); ui->actionZoomOut->setEnabled(false); + ui->actionZoomFitBest->setEnabled(false); + ui->actionZoomOriginal->setEnabled(false); + ui->actionHistory->setEnabled(false); + ui->actionTable->setEnabled(false); + ui->actionEdit_pattern_code->setEnabled(false); SetEnableTool(false); qApp->setPatternUnit(Unit::Cm); qApp->setPatternType(MeasurementsType::Individual); @@ -1404,9 +1420,42 @@ void MainWindow::Clear() #ifdef Q_OS_WIN32 qt_ntfs_permission_lookup--; // turn it off again #endif /*Q_OS_WIN32*/ - + qApp->getUndoStack()->clear(); } +//--------------------------------------------------------------------------------------------------------------------- +void MainWindow::FileClosedCorrect() +{ + WriteSettings(); + + //File was closed correct. + QStringList restoreFiles = qApp->getSettings()->value("restoreFileList").toStringList(); + restoreFiles.removeAll(curFile); + qApp->getSettings()->setValue("restoreFileList", restoreFiles); + + // Remove autosave file + QFile autofile(curFile +".autosave"); + if (autofile.exists()) + { + autofile.remove(); + } +} + +//--------------------------------------------------------------------------------------------------------------------- +void MainWindow::ResetWindow() +{ + if (MaybeSave()) + { + FileClosedCorrect(); + } + else + { + return; + } + Clear(); +} + +//--------------------------------------------------------------------------------------------------------------------- void MainWindow::FullParseFile() { toolOptions->ClearPropertyBrowser(); @@ -1478,7 +1527,23 @@ void MainWindow::FullParseFile() comboBoxDraws->blockSignals(false); ui->actionPattern_properties->setEnabled(true); - qint32 index = comboBoxDraws->findText(patternPiece); + GlobalChangePP(patternPiece); + + if (comboBoxDraws->count() > 0) + { + SetEnableTool(true); + } + else + { + SetEnableTool(false); + } + SetEnableWidgets(true); +} + +//--------------------------------------------------------------------------------------------------------------------- +void MainWindow::GlobalChangePP(const QString &patternPiece) +{ + const qint32 index = comboBoxDraws->findText(patternPiece); try { if ( index != -1 ) @@ -1502,19 +1567,8 @@ void MainWindow::FullParseFile() SetEnabledGUI(false); return; } - - if (comboBoxDraws->count() > 0) - { - SetEnableTool(true); - } - else - { - SetEnableTool(false); - } - SetEnableWidgets(true); } - //--------------------------------------------------------------------------------------------------------------------- void MainWindow::SetEnabledGUI(bool enabled) { @@ -1522,7 +1576,8 @@ void MainWindow::SetEnabledGUI(bool enabled) { if (enabled == false) { - CancelTool(); + ArrowTool(); + qApp->getUndoStack()->clear(); } comboBoxDraws->setEnabled(enabled); ui->actionOptionDraw->setEnabled(enabled); @@ -1538,6 +1593,9 @@ void MainWindow::SetEnabledGUI(bool enabled) ui->actionDraw->setEnabled(enabled); ui->actionDetails->setEnabled(enabled); ui->actionTable->setEnabled(enabled); + ui->actionLayout->setEnabled(enabled); + ui->actionZoomFitBest->setEnabled(enabled); + ui->actionZoomOriginal->setEnabled(enabled); guiEnabled = enabled; sceneDraw->SetDisable(!enabled); @@ -1741,6 +1799,7 @@ void MainWindow::ActionHistory(bool checked) { dialogHistory = new DialogHistory(pattern, doc, this); dialogHistory->setWindowFlags(Qt::Window); + connect(this, &MainWindow::RefreshHistory, dialogHistory, &DialogHistory::UpdateHistory); connect(dialogHistory, &DialogHistory::DialogClosed, this, &MainWindow::ClosedActionHistory); dialogHistory->show(); } @@ -1856,7 +1915,6 @@ bool MainWindow::SavePattern(const QString &fileName) { setCurrentFile(fileName); helpLabel->setText(tr("File saved")); - qApp->getUndoStack()->clear(); } } else @@ -2103,9 +2161,11 @@ void MainWindow::CreateActions() connect(ui->actionAbout_Valentina, &QAction::triggered, this, &MainWindow::About); connect(ui->actionExit, &QAction::triggered, this, &MainWindow::close); connect(ui->actionPreferences, &QAction::triggered, this, &MainWindow::Preferences); + connect(ui->actionRepotBug, &QAction::triggered, this, &MainWindow::RepotBug); connect(ui->actionPattern_properties, &QAction::triggered, this, &MainWindow::PatternProperties); ui->actionPattern_properties->setEnabled(false); connect(ui->actionEdit_pattern_code, &QAction::triggered, this, &MainWindow::EditPatternCode); + connect(ui->actionCloseWindow, &QAction::triggered, this, &MainWindow::ResetWindow); ui->actionEdit_pattern_code->setEnabled(false); //Actions for recent files loaded by a main window application. @@ -2254,23 +2314,28 @@ void MainWindow::LoadPattern(const QString &fileName) FullParseFile(); - bool patternModified = this->isWindowModified(); - setCurrentFile(fileName); - if (patternModified) - { - //For situation where was fixed wrong formula need return for document status was modified. - PatternWasModified(!patternModified); + if (guiEnabled) + { // No errors occurred + bool patternModified = this->isWindowModified(); + setCurrentFile(fileName); + if (patternModified) + { + //For situation where was fixed wrong formula need return for document status was modified. + PatternWasModified(!patternModified); + } + helpLabel->setText(tr("File loaded")); + + qApp->setOpeningPattern();// End opening file + + //Fit scene size to best size for first show + ZoomFirstShow(); + + ui->actionDraw->setChecked(true); } - helpLabel->setText(tr("File loaded")); - - qApp->setOpeningPattern();// End opening file - - //Fit scene size to best size for first show - ZoomFirstShow(); } //--------------------------------------------------------------------------------------------------------------------- -void MainWindow::ReopenFilesAfterCrash() +void MainWindow::ReopenFilesAfterCrash(QStringList &args) { QStringList files = qApp->getSettings()->value("restoreFileList").toStringList(); if (files.size() > 0) @@ -2304,6 +2369,7 @@ void MainWindow::ReopenFilesAfterCrash() QFile autoFile(restoreFiles.at(i) +".autosave"); autoFile.remove(); LoadPattern(restoreFiles.at(i)); + args.removeAll(restoreFiles.at(i));// Do not open file twice after we restore him. } else { @@ -2389,6 +2455,7 @@ void MainWindow::ChangePP(int index, bool zoomBestFit) { doc->ChangeActivPP(comboBoxDraws->itemText(index)); doc->setCurrentData(); + emit RefreshHistory(); if (drawMode) { ArrowTool(); diff --git a/src/app/mainwindow.h b/src/app/mainwindow.h index 3777cc4f3..57e12f321 100644 --- a/src/app/mainwindow.h +++ b/src/app/mainwindow.h @@ -56,7 +56,7 @@ public: explicit MainWindow(QWidget *parent = nullptr); virtual ~MainWindow(); void LoadPattern(const QString &curFile); - void ReopenFilesAfterCrash(); + void ReopenFilesAfterCrash(QStringList &args); public slots: void mouseMove(const QPointF &scenePos); void ArrowTool(); @@ -76,10 +76,12 @@ public slots: bool Save(); void Open(); void Preferences(); + void RepotBug(); void NewPattern(); void ShowToolTip(const QString &toolTip); void OpenRecentFile(); void Clear(); + void ResetWindow(); void currentPPChanged(int index); void OptionDraw(); @@ -126,6 +128,7 @@ public slots: void ClickEndVisualization(); void Layout(); void UpdateGradation(); + void GlobalChangePP(const QString &patternPiece); signals: /** * @brief ModelChosen emit after calculation all details. @@ -133,6 +136,7 @@ signals: * @param description pattern description. */ void ModelChosen(QVector listDetails, const QString &curFile, const QString &description); + void RefreshHistory(); protected: virtual void keyPressEvent(QKeyEvent *event); virtual void showEvent(QShowEvent *event); @@ -253,6 +257,7 @@ private: void AddDocks(); void PropertyBrowser(); void OpenNewValentina(const QString &fileName = QString())const; + void FileClosedCorrect(); }; #endif // MAINWINDOW_H diff --git a/src/app/mainwindow.ui b/src/app/mainwindow.ui index 0d78e233d..d3622ec64 100644 --- a/src/app/mainwindow.ui +++ b/src/app/mainwindow.ui @@ -779,6 +779,7 @@ &Help + @@ -803,9 +804,16 @@ + + + Window + + + + @@ -1229,7 +1237,9 @@ false - + + + Stop @@ -1238,6 +1248,19 @@ Stop using tool + + + Repot Bug... + + + Report bug + + + + + Close window + + diff --git a/src/app/options.cpp b/src/app/options.cpp index 90d97978e..0f102247f 100644 --- a/src/app/options.cpp +++ b/src/app/options.cpp @@ -31,7 +31,7 @@ #include //Same regexp in pattern.xsd shema file. Don't forget synchronize. -const QString nameRegExp = QStringLiteral("^([^0-9-*/^+=\\s\\(\\)%:;!.,]){1,1}([^-*/^+=\\s\\(\\)%:;!.,]){0,}$"); +const QString nameRegExp = QStringLiteral("^([^0-9-*/^+=\\s\\(\\)%:;!.,`'\"]){1,1}([^-*/^+=\\s\\(\\)%:;!.,`'\"]){0,}$"); // From documantation: If you use QStringLiteral you should avoid declaring the same literal in multiple places: This // furthermore blows up the binary sizes. diff --git a/src/app/options.h b/src/app/options.h index c384fca68..fb12f3d19 100644 --- a/src/app/options.h +++ b/src/app/options.h @@ -51,6 +51,7 @@ static const quint32 null_id = 0; #define SceneSize 50000 #define DefPointRadius 2.0//mm #define NULL_ID null_id//use this value for initialization variables that keeps id values. 0 mean uknown id value. +#define NULL_ID_STR "0" extern const QString nameRegExp; extern const QString degreeSymbol; diff --git a/src/app/share/resources/schema/pattern.xsd b/src/app/share/resources/schema/pattern.xsd index 90661b868..4c90764b3 100644 --- a/src/app/share/resources/schema/pattern.xsd +++ b/src/app/share/resources/schema/pattern.xsd @@ -98,7 +98,7 @@ - + @@ -267,7 +267,7 @@ - + diff --git a/src/app/share/translations/valentina.ts b/src/app/share/translations/valentina.ts index 9eb1fbf72..3e0cbe893 100644 --- a/src/app/share/translations/valentina.ts +++ b/src/app/share/translations/valentina.ts @@ -147,85 +147,100 @@ ConfigurationPage - + Setup user interface language updated and will be used the next time start - + Default unit updated and will be used the next pattern creation - + Save - + Auto-save modified pattern - + Interval: - + min - + Language - + GUI language - + Decimal separator parts - + With OS options (%1) - + Default unit - + Centimeters - + Millimiters - + Inches - + Label language + + + Send crash reports + + + + + Send crash reports (recommended) + + + + + After each crash Valentina collect information that may help us fix a problem. We do not collect any personal information. Find more about what <a href="https://bitbucket.org/dismine/valentina/wiki/manual/Crash_reports">kind of information</a> we collect. + + DelTool - + Delete tool @@ -317,97 +332,97 @@ - + <html><head/><body><p>Show full calculation in message box</p></body></html> - + Point label - + First point - + First point of line - + Second point - + Second point of line - + Type of line - + Show line from first point to this point - + Input data - + Size and height - - Standard table + + Measurements - + Increments - + Length of lines - + Length of arcs - + Length of curves - + Angle of lines - + Hide empty measurements - + Variables - Click twice to insert into formula - + Select second point of line @@ -431,8 +446,8 @@ - - + + Calculate value @@ -442,39 +457,44 @@ - - + + <html><head/><body><p>Show full calculation in message box</p></body></html> - + Insert variable into formula - + Value of first angle - + + Measurements + + + + First angle - + Second angle - + Insert marked variable into formula - + Value of second angle @@ -498,11 +518,6 @@ Size and height - - - Standard table - - Increments @@ -539,7 +554,7 @@ - + Value of angle of line. @@ -577,116 +592,230 @@ - + <html><head/><body><p>Show full calculation in message box</p></body></html> - + Point label - + First point - + First point of angle - + Second point - + Second point of angle - + Third point - + Third point of angle - + Type of line - + Show line from second point to this point - + Input data - + Size and height - - Standard table + + Measurements - + Increments - + Length of lines - + Length of arcs - + Length of curves - + Angle of lines - + Hide empty measurements - + Variables - Click twice to insert into formula - + Select second point of angle - + Select third point of angle + + DialogCurveIntersectAxis + + + Curve intersect axis + + + + + Angle + + + + + Calculate value + + + + + Value of angle + + + + + <html><head/><body><p>Show full calculation in message box</p></body></html> + + + + + Axis point + + + + + + First point of line + + + + + Curve + + + + + Point label + + + + + Type of line + + + + + Show line from first point to this point + + + + + Input data + + + + + Size and height + + + + + Measurements + + + + + Increments + + + + + Length of lines + + + + + Length of arcs + + + + + Length of curves + + + + + Angle of lines + + + + + Hide empty measurements + + + + + Variables + + + + + Select axis point + + + DialogCutArc @@ -715,72 +844,72 @@ - + <html><head/><body><p>Show full calculation in message box</p></body></html> - + Arc - + Selected curve - + Point label - + Input data - + Size and height - - Standard table + + Measurements - + Increments - + Length of lines - + Length of arcs - + Length of curves - + Angle of lines - + Hide empty measurements - + Variables - Click twice to insert into formula @@ -813,72 +942,72 @@ - + <html><head/><body><p>Show full calculation in message box</p></body></html> - + Curve - + Selected curve - + Point label - + Input data - + Size and height - - Standard table + + Measurements - + Increments - + Length of lines - + Length of arcs - + Length of curves - + Angle of lines - + Hide empty measurements - + Variables - Click twice to insert into formula @@ -911,72 +1040,72 @@ - + <html><head/><body><p>Show full calculation in message box</p></body></html> - + Curve - + Selected curve path - + Point label - + Input data - + Size and height - - Standard table + + Measurements - + Increments - + Length of lines - + Length of arcs - + Length of curves - + Angle of lines - + Hide empty measurements - + Variables - Click twice to insert into formula @@ -985,7 +1114,7 @@ DialogDetail - + Detail @@ -995,44 +1124,44 @@ - - - + + + cm - + Bias Y - + Options - + Name of detail - + Seam allowance - + Width - + Closed - + Delete @@ -1075,57 +1204,57 @@ - + <html><head/><body><p>Show full calculation in message box</p></body></html> - + Input data - + Size and height - - Standard table + + Measurements - + Increments - + Length of lines - + Length of arcs - + Length of curves - + Angle of lines - + Hide empty measurements - + Variables @@ -1144,7 +1273,7 @@ - + Calculate value @@ -1154,93 +1283,93 @@ - - + + <html><head/><body><p>Show full calculation in message box</p></body></html> - + Angle - + Value of angle - + Base point - + First point of line - + Point label - + Type of line - + Show line from first point to this point - + Input data - + Size and height - - Standard table + + Measurements - + Increments - + Length of lines - + Length of arcs - + Length of curves - + Angle of lines - + Hide empty measurements - + Variables @@ -1253,35 +1382,35 @@ - + Point label - + Base point - - - - + + + + First point of line - + Second point of line - + Type of line - + Show line from first point to our point @@ -1291,7 +1420,7 @@ - + Select second point of line @@ -1305,105 +1434,115 @@ - + Tool - - - - - + + + + + Can't create record. - + %1 - Base point + - %1_%2 - Line from point %1 to point %2 - + %3 - Point along line %1_%2 - + %1 - Point of shoulder - + %3 - normal to line %1_%2 - + %4 - bisector of angle %1_%2_%3 - + %5 - intersection of lines %1_%2 and %3_%4 - + Curve %1_%2 - + Arc with center in point %1 - + Curve point %1 - + %4 - point of contact of arc with the center in point %1 and line %2_%3 - + Point of perpendicular from point %1 to line %2_%3 - + Triangle: axis %1_%2, points %3 and %4 - + %1 - point of intersection %2 and %3 - + %1 - cut arc with center %2 - + %1 - cut curve %2_%3 - + %1 - cut curve path %2 + + + %1 - point of intersection line %2_%3 and axis through point %4 + + + + + %1 - point of intersection curve and axis through point %2 + + DialogIncrements @@ -1445,7 +1584,7 @@ - + Description @@ -1535,53 +1674,83 @@ - - + + File error. - + male - + female - + + Could not save GivenName + + + + + Could not save FamilyName + + + + + Could not save Email + + + + + Could not save Sex + + + + + Could not save BirthDate + + + + Measurements use different units than pattern. This pattern required measurements in %1 - + Individual measurements (*.vit) - - + + Open file - - + + Wrong units. - + Standard measurements (*.vst) - + Name_%1 + + + Can't save measurement + + DialogIndividualMeasurements @@ -1637,39 +1806,39 @@ - - + + File error. - - + + Individual measurements (*.vit) - + Open file - + Where save measurements? - + Centimeters - + Millimiters - + Inches @@ -1682,22 +1851,22 @@ - + First point - + Second point - + Type of line - + Show line from first point to this point @@ -1747,16 +1916,141 @@ - + Select first point of second line - + Select second point of second line + + DialogLineIntersectAxis + + + Line intersect axis + + + + + Angle + + + + + Calculate value + + + + + Value of angle + + + + + <html><head/><body><p>Show full calculation in message box</p></body></html> + + + + + Axis point + + + + + + + First point of line + + + + + First line point + + + + + Second line point + + + + + Point label + + + + + Type of line + + + + + Show line from first point to this point + + + + + Input data + + + + + Size and height + + + + + Measurements + + + + + Increments + + + + + Length of lines + + + + + Length of arcs + + + + + Length of curves + + + + + Angle of lines + + + + + Hide empty measurements + + + + + Variables + + + + + Select second point of line + + + + + Select axis point + + + DialogMeasurements @@ -1765,27 +2059,27 @@ - + <html><head/><body><p><span style=" font-size:18pt;">Please, choose pattern type.</span></p></body></html> - + Graduation - + Use for creation pattern standard measurement table - + Individual - + Use for creation pattern individual measurements @@ -1818,92 +2112,92 @@ - + <html><head/><body><p>Show full calculation in message box</p></body></html> - + Point label - + First point - + Second point - + Additional angle degrees - + Type of line - + Show line from first point to this point - + Input data - + Size and height - - Standard table + + Measurements - + Increments - + Length of lines - + Length of arcs - + Length of curves - + Angle of lines - + Hide empty measurements - + Variables - Click twice to insert into formula - + Select second point of line @@ -2154,88 +2448,88 @@ - + <html><head/><body><p>Show full calculation in message box</p></body></html> - + Point label - + Center of arc - - + + Select point of center of arc - + Top of the line - + End of the line - + Input data - + Size and height - - Standard table + + Measurements - + Increments - + Length of lines - + Length of arcs - + Length of curves - + Angle of lines - + Hide empty measurements - + Variables - Click twice to insert into formula. - + Select second point of line @@ -2253,22 +2547,22 @@ - + vertical point - + First point of angle - + horizontal point - + Second point of angle @@ -2306,97 +2600,97 @@ - + <html><head/><body><p>Show full calculation in message box</p></body></html> - + Point label - + First point - + Second point - + Third point - + Type of line - + Show line from first point to our point - + Input data - + Size and height - - Standard table + + Measurements - + Increments - + Length of lines - + Length of arcs - + Length of curves - + Angle of lines - + Hide empty measurements - + Variables - Click twice to insert into formula - + Select first point of line - + Select second point of line @@ -2486,7 +2780,7 @@ DialogSplinePath - Curve path + Curved path @@ -2556,51 +2850,51 @@ DialogTool - - - - - + + + + + Error - + Empty field - + Value can't be 0 - + Value - + Height - + Size - + Line length - + Arc length - + Curve length @@ -2618,30 +2912,30 @@ - + First point of axis - - - - + + + + First point of line - + Second point of axis - + First point - + Second point @@ -2651,12 +2945,12 @@ - + Select first point - + Select second point @@ -2726,151 +3020,151 @@ Functions - + sin sine function - + cos cosine function - + tan tangens function - + asin arcus sine function - + acos arcus cosine function - + atan arcus tangens function - + sinh hyperbolic sine function - + cosh hyperbolic cosine - + tanh hyperbolic tangens function - + asinh hyperbolic arcus sine function - + acosh hyperbolic arcus tangens function - + atanh hyperbolic arcur tangens function - + log2 logarithm to the base 2 - + log10 logarithm to the base 10 - + log logarithm to the base 10 - + ln logarithm to base e (2.71828...) - + exp e raised to the power of x - + sqrt square root of a value - + sign sign function -1 if x<0; 1 if x>0 - + rint round to nearest integer - + abs absolute value - + min min of all arguments - + max max of all arguments - + sum sum of all arguments - + avg mean value of all arguments @@ -2947,633 +3241,712 @@ - + Tools for creating lines. - + Line - + Line between points - + Point at line intersection - + Tools for creating curves. - + Curve - + Curve tool. - + Tool for path curve. - + Tool segment a pathed curve. - + Tool for segmenting a curve. - + + Point of intersection line and axis + + + + + + + ... + + + + Tools for creating arcs. - + Arc - + Arc tool. - + Cut arc tool. - + Tools for creating details. - + Detail - + Tool new detail. - + Tool for union two details. - + &File - + &Help - + &Pattern piece - + Measurements - + + Window + + + + Toolbar files - + ToolBar modes - + Toolbar pattern - + Toolbar options - + Toolbar tools - + Tool options - + Save &As... - + Export pattern (layout) - + About &Qt - + &About Valentina - + E&xit - + Exit the application - + Preferences - + Zoom in - + Original zoom - + Original Zoom - + Zoom fit best - + + Ctrl+= + + + + + Stop + + + + + Stop using tool + + + + + Repot Bug... + + + + + Report bug + + + + + Close window + + + + zoom in - - + + Zoom out - + Edit pattern XML code - + Pattern properties - + New - + &New - + Create a new pattern - + Ctrl+N - + Open - + &Open - + Open file with pattern - + Save - + &Save - + Save pattern - + Ctrl+S - + Save as - + Save not yet saved pattern - + Ctrl+Shift+S - + Draw - + Draw mode - + Ctrl+W - + Details - + Details mode - + Ctrl+E - - + + Pointer tools - + New pattern piece - + Add new pattern piece - + Ctrl+Shift+N - - + + Change the label of pattern piece - + Table of variables - + Tables of variables - + Ctrl+T - + History - + Ctrl+H - + Create layout - + Ctrl+L - + About Qt - + Ctrl+Q - + Pattern piece %1 - + Pattern piece: - + Enter a new label for the pattern piece. - - - + + + Select point - + + Individual measurements is under development + + + + + There is no way create individual measurements file independent on the pattern file. +For opening pattern need keep both files: pattern and measurements. Do you want continue? + + + + Select first point - - + + + Select first point of line - + Select first point of angle - + Select first point of first line - + Select first point curve - + Select simple curve - + Select point of center of arc - + Select point of curve path - + Select curve path - + Select points, arcs, curves clockwise. - + Select base point - + Select first point of axis - + Select point vertically - + Select detail - + Select arc - + + Select curve + + + + Size: - + pattern - + Critical error! - + Error parsing file (std::bad_alloc). - + Bad id. - + + Could not save file + + + + &Undo - + &Redo - + Wrong units. - + Application doesn't support standard table with inches. - + File error. - + + Valentina didn't shut down correctly. Do you want reopen files (%1) you had open? + + + + + Reopen files. + + + + The measurements file <br/><br/> <b>%1</b> <br/><br/> %3 - + could not be found. Do you want to update the file location - + Standard measurements (*.vst) - + Individual measurements (*.vit) - + File loaded - + Height: - + Pattern Piece: - - + + Pattern files (*.val) - + /pattern.val - + File saved - + untitled.val - + Unsaved change - + The pattern has been modified. Do you want to save your changes? - - + + Open file - - + + Error parsing file. - + Error can't convert value. - - + + Error empty parameter. - + Error wrong id. @@ -3581,799 +3954,799 @@ Do you want to save your changes? Measurements - + head_girth Short measurement name. Don't use math symbols in name!!!! - + mid_neck_girth Short measurement name. Don't use math symbols in name!!!! - + neck_base_girth Short measurement name. Don't use math symbols in name!!!! - + head_and_neck_length Short measurement name. Don't use math symbols in name!!!! - + center_front_waist_length Short measurement name. Don't use math symbols in name!!!! - + center_back_waist_length Short measurement name. Don't use math symbols in name!!!! - + shoulder_length Short measurement name. Don't use math symbols in name!!!! - + side_waist_length Short measurement name. Don't use math symbols in name!!!! - + trunk_length Short measurement name. Don't use math symbols in name!!!! - + shoulder_girth Short measurement name. Don't use math symbols in name!!!! - + upper_chest_girth Short measurement name. Don't use math symbols in name!!!! - + bust_girth Short measurement name. Don't use math symbols in name!!!! - + under_bust_girth Short measurement name. Don't use math symbols in name!!!! - + waist_girth Short measurement name. Don't use math symbols in name!!!! - + high_hip_girth Short measurement name. Don't use math symbols in name!!!! - + hip_girth Short measurement name. Don't use math symbols in name!!!! - + upper_front_chest_width Short measurement name. Don't use math symbols in name!!!! - + front_chest_width Short measurement name. Don't use math symbols in name!!!! - + across_front_shoulder_width Short measurement name. Don't use math symbols in name!!!! - + across_back_shoulder_width Short measurement name. Don't use math symbols in name!!!! - + upper_back_width Short measurement name. Don't use math symbols in name!!!! - + back_width Short measurement name. Don't use math symbols in name!!!! - + bustpoint_to_bustpoint Short measurement name. Don't use math symbols in name!!!! - + halter_bustpoint_to_bustpoint Short measurement name. Don't use math symbols in name!!!! - + neck_to_bustpoint Short measurement name. Don't use math symbols in name!!!! - + crotch_length Short measurement name. Don't use math symbols in name!!!! - + rise_height Short measurement name. Don't use math symbols in name!!!! - + shoulder_drop Short measurement name. Don't use math symbols in name!!!! - + shoulder_slope_degrees Short measurement name. Don't use math symbols in name!!!! - + front_shoulder_slope_length Short measurement name. Don't use math symbols in name!!!! - + back_shoulder_slope_length Short measurement name. Don't use math symbols in name!!!! - + front_shoulder_to_waist_length Short measurement name. Don't use math symbols in name!!!! - + back_shoulder_to_waist_length Short measurement name. Don't use math symbols in name!!!! - + front_neck_arc Short measurement name. Don't use math symbols in name!!!! - + back_neck_arc Short measurement name. Don't use math symbols in name!!!! - + front_upper_chest_arc Short measurement name. Don't use math symbols in name!!!! - + back_upper_chest_arc Short measurement name. Don't use math symbols in name!!!! - + front_waist_arc Short measurement name. Don't use math symbols in name!!!! - + back_waist_arc Short measurement name. Don't use math symbols in name!!!! - + front_upper_hip_arc Short measurement name. Don't use math symbols in name!!!! - + back_upper_hip_arc Short measurement name. Don't use math symbols in name!!!! - + front_hip_arc Short measurement name. Don't use math symbols in name!!!! - + back_hip_arc Short measurement name. Don't use math symbols in name!!!! - + chest_slope Short measurement name. Don't use math symbols in name!!!! - + back_slope Short measurement name. Don't use math symbols in name!!!! - + front_waist_slope Short measurement name. Don't use math symbols in name!!!! - + back_waist_slope Short measurement name. Don't use math symbols in name!!!! - + front_neck_to_upper_chest_height Short measurement name. Don't use math symbols in name!!!! - + front_neck_to_bust_height Short measurement name. Don't use math symbols in name!!!! - + front_waist_to_upper_chest Short measurement name. Don't use math symbols in name!!!! - + front_waist_to_lower_breast Short measurement name. Don't use math symbols in name!!!! - + back_waist_to_upper_chest Short measurement name. Don't use math symbols in name!!!! - + strap_length Short measurement name. Don't use math symbols in name!!!! - + armscye_girth Short measurement name. Don't use math symbols in name!!!! - + elbow_girth Short measurement name. Don't use math symbols in name!!!! - + upper_arm_girth Short measurement name. Don't use math symbols in name!!!! - + wrist_girth Short measurement name. Don't use math symbols in name!!!! - + scye_depth Short measurement name. Don't use math symbols in name!!!! - + shoulder_and_arm_length Short measurement name. Don't use math symbols in name!!!! - + underarm_length Short measurement name. Don't use math symbols in name!!!! - + cervicale_to_wrist_length Short measurement name. Don't use math symbols in name!!!! - + shoulder_to_elbow_length Short measurement name. Don't use math symbols in name!!!! - + arm_length Short measurement name. Don't use math symbols in name!!!! - + hand_width Short measurement name. Don't use math symbols in name!!!! - + hand_length Short measurement name. Don't use math symbols in name!!!! - + hand_girth Short measurement name. Don't use math symbols in name!!!! - + thigh_girth Short measurement name. Don't use math symbols in name!!!! - + mid_thigh_girth Short measurement name. Don't use math symbols in name!!!! - + knee_girth Short measurement name. Don't use math symbols in name!!!! - + calf_girth Short measurement name. Don't use math symbols in name!!!! - + ankle_girth Short measurement name. Don't use math symbols in name!!!! - + knee_height Short measurement name. Don't use math symbols in name!!!! - + ankle_height Short measurement name. Don't use math symbols in name!!!! - + foot_width Short measurement name. Don't use math symbols in name!!!! - + foot_length Short measurement name. Don't use math symbols in name!!!! - + height Short measurement name. Don't use math symbols in name!!!! - + cervicale_height Short measurement name. Don't use math symbols in name!!!! - + cervicale_to_knee_height Short measurement name. Don't use math symbols in name!!!! - + waist_height Short measurement name. Don't use math symbols in name!!!! - + high_hip_height Short measurement name. Don't use math symbols in name!!!! - + hip_height Short measurement name. Don't use math symbols in name!!!! - + waist_to_hip_height Short measurement name. Don't use math symbols in name!!!! - + waist_to_knee_height Short measurement name. Don't use math symbols in name!!!! - + crotch_height Short measurement name. Don't use math symbols in name!!!! - + size Short measurement name. Don't use math symbols in name!!!! - + height_front_neck_base_point Short measurement name. Don't use math symbols in name!!!! - + height_base_neck_side_point Short measurement name. Don't use math symbols in name!!!! - + height_shoulder_point Short measurement name. Don't use math symbols in name!!!! - + height_nipple_point Short measurement name. Don't use math symbols in name!!!! - + height_back_angle_axilla Short measurement name. Don't use math symbols in name!!!! - + height_scapular_point Short measurement name. Don't use math symbols in name!!!! - + height_under_buttock_folds Short measurement name. Don't use math symbols in name!!!! - + hips_excluding_protruding_abdomen Short measurement name. Don't use math symbols in name!!!! - + girth_foot_instep Short measurement name. Don't use math symbols in name!!!! - + side_waist_to_floor Short measurement name. Don't use math symbols in name!!!! - + front_waist_to_floor Short measurement name. Don't use math symbols in name!!!! - + arc_through_groin_area Short measurement name. Don't use math symbols in name!!!! - + waist_to_plane_seat Short measurement name. Don't use math symbols in name!!!! - + neck_to_radial_point Short measurement name. Don't use math symbols in name!!!! - + neck_to_third_finger Short measurement name. Don't use math symbols in name!!!! - + neck_to_first_line_chest_circumference Short measurement name. Don't use math symbols in name!!!! - + front_waist_length Short measurement name. Don't use math symbols in name!!!! - + arc_through_shoulder_joint Short measurement name. Don't use math symbols in name!!!! - + neck_to_back_line_chest_circumference Short measurement name. Don't use math symbols in name!!!! - + waist_to_neck_side Short measurement name. Don't use math symbols in name!!!! - + arc_length_upper_body Short measurement name. Don't use math symbols in name!!!! - + chest_width Short measurement name. Don't use math symbols in name!!!! - + anteroposterior_diameter_hands Short measurement name. Don't use math symbols in name!!!! - + height_clavicular_point Short measurement name. Don't use math symbols in name!!!! - + height_armhole_slash Short measurement name. Don't use math symbols in name!!!! - + slash_shoulder_height Short measurement name. Don't use math symbols in name!!!! - + half_girth_neck Short measurement name. Don't use math symbols in name!!!! - + half_girth_neck_for_shirts Short measurement name. Don't use math symbols in name!!!! - + half_girth_chest_first Short measurement name. Don't use math symbols in name!!!! - + half_girth_chest_second Short measurement name. Don't use math symbols in name!!!! - + half_girth_chest_third Short measurement name. Don't use math symbols in name!!!! - + half_girth_waist Short measurement name. Don't use math symbols in name!!!! - + half_girth_hips_considering_protruding_abdomen Short measurement name. Don't use math symbols in name!!!! - + half_girth_hips_excluding_protruding_abdomen Short measurement name. Don't use math symbols in name!!!! - + girth_knee_flexed_feet Short measurement name. Don't use math symbols in name!!!! - + neck_transverse_diameter Short measurement name. Don't use math symbols in name!!!! - + front_slash_shoulder_height Short measurement name. Don't use math symbols in name!!!! - + neck_to_front_waist_line Short measurement name. Don't use math symbols in name!!!! - + hand_vertical_diameter Short measurement name. Don't use math symbols in name!!!! - + neck_to_knee_point Short measurement name. Don't use math symbols in name!!!! - + waist_to_knee Short measurement name. Don't use math symbols in name!!!! - + shoulder_height Short measurement name. Don't use math symbols in name!!!! - + head_height Short measurement name. Don't use math symbols in name!!!! - + body_position Short measurement name. Don't use math symbols in name!!!! - + arc_behind_shoulder_girdle Short measurement name. Don't use math symbols in name!!!! - + neck_to_neck_base Short measurement name. Don't use math symbols in name!!!! - + depth_waist_first Short measurement name. Don't use math symbols in name!!!! - + depth_waist_second Short measurement name. Don't use math symbols in name!!!! @@ -4382,799 +4755,799 @@ Do you want to save your changes? MeasurementsDescriptions - + Around fullest part of Head Full measurement description - + Around middle part of Neck Full measurement description - + Around Neck at base Full measurement description - + Vertical Distance from Crown to Nape Full measurement description - + Front Neck Center over tape at Bustline to Front Waist Center Full measurement description - + Back Neck Center to Back Waist Center Full measurement description - + NeckPoint to ShoulderTip Full measurement description - + Armpit to Waist side Full measurement description - + Around Body from middle of Shoulder length to BustPoint to Crotch up back to beginning point Full measurement description - + Around Arms and Torso, at bicep level parallel to floor, with arms hanging at the sides Full measurement description - + Around Chest at Armfold level, will be parallel to floor across back, will not be parallel to floor across front chest Full measurement description - + Around fullest part of Bust, parallel to floor Full measurement description - + Around Chest below the Bust, parallel to floor Full measurement description - + Tie a string around smallest part of waist, keep string tied while taking meaasurements. Not usually parallel to floor for front waist or back waist. Full measurement description - + Around HighHip, parallel to floor Full measurement description - + Around Hip, parallel to floor Full measurement description - + Across Front UpperChest, smallest width from armscye to armscye Full measurement description - + Across Front Chest, from armfold to armfold Full measurement description - + From ShoulderTip to ShoulderTip, across Front Full measurement description - + From ShoulderTip to ShoulderTip, across Back Full measurement description - + Across Back UpperChest, smallest width from armscye to armscye Full measurement description - + Across Back Chest, from armfold to armfold Full measurement description - + Distance between BustPoints, across Chest Full measurement description - + Distance from Bustpoint, behind neck, down to Bustpoint Full measurement description - + From NeckPoint to BustPoint Full measurement description - + From Front Waist Center, down to crotch, up to Back Waist Center Full measurement description - + Sit on hard chair, measure from side waist straight down to chair bottom Full measurement description - + Vertical Distance from NeckPoint level to ShoulderTip level Full measurement description - + Degrees of angle from NeckPoint to ShoulderTip – requires goniometer Full measurement description - + ShoulderTip to Front Waist Center Full measurement description - + ShoulderTip to Back Waist Center Full measurement description - + NeckPoint straight down front chest to Waistline Full measurement description - + Back NeckPoint straight down back chest to Waistline Full measurement description - + NeckPoint to NeckPoint through Front Neck Center Full measurement description - + NeckPoint to NeckPoint across Nape Full measurement description - + Front upper-bust arc Full measurement description - + Back UpperBust side to side Full measurement description - + Front Waist side to side Full measurement description - + Back Waist side to side Full measurement description - + Front UpperHip side to side Full measurement description - + Back UpperHip side to side Full measurement description - + Front Hip side to side Full measurement description - + Back Hip side to side Full measurement description - + NeckPoint to Front ArmfoldPoint Full measurement description - + NeckPoint to Back ArmfoldPoint Full measurement description - + NeckPoint across Front Chest to Waist side Full measurement description - + NeckPoint across Back Chest to Waist side Full measurement description - + Front Neck Center straight down to UpperChest line Full measurement description - + Front Neck Center straight down to Bust line Full measurement description - + Front Upper chest waist Full measurement description - + Front waist to lower breast Full measurement description - + Back waist to upper chest Full measurement description - + Strap length Full measurement description - + Around Armscye Full measurement description - + Around Elbow with elbow bent Full measurement description - + Around UpperArm Full measurement description - + Around Wrist Full measurement description - + Nape straight down to UnderBust line (same as Back UpperBust height) Full measurement description - + NeckPoint to ShoulderTip to Wrist, with elbow bent and hand on hip Full measurement description - + Armpit to Wrist, with arm straight and hanging at side Full measurement description - + Nape to Wrist, with elbow bent and hand on hip Full measurement description - + ShoulderTip to Elbow, with elbow bent and hand on hip Full measurement description - + ShoulderTip to Wrist, with elbow bent and hand on hip Full measurement description - + Hand side to side Full measurement description - + Hand Middle Finger tip to wrist Full measurement description - + Around Hand Full measurement description - + Around Thigh Full measurement description - + Around MidThigh Full measurement description - + Around Knee Full measurement description - + Around Calf Full measurement description - + Around Ankle Full measurement description - + Knee to Floor Full measurement description - + Ankle to Floor Full measurement description - + Widest part of Foot side to side Full measurement description - + Tip of Longest Toe straight to back of heel Full measurement description - + Top of head to floor Full measurement description - + Nape to Floor Full measurement description - + Nape to Knee Full measurement description - + Waist side to floor Full measurement description - + HighHip side to Floor Full measurement description - + Hip side to Floor Full measurement description - + Waist side to Hip Full measurement description - + Waist side to Knee Full measurement description - + Crotch to Floor along inside leg Full measurement description - + Size Full measurement description - + Height of the point base of the neck in front Full measurement description - + Height of the base of the neck side point Full measurement description - + The height of the shoulder point Full measurement description - + Height nipple point Full measurement description - + Height back angle axilla Full measurement description - + Height scapular point Full measurement description - + Height under buttock folds Full measurement description - + Hips excluding protruding abdomen Full measurement description - + Girth foot instep Full measurement description - + The distance from the side waist to floor Full measurement description - + The distance from the front waist to floor Full measurement description - + Arc through groin area Full measurement description - + The distance from the waist to the plane seat Full measurement description - + The distance from the base of the neck to the side of the radial point Full measurement description - + Distance from the base of the neck side point to the end of the third finger Full measurement description - + The distance from the base of the neck to the side of the first line in front of chest circumference Full measurement description - + The distance from the base of the neck to the waist side front (waist length in the front) Full measurement description - + Arc through the highest point of the shoulder joint Full measurement description - + The distance from the base of the neck to the back line of chest circumference of the first and the second based on ledge vanes Full measurement description - + The distance from the waist to the back base of the neck side point Full measurement description - + Arc length of the upper body through the base of the neck side point Full measurement description - + Chest width Full measurement description - + Anteroposterior diameter of the hands Full measurement description - + Height clavicular point Full measurement description - + The distance from the point to the cervical level of the posterior angle of the front armpit (underarm height oblique) Full measurement description - + Slash shoulder height Full measurement description - + Half girth neck Full measurement description - + Half girth neck for shirts Full measurement description - + Half girth chest first Full measurement description - + Half girth chest second Full measurement description - + Half girth chest third Full measurement description - + Half girth waist Full measurement description - + Half girth hips considering protruding abdomen Full measurement description - + Half girth hips excluding protruding abdomen Full measurement description - + Girth knee flexed feet Full measurement description - + Neck transverse diameter Full measurement description - + Front slash shoulder height Full measurement description - + The distance from the base of the neck to the waist line front Full measurement description - + Hand vertical diameter Full measurement description - + Distance from neck to knee point Full measurement description - + The distance from the waist to the knee Full measurement description - + Shoulder height Full measurement description - + Head height Full measurement description - + Body position Full measurement description - + Arc behind the shoulder girdle Full measurement description - + Distance from neck point to point on the base of the neck side neck girth measurement line Full measurement description - + Depth waist first Full measurement description - + Depth waist second Full measurement description @@ -5183,799 +5556,799 @@ Do you want to save your changes? MeasurementsFullNames - + Head girth Full measurement name - + Mid-neck girth Full measurement name - + Neck Base girth Full measurement name - + Head and Neck length Full measurement name - + Front Center length Full measurement name - + Back Center length Full measurement name - + Shoulder length Full measurement name - + Side Waist length Full measurement name - + Trunk length Full measurement name - + Shoulder girth Full measurement name - + Upper Chest girth Full measurement name - + Bust girth Full measurement name - + Under Bust girth Full measurement name - + Waist girth Full measurement name - + HighHip girth Full measurement name - + Hip girth Full measurement name - + Front Upper Chest width Full measurement name - + Front Chest width Full measurement name - + Front Across Shoulder width Full measurement name - + Back Across Shoulder width Full measurement name - + Back Upper Chest width Full measurement name - + Back Chest width Full measurement name - + BustPoint to BustPoint Full measurement name - + Halter Bustpoint to Bustpoint Full measurement name - + NeckPoint to BustPoint Full measurement name - + Crotch length Full measurement name - + Rise height Full measurement name - + Shoulder Drop Full measurement name - + Shoulder Slope degrees Full measurement name - + Front Shoulder Balance Full measurement name - + Back Shoulder Balance Full measurement name - + Front Full Length Full measurement name - + Back Full Length Full measurement name - + Front Neck arc Full measurement name - + Back Neck arc Full measurement name - + Front upper-bust arc Full measurement name - + Back UpperBust arc Full measurement name - + Front Waist arc Full measurement name - + Back Waist arc Full measurement name - + Front UpperHip arc Full measurement name - + Back UpperHip arc Full measurement name - + Front Hip arc Full measurement name - + Back Hip arc Full measurement name - + Chest Balance Full measurement name - + Back Balance Full measurement name - + Front Waist Balance Full measurement name - + Back Waist Balance Full measurement name - + Front UpperChest height Full measurement name - + Bust height Full measurement name - + Front Upper chest waist Full measurement name - + Front waist to lower breast Full measurement name - + Back waist to upper chest Full measurement name - + Strap length Full measurement name - + Armscye Girth Full measurement name - + Elbow Girth Full measurement name - + Upperarm Girth Full measurement name - + Wrist girth Full measurement name - + Armscye depth Full measurement name - + Shoulder and Arm length Full measurement name - + Underarm length Full measurement name - + Nape to wrist length Full measurement name - + Elbow length Full measurement name - + Arm length Full measurement name - + Hand width Full measurement name - + Hand length Full measurement name - + Hand girth Full measurement name - + Thigh girth Full measurement name - + Midthigh girth Full measurement name - + Knee girth Full measurement name - + Calf girth Full measurement name - + Ankle girth Full measurement name - + Knee height Full measurement name - + Ankle height Full measurement name - + Foot width Full measurement name - + Foot length Full measurement name - + Total Height Full measurement name - + Nape height Full measurement name - + Nape to knee height Full measurement name - + Waist height Full measurement name - + HighHip height Full measurement name - + Hip height Full measurement name - + Waist to Hip height Full measurement name - + Waist to Knee height Full measurement name - + Crotch height/Inseam Full measurement name - + Size Full measurement name - + Height front neck base point Full measurement name - + Height base neck side point Full measurement name - + Height shoulder point Full measurement name - + Height nipple point Full measurement name - + Height back angle axilla Full measurement name - + Height scapular point Full measurement name - + Height under buttock folds Full measurement name - + Hips excluding protruding abdomen Full measurement name - + Girth foot instep Full measurement name - + Side waist to floor Full measurement name - + Front waist to floor Full measurement name - + Arc through groin area Full measurement name - + Waist to plane seat Full measurement name - + Neck to radial point Full measurement name - + Neck to third finger Full measurement name - + Neck to first line chest circumference Full measurement name - + Front waist length Full measurement name - + Arc through shoulder joint Full measurement name - + Neck to back line chest circumference Full measurement name - + Waist to neck side Full measurement name - + Arc length upper body Full measurement name - + Chest width Full measurement name - + Anteroposterior diameter hands Full measurement name - + Height clavicular point Full measurement name - + Height armhole slash Full measurement name - + Slash shoulder height Full measurement name - + Half girth neck Full measurement name - + Half girth neck for shirts Full measurement name - + Half girth chest first Full measurement name - + Half girth chest second Full measurement name - + Half girth chest third Full measurement name - + Half girth waist Full measurement name - + Half girth hips considering protruding abdomen Full measurement name - + Half girth hips excluding protruding abdomen Full measurement name - + Girth knee flexed feet Full measurement name - + Neck transverse diameter Full measurement name - + Front slash shoulder height Full measurement name - + Neck to front waist line Full measurement name - + Hand vertical diameter Full measurement name - + Neck to knee point Full measurement name - + Waist to knee Full measurement name - + Shoulder height Full measurement name - + Head height Full measurement name - + Body position Full measurement name - + Arc behind shoulder girdle Full measurement name - + Neck to neck base Full measurement name - + Depth waist first Full measurement name - + Depth waist second Full measurement name @@ -6084,19 +6457,19 @@ Do you want to save your changes? PostfixOperators - + cm centimeter - + mm millimeter - + in inch @@ -6158,7 +6531,7 @@ Do you want to save your changes? QObject - + Create new pattern piece to start working. @@ -6173,18 +6546,18 @@ Do you want to save your changes? - + mm - - + + cm - + inch @@ -6200,7 +6573,7 @@ Do you want to save your changes? STDescriptions - + Standard figures of men 1st group, chest 100 cm Standard table description @@ -6378,12 +6751,12 @@ Do you want to save your changes? VAbstractTool - + Confirm the deletion. - + Do you really want delete? @@ -6391,35 +6764,45 @@ Do you want to save your changes? VApplication - + Error parsing file. Program will be terminated. - + Error bad id. Program will be terminated. - + Error can't convert value. Program will be terminated. - + Error empty parameter. Program will be terminated. - + Error wrong id. Program will be terminated. - + Something's wrong!! + + + Could not copy temp file to document file + + + + + Could not remove document file + + VContainer @@ -6446,48 +6829,53 @@ Do you want to save your changes? VDomDocument - + Can't convert toUInt parameter - + Can't convert toBool parameter - + Got empty parameter - + Can't convert toDouble parameter - - + + Can't open file %1: %2. - + Can't open schema file %1: %2. - + Validation error file %3 in line %1 column %2 - + Parsing error file %3 in line %1 column %2 + + + Couldn't get node + + VDrawTool @@ -6510,7 +6898,7 @@ Do you want to save your changes? VException - + Critical error! @@ -6550,188 +6938,200 @@ Do you want to save your changes? VPattern - - Can't find tool id = %1 in table. + + Can't find tool in table. - + Error no unique id. - - + + Error parsing file. - + Error can't convert value. - + Error empty parameter. - + Error wrong id. - + Critical error! - + Error parsing file (std::bad_alloc). - + Error creating or updating detail - + Error creating or updating single point - - + + Error creating or updating point of end line - - + + Error creating or updating point along line - - + + Error creating or updating point of shoulder - - + + Error creating or updating point of normal - - + + Error creating or updating point of bisector - + Error creating or updating point of lineintersection - - + + Error creating or updating point of contact - + Error creating or updating modeling point - + Error creating or updating height - + Error creating or updating triangle - + Error creating or updating point of intersection - - + + Error creating or updating cut spline point - - + + Error creating or updating cut spline path point - - + + Error creating or updating cut arc point - + + + Error creating or updating point of intersection line and axis + + + + + + Error creating or updating point of intersection curve and axis + + + + Error creating or updating line - + Error creating or updating simple curve - + Error creating or updating curve path - + Error creating or updating modeling simple curve - + Error creating or updating modeling curve path - - + + Error creating or updating simple arc - + Error creating or updating modeling arc - + Error creating or updating union details - + Got wrong parameter id. Need only id > 0. - + This id is not unique. - + File error. @@ -6785,207 +7185,227 @@ Do you want to save your changes? VToolOptionsPropertyBrowser - + Base point - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + Point label - + Position - + Point at distance and angle - - - - - - - + + + + + + + + + Line type - - - - - - - - + + + + + + + + Length - + + + Angle - + Point at distance along line - + Arc - - + + Radius - + First angle - + Second angle - + Point along bisector - + Cut arc tool - + Tool for segmenting a curve - + Tool segment a pathed curve - + Perpendicular point along line - + Line between points - + Point at line intersection - + Point along perpendicular - + Additional angle degrees - + Point at intersection of arc and line - + Tool to make point from x & y of two other points - + Special point on shoulder - + Curve tool - - + + Curve factor - + Tool for path curve - + Tool triangle + + + + Point intersection line and axis + + Variables - + Line_ Left symbol _ in name - + AngleLine_ Left symbol _ in name - + Arc_ Left symbol _ in name - + Spl_ Left symbol _ in name - + SplPath Do not add symbol _ to the end of name + + VisToolCurveIntersectAxis + + + <b>Intersection curve and axis</b>: angle = %1°; <b>Shift</b> - sticking angle, <b>Enter</b> - finish creation + + + VisToolEndLine @@ -6994,6 +7414,14 @@ Do you want to save your changes? + + VisToolLineIntersectAxis + + + <b>Intersection line and axis</b>: angle = %1°; <b>Shift</b> - sticking angle, <b>Enter</b> - finish creation + + + VisToolSplinePath @@ -7005,12 +7433,12 @@ Do you want to save your changes? main - + Pattern making program. - + Pattern file. diff --git a/src/app/share/translations/valentina_cs_CZ.ts b/src/app/share/translations/valentina_cs_CZ.ts index 1db9a9e15..824ab841b 100644 --- a/src/app/share/translations/valentina_cs_CZ.ts +++ b/src/app/share/translations/valentina_cs_CZ.ts @@ -147,85 +147,100 @@ ConfigurationPage - + Setup user interface language updated and will be used the next time start - + Default unit updated and will be used the next pattern creation - + Save Uložit - + Auto-save modified pattern - + Interval: - + min - + Language - + GUI language - + Decimal separator parts - + With OS options (%1) - + Default unit - + Centimeters - + Millimiters - + Inches - + Label language + + + Send crash reports + + + + + Send crash reports (recommended) + + + + + After each crash Valentina collect information that may help us fix a problem. We do not collect any personal information. Find more about what <a href="https://bitbucket.org/dismine/valentina/wiki/manual/Crash_reports">kind of information</a> we collect. + + DelTool - + Delete tool @@ -325,97 +340,97 @@ _ - + <html><head/><body><p>Show full calculation in message box</p></body></html> - + Point label - + First point První bod - + First point of line První bod čáry - + Second point Druhý bod - + Second point of line Druhý bod čáry - + Type of line Typ čáry - + Show line from first point to this point - + Input data Vstupní data - + Size and height - - Standard table + + Measurements - + Increments Přídavky - + Length of lines Délka čar - + Length of arcs Délka oblouků - + Length of curves Délka křivek - + Angle of lines Úhel čar - + Hide empty measurements - + Variables - Click twice to insert into formula - + Select second point of line Vybrat druhý bod čáry @@ -443,8 +458,8 @@ - - + + Calculate value @@ -458,8 +473,8 @@ _ - - + + <html><head/><body><p>Show full calculation in message box</p></body></html> @@ -473,12 +488,12 @@ První úhel oblouku proti směru hodinových ručiček - + Insert variable into formula - + Value of first angle Hodnota prvního úhlu @@ -491,22 +506,22 @@ Druhý úhel oblouku proti směru hodinových ručiček - + First angle - + Second angle - + Insert marked variable into formula - + Value of second angle Hodnota druhého úhlu @@ -532,7 +547,7 @@ - Standard table + Measurements @@ -571,7 +586,7 @@ Proměnné - + Value of angle of line. @@ -613,116 +628,230 @@ _ - + <html><head/><body><p>Show full calculation in message box</p></body></html> - + Point label - + First point První bod - + First point of angle První bod úhlu - + Second point Druhý bod - + Second point of angle Druhý bod úhlu - + Third point Třetí bod - + Third point of angle Třetí bod úhlu - + Type of line Typ čáry - + Show line from second point to this point - + Input data Vstupní data - + Size and height - - Standard table + + Measurements - + Increments Přídavky - + Length of lines Délka čar - + Length of arcs Délka oblouků - + Length of curves Délka křivek - + Angle of lines Úhel čar - + Hide empty measurements - + Variables - Click twice to insert into formula - + Select second point of angle Vybrat druhý bod úhlu - + Select third point of angle Vybrat třetí bod úhlu + + DialogCurveIntersectAxis + + + Curve intersect axis + + + + + Angle + + + + + Calculate value + + + + + Value of angle + + + + + <html><head/><body><p>Show full calculation in message box</p></body></html> + + + + + Axis point + + + + + + First point of line + První bod čáry + + + + Curve + Křivka + + + + Point label + + + + + Type of line + Typ čáry + + + + Show line from first point to this point + + + + + Input data + Vstupní data + + + + Size and height + + + + + Measurements + + + + + Increments + Přídavky + + + + Length of lines + Délka čar + + + + Length of arcs + Délka oblouků + + + + Length of curves + Délka křivek + + + + Angle of lines + Úhel čar + + + + Hide empty measurements + + + + + Variables + Proměnné + + + + Select axis point + + + DialogCutArc @@ -755,72 +884,72 @@ _ - + <html><head/><body><p>Show full calculation in message box</p></body></html> - + Arc Oblouk - + Selected curve - + Point label - + Input data Vstupní data - + Size and height - - Standard table + + Measurements - + Increments Přídavky - + Length of lines Délka čar - + Length of arcs Délka oblouků - + Length of curves Délka křivek - + Angle of lines Úhel čar - + Hide empty measurements - + Variables - Click twice to insert into formula @@ -857,72 +986,72 @@ _ - + <html><head/><body><p>Show full calculation in message box</p></body></html> - + Curve Křivka - + Selected curve - + Point label - + Input data Vstupní data - + Size and height - - Standard table + + Measurements - + Increments Přídavky - + Length of lines Délka čar - + Length of arcs Délka oblouků - + Length of curves Délka křivek - + Angle of lines Úhel čar - + Hide empty measurements - + Variables - Click twice to insert into formula @@ -959,72 +1088,72 @@ _ - + <html><head/><body><p>Show full calculation in message box</p></body></html> - + Curve Křivka - + Selected curve path - + Point label - + Input data Vstupní data - + Size and height - - Standard table + + Measurements - + Increments Přídavky - + Length of lines Délka čar - + Length of arcs Délka oblouků - + Length of curves Délka křivek - + Angle of lines Úhel čar - + Hide empty measurements - + Variables - Click twice to insert into formula @@ -1033,7 +1162,7 @@ DialogDetail - + Detail Detail @@ -1043,44 +1172,44 @@ Odchylka X - - - + + + cm - + Bias Y Odchylka Y - + Options Volby - + Name of detail Název detailu - + Seam allowance - + Width Šířka - + Closed Zavřeno - + Delete Smazat @@ -1127,57 +1256,57 @@ _ - + <html><head/><body><p>Show full calculation in message box</p></body></html> - + Input data Vstupní data - + Size and height - - Standard table + + Measurements - + Increments Přídavky - + Length of lines Délka čar - + Length of arcs Délka oblouků - + Length of curves Délka křivek - + Angle of lines Úhel čar - + Hide empty measurements - + Variables Proměnné @@ -1200,7 +1329,7 @@ - + Calculate value @@ -1214,33 +1343,33 @@ _ - - + + <html><head/><body><p>Show full calculation in message box</p></body></html> - + Angle - + Value of angle - + Base point Základní bod - + First point of line První bod čáry - + Point label @@ -1249,62 +1378,62 @@ Úhel čáry - + Type of line Typ čáry - + Show line from first point to this point - + Input data Vstupní data - + Size and height - - Standard table + + Measurements - + Increments Přídavky - + Length of lines Délka čar - + Length of arcs Délka oblouků - + Length of curves Délka křivek - + Angle of lines Úhel čar - + Hide empty measurements - + Variables Proměnné @@ -1321,35 +1450,35 @@ - + Point label - + Base point Základní bod - - - - + + + + First point of line První bod čáry - + Second point of line Druhý bod čáry - + Type of line Typ čáry - + Show line from first point to our point Ukázat čáru od prvního bodu k našemu bodu @@ -1359,7 +1488,7 @@ Vybrat první bod čáry - + Select second point of line Vybrat druhý bod čáry @@ -1373,105 +1502,115 @@ - + Tool Nástroj - - - - - + + + + + Can't create record. - + %1 - Base point %1 - Základní bod + - %1_%2 - Line from point %1 to point %2 %1_%2 - Čára od bodu %1 k bodu %2 - + %3 - Point along line %1_%2 %3 - Bod podél čáry %1_%2 - + %1 - Point of shoulder - + %3 - normal to line %1_%2 - + %4 - bisector of angle %1_%2_%3 - + %5 - intersection of lines %1_%2 and %3_%4 - + Curve %1_%2 Křivka %1_%2 - + Arc with center in point %1 Oblouk se středem v bodě %1 - + Curve point %1 Bod křivky %1 - + %4 - point of contact of arc with the center in point %1 and line %2_%3 - + Point of perpendicular from point %1 to line %2_%3 - + Triangle: axis %1_%2, points %3 and %4 Trojúhelník: osa %1_%2, body %3 a %4 - + %1 - point of intersection %2 and %3 - + %1 - cut arc with center %2 - + %1 - cut curve %2_%3 - + %1 - cut curve path %2 + + + %1 - point of intersection line %2_%3 and axis through point %4 + + + + + %1 - point of intersection curve and axis through point %2 + + DialogIncrements @@ -1512,7 +1651,7 @@ - + Description Popis @@ -1611,53 +1750,83 @@ - - + + File error. - + male - + female - + + Could not save GivenName + + + + + Could not save FamilyName + + + + + Could not save Email + + + + + Could not save Sex + + + + + Could not save BirthDate + + + + Measurements use different units than pattern. This pattern required measurements in %1 - + Individual measurements (*.vit) - - + + Open file Otevřít soubor - - + + Wrong units. - + Standard measurements (*.vst) - + Name_%1 + + + Can't save measurement + + Can't convert toDouble value. Nelze převést na hodnotu toDouble. @@ -1721,39 +1890,39 @@ - - + + File error. - - + + Individual measurements (*.vit) - + Open file Otevřít soubor - + Where save measurements? - + Centimeters - + Millimiters - + Inches @@ -1766,22 +1935,22 @@ Čára - + First point První bod - + Second point Druhý bod - + Type of line Typ čáry - + Show line from first point to this point @@ -1831,16 +2000,141 @@ Vybrat druhý bod první čáry - + Select first point of second line Vybrat první bod druhé čáry - + Select second point of second line Vybrat druhý bod druhé čáry + + DialogLineIntersectAxis + + + Line intersect axis + + + + + Angle + + + + + Calculate value + + + + + Value of angle + + + + + <html><head/><body><p>Show full calculation in message box</p></body></html> + + + + + Axis point + + + + + + + First point of line + První bod čáry + + + + First line point + + + + + Second line point + + + + + Point label + + + + + Type of line + Typ čáry + + + + Show line from first point to this point + + + + + Input data + Vstupní data + + + + Size and height + + + + + Measurements + + + + + Increments + Přídavky + + + + Length of lines + Délka čar + + + + Length of arcs + Délka oblouků + + + + Length of curves + Délka křivek + + + + Angle of lines + Úhel čar + + + + Hide empty measurements + + + + + Variables + Proměnné + + + + Select second point of line + Vybrat druhý bod čáry + + + + Select axis point + + + DialogMeasurements @@ -1849,27 +2143,27 @@ - + <html><head/><body><p><span style=" font-size:18pt;">Please, choose pattern type.</span></p></body></html> - + Graduation - + Use for creation pattern standard measurement table - + Individual - + Use for creation pattern individual measurements @@ -1910,92 +2204,92 @@ _ - + <html><head/><body><p>Show full calculation in message box</p></body></html> - + Point label - + First point První bod - + Second point Druhý bod - + Additional angle degrees Dodatečné úhlové stupně - + Type of line Typ čáry - + Show line from first point to this point - + Input data Vstupní data - + Size and height - - Standard table + + Measurements - + Increments Přídavky - + Length of lines Délka čar - + Length of arcs Délka oblouků - + Length of curves Délka křivek - + Angle of lines Úhel čar - + Hide empty measurements - + Variables - Click twice to insert into formula - + Select second point of line Vybrat druhý bod čáry @@ -2254,88 +2548,88 @@ _ - + <html><head/><body><p>Show full calculation in message box</p></body></html> - + Point label - + Center of arc Střed oblouku - - + + Select point of center of arc Vybrat bod středu oblouku - + Top of the line Začátek čáry - + End of the line Konec čáry - + Input data Vstupní data - + Size and height - - Standard table + + Measurements - + Increments Přídavky - + Length of lines Délka čar - + Length of arcs Délka oblouků - + Length of curves Délka křivek - + Angle of lines Úhel čar - + Hide empty measurements - + Variables - Click twice to insert into formula. - + Select second point of line Vybrat druhý bod čáry @@ -2357,22 +2651,22 @@ - + vertical point - + First point of angle První bod úhlu - + horizontal point - + Second point of angle Druhý bod úhlu @@ -2418,97 +2712,97 @@ _ - + <html><head/><body><p>Show full calculation in message box</p></body></html> - + Point label - + First point První bod - + Second point Druhý bod - + Third point Třetí bod - + Type of line Typ čáry - + Show line from first point to our point Ukázat čáru od prvního bodu k našemu bodu - + Input data Vstupní data - + Size and height - - Standard table + + Measurements - + Increments Přídavky - + Length of lines Délka čar - + Length of arcs Délka oblouků - + Length of curves Délka křivek - + Angle of lines Úhel čar - + Hide empty measurements - + Variables - Click twice to insert into formula - + Select first point of line Vybrat první bod čáry - + Select second point of line Vybrat druhý bod čáry @@ -2601,9 +2895,13 @@ DialogSplinePath - Curve path - Cesta křivky + Cesta křivky + + + + Curved path + @@ -2680,51 +2978,51 @@ Žádná čára - - - - - + + + + + Error Chyba - + Empty field - + Value can't be 0 - + Value - + Height - + Size Velikost - + Line length Délka čáry - + Arc length Délka oblouku - + Curve length Délka křivky @@ -2746,30 +3044,30 @@ - + First point of axis První bod osy - - - - + + + + First point of line První bod čáry - + Second point of axis Druhý bod osy - + First point První bod - + Second point Druhý bod @@ -2779,12 +3077,12 @@ Vybrat druhý bod osy - + Select first point Vybrat první bod - + Select second point Vybrat druhý bod @@ -2854,151 +3152,151 @@ Functions - + sin sine function - + cos cosine function - + tan tangens function - + asin arcus sine function - + acos arcus cosine function - + atan arcus tangens function - + sinh hyperbolic sine function - + cosh hyperbolic cosine - + tanh hyperbolic tangens function - + asinh hyperbolic arcus sine function - + acosh hyperbolic arcus tangens function - + atanh hyperbolic arcur tangens function - + log2 logarithm to the base 2 - + log10 logarithm to the base 10 - + log logarithm to the base 10 - + ln logarithm to base e (2.71828...) - + exp e raised to the power of x - + sqrt square root of a value - + sign sign function -1 if x<0; 1 if x>0 - + rint round to nearest integer - + abs absolute value - + min min of all arguments - + max max of all arguments - + sum sum of all arguments - + avg mean value of all arguments @@ -3034,8 +3332,11 @@ Nástroj bod na koncové čáře. + + + ... - ... + ... Tool point of shoulder. @@ -3063,72 +3364,72 @@ Nástroj trojúhelník. - + Tools for creating lines. Nástroje na vytváření čar. - + Line Čára - + Tools for creating curves. Nástroje na vytváření křivek. - + Curve Křivka - + Curve tool. - + Tool for path curve. - + Tool segment a pathed curve. - + Tool for segmenting a curve. - + Tools for creating arcs. Nástroje na vytváření oblouků. - + Arc Oblouk - + Arc tool. - + Tools for creating details. Nástroje na vytváření podrobností. - + Detail Podrobnosti - + Tool new detail. Nástroj nové podrobnosti. @@ -3153,47 +3454,47 @@ Nástrojový pruh 3 - + New Nový - + Create a new pattern Vytvořit nový vzor - + Ctrl+N - + Open Otevřít - + Open file with pattern Otevřít soubor se vzorem - + Save Uložit - + Save pattern Uložit vzor - + Ctrl+S - + Save as Uložit jako @@ -3238,248 +3539,288 @@ - - Line between points + + Point of intersection line and axis + Line between points + + + + Point at line intersection - + Cut arc tool. - + Tool for union two details. - + &File - + &Help - + &Pattern piece - + Measurements - + + Window + + + + Toolbar files - + ToolBar modes - + Toolbar pattern - + Toolbar options - + Toolbar tools - + Tool options - + &New - + &Open - + &Save - + Save &As... - + Save not yet saved pattern Uložit ještě neuložený vzor - + Ctrl+Shift+S - + Draw Kreslit - + Draw mode Režim kreslení - + Ctrl+W - + Details Podrobnosti - + Details mode - + Ctrl+E - - + + Pointer tools - + New pattern piece - + Add new pattern piece - + Ctrl+Shift+N - - + + Change the label of pattern piece - + Table of variables Tabulka proměnných - + Tables of variables Tabulky proměnných - + Ctrl+T - + History Historie - + Ctrl+H - + Export pattern (layout) - + About &Qt - + &About Valentina - + E&xit - + Exit the application - + Preferences - + Pattern properties - + Zoom in - + Original zoom - + Original Zoom - + Zoom fit best + + + Ctrl+= + + + + + Stop + Zastavit + + + + Stop using tool + + + + + Repot Bug... + + + + + Report bug + + + + + Close window + + Zoom In Přiblížit - + zoom in @@ -3488,13 +3829,13 @@ Oddálit - - + + Zoom out - + Edit pattern XML code @@ -3503,17 +3844,17 @@ Rozvržení - + Create layout Vytvořit rozvržení - + Ctrl+L - + About Qt O Qt @@ -3526,83 +3867,94 @@ Ukončit - + Ctrl+Q - + Pattern piece %1 - + + Individual measurements is under development + + + + + There is no way create individual measurements file independent on the pattern file. +For opening pattern need keep both files: pattern and measurements. Do you want continue? + + + + Size: - + pattern - + /pattern.val - + Critical error! - + Error parsing file (std::bad_alloc). - + Bad id. - + File saved - + untitled.val - + Unsaved change - + The pattern has been modified. Do you want to save your changes? - + &Undo - + &Redo - + Pattern piece: - + Enter a new label for the pattern piece. @@ -3611,14 +3963,14 @@ Do you want to save your changes? Chyba při ukládání změny! - - - + + + Select point Vybrat bod - + Select first point Vybrat první bod @@ -3627,113 +3979,134 @@ Do you want to save your changes? Vybrat bod ramene - - + + + Select first point of line Vybrat první bod čáry - + Select first point of angle Vybrat první bod úhlu - + Select first point of first line Vybrat první bod první čáry - + Select first point curve Vybrat první bod křivky - + Select simple curve - + Select point of center of arc Vybrat bod středu oblouku - + Select point of curve path Vybrat bod cesty křivky - + Select curve path - + Select points, arcs, curves clockwise. Vybrat body, oblouky, křivky po směru hodinových ručiček. - + Select base point Vybrat základní bod - + Select first point of axis Vybrat první bod osy - + Select point vertically Vybrat bod svisle - + Select detail - + Select arc - + + Select curve + + + + + Could not save file + + + + Wrong units. - + Application doesn't support standard table with inches. - + File error. - + File loaded - + + Valentina didn't shut down correctly. Do you want reopen files (%1) you had open? + + + + + Reopen files. + + + + The measurements file <br/><br/> <b>%1</b> <br/><br/> %3 - + could not be found. Do you want to update the file location - + Standard measurements (*.vst) - + Individual measurements (*.vit) @@ -3758,7 +4131,7 @@ Do you want to save your changes? Chcete uložit své změny? - + Height: @@ -3767,13 +4140,13 @@ Do you want to save your changes? Velikost: - + Pattern Piece: - - + + Pattern files (*.val) @@ -3786,8 +4159,8 @@ Do you want to save your changes? Chyba při ukládání souboru! Nelze uložit soubor. - - + + Open file Otevřít soubor @@ -3804,24 +4177,24 @@ Do you want to save your changes? Nepodařilo se odstranit soubor se střihem - - + + Error parsing file. Chyba při zpracování souboru. - + Error can't convert value. Chyba. Nelze převést hodnotu. - - + + Error empty parameter. Chyba. Prázdný parametr. - + Error wrong id. Chyba. Špatné ID. @@ -3837,511 +4210,511 @@ Do you want to save your changes? Measurements - + head_girth Short measurement name. Don't use math symbols in name!!!! - + mid_neck_girth Short measurement name. Don't use math symbols in name!!!! - + neck_base_girth Short measurement name. Don't use math symbols in name!!!! - + head_and_neck_length Short measurement name. Don't use math symbols in name!!!! - + center_front_waist_length Short measurement name. Don't use math symbols in name!!!! - + center_back_waist_length Short measurement name. Don't use math symbols in name!!!! - + shoulder_length Short measurement name. Don't use math symbols in name!!!! - + side_waist_length Short measurement name. Don't use math symbols in name!!!! - + trunk_length Short measurement name. Don't use math symbols in name!!!! - + shoulder_girth Short measurement name. Don't use math symbols in name!!!! - + upper_chest_girth Short measurement name. Don't use math symbols in name!!!! - + bust_girth Short measurement name. Don't use math symbols in name!!!! - + under_bust_girth Short measurement name. Don't use math symbols in name!!!! - + waist_girth Short measurement name. Don't use math symbols in name!!!! - + high_hip_girth Short measurement name. Don't use math symbols in name!!!! - + hip_girth Short measurement name. Don't use math symbols in name!!!! - + upper_front_chest_width Short measurement name. Don't use math symbols in name!!!! - + front_chest_width Short measurement name. Don't use math symbols in name!!!! - + across_front_shoulder_width Short measurement name. Don't use math symbols in name!!!! - + across_back_shoulder_width Short measurement name. Don't use math symbols in name!!!! - + upper_back_width Short measurement name. Don't use math symbols in name!!!! - + back_width Short measurement name. Don't use math symbols in name!!!! - + bustpoint_to_bustpoint Short measurement name. Don't use math symbols in name!!!! - + halter_bustpoint_to_bustpoint Short measurement name. Don't use math symbols in name!!!! - + neck_to_bustpoint Short measurement name. Don't use math symbols in name!!!! - + crotch_length Short measurement name. Don't use math symbols in name!!!! - + rise_height Short measurement name. Don't use math symbols in name!!!! - + shoulder_drop Short measurement name. Don't use math symbols in name!!!! - + shoulder_slope_degrees Short measurement name. Don't use math symbols in name!!!! - + front_shoulder_slope_length Short measurement name. Don't use math symbols in name!!!! - + back_shoulder_slope_length Short measurement name. Don't use math symbols in name!!!! - + front_shoulder_to_waist_length Short measurement name. Don't use math symbols in name!!!! - + back_shoulder_to_waist_length Short measurement name. Don't use math symbols in name!!!! - + front_neck_arc Short measurement name. Don't use math symbols in name!!!! - + back_neck_arc Short measurement name. Don't use math symbols in name!!!! - + front_upper_chest_arc Short measurement name. Don't use math symbols in name!!!! - + back_upper_chest_arc Short measurement name. Don't use math symbols in name!!!! - + front_waist_arc Short measurement name. Don't use math symbols in name!!!! - + back_waist_arc Short measurement name. Don't use math symbols in name!!!! - + front_upper_hip_arc Short measurement name. Don't use math symbols in name!!!! - + back_upper_hip_arc Short measurement name. Don't use math symbols in name!!!! - + front_hip_arc Short measurement name. Don't use math symbols in name!!!! - + back_hip_arc Short measurement name. Don't use math symbols in name!!!! - + chest_slope Short measurement name. Don't use math symbols in name!!!! - + back_slope Short measurement name. Don't use math symbols in name!!!! - + front_waist_slope Short measurement name. Don't use math symbols in name!!!! - + back_waist_slope Short measurement name. Don't use math symbols in name!!!! - + front_neck_to_upper_chest_height Short measurement name. Don't use math symbols in name!!!! - + front_neck_to_bust_height Short measurement name. Don't use math symbols in name!!!! - + front_waist_to_upper_chest Short measurement name. Don't use math symbols in name!!!! - + front_waist_to_lower_breast Short measurement name. Don't use math symbols in name!!!! - + back_waist_to_upper_chest Short measurement name. Don't use math symbols in name!!!! - + strap_length Short measurement name. Don't use math symbols in name!!!! - + armscye_girth Short measurement name. Don't use math symbols in name!!!! - + elbow_girth Short measurement name. Don't use math symbols in name!!!! - + upper_arm_girth Short measurement name. Don't use math symbols in name!!!! - + wrist_girth Short measurement name. Don't use math symbols in name!!!! - + scye_depth Short measurement name. Don't use math symbols in name!!!! - + shoulder_and_arm_length Short measurement name. Don't use math symbols in name!!!! - + underarm_length Short measurement name. Don't use math symbols in name!!!! - + cervicale_to_wrist_length Short measurement name. Don't use math symbols in name!!!! - + shoulder_to_elbow_length Short measurement name. Don't use math symbols in name!!!! - + arm_length Short measurement name. Don't use math symbols in name!!!! - + hand_width Short measurement name. Don't use math symbols in name!!!! - + hand_length Short measurement name. Don't use math symbols in name!!!! - + hand_girth Short measurement name. Don't use math symbols in name!!!! - + thigh_girth Short measurement name. Don't use math symbols in name!!!! - + mid_thigh_girth Short measurement name. Don't use math symbols in name!!!! - + knee_girth Short measurement name. Don't use math symbols in name!!!! - + calf_girth Short measurement name. Don't use math symbols in name!!!! - + ankle_girth Short measurement name. Don't use math symbols in name!!!! - + knee_height Short measurement name. Don't use math symbols in name!!!! - + ankle_height Short measurement name. Don't use math symbols in name!!!! - + foot_width Short measurement name. Don't use math symbols in name!!!! - + foot_length Short measurement name. Don't use math symbols in name!!!! - + height Short measurement name. Don't use math symbols in name!!!! - + cervicale_height Short measurement name. Don't use math symbols in name!!!! - + cervicale_to_knee_height Short measurement name. Don't use math symbols in name!!!! - + waist_height Short measurement name. Don't use math symbols in name!!!! - + high_hip_height Short measurement name. Don't use math symbols in name!!!! - + hip_height Short measurement name. Don't use math symbols in name!!!! - + waist_to_hip_height Short measurement name. Don't use math symbols in name!!!! - + waist_to_knee_height Short measurement name. Don't use math symbols in name!!!! - + crotch_height Short measurement name. Don't use math symbols in name!!!! - + size Short measurement name. Don't use math symbols in name!!!! @@ -4357,289 +4730,289 @@ Do you want to save your changes? Velikost - + height_front_neck_base_point Short measurement name. Don't use math symbols in name!!!! - + height_base_neck_side_point Short measurement name. Don't use math symbols in name!!!! - + height_shoulder_point Short measurement name. Don't use math symbols in name!!!! - + height_nipple_point Short measurement name. Don't use math symbols in name!!!! - + height_back_angle_axilla Short measurement name. Don't use math symbols in name!!!! - + height_scapular_point Short measurement name. Don't use math symbols in name!!!! - + height_under_buttock_folds Short measurement name. Don't use math symbols in name!!!! - + hips_excluding_protruding_abdomen Short measurement name. Don't use math symbols in name!!!! - + girth_foot_instep Short measurement name. Don't use math symbols in name!!!! - + side_waist_to_floor Short measurement name. Don't use math symbols in name!!!! - + front_waist_to_floor Short measurement name. Don't use math symbols in name!!!! - + arc_through_groin_area Short measurement name. Don't use math symbols in name!!!! - + waist_to_plane_seat Short measurement name. Don't use math symbols in name!!!! - + neck_to_radial_point Short measurement name. Don't use math symbols in name!!!! - + neck_to_third_finger Short measurement name. Don't use math symbols in name!!!! - + neck_to_first_line_chest_circumference Short measurement name. Don't use math symbols in name!!!! - + front_waist_length Short measurement name. Don't use math symbols in name!!!! - + arc_through_shoulder_joint Short measurement name. Don't use math symbols in name!!!! - + neck_to_back_line_chest_circumference Short measurement name. Don't use math symbols in name!!!! - + waist_to_neck_side Short measurement name. Don't use math symbols in name!!!! - + arc_length_upper_body Short measurement name. Don't use math symbols in name!!!! - + chest_width Short measurement name. Don't use math symbols in name!!!! - + anteroposterior_diameter_hands Short measurement name. Don't use math symbols in name!!!! - + height_clavicular_point Short measurement name. Don't use math symbols in name!!!! - + height_armhole_slash Short measurement name. Don't use math symbols in name!!!! - + slash_shoulder_height Short measurement name. Don't use math symbols in name!!!! - + half_girth_neck Short measurement name. Don't use math symbols in name!!!! - + half_girth_neck_for_shirts Short measurement name. Don't use math symbols in name!!!! - + half_girth_chest_first Short measurement name. Don't use math symbols in name!!!! - + half_girth_chest_second Short measurement name. Don't use math symbols in name!!!! - + half_girth_chest_third Short measurement name. Don't use math symbols in name!!!! - + half_girth_waist Short measurement name. Don't use math symbols in name!!!! - + half_girth_hips_considering_protruding_abdomen Short measurement name. Don't use math symbols in name!!!! - + half_girth_hips_excluding_protruding_abdomen Short measurement name. Don't use math symbols in name!!!! - + girth_knee_flexed_feet Short measurement name. Don't use math symbols in name!!!! - + neck_transverse_diameter Short measurement name. Don't use math symbols in name!!!! - + front_slash_shoulder_height Short measurement name. Don't use math symbols in name!!!! - + neck_to_front_waist_line Short measurement name. Don't use math symbols in name!!!! - + hand_vertical_diameter Short measurement name. Don't use math symbols in name!!!! - + neck_to_knee_point Short measurement name. Don't use math symbols in name!!!! - + waist_to_knee Short measurement name. Don't use math symbols in name!!!! - + shoulder_height Short measurement name. Don't use math symbols in name!!!! - + head_height Short measurement name. Don't use math symbols in name!!!! - + body_position Short measurement name. Don't use math symbols in name!!!! - + arc_behind_shoulder_girdle Short measurement name. Don't use math symbols in name!!!! - + neck_to_neck_base Short measurement name. Don't use math symbols in name!!!! - + depth_waist_first Short measurement name. Don't use math symbols in name!!!! - + depth_waist_second Short measurement name. Don't use math symbols in name!!!! @@ -4648,799 +5021,799 @@ Do you want to save your changes? MeasurementsDescriptions - + Around fullest part of Head Full measurement description - + Around middle part of Neck Full measurement description - + Around Neck at base Full measurement description - + Vertical Distance from Crown to Nape Full measurement description - + Front Neck Center over tape at Bustline to Front Waist Center Full measurement description - + Back Neck Center to Back Waist Center Full measurement description - + NeckPoint to ShoulderTip Full measurement description - + Armpit to Waist side Full measurement description - + Around Body from middle of Shoulder length to BustPoint to Crotch up back to beginning point Full measurement description - + Around Arms and Torso, at bicep level parallel to floor, with arms hanging at the sides Full measurement description - + Around Chest at Armfold level, will be parallel to floor across back, will not be parallel to floor across front chest Full measurement description - + Around fullest part of Bust, parallel to floor Full measurement description - + Around Chest below the Bust, parallel to floor Full measurement description - + Tie a string around smallest part of waist, keep string tied while taking meaasurements. Not usually parallel to floor for front waist or back waist. Full measurement description - + Around HighHip, parallel to floor Full measurement description - + Around Hip, parallel to floor Full measurement description - + Across Front UpperChest, smallest width from armscye to armscye Full measurement description - + Across Front Chest, from armfold to armfold Full measurement description - + From ShoulderTip to ShoulderTip, across Front Full measurement description - + From ShoulderTip to ShoulderTip, across Back Full measurement description - + Across Back UpperChest, smallest width from armscye to armscye Full measurement description - + Across Back Chest, from armfold to armfold Full measurement description - + Distance between BustPoints, across Chest Full measurement description - + Distance from Bustpoint, behind neck, down to Bustpoint Full measurement description - + From NeckPoint to BustPoint Full measurement description - + From Front Waist Center, down to crotch, up to Back Waist Center Full measurement description - + Sit on hard chair, measure from side waist straight down to chair bottom Full measurement description - + Vertical Distance from NeckPoint level to ShoulderTip level Full measurement description - + Degrees of angle from NeckPoint to ShoulderTip – requires goniometer Full measurement description - + ShoulderTip to Front Waist Center Full measurement description - + ShoulderTip to Back Waist Center Full measurement description - + NeckPoint straight down front chest to Waistline Full measurement description - + Back NeckPoint straight down back chest to Waistline Full measurement description - + NeckPoint to NeckPoint through Front Neck Center Full measurement description - + NeckPoint to NeckPoint across Nape Full measurement description - + Front upper-bust arc Full measurement description - + Back UpperBust side to side Full measurement description - + Front Waist side to side Full measurement description - + Back Waist side to side Full measurement description - + Front UpperHip side to side Full measurement description - + Back UpperHip side to side Full measurement description - + Front Hip side to side Full measurement description - + Back Hip side to side Full measurement description - + NeckPoint to Front ArmfoldPoint Full measurement description - + NeckPoint to Back ArmfoldPoint Full measurement description - + NeckPoint across Front Chest to Waist side Full measurement description - + NeckPoint across Back Chest to Waist side Full measurement description - + Front Neck Center straight down to UpperChest line Full measurement description - + Front Neck Center straight down to Bust line Full measurement description - + Front Upper chest waist Full measurement description - + Front waist to lower breast Full measurement description - + Back waist to upper chest Full measurement description - + Strap length Full measurement description - + Around Armscye Full measurement description - + Around Elbow with elbow bent Full measurement description - + Around UpperArm Full measurement description - + Around Wrist Full measurement description - + Nape straight down to UnderBust line (same as Back UpperBust height) Full measurement description - + NeckPoint to ShoulderTip to Wrist, with elbow bent and hand on hip Full measurement description - + Armpit to Wrist, with arm straight and hanging at side Full measurement description - + Nape to Wrist, with elbow bent and hand on hip Full measurement description - + ShoulderTip to Elbow, with elbow bent and hand on hip Full measurement description - + ShoulderTip to Wrist, with elbow bent and hand on hip Full measurement description - + Hand side to side Full measurement description - + Hand Middle Finger tip to wrist Full measurement description - + Around Hand Full measurement description - + Around Thigh Full measurement description - + Around MidThigh Full measurement description - + Around Knee Full measurement description - + Around Calf Full measurement description - + Around Ankle Full measurement description - + Knee to Floor Full measurement description - + Ankle to Floor Full measurement description - + Widest part of Foot side to side Full measurement description - + Tip of Longest Toe straight to back of heel Full measurement description - + Top of head to floor Full measurement description - + Nape to Floor Full measurement description - + Nape to Knee Full measurement description - + Waist side to floor Full measurement description - + HighHip side to Floor Full measurement description - + Hip side to Floor Full measurement description - + Waist side to Hip Full measurement description - + Waist side to Knee Full measurement description - + Crotch to Floor along inside leg Full measurement description - + Size Full measurement description Velikost - + Height of the point base of the neck in front Full measurement description - + Height of the base of the neck side point Full measurement description - + The height of the shoulder point Full measurement description - + Height nipple point Full measurement description - + Height back angle axilla Full measurement description - + Height scapular point Full measurement description - + Height under buttock folds Full measurement description - + Hips excluding protruding abdomen Full measurement description - + Girth foot instep Full measurement description - + The distance from the side waist to floor Full measurement description - + The distance from the front waist to floor Full measurement description - + Arc through groin area Full measurement description - + The distance from the waist to the plane seat Full measurement description - + The distance from the base of the neck to the side of the radial point Full measurement description - + Distance from the base of the neck side point to the end of the third finger Full measurement description - + The distance from the base of the neck to the side of the first line in front of chest circumference Full measurement description - + The distance from the base of the neck to the waist side front (waist length in the front) Full measurement description - + Arc through the highest point of the shoulder joint Full measurement description - + The distance from the base of the neck to the back line of chest circumference of the first and the second based on ledge vanes Full measurement description - + The distance from the waist to the back base of the neck side point Full measurement description - + Arc length of the upper body through the base of the neck side point Full measurement description - + Chest width Full measurement description - + Anteroposterior diameter of the hands Full measurement description - + Height clavicular point Full measurement description - + The distance from the point to the cervical level of the posterior angle of the front armpit (underarm height oblique) Full measurement description - + Slash shoulder height Full measurement description - + Half girth neck Full measurement description - + Half girth neck for shirts Full measurement description - + Half girth chest first Full measurement description - + Half girth chest second Full measurement description - + Half girth chest third Full measurement description - + Half girth waist Full measurement description - + Half girth hips considering protruding abdomen Full measurement description - + Half girth hips excluding protruding abdomen Full measurement description - + Girth knee flexed feet Full measurement description - + Neck transverse diameter Full measurement description - + Front slash shoulder height Full measurement description - + The distance from the base of the neck to the waist line front Full measurement description - + Hand vertical diameter Full measurement description - + Distance from neck to knee point Full measurement description - + The distance from the waist to the knee Full measurement description - + Shoulder height Full measurement description - + Head height Full measurement description - + Body position Full measurement description - + Arc behind the shoulder girdle Full measurement description - + Distance from neck point to point on the base of the neck side neck girth measurement line Full measurement description - + Depth waist first Full measurement description - + Depth waist second Full measurement description @@ -5449,799 +5822,799 @@ Do you want to save your changes? MeasurementsFullNames - + Head girth Full measurement name - + Mid-neck girth Full measurement name - + Neck Base girth Full measurement name - + Head and Neck length Full measurement name - + Front Center length Full measurement name - + Back Center length Full measurement name - + Shoulder length Full measurement name - + Side Waist length Full measurement name - + Trunk length Full measurement name - + Shoulder girth Full measurement name - + Upper Chest girth Full measurement name - + Bust girth Full measurement name - + Under Bust girth Full measurement name - + Waist girth Full measurement name - + HighHip girth Full measurement name - + Hip girth Full measurement name - + Front Upper Chest width Full measurement name - + Front Chest width Full measurement name - + Front Across Shoulder width Full measurement name - + Back Across Shoulder width Full measurement name - + Back Upper Chest width Full measurement name - + Back Chest width Full measurement name - + BustPoint to BustPoint Full measurement name - + Halter Bustpoint to Bustpoint Full measurement name - + NeckPoint to BustPoint Full measurement name - + Crotch length Full measurement name - + Rise height Full measurement name - + Shoulder Drop Full measurement name - + Shoulder Slope degrees Full measurement name - + Front Shoulder Balance Full measurement name - + Back Shoulder Balance Full measurement name - + Front Full Length Full measurement name - + Back Full Length Full measurement name - + Front Neck arc Full measurement name - + Back Neck arc Full measurement name - + Front upper-bust arc Full measurement name - + Back UpperBust arc Full measurement name - + Front Waist arc Full measurement name - + Back Waist arc Full measurement name - + Front UpperHip arc Full measurement name - + Back UpperHip arc Full measurement name - + Front Hip arc Full measurement name - + Back Hip arc Full measurement name - + Chest Balance Full measurement name - + Back Balance Full measurement name - + Front Waist Balance Full measurement name - + Back Waist Balance Full measurement name - + Front UpperChest height Full measurement name - + Bust height Full measurement name - + Front Upper chest waist Full measurement name - + Front waist to lower breast Full measurement name - + Back waist to upper chest Full measurement name - + Strap length Full measurement name - + Armscye Girth Full measurement name - + Elbow Girth Full measurement name - + Upperarm Girth Full measurement name - + Wrist girth Full measurement name - + Armscye depth Full measurement name - + Shoulder and Arm length Full measurement name - + Underarm length Full measurement name - + Nape to wrist length Full measurement name - + Elbow length Full measurement name - + Arm length Full measurement name - + Hand width Full measurement name - + Hand length Full measurement name - + Hand girth Full measurement name - + Thigh girth Full measurement name - + Midthigh girth Full measurement name - + Knee girth Full measurement name - + Calf girth Full measurement name - + Ankle girth Full measurement name - + Knee height Full measurement name - + Ankle height Full measurement name - + Foot width Full measurement name - + Foot length Full measurement name - + Total Height Full measurement name - + Nape height Full measurement name - + Nape to knee height Full measurement name - + Waist height Full measurement name - + HighHip height Full measurement name - + Hip height Full measurement name - + Waist to Hip height Full measurement name - + Waist to Knee height Full measurement name - + Crotch height/Inseam Full measurement name - + Size Full measurement name Velikost - + Height front neck base point Full measurement name - + Height base neck side point Full measurement name - + Height shoulder point Full measurement name - + Height nipple point Full measurement name - + Height back angle axilla Full measurement name - + Height scapular point Full measurement name - + Height under buttock folds Full measurement name - + Hips excluding protruding abdomen Full measurement name - + Girth foot instep Full measurement name - + Side waist to floor Full measurement name - + Front waist to floor Full measurement name - + Arc through groin area Full measurement name - + Waist to plane seat Full measurement name - + Neck to radial point Full measurement name - + Neck to third finger Full measurement name - + Neck to first line chest circumference Full measurement name - + Front waist length Full measurement name - + Arc through shoulder joint Full measurement name - + Neck to back line chest circumference Full measurement name - + Waist to neck side Full measurement name - + Arc length upper body Full measurement name - + Chest width Full measurement name - + Anteroposterior diameter hands Full measurement name - + Height clavicular point Full measurement name - + Height armhole slash Full measurement name - + Slash shoulder height Full measurement name - + Half girth neck Full measurement name - + Half girth neck for shirts Full measurement name - + Half girth chest first Full measurement name - + Half girth chest second Full measurement name - + Half girth chest third Full measurement name - + Half girth waist Full measurement name - + Half girth hips considering protruding abdomen Full measurement name - + Half girth hips excluding protruding abdomen Full measurement name - + Girth knee flexed feet Full measurement name - + Neck transverse diameter Full measurement name - + Front slash shoulder height Full measurement name - + Neck to front waist line Full measurement name - + Hand vertical diameter Full measurement name - + Neck to knee point Full measurement name - + Waist to knee Full measurement name - + Shoulder height Full measurement name - + Head height Full measurement name - + Body position Full measurement name - + Arc behind shoulder girdle Full measurement name - + Neck to neck base Full measurement name - + Depth waist first Full measurement name - + Depth waist second Full measurement name @@ -6350,19 +6723,19 @@ Do you want to save your changes? PostfixOperators - + cm centimeter - + mm millimeter - + in inch @@ -6424,7 +6797,7 @@ Do you want to save your changes? QObject - + Create new pattern piece to start working. @@ -6439,18 +6812,18 @@ Do you want to save your changes? - + mm - - + + cm - + inch @@ -6466,7 +6839,7 @@ Do you want to save your changes? STDescriptions - + Standard figures of men 1st group, chest 100 cm Standard table description @@ -6659,12 +7032,12 @@ Do you want to save your changes? VAbstractTool - + Confirm the deletion. - + Do you really want delete? @@ -6676,35 +7049,45 @@ Do you want to save your changes? Chyba! - + Error parsing file. Program will be terminated. Chyba při zpracování souboru. Program bude ukončen. - + Error bad id. Program will be terminated. Chyba. Špatný identifikátor. Program bude ukončen. - + Error can't convert value. Program will be terminated. Chyba. Nelze převést hodnotu. Program bude ukončen. - + Error empty parameter. Program will be terminated. Chyba. Prázdný parametr. Program bude ukončen. - + Error wrong id. Program will be terminated. Chyba. Špatný identifikátor. Program bude ukončen. - + Something's wrong!! + + + Could not copy temp file to document file + + + + + Could not remove document file + + Something wrong!! Něco je špatně! @@ -6743,48 +7126,53 @@ Do you want to save your changes? Nelze převést na parametr toLongLong - + Can't convert toUInt parameter - + Can't convert toBool parameter - + Got empty parameter Obdržen prázdný parametr - + Can't convert toDouble parameter Nelze převést na parametr toDouble - - + + Can't open file %1: %2. - + Can't open schema file %1: %2. - + Validation error file %3 in line %1 column %2 - + Parsing error file %3 in line %1 column %2 + + + Couldn't get node + + This id is not unique. Toto ID není jedinečné. @@ -6907,7 +7295,7 @@ Do you want to save your changes? VException - + Critical error! @@ -6947,188 +7335,200 @@ Do you want to save your changes? VPattern - - Can't find tool id = %1 in table. + + Can't find tool in table. - + Error no unique id. - - + + Error parsing file. Chyba při zpracování souboru. - + Error can't convert value. Chyba. Nelze převést hodnotu. - + Error empty parameter. Chyba. Prázdný parametr. - + Error wrong id. Chyba. Špatné ID. - + Critical error! - + Error parsing file (std::bad_alloc). - + Error creating or updating detail Chyba při vytváření nebo aktualizaci detailu - + Error creating or updating single point Chyba při vytváření nebo aktualizaci základního bodu - - + + Error creating or updating point of end line Chyba při vytváření nebo aktualizaci bodu na konci čáry - - + + Error creating or updating point along line Chyba při vytváření nebo aktualizaci bodu podél čáry - - + + Error creating or updating point of shoulder Chyba při vytváření nebo aktualizaci bodu ramene - - + + Error creating or updating point of normal Chyba při vytváření nebo aktualizaci bodu kolmice - - + + Error creating or updating point of bisector Chyba při vytváření nebo aktualizaci bodu osy úhlu - + Error creating or updating point of lineintersection Chyba při vytváření nebo aktualizaci bodu průsečíku čar - - + + Error creating or updating point of contact Chyba při vytváření nebo aktualizaci bodu dotyku - + Error creating or updating modeling point Chyba při vytváření nebo aktualizaci bodu - + Error creating or updating height Chyba při vytváření nebo aktualizaci výšky - + Error creating or updating triangle Chyba při vytváření nebo aktualizaci trojúhelníku - + Error creating or updating point of intersection Chyba při vytváření nebo aktualizaci bodu průsečíku - - + + Error creating or updating cut spline point - - + + Error creating or updating cut spline path point - - + + Error creating or updating cut arc point - + + + Error creating or updating point of intersection line and axis + + + + + + Error creating or updating point of intersection curve and axis + + + + Error creating or updating line Chyba při vytváření nebo aktualizaci čáry - + Error creating or updating simple curve Chyba při vytváření nebo aktualizaci křivky - + Error creating or updating curve path Chyba při vytváření nebo aktualizaci cesty křivky - + Error creating or updating modeling simple curve Chyba při vytváření nebo aktualizaci modelové křivky - + Error creating or updating modeling curve path Chyba při vytváření nebo aktualizaci cesty modelové křivky - - + + Error creating or updating simple arc Chyba při vytváření nebo aktualizaci oblouku - + Error creating or updating modeling arc Chyba při vytváření nebo aktualizaci modelového oblouku - + Error creating or updating union details - + Got wrong parameter id. Need only id > 0. Obdrženo špatné ID parametru. Je potřeba jen ID > 0. - + This id is not unique. Toto ID není jedinečné. - + File error. @@ -7182,173 +7582,185 @@ Do you want to save your changes? VToolOptionsPropertyBrowser - + Base point Základní bod - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + Point label - + Position - + Point at distance and angle - - - - - - - + + + + + + + + + Line type - - - - - - - - + + + + + + + + Length Délka - + + + Angle - + Point at distance along line - + Arc Oblouk - - + + Radius Poloměr - + First angle - + Second angle - + Point along bisector - + Cut arc tool - + Tool for segmenting a curve - + Tool segment a pathed curve - + Perpendicular point along line - + Line between points - + Point at line intersection - + Point along perpendicular - + Additional angle degrees Dodatečné úhlové stupně - + Point at intersection of arc and line - + Tool to make point from x & y of two other points - + Special point on shoulder - + Curve tool - - + + Curve factor - + Tool for path curve - + Tool triangle + + + + Point intersection line and axis + + VToolTriangle @@ -7360,36 +7772,44 @@ Do you want to save your changes? Variables - + Line_ Left symbol _ in name - + AngleLine_ Left symbol _ in name - + Arc_ Left symbol _ in name - + Spl_ Left symbol _ in name - + SplPath Do not add symbol _ to the end of name + + VisToolCurveIntersectAxis + + + <b>Intersection curve and axis</b>: angle = %1°; <b>Shift</b> - sticking angle, <b>Enter</b> - finish creation + + + VisToolEndLine @@ -7398,6 +7818,14 @@ Do you want to save your changes? + + VisToolLineIntersectAxis + + + <b>Intersection line and axis</b>: angle = %1°; <b>Shift</b> - sticking angle, <b>Enter</b> - finish creation + + + VisToolSplinePath @@ -7409,12 +7837,12 @@ Do you want to save your changes? main - + Pattern making program. - + Pattern file. diff --git a/src/app/share/translations/valentina_de_DE.ts b/src/app/share/translations/valentina_de_DE.ts index c165d0d45..4082e4ded 100644 --- a/src/app/share/translations/valentina_de_DE.ts +++ b/src/app/share/translations/valentina_de_DE.ts @@ -147,85 +147,100 @@ ConfigurationPage - + Setup user interface language updated and will be used the next time start - + Default unit updated and will be used the next pattern creation - + Save Speichern - + Auto-save modified pattern - + Interval: - + min min - + Language Sprache - + GUI language GUI Sprache - + Decimal separator parts - + With OS options (%1) - + Default unit - + Centimeters Zentimeter - + Millimiters - + Inches Zoll - + Label language + + + Send crash reports + + + + + Send crash reports (recommended) + + + + + After each crash Valentina collect information that may help us fix a problem. We do not collect any personal information. Find more about what <a href="https://bitbucket.org/dismine/valentina/wiki/manual/Crash_reports">kind of information</a> we collect. + + DelTool - + Delete tool @@ -317,97 +332,101 @@ Wert der Länge - + <html><head/><body><p>Show full calculation in message box</p></body></html> - + Point label Bezeichnung des Punktes - + First point Erster Punkt - + First point of line Erster Punkt der Linie - + Second point Zweiter Punkt - + Second point of line Zweiter Punkt der Linie - + Type of line Linientyp - + Show line from first point to this point Linie vom ersten zu diesem Punkt zeigen - + Input data Eingabedaten - + Size and height Konfektion und Größe - - Standard table - Standardtabelle + + Measurements + Maße - + Standard table + Standardtabelle + + + Increments weitere Maße - + Length of lines Linienlängen - + Length of arcs Bogenlängen - + Length of curves Kurvenlängen - + Angle of lines - + Hide empty measurements - + Variables - Click twice to insert into formula Variablen - Doppelklick fügt die Variable in die Formel ein - + Select second point of line Zweiten Punkt der Linie auswählen @@ -431,8 +450,8 @@ - - + + Calculate value Wert berechnen @@ -442,39 +461,44 @@ Wert des Radius - - + + <html><head/><body><p>Show full calculation in message box</p></body></html> - + Insert variable into formula Variable in die Formel einfügen - + Value of first angle Wert des ersten Winkels - + + Measurements + Maße + + + First angle - + Second angle - + Insert marked variable into formula Markierte Variable in die Formel einfügen - + Value of second angle Wert des zweiten Winkels @@ -499,9 +523,8 @@ Konfektion und Größe - Standard table - Standardtabelle + Standardtabelle @@ -539,7 +562,7 @@ Variablen - + Value of angle of line. Wert des Linenwinkels. @@ -577,116 +600,234 @@ - + <html><head/><body><p>Show full calculation in message box</p></body></html> - + Point label Bezeichnung des Punktes - + First point Erster Punkt - + First point of angle Punkt der ersten Schenkelgeraden - + Second point Zweiter Punkt - + Second point of angle Scheitel des Winkels - + Third point Punkt der zweiten Scheitelgeraden - + Third point of angle Punkt der zweiten Schenkelgeraden - + Type of line Linientyp - + Show line from second point to this point Zeige Linie vom Scheitelpunkt zu diesem Punkt - + Input data Eingabedaten - + Size and height Konfektion und Größe - - Standard table - Standardtabelle + + Measurements + Maße - + Standard table + Standardtabelle + + + Increments weitere Maße - + Length of lines Linienlängen - + Length of arcs Bogenlängen - + Length of curves Kurvenlängen - + Angle of lines - + Hide empty measurements - + Variables - Click twice to insert into formula Variablen - Doppelklick fügt die Variable in die Formel ein - + Select second point of angle Scheitelpunkt auswählen - + Select third point of angle zweiten Punkt auf dem zweiten Schenkel wählen + + DialogCurveIntersectAxis + + + Curve intersect axis + + + + + Angle + + + + + Calculate value + Wert berechnen + + + + Value of angle + + + + + <html><head/><body><p>Show full calculation in message box</p></body></html> + + + + + Axis point + + + + + + First point of line + Erster Punkt der Linie + + + + Curve + Kurve + + + + Point label + Bezeichnung des Punktes + + + + Type of line + Linientyp + + + + Show line from first point to this point + Linie vom ersten zu diesem Punkt zeigen + + + + Input data + Eingabedaten + + + + Size and height + Konfektion und Größe + + + + Measurements + Maße + + + + Increments + weitere Maße + + + + Length of lines + + + + + Length of arcs + + + + + Length of curves + + + + + Angle of lines + + + + + Hide empty measurements + + + + + Variables + Variablen + + + + Select axis point + + + DialogCutArc @@ -715,72 +856,76 @@ - + <html><head/><body><p>Show full calculation in message box</p></body></html> - + Arc Bogen - + Selected curve Ausgewählte Kurve - + Point label Bezeichnung des Punktes - + Input data Eingabedaten - + Size and height Konfektion und Größe - - Standard table - Standardtabelle + + Measurements + Maße - + Standard table + Standardtabelle + + + Increments weitere Maße - + Length of lines Linienlängen - + Length of arcs Bogenlängen - + Length of curves Kurvenlängen - + Angle of lines - + Hide empty measurements - + Variables - Click twice to insert into formula Variablen - Doppelklick fügt die Variable in die Formel ein @@ -813,72 +958,76 @@ - + <html><head/><body><p>Show full calculation in message box</p></body></html> - + Curve Kurve - + Selected curve Ausgewählte Kurve - + Point label Bezeichnung des Punktes - + Input data Eingabedaten - + Size and height Konfektion und Größe - - Standard table - Standardtabelle + + Measurements + Maße - + Standard table + Standardtabelle + + + Increments weitere Maße - + Length of lines Linienlängen - + Length of arcs Bogenlängen - + Length of curves Kurvenlängen - + Angle of lines - + Hide empty measurements - + Variables - Click twice to insert into formula Variablen - Doppelklick fügt die Variable in die Formel ein @@ -911,72 +1060,76 @@ - + <html><head/><body><p>Show full calculation in message box</p></body></html> - + Curve Kurve - + Selected curve path Ausgewählter Kurvenpfad - + Point label Bezeichnung des Punktes - + Input data Eingabedaten - + Size and height Konfektion und Größe - - Standard table - Standardtabelle + + Measurements + Maße - + Standard table + Standardtabelle + + + Increments weitere Maße - + Length of lines Linienlängen - + Length of arcs Bogenlängen - + Length of curves Kurvenlängen - + Angle of lines - + Hide empty measurements - + Variables - Click twice to insert into formula Variablen - Doppelklick fügt die Variable in die Formel ein @@ -985,7 +1138,7 @@ DialogDetail - + Detail Detail @@ -995,44 +1148,44 @@ Bias X - - - + + + cm cm - + Bias Y Bias Y - + Options Optionen - + Name of detail Name des Deails - + Seam allowance Nahtzugaben - + Width Breite - + Closed Geschlossen - + Delete Löschen @@ -1075,57 +1228,61 @@ - + <html><head/><body><p>Show full calculation in message box</p></body></html> <html><head/><body><p>Zeige die ganze Berechnung in der Nachrichtenbox box</p></body></html> - + Input data Eingabedaten - + Size and height Konfektion und Größe - - Standard table - Standardtabelle + + Measurements + Maße - + Standard table + Standardtabelle + + + Increments weitere Maße - + Length of lines Linienlänge - + Length of arcs Bogenlänge - + Length of curves Kurvenlänge - + Angle of lines Winkel der Linien - + Hide empty measurements - + Variables Variablen @@ -1144,7 +1301,7 @@ - + Calculate value Wert berechnen @@ -1154,93 +1311,97 @@ Wert der Länge - - + + <html><head/><body><p>Show full calculation in message box</p></body></html> - + Angle - + Value of angle - + Base point Startpunkt - + First point of line Erster Punkt der Linie - + Point label Bezeichnung des Punktes - + Type of line Linientyp - + Show line from first point to this point Linie vom ersten zu diesem Punkt zeigen - + Input data Eingabedaten - + Size and height Konfektion und Größe - - Standard table - Standardtabelle + + Measurements + Maße - + Standard table + Standardtabelle + + + Increments weitere Maße - + Length of lines Linienlängen - + Length of arcs Bogenlängen - + Length of curves Kurvenlängen - + Angle of lines - + Hide empty measurements - + Variables Variablen @@ -1257,35 +1418,35 @@ Größe - + Point label Bezeichnung des Punktes - + Base point Startpunkt - - - - + + + + First point of line Erster Punkt der Linie - + Second point of line Zweiter Punkt der Linie - + Type of line Linientyp - + Show line from first point to our point Zeige linie vom ersten punkt zu diesem Punkt @@ -1295,7 +1456,7 @@ Ersten Punkt der Linie auswählen - + Select second point of line Zweiten Punkt der Linie auswählen @@ -1309,105 +1470,115 @@ - + Tool Werkzeug - - - - - + + + + + Can't create record. - + %1 - Base point %1 - Startpunkt + - %1_%2 - Line from point %1 to point %2 %1_%2 - Linie von Punkt %1 nach Punkt %2 - + %3 - Point along line %1_%2 %3 - Punkt auf der Linie %1_%2 - + %1 - Point of shoulder %1 -. Schulterpunkt - + %3 - normal to line %1_%2 %3 - Normale zur Linie %1_%2 - + %4 - bisector of angle %1_%2_%3 %4 - Winkelhalbierende des Winkels %1_%2_%3 - + %5 - intersection of lines %1_%2 and %3_%4 %5 - Schnittpunkt der Linien %1_%2 und %3_%4 - + Curve %1_%2 Kurve %1_%2 - + Arc with center in point %1 Bogen mit dem Mittelpunkt %1 - + Curve point %1 Kurvenpunkt %1 - + %4 - point of contact of arc with the center in point %1 and line %2_%3 %4 - Kontaktpunkt von Bogen und dem Mittelpunkt von Punkt %1 und Linie %2_%3 - + Point of perpendicular from point %1 to line %2_%3 Lotfußpunkt von Punkt %1 zu Linie %2_%3 - + Triangle: axis %1_%2, points %3 and %4 Dreieck: Achse %1_%2, Punkte %3 und %4 - + %1 - point of intersection %2 and %3 %1 - Schnittpunkt von %2 und %3 - + %1 - cut arc with center %2 %1 - Bogen mit Zentrum %2 schneiden - + %1 - cut curve %2_%3 %1 - schneide Kurve %2_%3 - + %1 - cut curve path %2 + + + %1 - point of intersection line %2_%3 and axis through point %4 + + + + + %1 - point of intersection curve and axis through point %2 + + DialogIncrements @@ -1449,7 +1620,7 @@ - + Description Beschreibung @@ -1539,53 +1710,83 @@ - - + + File error. Dateifehler. - + male männlich - + female weiblich - + + Could not save GivenName + + + + + Could not save FamilyName + + + + + Could not save Email + + + + + Could not save Sex + + + + + Could not save BirthDate + + + + Measurements use different units than pattern. This pattern required measurements in %1 Die Maße sind in einer anderen Einheit als das Schnittmuster. Dieses Schnittmuster setzt Maße in %1 vorraus - + Individual measurements (*.vit) Individuelle Maße (*.vit) - - + + Open file Datei öffnen - - + + Wrong units. Falsche Maßeinheit. - + Standard measurements (*.vst) Standardmaße (*.vst) - + Name_%1 Name_%1 + + + Can't save measurement + + DialogIndividualMeasurements @@ -1641,39 +1842,39 @@ Bitte versuchen sie es noch einmal oder ändern sie den Datei - - + + File error. Datei Fehler. - - + + Individual measurements (*.vit) Individuelle Maße (*.vit) - + Open file Datei öffnen - + Where save measurements? - + Centimeters Zentimeter - + Millimiters - + Inches Zoll @@ -1686,22 +1887,22 @@ Linie - + First point Erster Punkt - + Second point Zweiter Punkt - + Type of line Linientyp - + Show line from first point to this point Linie vom ersten zu diesem Punkt zeigen @@ -1751,16 +1952,141 @@ Zweiten Punkt der ersten Linie auswählen - + Select first point of second line Ersten Punkt der zweiten Linie auswählen - + Select second point of second line Zweiten Punkt der zweiten Linie auswählen + + DialogLineIntersectAxis + + + Line intersect axis + + + + + Angle + + + + + Calculate value + Wert berechnen + + + + Value of angle + + + + + <html><head/><body><p>Show full calculation in message box</p></body></html> + + + + + Axis point + + + + + + + First point of line + Erster Punkt der Linie + + + + First line point + + + + + Second line point + + + + + Point label + Bezeichnung des Punktes + + + + Type of line + Linientyp + + + + Show line from first point to this point + Linie vom ersten zu diesem Punkt zeigen + + + + Input data + Eingabedaten + + + + Size and height + Konfektion und Größe + + + + Measurements + Maße + + + + Increments + weitere Maße + + + + Length of lines + + + + + Length of arcs + + + + + Length of curves + + + + + Angle of lines + + + + + Hide empty measurements + + + + + Variables + Variablen + + + + Select second point of line + Zweiten Punkt der Linie auswählen + + + + Select axis point + + + DialogMeasurements @@ -1769,27 +2095,27 @@ Maße - + <html><head/><body><p><span style=" font-size:18pt;">Please, choose pattern type.</span></p></body></html> <html><head/><body><p><span style=" font-size:18pt;">Bitte einen Schnittmustertyp auswählen.</span></p></body></html> - + Graduation Gradierung - + Use for creation pattern standard measurement table Für die Erstellung eines Schnittmusters, die Standardmaßtabelle benutzen - + Individual Individuell - + Use for creation pattern individual measurements Für die Erstellung eines Schnittmusters individuelle Maße benutzen @@ -1822,92 +2148,96 @@ Wert der Länge - + <html><head/><body><p>Show full calculation in message box</p></body></html> <html><head/><body><p>Die ganze Berechnung in der Messagebox anzeigen</p></body></html> - + Point label Bezeichnung des Punktes - + First point Erster Punkt - + Second point Zweiter Punkt - + Additional angle degrees Zusätzlicher Winkel - + Type of line Linientyp - + Show line from first point to this point Linie vom ersten zu diesem Punkt zeigen - + Input data Eingabedaten - + Size and height Konfektion und Größe - - Standard table - Standardtabelle + + Measurements + Maße - + Standard table + Standardtabelle + + + Increments weitere Maße - + Length of lines Linienlängen - + Length of arcs Bogenlängen - + Length of curves Kurvenlängen - + Angle of lines - + Hide empty measurements - + Variables - Click twice to insert into formula Variablen - Doppelklick fügt die Variable in die Formel ein - + Select second point of line Zweiten Punkt der Linie auswählen @@ -2158,88 +2488,92 @@ Wert des Radius - + <html><head/><body><p>Show full calculation in message box</p></body></html> <html><head/><body><p>Die vollständige Berechnung in einer Messagebox anzeigen</p></body></html> - + Point label Bezeichnung des Punktes - + Center of arc Mittelpunkt des Bogens - - + + Select point of center of arc Mittelpunkt des Bogens auswählen - + Top of the line Anfang der Linie - + End of the line Ende der Linie - + Input data Eingabedaten - + Size and height Konfektion und Größe - - Standard table - Standardtabelle + + Measurements + Maße - + Standard table + Standardtabelle + + + Increments weitere Maße - + Length of lines Linienlängen - + Length of arcs Bogenlängen - + Length of curves Kurvenlängen - + Angle of lines - + Hide empty measurements - + Variables - Click twice to insert into formula. Variablen - Doppelklick fügt die Variable in die Formel ein. - + Select second point of line Zweiten Punkt der Linie auswählen @@ -2257,22 +2591,22 @@ Bezeichnung des Punktes - + vertical point vertikaler Punkt - + First point of angle Punkt der ersten Schenkelgeraden - + horizontal point horizontaler Punkt - + Second point of angle Scheitel des Winkels @@ -2310,97 +2644,101 @@ Wert der Länge - + <html><head/><body><p>Show full calculation in message box</p></body></html> - + Point label Bezeichnung des Punktes - + First point Erster Punkt - + Second point Zweiter Punkt - + Third point Punkt der zweiten Scheitelgeraden - + Type of line Linientyp - + Show line from first point to our point Zeige linie vom ersten punkt zu diesem Punkt - + Input data Eingabedaten - + Size and height Konfektion und Größe - - Standard table - Standardtabelle + + Measurements + Maße - + Standard table + Standardtabelle + + + Increments weitere Maße - + Length of lines Linienlängen - + Length of arcs - + Length of curves Kurvenlängen - + Angle of lines - + Hide empty measurements - + Variables - Click twice to insert into formula Variablen - Doppelklick fügt die Variable in die Formel ein - + Select first point of line Ersten Punkt der Linie auswählen - + Select second point of line Zweiten Punkt der Linie auswählen @@ -2489,9 +2827,13 @@ DialogSplinePath - Curve path - Kurvenpfad + Kurvenpfad + + + + Curved path + @@ -2560,51 +2902,51 @@ DialogTool - - - - - + + + + + Error Fehler - + Empty field - + Value can't be 0 - + Value - + Height Größe - + Size Konfektion - + Line length Linienlänge - + Arc length Bogenlänge - + Curve length Kurvenlänge @@ -2622,30 +2964,30 @@ Bezeichnung des Punktes - + First point of axis Erster Punkt der Achse - - - - + + + + First point of line Erster Punkt der Linie - + Second point of axis Zweiter Punkt der Achse - + First point Erster Punkt - + Second point Zweiter Punkt @@ -2655,12 +2997,12 @@ Den zweiten Punkt der Achse auswählen - + Select first point Zweiten Punkt wählen - + Select second point Zweiten Punkt wählen @@ -2730,151 +3072,151 @@ Functions - + sin sine function - + cos cosine function - + tan tangens function - + asin arcus sine function - + acos arcus cosine function - + atan arcus tangens function - + sinh hyperbolic sine function - + cosh hyperbolic cosine - + tanh hyperbolic tangens function - + asinh hyperbolic arcus sine function - + acosh hyperbolic arcus tangens function - + atanh hyperbolic arcur tangens function - + log2 logarithm to the base 2 - + log10 logarithm to the base 10 - + log logarithm to the base 10 - + ln logarithm to base e (2.71828...) - + exp e raised to the power of x - + sqrt square root of a value - + sign sign function -1 if x<0; 1 if x>0 - + rint round to nearest integer - + abs absolute value - + min min of all arguments min - + max max of all arguments - + sum sum of all arguments - + avg mean value of all arguments @@ -2951,634 +3293,713 @@ Werkzeug zum Erstellen eines Punktes aus den x- und y-Koordinaten zweier anderer Punkte. - + Tools for creating lines. Werkzeuge zur Linienerzeugung. - + Line Linie - + Line between points Linie zwischen Punkten - + Point at line intersection Linienschnittpunkt - + Tools for creating curves. Werkzeuge zur Kurvenerzeugung. - + Curve Kurve - + Curve tool. Kurvenverkzeug. - + Tool for path curve. Werkzeug zur Definition einer Kurve. - + Tool segment a pathed curve. Werkzeug zum Segmentieren einer definierten Kurve - + Tool for segmenting a curve. Werkzeug zur Kurvensegmentierung. - + + Point of intersection line and axis + + + + + + + ... + + + + Tools for creating arcs. Werkzeuge zur Kurvenerzeugung. - + Arc Bogen - + Arc tool. Bogenwerkzeug. - + Cut arc tool. - + Tools for creating details. Werkzeuge zur Detailerzeugung. - + Detail Detail - + Tool new detail. Werkzeug neues Detail. - + Tool for union two details. - + &File - + &Help - + &Pattern piece - + Measurements Maße - + + Window + + + + Toolbar files - + ToolBar modes - + Toolbar pattern - + Toolbar options - + Toolbar tools - + Tool options - + Save &As... - + Export pattern (layout) - + About &Qt - + &About Valentina &Über Valentina - + E&xit - + Exit the application - + Preferences - + Zoom in - + Original zoom - + Original Zoom - + Zoom fit best - + + Ctrl+= + + + + + Stop + Stop + + + + Stop using tool + + + + + Repot Bug... + + + + + Report bug + + + + + Close window + + + + zoom in - - + + Zoom out - + Edit pattern XML code - + Pattern properties Schnittmustereigenschaften - + New Neu - + &New &Neu - + Create a new pattern Neues Schnittmuster erstellen - + Ctrl+N Strg+N - + Open Öffnen - + &Open &Öffnen - + Open file with pattern Datei mit Schnittmuster öffnen - + Save Speichern - + &Save &Speichern - + Save pattern Schnittmuster speichern - + Ctrl+S Strg+S - + Save as Speichern als - + Save not yet saved pattern Speichere ungesichertes Schnittmuster - + Ctrl+Shift+S Strg+Umschalt+S - + Draw Zeichnen - + Draw mode Zeichnenmodus - + Ctrl+W Strg+W - + Details Details - + Details mode Detailmodus - + Ctrl+E Strg+E - - + + Pointer tools Zeigerwerkzeuge - + New pattern piece Neues Schnittteil - + Add new pattern piece Neues Schnittteil hinzufügen - + Ctrl+Shift+N Strg+Umschalt+N - - + + Change the label of pattern piece Das Label eines Schnittteils ändern - + Table of variables Variablentabelle - + Tables of variables Variablentabellen - + Ctrl+T Strg+T - + History Chronik - + Ctrl+H Strg+H - + Create layout Layout erstellen - + Ctrl+L Strg+L - + About Qt Über Qt - + Ctrl+Q Strg+Q - + Pattern piece %1 Schnittteil %1 - + Pattern piece: Schnittteil: - + Enter a new label for the pattern piece. Es muss ein neues Label für das Schnittteil eingegeben werden. - - - + + + Select point Punkt wählen - + + Individual measurements is under development + + + + + There is no way create individual measurements file independent on the pattern file. +For opening pattern need keep both files: pattern and measurements. Do you want continue? + + + + Select first point Zweiten Punkt wählen - - + + + Select first point of line Ersten Punkt der Linie auswählen - + Select first point of angle Den Erstehn Punkt des Winkels wählen - + Select first point of first line Den ersten Punkt der Linie wählen - + Select first point curve Ersten Punkt der Kurve wählen - + Select simple curve Einfache Kurve auswählen - + Select point of center of arc Mittelpunkt des Bogens auswählen - + Select point of curve path Punkt für den Kurvenpfad auswählen - + Select curve path Kurvenpfad auswählen - + Select points, arcs, curves clockwise. Punkte, Bögen, Kurven im Uhrzeigersinn auswählen. - + Select base point Fußpunkt auswählen - + Select first point of axis Ersten Punkt der Achse auswählen - + Select point vertically - + Select detail Detail auswählen - + Select arc - + + Select curve + + + + Size: - + pattern - + Critical error! - + Error parsing file (std::bad_alloc). - + Bad id. - + + Could not save file + + + + &Undo - + &Redo &Wiederholen - + Wrong units. Falsche Maßeinheiten. - + Application doesn't support standard table with inches. - + File error. Dateifehler. - + + Valentina didn't shut down correctly. Do you want reopen files (%1) you had open? + + + + + Reopen files. + + + + The measurements file <br/><br/> <b>%1</b> <br/><br/> %3 - + could not be found. Do you want to update the file location - + Standard measurements (*.vst) Standardmaße (*.vst) - + Individual measurements (*.vit) Individuelle Maße (*.vit) - + File loaded - + Height: Größe: - + Pattern Piece: Schnittteil: - - + + Pattern files (*.val) Schnittmuster Dateien (*.val) - + /pattern.val /schnittmuster.val - + File saved Datei gespeichert - + untitled.val unbenannt.val - + Unsaved change Ungespeicherte Änderungen - + The pattern has been modified. Do you want to save your changes? Das Schnittmuster wurde geändert. Sollen die Änderungen gespeichert werden? - - + + Open file Datei öffnen - - + + Error parsing file. Fehler beim Parsen der Datei. - + Error can't convert value. Fehler Wert kann nicht konvertiert werden. - - + + Error empty parameter. Fehler leerer parameter. - + Error wrong id. Fehler falsche Id. @@ -3586,799 +4007,799 @@ Sollen die Änderungen gespeichert werden? Measurements - + head_girth Short measurement name. Don't use math symbols in name!!!! - + mid_neck_girth Short measurement name. Don't use math symbols in name!!!! - + neck_base_girth Short measurement name. Don't use math symbols in name!!!! - + head_and_neck_length Short measurement name. Don't use math symbols in name!!!! - + center_front_waist_length Short measurement name. Don't use math symbols in name!!!! - + center_back_waist_length Short measurement name. Don't use math symbols in name!!!! - + shoulder_length Short measurement name. Don't use math symbols in name!!!! schulter_breite - + side_waist_length Short measurement name. Don't use math symbols in name!!!! - + trunk_length Short measurement name. Don't use math symbols in name!!!! - + shoulder_girth Short measurement name. Don't use math symbols in name!!!! - + upper_chest_girth Short measurement name. Don't use math symbols in name!!!! - + bust_girth Short measurement name. Don't use math symbols in name!!!! - + under_bust_girth Short measurement name. Don't use math symbols in name!!!! - + waist_girth Short measurement name. Don't use math symbols in name!!!! - + high_hip_girth Short measurement name. Don't use math symbols in name!!!! - + hip_girth Short measurement name. Don't use math symbols in name!!!! - + upper_front_chest_width Short measurement name. Don't use math symbols in name!!!! - + front_chest_width Short measurement name. Don't use math symbols in name!!!! - + across_front_shoulder_width Short measurement name. Don't use math symbols in name!!!! - + across_back_shoulder_width Short measurement name. Don't use math symbols in name!!!! - + upper_back_width Short measurement name. Don't use math symbols in name!!!! - + back_width Short measurement name. Don't use math symbols in name!!!! - + bustpoint_to_bustpoint Short measurement name. Don't use math symbols in name!!!! - + halter_bustpoint_to_bustpoint Short measurement name. Don't use math symbols in name!!!! - + neck_to_bustpoint Short measurement name. Don't use math symbols in name!!!! - + crotch_length Short measurement name. Don't use math symbols in name!!!! - + rise_height Short measurement name. Don't use math symbols in name!!!! - + shoulder_drop Short measurement name. Don't use math symbols in name!!!! - + shoulder_slope_degrees Short measurement name. Don't use math symbols in name!!!! - + front_shoulder_slope_length Short measurement name. Don't use math symbols in name!!!! - + back_shoulder_slope_length Short measurement name. Don't use math symbols in name!!!! - + front_shoulder_to_waist_length Short measurement name. Don't use math symbols in name!!!! - + back_shoulder_to_waist_length Short measurement name. Don't use math symbols in name!!!! - + front_neck_arc Short measurement name. Don't use math symbols in name!!!! - + back_neck_arc Short measurement name. Don't use math symbols in name!!!! - + front_upper_chest_arc Short measurement name. Don't use math symbols in name!!!! - + back_upper_chest_arc Short measurement name. Don't use math symbols in name!!!! - + front_waist_arc Short measurement name. Don't use math symbols in name!!!! - + back_waist_arc Short measurement name. Don't use math symbols in name!!!! - + front_upper_hip_arc Short measurement name. Don't use math symbols in name!!!! - + back_upper_hip_arc Short measurement name. Don't use math symbols in name!!!! - + front_hip_arc Short measurement name. Don't use math symbols in name!!!! - + back_hip_arc Short measurement name. Don't use math symbols in name!!!! - + chest_slope Short measurement name. Don't use math symbols in name!!!! - + back_slope Short measurement name. Don't use math symbols in name!!!! - + front_waist_slope Short measurement name. Don't use math symbols in name!!!! - + back_waist_slope Short measurement name. Don't use math symbols in name!!!! - + front_neck_to_upper_chest_height Short measurement name. Don't use math symbols in name!!!! - + front_neck_to_bust_height Short measurement name. Don't use math symbols in name!!!! - + front_waist_to_upper_chest Short measurement name. Don't use math symbols in name!!!! - + front_waist_to_lower_breast Short measurement name. Don't use math symbols in name!!!! - + back_waist_to_upper_chest Short measurement name. Don't use math symbols in name!!!! - + strap_length Short measurement name. Don't use math symbols in name!!!! - + armscye_girth Short measurement name. Don't use math symbols in name!!!! - + elbow_girth Short measurement name. Don't use math symbols in name!!!! - + upper_arm_girth Short measurement name. Don't use math symbols in name!!!! - + wrist_girth Short measurement name. Don't use math symbols in name!!!! - + scye_depth Short measurement name. Don't use math symbols in name!!!! - + shoulder_and_arm_length Short measurement name. Don't use math symbols in name!!!! - + underarm_length Short measurement name. Don't use math symbols in name!!!! - + cervicale_to_wrist_length Short measurement name. Don't use math symbols in name!!!! - + shoulder_to_elbow_length Short measurement name. Don't use math symbols in name!!!! - + arm_length Short measurement name. Don't use math symbols in name!!!! - + hand_width Short measurement name. Don't use math symbols in name!!!! - + hand_length Short measurement name. Don't use math symbols in name!!!! - + hand_girth Short measurement name. Don't use math symbols in name!!!! - + thigh_girth Short measurement name. Don't use math symbols in name!!!! - + mid_thigh_girth Short measurement name. Don't use math symbols in name!!!! - + knee_girth Short measurement name. Don't use math symbols in name!!!! - + calf_girth Short measurement name. Don't use math symbols in name!!!! - + ankle_girth Short measurement name. Don't use math symbols in name!!!! - + knee_height Short measurement name. Don't use math symbols in name!!!! - + ankle_height Short measurement name. Don't use math symbols in name!!!! - + foot_width Short measurement name. Don't use math symbols in name!!!! - + foot_length Short measurement name. Don't use math symbols in name!!!! - + height Short measurement name. Don't use math symbols in name!!!! - + cervicale_height Short measurement name. Don't use math symbols in name!!!! - + cervicale_to_knee_height Short measurement name. Don't use math symbols in name!!!! - + waist_height Short measurement name. Don't use math symbols in name!!!! - + high_hip_height Short measurement name. Don't use math symbols in name!!!! - + hip_height Short measurement name. Don't use math symbols in name!!!! - + waist_to_hip_height Short measurement name. Don't use math symbols in name!!!! - + waist_to_knee_height Short measurement name. Don't use math symbols in name!!!! - + crotch_height Short measurement name. Don't use math symbols in name!!!! - + size Short measurement name. Don't use math symbols in name!!!! - + height_front_neck_base_point Short measurement name. Don't use math symbols in name!!!! - + height_base_neck_side_point Short measurement name. Don't use math symbols in name!!!! - + height_shoulder_point Short measurement name. Don't use math symbols in name!!!! - + height_nipple_point Short measurement name. Don't use math symbols in name!!!! - + height_back_angle_axilla Short measurement name. Don't use math symbols in name!!!! - + height_scapular_point Short measurement name. Don't use math symbols in name!!!! - + height_under_buttock_folds Short measurement name. Don't use math symbols in name!!!! - + hips_excluding_protruding_abdomen Short measurement name. Don't use math symbols in name!!!! - + girth_foot_instep Short measurement name. Don't use math symbols in name!!!! - + side_waist_to_floor Short measurement name. Don't use math symbols in name!!!! - + front_waist_to_floor Short measurement name. Don't use math symbols in name!!!! - + arc_through_groin_area Short measurement name. Don't use math symbols in name!!!! - + waist_to_plane_seat Short measurement name. Don't use math symbols in name!!!! - + neck_to_radial_point Short measurement name. Don't use math symbols in name!!!! - + neck_to_third_finger Short measurement name. Don't use math symbols in name!!!! - + neck_to_first_line_chest_circumference Short measurement name. Don't use math symbols in name!!!! - + front_waist_length Short measurement name. Don't use math symbols in name!!!! - + arc_through_shoulder_joint Short measurement name. Don't use math symbols in name!!!! - + neck_to_back_line_chest_circumference Short measurement name. Don't use math symbols in name!!!! - + waist_to_neck_side Short measurement name. Don't use math symbols in name!!!! - + arc_length_upper_body Short measurement name. Don't use math symbols in name!!!! - + chest_width Short measurement name. Don't use math symbols in name!!!! - + anteroposterior_diameter_hands Short measurement name. Don't use math symbols in name!!!! - + height_clavicular_point Short measurement name. Don't use math symbols in name!!!! - + height_armhole_slash Short measurement name. Don't use math symbols in name!!!! - + slash_shoulder_height Short measurement name. Don't use math symbols in name!!!! - + half_girth_neck Short measurement name. Don't use math symbols in name!!!! - + half_girth_neck_for_shirts Short measurement name. Don't use math symbols in name!!!! - + half_girth_chest_first Short measurement name. Don't use math symbols in name!!!! - + half_girth_chest_second Short measurement name. Don't use math symbols in name!!!! - + half_girth_chest_third Short measurement name. Don't use math symbols in name!!!! - + half_girth_waist Short measurement name. Don't use math symbols in name!!!! - + half_girth_hips_considering_protruding_abdomen Short measurement name. Don't use math symbols in name!!!! - + half_girth_hips_excluding_protruding_abdomen Short measurement name. Don't use math symbols in name!!!! - + girth_knee_flexed_feet Short measurement name. Don't use math symbols in name!!!! - + neck_transverse_diameter Short measurement name. Don't use math symbols in name!!!! - + front_slash_shoulder_height Short measurement name. Don't use math symbols in name!!!! - + neck_to_front_waist_line Short measurement name. Don't use math symbols in name!!!! - + hand_vertical_diameter Short measurement name. Don't use math symbols in name!!!! - + neck_to_knee_point Short measurement name. Don't use math symbols in name!!!! - + waist_to_knee Short measurement name. Don't use math symbols in name!!!! - + shoulder_height Short measurement name. Don't use math symbols in name!!!! - + head_height Short measurement name. Don't use math symbols in name!!!! - + body_position Short measurement name. Don't use math symbols in name!!!! - + arc_behind_shoulder_girdle Short measurement name. Don't use math symbols in name!!!! - + neck_to_neck_base Short measurement name. Don't use math symbols in name!!!! - + depth_waist_first Short measurement name. Don't use math symbols in name!!!! - + depth_waist_second Short measurement name. Don't use math symbols in name!!!! @@ -4387,799 +4808,799 @@ Sollen die Änderungen gespeichert werden? MeasurementsDescriptions - + Around fullest part of Head Full measurement description - + Around middle part of Neck Full measurement description - + Around Neck at base Full measurement description - + Vertical Distance from Crown to Nape Full measurement description - + Front Neck Center over tape at Bustline to Front Waist Center Full measurement description - + Back Neck Center to Back Waist Center Full measurement description - + NeckPoint to ShoulderTip Full measurement description - + Armpit to Waist side Full measurement description - + Around Body from middle of Shoulder length to BustPoint to Crotch up back to beginning point Full measurement description - + Around Arms and Torso, at bicep level parallel to floor, with arms hanging at the sides Full measurement description - + Around Chest at Armfold level, will be parallel to floor across back, will not be parallel to floor across front chest Full measurement description - + Around fullest part of Bust, parallel to floor Full measurement description - + Around Chest below the Bust, parallel to floor Full measurement description - + Tie a string around smallest part of waist, keep string tied while taking meaasurements. Not usually parallel to floor for front waist or back waist. Full measurement description - + Around HighHip, parallel to floor Full measurement description - + Around Hip, parallel to floor Full measurement description - + Across Front UpperChest, smallest width from armscye to armscye Full measurement description - + Across Front Chest, from armfold to armfold Full measurement description - + From ShoulderTip to ShoulderTip, across Front Full measurement description - + From ShoulderTip to ShoulderTip, across Back Full measurement description - + Across Back UpperChest, smallest width from armscye to armscye Full measurement description - + Across Back Chest, from armfold to armfold Full measurement description - + Distance between BustPoints, across Chest Full measurement description - + Distance from Bustpoint, behind neck, down to Bustpoint Full measurement description - + From NeckPoint to BustPoint Full measurement description - + From Front Waist Center, down to crotch, up to Back Waist Center Full measurement description - + Sit on hard chair, measure from side waist straight down to chair bottom Full measurement description - + Vertical Distance from NeckPoint level to ShoulderTip level Full measurement description - + Degrees of angle from NeckPoint to ShoulderTip – requires goniometer Full measurement description - + ShoulderTip to Front Waist Center Full measurement description - + ShoulderTip to Back Waist Center Full measurement description - + NeckPoint straight down front chest to Waistline Full measurement description - + Back NeckPoint straight down back chest to Waistline Full measurement description - + NeckPoint to NeckPoint through Front Neck Center Full measurement description - + NeckPoint to NeckPoint across Nape Full measurement description - + Front upper-bust arc Full measurement description - + Back UpperBust side to side Full measurement description - + Front Waist side to side Full measurement description - + Back Waist side to side Full measurement description - + Front UpperHip side to side Full measurement description - + Back UpperHip side to side Full measurement description - + Front Hip side to side Full measurement description - + Back Hip side to side Full measurement description - + NeckPoint to Front ArmfoldPoint Full measurement description - + NeckPoint to Back ArmfoldPoint Full measurement description - + NeckPoint across Front Chest to Waist side Full measurement description - + NeckPoint across Back Chest to Waist side Full measurement description - + Front Neck Center straight down to UpperChest line Full measurement description - + Front Neck Center straight down to Bust line Full measurement description - + Front Upper chest waist Full measurement description - + Front waist to lower breast Full measurement description - + Back waist to upper chest Full measurement description - + Strap length Full measurement description - + Around Armscye Full measurement description - + Around Elbow with elbow bent Full measurement description - + Around UpperArm Full measurement description - + Around Wrist Full measurement description - + Nape straight down to UnderBust line (same as Back UpperBust height) Full measurement description - + NeckPoint to ShoulderTip to Wrist, with elbow bent and hand on hip Full measurement description - + Armpit to Wrist, with arm straight and hanging at side Full measurement description - + Nape to Wrist, with elbow bent and hand on hip Full measurement description - + ShoulderTip to Elbow, with elbow bent and hand on hip Full measurement description - + ShoulderTip to Wrist, with elbow bent and hand on hip Full measurement description - + Hand side to side Full measurement description - + Hand Middle Finger tip to wrist Full measurement description - + Around Hand Full measurement description - + Around Thigh Full measurement description - + Around MidThigh Full measurement description - + Around Knee Full measurement description - + Around Calf Full measurement description - + Around Ankle Full measurement description - + Knee to Floor Full measurement description - + Ankle to Floor Full measurement description - + Widest part of Foot side to side Full measurement description - + Tip of Longest Toe straight to back of heel Full measurement description - + Top of head to floor Full measurement description - + Nape to Floor Full measurement description - + Nape to Knee Full measurement description - + Waist side to floor Full measurement description - + HighHip side to Floor Full measurement description - + Hip side to Floor Full measurement description - + Waist side to Hip Full measurement description - + Waist side to Knee Full measurement description - + Crotch to Floor along inside leg Full measurement description - + Size Full measurement description Konfektion - + Height of the point base of the neck in front Full measurement description - + Height of the base of the neck side point Full measurement description - + The height of the shoulder point Full measurement description - + Height nipple point Full measurement description - + Height back angle axilla Full measurement description - + Height scapular point Full measurement description - + Height under buttock folds Full measurement description - + Hips excluding protruding abdomen Full measurement description - + Girth foot instep Full measurement description - + The distance from the side waist to floor Full measurement description - + The distance from the front waist to floor Full measurement description - + Arc through groin area Full measurement description - + The distance from the waist to the plane seat Full measurement description - + The distance from the base of the neck to the side of the radial point Full measurement description - + Distance from the base of the neck side point to the end of the third finger Full measurement description - + The distance from the base of the neck to the side of the first line in front of chest circumference Full measurement description - + The distance from the base of the neck to the waist side front (waist length in the front) Full measurement description - + Arc through the highest point of the shoulder joint Full measurement description - + The distance from the base of the neck to the back line of chest circumference of the first and the second based on ledge vanes Full measurement description - + The distance from the waist to the back base of the neck side point Full measurement description - + Arc length of the upper body through the base of the neck side point Full measurement description - + Chest width Full measurement description - + Anteroposterior diameter of the hands Full measurement description - + Height clavicular point Full measurement description - + The distance from the point to the cervical level of the posterior angle of the front armpit (underarm height oblique) Full measurement description - + Slash shoulder height Full measurement description - + Half girth neck Full measurement description - + Half girth neck for shirts Full measurement description - + Half girth chest first Full measurement description - + Half girth chest second Full measurement description - + Half girth chest third Full measurement description - + Half girth waist Full measurement description - + Half girth hips considering protruding abdomen Full measurement description - + Half girth hips excluding protruding abdomen Full measurement description - + Girth knee flexed feet Full measurement description - + Neck transverse diameter Full measurement description - + Front slash shoulder height Full measurement description - + The distance from the base of the neck to the waist line front Full measurement description - + Hand vertical diameter Full measurement description - + Distance from neck to knee point Full measurement description - + The distance from the waist to the knee Full measurement description - + Shoulder height Full measurement description - + Head height Full measurement description - + Body position Full measurement description - + Arc behind the shoulder girdle Full measurement description - + Distance from neck point to point on the base of the neck side neck girth measurement line Full measurement description - + Depth waist first Full measurement description - + Depth waist second Full measurement description @@ -5188,799 +5609,799 @@ Sollen die Änderungen gespeichert werden? MeasurementsFullNames - + Head girth Full measurement name - + Mid-neck girth Full measurement name - + Neck Base girth Full measurement name - + Head and Neck length Full measurement name - + Front Center length Full measurement name - + Back Center length Full measurement name - + Shoulder length Full measurement name - + Side Waist length Full measurement name - + Trunk length Full measurement name - + Shoulder girth Full measurement name - + Upper Chest girth Full measurement name - + Bust girth Full measurement name - + Under Bust girth Full measurement name - + Waist girth Full measurement name - + HighHip girth Full measurement name - + Hip girth Full measurement name - + Front Upper Chest width Full measurement name - + Front Chest width Full measurement name - + Front Across Shoulder width Full measurement name - + Back Across Shoulder width Full measurement name - + Back Upper Chest width Full measurement name - + Back Chest width Full measurement name - + BustPoint to BustPoint Full measurement name - + Halter Bustpoint to Bustpoint Full measurement name - + NeckPoint to BustPoint Full measurement name - + Crotch length Full measurement name - + Rise height Full measurement name - + Shoulder Drop Full measurement name - + Shoulder Slope degrees Full measurement name - + Front Shoulder Balance Full measurement name - + Back Shoulder Balance Full measurement name - + Front Full Length Full measurement name - + Back Full Length Full measurement name - + Front Neck arc Full measurement name - + Back Neck arc Full measurement name - + Front upper-bust arc Full measurement name - + Back UpperBust arc Full measurement name - + Front Waist arc Full measurement name - + Back Waist arc Full measurement name - + Front UpperHip arc Full measurement name - + Back UpperHip arc Full measurement name - + Front Hip arc Full measurement name - + Back Hip arc Full measurement name - + Chest Balance Full measurement name - + Back Balance Full measurement name - + Front Waist Balance Full measurement name - + Back Waist Balance Full measurement name - + Front UpperChest height Full measurement name - + Bust height Full measurement name - + Front Upper chest waist Full measurement name - + Front waist to lower breast Full measurement name - + Back waist to upper chest Full measurement name - + Strap length Full measurement name - + Armscye Girth Full measurement name - + Elbow Girth Full measurement name - + Upperarm Girth Full measurement name - + Wrist girth Full measurement name - + Armscye depth Full measurement name - + Shoulder and Arm length Full measurement name - + Underarm length Full measurement name - + Nape to wrist length Full measurement name - + Elbow length Full measurement name - + Arm length Full measurement name - + Hand width Full measurement name - + Hand length Full measurement name - + Hand girth Full measurement name - + Thigh girth Full measurement name - + Midthigh girth Full measurement name - + Knee girth Full measurement name - + Calf girth Full measurement name - + Ankle girth Full measurement name - + Knee height Full measurement name - + Ankle height Full measurement name - + Foot width Full measurement name - + Foot length Full measurement name - + Total Height Full measurement name - + Nape height Full measurement name - + Nape to knee height Full measurement name - + Waist height Full measurement name - + HighHip height Full measurement name - + Hip height Full measurement name - + Waist to Hip height Full measurement name - + Waist to Knee height Full measurement name - + Crotch height/Inseam Full measurement name - + Size Full measurement name Konfektion - + Height front neck base point Full measurement name - + Height base neck side point Full measurement name - + Height shoulder point Full measurement name - + Height nipple point Full measurement name - + Height back angle axilla Full measurement name - + Height scapular point Full measurement name - + Height under buttock folds Full measurement name - + Hips excluding protruding abdomen Full measurement name - + Girth foot instep Full measurement name - + Side waist to floor Full measurement name - + Front waist to floor Full measurement name - + Arc through groin area Full measurement name - + Waist to plane seat Full measurement name - + Neck to radial point Full measurement name - + Neck to third finger Full measurement name - + Neck to first line chest circumference Full measurement name - + Front waist length Full measurement name - + Arc through shoulder joint Full measurement name - + Neck to back line chest circumference Full measurement name - + Waist to neck side Full measurement name - + Arc length upper body Full measurement name - + Chest width Full measurement name - + Anteroposterior diameter hands Full measurement name - + Height clavicular point Full measurement name - + Height armhole slash Full measurement name - + Slash shoulder height Full measurement name - + Half girth neck Full measurement name - + Half girth neck for shirts Full measurement name - + Half girth chest first Full measurement name - + Half girth chest second Full measurement name - + Half girth chest third Full measurement name - + Half girth waist Full measurement name - + Half girth hips considering protruding abdomen Full measurement name - + Half girth hips excluding protruding abdomen Full measurement name - + Girth knee flexed feet Full measurement name - + Neck transverse diameter Full measurement name - + Front slash shoulder height Full measurement name - + Neck to front waist line Full measurement name - + Hand vertical diameter Full measurement name - + Neck to knee point Full measurement name - + Waist to knee Full measurement name - + Shoulder height Full measurement name - + Head height Full measurement name - + Body position Full measurement name - + Arc behind shoulder girdle Full measurement name - + Neck to neck base Full measurement name - + Depth waist first Full measurement name - + Depth waist second Full measurement name @@ -6089,19 +6510,19 @@ Sollen die Änderungen gespeichert werden? PostfixOperators - + cm centimeter cm - + mm millimeter mm - + in inch in @@ -6163,7 +6584,7 @@ Sollen die Änderungen gespeichert werden? QObject - + Create new pattern piece to start working. Es muss ein neues Schnittteil erstellt werden, um fortfahen zu können. @@ -6178,18 +6599,18 @@ Sollen die Änderungen gespeichert werden? Detail bewegen - + mm mm - - + + cm cm - + inch @@ -6205,7 +6626,7 @@ Sollen die Änderungen gespeichert werden? STDescriptions - + Standard figures of men 1st group, chest 100 cm Standard table description @@ -6383,12 +6804,12 @@ Sollen die Änderungen gespeichert werden? VAbstractTool - + Confirm the deletion. - + Do you really want delete? @@ -6396,35 +6817,45 @@ Sollen die Änderungen gespeichert werden? VApplication - + Error parsing file. Program will be terminated. Fehler beim Parsen der Datei. Das Programm wird geschlossen. - + Error bad id. Program will be terminated. Fehler - unbekannte Id. Fas Programm wird geschlossen. - + Error can't convert value. Program will be terminated. Fehler - Wert kann nicht konvertiert werden. Das Programm wird geschlossen. - + Error empty parameter. Program will be terminated. Fehler - leerer Parameter. Das Programm wird geschlossen. - + Error wrong id. Program will be terminated. Fehler - falsche Id. Das Programm wird geschlossen. - + Something's wrong!! + + + Could not copy temp file to document file + + + + + Could not remove document file + + VContainer @@ -6451,48 +6882,53 @@ Sollen die Änderungen gespeichert werden? VDomDocument - + Can't convert toUInt parameter - + Can't convert toBool parameter - + Got empty parameter Leerer Parameter übermittelt - + Can't convert toDouble parameter Kann Parameter nicht toDouble konvertieren - - + + Can't open file %1: %2. - + Can't open schema file %1: %2. - + Validation error file %3 in line %1 column %2 - + Parsing error file %3 in line %1 column %2 + + + Couldn't get node + + VDrawTool @@ -6515,7 +6951,7 @@ Sollen die Änderungen gespeichert werden? VException - + Critical error! @@ -6555,188 +6991,200 @@ Sollen die Änderungen gespeichert werden? VPattern - - Can't find tool id = %1 in table. + + Can't find tool in table. - + Error no unique id. - - + + Error parsing file. Fehler beim Parsen der Datei. - + Error can't convert value. Fehler Wert kann nicht konvertiert werden. - + Error empty parameter. Fehler leerer parameter. - + Error wrong id. Fehler falsche Id. - + Critical error! - + Error parsing file (std::bad_alloc). - + Error creating or updating detail - + Error creating or updating single point - - + + Error creating or updating point of end line - - + + Error creating or updating point along line - - + + Error creating or updating point of shoulder - - + + Error creating or updating point of normal - - + + Error creating or updating point of bisector - + Error creating or updating point of lineintersection - - + + Error creating or updating point of contact - + Error creating or updating modeling point - + Error creating or updating height - + Error creating or updating triangle - + Error creating or updating point of intersection - - + + Error creating or updating cut spline point - - + + Error creating or updating cut spline path point - - + + Error creating or updating cut arc point - + + + Error creating or updating point of intersection line and axis + + + + + + Error creating or updating point of intersection curve and axis + + + + Error creating or updating line - + Error creating or updating simple curve - + Error creating or updating curve path - + Error creating or updating modeling simple curve - + Error creating or updating modeling curve path - - + + Error creating or updating simple arc - + Error creating or updating modeling arc - + Error creating or updating union details - + Got wrong parameter id. Need only id > 0. - + This id is not unique. - + File error. @@ -6790,207 +7238,227 @@ Sollen die Änderungen gespeichert werden? VToolOptionsPropertyBrowser - + Base point Startpunkt - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + Point label Bezeichnung des Punktes - + Position - + Point at distance and angle Punkt in einer Distanz und mit einem Winkel - - - - - - - + + + + + + + + + Line type - - - - - - - - + + + + + + + + Length Länge - + + + Angle - + Point at distance along line Punkt in einer Distanz auf einer Linie - + Arc Bogen - - + + Radius Radius - + First angle - + Second angle - + Point along bisector Punkt auf einer Winkelhalbierenden - + Cut arc tool - + Tool for segmenting a curve - + Tool segment a pathed curve - + Perpendicular point along line Lotfußpunkt auf einer Linie - + Line between points Linie zwischen Punkten - + Point at line intersection Linienschnittpunkt - + Point along perpendicular Punkt auf einer Normalen - + Additional angle degrees Zusätzlicher Winkel - + Point at intersection of arc and line - + Tool to make point from x & y of two other points - + Special point on shoulder - + Curve tool - - + + Curve factor - + Tool for path curve - + Tool triangle + + + + Point intersection line and axis + + Variables - + Line_ Left symbol _ in name - + AngleLine_ Left symbol _ in name - + Arc_ Left symbol _ in name - + Spl_ Left symbol _ in name - + SplPath Do not add symbol _ to the end of name + + VisToolCurveIntersectAxis + + + <b>Intersection curve and axis</b>: angle = %1°; <b>Shift</b> - sticking angle, <b>Enter</b> - finish creation + + + VisToolEndLine @@ -6999,6 +7467,14 @@ Sollen die Änderungen gespeichert werden? + + VisToolLineIntersectAxis + + + <b>Intersection line and axis</b>: angle = %1°; <b>Shift</b> - sticking angle, <b>Enter</b> - finish creation + + + VisToolSplinePath @@ -7010,12 +7486,12 @@ Sollen die Änderungen gespeichert werden? main - + Pattern making program. Programm zum Schnittmuster erstellen. - + Pattern file. Schnittmusterdatei diff --git a/src/app/share/translations/valentina_fr_FR.ts b/src/app/share/translations/valentina_fr_FR.ts index a74adca5f..5f8fcd75e 100644 --- a/src/app/share/translations/valentina_fr_FR.ts +++ b/src/app/share/translations/valentina_fr_FR.ts @@ -147,85 +147,100 @@ ConfigurationPage - + Setup user interface language updated and will be used the next time start La langue de l'interface a été mise à jour et sera utilisée dès le prochain démarrage - + Default unit updated and will be used the next pattern creation L'unité par défaut a été mise à jour et sera utilisée pour le prochain nouveau patron - + Save Sauvegarder - + Auto-save modified pattern Auto-sauvegarde modifiée - + Interval: Intervalle : - + min mininimum - + Language Langue - + GUI language Langue de l'interface - + Decimal separator parts Séparateur de décimale - + With OS options (%1) Utiliser les réglages par défaut (%1) - + Default unit Unité par défaut - + Centimeters Centimètres - + Millimiters Millimètres - + Inches Pouces - + Label language + + + Send crash reports + + + + + Send crash reports (recommended) + + + + + After each crash Valentina collect information that may help us fix a problem. We do not collect any personal information. Find more about what <a href="https://bitbucket.org/dismine/valentina/wiki/manual/Crash_reports">kind of information</a> we collect. + + DelTool - + Delete tool Supprimer l'outil @@ -317,97 +332,101 @@ Longueur - + <html><head/><body><p>Show full calculation in message box</p></body></html> <html><head/><body><p>Voir le calcul dans une boite de dialogue</p></body></html> - + Point label Désignation du point - + First point Premier point - + First point of line Premier point de la ligne - + Second point Deuxième point - + Second point of line Deuxième point de la ligne - + Type of line Type de ligne - + Show line from first point to this point Afficher la ligne du premier point jusqu'à ce point - + Input data Données - + Size and height Taille et stature - - Standard table - Tableau des mesures + + Measurements + Mesures - + Standard table + Tableau des mesures + + + Increments Évolutions - + Length of lines Longueur des lignes - + Length of arcs Longueur des arcs - + Length of curves Longueur des courbes - + Angle of lines Angle des lignes - + Hide empty measurements - + Variables - Click twice to insert into formula Variables - Double-cliquer pour ajouter à une formule - + Select second point of line Choisir le deuxième point d'une ligne @@ -431,8 +450,8 @@ - - + + Calculate value Calculer la valeur @@ -442,39 +461,44 @@ Rayon - - + + <html><head/><body><p>Show full calculation in message box</p></body></html> <html><head/><body><p>Voir le calcul dans une boite de dialogue</p></body></html> - + Insert variable into formula Ajouter une variable dans la formule - + Value of first angle Valeur du premier angle - + + Measurements + Mesures + + + First angle - + Second angle - + Insert marked variable into formula Ajouter les variables sélectionnées dans la formule - + Value of second angle Valeur du deuxième angle @@ -499,9 +523,8 @@ Taille et stature - Standard table - Tableau des mesures + Tableau des mesures @@ -539,7 +562,7 @@ Variables - + Value of angle of line. Angle de la ligne @@ -577,116 +600,234 @@ _ - + <html><head/><body><p>Show full calculation in message box</p></body></html> <html><head/><body><p>Voir le calcul dans une boite de dialogue</p></body></html> - + Point label Désignation du point - + First point Premier point - + First point of angle Premier point de l'angle - + Second point Deuxième point - + Second point of angle Deuxième point de l'angle - + Third point Troisième point - + Third point of angle Troisième point de l'angle - + Type of line Type de ligne - + Show line from second point to this point Afficher la ligne du deuxième point jusqu'à ce point - + Input data Données - + Size and height Taille et stature - - Standard table - Tableau des mesures + + Measurements + Mesures - + Standard table + Tableau des mesures + + + Increments Evolutions - + Length of lines Longueur des lignes - + Length of arcs Longueur des arcs - + Length of curves Longueur des courbes - + Angle of lines Angle des lignes - + Hide empty measurements - + Variables - Click twice to insert into formula Variables - Double-cliquer pour ajouter à une formule - + Select second point of angle Choisir le deuxième point de l'angle - + Select third point of angle Choisir le troisième point de l'angle + + DialogCurveIntersectAxis + + + Curve intersect axis + + + + + Angle + Angle + + + + Calculate value + + + + + Value of angle + Valeur de l'angle + + + + <html><head/><body><p>Show full calculation in message box</p></body></html> + + + + + Axis point + + + + + + First point of line + Premier point de la ligne + + + + Curve + Courbe + + + + Point label + Désignation du point + + + + Type of line + Type de ligne + + + + Show line from first point to this point + + + + + Input data + Données + + + + Size and height + Taille et stature + + + + Measurements + Mesures + + + + Increments + + + + + Length of lines + Longueur des lignes + + + + Length of arcs + Longueur des arcs + + + + Length of curves + Longueur des courbes + + + + Angle of lines + Angle des lignes + + + + Hide empty measurements + + + + + Variables + Variables + + + + Select axis point + + + DialogCutArc @@ -715,72 +856,76 @@ _ - + <html><head/><body><p>Show full calculation in message box</p></body></html> <html><head/><body><p>Voir le calcul dans une boite de dialogue</p></body></html> - + Arc Arc - + Selected curve Courbe selectionnée - + Point label Désignation du point - + Input data Données - + Size and height Taille et stature - - Standard table - Tableau des mesures + + Measurements + Mesures - + Standard table + Tableau des mesures + + + Increments Evolutions - + Length of lines Longueur des lignes - + Length of arcs Longueur des arcs - + Length of curves Longueur des courbes - + Angle of lines Angle des lignes - + Hide empty measurements - + Variables - Click twice to insert into formula Variables - Double-cliquer pour ajouter à une formule @@ -813,72 +958,76 @@ _ - + <html><head/><body><p>Show full calculation in message box</p></body></html> <html><head/><body><p>Voir le calcul dans une boite de dialogue</p></body></html> - + Curve Courbe - + Selected curve Courbe sélectionnée - + Point label Désignation du point - + Input data Données - + Size and height Taille et stature - - Standard table - Tableau des mesures + + Measurements + Mesures - + Standard table + Tableau des mesures + + + Increments Évolutions - + Length of lines Longueur des lignes - + Length of arcs Longueur des arcs - + Length of curves Longueur des courbes - + Angle of lines Angle des lignes - + Hide empty measurements - + Variables - Click twice to insert into formula Variables - Double-cliquer pour ajouter à une formule @@ -911,72 +1060,76 @@ _ - + <html><head/><body><p>Show full calculation in message box</p></body></html> <html><head/><body><p>Voir le calcul dans une boite de dialogue</p></body></html> - + Curve Courbe - + Selected curve path Chemin de courbe sélectionné - + Point label Désignation du point - + Input data Données - + Size and height Taille et stature - - Standard table - Tableau des mesures + + Measurements + Mesures - + Standard table + Tableau des mesures + + + Increments Évolutions - + Length of lines Longueur des lignes - + Length of arcs Longueur des arcs - + Length of curves Longueur des courbes - + Angle of lines Angle des lignes - + Hide empty measurements - + Variables - Click twice to insert into formula Variables - Double-cliquer pour ajouter à une formule @@ -985,7 +1138,7 @@ DialogDetail - + Detail Détail @@ -995,44 +1148,44 @@ Biais X - - - + + + cm Cm - + Bias Y Biais Y - + Options Options - + Name of detail Nom du détail - + Seam allowance Marge de couture - + Width Largeur - + Closed Fermé - + Delete Supprimer @@ -1075,57 +1228,61 @@ _ - + <html><head/><body><p>Show full calculation in message box</p></body></html> <html><head/><body><p>Voir le calcul entier dans une boite de dialogue</p></body></html> - + Input data Données - + Size and height Taille et stature - - Standard table - Tableau standard + + Measurements + Mesures - + Standard table + Tableau standard + + + Increments Incréments - + Length of lines Longueur des lignes - + Length of arcs Longueur des arcs - + Length of curves Longueur des courbes - + Angle of lines Angle des lignes - + Hide empty measurements - + Variables Variables @@ -1144,7 +1301,7 @@ - + Calculate value Valeur calculée @@ -1154,93 +1311,97 @@ Longueur - - + + <html><head/><body><p>Show full calculation in message box</p></body></html> <html><head/><body><p>Voir le calcul dans une boite de dialogue</p></body></html> - + Angle Angle - + Value of angle Valeur de l'angle - + Base point Point de départ - + First point of line Premier point de la ligne - + Point label Désignation du point - + Type of line Type de ligne - + Show line from first point to this point Montrer la ligne du premier point jusqu'à ce point - + Input data Données - + Size and height Taille et stature - - Standard table - Tableau des mesures + + Measurements + Mesures - + Standard table + Tableau des mesures + + + Increments Évolutions - + Length of lines Longueur des lignes - + Length of arcs Longueur des arcs - + Length of curves Longueur des courbes - + Angle of lines Angle des lignes - + Hide empty measurements - + Variables Variables @@ -1257,35 +1418,35 @@ Stature - + Point label Désignation du point - + Base point Point de départ - - - - + + + + First point of line Premier point de la ligne - + Second point of line Deuxième point de la ligne - + Type of line Type de ligne - + Show line from first point to our point Montrer la ligne du premier point jusqu'à ce point @@ -1295,7 +1456,7 @@ Choisir le premier point de la ligne - + Select second point of line Choisir le deuxième point de la ligne @@ -1309,105 +1470,115 @@ - + Tool Outil - - - - - + + + + + Can't create record. Ne peut pat créer d'enregistrement - + %1 - Base point %1 - Point de départ + - %1_%2 - Line from point %1 to point %2 %1_%2 - Ligne du point %1 au point %2 - + %3 - Point along line %1_%2 %3 - Point le long d'une ligne %1_%2 - + %1 - Point of shoulder %1 - Point d'épaule - + %3 - normal to line %1_%2 %3 - normal à la ligne %1_%2 - + %4 - bisector of angle %1_%2_%3 %4 - bissectrice de l'angle %1_%2_%3 - + %5 - intersection of lines %1_%2 and %3_%4 %5 - intersection des lignes %1_%2 et %3_%4 - + Curve %1_%2 Courbe %1_%2 - + Arc with center in point %1 Arc centré sur le point %1 - + Curve point %1 Point de courbe %1 - + %4 - point of contact of arc with the center in point %1 and line %2_%3 %4 - point de contact de l'arc avec le centre au point %1 et à la ligne %2_%3 - + Point of perpendicular from point %1 to line %2_%3 Point de la perpendiculaire du point %1 à la ligne %2_%3 - + Triangle: axis %1_%2, points %3 and %4 Triangle : axe %1_%2, points %3 et %4 - + %1 - point of intersection %2 and %3 %1 - point d'intersection %2 et %3 - + %1 - cut arc with center %2 %1 - couper l'arc avec le centre %2 - + %1 - cut curve %2_%3 %1 - couper la courbe %2_%3 - + %1 - cut curve path %2 %1 - coup le chemin de la courbe %2 + + + %1 - point of intersection line %2_%3 and axis through point %4 + + + + + %1 - point of intersection curve and axis through point %2 + + DialogIncrements @@ -1449,7 +1620,7 @@ - + Description Description @@ -1539,53 +1710,83 @@ - - + + File error. Erreur de fichier. - + male homme - + female femme - + + Could not save GivenName + + + + + Could not save FamilyName + + + + + Could not save Email + + + + + Could not save Sex + + + + + Could not save BirthDate + + + + Measurements use different units than pattern. This pattern required measurements in %1 - + Individual measurements (*.vit) Mesure Individuelles (*.vit) - - + + Open file Ouvrir - - + + Wrong units. Mauvaise unité. - + Standard measurements (*.vst) Mesures standard (*.vst) - + Name_%1 Nom_%1 + + + Can't save measurement + + DialogIndividualMeasurements @@ -1641,39 +1842,39 @@ Essayez de nouveau ou changer de fichier - - + + File error. Erreur de fichier. - - + + Individual measurements (*.vit) Mesures individuelles (*.vit) - + Open file Ouvrir - + Where save measurements? Où sauvegarder les mesures ? - + Centimeters Centimètres - + Millimiters Millimètres - + Inches Pouces @@ -1686,22 +1887,22 @@ Ligne - + First point Premier point - + Second point Deuxième point - + Type of line Type de ligne - + Show line from first point to this point Visualiser la ligne du premier points à ce point @@ -1751,16 +1952,141 @@ Choisir le deuxième point de la première ligne - + Select first point of second line Choisir le premier point de la deuxième ligne - + Select second point of second line Choisir le deuxième point de la deuxième ligne + + DialogLineIntersectAxis + + + Line intersect axis + + + + + Angle + Angle + + + + Calculate value + + + + + Value of angle + Valeur de l'angle + + + + <html><head/><body><p>Show full calculation in message box</p></body></html> + + + + + Axis point + + + + + + + First point of line + Premier point de la ligne + + + + First line point + + + + + Second line point + + + + + Point label + Désignation du point + + + + Type of line + Type de ligne + + + + Show line from first point to this point + + + + + Input data + Données + + + + Size and height + Taille et stature + + + + Measurements + Mesures + + + + Increments + + + + + Length of lines + Longueur des lignes + + + + Length of arcs + Longueur des arcs + + + + Length of curves + Longueur des courbes + + + + Angle of lines + Angle des lignes + + + + Hide empty measurements + + + + + Variables + Variables + + + + Select second point of line + + + + + Select axis point + + + DialogMeasurements @@ -1769,27 +2095,27 @@ Mesures - + <html><head/><body><p><span style=" font-size:18pt;">Please, choose pattern type.</span></p></body></html> <html><head/><body><p><span style=" font-size:18pt;">Choisisez un type de patron</span></p></body></html> - + Graduation Graduation - + Use for creation pattern standard measurement table - + Individual Individuel - + Use for creation pattern individual measurements @@ -1822,92 +2148,96 @@ Longueur - + <html><head/><body><p>Show full calculation in message box</p></body></html> <html><head/><body><p>Voir le calcul entier dans une boite de dialogue</p></body></html> - + Point label Désignation du point - + First point Premier point - + Second point Deuxième point - + Additional angle degrees - + Type of line Type de ligne - + Show line from first point to this point Montrer la ligne du premier point jusqu'à ce point - + Input data Données - + Size and height Taille et stature - - Standard table - Tableau des mesures + + Measurements + Mesures - + Standard table + Tableau des mesures + + + Increments Évolutions - + Length of lines Longueur des lignes - + Length of arcs Longueur des arcs - + Length of curves Longueur des courbes - + Angle of lines Angle des lignes - + Hide empty measurements - + Variables - Click twice to insert into formula Variables - Double-cliquer pour ajouter à une formule - + Select second point of line Choisir le second point d'une ligne @@ -2158,88 +2488,92 @@ Rayon - + <html><head/><body><p>Show full calculation in message box</p></body></html> <html><head/><body><p>Voir le calcul entier dans une boite de dialogue</p></body></html> - + Point label Désignation du point - + Center of arc Centre de l'arc - - + + Select point of center of arc Choisir le point central de l'arc - + Top of the line Sommet de la ligne - + End of the line Fin de la ligne - + Input data Données - + Size and height Taille et stature - - Standard table - Tableau des mesures + + Measurements + Mesures - + Standard table + Tableau des mesures + + + Increments Évolutions - + Length of lines Longueur des lignes - + Length of arcs Longueur des arcs - + Length of curves Longueur des courbes - + Angle of lines Angle des lignes - + Hide empty measurements - + Variables - Click twice to insert into formula. Variables - Double-cliquer pour ajouter à une formule - + Select second point of line Choisir le second point d'une ligne @@ -2257,22 +2591,22 @@ Désignation du point - + vertical point Point vertical - + First point of angle Premier point de l'angle - + horizontal point point horizontal - + Second point of angle Second point de l'angle @@ -2310,97 +2644,101 @@ Longueur - + <html><head/><body><p>Show full calculation in message box</p></body></html> <html><head/><body><p>Voir le calcul entier dans une boite de dialogue</p></body></html> - + Point label Désignation du point - + First point Premier point - + Second point Deuxième point - + Third point Troisième point - + Type of line Type de ligne - + Show line from first point to our point Montrer la ligne du premier point jusqu'à ce point - + Input data Données - + Size and height Taille et stature - - Standard table - Tableau des mesures + + Measurements + Mesures - + Standard table + Tableau des mesures + + + Increments Évolutions - + Length of lines Longueur des lignes - + Length of arcs Longueur des arcs - + Length of curves Longueur des courbes - + Angle of lines Angle des lignes - + Hide empty measurements - + Variables - Click twice to insert into formula Variables - Double-cliquer pour ajouter à une formule - + Select first point of line Sélectionnez le premier point de la ligne - + Select second point of line Choisir le second point d'une ligne @@ -2489,9 +2827,13 @@ DialogSplinePath - Curve path - Chemin de la courbe + Chemin de la courbe + + + + Curved path + @@ -2560,51 +2902,51 @@ DialogTool - - - - - + + + + + Error Erreur - + Empty field Champ vide - + Value can't be 0 La valeur ne peut pas être 0 - + Value Valeur : - + Height Stature - + Size Taille - + Line length Longueur de ligne - + Arc length Longueur d'arc - + Curve length Longueur de courbe @@ -2622,30 +2964,30 @@ Désignation du point - + First point of axis Premier point de l'axe - - - - + + + + First point of line Premier point de la ligne - + Second point of axis Deuxième point de l'axe - + First point Premier point - + Second point Deuxième point @@ -2655,12 +2997,12 @@ Choisir le deuxième point de l'axe - + Select first point Choisir le premier point - + Select second point Choisir le deuxième point @@ -2730,152 +3072,152 @@ Functions - + sin sine function sin - + cos cosine function cos - + tan tangens function tan - + asin arcus sine function asin - + acos arcus cosine function acos - + atan arcus tangens function atan - + sinh hyperbolic sine function sinh - + cosh hyperbolic cosine cosh - + tanh hyperbolic tangens function tanh - + asinh hyperbolic arcus sine function asinh - + acosh hyperbolic arcus tangens function acosh - + atanh hyperbolic arcur tangens function atanh - + log2 logarithm to the base 2 log2 - + log10 logarithm to the base 10 log10 - + log logarithm to the base 10 log - + ln logarithm to base e (2.71828...) ln - + exp e raised to the power of x exp - + sqrt square root of a value sqrt - + sign sign function -1 if x<0; 1 if x>0 signe - + rint round to nearest integer rint - + abs absolute value abs - + min min of all arguments min - + max max of all arguments max - + sum sum of all arguments somme - + avg mean value of all arguments moyenne @@ -2952,418 +3294,465 @@ - + Tools for creating lines. Outil pour créer des lignes. - + Line Ligne - + Line between points Ligne entre plusieurs points - + Point at line intersection Point à l'intersection de ligne - + Tools for creating curves. Outil pour créer des courbes. - + Curve Courbe - + Curve tool. Outils courbe. - + Tool for path curve. Outil pour chemin de courbe. - + Tool segment a pathed curve. Outil segment d'une courbe le long d'un chemin. - + Tool for segmenting a curve. Outil pour segmenter une courbe. - + + Point of intersection line and axis + + + + + + + ... + + + + Tools for creating arcs. Outils pour créer des arcs. - + Arc Arc - + Arc tool. Outil arc. - + Cut arc tool. Outil Coupe Arc - + Tools for creating details. Outils pour créer des détails. - + Detail Détail - + Tool new detail. Outil nouveau détail. - + Tool for union two details. outil d'union de deux détails - + &File - + &Help - + &Pattern piece - + Measurements Mesures - + + Window + + + + Toolbar files Barre d'outil fichier - + ToolBar modes Barre d'outils modes - + Toolbar pattern Barre d'outil patron - + Toolbar options Barre d'outils options - + Toolbar tools Barre d'outils Outils - + Tool options - + Save &As... - + Export pattern (layout) Exporter le patron (agencement) - + About &Qt - + &About Valentina - + E&xit - + Exit the application Quitter l''application - + Preferences Préférences - + Zoom in - + Original zoom - + Original Zoom - + Zoom fit best - + + Ctrl+= + + + + + Stop + Arrêter + + + + Stop using tool + + + + + Repot Bug... + + + + + Report bug + + + + + Close window + + + + zoom in zoom avant - - + + Zoom out Zoom arrière - + Edit pattern XML code Editer le code XML du patron - + Pattern properties Propriétés du patron - + New Nouveau - + &New - + Create a new pattern Créer un nouveau patron - + Ctrl+N Ctrl+N - + Open Ouvrir - + &Open - + Open file with pattern Ouvrir un fichier de patron - + Save Enregistrer - + &Save - + Save pattern Enregistrer le patron - + Ctrl+S Ctrl+S - + Save as Enregistrer sous - + Save not yet saved pattern Enregistrer le patron en cours - + Ctrl+Shift+S Ctrl+Shift+S - + Draw Dessin - + Draw mode Mode dessin - + Ctrl+W Ctrl+W - + Details Détails - + Details mode Mode détails - + Ctrl+E Ctrl+E - - + + Pointer tools Outil pointeur - + New pattern piece Nouveau élément de patron - + Add new pattern piece Ajouter un nouveau élément de patron - + Ctrl+Shift+N Ctrl+Shift+N - - + + Change the label of pattern piece Changer la désignation de l'élément de patron - + Table of variables Tableau des variables - + Tables of variables Tableaux des variables - + Ctrl+T Ctrl+T - + History Historique - + Ctrl+H Ctrl+H - + Create layout Créer une mise en page - + Ctrl+L Ctrl+L - + About Qt A propos de Qt - + Ctrl+Q Ctrl+Q - + Pattern piece %1 Élément de patron %1 - + Pattern piece: Élément de patron: - + Enter a new label for the pattern piece. Saisir une nouvelle désignation pour cet élément de patron. - - - + + + Select point Choisir un point - + Select first point Choisir le premier point @@ -3372,219 +3761,251 @@ Sélectionnez le point d'épaule - - + + + Select first point of line Choisir le premier point de la ligne - + Select first point of angle Choisir le premier point de l'angle - + Select first point of first line Choisir le premier point de la première ligne - + Select first point curve Choisir le premier point de la courbe - + Select simple curve Choisir une courbe simple - + Select point of center of arc Choisir le point central de l'arc - + Select point of curve path Choisir un point sur la courbe - + Select curve path Choisir le chemin de courbe - + Select points, arcs, curves clockwise. Choisir points, arcs et courbes dans le sens horaire. - + Select base point Choisir le point de départ - + Select first point of axis Choisir le premier point de l'axe - + Select point vertically Choisir le point verticallement - + Select detail Choisir les détails - + Select arc Choisir un arc - + + Select curve + + + + Size: Taille : - + pattern parton - + Critical error! Erreur critique! - + Error parsing file (std::bad_alloc). Erreur d'interprétation de fichier.(std::bad_alloc). - + Bad id. Mauvais id. - + + Could not save file + + + + &Undo - + &Redo - + Wrong units. Mauvaises unités de mesure. - + Application doesn't support standard table with inches. L'application ne supporte pas la table de mesure standard en pouces. - + File error. Erreur de fichier - + + Valentina didn't shut down correctly. Do you want reopen files (%1) you had open? + + + + + Reopen files. + + + + The measurements file <br/><br/> <b>%1</b> <br/><br/> %3 - + could not be found. Do you want to update the file location Ne peut être trouvé. voulez vous mettre à jour le chemin du fichier - + Standard measurements (*.vst) Mesures standard (*.vst) - + Individual measurements (*.vit) Mesures individuelles (*.vit) - + File loaded Fichier chargé - + + Individual measurements is under development + + + + + There is no way create individual measurements file independent on the pattern file. +For opening pattern need keep both files: pattern and measurements. Do you want continue? + + + + Height: Stature : - + Pattern Piece: Élément de patron : - - + + Pattern files (*.val) Fichier de patron (*.val) - + /pattern.val - + File saved Fichier suvegardé - + untitled.val - + Unsaved change - + The pattern has been modified. Do you want to save your changes? Le patron a été changé. Voulez vous sauvegarder les changements ? - - + + Open file Ouvrir fichier - - + + Error parsing file. Erreur d'interprétation de fichier. - + Error can't convert value. Erreur : valeur non convertissable. - - + + Error empty parameter. Erreur : paramètre vide. - + Error wrong id. Erreur : mauvais id. @@ -3592,799 +4013,799 @@ Voulez vous sauvegarder les changements ? Measurements - + head_girth Short measurement name. Don't use math symbols in name!!!! - + mid_neck_girth Short measurement name. Don't use math symbols in name!!!! - + neck_base_girth Short measurement name. Don't use math symbols in name!!!! - + head_and_neck_length Short measurement name. Don't use math symbols in name!!!! - + center_front_waist_length Short measurement name. Don't use math symbols in name!!!! - + center_back_waist_length Short measurement name. Don't use math symbols in name!!!! - + shoulder_length Short measurement name. Don't use math symbols in name!!!! - + side_waist_length Short measurement name. Don't use math symbols in name!!!! - + trunk_length Short measurement name. Don't use math symbols in name!!!! - + shoulder_girth Short measurement name. Don't use math symbols in name!!!! - + upper_chest_girth Short measurement name. Don't use math symbols in name!!!! - + bust_girth Short measurement name. Don't use math symbols in name!!!! - + under_bust_girth Short measurement name. Don't use math symbols in name!!!! - + waist_girth Short measurement name. Don't use math symbols in name!!!! - + high_hip_girth Short measurement name. Don't use math symbols in name!!!! - + hip_girth Short measurement name. Don't use math symbols in name!!!! - + upper_front_chest_width Short measurement name. Don't use math symbols in name!!!! - + front_chest_width Short measurement name. Don't use math symbols in name!!!! - + across_front_shoulder_width Short measurement name. Don't use math symbols in name!!!! Largeur d'épaule de face - + across_back_shoulder_width Short measurement name. Don't use math symbols in name!!!! Largeur d'épaule de dos - + upper_back_width Short measurement name. Don't use math symbols in name!!!! - + back_width Short measurement name. Don't use math symbols in name!!!! - + bustpoint_to_bustpoint Short measurement name. Don't use math symbols in name!!!! - + halter_bustpoint_to_bustpoint Short measurement name. Don't use math symbols in name!!!! - + neck_to_bustpoint Short measurement name. Don't use math symbols in name!!!! - + crotch_length Short measurement name. Don't use math symbols in name!!!! - + rise_height Short measurement name. Don't use math symbols in name!!!! - + shoulder_drop Short measurement name. Don't use math symbols in name!!!! - + shoulder_slope_degrees Short measurement name. Don't use math symbols in name!!!! - + front_shoulder_slope_length Short measurement name. Don't use math symbols in name!!!! - + back_shoulder_slope_length Short measurement name. Don't use math symbols in name!!!! - + front_shoulder_to_waist_length Short measurement name. Don't use math symbols in name!!!! - + back_shoulder_to_waist_length Short measurement name. Don't use math symbols in name!!!! - + front_neck_arc Short measurement name. Don't use math symbols in name!!!! - + back_neck_arc Short measurement name. Don't use math symbols in name!!!! - + front_upper_chest_arc Short measurement name. Don't use math symbols in name!!!! - + back_upper_chest_arc Short measurement name. Don't use math symbols in name!!!! - + front_waist_arc Short measurement name. Don't use math symbols in name!!!! - + back_waist_arc Short measurement name. Don't use math symbols in name!!!! - + front_upper_hip_arc Short measurement name. Don't use math symbols in name!!!! - + back_upper_hip_arc Short measurement name. Don't use math symbols in name!!!! - + front_hip_arc Short measurement name. Don't use math symbols in name!!!! - + back_hip_arc Short measurement name. Don't use math symbols in name!!!! - + chest_slope Short measurement name. Don't use math symbols in name!!!! - + back_slope Short measurement name. Don't use math symbols in name!!!! - + front_waist_slope Short measurement name. Don't use math symbols in name!!!! - + back_waist_slope Short measurement name. Don't use math symbols in name!!!! - + front_neck_to_upper_chest_height Short measurement name. Don't use math symbols in name!!!! - + front_neck_to_bust_height Short measurement name. Don't use math symbols in name!!!! - + front_waist_to_upper_chest Short measurement name. Don't use math symbols in name!!!! - + front_waist_to_lower_breast Short measurement name. Don't use math symbols in name!!!! - + back_waist_to_upper_chest Short measurement name. Don't use math symbols in name!!!! - + strap_length Short measurement name. Don't use math symbols in name!!!! - + armscye_girth Short measurement name. Don't use math symbols in name!!!! - + elbow_girth Short measurement name. Don't use math symbols in name!!!! - + upper_arm_girth Short measurement name. Don't use math symbols in name!!!! - + wrist_girth Short measurement name. Don't use math symbols in name!!!! - + scye_depth Short measurement name. Don't use math symbols in name!!!! - + shoulder_and_arm_length Short measurement name. Don't use math symbols in name!!!! - + underarm_length Short measurement name. Don't use math symbols in name!!!! - + cervicale_to_wrist_length Short measurement name. Don't use math symbols in name!!!! - + shoulder_to_elbow_length Short measurement name. Don't use math symbols in name!!!! - + arm_length Short measurement name. Don't use math symbols in name!!!! - + hand_width Short measurement name. Don't use math symbols in name!!!! - + hand_length Short measurement name. Don't use math symbols in name!!!! - + hand_girth Short measurement name. Don't use math symbols in name!!!! - + thigh_girth Short measurement name. Don't use math symbols in name!!!! - + mid_thigh_girth Short measurement name. Don't use math symbols in name!!!! - + knee_girth Short measurement name. Don't use math symbols in name!!!! - + calf_girth Short measurement name. Don't use math symbols in name!!!! - + ankle_girth Short measurement name. Don't use math symbols in name!!!! Tour de cheville - + knee_height Short measurement name. Don't use math symbols in name!!!! - + ankle_height Short measurement name. Don't use math symbols in name!!!! Taille de cheville - + foot_width Short measurement name. Don't use math symbols in name!!!! - + foot_length Short measurement name. Don't use math symbols in name!!!! - + height Short measurement name. Don't use math symbols in name!!!! - + cervicale_height Short measurement name. Don't use math symbols in name!!!! - + cervicale_to_knee_height Short measurement name. Don't use math symbols in name!!!! - + waist_height Short measurement name. Don't use math symbols in name!!!! - + high_hip_height Short measurement name. Don't use math symbols in name!!!! - + hip_height Short measurement name. Don't use math symbols in name!!!! - + waist_to_hip_height Short measurement name. Don't use math symbols in name!!!! - + waist_to_knee_height Short measurement name. Don't use math symbols in name!!!! - + crotch_height Short measurement name. Don't use math symbols in name!!!! - + size Short measurement name. Don't use math symbols in name!!!! Taille - + height_front_neck_base_point Short measurement name. Don't use math symbols in name!!!! - + height_base_neck_side_point Short measurement name. Don't use math symbols in name!!!! - + height_shoulder_point Short measurement name. Don't use math symbols in name!!!! - + height_nipple_point Short measurement name. Don't use math symbols in name!!!! - + height_back_angle_axilla Short measurement name. Don't use math symbols in name!!!! - + height_scapular_point Short measurement name. Don't use math symbols in name!!!! - + height_under_buttock_folds Short measurement name. Don't use math symbols in name!!!! - + hips_excluding_protruding_abdomen Short measurement name. Don't use math symbols in name!!!! - + girth_foot_instep Short measurement name. Don't use math symbols in name!!!! - + side_waist_to_floor Short measurement name. Don't use math symbols in name!!!! - + front_waist_to_floor Short measurement name. Don't use math symbols in name!!!! - + arc_through_groin_area Short measurement name. Don't use math symbols in name!!!! - + waist_to_plane_seat Short measurement name. Don't use math symbols in name!!!! - + neck_to_radial_point Short measurement name. Don't use math symbols in name!!!! - + neck_to_third_finger Short measurement name. Don't use math symbols in name!!!! - + neck_to_first_line_chest_circumference Short measurement name. Don't use math symbols in name!!!! - + front_waist_length Short measurement name. Don't use math symbols in name!!!! - + arc_through_shoulder_joint Short measurement name. Don't use math symbols in name!!!! - + neck_to_back_line_chest_circumference Short measurement name. Don't use math symbols in name!!!! - + waist_to_neck_side Short measurement name. Don't use math symbols in name!!!! - + arc_length_upper_body Short measurement name. Don't use math symbols in name!!!! - + chest_width Short measurement name. Don't use math symbols in name!!!! - + anteroposterior_diameter_hands Short measurement name. Don't use math symbols in name!!!! - + height_clavicular_point Short measurement name. Don't use math symbols in name!!!! - + height_armhole_slash Short measurement name. Don't use math symbols in name!!!! - + slash_shoulder_height Short measurement name. Don't use math symbols in name!!!! - + half_girth_neck Short measurement name. Don't use math symbols in name!!!! - + half_girth_neck_for_shirts Short measurement name. Don't use math symbols in name!!!! - + half_girth_chest_first Short measurement name. Don't use math symbols in name!!!! - + half_girth_chest_second Short measurement name. Don't use math symbols in name!!!! - + half_girth_chest_third Short measurement name. Don't use math symbols in name!!!! - + half_girth_waist Short measurement name. Don't use math symbols in name!!!! - + half_girth_hips_considering_protruding_abdomen Short measurement name. Don't use math symbols in name!!!! - + half_girth_hips_excluding_protruding_abdomen Short measurement name. Don't use math symbols in name!!!! - + girth_knee_flexed_feet Short measurement name. Don't use math symbols in name!!!! - + neck_transverse_diameter Short measurement name. Don't use math symbols in name!!!! - + front_slash_shoulder_height Short measurement name. Don't use math symbols in name!!!! - + neck_to_front_waist_line Short measurement name. Don't use math symbols in name!!!! - + hand_vertical_diameter Short measurement name. Don't use math symbols in name!!!! - + neck_to_knee_point Short measurement name. Don't use math symbols in name!!!! - + waist_to_knee Short measurement name. Don't use math symbols in name!!!! - + shoulder_height Short measurement name. Don't use math symbols in name!!!! - + head_height Short measurement name. Don't use math symbols in name!!!! - + body_position Short measurement name. Don't use math symbols in name!!!! - + arc_behind_shoulder_girdle Short measurement name. Don't use math symbols in name!!!! - + neck_to_neck_base Short measurement name. Don't use math symbols in name!!!! - + depth_waist_first Short measurement name. Don't use math symbols in name!!!! - + depth_waist_second Short measurement name. Don't use math symbols in name!!!! @@ -4393,799 +4814,799 @@ Voulez vous sauvegarder les changements ? MeasurementsDescriptions - + Around fullest part of Head Full measurement description - + Around middle part of Neck Full measurement description - + Around Neck at base Full measurement description - + Vertical Distance from Crown to Nape Full measurement description - + Front Neck Center over tape at Bustline to Front Waist Center Full measurement description - + Back Neck Center to Back Waist Center Full measurement description - + NeckPoint to ShoulderTip Full measurement description - + Armpit to Waist side Full measurement description - + Around Body from middle of Shoulder length to BustPoint to Crotch up back to beginning point Full measurement description - + Around Arms and Torso, at bicep level parallel to floor, with arms hanging at the sides Full measurement description - + Around Chest at Armfold level, will be parallel to floor across back, will not be parallel to floor across front chest Full measurement description - + Around fullest part of Bust, parallel to floor Full measurement description - + Around Chest below the Bust, parallel to floor Full measurement description - + Tie a string around smallest part of waist, keep string tied while taking meaasurements. Not usually parallel to floor for front waist or back waist. Full measurement description - + Around HighHip, parallel to floor Full measurement description - + Around Hip, parallel to floor Full measurement description - + Across Front UpperChest, smallest width from armscye to armscye Full measurement description - + Across Front Chest, from armfold to armfold Full measurement description - + From ShoulderTip to ShoulderTip, across Front Full measurement description - + From ShoulderTip to ShoulderTip, across Back Full measurement description - + Across Back UpperChest, smallest width from armscye to armscye Full measurement description - + Across Back Chest, from armfold to armfold Full measurement description - + Distance between BustPoints, across Chest Full measurement description - + Distance from Bustpoint, behind neck, down to Bustpoint Full measurement description - + From NeckPoint to BustPoint Full measurement description - + From Front Waist Center, down to crotch, up to Back Waist Center Full measurement description - + Sit on hard chair, measure from side waist straight down to chair bottom Full measurement description - + Vertical Distance from NeckPoint level to ShoulderTip level Full measurement description - + Degrees of angle from NeckPoint to ShoulderTip – requires goniometer Full measurement description - + ShoulderTip to Front Waist Center Full measurement description - + ShoulderTip to Back Waist Center Full measurement description - + NeckPoint straight down front chest to Waistline Full measurement description - + Back NeckPoint straight down back chest to Waistline Full measurement description - + NeckPoint to NeckPoint through Front Neck Center Full measurement description - + NeckPoint to NeckPoint across Nape Full measurement description - + Front upper-bust arc Full measurement description - + Back UpperBust side to side Full measurement description - + Front Waist side to side Full measurement description - + Back Waist side to side Full measurement description - + Front UpperHip side to side Full measurement description - + Back UpperHip side to side Full measurement description - + Front Hip side to side Full measurement description - + Back Hip side to side Full measurement description - + NeckPoint to Front ArmfoldPoint Full measurement description - + NeckPoint to Back ArmfoldPoint Full measurement description - + NeckPoint across Front Chest to Waist side Full measurement description - + NeckPoint across Back Chest to Waist side Full measurement description - + Front Neck Center straight down to UpperChest line Full measurement description - + Front Neck Center straight down to Bust line Full measurement description - + Front Upper chest waist Full measurement description - + Front waist to lower breast Full measurement description - + Back waist to upper chest Full measurement description - + Strap length Full measurement description - + Around Armscye Full measurement description - + Around Elbow with elbow bent Full measurement description - + Around UpperArm Full measurement description - + Around Wrist Full measurement description - + Nape straight down to UnderBust line (same as Back UpperBust height) Full measurement description - + NeckPoint to ShoulderTip to Wrist, with elbow bent and hand on hip Full measurement description - + Armpit to Wrist, with arm straight and hanging at side Full measurement description - + Nape to Wrist, with elbow bent and hand on hip Full measurement description - + ShoulderTip to Elbow, with elbow bent and hand on hip Full measurement description - + ShoulderTip to Wrist, with elbow bent and hand on hip Full measurement description - + Hand side to side Full measurement description - + Hand Middle Finger tip to wrist Full measurement description - + Around Hand Full measurement description - + Around Thigh Full measurement description - + Around MidThigh Full measurement description - + Around Knee Full measurement description - + Around Calf Full measurement description - + Around Ankle Full measurement description - + Knee to Floor Full measurement description - + Ankle to Floor Full measurement description - + Widest part of Foot side to side Full measurement description - + Tip of Longest Toe straight to back of heel Full measurement description - + Top of head to floor Full measurement description - + Nape to Floor Full measurement description - + Nape to Knee Full measurement description - + Waist side to floor Full measurement description - + HighHip side to Floor Full measurement description - + Hip side to Floor Full measurement description - + Waist side to Hip Full measurement description - + Waist side to Knee Full measurement description - + Crotch to Floor along inside leg Full measurement description - + Size Full measurement description Taille - + Height of the point base of the neck in front Full measurement description - + Height of the base of the neck side point Full measurement description - + The height of the shoulder point Full measurement description - + Height nipple point Full measurement description - + Height back angle axilla Full measurement description - + Height scapular point Full measurement description - + Height under buttock folds Full measurement description - + Hips excluding protruding abdomen Full measurement description - + Girth foot instep Full measurement description - + The distance from the side waist to floor Full measurement description - + The distance from the front waist to floor Full measurement description - + Arc through groin area Full measurement description - + The distance from the waist to the plane seat Full measurement description - + The distance from the base of the neck to the side of the radial point Full measurement description - + Distance from the base of the neck side point to the end of the third finger Full measurement description - + The distance from the base of the neck to the side of the first line in front of chest circumference Full measurement description - + The distance from the base of the neck to the waist side front (waist length in the front) Full measurement description - + Arc through the highest point of the shoulder joint Full measurement description - + The distance from the base of the neck to the back line of chest circumference of the first and the second based on ledge vanes Full measurement description - + The distance from the waist to the back base of the neck side point Full measurement description - + Arc length of the upper body through the base of the neck side point Full measurement description - + Chest width Full measurement description - + Anteroposterior diameter of the hands Full measurement description - + Height clavicular point Full measurement description - + The distance from the point to the cervical level of the posterior angle of the front armpit (underarm height oblique) Full measurement description - + Slash shoulder height Full measurement description - + Half girth neck Full measurement description - + Half girth neck for shirts Full measurement description - + Half girth chest first Full measurement description - + Half girth chest second Full measurement description - + Half girth chest third Full measurement description - + Half girth waist Full measurement description - + Half girth hips considering protruding abdomen Full measurement description - + Half girth hips excluding protruding abdomen Full measurement description - + Girth knee flexed feet Full measurement description - + Neck transverse diameter Full measurement description - + Front slash shoulder height Full measurement description - + The distance from the base of the neck to the waist line front Full measurement description - + Hand vertical diameter Full measurement description - + Distance from neck to knee point Full measurement description - + The distance from the waist to the knee Full measurement description - + Shoulder height Full measurement description - + Head height Full measurement description - + Body position Full measurement description - + Arc behind the shoulder girdle Full measurement description - + Distance from neck point to point on the base of the neck side neck girth measurement line Full measurement description - + Depth waist first Full measurement description - + Depth waist second Full measurement description @@ -5194,799 +5615,799 @@ Voulez vous sauvegarder les changements ? MeasurementsFullNames - + Head girth Full measurement name - + Mid-neck girth Full measurement name - + Neck Base girth Full measurement name - + Head and Neck length Full measurement name - + Front Center length Full measurement name - + Back Center length Full measurement name - + Shoulder length Full measurement name - + Side Waist length Full measurement name - + Trunk length Full measurement name - + Shoulder girth Full measurement name - + Upper Chest girth Full measurement name - + Bust girth Full measurement name - + Under Bust girth Full measurement name - + Waist girth Full measurement name - + HighHip girth Full measurement name - + Hip girth Full measurement name - + Front Upper Chest width Full measurement name - + Front Chest width Full measurement name - + Front Across Shoulder width Full measurement name - + Back Across Shoulder width Full measurement name - + Back Upper Chest width Full measurement name - + Back Chest width Full measurement name - + BustPoint to BustPoint Full measurement name - + Halter Bustpoint to Bustpoint Full measurement name - + NeckPoint to BustPoint Full measurement name - + Crotch length Full measurement name - + Rise height Full measurement name - + Shoulder Drop Full measurement name - + Shoulder Slope degrees Full measurement name - + Front Shoulder Balance Full measurement name - + Back Shoulder Balance Full measurement name - + Front Full Length Full measurement name - + Back Full Length Full measurement name - + Front Neck arc Full measurement name - + Back Neck arc Full measurement name - + Front upper-bust arc Full measurement name - + Back UpperBust arc Full measurement name - + Front Waist arc Full measurement name - + Back Waist arc Full measurement name - + Front UpperHip arc Full measurement name - + Back UpperHip arc Full measurement name - + Front Hip arc Full measurement name - + Back Hip arc Full measurement name - + Chest Balance Full measurement name - + Back Balance Full measurement name - + Front Waist Balance Full measurement name - + Back Waist Balance Full measurement name - + Front UpperChest height Full measurement name - + Bust height Full measurement name - + Front Upper chest waist Full measurement name - + Front waist to lower breast Full measurement name - + Back waist to upper chest Full measurement name - + Strap length Full measurement name - + Armscye Girth Full measurement name - + Elbow Girth Full measurement name - + Upperarm Girth Full measurement name - + Wrist girth Full measurement name - + Armscye depth Full measurement name - + Shoulder and Arm length Full measurement name - + Underarm length Full measurement name - + Nape to wrist length Full measurement name - + Elbow length Full measurement name - + Arm length Full measurement name - + Hand width Full measurement name - + Hand length Full measurement name - + Hand girth Full measurement name - + Thigh girth Full measurement name - + Midthigh girth Full measurement name - + Knee girth Full measurement name - + Calf girth Full measurement name - + Ankle girth Full measurement name - + Knee height Full measurement name - + Ankle height Full measurement name - + Foot width Full measurement name - + Foot length Full measurement name - + Total Height Full measurement name - + Nape height Full measurement name - + Nape to knee height Full measurement name - + Waist height Full measurement name - + HighHip height Full measurement name - + Hip height Full measurement name - + Waist to Hip height Full measurement name - + Waist to Knee height Full measurement name - + Crotch height/Inseam Full measurement name - + Size Full measurement name Taille - + Height front neck base point Full measurement name - + Height base neck side point Full measurement name - + Height shoulder point Full measurement name - + Height nipple point Full measurement name - + Height back angle axilla Full measurement name - + Height scapular point Full measurement name - + Height under buttock folds Full measurement name - + Hips excluding protruding abdomen Full measurement name - + Girth foot instep Full measurement name - + Side waist to floor Full measurement name - + Front waist to floor Full measurement name - + Arc through groin area Full measurement name - + Waist to plane seat Full measurement name - + Neck to radial point Full measurement name - + Neck to third finger Full measurement name - + Neck to first line chest circumference Full measurement name - + Front waist length Full measurement name - + Arc through shoulder joint Full measurement name - + Neck to back line chest circumference Full measurement name - + Waist to neck side Full measurement name - + Arc length upper body Full measurement name - + Chest width Full measurement name - + Anteroposterior diameter hands Full measurement name - + Height clavicular point Full measurement name - + Height armhole slash Full measurement name - + Slash shoulder height Full measurement name - + Half girth neck Full measurement name - + Half girth neck for shirts Full measurement name - + Half girth chest first Full measurement name - + Half girth chest second Full measurement name - + Half girth chest third Full measurement name - + Half girth waist Full measurement name - + Half girth hips considering protruding abdomen Full measurement name - + Half girth hips excluding protruding abdomen Full measurement name - + Girth knee flexed feet Full measurement name - + Neck transverse diameter Full measurement name - + Front slash shoulder height Full measurement name - + Neck to front waist line Full measurement name - + Hand vertical diameter Full measurement name - + Neck to knee point Full measurement name - + Waist to knee Full measurement name - + Shoulder height Full measurement name - + Head height Full measurement name - + Body position Full measurement name - + Arc behind shoulder girdle Full measurement name - + Neck to neck base Full measurement name - + Depth waist first Full measurement name - + Depth waist second Full measurement name @@ -6095,19 +6516,19 @@ Voulez vous sauvegarder les changements ? PostfixOperators - + cm centimeter cm - + mm millimeter mm - + in inch in @@ -6169,7 +6590,7 @@ Voulez vous sauvegarder les changements ? QObject - + Create new pattern piece to start working. @@ -6184,18 +6605,18 @@ Voulez vous sauvegarder les changements ? Déplacer le détail - + mm mm - - + + cm cm - + inch @@ -6211,7 +6632,7 @@ Voulez vous sauvegarder les changements ? STDescriptions - + Standard figures of men 1st group, chest 100 cm Standard table description @@ -6389,12 +6810,12 @@ Voulez vous sauvegarder les changements ? VAbstractTool - + Confirm the deletion. Confirmer la suppression - + Do you really want delete? Voulez vous vraiment supprimer ? @@ -6402,35 +6823,45 @@ Voulez vous sauvegarder les changements ? VApplication - + Error parsing file. Program will be terminated. Erreur d'interprétation du fichier. Fin du programme. - + Error bad id. Program will be terminated. Erreur d'identifiant. Fin du programme. - + Error can't convert value. Program will be terminated. Erreur : valeur non convertissable. Fin du programme. - + Error empty parameter. Program will be terminated. Erreur : paramètre vide. Fin du programme. - + Error wrong id. Program will be terminated. Erreur : mauvais identifiant. Fin du programme. - + Something's wrong!! Quel que chose ne va pas + + + Could not copy temp file to document file + + + + + Could not remove document file + + VContainer @@ -6457,48 +6888,53 @@ Voulez vous sauvegarder les changements ? VDomDocument - + Can't convert toUInt parameter - + Can't convert toBool parameter - + Got empty parameter Paramètre vide - + Can't convert toDouble parameter Conversion du paramètre impossible vers toDouble. - - + + Can't open file %1: %2. - + Can't open schema file %1: %2. - + Validation error file %3 in line %1 column %2 - + Parsing error file %3 in line %1 column %2 + + + Couldn't get node + + VDrawTool @@ -6521,7 +6957,7 @@ Voulez vous sauvegarder les changements ? VException - + Critical error! Erreur critique! @@ -6561,188 +6997,204 @@ Voulez vous sauvegarder les changements ? VPattern - Can't find tool id = %1 in table. - Identifiant d'outil non trouvé = %1 dans la table. + Identifiant d'outil non trouvé = %1 dans la table. - + + Can't find tool in table. + + + + Error no unique id. Erreur : id non unique. - - + + Error parsing file. Erreur d'interprétation de fichier. - + Error can't convert value. Erreur : valeur non convertissable. - + Error empty parameter. Erreur : paramètre vide. - + Error wrong id. Erreur : mauvais id. - + Critical error! Erreur Critique! - + Error parsing file (std::bad_alloc). Erreur d'interprétation de fichier. (std::bad_alloc). - + Error creating or updating detail Erreur : Création ou mise à jour du détail - + Error creating or updating single point Erreur lors de la création ou de la mise à jour d'un point seul - - + + Error creating or updating point of end line Erreur lors de la création ou de la mise à jour d'un point de fin de ligne - - + + Error creating or updating point along line Erreur lors de la création ou de la mise à jour d'un point de la ligne - - + + Error creating or updating point of shoulder Erreur : Création ou mise à jour du point d'épaule - - + + Error creating or updating point of normal Erreur lors de la création ou de la mise à jour d'un point de la normale - - + + Error creating or updating point of bisector Erreur : Création ou mise à jour du point de bisection - + Error creating or updating point of lineintersection Erreur : Création ou mise à jour du point d'intersection de ligne - - + + Error creating or updating point of contact Erreur : Création ou mise à jour du point de contact - + Error creating or updating modeling point Erreur : Création ou mise à jour du point de modélisation - + Error creating or updating height Erreur : Création ou mise à jour de la taille - + Error creating or updating triangle Erreur lors de la création ou de la mise à jour d'un triangle - + Error creating or updating point of intersection Erreur : Création ou mise à jour du point d'intersection - - + + Error creating or updating cut spline point Erreur : Création ou mise à jour du point de découpe de crannelure - - + + Error creating or updating cut spline path point Erreur : Création ou mise à jour du point du chemine de cannelure - - + + Error creating or updating cut arc point Erreur lors de la création ou de la mise à jour d'un point de découpe d'arc - + + + Error creating or updating point of intersection line and axis + + + + + + Error creating or updating point of intersection curve and axis + + + + Error creating or updating line Erreur lors de la création ou de la mise à jour de la ligne - + Error creating or updating simple curve Erreur lors de la création ou de la mise à jour de la courbe - + Error creating or updating curve path Erreur lors de la création ou de la mise à jour du chemin de la courbe - + Error creating or updating modeling simple curve Erreur lors de la création ou de la mise à jour de la courbe simple - + Error creating or updating modeling curve path Erreur lors de la création ou de la mise à jour du chemin de la coubre - - + + Error creating or updating simple arc Erreur : Création ou mise à jour d'un arc simple - + Error creating or updating modeling arc Erreur : Création ou mise à jour d'un arc modelé - + Error creating or updating union details Erreur : Création ou mise à jour d'un union de détails - + Got wrong parameter id. Need only id > 0. Mauvais id . Seul les id > 0 sont autorisés - + This id is not unique. Cet idientifiant n'est pas unique. - + File error. @@ -6796,208 +7248,228 @@ Voulez vous sauvegarder les changements ? VToolOptionsPropertyBrowser - + Base point Point de départ - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + Point label Désignation du point - + Position - + Point at distance and angle Point à distance et angle - - - - - - - + + + + + + + + + Line type - - - - - - - - + + + + + + + + Length - + + + Angle Angle - + Point at distance along line Point à distance le long d'un ligne - + Arc Arc - - + + Radius Rayon - + First angle - + Second angle - + Point along bisector point le long d'une bissectrice - + Cut arc tool - + Tool for segmenting a curve - + Tool segment a pathed curve - + Perpendicular point along line Point perpendiculaire le long d'une ligne - + Line between points Ligne entre plusieurs points - + Point at line intersection Point à l'intersection de ligne - + Point along perpendicular Point le long d'une perpendiculaire - + Additional angle degrees - + Point at intersection of arc and line - + Tool to make point from x & y of two other points - + Special point on shoulder - + Curve tool - - + + Curve factor - + Tool for path curve - + Tool triangle + + + + Point intersection line and axis + + Variables - + Line_ Left symbol _ in name - + AngleLine_ Left symbol _ in name - + Arc_ Left symbol _ in name - + Spl_ Left symbol _ in name - + SplPath Do not add symbol _ to the end of name + + VisToolCurveIntersectAxis + + + <b>Intersection curve and axis</b>: angle = %1°; <b>Shift</b> - sticking angle, <b>Enter</b> - finish creation + + + VisToolEndLine @@ -7006,6 +7478,14 @@ Voulez vous sauvegarder les changements ? + + VisToolLineIntersectAxis + + + <b>Intersection line and axis</b>: angle = %1°; <b>Shift</b> - sticking angle, <b>Enter</b> - finish creation + + + VisToolSplinePath @@ -7017,12 +7497,12 @@ Voulez vous sauvegarder les changements ? main - + Pattern making program. Programme de réalisation de patrons - + Pattern file. Fichier Patron diff --git a/src/app/share/translations/valentina_he_IL.ts b/src/app/share/translations/valentina_he_IL.ts index 751120037..36d4f8fd6 100644 --- a/src/app/share/translations/valentina_he_IL.ts +++ b/src/app/share/translations/valentina_he_IL.ts @@ -147,85 +147,100 @@ ConfigurationPage - + Setup user interface language updated and will be used the next time start - + Default unit updated and will be used the next pattern creation - + Save שמור - + Auto-save modified pattern - + Interval: - + min - + Language - + GUI language - + Decimal separator parts - + With OS options (%1) - + Default unit - + Centimeters - + Millimiters - + Inches - + Label language + + + Send crash reports + + + + + Send crash reports (recommended) + + + + + After each crash Valentina collect information that may help us fix a problem. We do not collect any personal information. Find more about what <a href="https://bitbucket.org/dismine/valentina/wiki/manual/Crash_reports">kind of information</a> we collect. + + DelTool - + Delete tool @@ -317,97 +332,97 @@ ערך האורך - + <html><head/><body><p>Show full calculation in message box</p></body></html> - + Point label תווית הנקודה - + First point נקודה ראשונה - + First point of line נקודה ראשונה בקו - + Second point נקודה שנייה - + Second point of line נקודה שנייה בקו - + Type of line סוג הקו - + Show line from first point to this point - + Input data - + Size and height - - Standard table + + Measurements - + Increments - + Length of lines אורך הקווים - + Length of arcs - + Length of curves אורך העקומות - + Angle of lines - + Hide empty measurements - + Variables - Click twice to insert into formula - + Select second point of line @@ -431,8 +446,8 @@ - - + + Calculate value לחשב ערך @@ -442,39 +457,44 @@ ערך הרדיוס - - + + <html><head/><body><p>Show full calculation in message box</p></body></html> - + Insert variable into formula - + Value of first angle - + + Measurements + + + + First angle - + Second angle - + Insert marked variable into formula - + Value of second angle @@ -498,11 +518,6 @@ Size and height - - - Standard table - - Increments @@ -539,7 +554,7 @@ - + Value of angle of line. @@ -577,116 +592,230 @@ _ - + <html><head/><body><p>Show full calculation in message box</p></body></html> - + Point label תווית הנקודה - + First point נקודה ראשונה - + First point of angle - + Second point נקודה שנייה - + Second point of angle - + Third point - + Third point of angle - + Type of line סוג הקו - + Show line from second point to this point - + Input data - + Size and height - - Standard table + + Measurements - + Increments - + Length of lines אורך הקווים - + Length of arcs - + Length of curves אורך העקומות - + Angle of lines - + Hide empty measurements - + Variables - Click twice to insert into formula - + Select second point of angle - + Select third point of angle + + DialogCurveIntersectAxis + + + Curve intersect axis + + + + + Angle + + + + + Calculate value + לחשב ערך + + + + Value of angle + + + + + <html><head/><body><p>Show full calculation in message box</p></body></html> + + + + + Axis point + + + + + + First point of line + + + + + Curve + עקומה + + + + Point label + תווית הנקודה + + + + Type of line + סוג הקו + + + + Show line from first point to this point + + + + + Input data + + + + + Size and height + + + + + Measurements + + + + + Increments + + + + + Length of lines + אורך הקווים + + + + Length of arcs + + + + + Length of curves + אורך העקומות + + + + Angle of lines + + + + + Hide empty measurements + + + + + Variables + + + + + Select axis point + + + DialogCutArc @@ -715,72 +844,72 @@ _ - + <html><head/><body><p>Show full calculation in message box</p></body></html> - + Arc - + Selected curve - + Point label תווית הנקודה - + Input data - + Size and height - - Standard table + + Measurements - + Increments - + Length of lines אורך הקווים - + Length of arcs - + Length of curves אורך העקומות - + Angle of lines - + Hide empty measurements - + Variables - Click twice to insert into formula @@ -813,72 +942,72 @@ _ - + <html><head/><body><p>Show full calculation in message box</p></body></html> - + Curve עקומה - + Selected curve - + Point label תווית הנקודה - + Input data - + Size and height - - Standard table + + Measurements - + Increments - + Length of lines אורך הקווים - + Length of arcs - + Length of curves אורך העקומות - + Angle of lines - + Hide empty measurements - + Variables - Click twice to insert into formula @@ -911,72 +1040,72 @@ _ - + <html><head/><body><p>Show full calculation in message box</p></body></html> - + Curve עקומה - + Selected curve path - + Point label תווית הנקודה - + Input data - + Size and height - - Standard table + + Measurements - + Increments - + Length of lines אורך הקווים - + Length of arcs - + Length of curves אורך העקומות - + Angle of lines - + Hide empty measurements - + Variables - Click twice to insert into formula @@ -985,7 +1114,7 @@ DialogDetail - + Detail @@ -995,44 +1124,44 @@ - - - + + + cm - + Bias Y - + Options אפשרויות - + Name of detail - + Seam allowance - + Width רוחב - + Closed - + Delete למחוק @@ -1075,57 +1204,57 @@ _ - + <html><head/><body><p>Show full calculation in message box</p></body></html> - + Input data - + Size and height - - Standard table + + Measurements - + Increments - + Length of lines אורך הקווים - + Length of arcs - + Length of curves אורך העקומות - + Angle of lines - + Hide empty measurements - + Variables @@ -1144,7 +1273,7 @@ - + Calculate value לחשב ערך @@ -1154,93 +1283,93 @@ ערך האורך - - + + <html><head/><body><p>Show full calculation in message box</p></body></html> - + Angle - + Value of angle - + Base point - + First point of line נקודה ראשונה בשורה - + Point label תווית הנקודה - + Type of line סוג הקו - + Show line from first point to this point - + Input data - + Size and height - - Standard table + + Measurements - + Increments - + Length of lines אורך הקווים - + Length of arcs - + Length of curves אורך העקומות - + Angle of lines - + Hide empty measurements - + Variables @@ -1253,35 +1382,35 @@ - + Point label תווית הנקודה - + Base point - - - - + + + + First point of line נקודה ראשונה בשורה - + Second point of line נקודה שנייה בשורה - + Type of line סוג הקו - + Show line from first point to our point @@ -1291,7 +1420,7 @@ לבחור נקודה ראשונה - + Select second point of line @@ -1305,105 +1434,115 @@ - + Tool כלי - - - - - + + + + + Can't create record. - + %1 - Base point + - %1_%2 - Line from point %1 to point %2 - + %3 - Point along line %1_%2 - + %1 - Point of shoulder - + %3 - normal to line %1_%2 - + %4 - bisector of angle %1_%2_%3 - + %5 - intersection of lines %1_%2 and %3_%4 - + Curve %1_%2 - + Arc with center in point %1 - + Curve point %1 - + %4 - point of contact of arc with the center in point %1 and line %2_%3 - + Point of perpendicular from point %1 to line %2_%3 - + Triangle: axis %1_%2, points %3 and %4 - + %1 - point of intersection %2 and %3 - + %1 - cut arc with center %2 - + %1 - cut curve %2_%3 - + %1 - cut curve path %2 + + + %1 - point of intersection line %2_%3 and axis through point %4 + + + + + %1 - point of intersection curve and axis through point %2 + + DialogIncrements @@ -1445,7 +1584,7 @@ - + Description @@ -1535,53 +1674,83 @@ - - + + File error. - + male - + female - + + Could not save GivenName + + + + + Could not save FamilyName + + + + + Could not save Email + + + + + Could not save Sex + + + + + Could not save BirthDate + + + + Measurements use different units than pattern. This pattern required measurements in %1 - + Individual measurements (*.vit) - - + + Open file - - + + Wrong units. - + Standard measurements (*.vst) - + Name_%1 + + + Can't save measurement + + DialogIndividualMeasurements @@ -1637,39 +1806,39 @@ - - + + File error. - - + + Individual measurements (*.vit) - + Open file - + Where save measurements? - + Centimeters - + Millimiters - + Inches @@ -1682,22 +1851,22 @@ קו - + First point נקודה ראשונה - + Second point נקודה שנייה - + Type of line סוג הקו - + Show line from first point to this point @@ -1747,16 +1916,141 @@ - + Select first point of second line - + Select second point of second line + + DialogLineIntersectAxis + + + Line intersect axis + + + + + Angle + + + + + Calculate value + לחשב ערך + + + + Value of angle + + + + + <html><head/><body><p>Show full calculation in message box</p></body></html> + + + + + Axis point + + + + + + + First point of line + + + + + First line point + + + + + Second line point + + + + + Point label + תווית הנקודה + + + + Type of line + סוג הקו + + + + Show line from first point to this point + + + + + Input data + + + + + Size and height + + + + + Measurements + + + + + Increments + + + + + Length of lines + אורך הקווים + + + + Length of arcs + + + + + Length of curves + אורך העקומות + + + + Angle of lines + + + + + Hide empty measurements + + + + + Variables + + + + + Select second point of line + + + + + Select axis point + + + DialogMeasurements @@ -1765,27 +2059,27 @@ - + <html><head/><body><p><span style=" font-size:18pt;">Please, choose pattern type.</span></p></body></html> - + Graduation - + Use for creation pattern standard measurement table - + Individual - + Use for creation pattern individual measurements @@ -1818,92 +2112,92 @@ ערך האורך - + <html><head/><body><p>Show full calculation in message box</p></body></html> - + Point label תווית הנקודה - + First point נקודה ראשונה - + Second point נקודה שנייה - + Additional angle degrees - + Type of line סוג הקו - + Show line from first point to this point - + Input data - + Size and height - - Standard table + + Measurements - + Increments - + Length of lines אורך הקווים - + Length of arcs - + Length of curves אורך העקומות - + Angle of lines - + Hide empty measurements - + Variables - Click twice to insert into formula - + Select second point of line @@ -2154,88 +2448,88 @@ ערך הרדיוס - + <html><head/><body><p>Show full calculation in message box</p></body></html> - + Point label תווית הנקודה - + Center of arc - - + + Select point of center of arc - + Top of the line - + End of the line - + Input data - + Size and height - - Standard table + + Measurements - + Increments - + Length of lines אורך הקווים - + Length of arcs - + Length of curves אורך העקומות - + Angle of lines - + Hide empty measurements - + Variables - Click twice to insert into formula. - + Select second point of line @@ -2253,22 +2547,22 @@ תווית הנקודה - + vertical point - + First point of angle - + horizontal point - + Second point of angle @@ -2306,97 +2600,97 @@ ערך האורך - + <html><head/><body><p>Show full calculation in message box</p></body></html> - + Point label תווית הנקודה - + First point נקודה ראשונה - + Second point נקודה שנייה - + Third point - + Type of line סוג הקו - + Show line from first point to our point - + Input data - + Size and height - - Standard table + + Measurements - + Increments - + Length of lines אורך הקווים - + Length of arcs - + Length of curves אורך העקומות - + Angle of lines - + Hide empty measurements - + Variables - Click twice to insert into formula - + Select first point of line לבחור נקודה ראשונה - + Select second point of line @@ -2486,7 +2780,7 @@ DialogSplinePath - Curve path + Curved path @@ -2556,51 +2850,51 @@ DialogTool - - - - - + + + + + Error - + Empty field - + Value can't be 0 - + Value - + Height - + Size - + Line length אורך הקו - + Arc length - + Curve length אורך העקומה @@ -2618,30 +2912,30 @@ תווית הנקודה - + First point of axis - - - - + + + + First point of line - + Second point of axis - + First point נקודה ראשונה - + Second point נקודה שנייה @@ -2651,12 +2945,12 @@ - + Select first point לבחור נקודה ראשונה - + Select second point לבחור נקודה שנייה @@ -2726,151 +3020,151 @@ Functions - + sin sine function - + cos cosine function - + tan tangens function - + asin arcus sine function - + acos arcus cosine function - + atan arcus tangens function - + sinh hyperbolic sine function - + cosh hyperbolic cosine - + tanh hyperbolic tangens function - + asinh hyperbolic arcus sine function - + acosh hyperbolic arcus tangens function - + atanh hyperbolic arcur tangens function - + log2 logarithm to the base 2 - + log10 logarithm to the base 10 - + log logarithm to the base 10 - + ln logarithm to base e (2.71828...) - + exp e raised to the power of x - + sqrt square root of a value - + sign sign function -1 if x<0; 1 if x>0 - + rint round to nearest integer - + abs absolute value - + min min of all arguments - + max max of all arguments - + sum sum of all arguments - + avg mean value of all arguments @@ -2947,633 +3241,712 @@ - + Tools for creating lines. כלים ליצירת קווים. - + Line קו - + Line between points - + Point at line intersection - + Tools for creating curves. - + Curve עקומה - + Curve tool. - + Tool for path curve. - + Tool segment a pathed curve. - + Tool for segmenting a curve. - + + Point of intersection line and axis + + + + + + + ... + + + + Tools for creating arcs. - + Arc - + Arc tool. - + Cut arc tool. - + Tools for creating details. - + Detail - + Tool new detail. - + Tool for union two details. - + &File - + &Help - + &Pattern piece - + Measurements - + + Window + + + + Toolbar files - + ToolBar modes - + Toolbar pattern - + Toolbar options - + Toolbar tools - + Tool options - + Save &As... - + Export pattern (layout) - + About &Qt - + &About Valentina - + E&xit - + Exit the application - + Preferences - + Zoom in - + Original zoom - + Original Zoom - + Zoom fit best - + + Ctrl+= + + + + + Stop + + + + + Stop using tool + + + + + Repot Bug... + + + + + Report bug + + + + + Close window + + + + zoom in - - + + Zoom out - + Edit pattern XML code - + Pattern properties - + New חדש - + &New - + Create a new pattern - + Ctrl+N - + Open - + &Open - + Open file with pattern - + Save שמור - + &Save - + Save pattern - + Ctrl+S - + Save as - + Save not yet saved pattern - + Ctrl+Shift+S - + Draw - + Draw mode - + Ctrl+W - + Details - + Details mode - + Ctrl+E - - + + Pointer tools - + New pattern piece - + Add new pattern piece - + Ctrl+Shift+N - - + + Change the label of pattern piece - + Table of variables - + Tables of variables - + Ctrl+T - + History - + Ctrl+H - + Create layout - + Ctrl+L - + About Qt - + Ctrl+Q - + Pattern piece %1 - + Pattern piece: - + Enter a new label for the pattern piece. - - - + + + Select point - + + Individual measurements is under development + + + + + There is no way create individual measurements file independent on the pattern file. +For opening pattern need keep both files: pattern and measurements. Do you want continue? + + + + Select first point לבחור נקודה ראשונה - - + + + Select first point of line לבחור נקודה ראשונה - + Select first point of angle - + Select first point of first line - + Select first point curve - + Select simple curve - + Select point of center of arc - + Select point of curve path - + Select curve path - + Select points, arcs, curves clockwise. - + Select base point - + Select first point of axis - + Select point vertically - + Select detail - + Select arc - + + Select curve + + + + Size: - + pattern - + Critical error! - + Error parsing file (std::bad_alloc). - + Bad id. - + + Could not save file + + + + &Undo - + &Redo - + Wrong units. - + Application doesn't support standard table with inches. - + File error. - + + Valentina didn't shut down correctly. Do you want reopen files (%1) you had open? + + + + + Reopen files. + + + + The measurements file <br/><br/> <b>%1</b> <br/><br/> %3 - + could not be found. Do you want to update the file location - + Standard measurements (*.vst) - + Individual measurements (*.vit) - + File loaded - + Height: - + Pattern Piece: - - + + Pattern files (*.val) - + /pattern.val - + File saved - + untitled.val - + Unsaved change - + The pattern has been modified. Do you want to save your changes? - - + + Open file - - + + Error parsing file. - + Error can't convert value. - - + + Error empty parameter. - + Error wrong id. @@ -3581,799 +3954,799 @@ Do you want to save your changes? Measurements - + head_girth Short measurement name. Don't use math symbols in name!!!! - + mid_neck_girth Short measurement name. Don't use math symbols in name!!!! - + neck_base_girth Short measurement name. Don't use math symbols in name!!!! - + head_and_neck_length Short measurement name. Don't use math symbols in name!!!! - + center_front_waist_length Short measurement name. Don't use math symbols in name!!!! - + center_back_waist_length Short measurement name. Don't use math symbols in name!!!! - + shoulder_length Short measurement name. Don't use math symbols in name!!!! - + side_waist_length Short measurement name. Don't use math symbols in name!!!! - + trunk_length Short measurement name. Don't use math symbols in name!!!! - + shoulder_girth Short measurement name. Don't use math symbols in name!!!! - + upper_chest_girth Short measurement name. Don't use math symbols in name!!!! - + bust_girth Short measurement name. Don't use math symbols in name!!!! - + under_bust_girth Short measurement name. Don't use math symbols in name!!!! - + waist_girth Short measurement name. Don't use math symbols in name!!!! - + high_hip_girth Short measurement name. Don't use math symbols in name!!!! - + hip_girth Short measurement name. Don't use math symbols in name!!!! - + upper_front_chest_width Short measurement name. Don't use math symbols in name!!!! - + front_chest_width Short measurement name. Don't use math symbols in name!!!! - + across_front_shoulder_width Short measurement name. Don't use math symbols in name!!!! - + across_back_shoulder_width Short measurement name. Don't use math symbols in name!!!! - + upper_back_width Short measurement name. Don't use math symbols in name!!!! - + back_width Short measurement name. Don't use math symbols in name!!!! - + bustpoint_to_bustpoint Short measurement name. Don't use math symbols in name!!!! - + halter_bustpoint_to_bustpoint Short measurement name. Don't use math symbols in name!!!! - + neck_to_bustpoint Short measurement name. Don't use math symbols in name!!!! - + crotch_length Short measurement name. Don't use math symbols in name!!!! - + rise_height Short measurement name. Don't use math symbols in name!!!! - + shoulder_drop Short measurement name. Don't use math symbols in name!!!! - + shoulder_slope_degrees Short measurement name. Don't use math symbols in name!!!! - + front_shoulder_slope_length Short measurement name. Don't use math symbols in name!!!! - + back_shoulder_slope_length Short measurement name. Don't use math symbols in name!!!! - + front_shoulder_to_waist_length Short measurement name. Don't use math symbols in name!!!! - + back_shoulder_to_waist_length Short measurement name. Don't use math symbols in name!!!! - + front_neck_arc Short measurement name. Don't use math symbols in name!!!! - + back_neck_arc Short measurement name. Don't use math symbols in name!!!! - + front_upper_chest_arc Short measurement name. Don't use math symbols in name!!!! - + back_upper_chest_arc Short measurement name. Don't use math symbols in name!!!! - + front_waist_arc Short measurement name. Don't use math symbols in name!!!! - + back_waist_arc Short measurement name. Don't use math symbols in name!!!! - + front_upper_hip_arc Short measurement name. Don't use math symbols in name!!!! - + back_upper_hip_arc Short measurement name. Don't use math symbols in name!!!! - + front_hip_arc Short measurement name. Don't use math symbols in name!!!! - + back_hip_arc Short measurement name. Don't use math symbols in name!!!! - + chest_slope Short measurement name. Don't use math symbols in name!!!! - + back_slope Short measurement name. Don't use math symbols in name!!!! - + front_waist_slope Short measurement name. Don't use math symbols in name!!!! - + back_waist_slope Short measurement name. Don't use math symbols in name!!!! - + front_neck_to_upper_chest_height Short measurement name. Don't use math symbols in name!!!! - + front_neck_to_bust_height Short measurement name. Don't use math symbols in name!!!! - + front_waist_to_upper_chest Short measurement name. Don't use math symbols in name!!!! - + front_waist_to_lower_breast Short measurement name. Don't use math symbols in name!!!! - + back_waist_to_upper_chest Short measurement name. Don't use math symbols in name!!!! - + strap_length Short measurement name. Don't use math symbols in name!!!! - + armscye_girth Short measurement name. Don't use math symbols in name!!!! - + elbow_girth Short measurement name. Don't use math symbols in name!!!! - + upper_arm_girth Short measurement name. Don't use math symbols in name!!!! - + wrist_girth Short measurement name. Don't use math symbols in name!!!! - + scye_depth Short measurement name. Don't use math symbols in name!!!! - + shoulder_and_arm_length Short measurement name. Don't use math symbols in name!!!! - + underarm_length Short measurement name. Don't use math symbols in name!!!! - + cervicale_to_wrist_length Short measurement name. Don't use math symbols in name!!!! - + shoulder_to_elbow_length Short measurement name. Don't use math symbols in name!!!! - + arm_length Short measurement name. Don't use math symbols in name!!!! - + hand_width Short measurement name. Don't use math symbols in name!!!! - + hand_length Short measurement name. Don't use math symbols in name!!!! - + hand_girth Short measurement name. Don't use math symbols in name!!!! - + thigh_girth Short measurement name. Don't use math symbols in name!!!! - + mid_thigh_girth Short measurement name. Don't use math symbols in name!!!! - + knee_girth Short measurement name. Don't use math symbols in name!!!! - + calf_girth Short measurement name. Don't use math symbols in name!!!! - + ankle_girth Short measurement name. Don't use math symbols in name!!!! - + knee_height Short measurement name. Don't use math symbols in name!!!! - + ankle_height Short measurement name. Don't use math symbols in name!!!! - + foot_width Short measurement name. Don't use math symbols in name!!!! - + foot_length Short measurement name. Don't use math symbols in name!!!! - + height Short measurement name. Don't use math symbols in name!!!! - + cervicale_height Short measurement name. Don't use math symbols in name!!!! - + cervicale_to_knee_height Short measurement name. Don't use math symbols in name!!!! - + waist_height Short measurement name. Don't use math symbols in name!!!! - + high_hip_height Short measurement name. Don't use math symbols in name!!!! - + hip_height Short measurement name. Don't use math symbols in name!!!! - + waist_to_hip_height Short measurement name. Don't use math symbols in name!!!! - + waist_to_knee_height Short measurement name. Don't use math symbols in name!!!! - + crotch_height Short measurement name. Don't use math symbols in name!!!! - + size Short measurement name. Don't use math symbols in name!!!! - + height_front_neck_base_point Short measurement name. Don't use math symbols in name!!!! - + height_base_neck_side_point Short measurement name. Don't use math symbols in name!!!! - + height_shoulder_point Short measurement name. Don't use math symbols in name!!!! - + height_nipple_point Short measurement name. Don't use math symbols in name!!!! - + height_back_angle_axilla Short measurement name. Don't use math symbols in name!!!! - + height_scapular_point Short measurement name. Don't use math symbols in name!!!! - + height_under_buttock_folds Short measurement name. Don't use math symbols in name!!!! - + hips_excluding_protruding_abdomen Short measurement name. Don't use math symbols in name!!!! - + girth_foot_instep Short measurement name. Don't use math symbols in name!!!! - + side_waist_to_floor Short measurement name. Don't use math symbols in name!!!! - + front_waist_to_floor Short measurement name. Don't use math symbols in name!!!! - + arc_through_groin_area Short measurement name. Don't use math symbols in name!!!! - + waist_to_plane_seat Short measurement name. Don't use math symbols in name!!!! - + neck_to_radial_point Short measurement name. Don't use math symbols in name!!!! - + neck_to_third_finger Short measurement name. Don't use math symbols in name!!!! - + neck_to_first_line_chest_circumference Short measurement name. Don't use math symbols in name!!!! - + front_waist_length Short measurement name. Don't use math symbols in name!!!! - + arc_through_shoulder_joint Short measurement name. Don't use math symbols in name!!!! - + neck_to_back_line_chest_circumference Short measurement name. Don't use math symbols in name!!!! - + waist_to_neck_side Short measurement name. Don't use math symbols in name!!!! - + arc_length_upper_body Short measurement name. Don't use math symbols in name!!!! - + chest_width Short measurement name. Don't use math symbols in name!!!! - + anteroposterior_diameter_hands Short measurement name. Don't use math symbols in name!!!! - + height_clavicular_point Short measurement name. Don't use math symbols in name!!!! - + height_armhole_slash Short measurement name. Don't use math symbols in name!!!! - + slash_shoulder_height Short measurement name. Don't use math symbols in name!!!! - + half_girth_neck Short measurement name. Don't use math symbols in name!!!! - + half_girth_neck_for_shirts Short measurement name. Don't use math symbols in name!!!! - + half_girth_chest_first Short measurement name. Don't use math symbols in name!!!! - + half_girth_chest_second Short measurement name. Don't use math symbols in name!!!! - + half_girth_chest_third Short measurement name. Don't use math symbols in name!!!! - + half_girth_waist Short measurement name. Don't use math symbols in name!!!! - + half_girth_hips_considering_protruding_abdomen Short measurement name. Don't use math symbols in name!!!! - + half_girth_hips_excluding_protruding_abdomen Short measurement name. Don't use math symbols in name!!!! - + girth_knee_flexed_feet Short measurement name. Don't use math symbols in name!!!! - + neck_transverse_diameter Short measurement name. Don't use math symbols in name!!!! - + front_slash_shoulder_height Short measurement name. Don't use math symbols in name!!!! - + neck_to_front_waist_line Short measurement name. Don't use math symbols in name!!!! - + hand_vertical_diameter Short measurement name. Don't use math symbols in name!!!! - + neck_to_knee_point Short measurement name. Don't use math symbols in name!!!! - + waist_to_knee Short measurement name. Don't use math symbols in name!!!! - + shoulder_height Short measurement name. Don't use math symbols in name!!!! - + head_height Short measurement name. Don't use math symbols in name!!!! - + body_position Short measurement name. Don't use math symbols in name!!!! - + arc_behind_shoulder_girdle Short measurement name. Don't use math symbols in name!!!! - + neck_to_neck_base Short measurement name. Don't use math symbols in name!!!! - + depth_waist_first Short measurement name. Don't use math symbols in name!!!! - + depth_waist_second Short measurement name. Don't use math symbols in name!!!! @@ -4382,799 +4755,799 @@ Do you want to save your changes? MeasurementsDescriptions - + Around fullest part of Head Full measurement description - + Around middle part of Neck Full measurement description - + Around Neck at base Full measurement description - + Vertical Distance from Crown to Nape Full measurement description - + Front Neck Center over tape at Bustline to Front Waist Center Full measurement description - + Back Neck Center to Back Waist Center Full measurement description - + NeckPoint to ShoulderTip Full measurement description - + Armpit to Waist side Full measurement description - + Around Body from middle of Shoulder length to BustPoint to Crotch up back to beginning point Full measurement description - + Around Arms and Torso, at bicep level parallel to floor, with arms hanging at the sides Full measurement description - + Around Chest at Armfold level, will be parallel to floor across back, will not be parallel to floor across front chest Full measurement description - + Around fullest part of Bust, parallel to floor Full measurement description - + Around Chest below the Bust, parallel to floor Full measurement description - + Tie a string around smallest part of waist, keep string tied while taking meaasurements. Not usually parallel to floor for front waist or back waist. Full measurement description - + Around HighHip, parallel to floor Full measurement description - + Around Hip, parallel to floor Full measurement description - + Across Front UpperChest, smallest width from armscye to armscye Full measurement description - + Across Front Chest, from armfold to armfold Full measurement description - + From ShoulderTip to ShoulderTip, across Front Full measurement description - + From ShoulderTip to ShoulderTip, across Back Full measurement description - + Across Back UpperChest, smallest width from armscye to armscye Full measurement description - + Across Back Chest, from armfold to armfold Full measurement description - + Distance between BustPoints, across Chest Full measurement description - + Distance from Bustpoint, behind neck, down to Bustpoint Full measurement description - + From NeckPoint to BustPoint Full measurement description - + From Front Waist Center, down to crotch, up to Back Waist Center Full measurement description - + Sit on hard chair, measure from side waist straight down to chair bottom Full measurement description - + Vertical Distance from NeckPoint level to ShoulderTip level Full measurement description - + Degrees of angle from NeckPoint to ShoulderTip – requires goniometer Full measurement description - + ShoulderTip to Front Waist Center Full measurement description - + ShoulderTip to Back Waist Center Full measurement description - + NeckPoint straight down front chest to Waistline Full measurement description - + Back NeckPoint straight down back chest to Waistline Full measurement description - + NeckPoint to NeckPoint through Front Neck Center Full measurement description - + NeckPoint to NeckPoint across Nape Full measurement description - + Front upper-bust arc Full measurement description - + Back UpperBust side to side Full measurement description - + Front Waist side to side Full measurement description - + Back Waist side to side Full measurement description - + Front UpperHip side to side Full measurement description - + Back UpperHip side to side Full measurement description - + Front Hip side to side Full measurement description - + Back Hip side to side Full measurement description - + NeckPoint to Front ArmfoldPoint Full measurement description - + NeckPoint to Back ArmfoldPoint Full measurement description - + NeckPoint across Front Chest to Waist side Full measurement description - + NeckPoint across Back Chest to Waist side Full measurement description - + Front Neck Center straight down to UpperChest line Full measurement description - + Front Neck Center straight down to Bust line Full measurement description - + Front Upper chest waist Full measurement description - + Front waist to lower breast Full measurement description - + Back waist to upper chest Full measurement description - + Strap length Full measurement description - + Around Armscye Full measurement description - + Around Elbow with elbow bent Full measurement description - + Around UpperArm Full measurement description - + Around Wrist Full measurement description - + Nape straight down to UnderBust line (same as Back UpperBust height) Full measurement description - + NeckPoint to ShoulderTip to Wrist, with elbow bent and hand on hip Full measurement description - + Armpit to Wrist, with arm straight and hanging at side Full measurement description - + Nape to Wrist, with elbow bent and hand on hip Full measurement description - + ShoulderTip to Elbow, with elbow bent and hand on hip Full measurement description - + ShoulderTip to Wrist, with elbow bent and hand on hip Full measurement description - + Hand side to side Full measurement description - + Hand Middle Finger tip to wrist Full measurement description - + Around Hand Full measurement description - + Around Thigh Full measurement description - + Around MidThigh Full measurement description - + Around Knee Full measurement description - + Around Calf Full measurement description - + Around Ankle Full measurement description - + Knee to Floor Full measurement description - + Ankle to Floor Full measurement description - + Widest part of Foot side to side Full measurement description - + Tip of Longest Toe straight to back of heel Full measurement description - + Top of head to floor Full measurement description - + Nape to Floor Full measurement description - + Nape to Knee Full measurement description - + Waist side to floor Full measurement description - + HighHip side to Floor Full measurement description - + Hip side to Floor Full measurement description - + Waist side to Hip Full measurement description - + Waist side to Knee Full measurement description - + Crotch to Floor along inside leg Full measurement description - + Size Full measurement description - + Height of the point base of the neck in front Full measurement description - + Height of the base of the neck side point Full measurement description - + The height of the shoulder point Full measurement description - + Height nipple point Full measurement description - + Height back angle axilla Full measurement description - + Height scapular point Full measurement description - + Height under buttock folds Full measurement description - + Hips excluding protruding abdomen Full measurement description - + Girth foot instep Full measurement description - + The distance from the side waist to floor Full measurement description - + The distance from the front waist to floor Full measurement description - + Arc through groin area Full measurement description - + The distance from the waist to the plane seat Full measurement description - + The distance from the base of the neck to the side of the radial point Full measurement description - + Distance from the base of the neck side point to the end of the third finger Full measurement description - + The distance from the base of the neck to the side of the first line in front of chest circumference Full measurement description - + The distance from the base of the neck to the waist side front (waist length in the front) Full measurement description - + Arc through the highest point of the shoulder joint Full measurement description - + The distance from the base of the neck to the back line of chest circumference of the first and the second based on ledge vanes Full measurement description - + The distance from the waist to the back base of the neck side point Full measurement description - + Arc length of the upper body through the base of the neck side point Full measurement description - + Chest width Full measurement description - + Anteroposterior diameter of the hands Full measurement description - + Height clavicular point Full measurement description - + The distance from the point to the cervical level of the posterior angle of the front armpit (underarm height oblique) Full measurement description - + Slash shoulder height Full measurement description - + Half girth neck Full measurement description - + Half girth neck for shirts Full measurement description - + Half girth chest first Full measurement description - + Half girth chest second Full measurement description - + Half girth chest third Full measurement description - + Half girth waist Full measurement description - + Half girth hips considering protruding abdomen Full measurement description - + Half girth hips excluding protruding abdomen Full measurement description - + Girth knee flexed feet Full measurement description - + Neck transverse diameter Full measurement description - + Front slash shoulder height Full measurement description - + The distance from the base of the neck to the waist line front Full measurement description - + Hand vertical diameter Full measurement description - + Distance from neck to knee point Full measurement description - + The distance from the waist to the knee Full measurement description - + Shoulder height Full measurement description - + Head height Full measurement description - + Body position Full measurement description - + Arc behind the shoulder girdle Full measurement description - + Distance from neck point to point on the base of the neck side neck girth measurement line Full measurement description - + Depth waist first Full measurement description - + Depth waist second Full measurement description @@ -5183,799 +5556,799 @@ Do you want to save your changes? MeasurementsFullNames - + Head girth Full measurement name - + Mid-neck girth Full measurement name - + Neck Base girth Full measurement name - + Head and Neck length Full measurement name - + Front Center length Full measurement name - + Back Center length Full measurement name - + Shoulder length Full measurement name - + Side Waist length Full measurement name - + Trunk length Full measurement name - + Shoulder girth Full measurement name - + Upper Chest girth Full measurement name - + Bust girth Full measurement name - + Under Bust girth Full measurement name - + Waist girth Full measurement name - + HighHip girth Full measurement name - + Hip girth Full measurement name - + Front Upper Chest width Full measurement name - + Front Chest width Full measurement name - + Front Across Shoulder width Full measurement name - + Back Across Shoulder width Full measurement name - + Back Upper Chest width Full measurement name - + Back Chest width Full measurement name - + BustPoint to BustPoint Full measurement name - + Halter Bustpoint to Bustpoint Full measurement name - + NeckPoint to BustPoint Full measurement name - + Crotch length Full measurement name - + Rise height Full measurement name - + Shoulder Drop Full measurement name - + Shoulder Slope degrees Full measurement name - + Front Shoulder Balance Full measurement name - + Back Shoulder Balance Full measurement name - + Front Full Length Full measurement name - + Back Full Length Full measurement name - + Front Neck arc Full measurement name - + Back Neck arc Full measurement name - + Front upper-bust arc Full measurement name - + Back UpperBust arc Full measurement name - + Front Waist arc Full measurement name - + Back Waist arc Full measurement name - + Front UpperHip arc Full measurement name - + Back UpperHip arc Full measurement name - + Front Hip arc Full measurement name - + Back Hip arc Full measurement name - + Chest Balance Full measurement name - + Back Balance Full measurement name - + Front Waist Balance Full measurement name - + Back Waist Balance Full measurement name - + Front UpperChest height Full measurement name - + Bust height Full measurement name - + Front Upper chest waist Full measurement name - + Front waist to lower breast Full measurement name - + Back waist to upper chest Full measurement name - + Strap length Full measurement name - + Armscye Girth Full measurement name - + Elbow Girth Full measurement name - + Upperarm Girth Full measurement name - + Wrist girth Full measurement name - + Armscye depth Full measurement name - + Shoulder and Arm length Full measurement name - + Underarm length Full measurement name - + Nape to wrist length Full measurement name - + Elbow length Full measurement name - + Arm length Full measurement name - + Hand width Full measurement name - + Hand length Full measurement name - + Hand girth Full measurement name - + Thigh girth Full measurement name - + Midthigh girth Full measurement name - + Knee girth Full measurement name - + Calf girth Full measurement name - + Ankle girth Full measurement name - + Knee height Full measurement name - + Ankle height Full measurement name - + Foot width Full measurement name - + Foot length Full measurement name - + Total Height Full measurement name - + Nape height Full measurement name - + Nape to knee height Full measurement name - + Waist height Full measurement name - + HighHip height Full measurement name - + Hip height Full measurement name - + Waist to Hip height Full measurement name - + Waist to Knee height Full measurement name - + Crotch height/Inseam Full measurement name - + Size Full measurement name - + Height front neck base point Full measurement name - + Height base neck side point Full measurement name - + Height shoulder point Full measurement name - + Height nipple point Full measurement name - + Height back angle axilla Full measurement name - + Height scapular point Full measurement name - + Height under buttock folds Full measurement name - + Hips excluding protruding abdomen Full measurement name - + Girth foot instep Full measurement name - + Side waist to floor Full measurement name - + Front waist to floor Full measurement name - + Arc through groin area Full measurement name - + Waist to plane seat Full measurement name - + Neck to radial point Full measurement name - + Neck to third finger Full measurement name - + Neck to first line chest circumference Full measurement name - + Front waist length Full measurement name - + Arc through shoulder joint Full measurement name - + Neck to back line chest circumference Full measurement name - + Waist to neck side Full measurement name - + Arc length upper body Full measurement name - + Chest width Full measurement name - + Anteroposterior diameter hands Full measurement name - + Height clavicular point Full measurement name - + Height armhole slash Full measurement name - + Slash shoulder height Full measurement name - + Half girth neck Full measurement name - + Half girth neck for shirts Full measurement name - + Half girth chest first Full measurement name - + Half girth chest second Full measurement name - + Half girth chest third Full measurement name - + Half girth waist Full measurement name - + Half girth hips considering protruding abdomen Full measurement name - + Half girth hips excluding protruding abdomen Full measurement name - + Girth knee flexed feet Full measurement name - + Neck transverse diameter Full measurement name - + Front slash shoulder height Full measurement name - + Neck to front waist line Full measurement name - + Hand vertical diameter Full measurement name - + Neck to knee point Full measurement name - + Waist to knee Full measurement name - + Shoulder height Full measurement name - + Head height Full measurement name - + Body position Full measurement name - + Arc behind shoulder girdle Full measurement name - + Neck to neck base Full measurement name - + Depth waist first Full measurement name - + Depth waist second Full measurement name @@ -6084,19 +6457,19 @@ Do you want to save your changes? PostfixOperators - + cm centimeter - + mm millimeter - + in inch @@ -6158,7 +6531,7 @@ Do you want to save your changes? QObject - + Create new pattern piece to start working. @@ -6173,18 +6546,18 @@ Do you want to save your changes? - + mm - - + + cm - + inch @@ -6200,7 +6573,7 @@ Do you want to save your changes? STDescriptions - + Standard figures of men 1st group, chest 100 cm Standard table description @@ -6378,12 +6751,12 @@ Do you want to save your changes? VAbstractTool - + Confirm the deletion. - + Do you really want delete? @@ -6391,35 +6764,45 @@ Do you want to save your changes? VApplication - + Error parsing file. Program will be terminated. - + Error bad id. Program will be terminated. - + Error can't convert value. Program will be terminated. - + Error empty parameter. Program will be terminated. - + Error wrong id. Program will be terminated. - + Something's wrong!! + + + Could not copy temp file to document file + + + + + Could not remove document file + + VContainer @@ -6446,48 +6829,53 @@ Do you want to save your changes? VDomDocument - + Can't convert toUInt parameter - + Can't convert toBool parameter - + Got empty parameter - + Can't convert toDouble parameter - - + + Can't open file %1: %2. - + Can't open schema file %1: %2. - + Validation error file %3 in line %1 column %2 - + Parsing error file %3 in line %1 column %2 + + + Couldn't get node + + VDrawTool @@ -6510,7 +6898,7 @@ Do you want to save your changes? VException - + Critical error! @@ -6550,188 +6938,200 @@ Do you want to save your changes? VPattern - - Can't find tool id = %1 in table. + + Can't find tool in table. - + Error no unique id. - - + + Error parsing file. - + Error can't convert value. - + Error empty parameter. - + Error wrong id. - + Critical error! - + Error parsing file (std::bad_alloc). - + Error creating or updating detail - + Error creating or updating single point - - + + Error creating or updating point of end line - - + + Error creating or updating point along line - - + + Error creating or updating point of shoulder - - + + Error creating or updating point of normal - - + + Error creating or updating point of bisector - + Error creating or updating point of lineintersection - - + + Error creating or updating point of contact - + Error creating or updating modeling point - + Error creating or updating height - + Error creating or updating triangle - + Error creating or updating point of intersection - - + + Error creating or updating cut spline point - - + + Error creating or updating cut spline path point - - + + Error creating or updating cut arc point - + + + Error creating or updating point of intersection line and axis + + + + + + Error creating or updating point of intersection curve and axis + + + + Error creating or updating line - + Error creating or updating simple curve - + Error creating or updating curve path - + Error creating or updating modeling simple curve - + Error creating or updating modeling curve path - - + + Error creating or updating simple arc - + Error creating or updating modeling arc - + Error creating or updating union details - + Got wrong parameter id. Need only id > 0. - + This id is not unique. - + File error. @@ -6785,207 +7185,227 @@ Do you want to save your changes? VToolOptionsPropertyBrowser - + Base point - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + Point label תווית הנקודה - + Position - + Point at distance and angle - - - - - - - + + + + + + + + + Line type - - - - - - - - + + + + + + + + Length אורך - + + + Angle - + Point at distance along line - + Arc - - + + Radius רדיוס - + First angle - + Second angle - + Point along bisector - + Cut arc tool - + Tool for segmenting a curve - + Tool segment a pathed curve - + Perpendicular point along line - + Line between points - + Point at line intersection - + Point along perpendicular - + Additional angle degrees - + Point at intersection of arc and line - + Tool to make point from x & y of two other points - + Special point on shoulder - + Curve tool - - + + Curve factor - + Tool for path curve - + Tool triangle + + + + Point intersection line and axis + + Variables - + Line_ Left symbol _ in name - + AngleLine_ Left symbol _ in name - + Arc_ Left symbol _ in name - + Spl_ Left symbol _ in name - + SplPath Do not add symbol _ to the end of name + + VisToolCurveIntersectAxis + + + <b>Intersection curve and axis</b>: angle = %1°; <b>Shift</b> - sticking angle, <b>Enter</b> - finish creation + + + VisToolEndLine @@ -6994,6 +7414,14 @@ Do you want to save your changes? + + VisToolLineIntersectAxis + + + <b>Intersection line and axis</b>: angle = %1°; <b>Shift</b> - sticking angle, <b>Enter</b> - finish creation + + + VisToolSplinePath @@ -7005,12 +7433,12 @@ Do you want to save your changes? main - + Pattern making program. - + Pattern file. diff --git a/src/app/share/translations/valentina_it_IT.ts b/src/app/share/translations/valentina_it_IT.ts index e97ad693d..5571aeff7 100644 --- a/src/app/share/translations/valentina_it_IT.ts +++ b/src/app/share/translations/valentina_it_IT.ts @@ -147,85 +147,100 @@ ConfigurationPage - + Setup user interface language updated and will be used the next time start - + Default unit updated and will be used the next pattern creation - + Save - + Auto-save modified pattern - + Interval: - + min - + Language - + GUI language - + Decimal separator parts - + With OS options (%1) - + Default unit - + Centimeters - + Millimiters - + Inches - + Label language + + + Send crash reports + + + + + Send crash reports (recommended) + + + + + After each crash Valentina collect information that may help us fix a problem. We do not collect any personal information. Find more about what <a href="https://bitbucket.org/dismine/valentina/wiki/manual/Crash_reports">kind of information</a> we collect. + + DelTool - + Delete tool @@ -325,97 +340,97 @@ _ - + <html><head/><body><p>Show full calculation in message box</p></body></html> - + Point label - + First point - + First point of line - + Second point - + Second point of line - + Type of line - + Show line from first point to this point - + Input data - + Size and height - - Standard table + + Measurements - + Increments - + Length of lines - + Length of arcs - + Length of curves - + Angle of lines - + Hide empty measurements - + Variables - Click twice to insert into formula - + Select second point of line @@ -443,8 +458,8 @@ - - + + Calculate value @@ -458,39 +473,39 @@ _ - - + + <html><head/><body><p>Show full calculation in message box</p></body></html> - + Insert variable into formula - + Value of first angle - + First angle - + Second angle - + Insert marked variable into formula - + Value of second angle @@ -516,7 +531,7 @@ - Standard table + Measurements @@ -555,7 +570,7 @@ - + Value of angle of line. @@ -597,116 +612,230 @@ _ - + <html><head/><body><p>Show full calculation in message box</p></body></html> - + Point label - + First point - + First point of angle - + Second point - + Second point of angle - + Third point - + Third point of angle - + Type of line - + Show line from second point to this point - + Input data - + Size and height - - Standard table + + Measurements - + Increments - + Length of lines - + Length of arcs - + Length of curves - + Angle of lines - + Hide empty measurements - + Variables - Click twice to insert into formula - + Select second point of angle - + Select third point of angle + + DialogCurveIntersectAxis + + + Curve intersect axis + + + + + Angle + + + + + Calculate value + + + + + Value of angle + + + + + <html><head/><body><p>Show full calculation in message box</p></body></html> + + + + + Axis point + + + + + + First point of line + + + + + Curve + + + + + Point label + + + + + Type of line + + + + + Show line from first point to this point + + + + + Input data + + + + + Size and height + + + + + Measurements + + + + + Increments + + + + + Length of lines + + + + + Length of arcs + + + + + Length of curves + + + + + Angle of lines + + + + + Hide empty measurements + + + + + Variables + + + + + Select axis point + + + DialogCutArc @@ -739,72 +868,72 @@ _ - + <html><head/><body><p>Show full calculation in message box</p></body></html> - + Arc - + Selected curve - + Point label - + Input data - + Size and height - - Standard table + + Measurements - + Increments - + Length of lines - + Length of arcs - + Length of curves - + Angle of lines - + Hide empty measurements - + Variables - Click twice to insert into formula @@ -841,72 +970,72 @@ _ - + <html><head/><body><p>Show full calculation in message box</p></body></html> - + Curve - + Selected curve - + Point label - + Input data - + Size and height - - Standard table + + Measurements - + Increments - + Length of lines - + Length of arcs - + Length of curves - + Angle of lines - + Hide empty measurements - + Variables - Click twice to insert into formula @@ -943,72 +1072,72 @@ _ - + <html><head/><body><p>Show full calculation in message box</p></body></html> - + Curve - + Selected curve path - + Point label - + Input data - + Size and height - - Standard table + + Measurements - + Increments - + Length of lines - + Length of arcs - + Length of curves - + Angle of lines - + Hide empty measurements - + Variables - Click twice to insert into formula @@ -1017,7 +1146,7 @@ DialogDetail - + Detail @@ -1027,44 +1156,44 @@ - - - + + + cm - + Bias Y - + Options - + Name of detail - + Seam allowance - + Width - + Closed - + Delete @@ -1111,57 +1240,57 @@ _ - + <html><head/><body><p>Show full calculation in message box</p></body></html> - + Input data - + Size and height - - Standard table + + Measurements - + Increments - + Length of lines - + Length of arcs - + Length of curves - + Angle of lines - + Hide empty measurements - + Variables @@ -1184,7 +1313,7 @@ - + Calculate value @@ -1198,93 +1327,93 @@ _ - - + + <html><head/><body><p>Show full calculation in message box</p></body></html> - + Angle - + Value of angle - + Base point - + First point of line - + Point label - + Type of line - + Show line from first point to this point - + Input data - + Size and height - - Standard table + + Measurements - + Increments - + Length of lines - + Length of arcs - + Length of curves - + Angle of lines - + Hide empty measurements - + Variables @@ -1297,35 +1426,35 @@ - + Point label - + Base point - - - - + + + + First point of line - + Second point of line - + Type of line - + Show line from first point to our point @@ -1335,7 +1464,7 @@ - + Select second point of line @@ -1349,105 +1478,115 @@ - + Tool - - - - - + + + + + Can't create record. - + %1 - Base point + - %1_%2 - Line from point %1 to point %2 - + %3 - Point along line %1_%2 - + %1 - Point of shoulder - + %3 - normal to line %1_%2 - + %4 - bisector of angle %1_%2_%3 - + %5 - intersection of lines %1_%2 and %3_%4 - + Curve %1_%2 - + Arc with center in point %1 - + Curve point %1 - + %4 - point of contact of arc with the center in point %1 and line %2_%3 - + Point of perpendicular from point %1 to line %2_%3 - + Triangle: axis %1_%2, points %3 and %4 - + %1 - point of intersection %2 and %3 - + %1 - cut arc with center %2 - + %1 - cut curve %2_%3 - + %1 - cut curve path %2 + + + %1 - point of intersection line %2_%3 and axis through point %4 + + + + + %1 - point of intersection curve and axis through point %2 + + DialogIncrements @@ -1484,7 +1623,7 @@ - + Description @@ -1583,53 +1722,83 @@ - - + + File error. - + male - + female - + + Could not save GivenName + + + + + Could not save FamilyName + + + + + Could not save Email + + + + + Could not save Sex + + + + + Could not save BirthDate + + + + Measurements use different units than pattern. This pattern required measurements in %1 - + Individual measurements (*.vit) - - + + Open file - - + + Wrong units. - + Standard measurements (*.vst) - + Name_%1 + + + Can't save measurement + + DialogIndividualMeasurements @@ -1689,39 +1858,39 @@ - - + + File error. - - + + Individual measurements (*.vit) - + Open file - + Where save measurements? - + Centimeters - + Millimiters - + Inches @@ -1734,22 +1903,22 @@ - + First point - + Second point - + Type of line - + Show line from first point to this point @@ -1799,16 +1968,141 @@ - + Select first point of second line - + Select second point of second line + + DialogLineIntersectAxis + + + Line intersect axis + + + + + Angle + + + + + Calculate value + + + + + Value of angle + + + + + <html><head/><body><p>Show full calculation in message box</p></body></html> + + + + + Axis point + + + + + + + First point of line + + + + + First line point + + + + + Second line point + + + + + Point label + + + + + Type of line + + + + + Show line from first point to this point + + + + + Input data + + + + + Size and height + + + + + Measurements + + + + + Increments + + + + + Length of lines + + + + + Length of arcs + + + + + Length of curves + + + + + Angle of lines + + + + + Hide empty measurements + + + + + Variables + + + + + Select second point of line + + + + + Select axis point + + + DialogMeasurements @@ -1817,27 +2111,27 @@ - + <html><head/><body><p><span style=" font-size:18pt;">Please, choose pattern type.</span></p></body></html> - + Graduation - + Use for creation pattern standard measurement table - + Individual - + Use for creation pattern individual measurements @@ -1878,92 +2172,92 @@ _ - + <html><head/><body><p>Show full calculation in message box</p></body></html> - + Point label - + First point - + Second point - + Additional angle degrees - + Type of line - + Show line from first point to this point - + Input data - + Size and height - - Standard table + + Measurements - + Increments - + Length of lines - + Length of arcs - + Length of curves - + Angle of lines - + Hide empty measurements - + Variables - Click twice to insert into formula - + Select second point of line @@ -2222,88 +2516,88 @@ _ - + <html><head/><body><p>Show full calculation in message box</p></body></html> - + Point label - + Center of arc - - + + Select point of center of arc - + Top of the line - + End of the line - + Input data - + Size and height - - Standard table + + Measurements - + Increments - + Length of lines - + Length of arcs - + Length of curves - + Angle of lines - + Hide empty measurements - + Variables - Click twice to insert into formula. - + Select second point of line @@ -2321,22 +2615,22 @@ - + vertical point - + First point of angle - + horizontal point - + Second point of angle @@ -2382,97 +2676,97 @@ _ - + <html><head/><body><p>Show full calculation in message box</p></body></html> - + Point label - + First point - + Second point - + Third point - + Type of line - + Show line from first point to our point - + Input data - + Size and height - - Standard table + + Measurements - + Increments - + Length of lines - + Length of arcs - + Length of curves - + Angle of lines - + Hide empty measurements - + Variables - Click twice to insert into formula - + Select first point of line - + Select second point of line @@ -2562,7 +2856,7 @@ DialogSplinePath - Curve path + Curved path @@ -2632,51 +2926,51 @@ DialogTool - - - - - + + + + + Error - + Empty field - + Value can't be 0 - + Value - + Height - + Size - + Line length - + Arc length - + Curve length @@ -2694,30 +2988,30 @@ - + First point of axis - - - - + + + + First point of line - + Second point of axis - + First point - + Second point @@ -2727,12 +3021,12 @@ - + Select first point - + Select second point @@ -2802,151 +3096,151 @@ Functions - + sin sine function - + cos cosine function - + tan tangens function - + asin arcus sine function - + acos arcus cosine function - + atan arcus tangens function - + sinh hyperbolic sine function - + cosh hyperbolic cosine - + tanh hyperbolic tangens function - + asinh hyperbolic arcus sine function - + acosh hyperbolic arcus tangens function - + atanh hyperbolic arcur tangens function - + log2 logarithm to the base 2 - + log10 logarithm to the base 10 - + log logarithm to the base 10 - + ln logarithm to base e (2.71828...) - + exp e raised to the power of x - + sqrt square root of a value - + sign sign function -1 if x<0; 1 if x>0 - + rint round to nearest integer - + abs absolute value - + min min of all arguments - + max max of all arguments - + sum sum of all arguments - + avg mean value of all arguments @@ -2978,8 +3272,11 @@ + + + ... - ... + ... @@ -2987,117 +3284,117 @@ - + Tools for creating lines. - + Line - + Tools for creating curves. - + Curve - + Curve tool. - + Tool for path curve. - + Tool segment a pathed curve. - + Tool for segmenting a curve. - + Tools for creating arcs. - + Arc - + Arc tool. - + Tools for creating details. - + Detail - + Tool new detail. - + New - + Create a new pattern - + Ctrl+N - + Open - + Open file with pattern - + Save - + Save pattern - + Ctrl+S - + Save as @@ -3142,474 +3439,546 @@ - - Line between points + + Point of intersection line and axis + Line between points + + + + Point at line intersection - + Cut arc tool. - + Tool for union two details. - + &File - + &Help - + &Pattern piece - + Measurements - + + Window + + + + Toolbar files - + ToolBar modes - + Toolbar pattern - + Toolbar options - + Toolbar tools - + Tool options - + &New - + &Open - + &Save - + Save &As... - + Save not yet saved pattern - + Ctrl+Shift+S - + Draw - + Draw mode - + Ctrl+W - + Details - + Details mode - + Ctrl+E Ctrl+E - - + + Pointer tools - + New pattern piece - + Add new pattern piece - + Ctrl+Shift+N Ctrl+Shift+N - - + + Change the label of pattern piece - + Table of variables - + Tables of variables - + Ctrl+T Ctrl+T - + History - + Ctrl+H Ctrl+H - + Export pattern (layout) - + About &Qt - + &About Valentina - + E&xit - + Exit the application - + Preferences - + Pattern properties - + Zoom in - + Original zoom - + Original Zoom - + Zoom fit best - + + Ctrl+= + + + + + Stop + + + + + Stop using tool + + + + + Repot Bug... + + + + + Report bug + + + + + Close window + + + + zoom in - - + + Zoom out - + Edit pattern XML code - + Create layout - + Ctrl+L Ctrl+L - + About Qt - + Ctrl+Q Ctrl+Q - + Pattern piece %1 - + Size: - + pattern - + /pattern.val - + Critical error! - + Error parsing file (std::bad_alloc). - + Bad id. - + File saved - + untitled.val - + Unsaved change - + The pattern has been modified. Do you want to save your changes? - + &Undo - + &Redo - + Pattern piece: - + Enter a new label for the pattern piece. - - - + + + Select point - + + Individual measurements is under development + + + + + There is no way create individual measurements file independent on the pattern file. +For opening pattern need keep both files: pattern and measurements. Do you want continue? + + + + Select first point - - + + + Select first point of line - + Select first point of angle - + Select first point of first line - + Select first point curve - + Select simple curve - + Select point of center of arc - + Select point of curve path - + Select curve path - + Select points, arcs, curves clockwise. - + Select base point - + Select first point of axis - + Select point vertically - + Select detail - + Select arc - + + Select curve + + + + + Could not save file + + + + Wrong units. - + Application doesn't support standard table with inches. - + File error. - + File loaded - + + Valentina didn't shut down correctly. Do you want reopen files (%1) you had open? + + + + + Reopen files. + + + + The measurements file <br/><br/> <b>%1</b> <br/><br/> %3 - + could not be found. Do you want to update the file location - + Standard measurements (*.vst) - + Individual measurements (*.vit) @@ -3618,46 +3987,46 @@ Do you want to save your changes? <h1>%1</h1> %2 <br/><br/> %3 <br/><br/> %4 - + Height: - + Pattern Piece: - - + + Pattern files (*.val) - - + + Open file - - + + Error parsing file. - + Error can't convert value. - - + + Error empty parameter. - + Error wrong id. @@ -3665,799 +4034,799 @@ Do you want to save your changes? Measurements - + head_girth Short measurement name. Don't use math symbols in name!!!! - + mid_neck_girth Short measurement name. Don't use math symbols in name!!!! - + neck_base_girth Short measurement name. Don't use math symbols in name!!!! - + head_and_neck_length Short measurement name. Don't use math symbols in name!!!! - + center_front_waist_length Short measurement name. Don't use math symbols in name!!!! - + center_back_waist_length Short measurement name. Don't use math symbols in name!!!! - + shoulder_length Short measurement name. Don't use math symbols in name!!!! - + side_waist_length Short measurement name. Don't use math symbols in name!!!! - + trunk_length Short measurement name. Don't use math symbols in name!!!! - + shoulder_girth Short measurement name. Don't use math symbols in name!!!! - + upper_chest_girth Short measurement name. Don't use math symbols in name!!!! - + bust_girth Short measurement name. Don't use math symbols in name!!!! - + under_bust_girth Short measurement name. Don't use math symbols in name!!!! - + waist_girth Short measurement name. Don't use math symbols in name!!!! - + high_hip_girth Short measurement name. Don't use math symbols in name!!!! - + hip_girth Short measurement name. Don't use math symbols in name!!!! - + upper_front_chest_width Short measurement name. Don't use math symbols in name!!!! - + front_chest_width Short measurement name. Don't use math symbols in name!!!! - + across_front_shoulder_width Short measurement name. Don't use math symbols in name!!!! - + across_back_shoulder_width Short measurement name. Don't use math symbols in name!!!! - + upper_back_width Short measurement name. Don't use math symbols in name!!!! - + back_width Short measurement name. Don't use math symbols in name!!!! - + bustpoint_to_bustpoint Short measurement name. Don't use math symbols in name!!!! - + halter_bustpoint_to_bustpoint Short measurement name. Don't use math symbols in name!!!! - + neck_to_bustpoint Short measurement name. Don't use math symbols in name!!!! - + crotch_length Short measurement name. Don't use math symbols in name!!!! - + rise_height Short measurement name. Don't use math symbols in name!!!! - + shoulder_drop Short measurement name. Don't use math symbols in name!!!! - + shoulder_slope_degrees Short measurement name. Don't use math symbols in name!!!! - + front_shoulder_slope_length Short measurement name. Don't use math symbols in name!!!! - + back_shoulder_slope_length Short measurement name. Don't use math symbols in name!!!! - + front_shoulder_to_waist_length Short measurement name. Don't use math symbols in name!!!! - + back_shoulder_to_waist_length Short measurement name. Don't use math symbols in name!!!! - + front_neck_arc Short measurement name. Don't use math symbols in name!!!! - + back_neck_arc Short measurement name. Don't use math symbols in name!!!! - + front_upper_chest_arc Short measurement name. Don't use math symbols in name!!!! - + back_upper_chest_arc Short measurement name. Don't use math symbols in name!!!! - + front_waist_arc Short measurement name. Don't use math symbols in name!!!! - + back_waist_arc Short measurement name. Don't use math symbols in name!!!! - + front_upper_hip_arc Short measurement name. Don't use math symbols in name!!!! - + back_upper_hip_arc Short measurement name. Don't use math symbols in name!!!! - + front_hip_arc Short measurement name. Don't use math symbols in name!!!! - + back_hip_arc Short measurement name. Don't use math symbols in name!!!! - + chest_slope Short measurement name. Don't use math symbols in name!!!! - + back_slope Short measurement name. Don't use math symbols in name!!!! - + front_waist_slope Short measurement name. Don't use math symbols in name!!!! - + back_waist_slope Short measurement name. Don't use math symbols in name!!!! - + front_neck_to_upper_chest_height Short measurement name. Don't use math symbols in name!!!! - + front_neck_to_bust_height Short measurement name. Don't use math symbols in name!!!! - + front_waist_to_upper_chest Short measurement name. Don't use math symbols in name!!!! - + front_waist_to_lower_breast Short measurement name. Don't use math symbols in name!!!! - + back_waist_to_upper_chest Short measurement name. Don't use math symbols in name!!!! - + strap_length Short measurement name. Don't use math symbols in name!!!! - + armscye_girth Short measurement name. Don't use math symbols in name!!!! - + elbow_girth Short measurement name. Don't use math symbols in name!!!! - + upper_arm_girth Short measurement name. Don't use math symbols in name!!!! - + wrist_girth Short measurement name. Don't use math symbols in name!!!! - + scye_depth Short measurement name. Don't use math symbols in name!!!! - + shoulder_and_arm_length Short measurement name. Don't use math symbols in name!!!! - + underarm_length Short measurement name. Don't use math symbols in name!!!! - + cervicale_to_wrist_length Short measurement name. Don't use math symbols in name!!!! - + shoulder_to_elbow_length Short measurement name. Don't use math symbols in name!!!! - + arm_length Short measurement name. Don't use math symbols in name!!!! - + hand_width Short measurement name. Don't use math symbols in name!!!! - + hand_length Short measurement name. Don't use math symbols in name!!!! - + hand_girth Short measurement name. Don't use math symbols in name!!!! - + thigh_girth Short measurement name. Don't use math symbols in name!!!! - + mid_thigh_girth Short measurement name. Don't use math symbols in name!!!! - + knee_girth Short measurement name. Don't use math symbols in name!!!! - + calf_girth Short measurement name. Don't use math symbols in name!!!! - + ankle_girth Short measurement name. Don't use math symbols in name!!!! - + knee_height Short measurement name. Don't use math symbols in name!!!! - + ankle_height Short measurement name. Don't use math symbols in name!!!! - + foot_width Short measurement name. Don't use math symbols in name!!!! - + foot_length Short measurement name. Don't use math symbols in name!!!! - + height Short measurement name. Don't use math symbols in name!!!! - + cervicale_height Short measurement name. Don't use math symbols in name!!!! - + cervicale_to_knee_height Short measurement name. Don't use math symbols in name!!!! - + waist_height Short measurement name. Don't use math symbols in name!!!! - + high_hip_height Short measurement name. Don't use math symbols in name!!!! - + hip_height Short measurement name. Don't use math symbols in name!!!! - + waist_to_hip_height Short measurement name. Don't use math symbols in name!!!! - + waist_to_knee_height Short measurement name. Don't use math symbols in name!!!! - + crotch_height Short measurement name. Don't use math symbols in name!!!! - + size Short measurement name. Don't use math symbols in name!!!! - + height_front_neck_base_point Short measurement name. Don't use math symbols in name!!!! - + height_base_neck_side_point Short measurement name. Don't use math symbols in name!!!! - + height_shoulder_point Short measurement name. Don't use math symbols in name!!!! - + height_nipple_point Short measurement name. Don't use math symbols in name!!!! - + height_back_angle_axilla Short measurement name. Don't use math symbols in name!!!! - + height_scapular_point Short measurement name. Don't use math symbols in name!!!! - + height_under_buttock_folds Short measurement name. Don't use math symbols in name!!!! - + hips_excluding_protruding_abdomen Short measurement name. Don't use math symbols in name!!!! - + girth_foot_instep Short measurement name. Don't use math symbols in name!!!! - + side_waist_to_floor Short measurement name. Don't use math symbols in name!!!! - + front_waist_to_floor Short measurement name. Don't use math symbols in name!!!! - + arc_through_groin_area Short measurement name. Don't use math symbols in name!!!! - + waist_to_plane_seat Short measurement name. Don't use math symbols in name!!!! - + neck_to_radial_point Short measurement name. Don't use math symbols in name!!!! - + neck_to_third_finger Short measurement name. Don't use math symbols in name!!!! - + neck_to_first_line_chest_circumference Short measurement name. Don't use math symbols in name!!!! - + front_waist_length Short measurement name. Don't use math symbols in name!!!! - + arc_through_shoulder_joint Short measurement name. Don't use math symbols in name!!!! - + neck_to_back_line_chest_circumference Short measurement name. Don't use math symbols in name!!!! - + waist_to_neck_side Short measurement name. Don't use math symbols in name!!!! - + arc_length_upper_body Short measurement name. Don't use math symbols in name!!!! - + chest_width Short measurement name. Don't use math symbols in name!!!! - + anteroposterior_diameter_hands Short measurement name. Don't use math symbols in name!!!! - + height_clavicular_point Short measurement name. Don't use math symbols in name!!!! - + height_armhole_slash Short measurement name. Don't use math symbols in name!!!! - + slash_shoulder_height Short measurement name. Don't use math symbols in name!!!! - + half_girth_neck Short measurement name. Don't use math symbols in name!!!! - + half_girth_neck_for_shirts Short measurement name. Don't use math symbols in name!!!! - + half_girth_chest_first Short measurement name. Don't use math symbols in name!!!! - + half_girth_chest_second Short measurement name. Don't use math symbols in name!!!! - + half_girth_chest_third Short measurement name. Don't use math symbols in name!!!! - + half_girth_waist Short measurement name. Don't use math symbols in name!!!! - + half_girth_hips_considering_protruding_abdomen Short measurement name. Don't use math symbols in name!!!! - + half_girth_hips_excluding_protruding_abdomen Short measurement name. Don't use math symbols in name!!!! - + girth_knee_flexed_feet Short measurement name. Don't use math symbols in name!!!! - + neck_transverse_diameter Short measurement name. Don't use math symbols in name!!!! - + front_slash_shoulder_height Short measurement name. Don't use math symbols in name!!!! - + neck_to_front_waist_line Short measurement name. Don't use math symbols in name!!!! - + hand_vertical_diameter Short measurement name. Don't use math symbols in name!!!! - + neck_to_knee_point Short measurement name. Don't use math symbols in name!!!! - + waist_to_knee Short measurement name. Don't use math symbols in name!!!! - + shoulder_height Short measurement name. Don't use math symbols in name!!!! - + head_height Short measurement name. Don't use math symbols in name!!!! - + body_position Short measurement name. Don't use math symbols in name!!!! - + arc_behind_shoulder_girdle Short measurement name. Don't use math symbols in name!!!! - + neck_to_neck_base Short measurement name. Don't use math symbols in name!!!! - + depth_waist_first Short measurement name. Don't use math symbols in name!!!! - + depth_waist_second Short measurement name. Don't use math symbols in name!!!! @@ -4466,799 +4835,799 @@ Do you want to save your changes? MeasurementsDescriptions - + Around fullest part of Head Full measurement description - + Around middle part of Neck Full measurement description - + Around Neck at base Full measurement description - + Vertical Distance from Crown to Nape Full measurement description - + Front Neck Center over tape at Bustline to Front Waist Center Full measurement description - + Back Neck Center to Back Waist Center Full measurement description - + NeckPoint to ShoulderTip Full measurement description - + Armpit to Waist side Full measurement description - + Around Body from middle of Shoulder length to BustPoint to Crotch up back to beginning point Full measurement description - + Around Arms and Torso, at bicep level parallel to floor, with arms hanging at the sides Full measurement description - + Around Chest at Armfold level, will be parallel to floor across back, will not be parallel to floor across front chest Full measurement description - + Around fullest part of Bust, parallel to floor Full measurement description - + Around Chest below the Bust, parallel to floor Full measurement description - + Tie a string around smallest part of waist, keep string tied while taking meaasurements. Not usually parallel to floor for front waist or back waist. Full measurement description - + Around HighHip, parallel to floor Full measurement description - + Around Hip, parallel to floor Full measurement description - + Across Front UpperChest, smallest width from armscye to armscye Full measurement description - + Across Front Chest, from armfold to armfold Full measurement description - + From ShoulderTip to ShoulderTip, across Front Full measurement description - + From ShoulderTip to ShoulderTip, across Back Full measurement description - + Across Back UpperChest, smallest width from armscye to armscye Full measurement description - + Across Back Chest, from armfold to armfold Full measurement description - + Distance between BustPoints, across Chest Full measurement description - + Distance from Bustpoint, behind neck, down to Bustpoint Full measurement description - + From NeckPoint to BustPoint Full measurement description - + From Front Waist Center, down to crotch, up to Back Waist Center Full measurement description - + Sit on hard chair, measure from side waist straight down to chair bottom Full measurement description - + Vertical Distance from NeckPoint level to ShoulderTip level Full measurement description - + Degrees of angle from NeckPoint to ShoulderTip – requires goniometer Full measurement description - + ShoulderTip to Front Waist Center Full measurement description - + ShoulderTip to Back Waist Center Full measurement description - + NeckPoint straight down front chest to Waistline Full measurement description - + Back NeckPoint straight down back chest to Waistline Full measurement description - + NeckPoint to NeckPoint through Front Neck Center Full measurement description - + NeckPoint to NeckPoint across Nape Full measurement description - + Front upper-bust arc Full measurement description - + Back UpperBust side to side Full measurement description - + Front Waist side to side Full measurement description - + Back Waist side to side Full measurement description - + Front UpperHip side to side Full measurement description - + Back UpperHip side to side Full measurement description - + Front Hip side to side Full measurement description - + Back Hip side to side Full measurement description - + NeckPoint to Front ArmfoldPoint Full measurement description - + NeckPoint to Back ArmfoldPoint Full measurement description - + NeckPoint across Front Chest to Waist side Full measurement description - + NeckPoint across Back Chest to Waist side Full measurement description - + Front Neck Center straight down to UpperChest line Full measurement description - + Front Neck Center straight down to Bust line Full measurement description - + Front Upper chest waist Full measurement description - + Front waist to lower breast Full measurement description - + Back waist to upper chest Full measurement description - + Strap length Full measurement description - + Around Armscye Full measurement description - + Around Elbow with elbow bent Full measurement description - + Around UpperArm Full measurement description - + Around Wrist Full measurement description - + Nape straight down to UnderBust line (same as Back UpperBust height) Full measurement description - + NeckPoint to ShoulderTip to Wrist, with elbow bent and hand on hip Full measurement description - + Armpit to Wrist, with arm straight and hanging at side Full measurement description - + Nape to Wrist, with elbow bent and hand on hip Full measurement description - + ShoulderTip to Elbow, with elbow bent and hand on hip Full measurement description - + ShoulderTip to Wrist, with elbow bent and hand on hip Full measurement description - + Hand side to side Full measurement description - + Hand Middle Finger tip to wrist Full measurement description - + Around Hand Full measurement description - + Around Thigh Full measurement description - + Around MidThigh Full measurement description - + Around Knee Full measurement description - + Around Calf Full measurement description - + Around Ankle Full measurement description - + Knee to Floor Full measurement description - + Ankle to Floor Full measurement description - + Widest part of Foot side to side Full measurement description - + Tip of Longest Toe straight to back of heel Full measurement description - + Top of head to floor Full measurement description - + Nape to Floor Full measurement description - + Nape to Knee Full measurement description - + Waist side to floor Full measurement description - + HighHip side to Floor Full measurement description - + Hip side to Floor Full measurement description - + Waist side to Hip Full measurement description - + Waist side to Knee Full measurement description - + Crotch to Floor along inside leg Full measurement description - + Size Full measurement description - + Height of the point base of the neck in front Full measurement description - + Height of the base of the neck side point Full measurement description - + The height of the shoulder point Full measurement description - + Height nipple point Full measurement description - + Height back angle axilla Full measurement description - + Height scapular point Full measurement description - + Height under buttock folds Full measurement description - + Hips excluding protruding abdomen Full measurement description - + Girth foot instep Full measurement description - + The distance from the side waist to floor Full measurement description - + The distance from the front waist to floor Full measurement description - + Arc through groin area Full measurement description - + The distance from the waist to the plane seat Full measurement description - + The distance from the base of the neck to the side of the radial point Full measurement description - + Distance from the base of the neck side point to the end of the third finger Full measurement description - + The distance from the base of the neck to the side of the first line in front of chest circumference Full measurement description - + The distance from the base of the neck to the waist side front (waist length in the front) Full measurement description - + Arc through the highest point of the shoulder joint Full measurement description - + The distance from the base of the neck to the back line of chest circumference of the first and the second based on ledge vanes Full measurement description - + The distance from the waist to the back base of the neck side point Full measurement description - + Arc length of the upper body through the base of the neck side point Full measurement description - + Chest width Full measurement description - + Anteroposterior diameter of the hands Full measurement description - + Height clavicular point Full measurement description - + The distance from the point to the cervical level of the posterior angle of the front armpit (underarm height oblique) Full measurement description - + Slash shoulder height Full measurement description - + Half girth neck Full measurement description - + Half girth neck for shirts Full measurement description - + Half girth chest first Full measurement description - + Half girth chest second Full measurement description - + Half girth chest third Full measurement description - + Half girth waist Full measurement description - + Half girth hips considering protruding abdomen Full measurement description - + Half girth hips excluding protruding abdomen Full measurement description - + Girth knee flexed feet Full measurement description - + Neck transverse diameter Full measurement description - + Front slash shoulder height Full measurement description - + The distance from the base of the neck to the waist line front Full measurement description - + Hand vertical diameter Full measurement description - + Distance from neck to knee point Full measurement description - + The distance from the waist to the knee Full measurement description - + Shoulder height Full measurement description - + Head height Full measurement description - + Body position Full measurement description - + Arc behind the shoulder girdle Full measurement description - + Distance from neck point to point on the base of the neck side neck girth measurement line Full measurement description - + Depth waist first Full measurement description - + Depth waist second Full measurement description @@ -5267,799 +5636,799 @@ Do you want to save your changes? MeasurementsFullNames - + Head girth Full measurement name - + Mid-neck girth Full measurement name - + Neck Base girth Full measurement name - + Head and Neck length Full measurement name - + Front Center length Full measurement name - + Back Center length Full measurement name - + Shoulder length Full measurement name - + Side Waist length Full measurement name - + Trunk length Full measurement name - + Shoulder girth Full measurement name - + Upper Chest girth Full measurement name - + Bust girth Full measurement name - + Under Bust girth Full measurement name - + Waist girth Full measurement name - + HighHip girth Full measurement name - + Hip girth Full measurement name - + Front Upper Chest width Full measurement name - + Front Chest width Full measurement name - + Front Across Shoulder width Full measurement name - + Back Across Shoulder width Full measurement name - + Back Upper Chest width Full measurement name - + Back Chest width Full measurement name - + BustPoint to BustPoint Full measurement name - + Halter Bustpoint to Bustpoint Full measurement name - + NeckPoint to BustPoint Full measurement name - + Crotch length Full measurement name - + Rise height Full measurement name - + Shoulder Drop Full measurement name - + Shoulder Slope degrees Full measurement name - + Front Shoulder Balance Full measurement name - + Back Shoulder Balance Full measurement name - + Front Full Length Full measurement name - + Back Full Length Full measurement name - + Front Neck arc Full measurement name - + Back Neck arc Full measurement name - + Front upper-bust arc Full measurement name - + Back UpperBust arc Full measurement name - + Front Waist arc Full measurement name - + Back Waist arc Full measurement name - + Front UpperHip arc Full measurement name - + Back UpperHip arc Full measurement name - + Front Hip arc Full measurement name - + Back Hip arc Full measurement name - + Chest Balance Full measurement name - + Back Balance Full measurement name - + Front Waist Balance Full measurement name - + Back Waist Balance Full measurement name - + Front UpperChest height Full measurement name - + Bust height Full measurement name - + Front Upper chest waist Full measurement name - + Front waist to lower breast Full measurement name - + Back waist to upper chest Full measurement name - + Strap length Full measurement name - + Armscye Girth Full measurement name - + Elbow Girth Full measurement name - + Upperarm Girth Full measurement name - + Wrist girth Full measurement name - + Armscye depth Full measurement name - + Shoulder and Arm length Full measurement name - + Underarm length Full measurement name - + Nape to wrist length Full measurement name - + Elbow length Full measurement name - + Arm length Full measurement name - + Hand width Full measurement name - + Hand length Full measurement name - + Hand girth Full measurement name - + Thigh girth Full measurement name - + Midthigh girth Full measurement name - + Knee girth Full measurement name - + Calf girth Full measurement name - + Ankle girth Full measurement name - + Knee height Full measurement name - + Ankle height Full measurement name - + Foot width Full measurement name - + Foot length Full measurement name - + Total Height Full measurement name - + Nape height Full measurement name - + Nape to knee height Full measurement name - + Waist height Full measurement name - + HighHip height Full measurement name - + Hip height Full measurement name - + Waist to Hip height Full measurement name - + Waist to Knee height Full measurement name - + Crotch height/Inseam Full measurement name - + Size Full measurement name - + Height front neck base point Full measurement name - + Height base neck side point Full measurement name - + Height shoulder point Full measurement name - + Height nipple point Full measurement name - + Height back angle axilla Full measurement name - + Height scapular point Full measurement name - + Height under buttock folds Full measurement name - + Hips excluding protruding abdomen Full measurement name - + Girth foot instep Full measurement name - + Side waist to floor Full measurement name - + Front waist to floor Full measurement name - + Arc through groin area Full measurement name - + Waist to plane seat Full measurement name - + Neck to radial point Full measurement name - + Neck to third finger Full measurement name - + Neck to first line chest circumference Full measurement name - + Front waist length Full measurement name - + Arc through shoulder joint Full measurement name - + Neck to back line chest circumference Full measurement name - + Waist to neck side Full measurement name - + Arc length upper body Full measurement name - + Chest width Full measurement name - + Anteroposterior diameter hands Full measurement name - + Height clavicular point Full measurement name - + Height armhole slash Full measurement name - + Slash shoulder height Full measurement name - + Half girth neck Full measurement name - + Half girth neck for shirts Full measurement name - + Half girth chest first Full measurement name - + Half girth chest second Full measurement name - + Half girth chest third Full measurement name - + Half girth waist Full measurement name - + Half girth hips considering protruding abdomen Full measurement name - + Half girth hips excluding protruding abdomen Full measurement name - + Girth knee flexed feet Full measurement name - + Neck transverse diameter Full measurement name - + Front slash shoulder height Full measurement name - + Neck to front waist line Full measurement name - + Hand vertical diameter Full measurement name - + Neck to knee point Full measurement name - + Waist to knee Full measurement name - + Shoulder height Full measurement name - + Head height Full measurement name - + Body position Full measurement name - + Arc behind shoulder girdle Full measurement name - + Neck to neck base Full measurement name - + Depth waist first Full measurement name - + Depth waist second Full measurement name @@ -6168,19 +6537,19 @@ Do you want to save your changes? PostfixOperators - + cm centimeter - + mm millimeter - + in inch @@ -6242,7 +6611,7 @@ Do you want to save your changes? QObject - + Create new pattern piece to start working. @@ -6257,18 +6626,18 @@ Do you want to save your changes? - + mm - - + + cm - + inch @@ -6284,7 +6653,7 @@ Do you want to save your changes? STDescriptions - + Standard figures of men 1st group, chest 100 cm Standard table description @@ -6462,12 +6831,12 @@ Do you want to save your changes? VAbstractTool - + Confirm the deletion. - + Do you really want delete? @@ -6475,35 +6844,45 @@ Do you want to save your changes? VApplication - + Error parsing file. Program will be terminated. - + Error bad id. Program will be terminated. - + Error can't convert value. Program will be terminated. - + Error empty parameter. Program will be terminated. - + Error wrong id. Program will be terminated. - + Something's wrong!! + + + Could not copy temp file to document file + + + + + Could not remove document file + + VContainer @@ -6530,48 +6909,53 @@ Do you want to save your changes? VDomDocument - + Can't convert toUInt parameter - + Can't convert toBool parameter - + Got empty parameter - + Can't convert toDouble parameter - - + + Can't open file %1: %2. - + Can't open schema file %1: %2. - + Validation error file %3 in line %1 column %2 - + Parsing error file %3 in line %1 column %2 + + + Couldn't get node + + VDrawTool @@ -6594,7 +6978,7 @@ Do you want to save your changes? VException - + Critical error! @@ -6634,188 +7018,200 @@ Do you want to save your changes? VPattern - - Can't find tool id = %1 in table. + + Can't find tool in table. - + Error no unique id. - - + + Error parsing file. - + Error can't convert value. - + Error empty parameter. - + Error wrong id. - + Critical error! - + Error parsing file (std::bad_alloc). - + Error creating or updating detail - + Error creating or updating single point - - + + Error creating or updating point of end line - - + + Error creating or updating point along line - - + + Error creating or updating point of shoulder - - + + Error creating or updating point of normal - - + + Error creating or updating point of bisector - + Error creating or updating point of lineintersection - - + + Error creating or updating point of contact - + Error creating or updating modeling point - + Error creating or updating height - + Error creating or updating triangle - + Error creating or updating point of intersection - - + + Error creating or updating cut spline point - - + + Error creating or updating cut spline path point - - + + Error creating or updating cut arc point - + + + Error creating or updating point of intersection line and axis + + + + + + Error creating or updating point of intersection curve and axis + + + + Error creating or updating line - + Error creating or updating simple curve - + Error creating or updating curve path - + Error creating or updating modeling simple curve - + Error creating or updating modeling curve path - - + + Error creating or updating simple arc - + Error creating or updating modeling arc - + Error creating or updating union details - + Got wrong parameter id. Need only id > 0. - + This id is not unique. - + File error. @@ -6869,207 +7265,227 @@ Do you want to save your changes? VToolOptionsPropertyBrowser - + Base point - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + Point label - + Position - + Point at distance and angle - - - - - - - + + + + + + + + + Line type - - - - - - - - + + + + + + + + Length - + + + Angle - + Point at distance along line - + Arc - - + + Radius - + First angle - + Second angle - + Point along bisector - + Cut arc tool - + Tool for segmenting a curve - + Tool segment a pathed curve - + Perpendicular point along line - + Line between points - + Point at line intersection - + Point along perpendicular - + Additional angle degrees - + Point at intersection of arc and line - + Tool to make point from x & y of two other points - + Special point on shoulder - + Curve tool - - + + Curve factor - + Tool for path curve - + Tool triangle + + + + Point intersection line and axis + + Variables - + Line_ Left symbol _ in name - + AngleLine_ Left symbol _ in name - + Arc_ Left symbol _ in name - + Spl_ Left symbol _ in name - + SplPath Do not add symbol _ to the end of name + + VisToolCurveIntersectAxis + + + <b>Intersection curve and axis</b>: angle = %1°; <b>Shift</b> - sticking angle, <b>Enter</b> - finish creation + + + VisToolEndLine @@ -7078,6 +7494,14 @@ Do you want to save your changes? + + VisToolLineIntersectAxis + + + <b>Intersection line and axis</b>: angle = %1°; <b>Shift</b> - sticking angle, <b>Enter</b> - finish creation + + + VisToolSplinePath @@ -7089,12 +7513,12 @@ Do you want to save your changes? main - + Pattern making program. - + Pattern file. diff --git a/src/app/share/translations/valentina_nl_NL.ts b/src/app/share/translations/valentina_nl_NL.ts index a7868b15d..16b02a59e 100644 --- a/src/app/share/translations/valentina_nl_NL.ts +++ b/src/app/share/translations/valentina_nl_NL.ts @@ -147,85 +147,100 @@ ConfigurationPage - + Setup user interface language updated and will be used the next time start - + Default unit updated and will be used the next pattern creation - + Save - + Auto-save modified pattern - + Interval: - + min - + Language - + GUI language - + Decimal separator parts - + With OS options (%1) - + Default unit - + Centimeters - + Millimiters - + Inches - + Label language + + + Send crash reports + + + + + Send crash reports (recommended) + + + + + After each crash Valentina collect information that may help us fix a problem. We do not collect any personal information. Find more about what <a href="https://bitbucket.org/dismine/valentina/wiki/manual/Crash_reports">kind of information</a> we collect. + + DelTool - + Delete tool @@ -317,97 +332,97 @@ - + <html><head/><body><p>Show full calculation in message box</p></body></html> - + Point label - + First point - + First point of line - + Second point - + Second point of line - + Type of line - + Show line from first point to this point - + Input data - + Size and height - - Standard table + + Measurements - + Increments - + Length of lines - + Length of arcs - + Length of curves - + Angle of lines - + Hide empty measurements - + Variables - Click twice to insert into formula - + Select second point of line @@ -431,8 +446,8 @@ - - + + Calculate value @@ -442,39 +457,44 @@ - - + + <html><head/><body><p>Show full calculation in message box</p></body></html> - + Insert variable into formula - + Value of first angle - + + Measurements + + + + First angle - + Second angle - + Insert marked variable into formula - + Value of second angle @@ -498,11 +518,6 @@ Size and height - - - Standard table - - Increments @@ -539,7 +554,7 @@ - + Value of angle of line. @@ -577,116 +592,230 @@ - + <html><head/><body><p>Show full calculation in message box</p></body></html> - + Point label - + First point - + First point of angle - + Second point - + Second point of angle - + Third point - + Third point of angle - + Type of line - + Show line from second point to this point - + Input data - + Size and height - - Standard table + + Measurements - + Increments - + Length of lines - + Length of arcs - + Length of curves - + Angle of lines - + Hide empty measurements - + Variables - Click twice to insert into formula - + Select second point of angle - + Select third point of angle + + DialogCurveIntersectAxis + + + Curve intersect axis + + + + + Angle + + + + + Calculate value + + + + + Value of angle + + + + + <html><head/><body><p>Show full calculation in message box</p></body></html> + + + + + Axis point + + + + + + First point of line + + + + + Curve + + + + + Point label + + + + + Type of line + + + + + Show line from first point to this point + + + + + Input data + + + + + Size and height + + + + + Measurements + + + + + Increments + + + + + Length of lines + + + + + Length of arcs + + + + + Length of curves + + + + + Angle of lines + + + + + Hide empty measurements + + + + + Variables + + + + + Select axis point + + + DialogCutArc @@ -715,72 +844,72 @@ - + <html><head/><body><p>Show full calculation in message box</p></body></html> - + Arc - + Selected curve - + Point label - + Input data - + Size and height - - Standard table + + Measurements - + Increments - + Length of lines - + Length of arcs - + Length of curves - + Angle of lines - + Hide empty measurements - + Variables - Click twice to insert into formula @@ -813,72 +942,72 @@ - + <html><head/><body><p>Show full calculation in message box</p></body></html> - + Curve - + Selected curve - + Point label - + Input data - + Size and height - - Standard table + + Measurements - + Increments - + Length of lines - + Length of arcs - + Length of curves - + Angle of lines - + Hide empty measurements - + Variables - Click twice to insert into formula @@ -911,72 +1040,72 @@ - + <html><head/><body><p>Show full calculation in message box</p></body></html> - + Curve - + Selected curve path - + Point label - + Input data - + Size and height - - Standard table + + Measurements - + Increments - + Length of lines - + Length of arcs - + Length of curves - + Angle of lines - + Hide empty measurements - + Variables - Click twice to insert into formula @@ -985,7 +1114,7 @@ DialogDetail - + Detail @@ -995,44 +1124,44 @@ - - - + + + cm - + Bias Y - + Options - + Name of detail - + Seam allowance - + Width - + Closed - + Delete @@ -1075,57 +1204,57 @@ - + <html><head/><body><p>Show full calculation in message box</p></body></html> - + Input data - + Size and height - - Standard table + + Measurements - + Increments - + Length of lines - + Length of arcs - + Length of curves - + Angle of lines - + Hide empty measurements - + Variables @@ -1144,7 +1273,7 @@ - + Calculate value @@ -1154,93 +1283,93 @@ - - + + <html><head/><body><p>Show full calculation in message box</p></body></html> - + Angle - + Value of angle - + Base point - + First point of line - + Point label - + Type of line - + Show line from first point to this point - + Input data - + Size and height - - Standard table + + Measurements - + Increments - + Length of lines - + Length of arcs - + Length of curves - + Angle of lines - + Hide empty measurements - + Variables @@ -1253,35 +1382,35 @@ - + Point label - + Base point - - - - + + + + First point of line - + Second point of line - + Type of line - + Show line from first point to our point @@ -1291,7 +1420,7 @@ - + Select second point of line @@ -1305,105 +1434,115 @@ - + Tool - - - - - + + + + + Can't create record. - + %1 - Base point + - %1_%2 - Line from point %1 to point %2 - + %3 - Point along line %1_%2 - + %1 - Point of shoulder - + %3 - normal to line %1_%2 - + %4 - bisector of angle %1_%2_%3 - + %5 - intersection of lines %1_%2 and %3_%4 - + Curve %1_%2 - + Arc with center in point %1 - + Curve point %1 - + %4 - point of contact of arc with the center in point %1 and line %2_%3 - + Point of perpendicular from point %1 to line %2_%3 - + Triangle: axis %1_%2, points %3 and %4 - + %1 - point of intersection %2 and %3 - + %1 - cut arc with center %2 - + %1 - cut curve %2_%3 - + %1 - cut curve path %2 + + + %1 - point of intersection line %2_%3 and axis through point %4 + + + + + %1 - point of intersection curve and axis through point %2 + + DialogIncrements @@ -1445,7 +1584,7 @@ - + Description @@ -1535,53 +1674,83 @@ - - + + File error. - + male - + female - + + Could not save GivenName + + + + + Could not save FamilyName + + + + + Could not save Email + + + + + Could not save Sex + + + + + Could not save BirthDate + + + + Measurements use different units than pattern. This pattern required measurements in %1 - + Individual measurements (*.vit) - - + + Open file - - + + Wrong units. - + Standard measurements (*.vst) - + Name_%1 + + + Can't save measurement + + DialogIndividualMeasurements @@ -1637,39 +1806,39 @@ - - + + File error. - - + + Individual measurements (*.vit) - + Open file - + Where save measurements? - + Centimeters - + Millimiters - + Inches @@ -1682,22 +1851,22 @@ - + First point - + Second point - + Type of line - + Show line from first point to this point @@ -1747,16 +1916,141 @@ - + Select first point of second line - + Select second point of second line + + DialogLineIntersectAxis + + + Line intersect axis + + + + + Angle + + + + + Calculate value + + + + + Value of angle + + + + + <html><head/><body><p>Show full calculation in message box</p></body></html> + + + + + Axis point + + + + + + + First point of line + + + + + First line point + + + + + Second line point + + + + + Point label + + + + + Type of line + + + + + Show line from first point to this point + + + + + Input data + + + + + Size and height + + + + + Measurements + + + + + Increments + + + + + Length of lines + + + + + Length of arcs + + + + + Length of curves + + + + + Angle of lines + + + + + Hide empty measurements + + + + + Variables + + + + + Select second point of line + + + + + Select axis point + + + DialogMeasurements @@ -1765,27 +2059,27 @@ - + <html><head/><body><p><span style=" font-size:18pt;">Please, choose pattern type.</span></p></body></html> - + Graduation - + Use for creation pattern standard measurement table - + Individual - + Use for creation pattern individual measurements @@ -1818,92 +2112,92 @@ - + <html><head/><body><p>Show full calculation in message box</p></body></html> - + Point label - + First point - + Second point - + Additional angle degrees - + Type of line - + Show line from first point to this point - + Input data - + Size and height - - Standard table + + Measurements - + Increments - + Length of lines - + Length of arcs - + Length of curves - + Angle of lines - + Hide empty measurements - + Variables - Click twice to insert into formula - + Select second point of line @@ -2154,88 +2448,88 @@ - + <html><head/><body><p>Show full calculation in message box</p></body></html> - + Point label - + Center of arc - - + + Select point of center of arc - + Top of the line - + End of the line - + Input data - + Size and height - - Standard table + + Measurements - + Increments - + Length of lines - + Length of arcs - + Length of curves - + Angle of lines - + Hide empty measurements - + Variables - Click twice to insert into formula. - + Select second point of line @@ -2253,22 +2547,22 @@ - + vertical point - + First point of angle - + horizontal point - + Second point of angle @@ -2306,97 +2600,97 @@ - + <html><head/><body><p>Show full calculation in message box</p></body></html> - + Point label - + First point - + Second point - + Third point - + Type of line - + Show line from first point to our point - + Input data - + Size and height - - Standard table + + Measurements - + Increments - + Length of lines - + Length of arcs - + Length of curves - + Angle of lines - + Hide empty measurements - + Variables - Click twice to insert into formula - + Select first point of line - + Select second point of line @@ -2486,7 +2780,7 @@ DialogSplinePath - Curve path + Curved path @@ -2556,51 +2850,51 @@ DialogTool - - - - - + + + + + Error - + Empty field - + Value can't be 0 - + Value - + Height - + Size - + Line length - + Arc length - + Curve length @@ -2618,30 +2912,30 @@ - + First point of axis - - - - + + + + First point of line - + Second point of axis - + First point - + Second point @@ -2651,12 +2945,12 @@ - + Select first point - + Select second point @@ -2726,151 +3020,151 @@ Functions - + sin sine function - + cos cosine function - + tan tangens function - + asin arcus sine function - + acos arcus cosine function - + atan arcus tangens function - + sinh hyperbolic sine function - + cosh hyperbolic cosine - + tanh hyperbolic tangens function - + asinh hyperbolic arcus sine function - + acosh hyperbolic arcus tangens function - + atanh hyperbolic arcur tangens function - + log2 logarithm to the base 2 - + log10 logarithm to the base 10 - + log logarithm to the base 10 - + ln logarithm to base e (2.71828...) - + exp e raised to the power of x - + sqrt square root of a value - + sign sign function -1 if x<0; 1 if x>0 - + rint round to nearest integer - + abs absolute value - + min min of all arguments - + max max of all arguments - + sum sum of all arguments - + avg mean value of all arguments @@ -2907,117 +3201,117 @@ - + Tools for creating lines. - + Line - + Tools for creating curves. - + Curve - + Curve tool. - + Tool for path curve. - + Tool segment a pathed curve. - + Tool for segmenting a curve. - + Tools for creating arcs. - + Arc - + Arc tool. - + Tools for creating details. - + Detail - + Tool new detail. - + New - + Create a new pattern - + Ctrl+N - + Open - + Open file with pattern - + Save - + Save pattern - + Ctrl+S - + Save as @@ -3062,518 +3356,597 @@ - - Line between points + + Point of intersection line and axis + + + + + + + ... + Line between points + + + + Point at line intersection - + Cut arc tool. - + Tool for union two details. - + &File - + &Help - + &Pattern piece - + Measurements - + + Window + + + + Toolbar files - + ToolBar modes - + Toolbar pattern - + Toolbar options - + Toolbar tools - + Tool options - + &New - + &Open - + &Save - + Save &As... - + Save not yet saved pattern - + Ctrl+Shift+S - + Draw - + Draw mode - + Ctrl+W - + Details - + Details mode - + Ctrl+E - - + + Pointer tools - + New pattern piece - + Add new pattern piece - + Ctrl+Shift+N - - + + Change the label of pattern piece - + Table of variables - + Tables of variables - + Ctrl+T - + History - + Ctrl+H - + Export pattern (layout) - + Zoom in - + Original zoom - + Original Zoom - + Zoom fit best - + + Ctrl+= + + + + + Stop + + + + + Stop using tool + + + + + Repot Bug... + + + + + Report bug + + + + + Close window + + + + Create layout - + Ctrl+L - + About &Qt - + &About Valentina - + E&xit - + Exit the application - + Preferences - + zoom in - - + + Zoom out - + Edit pattern XML code - + Pattern properties - + About Qt - + Ctrl+Q - + Pattern piece %1 - + /pattern.val - + File saved - + untitled.val - + Unsaved change - + The pattern has been modified. Do you want to save your changes? - + Pattern piece: - + Enter a new label for the pattern piece. - - - + + + Select point - + + Individual measurements is under development + + + + + There is no way create individual measurements file independent on the pattern file. +For opening pattern need keep both files: pattern and measurements. Do you want continue? + + + + Select first point - - + + + Select first point of line - + Select first point of angle - + Select first point of first line - + Select first point curve - + Select simple curve - + Select point of center of arc - + Select point of curve path - + Select curve path - + Select points, arcs, curves clockwise. - + Select base point - + Select first point of axis - + Select point vertically - + Select detail - + Select arc - + + Select curve + + + + Size: - + pattern - + Critical error! - + Error parsing file (std::bad_alloc). - + Bad id. - + + Could not save file + + + + &Undo - + &Redo - + Wrong units. - + Application doesn't support standard table with inches. - + File error. - + File loaded - + + Valentina didn't shut down correctly. Do you want reopen files (%1) you had open? + + + + + Reopen files. + + + + The measurements file <br/><br/> <b>%1</b> <br/><br/> %3 - + could not be found. Do you want to update the file location - + Standard measurements (*.vst) - + Individual measurements (*.vit) - + Height: - + Pattern Piece: - - + + Pattern files (*.val) - - + + Open file - - + + Error parsing file. - + Error can't convert value. - - + + Error empty parameter. - + Error wrong id. @@ -3581,799 +3954,799 @@ Do you want to save your changes? Measurements - + head_girth Short measurement name. Don't use math symbols in name!!!! - + mid_neck_girth Short measurement name. Don't use math symbols in name!!!! - + neck_base_girth Short measurement name. Don't use math symbols in name!!!! - + head_and_neck_length Short measurement name. Don't use math symbols in name!!!! - + center_front_waist_length Short measurement name. Don't use math symbols in name!!!! - + center_back_waist_length Short measurement name. Don't use math symbols in name!!!! - + shoulder_length Short measurement name. Don't use math symbols in name!!!! - + side_waist_length Short measurement name. Don't use math symbols in name!!!! - + trunk_length Short measurement name. Don't use math symbols in name!!!! - + shoulder_girth Short measurement name. Don't use math symbols in name!!!! - + upper_chest_girth Short measurement name. Don't use math symbols in name!!!! - + bust_girth Short measurement name. Don't use math symbols in name!!!! - + under_bust_girth Short measurement name. Don't use math symbols in name!!!! - + waist_girth Short measurement name. Don't use math symbols in name!!!! - + high_hip_girth Short measurement name. Don't use math symbols in name!!!! - + hip_girth Short measurement name. Don't use math symbols in name!!!! - + upper_front_chest_width Short measurement name. Don't use math symbols in name!!!! - + front_chest_width Short measurement name. Don't use math symbols in name!!!! - + across_front_shoulder_width Short measurement name. Don't use math symbols in name!!!! - + across_back_shoulder_width Short measurement name. Don't use math symbols in name!!!! - + upper_back_width Short measurement name. Don't use math symbols in name!!!! - + back_width Short measurement name. Don't use math symbols in name!!!! - + bustpoint_to_bustpoint Short measurement name. Don't use math symbols in name!!!! - + halter_bustpoint_to_bustpoint Short measurement name. Don't use math symbols in name!!!! - + neck_to_bustpoint Short measurement name. Don't use math symbols in name!!!! - + crotch_length Short measurement name. Don't use math symbols in name!!!! - + rise_height Short measurement name. Don't use math symbols in name!!!! - + shoulder_drop Short measurement name. Don't use math symbols in name!!!! - + shoulder_slope_degrees Short measurement name. Don't use math symbols in name!!!! - + front_shoulder_slope_length Short measurement name. Don't use math symbols in name!!!! - + back_shoulder_slope_length Short measurement name. Don't use math symbols in name!!!! - + front_shoulder_to_waist_length Short measurement name. Don't use math symbols in name!!!! - + back_shoulder_to_waist_length Short measurement name. Don't use math symbols in name!!!! - + front_neck_arc Short measurement name. Don't use math symbols in name!!!! - + back_neck_arc Short measurement name. Don't use math symbols in name!!!! - + front_upper_chest_arc Short measurement name. Don't use math symbols in name!!!! - + back_upper_chest_arc Short measurement name. Don't use math symbols in name!!!! - + front_waist_arc Short measurement name. Don't use math symbols in name!!!! - + back_waist_arc Short measurement name. Don't use math symbols in name!!!! - + front_upper_hip_arc Short measurement name. Don't use math symbols in name!!!! - + back_upper_hip_arc Short measurement name. Don't use math symbols in name!!!! - + front_hip_arc Short measurement name. Don't use math symbols in name!!!! - + back_hip_arc Short measurement name. Don't use math symbols in name!!!! - + chest_slope Short measurement name. Don't use math symbols in name!!!! - + back_slope Short measurement name. Don't use math symbols in name!!!! - + front_waist_slope Short measurement name. Don't use math symbols in name!!!! - + back_waist_slope Short measurement name. Don't use math symbols in name!!!! - + front_neck_to_upper_chest_height Short measurement name. Don't use math symbols in name!!!! - + front_neck_to_bust_height Short measurement name. Don't use math symbols in name!!!! - + front_waist_to_upper_chest Short measurement name. Don't use math symbols in name!!!! - + front_waist_to_lower_breast Short measurement name. Don't use math symbols in name!!!! - + back_waist_to_upper_chest Short measurement name. Don't use math symbols in name!!!! - + strap_length Short measurement name. Don't use math symbols in name!!!! - + armscye_girth Short measurement name. Don't use math symbols in name!!!! - + elbow_girth Short measurement name. Don't use math symbols in name!!!! - + upper_arm_girth Short measurement name. Don't use math symbols in name!!!! - + wrist_girth Short measurement name. Don't use math symbols in name!!!! - + scye_depth Short measurement name. Don't use math symbols in name!!!! - + shoulder_and_arm_length Short measurement name. Don't use math symbols in name!!!! - + underarm_length Short measurement name. Don't use math symbols in name!!!! - + cervicale_to_wrist_length Short measurement name. Don't use math symbols in name!!!! - + shoulder_to_elbow_length Short measurement name. Don't use math symbols in name!!!! - + arm_length Short measurement name. Don't use math symbols in name!!!! - + hand_width Short measurement name. Don't use math symbols in name!!!! - + hand_length Short measurement name. Don't use math symbols in name!!!! - + hand_girth Short measurement name. Don't use math symbols in name!!!! - + thigh_girth Short measurement name. Don't use math symbols in name!!!! - + mid_thigh_girth Short measurement name. Don't use math symbols in name!!!! - + knee_girth Short measurement name. Don't use math symbols in name!!!! - + calf_girth Short measurement name. Don't use math symbols in name!!!! - + ankle_girth Short measurement name. Don't use math symbols in name!!!! - + knee_height Short measurement name. Don't use math symbols in name!!!! - + ankle_height Short measurement name. Don't use math symbols in name!!!! - + foot_width Short measurement name. Don't use math symbols in name!!!! - + foot_length Short measurement name. Don't use math symbols in name!!!! - + height Short measurement name. Don't use math symbols in name!!!! - + cervicale_height Short measurement name. Don't use math symbols in name!!!! - + cervicale_to_knee_height Short measurement name. Don't use math symbols in name!!!! - + waist_height Short measurement name. Don't use math symbols in name!!!! - + high_hip_height Short measurement name. Don't use math symbols in name!!!! - + hip_height Short measurement name. Don't use math symbols in name!!!! - + waist_to_hip_height Short measurement name. Don't use math symbols in name!!!! - + waist_to_knee_height Short measurement name. Don't use math symbols in name!!!! - + crotch_height Short measurement name. Don't use math symbols in name!!!! - + size Short measurement name. Don't use math symbols in name!!!! - + height_front_neck_base_point Short measurement name. Don't use math symbols in name!!!! - + height_base_neck_side_point Short measurement name. Don't use math symbols in name!!!! - + height_shoulder_point Short measurement name. Don't use math symbols in name!!!! - + height_nipple_point Short measurement name. Don't use math symbols in name!!!! - + height_back_angle_axilla Short measurement name. Don't use math symbols in name!!!! - + height_scapular_point Short measurement name. Don't use math symbols in name!!!! - + height_under_buttock_folds Short measurement name. Don't use math symbols in name!!!! - + hips_excluding_protruding_abdomen Short measurement name. Don't use math symbols in name!!!! - + girth_foot_instep Short measurement name. Don't use math symbols in name!!!! - + side_waist_to_floor Short measurement name. Don't use math symbols in name!!!! - + front_waist_to_floor Short measurement name. Don't use math symbols in name!!!! - + arc_through_groin_area Short measurement name. Don't use math symbols in name!!!! - + waist_to_plane_seat Short measurement name. Don't use math symbols in name!!!! - + neck_to_radial_point Short measurement name. Don't use math symbols in name!!!! - + neck_to_third_finger Short measurement name. Don't use math symbols in name!!!! - + neck_to_first_line_chest_circumference Short measurement name. Don't use math symbols in name!!!! - + front_waist_length Short measurement name. Don't use math symbols in name!!!! - + arc_through_shoulder_joint Short measurement name. Don't use math symbols in name!!!! - + neck_to_back_line_chest_circumference Short measurement name. Don't use math symbols in name!!!! - + waist_to_neck_side Short measurement name. Don't use math symbols in name!!!! - + arc_length_upper_body Short measurement name. Don't use math symbols in name!!!! - + chest_width Short measurement name. Don't use math symbols in name!!!! - + anteroposterior_diameter_hands Short measurement name. Don't use math symbols in name!!!! - + height_clavicular_point Short measurement name. Don't use math symbols in name!!!! - + height_armhole_slash Short measurement name. Don't use math symbols in name!!!! - + slash_shoulder_height Short measurement name. Don't use math symbols in name!!!! - + half_girth_neck Short measurement name. Don't use math symbols in name!!!! - + half_girth_neck_for_shirts Short measurement name. Don't use math symbols in name!!!! - + half_girth_chest_first Short measurement name. Don't use math symbols in name!!!! - + half_girth_chest_second Short measurement name. Don't use math symbols in name!!!! - + half_girth_chest_third Short measurement name. Don't use math symbols in name!!!! - + half_girth_waist Short measurement name. Don't use math symbols in name!!!! - + half_girth_hips_considering_protruding_abdomen Short measurement name. Don't use math symbols in name!!!! - + half_girth_hips_excluding_protruding_abdomen Short measurement name. Don't use math symbols in name!!!! - + girth_knee_flexed_feet Short measurement name. Don't use math symbols in name!!!! - + neck_transverse_diameter Short measurement name. Don't use math symbols in name!!!! - + front_slash_shoulder_height Short measurement name. Don't use math symbols in name!!!! - + neck_to_front_waist_line Short measurement name. Don't use math symbols in name!!!! - + hand_vertical_diameter Short measurement name. Don't use math symbols in name!!!! - + neck_to_knee_point Short measurement name. Don't use math symbols in name!!!! - + waist_to_knee Short measurement name. Don't use math symbols in name!!!! - + shoulder_height Short measurement name. Don't use math symbols in name!!!! - + head_height Short measurement name. Don't use math symbols in name!!!! - + body_position Short measurement name. Don't use math symbols in name!!!! - + arc_behind_shoulder_girdle Short measurement name. Don't use math symbols in name!!!! - + neck_to_neck_base Short measurement name. Don't use math symbols in name!!!! - + depth_waist_first Short measurement name. Don't use math symbols in name!!!! - + depth_waist_second Short measurement name. Don't use math symbols in name!!!! @@ -4382,799 +4755,799 @@ Do you want to save your changes? MeasurementsDescriptions - + Around fullest part of Head Full measurement description - + Around middle part of Neck Full measurement description - + Around Neck at base Full measurement description - + Vertical Distance from Crown to Nape Full measurement description - + Front Neck Center over tape at Bustline to Front Waist Center Full measurement description - + Back Neck Center to Back Waist Center Full measurement description - + NeckPoint to ShoulderTip Full measurement description - + Armpit to Waist side Full measurement description - + Around Body from middle of Shoulder length to BustPoint to Crotch up back to beginning point Full measurement description - + Around Arms and Torso, at bicep level parallel to floor, with arms hanging at the sides Full measurement description - + Around Chest at Armfold level, will be parallel to floor across back, will not be parallel to floor across front chest Full measurement description - + Around fullest part of Bust, parallel to floor Full measurement description - + Around Chest below the Bust, parallel to floor Full measurement description - + Tie a string around smallest part of waist, keep string tied while taking meaasurements. Not usually parallel to floor for front waist or back waist. Full measurement description - + Around HighHip, parallel to floor Full measurement description - + Around Hip, parallel to floor Full measurement description - + Across Front UpperChest, smallest width from armscye to armscye Full measurement description - + Across Front Chest, from armfold to armfold Full measurement description - + From ShoulderTip to ShoulderTip, across Front Full measurement description - + From ShoulderTip to ShoulderTip, across Back Full measurement description - + Across Back UpperChest, smallest width from armscye to armscye Full measurement description - + Across Back Chest, from armfold to armfold Full measurement description - + Distance between BustPoints, across Chest Full measurement description - + Distance from Bustpoint, behind neck, down to Bustpoint Full measurement description - + From NeckPoint to BustPoint Full measurement description - + From Front Waist Center, down to crotch, up to Back Waist Center Full measurement description - + Sit on hard chair, measure from side waist straight down to chair bottom Full measurement description - + Vertical Distance from NeckPoint level to ShoulderTip level Full measurement description - + Degrees of angle from NeckPoint to ShoulderTip – requires goniometer Full measurement description - + ShoulderTip to Front Waist Center Full measurement description - + ShoulderTip to Back Waist Center Full measurement description - + NeckPoint straight down front chest to Waistline Full measurement description - + Back NeckPoint straight down back chest to Waistline Full measurement description - + NeckPoint to NeckPoint through Front Neck Center Full measurement description - + NeckPoint to NeckPoint across Nape Full measurement description - + Front upper-bust arc Full measurement description - + Back UpperBust side to side Full measurement description - + Front Waist side to side Full measurement description - + Back Waist side to side Full measurement description - + Front UpperHip side to side Full measurement description - + Back UpperHip side to side Full measurement description - + Front Hip side to side Full measurement description - + Back Hip side to side Full measurement description - + NeckPoint to Front ArmfoldPoint Full measurement description - + NeckPoint to Back ArmfoldPoint Full measurement description - + NeckPoint across Front Chest to Waist side Full measurement description - + NeckPoint across Back Chest to Waist side Full measurement description - + Front Neck Center straight down to UpperChest line Full measurement description - + Front Neck Center straight down to Bust line Full measurement description - + Front Upper chest waist Full measurement description - + Front waist to lower breast Full measurement description - + Back waist to upper chest Full measurement description - + Strap length Full measurement description - + Around Armscye Full measurement description - + Around Elbow with elbow bent Full measurement description - + Around UpperArm Full measurement description - + Around Wrist Full measurement description - + Nape straight down to UnderBust line (same as Back UpperBust height) Full measurement description - + NeckPoint to ShoulderTip to Wrist, with elbow bent and hand on hip Full measurement description - + Armpit to Wrist, with arm straight and hanging at side Full measurement description - + Nape to Wrist, with elbow bent and hand on hip Full measurement description - + ShoulderTip to Elbow, with elbow bent and hand on hip Full measurement description - + ShoulderTip to Wrist, with elbow bent and hand on hip Full measurement description - + Hand side to side Full measurement description - + Hand Middle Finger tip to wrist Full measurement description - + Around Hand Full measurement description - + Around Thigh Full measurement description - + Around MidThigh Full measurement description - + Around Knee Full measurement description - + Around Calf Full measurement description - + Around Ankle Full measurement description - + Knee to Floor Full measurement description - + Ankle to Floor Full measurement description - + Widest part of Foot side to side Full measurement description - + Tip of Longest Toe straight to back of heel Full measurement description - + Top of head to floor Full measurement description - + Nape to Floor Full measurement description - + Nape to Knee Full measurement description - + Waist side to floor Full measurement description - + HighHip side to Floor Full measurement description - + Hip side to Floor Full measurement description - + Waist side to Hip Full measurement description - + Waist side to Knee Full measurement description - + Crotch to Floor along inside leg Full measurement description - + Size Full measurement description - + Height of the point base of the neck in front Full measurement description - + Height of the base of the neck side point Full measurement description - + The height of the shoulder point Full measurement description - + Height nipple point Full measurement description - + Height back angle axilla Full measurement description - + Height scapular point Full measurement description - + Height under buttock folds Full measurement description - + Hips excluding protruding abdomen Full measurement description - + Girth foot instep Full measurement description - + The distance from the side waist to floor Full measurement description - + The distance from the front waist to floor Full measurement description - + Arc through groin area Full measurement description - + The distance from the waist to the plane seat Full measurement description - + The distance from the base of the neck to the side of the radial point Full measurement description - + Distance from the base of the neck side point to the end of the third finger Full measurement description - + The distance from the base of the neck to the side of the first line in front of chest circumference Full measurement description - + The distance from the base of the neck to the waist side front (waist length in the front) Full measurement description - + Arc through the highest point of the shoulder joint Full measurement description - + The distance from the base of the neck to the back line of chest circumference of the first and the second based on ledge vanes Full measurement description - + The distance from the waist to the back base of the neck side point Full measurement description - + Arc length of the upper body through the base of the neck side point Full measurement description - + Chest width Full measurement description - + Anteroposterior diameter of the hands Full measurement description - + Height clavicular point Full measurement description - + The distance from the point to the cervical level of the posterior angle of the front armpit (underarm height oblique) Full measurement description - + Slash shoulder height Full measurement description - + Half girth neck Full measurement description - + Half girth neck for shirts Full measurement description - + Half girth chest first Full measurement description - + Half girth chest second Full measurement description - + Half girth chest third Full measurement description - + Half girth waist Full measurement description - + Half girth hips considering protruding abdomen Full measurement description - + Half girth hips excluding protruding abdomen Full measurement description - + Girth knee flexed feet Full measurement description - + Neck transverse diameter Full measurement description - + Front slash shoulder height Full measurement description - + The distance from the base of the neck to the waist line front Full measurement description - + Hand vertical diameter Full measurement description - + Distance from neck to knee point Full measurement description - + The distance from the waist to the knee Full measurement description - + Shoulder height Full measurement description - + Head height Full measurement description - + Body position Full measurement description - + Arc behind the shoulder girdle Full measurement description - + Distance from neck point to point on the base of the neck side neck girth measurement line Full measurement description - + Depth waist first Full measurement description - + Depth waist second Full measurement description @@ -5183,799 +5556,799 @@ Do you want to save your changes? MeasurementsFullNames - + Head girth Full measurement name - + Mid-neck girth Full measurement name - + Neck Base girth Full measurement name - + Head and Neck length Full measurement name - + Front Center length Full measurement name - + Back Center length Full measurement name - + Shoulder length Full measurement name - + Side Waist length Full measurement name - + Trunk length Full measurement name - + Shoulder girth Full measurement name - + Upper Chest girth Full measurement name - + Bust girth Full measurement name - + Under Bust girth Full measurement name - + Waist girth Full measurement name - + HighHip girth Full measurement name - + Hip girth Full measurement name - + Front Upper Chest width Full measurement name - + Front Chest width Full measurement name - + Front Across Shoulder width Full measurement name - + Back Across Shoulder width Full measurement name - + Back Upper Chest width Full measurement name - + Back Chest width Full measurement name - + BustPoint to BustPoint Full measurement name - + Halter Bustpoint to Bustpoint Full measurement name - + NeckPoint to BustPoint Full measurement name - + Crotch length Full measurement name - + Rise height Full measurement name - + Shoulder Drop Full measurement name - + Shoulder Slope degrees Full measurement name - + Front Shoulder Balance Full measurement name - + Back Shoulder Balance Full measurement name - + Front Full Length Full measurement name - + Back Full Length Full measurement name - + Front Neck arc Full measurement name - + Back Neck arc Full measurement name - + Front upper-bust arc Full measurement name - + Back UpperBust arc Full measurement name - + Front Waist arc Full measurement name - + Back Waist arc Full measurement name - + Front UpperHip arc Full measurement name - + Back UpperHip arc Full measurement name - + Front Hip arc Full measurement name - + Back Hip arc Full measurement name - + Chest Balance Full measurement name - + Back Balance Full measurement name - + Front Waist Balance Full measurement name - + Back Waist Balance Full measurement name - + Front UpperChest height Full measurement name - + Bust height Full measurement name - + Front Upper chest waist Full measurement name - + Front waist to lower breast Full measurement name - + Back waist to upper chest Full measurement name - + Strap length Full measurement name - + Armscye Girth Full measurement name - + Elbow Girth Full measurement name - + Upperarm Girth Full measurement name - + Wrist girth Full measurement name - + Armscye depth Full measurement name - + Shoulder and Arm length Full measurement name - + Underarm length Full measurement name - + Nape to wrist length Full measurement name - + Elbow length Full measurement name - + Arm length Full measurement name - + Hand width Full measurement name - + Hand length Full measurement name - + Hand girth Full measurement name - + Thigh girth Full measurement name - + Midthigh girth Full measurement name - + Knee girth Full measurement name - + Calf girth Full measurement name - + Ankle girth Full measurement name - + Knee height Full measurement name - + Ankle height Full measurement name - + Foot width Full measurement name - + Foot length Full measurement name - + Total Height Full measurement name - + Nape height Full measurement name - + Nape to knee height Full measurement name - + Waist height Full measurement name - + HighHip height Full measurement name - + Hip height Full measurement name - + Waist to Hip height Full measurement name - + Waist to Knee height Full measurement name - + Crotch height/Inseam Full measurement name - + Size Full measurement name - + Height front neck base point Full measurement name - + Height base neck side point Full measurement name - + Height shoulder point Full measurement name - + Height nipple point Full measurement name - + Height back angle axilla Full measurement name - + Height scapular point Full measurement name - + Height under buttock folds Full measurement name - + Hips excluding protruding abdomen Full measurement name - + Girth foot instep Full measurement name - + Side waist to floor Full measurement name - + Front waist to floor Full measurement name - + Arc through groin area Full measurement name - + Waist to plane seat Full measurement name - + Neck to radial point Full measurement name - + Neck to third finger Full measurement name - + Neck to first line chest circumference Full measurement name - + Front waist length Full measurement name - + Arc through shoulder joint Full measurement name - + Neck to back line chest circumference Full measurement name - + Waist to neck side Full measurement name - + Arc length upper body Full measurement name - + Chest width Full measurement name - + Anteroposterior diameter hands Full measurement name - + Height clavicular point Full measurement name - + Height armhole slash Full measurement name - + Slash shoulder height Full measurement name - + Half girth neck Full measurement name - + Half girth neck for shirts Full measurement name - + Half girth chest first Full measurement name - + Half girth chest second Full measurement name - + Half girth chest third Full measurement name - + Half girth waist Full measurement name - + Half girth hips considering protruding abdomen Full measurement name - + Half girth hips excluding protruding abdomen Full measurement name - + Girth knee flexed feet Full measurement name - + Neck transverse diameter Full measurement name - + Front slash shoulder height Full measurement name - + Neck to front waist line Full measurement name - + Hand vertical diameter Full measurement name - + Neck to knee point Full measurement name - + Waist to knee Full measurement name - + Shoulder height Full measurement name - + Head height Full measurement name - + Body position Full measurement name - + Arc behind shoulder girdle Full measurement name - + Neck to neck base Full measurement name - + Depth waist first Full measurement name - + Depth waist second Full measurement name @@ -6084,19 +6457,19 @@ Do you want to save your changes? PostfixOperators - + cm centimeter - + mm millimeter - + in inch @@ -6158,7 +6531,7 @@ Do you want to save your changes? QObject - + Create new pattern piece to start working. @@ -6173,18 +6546,18 @@ Do you want to save your changes? - + mm - - + + cm - + inch @@ -6200,7 +6573,7 @@ Do you want to save your changes? STDescriptions - + Standard figures of men 1st group, chest 100 cm Standard table description @@ -6378,12 +6751,12 @@ Do you want to save your changes? VAbstractTool - + Confirm the deletion. - + Do you really want delete? @@ -6391,35 +6764,45 @@ Do you want to save your changes? VApplication - + Error parsing file. Program will be terminated. - + Error bad id. Program will be terminated. - + Error can't convert value. Program will be terminated. - + Error empty parameter. Program will be terminated. - + Error wrong id. Program will be terminated. - + Something's wrong!! + + + Could not copy temp file to document file + + + + + Could not remove document file + + VContainer @@ -6446,48 +6829,53 @@ Do you want to save your changes? VDomDocument - + Can't convert toUInt parameter - + Can't convert toBool parameter - + Got empty parameter - + Can't convert toDouble parameter - - + + Can't open file %1: %2. - + Can't open schema file %1: %2. - + Validation error file %3 in line %1 column %2 - + Parsing error file %3 in line %1 column %2 + + + Couldn't get node + + VDrawTool @@ -6510,7 +6898,7 @@ Do you want to save your changes? VException - + Critical error! @@ -6550,188 +6938,200 @@ Do you want to save your changes? VPattern - - Can't find tool id = %1 in table. + + Can't find tool in table. - + Error no unique id. - - + + Error parsing file. - + Error can't convert value. - + Error empty parameter. - + Error wrong id. - + Critical error! - + Error parsing file (std::bad_alloc). - + Error creating or updating detail - + Error creating or updating single point - - + + Error creating or updating point of end line - - + + Error creating or updating point along line - - + + Error creating or updating point of shoulder - - + + Error creating or updating point of normal - - + + Error creating or updating point of bisector - + Error creating or updating point of lineintersection - - + + Error creating or updating point of contact - + Error creating or updating modeling point - + Error creating or updating height - + Error creating or updating triangle - + Error creating or updating point of intersection - - + + Error creating or updating cut spline point - - + + Error creating or updating cut spline path point - - + + Error creating or updating cut arc point - + + + Error creating or updating point of intersection line and axis + + + + + + Error creating or updating point of intersection curve and axis + + + + Error creating or updating line - + Error creating or updating simple curve - + Error creating or updating curve path - + Error creating or updating modeling simple curve - + Error creating or updating modeling curve path - - + + Error creating or updating simple arc - + Error creating or updating modeling arc - + Error creating or updating union details - + Got wrong parameter id. Need only id > 0. - + This id is not unique. - + File error. @@ -6785,207 +7185,227 @@ Do you want to save your changes? VToolOptionsPropertyBrowser - + Base point - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + Point label - + Position - + Point at distance and angle - - - - - - - + + + + + + + + + Line type - - - - - - - - + + + + + + + + Length - + + + Angle - + Point at distance along line - + Arc - - + + Radius - + First angle - + Second angle - + Point along bisector - + Cut arc tool - + Tool for segmenting a curve - + Tool segment a pathed curve - + Perpendicular point along line - + Line between points - + Point at line intersection - + Point along perpendicular - + Additional angle degrees - + Point at intersection of arc and line - + Tool to make point from x & y of two other points - + Special point on shoulder - + Curve tool - - + + Curve factor - + Tool for path curve - + Tool triangle + + + + Point intersection line and axis + + Variables - + Line_ Left symbol _ in name - + AngleLine_ Left symbol _ in name - + Arc_ Left symbol _ in name - + Spl_ Left symbol _ in name - + SplPath Do not add symbol _ to the end of name + + VisToolCurveIntersectAxis + + + <b>Intersection curve and axis</b>: angle = %1°; <b>Shift</b> - sticking angle, <b>Enter</b> - finish creation + + + VisToolEndLine @@ -6994,6 +7414,14 @@ Do you want to save your changes? + + VisToolLineIntersectAxis + + + <b>Intersection line and axis</b>: angle = %1°; <b>Shift</b> - sticking angle, <b>Enter</b> - finish creation + + + VisToolSplinePath @@ -7005,12 +7433,12 @@ Do you want to save your changes? main - + Pattern making program. - + Pattern file. diff --git a/src/app/share/translations/valentina_ru_RU.ts b/src/app/share/translations/valentina_ru_RU.ts index 47049ede9..52062d5f2 100644 --- a/src/app/share/translations/valentina_ru_RU.ts +++ b/src/app/share/translations/valentina_ru_RU.ts @@ -147,7 +147,7 @@ ConfigurationPage - + Setup user interface language updated and will be used the next time start Настройки языка интерфейса пользователя оновлены и будут задействованы при следующем запуске @@ -211,12 +211,27 @@ Millimiters Миллиметры + + + Send crash reports + Отсылка отчета об ошибках + + + + Send crash reports (recommended) + Отсылка отчета об ошибках (рекомендуется) + + + + After each crash Valentina collect information that may help us fix a problem. We do not collect any personal information. Find more about what <a href="https://bitbucket.org/dismine/valentina/wiki/manual/Crash_reports">kind of information</a> we collect. + После каждого падения Valentina собирает информацию которая может помочь нам в исправлении ошибки. Мы не собираем персональную информацию пользователей. Узнать больше о <a href=https://bitbucket.org/dismine/valentina/wiki/manual/Crash_reports>информации</a> которую мы собираем. + Milimiters Milimiters - + Inches Дюймы @@ -233,7 +248,7 @@ DelTool - + Delete tool Удалить инструмент @@ -332,22 +347,22 @@ Расчитать значение - + Point label Имя точки - + Insert variable into the formula Вставить переменную в формулу - + <html><head/><body><p>Show full calculation in message box</p></body></html> <html><head/><body><р>Показать полный расчет в окне сообщения</p></body</html> - + First point Первая точка @@ -357,7 +372,7 @@ Первая точка линии - + Second point Вторая точка @@ -367,7 +382,7 @@ Вторая точка линии - + Type of line Тип линии @@ -377,14 +392,18 @@ Показать линию с первой точки до этой - + Size and height Размер и рост + Measurements + Мерки + + Standard table - Стандартная таблица + Стандартная таблица @@ -431,7 +450,7 @@ Длина кривых - + Select second point of line Выберить вторую точку линии @@ -463,13 +482,13 @@ - + Calculate value Расчитать значение - + Value of radius Значение радиуса @@ -478,9 +497,9 @@ _ - + + - <html><head/><body><p>Show full calculation in message box</p></body></html> <html><head/><body><р>Показать полный расчет в окне сообщения</p></body></html> @@ -493,7 +512,7 @@ Первый угол дуги против часовой стрелки - + Insert variable into formula Вставить переменную в формулу @@ -521,7 +540,7 @@ Значение второго угла - + Center point Центральная точка @@ -545,7 +564,7 @@ Размер и рост - + First angle Первый угол @@ -555,9 +574,13 @@ Второй угол - Standard table - Стандартная таблица + Стандартная таблица + + + + Measurements + Мерки @@ -595,7 +618,7 @@ Переменные - + Value of angle of line. Значение угла линии. @@ -641,17 +664,17 @@ Расчитать значение - + <html><head/><body><p>Show full calculation in message box</p></body></html> <html><head/><body><р>Показать полный расчет в окне сообщения</p></body></html> - + Point label Имя точки - + First point Первая точка @@ -661,7 +684,7 @@ Первая точка угла - + Second point Вторая точка @@ -671,7 +694,7 @@ Вторая точка угла - + Third point Третья точка @@ -681,7 +704,7 @@ Третья точка угла - + Type of line Тип линии @@ -691,14 +714,18 @@ Показать линию с первой точки до этой - + Size and height Размер и рост + Measurements + Мерки + + Standard table - Стандартная таблица + Стандартная таблица @@ -745,16 +772,130 @@ Длина кривых - + Select second point of angle Выберить вторую точку угла - + Select third point of angle Выберить третью точку угла + + DialogCurveIntersectAxis + + + Curve intersect axis + Пересичение кривой и оси + + + + Angle + Угол + + + + Calculate value + Расчитать значение + + + + Value of angle + Значение угла + + + + <html><head/><body><p>Show full calculation in message box</p></body></html> + <html><head/><body><р>Показать полный расчет в окне сообщения</p></body</html> + + + + Axis point + Точка оси + + + + + First point of line + Первая точка линии + + + + Curve + Кривая + + + + Point label + Имя точки + + + + Type of line + Тип линии + + + + Show line from first point to this point + Показать линию с первой точки до этой + + + + Input data + Входные данные + + + + Size and height + Размер и рост + + + + Measurements + Мерки + + + + Increments + Прибавки + + + + Length of lines + Длина линий + + + + Length of arcs + Длина дуг + + + + Length of curves + Длина кривых + + + + Angle of lines + Уголы линий + + + + Hide empty measurements + Спрятать пустые мерки + + + + Variables + Переменные + + + + Select axis point + Выберить точку оси + + DialogCutArc @@ -795,12 +936,12 @@ _ - + <html><head/><body><p>Show full calculation in message box</p></body></html> <html><head/><body><р>Показать полный расчет в окне сообщения</p></body></html> - + Arc Дуга @@ -810,12 +951,12 @@ Выбраная кривая - + Point label Имя точки - + Input data Входные данные @@ -826,8 +967,12 @@ + Measurements + Мерки + + Standard table - Стандартная таблица + Стандартная таблица @@ -905,12 +1050,12 @@ _ - + <html><head/><body><p>Show full calculation in message box</p></body></html> <html><head/><body><р>Показать полный расчет в окне сообщения</p></body></html> - + Curve Кривая @@ -920,12 +1065,12 @@ Выбраная кривая - + Point label Имя точки - + Input data Входные данные @@ -936,8 +1081,12 @@ + Measurements + Мерки + + Standard table - Стандартная таблица + Стандартная таблица @@ -1015,12 +1164,12 @@ _ - + <html><head/><body><p>Show full calculation in message box</p></body></html> <html><head/><body><р>Показать полный расчет в окне сообщения</p></body></html> - + Curve Кривая @@ -1030,12 +1179,12 @@ Выбраная сложная кривая - + Point label Имя точки - + Input data Входные данные @@ -1046,8 +1195,12 @@ + Measurements + Мерки + + Standard table - Стандартная таблица + Стандартная таблица @@ -1089,29 +1242,29 @@ DialogDetail - + Detail Деталь - + Bias X Смещение по Х - - + + cm см - + Bias Y Смещение по Y - + Options Параметры @@ -1187,7 +1340,7 @@ _ - + <html><head/><body><p>Show full calculation in message box</p></body></html> <html><head/><body><р>Показать полный расчет в окне сообщения</p></body></html> @@ -1202,9 +1355,13 @@ Размер и рост - Standard table - Стандартная таблица + Стандартная таблица + + + + Measurements + Мерки @@ -1260,7 +1417,7 @@ - + Calculate value Расчитать значение @@ -1269,7 +1426,7 @@ ... - + Value of length Значение длины @@ -1278,13 +1435,13 @@ _ - - + + <html><head/><body><p>Show full calculation in message box</p></body></html> <html><head/><body><р>Показать полный расчет в окне сообщения</p></body></html> - + Angle Угол @@ -1294,7 +1451,7 @@ Значение угла - + Base point Базовая точка @@ -1304,12 +1461,12 @@ Первая точка линии - + Point label Имя точки - + Type of line Тип линии @@ -1325,8 +1482,12 @@ + Measurements + Мерки + + Standard table - Стандартная таблица + Стандартная таблица @@ -1397,20 +1558,20 @@ Рост - + Point label Имя точки - + Base point Базовая точка - + - + First point of line Первая точка линии @@ -1420,7 +1581,7 @@ Вторая точка линии - + Type of line Тип линии @@ -1435,7 +1596,7 @@ Выберить первую точку линии - + Select second point of line Выберить вторую точку линии @@ -1449,12 +1610,12 @@ - + Tool Инструмент - + %1 - Base point %1 - Базовая точка @@ -1514,6 +1675,16 @@ %1 - cut curve path %2 %1 - разрезает сложную кривую %2 + + + %1 - point of intersection line %2_%3 and axis through point %4 + %1 - точка пересечения линии %2_%3 и оси через точку %4 + + + + %1 - point of intersection curve and axis through point %2 + %1 - точка пересечения кривой и оси через точку %2 + %1 - cut curve point %2 %1 - разрезает сложную кривую %2 @@ -1523,7 +1694,7 @@ Получено неправильный тип инструмента. Игнорируем. - + Curve %1_%2 Кривая %1_%2 @@ -1536,13 +1707,13 @@ - + Can't create record. Не могу создать запись. - + Arc with center in point %1 Дуга c центром в точке %1 @@ -1641,7 +1812,7 @@ - + Description Опис @@ -1715,14 +1886,14 @@ Обозначение %1 - - + + File error. Ошибка файла. - + male мужчина @@ -1732,7 +1903,32 @@ женщина - + + Could not save GivenName + Не удалось сохранить имя + + + + Could not save FamilyName + Не удалось сохранить фамилию + + + + Could not save Email + Не удалось сохранить Email + + + + Could not save Sex + Не удалось сохранить стать + + + + Could not save BirthDate + Не удалось сохранить дату рождения + + + Measurements use different units than pattern. This pattern required measurements in %1 Мерки используют другие единицы измерения нежели лекало. Это лекало требует мерки в %1 @@ -1763,6 +1959,11 @@ Name_%1 Имя_%1 + + + Can't save measurement + Не удалось сохранить мерки + Can't convert toDouble value. Не могу конвертировать к toDouble значение. @@ -1841,7 +2042,7 @@ Пожайлуста попробуйте снова или смените файл - + File error. Ошибка файла. @@ -1898,17 +2099,17 @@ Линия - + First point Первая точка - + Second point Вторая точка - + Type of line Тип линии @@ -1967,16 +2168,141 @@ Выберить вторую точку первой линии - + Select first point of second line Выберить первую точку второй линии - + Select second point of second line Выберить вторую точку второй линии + + DialogLineIntersectAxis + + + Line intersect axis + Пересечение линии и оси + + + + Angle + Угол + + + + Calculate value + Расчитать значение + + + + Value of angle + Значение угла + + + + <html><head/><body><p>Show full calculation in message box</p></body></html> + <html><head/><body><р>Показать полный расчет в окне сообщения</p></body</html> + + + + Axis point + Точка оси + + + + + + First point of line + Первая точка линии + + + + First line point + Первая точка линии + + + + Second line point + Вторая точка линии + + + + Point label + Имя точки + + + + Type of line + Тип линии + + + + Show line from first point to this point + Показать линию с первой точки до этой + + + + Input data + Входные данные + + + + Size and height + Размер и рост + + + + Measurements + Мерки + + + + Increments + Прибавки + + + + Length of lines + Длина линий + + + + Length of arcs + Длина дуг + + + + Length of curves + Длина кривых + + + + Angle of lines + Уголы линий + + + + Hide empty measurements + Спрятать пустые мерки + + + + Variables + Переменные + + + + Select second point of line + Выберить вторую точку линии + + + + Select axis point + Выберить точку оси + + DialogMeasurements @@ -1985,27 +2311,27 @@ Мерки - + <html><head/><body><p><span style=" font-size:18pt;">Please, choose pattern type.</span></p></body></html> <html><head/><body><p><span style=" font-size:18pt;">Пожалуйста, выберите тип лекала.</span></p></body></html> - + Graduation Градация - + Use for creation pattern standard measurement table Лекало со стандартной таблицей - + Individual Индивиндуальные - + Use for creation pattern individual measurements Лекало с индивидуальных мерок @@ -2036,12 +2362,12 @@ _ - + First point Первая точка - + Second point Вторая точка @@ -2051,7 +2377,7 @@ Доп. угол градусы - + Input data Входные данные @@ -2064,27 +2390,27 @@ Формула расчета длины перпендикуляра - + Calculate value Расчитать значение - + Point label Имя точки - + Insert variable into formula Вставить переменную в формулу - + <html><head/><body><p>Show full calculation in message box</p></body></html> <html><head/><body><р>Показать полный расчет в окне сообщения</p></body></html> - + Type of line Тип линии @@ -2099,9 +2425,13 @@ Размер и рост - Standard table - Стандартная таблица + Стандартная таблица + + + + Measurements + Мерки @@ -2139,7 +2469,7 @@ Переменные - кликнете дважды для вставки в формулу - + Select second point of line Выберить вторую точку линии @@ -2536,12 +2866,12 @@ _ - + <html><head/><body><p>Show full calculation in message box</p></body></html> <html><head/><body><р>Показать полный расчет в окне сообщения</p></body></html> - + Center of arc Центр дуги @@ -2550,32 +2880,32 @@ Формула расчета радиуса дуги - + Calculate value Расчитать значение - + Point label Имя точки - + Insert variable into formula Вставить переменную в формулу - + Top of the line Начало линии - + End of the line Конец линии - + Input data Входные данные @@ -2584,12 +2914,11 @@ Размер и рост - Standard table - Стандартная таблица + Стандартная таблица - + Angle of lines Уголы линий @@ -2614,7 +2943,12 @@ Размер и рост - + + Measurements + Мерки + + + Length of lines Длина линий @@ -2629,13 +2963,13 @@ Длина кривых - + Select second point of line Выберить вторую точку линии - - + + Select point of center of arc Выберите точку центра дуги @@ -2652,27 +2986,27 @@ Имя точки - + vertical point Точка вертикали - + horizontal point Точка горизонтали - + First point of angle Первая точка угла - + Point of intersection Точка пересечения - + Second point of angle Вторая точка угла @@ -2717,37 +3051,37 @@ Расчитать значение - + Point label Имя точки - + Insert variable into formula Вставить переменную в формулу - + <html><head/><body><p>Show full calculation in message box</p></body></html> <html><head/><body><р>Показать полный расчет в окне сообщения</p></body></html> - + First point Первая точка - + Second point Вторая точка - + Third point - Третья точка + Третья точка - + Type of line Тип линии @@ -2757,7 +3091,7 @@ Показать линию с первой точки к нашей - + Input data Входные данные @@ -2766,12 +3100,11 @@ Размер и рост - Standard table - Стандартная таблица + Стандартная таблица - + Angle of lines Уголы линий @@ -2796,7 +3129,12 @@ Размер и рост - + + Measurements + Мерки + + + Length of lines Длина линий @@ -2811,12 +3149,12 @@ Длина кривых - + Select first point of line Выберить первую точку линии - + Select second point of line Выберить вторую точку линии @@ -2909,8 +3247,12 @@ DialogSplinePath - Curve path + Сложная кривая + + + + Curved path Сложная кривая @@ -2996,7 +3338,7 @@ Не могу найти точку за именем - + @@ -3044,7 +3386,7 @@ Значение - + Height Рост @@ -3086,30 +3428,30 @@ Имя точки - + First point of axis Первая точка оси - - - + + + First point of line Первая точка линии - + Second point of axis Вторая точка оси - + First point Первая точка - + Second point Вторая точка @@ -3119,12 +3461,12 @@ Выберить вторую точку оси - + Select first point Выберить первую точку - + Select second point Выберить вторую точку @@ -3202,7 +3544,7 @@ Functions - + sin sine function sin @@ -3383,11 +3725,14 @@ Инструмент точка перпендикуляра + + + ... - ... + ... - + Special point on shoulder. Инструмент точка плеча. @@ -3421,7 +3766,7 @@ Инструмент угольник. - + Tools for creating lines. Инструменты создания линий. @@ -3457,7 +3802,7 @@ Инструмент сложная кривая. - + Tools for creating arcs. Инструменты создания дуг. @@ -3471,7 +3816,7 @@ Инструмент дуга. - + Tools for creating details. Инструменты создания деталей. @@ -3498,7 +3843,7 @@ Чертеж - + Details mode Режим деталей @@ -3519,7 +3864,7 @@ Добавить новый чертеж - + Perpendicular point along line Перпендикулярная точка вдоль линии @@ -3529,7 +3874,7 @@ Инструмент, чтобы сделать точку от х и у двух других точек. - + Line between points Линия между точками @@ -3559,7 +3904,12 @@ Инструмент разрезания кривой. - + + Point of intersection line and axis + Точка пересечения линии и оси + + + Arc tool. Инструмент дуга. @@ -3569,7 +3919,7 @@ Инструмент разрезания дуги. - + Tool for union two details. Инструмент объединения двух деталей. @@ -3584,12 +3934,12 @@ &Помощь - + &Pattern piece &Чертеж - + New Новое @@ -3658,17 +4008,22 @@ Свойства лекала - + Save as Сохранить как - + Measurements Мерки - + + Window + Окно + + + Toolbar files Панель инструментов файлы @@ -3688,12 +4043,12 @@ Панель инструментов настройки - + Toolbar tools Панель инструментов - + Tool options Параметры инструметнов @@ -3798,12 +4153,42 @@ Zoom fit best Уместить + + + Ctrl+= + Ctrl+= + + + + Stop + Стоп + + + + Stop using tool + Прекратить использование инструмента + + + + Repot Bug... + Сообщить об ошибке... + + + + Report bug + Сообщить об ошибке + + + + Close window + Закрыть окно + Zoom In Увеличить - + zoom in приблизить @@ -3878,7 +4263,7 @@ Ctrl+L - + About Qt Про Qt @@ -3919,12 +4304,12 @@ Ошибка. Чертеж с таким именем уже сущевствует. - + Pattern piece: Чертеж: - + Pattern piece %1 Чертеж %1 @@ -3933,7 +4318,7 @@ Ошибка создания чертежа с именем - + Enter a new label for the pattern piece. Введите новое имя для чертежа. @@ -3946,7 +4331,7 @@ Не могу сохранить новое имя чертежа - + Select point @@ -3962,13 +4347,26 @@ Выберить точку плеча - + + Individual measurements is under development + Индивидуальные мерки находится в стадии разработки + + + + There is no way create individual measurements file independent on the pattern file. +For opening pattern need keep both files: pattern and measurements. Do you want continue? + У вас не будет возможности создать файл с индивидуальными мерками независимо от файла лекала. +Для того что бы отрыть файл лекала сохраните оба вайла: выкройку и мерки. Вы хотите продолжить? + + + + Select first point of line Выберить первую точку линии - + Select first point of angle Выберить первую точку угла @@ -4013,17 +4411,22 @@ Выберить дугу - + + Select curve + Выберите кривую + + + Size: Размеры: - + pattern Чертеж - + Critical error! Критическая ошибка! @@ -4033,17 +4436,22 @@ Ошибка парсинга файла (std::bad_alloc). - + Bad id. Плохой id. - + File saved Файл сохранен - + + Could not save file + Не удалось сохранить файл + + + &Undo &Отменить @@ -4057,7 +4465,7 @@ Мерки используют другие единицы измерения нежели лекало. Ето леколо требует мерки в %1 - + Wrong units. Неправильные единицы измерения. @@ -4072,7 +4480,17 @@ Ошибка файла. - + + Valentina didn't shut down correctly. Do you want reopen files (%1) you had open? + Валентина не была закрыта корректно. Вы хотите восстановить файлы (%1) которые былы открыты раньше? + + + + Reopen files. + Повторно открыть файлы. + + + The measurements file <br/><br/> <b>%1</b> <br/><br/> %3 Файл мерок <br/><br/> <b>%1</b> <br/><br/> %3 @@ -4096,12 +4514,12 @@ Не могу сохранить лекало - + untitled.val без_имени.val - + Unsaved change Не сохраненные изменения @@ -4121,7 +4539,7 @@ Do you want to save your changes? Не могу прочитать файл %1:\n%2. - + File loaded Файл загружен @@ -4166,8 +4584,8 @@ Do you want to save your changes? Ошибка сохранения файла. Не могу сохранить файл. - - + + Open file Открыть файл @@ -4206,7 +4624,7 @@ Do you want to save your changes? Ошибка! - + Select points, arcs, curves clockwise. Выберить точки, дуги, кривые за часовой стрелкой. @@ -4234,7 +4652,7 @@ Do you want to save your changes? Создано %3 в %4 - + Height: Рост: @@ -4244,7 +4662,7 @@ Do you want to save your changes? Чертеж: - + Pattern files (*.val) Файл лекала (*.val) @@ -4271,7 +4689,7 @@ Do you want to save your changes? Не могу открыть файл лекала. Имя файла пустое - + Error parsing file. Ошибка парсинга файла. @@ -4283,12 +4701,12 @@ Do you want to save your changes? - + Error empty parameter. Ошибка, пустой параметр. - + Error wrong id. Ошибка, неправильный id. @@ -7709,7 +8127,7 @@ Do you want to save your changes? QObject - + Create new pattern piece to start working. Создайте новый чертеж для начала работы. @@ -7724,7 +8142,7 @@ Do you want to save your changes? Переместить деталь - + mm мм @@ -7957,7 +8375,7 @@ Do you want to save your changes? VAbstractTool - + Confirm the deletion. Подтвердить удаление. @@ -7974,7 +8392,7 @@ Do you want to save your changes? Ошибка! - + Error parsing file. Program will be terminated. Ошибка парсинга файла. Програма будет закрыта. @@ -8003,6 +8421,16 @@ Do you want to save your changes? Something's wrong!! Что то не так!!! + + + Could not copy temp file to document file + Не удалось скопировать временный файл в выходной файл + + + + Could not remove document file + Не удалось удалить файл документа. + Something wrong!! Что то не так!!! @@ -8099,6 +8527,11 @@ Do you want to save your changes? Parsing error file %3 in line %1 column %2 Ошибка разбора файла %3 в строке %1 столбца %2 + + + Couldn't get node + Не удалось получить узел. + Validation error in line %1 column %2 Ошибка валидации линия %1 столбик %2 @@ -8245,7 +8678,7 @@ Do you want to save your changes? VException - + Critical error! Критическая ошибка! @@ -8296,12 +8729,11 @@ Do you want to save your changes? VPattern - Can't find tool id = %1 in table. - Не могу найти инструмент с id = %1 в таблице. + Не могу найти инструмент с id = %1 в таблице. - + Error no unique id. Ошибка не уникальный id. @@ -8310,7 +8742,12 @@ Do you want to save your changes? Ошибка! - + + Can't find tool in table. + Не могу найти инструмент в таблице. + + + Error parsing file. Ошибка парсинга файла. @@ -8341,12 +8778,12 @@ Do you want to save your changes? Ошибка парсинга файла (std::bad_alloc). - + Error creating or updating detail Ошибка создания или обновления детали - + Error creating or updating single point Ошибка создания или обновления базовой точки @@ -8418,7 +8855,7 @@ Do you want to save your changes? Ошибка создания или обновления точки разрезания сплайна - + Error creating or updating cut spline path point Ошибка создания или обновления точки разрезания сложного сплайна @@ -8430,7 +8867,19 @@ Do you want to save your changes? Ошибка создания или обновления точки разрезания дуги - + + + Error creating or updating point of intersection line and axis + Ошибка создания или обновления точки пересечения линии и оси + + + + + Error creating or updating point of intersection curve and axis + Ошибка создания или обновления точки пересечения кривой и оси + + + Error creating or updating line Ошибка создания или обновления линии @@ -8535,7 +8984,7 @@ Do you want to save your changes? VToolOptionsPropertyBrowser - + Base point Базовая точка @@ -8554,11 +9003,13 @@ Do you want to save your changes? + + Point label Имя точки - + Position Положение @@ -8575,11 +9026,13 @@ Do you want to save your changes? + + Line type Тип линии - + @@ -8592,11 +9045,13 @@ Do you want to save your changes? + + Angle Угол - + Point at distance along line Инструмент точка вдоль линии @@ -8702,6 +9157,12 @@ Do you want to save your changes? Tool triangle Инструмент треугольник + + + + Point intersection line and axis + Точка пересечения линии и оси + VToolTriangle @@ -8720,7 +9181,7 @@ Do you want to save your changes? Variables - + Line_ Left symbol _ in name Линия_ @@ -8759,6 +9220,14 @@ Do you want to save your changes? СлСпл + + VisToolCurveIntersectAxis + + + <b>Intersection curve and axis</b>: angle = %1°; <b>Shift</b> - sticking angle, <b>Enter</b> - finish creation + <b>пересечение кривой и дуги</b>: угол = %1°; <b>Shift</b> - фиксация угола, <b>Enter</b> - завершение создания + + VisToolEndLine @@ -8767,6 +9236,14 @@ Do you want to save your changes? <b>Точка на конце отрезка</b>: угол = %1°; <b>Shift</b> - фиксация угла, <b>Enter</b> - завершение создания + + VisToolLineIntersectAxis + + + <b>Intersection line and axis</b>: angle = %1°; <b>Shift</b> - sticking angle, <b>Enter</b> - finish creation + <b>Пересечение линии и оси</b>: угол = %1°; <b>Shift</b> - "фиксация угола, <b>Enter</b> - завершение создания + + VisToolSplinePath @@ -8778,7 +9255,7 @@ Do you want to save your changes? main - + Pattern making program. Программа создания выкроек. diff --git a/src/app/share/translations/valentina_uk_UA.ts b/src/app/share/translations/valentina_uk_UA.ts index e6f3575a4..bdfea37f3 100644 --- a/src/app/share/translations/valentina_uk_UA.ts +++ b/src/app/share/translations/valentina_uk_UA.ts @@ -147,80 +147,95 @@ ConfigurationPage - + Setup user interface language updated and will be used the next time start Налаштування мови інтерфейсу користувача оновлені і будуть застосовані наступного запуску - + Default unit updated and will be used the next pattern creation Одиниці виміру оновленні і будуть використані при наступному створенні лекала - + Save Зберегти - + Auto-save modified pattern Авто збереження модифіковане лекало - + Interval: Інтервал: - + min хв - + Language Мова - + GUI language Мова інтерфейсу - + Decimal separator parts Розділювач десяткової частини - + With OS options (%1) З параметрами ОС (%1) - + Default unit Одиниця виміру по замовчуванню - + Centimeters Сантиметри - + Millimiters Міліметри - + Inches Дюйми - + Label language Мова назви точки + + + Send crash reports + Надсилати звіти про помилки + + + + Send crash reports (recommended) + Надсилати звіти про помилки (рекомендується) + + + + After each crash Valentina collect information that may help us fix a problem. We do not collect any personal information. Find more about what <a href="https://bitbucket.org/dismine/valentina/wiki/manual/Crash_reports">kind of information</a> we collect. + Після кожного падіння Valentina збирає інформацію яка може допомогти нам у виправленні помилки. Ми не збираємо персональну інформацію користувачів. Дізнатися більше про <a href=https://bitbucket.org/dismine/valentina/wiki/manual/Crash_reports>информацію</a> яку ми збираємо. + With OS options (.) З параметрів ОС (.) @@ -229,7 +244,7 @@ DelTool - + Delete tool Видалити деталь @@ -320,7 +335,7 @@ Розрахунок довжини - + Point label Ім'я точки @@ -330,67 +345,71 @@ Вставте значення в формулу - + <html><head/><body><p>Show full calculation in message box</p></body></html> <html><head/><body><р>Показати повний розрахунок у вікні повідомлення</p></body</html> - + First point Перша точка - + First point of line Перша точка лінії - + Second point Друга точка - + Second point of line Друга точка лінії - + Type of line Тип лінії - + Show line from first point to this point Показати лінію від першої точки до даної - + Size and height Розмір і зріст - - Standard table - Стандартна таблиця + + Measurements + Мірки - + Standard table + Стандартна таблиця + + + Angle of lines Кути ліній - + Hide empty measurements Сховати пусті мірки - + Variables - Click twice to insert into formula Змінні - клікніть двічі для вставки в формулу - + Input data Вхідні данні @@ -399,27 +418,27 @@ Розмір і зріст - + Increments Прибавки - + Length of lines Довжина ліній - + Length of arcs Довжина дуг - + Length of curves Довжина кривих - + Select second point of line Виберіть другу точку лінії @@ -447,8 +466,8 @@ - - + + Calculate value Розрахувати значення @@ -458,8 +477,8 @@ Значення радіусу - - + + <html><head/><body><p>Show full calculation in message box</p></body></html> <html><head/><body><р>Показати повний розрахунок у вікні повідомлення</p></body</html> @@ -473,12 +492,12 @@ Перший кут дуги проти годинникової стрілки - + Insert variable into formula Вставте значення в формулу - + Value of first angle Значення першого кута @@ -491,12 +510,12 @@ Другий кут дуги проти годинникової стрілки - + Insert marked variable into formula Вставити позначену змінну у формулу - + Value of second angle Значення другого кута @@ -525,19 +544,23 @@ Розмір і зріст - + First angle Перший кут - + Second angle Другий кут - Standard table - Стандартна таблиця + Стандартна таблиця + + + + Measurements + Мірки @@ -575,7 +598,7 @@ Змінні - + Value of angle of line. Значення кута лінії. @@ -617,82 +640,86 @@ Розрахувати значення - + <html><head/><body><p>Show full calculation in message box</p></body></html> <html><head/><body><р>Показати повний розрахунок у вікні повідомлення</p></body</html> - + Point label Ім'я точки - + First point Перша точка - + First point of angle Перша точка кута - + Second point Друга точка - + Second point of angle Друга точка кута - + Third point Третя точка - + Third point of angle Третя точка кута - + Type of line Тип лінії - + Show line from second point to this point Показати лінію від першої точки до даної - + Size and height Розмір і зріст - - Standard table - Стандартна таблиця + + Measurements + Мірки - + Standard table + Стандартна таблиця + + + Angle of lines Кут ліній - + Hide empty measurements Сховати пусті мірки - + Variables - Click twice to insert into formula Змінні - клікніть двічі для вставки в формулу - + Input data Вхідні данні @@ -701,36 +728,150 @@ Розмір і зріст - + Increments Прибавки - + Length of lines Довжина ліній - + Length of arcs Довжина дуг - + Length of curves Довжина кривих - + Select second point of angle Виберіть другу точку кута - + Select third point of angle Виберіть третю точку кута + + DialogCurveIntersectAxis + + + Curve intersect axis + Перетин кривої і осі + + + + Angle + Кут + + + + Calculate value + Розрахувати значення + + + + Value of angle + Значення кута + + + + <html><head/><body><p>Show full calculation in message box</p></body></html> + <html><head/><body><р>Показати повний розрахунок у вікні повідомлення</p></body</html> + + + + Axis point + Точка осі + + + + + First point of line + Перша точка лінії + + + + Curve + Крива + + + + Point label + Ім'я точки + + + + Type of line + Тип лінії + + + + Show line from first point to this point + Показати лінію від першої точки до даної + + + + Input data + Вхідні данні + + + + Size and height + Розмір і зріст + + + + Measurements + Мірки + + + + Increments + Прибавки + + + + Length of lines + Довжина ліній + + + + Length of arcs + Довжина дуг + + + + Length of curves + Довжина кривих + + + + Angle of lines + Кути ліній + + + + Hide empty measurements + Сховати пусті мірки + + + + Variables + Змінні + + + + Select axis point + Виберіть точку осі + + DialogCutArc @@ -771,72 +912,76 @@ _ - + <html><head/><body><p>Show full calculation in message box</p></body></html> <html><head/><body><р>Показати повний розрахунок у вікні повідомлення</p></body</html> - + Arc Дуга - + Selected curve Вибрана крива - + Point label Ім'я точки - + Input data Вхідні данні - + Size and height Розмір і зріст - - Standard table - Стандартна таблиця + + Measurements + Мірки - + Standard table + Стандартна таблиця + + + Increments Прибавки - + Length of lines Довжина ліній - + Length of arcs Довжина дуг - + Length of curves Довжина кривих - + Angle of lines Кут ліній - + Hide empty measurements Сховати пусті мірки - + Variables - Click twice to insert into formula Змінні - клікніть двічі для вставки в формулу @@ -881,72 +1026,76 @@ _ - + <html><head/><body><p>Show full calculation in message box</p></body></html> <html><head/><body><р>Показати повний розрахунок у вікні повідомлення</p></body</html> - + Curve Крива - + Selected curve Вибрана крива - + Point label Ім'я точки - + Input data Вхідні данні - + Size and height Розмір і зріст - - Standard table - Стандартна таблиця + + Measurements + Мірки - + Standard table + Стандартна таблиця + + + Increments Прибавки - + Length of lines Довжина ліній - + Length of arcs Довжина дуг - + Length of curves Довжина кривих - + Angle of lines Кут ліній - + Hide empty measurements Сховати пусті мірки - + Variables - Click twice to insert into formula Змінні - клікніть двічі для вставки в формулу @@ -991,72 +1140,76 @@ _ - + <html><head/><body><p>Show full calculation in message box</p></body></html> <html><head/><body><р>Показати повний розрахунок у вікні повідомлення</p></body</html> - + Curve Крива - + Selected curve path Вибрана складна крива - + Point label Ім'я точки - + Input data Вхідні данні - + Size and height Розмір і зріст - - Standard table - Стандартна таблиця + + Measurements + Мірки - + Standard table + Стандартна таблиця + + + Increments Прибавки - + Length of lines Довжина ліній - + Length of arcs Довжина дуг - + Length of curves Довжина кривих - + Angle of lines Кут ліній - + Hide empty measurements Сховати пусті мірки - + Variables - Click twice to insert into formula Змінні - клікніть двічі для вставки в формулу @@ -1065,7 +1218,7 @@ DialogDetail - + Detail Деталь @@ -1075,44 +1228,44 @@ Зміщення по Х - - - + + + cm см - + Bias Y Зміщення по Y - + Options Параметри - + Seam allowance Прибавка на шви - + Delete Видалити - + Name of detail Ім'я деталі - + Width Ширина - + Closed Замкнена @@ -1163,57 +1316,61 @@ _ - + <html><head/><body><p>Show full calculation in message box</p></body></html> <html><head/><body><р>Показати повний розрахунок у вікні повідомлення</p></body</html> - + Input data Вхідні данні - + Size and height Розмір і зріст - Standard table - Стандартна таблиця + Стандартна таблиця - + + Measurements + Мірки + + + Increments Прибавки - + Length of lines Довжина ліній - + Length of arcs Довжина дуг - + Length of curves Довжина кривих - + Angle of lines Кут ліній - + Hide empty measurements Сховати пусті мірки - + Variables Змінні @@ -1236,7 +1393,7 @@ - + Calculate value Розрахувати значення @@ -1246,68 +1403,72 @@ Значення довжини - - + + <html><head/><body><p>Show full calculation in message box</p></body></html> <html><head/><body><р>Показати повний розрахунок у вікні повідомлення</p></body</html> - + Angle Кут - + Value of angle Значення кута - + Base point Базова точка - + First point of line Перша точка лінії - + Point label Ім'я точки - + Type of line Тип лінії - + Show line from first point to this point Показати лінію від першої точки до даної - + Size and height Розмір і зріст - - Standard table - Стандартна таблиця + + Measurements + Мірки - + Standard table + Стандартна таблиця + + + Angle of lines Кут ліній - + Hide empty measurements Сховати пусті мірки - + Variables Змінні @@ -1324,7 +1485,7 @@ Кут - + Input data Вхідні данні @@ -1333,22 +1494,22 @@ Розмір і зріст - + Increments Прибавки - + Length of lines Довжина ліній - + Length of arcs Довжина дуг - + Length of curves Довжина кривих @@ -1365,35 +1526,35 @@ Зріст - + Point label Ім'я точки - + Base point Базова точка - - - - + + + + First point of line Перша точка лінії - + Second point of line Друга точка лінії - + Type of line Тип лінії - + Show line from first point to our point Показати лінію від першої точки до нашої точки @@ -1403,7 +1564,7 @@ Виберість першу точку лінії - + Select second point of line Виберіть другу точку лінії @@ -1417,71 +1578,81 @@ - + Tool Інструмент - + %1 - Base point %1 - Базова точка + - %1_%2 - Line from point %1 to point %2 %1_%2 - Лінія від точки %1 до точки %2 - + %3 - Point along line %1_%2 %3 - Точка вздовж лінії %1_%2 - + %1 - Point of shoulder %1 - точка плеча - + %3 - normal to line %1_%2 %3 - перпендикуляр до лінії %1_%2 - + %4 - bisector of angle %1_%2_%3 %4 - бісектриса кута %1_%2_%3 - + %4 - point of contact of arc with the center in point %1 and line %2_%3 %4 - точка перетину дуги з центром в точці %1 і лінії %2_%3 - + Point of perpendicular from point %1 to line %2_%3 Точка перпендикуляра з точки %1 до лінії %2_%3 - + %1 - point of intersection %2 and %3 %1 - перитину %2 і %3 - + %1 - cut arc with center %2 %1 - розразає дугу з центром в точці %2 - + %1 - cut curve %2_%3 %1 - розрізає криву %2_%3 - + %1 - cut curve path %2 %1 - розрізає складну криву %2 + + + %1 - point of intersection line %2_%3 and axis through point %4 + %1 - точка перетину лінії %2_%3 і осі через точку %4 + + + + %1 - point of intersection curve and axis through point %2 + %1 - точка перетину кривої і осі через точку %2 + %1 - cut curve point %2 %1 - розрізає криву точкою %2 @@ -1491,36 +1662,36 @@ Отримано не правильний тип інструменту. Ігнорується. - + Curve %1_%2 Крива %1_%2 - + %5 - intersection of lines %1_%2 and %3_%4 %5 - перетин ліній %1_%2 і %3_%4 - - - - - + + + + + Can't create record. Не можу створити запис. - + Arc with center in point %1 Дуга з центром в точці %1 - + Curve point %1 Точка кривої %1 - + Triangle: axis %1_%2, points %3 and %4 Трикутник: вісь %1_%2, точки %3 і %4 @@ -1609,7 +1780,7 @@ - + Description Опис @@ -1680,53 +1851,83 @@ - - + + File error. Помилка файла. - + male чоловік - + female жінка - + + Could not save GivenName + Не вдалося зебрегти імя + + + + Could not save FamilyName + Не вдалося збергети прізвище + + + + Could not save Email + Не вдалося зберегти Email + + + + Could not save Sex + Не вдалося зберегти стать + + + + Could not save BirthDate + Не вдалося зберегти Дату народження + + + Measurements use different units than pattern. This pattern required measurements in %1 Мірки використовують інші одиниці виміри ніж лекало. Це лекало потребує мірок в %1 - + Individual measurements (*.vit) Індивідуальні мірки (*.vit) - - + + Open file Відкрити файл - - + + Wrong units. Неправильні одиниці виміру. - + Standard measurements (*.vst) Стандартні мірки (*.vst) - + Name_%1 Name_%1 + + + Can't save measurement + Не вдалося зберегти мірки + Can't convert toDouble value. Не можу конвертувати toDouble значення. @@ -1805,39 +2006,39 @@ Будь ласка спробуйте знову чи змініть файл - - + + File error. Помилка файла. - - + + Individual measurements (*.vit) Індивідуальні мірки (*.vit) - + Open file Відкрити файл - + Where save measurements? Де зберегти мірки? - + Centimeters Сантиметри - + Millimiters Міліметри - + Inches Дюйми @@ -1850,22 +2051,22 @@ Лінія - + First point Перша точка - + Second point Друга точка - + Type of line Тип лінії - + Show line from first point to this point Показати лінію від першої точки до даної @@ -1919,16 +2120,141 @@ Виберіть другу точка першої лінії - + Select first point of second line Виберіть першу точку другої лінії - + Select second point of second line Виберіть другу точку другої лінії + + DialogLineIntersectAxis + + + Line intersect axis + Перетин лінії і осі + + + + Angle + Кут + + + + Calculate value + Розрахувати значення + + + + Value of angle + Значення кута + + + + <html><head/><body><p>Show full calculation in message box</p></body></html> + <html><head/><body><р>Показати повний розрахунок у вікні повідомлення</p></body</html> + + + + Axis point + Точка осі + + + + + + First point of line + Перша точка лінії + + + + First line point + Перша точка лінії + + + + Second line point + Друга точка лінії + + + + Point label + Ім'я точки + + + + Type of line + Тип лінії + + + + Show line from first point to this point + Показати лінію від першої точки до даної + + + + Input data + Вхідні данні + + + + Size and height + Розмір і зріст + + + + Measurements + Мірки + + + + Increments + Прибавки + + + + Length of lines + Довжина ліній + + + + Length of arcs + Довжина дуг + + + + Length of curves + Довжина кривих + + + + Angle of lines + Кути ліній + + + + Hide empty measurements + Сховати пусті мірки + + + + Variables + Змінні + + + + Select second point of line + Виберіть другу точку лінії + + + + Select axis point + Виберіть точку осі + + DialogMeasurements @@ -1937,27 +2263,27 @@ Мірки - + <html><head/><body><p><span style=" font-size:18pt;">Please, choose pattern type.</span></p></body></html> <html><head/><body><p><span style=" font-size:18pt;">Будь ласка, виберіть тип лекала.</span></p></body></html> - + Graduation Градація - + Use for creation pattern standard measurement table Лекало зі стандартною таблицею - + Individual Індивідуальні - + Use for creation pattern individual measurements Лекало з індивідуальними мірками @@ -1980,25 +2306,30 @@ Значення довжини - + First point Перша точка - + Second point Друга точка - + Additional angle degrees Додатковий кут градуси - + Input data Вхідні данні + + + Measurements + Мірки + Size and growth Розмір і зріст @@ -2013,7 +2344,7 @@ Розрахувати значення - + Point label Ім'я точки @@ -2023,67 +2354,66 @@ Вставте змінну в формулу - + <html><head/><body><p>Show full calculation in message box</p></body></html> <html><head/><body><р>Показати повний розрахунок у вікні повідомлення</p></body</html> - + Type of line Тип лінії - + Show line from first point to this point Показати лінію від першої точки до даної - + Size and height Розмір і зріст - Standard table - Стандартна таблиця + Стандартна таблиця - + Increments Прибавки - + Length of lines Довжини ліній - + Length of arcs Довжини дуг - + Length of curves Довжини кривих - + Angle of lines Кут ліній - + Hide empty measurements Сховати пусті мірки - + Variables - Click twice to insert into formula Змінні - клікніть двічі для вставки в формулу - + Select second point of line Виберіть другу точку лінії @@ -2324,12 +2654,12 @@ Значення радіусу - + <html><head/><body><p>Show full calculation in message box</p></body></html> <html><head/><body><р>Показати повний розрахунок у вікні повідомлення</p></body</html> - + Center of arc Центер дуги @@ -2343,7 +2673,7 @@ Розрахувати значення - + Point label Ім'я точки @@ -2353,17 +2683,17 @@ Вставте змінну в формулу - + Top of the line Початок лінії - + End of the line Кінець лінії - + Input data Вхідні данні @@ -2372,58 +2702,62 @@ Розмір і зріст - Standard table - Стандартна таблиця + Стандартна таблиця - + Angle of lines Кут ліній - + Hide empty measurements Сховати пусті мірки - + Variables - Click twice to insert into formula. Змінні - клікніть двічі для вставки в формулу. - + Increments Прибавки - + Size and height Розмір і зріст - + + Measurements + Мірки + + + Length of lines Довжини ліній - + Length of arcs Довжини дуг - + Length of curves Довжини кривих - + Select second point of line Виберіть другу точку лінії - - + + Select point of center of arc Виберіть точку центру дуги @@ -2440,17 +2774,17 @@ Ім'я точки - + vertical point Точка по вертикалі - + horizontal point Точка по горизонталі - + First point of angle Перша точка кута @@ -2460,7 +2794,7 @@ Точка перетину - + Second point of angle Друга точка кута @@ -2497,7 +2831,7 @@ Розрахувати значення - + Point label Ім'я точки @@ -2507,37 +2841,37 @@ Вставте значення в формулу - + <html><head/><body><p>Show full calculation in message box</p></body></html> <html><head/><body><р>Показати повний розрахунок у вікні повідомлення</p></body</html> - + First point Перша точка - + Second point Друга точка - + Third point - Третя точка + Третя точка - + Type of line Тип лінії - + Show line from first point to our point Показати лінію від першої точки до нашої точки - + Input data Вхідні данні @@ -2546,57 +2880,61 @@ Розмір і зріст - Standard table - Стандартна таблиця + Стандартна таблиця - + Angle of lines Кут ліній - + Hide empty measurements Сховати пусті мірки - + Variables - Click twice to insert into formula Змінні - клікніть двічі для вставки в формулу - + Increments Прибавки - + Size and height Розмір і зріст - + + Measurements + Мірки + + + Length of lines Довжини лінії - + Length of arcs Довжина дуг - + Length of curves Довжни кривих - + Select first point of line Виберість першу точку лінії - + Select second point of line Виберіть другу точку лінії @@ -2689,8 +3027,12 @@ DialogSplinePath - Curve path + Складна крива + + + + Curved path Складна крива @@ -2776,11 +3118,11 @@ Не можу знайти точку за ім'ям - - - - - + + + + + Error Помилка @@ -2809,42 +3151,42 @@ Не можу знайти об'єкт за ім'ям - + Empty field Пусте поле - + Value can't be 0 Значення не може бути 0 - + Value Значення - + Height Зріст - + Size Розмір - + Line length Довжина лінії - + Arc length Довжина дуги - + Curve length Довжина кривої @@ -2866,30 +3208,30 @@ Ім'я точки - + First point of axis Перша точка вісі - - - - + + + + First point of line Перша точка лінії - + Second point of axis Друга точка вісі - + First point Перша точка - + Second point Друга точка @@ -2899,12 +3241,12 @@ Виберіть другу точку вісі - + Select first point Виберість першу точку - + Select second point Виберіть другу точку @@ -2982,151 +3324,151 @@ Functions - + sin sine function sin - + cos cosine function cos - + tan tangens function tan - + asin arcus sine function asin - + acos arcus cosine function acos - + atan arcus tangens function atan - + sinh hyperbolic sine function sinh - + cosh hyperbolic cosine cosh - + tanh hyperbolic tangens function tanh - + asinh hyperbolic arcus sine function asibh - + acosh hyperbolic arcus tangens function acosh - + atanh hyperbolic arcur tangens function atanh - + log2 logarithm to the base 2 log2 - + log10 logarithm to the base 10 log10 - + log logarithm to the base 10 log - + ln logarithm to base e (2.71828...) ln - + exp e raised to the power of x exp - + sqrt square root of a value sqrt - + sign sign function -1 if x<0; 1 if x>0 sign - + rint round to nearest integer rint - + abs absolute value abs - + min min of all arguments min - + max max of all arguments max - + sum sum of all arguments sum - + avg mean value of all arguments avg @@ -3197,12 +3539,12 @@ Інструмент трикутник. - + Tools for creating lines. Інструменти для створення ліній. - + Line Лінія @@ -3215,12 +3557,12 @@ Інструмент точка перетину ліній. - + Tools for creating curves. Інструменти для створення кривих. - + Curve Крива @@ -3233,12 +3575,12 @@ Інструмент складна крива. - + Tools for creating arcs. Інструменти для створення дуг. - + Arc Дуга @@ -3247,17 +3589,17 @@ Інструмент дуга. - + Tools for creating details. Інструменти для створення деталей. - + Detail Деталь - + Tool new detail. Інструмент нова деталь. @@ -3274,23 +3616,23 @@ Креслення - + Details mode Режим деталей - - + + Pointer tools Інструмент вказівник - + New pattern piece Нове креслення - + Add new pattern piece Додати нове креслення @@ -3305,122 +3647,134 @@ Інструменд для створення точки з двух х и у координат двух інших точок. - + Line between points Лінія між двома точками - + Point at line intersection Точка перетину ліній - + Curve tool. Інструмент крива. - + Tool for path curve. Інструмент складна крива. - + Tool segment a pathed curve. Інструмент розрізання складної кривої. - + Tool for segmenting a curve. Інструмент розрізання кривої. - + + Point of intersection line and axis + Точка на перетині лінії і осі + + + + + + ... + ... + + + Arc tool. Інструмент дуга. - + Cut arc tool. Інструмент розрізання дуги. - + Tool for union two details. Інструмент обєднання двух деталей. - + &File &Файл - + &Help &Допомога - + &Pattern piece &Креслення - + New Новий - + &New &Новий - + Create a new pattern Створити нове лекало - + Ctrl+N Ctrl+N - + Open Відкрити - + &Open &Відкрити - + Open file with pattern Відкрити файл з лекалами - + Save Зберегти - + &Save &Зберегти - + Save pattern Зберегти лекало - + Ctrl+S Ctrl+S - + Save &As... Зберегти &як... @@ -3429,157 +3783,192 @@ Нашатування... - + Pattern properties Властивості лекала - + Save as Зберегти як - + Measurements Мірки - + + Window + Вікно + + + Toolbar files Панель інструментів файли - + ToolBar modes Панель інструментів режими - + Toolbar pattern Панель інструметнів лекала - + Toolbar options Панель інструментів налаштування - + Toolbar tools Панель інструментів - + Tool options Параметри інструментів - + Save not yet saved pattern Зберегти ще не збережене лекало - + Ctrl+Shift+S Ctrl+Shift+S - + Draw Малювання - + Draw mode Режим малювання - + Ctrl+W Ctrl+W - + Details Деталь - + Ctrl+E Ctrl+E - + Ctrl+Shift+N Ctrl+Shift+N - - + + Change the label of pattern piece Змінити ім'я креслення - + Export pattern (layout) Експорт креслення (розкладка) - + About &Qt Про &Qt - + &About Valentina &Про Valentina - + E&xit &Вихід - + Exit the application Закрити програму - + Ctrl+Q Ctrl+Q - + Preferences Властивості - + Zoom in Збільшити - + Original zoom Початковий масштаб - + Original Zoom Початковий масштаб - + Zoom fit best Помістити все + + + Ctrl+= + Ctrl+= + + + + Stop + Зупинити + + + + Stop using tool + Зупинити використання інструменту + + + + Repot Bug... + Повідомити про помилку... + + + + Report bug + Повідомити про помилку + + + + Close window + Закрити вікно + Zoom In Збільшити - + zoom in наблизити @@ -3588,13 +3977,13 @@ Зменшити - - + + Zoom out Зменшити - + Edit pattern XML code Редагувати XML код креслення @@ -3607,27 +3996,27 @@ Інструмент вказівник - + Table of variables Таблиця змінних - + Tables of variables Таблиці змінних - + Ctrl+T Ctrl+T - + History Історія - + Ctrl+H Ctrl+H @@ -3636,17 +4025,17 @@ Розкладки - + Create layout Створити розкладку - + Ctrl+L Ctrl+L - + About Qt Про Qt @@ -3675,14 +4064,14 @@ Помилка збереження змін!!! - - - + + + Select point Виберість точку - + Select first point Виберіть першу точку @@ -3691,103 +4080,136 @@ Виберіть точку плеча - - + + Individual measurements is under development + Індивідуальні мірки знаходяться в стадії розробки + + + + There is no way create individual measurements file independent on the pattern file. +For opening pattern need keep both files: pattern and measurements. Do you want continue? + У вас не буде можливості створити файл індивідуальних мірок незалежно від файлу викройки. +Для того щоб відкрити файл викройки зберігайте обидва файли: викройку і індивідуальні мірки. Ви хочете продовжити створення? + + + + + Select first point of line Виберіть першу точку лінії - + Select first point of angle Виберіть першу точку кута - + Select first point of first line Виберіть першу точку першої лінії - + Select first point curve Виберіть першу точку кривої - + Select point of center of arc Виберіть точку центру дуги - + Select point of curve path Виберіть точку складної кривої - + + Select curve + Вибрати криву + + + Size: Розмір: - + pattern Лекало - + Critical error! Критична помилка! - + Error parsing file (std::bad_alloc). Помилка парсінгу файлу (std::bad_alloc). - + Bad id. Поганий id. - + + Could not save file + Не вдалося зберегти файл + + + &Undo &Відмінити - + &Redo &Повторити - + Wrong units. Неправильні одиниці виміру. - + Application doesn't support standard table with inches. Програма не підтримує стандарнту таблицю з дюймами. - + File error. Помилка файла. - + + Valentina didn't shut down correctly. Do you want reopen files (%1) you had open? + Валентина не була закрита правильно. Ви хочете знову відкрити ці файли (%1)? + + + + Reopen files. + Відкрити знову файли. + + + The measurements file <br/><br/> <b>%1</b> <br/><br/> %3 Файл мірок <br/><br/> <b>%1</b> <br/><br/> %3 - + could not be found. Do you want to update the file location не може бути знайдений. Ви хочете оновити шлях до файлу - + Standard measurements (*.vst) Стандартні мірки (*.vst) - + Individual measurements (*.vit) Індивідуальні мірки (*.vit) @@ -3804,12 +4226,12 @@ Помилка. Креслення з таким імям уже існує. - + Pattern piece: Креслення: - + Enter a new label for the pattern piece. Введить нове ім'я для креслення. @@ -3854,8 +4276,8 @@ Помилка збереження файлу. Не можу зберегти файл. - - + + Open file Відкрити файл @@ -3896,12 +4318,12 @@ Помилка! - + Select points, arcs, curves clockwise. Виберіть точки, дуги, криві загодинниковою стрілкою. - + Pattern piece %1 Креслення %1 @@ -3910,37 +4332,37 @@ Помилка створення лекала з ім'ям - + Select simple curve Виберіть просту криву - + Select curve path Виберіть складну криву - + Select base point Виберіть базову точку - + Select first point of axis Виберіть першу точку вісі - + Select point vertically Виберіть точку по вертикалі - + Select detail Виберіть деталь - + Select arc Виберіть дугу @@ -3953,28 +4375,28 @@ Зібрано %3 в %4 - + Height: Зріст: - + Pattern Piece: Креслення: - - + + Pattern files (*.val) Файл лекала (*.val) - + /pattern.val /викрійка.val - + File saved Файл збережено @@ -3983,17 +4405,17 @@ Не можу зберегти лекало - + untitled.val безімений.val - + Unsaved change Незбережені зміни - + The pattern has been modified. Do you want to save your changes? Лекало було змінено. Ви хочете зберегти ваші зміни? @@ -4008,7 +4430,7 @@ Do you want to save your changes? Не можу прочитати файл%1:\n%2. - + File loaded Файл завантажено @@ -4029,24 +4451,24 @@ Do you want to save your changes? Не можу відкрити файл викрійки. Ім'я файлу пусте - - + + Error parsing file. Помилка парсингу файла. - + Error can't convert value. Помилка, не можу конвертувати значення. - - + + Error empty parameter. Помилка, пустий параметр. - + Error wrong id. Помикла, неправильний id. @@ -4070,511 +4492,511 @@ Do you want to save your changes? Measurements - + head_girth Short measurement name. Don't use math symbols in name!!!! Огол - + mid_neck_girth Short measurement name. Don't use math symbols in name!!!! mid_neck_girth - + neck_base_girth Short measurement name. Don't use math symbols in name!!!! Ош - + head_and_neck_length Short measurement name. Don't use math symbols in name!!!! head_and_neck_length - + center_front_waist_length Short measurement name. Don't use math symbols in name!!!! Дпт - + center_back_waist_length Short measurement name. Don't use math symbols in name!!!! Дтс - + shoulder_length Short measurement name. Don't use math symbols in name!!!! Шп - + side_waist_length Short measurement name. Don't use math symbols in name!!!! Дб - + trunk_length Short measurement name. Don't use math symbols in name!!!! trunk_length - + shoulder_girth Short measurement name. Don't use math symbols in name!!!! shoulder_girth - + upper_chest_girth Short measurement name. Don't use math symbols in name!!!! ОгI - + bust_girth Short measurement name. Don't use math symbols in name!!!! ОгII - + under_bust_girth Short measurement name. Don't use math symbols in name!!!! ОгIII - + waist_girth Short measurement name. Don't use math symbols in name!!!! От - + high_hip_girth Short measurement name. Don't use math symbols in name!!!! high_hip_girth - + hip_girth Short measurement name. Don't use math symbols in name!!!! Об - + upper_front_chest_width Short measurement name. Don't use math symbols in name!!!! Шг1 - + front_chest_width Short measurement name. Don't use math symbols in name!!!! Шг2 - + across_front_shoulder_width Short measurement name. Don't use math symbols in name!!!! dпл - + across_back_shoulder_width Short measurement name. Don't use math symbols in name!!!! across_back_shoulder_width - + upper_back_width Short measurement name. Don't use math symbols in name!!!! upper_back_width - + back_width Short measurement name. Don't use math symbols in name!!!! Шс - + bustpoint_to_bustpoint Short measurement name. Don't use math symbols in name!!!! Цг - + halter_bustpoint_to_bustpoint Short measurement name. Don't use math symbols in name!!!! halter_bustpoint_to_bustpoint - + neck_to_bustpoint Short measurement name. Don't use math symbols in name!!!! Вг - + crotch_length Short measurement name. Don't use math symbols in name!!!! crotch_length - + rise_height Short measurement name. Don't use math symbols in name!!!! Дпс - + shoulder_drop Short measurement name. Don't use math symbols in name!!!! shoulder_drop - + shoulder_slope_degrees Short measurement name. Don't use math symbols in name!!!! shoulder_slope_degrees - + front_shoulder_slope_length Short measurement name. Don't use math symbols in name!!!! front_shoulder_slope_length - + back_shoulder_slope_length Short measurement name. Don't use math symbols in name!!!! back_shoulder_slope_length - + front_shoulder_to_waist_length Short measurement name. Don't use math symbols in name!!!! front_shoulder_to_waist_length - + back_shoulder_to_waist_length Short measurement name. Don't use math symbols in name!!!! back_shoulder_to_waist_length - + front_neck_arc Short measurement name. Don't use math symbols in name!!!! front_neck_arc - + back_neck_arc Short measurement name. Don't use math symbols in name!!!! back_neck_arc - + front_upper_chest_arc Short measurement name. Don't use math symbols in name!!!! front_upper_chest_arc - + back_upper_chest_arc Short measurement name. Don't use math symbols in name!!!! back_upper_chest_arc - + front_waist_arc Short measurement name. Don't use math symbols in name!!!! front_waist_arc - + back_waist_arc Short measurement name. Don't use math symbols in name!!!! back_waist_arc - + front_upper_hip_arc Short measurement name. Don't use math symbols in name!!!! front_upper_hip_arc - + back_upper_hip_arc Short measurement name. Don't use math symbols in name!!!! back_upper_hip_arc - + front_hip_arc Short measurement name. Don't use math symbols in name!!!! front_hip_arc - + back_hip_arc Short measurement name. Don't use math symbols in name!!!! back_hip_arc - + chest_slope Short measurement name. Don't use math symbols in name!!!! chest_slope - + back_slope Short measurement name. Don't use math symbols in name!!!! back_slope - + front_waist_slope Short measurement name. Don't use math symbols in name!!!! front_waist_slope - + back_waist_slope Short measurement name. Don't use math symbols in name!!!! back_waist_slope - + front_neck_to_upper_chest_height Short measurement name. Don't use math symbols in name!!!! front_neck_to_upper_chest_height - + front_neck_to_bust_height Short measurement name. Don't use math symbols in name!!!! front_neck_to_bust_height - + front_waist_to_upper_chest Short measurement name. Don't use math symbols in name!!!! Дпер - + front_waist_to_lower_breast Short measurement name. Don't use math symbols in name!!!! Дпг - + back_waist_to_upper_chest Short measurement name. Don't use math symbols in name!!!! Дст - + strap_length Short measurement name. Don't use math symbols in name!!!! Дбр - + armscye_girth Short measurement name. Don't use math symbols in name!!!! armscye_girth - + elbow_girth Short measurement name. Don't use math symbols in name!!!! Олк - + upper_arm_girth Short measurement name. Don't use math symbols in name!!!! Оп - + wrist_girth Short measurement name. Don't use math symbols in name!!!! Озап - + scye_depth Short measurement name. Don't use math symbols in name!!!! scye_depth - + shoulder_and_arm_length Short measurement name. Don't use math symbols in name!!!! Дзап - + underarm_length Short measurement name. Don't use math symbols in name!!!! Втр - + cervicale_to_wrist_length Short measurement name. Don't use math symbols in name!!!! cervicale_to_wrist_length - + shoulder_to_elbow_length Short measurement name. Don't use math symbols in name!!!! Дрлок - + arm_length Short measurement name. Don't use math symbols in name!!!! Дрзап - + hand_width Short measurement name. Don't use math symbols in name!!!! hand_width - + hand_length Short measurement name. Don't use math symbols in name!!!! hand_length - + hand_girth Short measurement name. Don't use math symbols in name!!!! Окис - + thigh_girth Short measurement name. Don't use math symbols in name!!!! Обед - + mid_thigh_girth Short measurement name. Don't use math symbols in name!!!! mid_thigh_girth - + knee_girth Short measurement name. Don't use math symbols in name!!!! Ок - + calf_girth Short measurement name. Don't use math symbols in name!!!! Ои - + ankle_girth Short measurement name. Don't use math symbols in name!!!! Ощ - + knee_height Short measurement name. Don't use math symbols in name!!!! Вк - + ankle_height Short measurement name. Don't use math symbols in name!!!! ankle_height - + foot_width Short measurement name. Don't use math symbols in name!!!! foot_width - + foot_length Short measurement name. Don't use math symbols in name!!!! foot_length - + height Short measurement name. Don't use math symbols in name!!!! Р - + cervicale_height Short measurement name. Don't use math symbols in name!!!! Вшт - + cervicale_to_knee_height Short measurement name. Don't use math symbols in name!!!! cervicale_to_knee_height - + waist_height Short measurement name. Don't use math symbols in name!!!! Влт - + high_hip_height Short measurement name. Don't use math symbols in name!!!! high_hip_height - + hip_height Short measurement name. Don't use math symbols in name!!!! hip_height - + waist_to_hip_height Short measurement name. Don't use math symbols in name!!!! waist_to_hip_height - + waist_to_knee_height Short measurement name. Don't use math symbols in name!!!! waist_to_knee_height - + crotch_height Short measurement name. Don't use math symbols in name!!!! Дн - + size Short measurement name. Don't use math symbols in name!!!! Сг @@ -4590,289 +5012,289 @@ Do you want to save your changes? Розмір - + height_front_neck_base_point Short measurement name. Don't use math symbols in name!!!! Втос - + height_base_neck_side_point Short measurement name. Don't use math symbols in name!!!! Втош - + height_shoulder_point Short measurement name. Don't use math symbols in name!!!! Впт - + height_nipple_point Short measurement name. Don't use math symbols in name!!!! Вст - + height_back_angle_axilla Short measurement name. Don't use math symbols in name!!!! Взу - + height_scapular_point Short measurement name. Don't use math symbols in name!!!! Влоп - + height_under_buttock_folds Short measurement name. Don't use math symbols in name!!!! Впс - + hips_excluding_protruding_abdomen Short measurement name. Don't use math symbols in name!!!! ОбI - + girth_foot_instep Short measurement name. Don't use math symbols in name!!!! Ос - + side_waist_to_floor Short measurement name. Don't use math symbols in name!!!! Дсб - + front_waist_to_floor Short measurement name. Don't use math symbols in name!!!! Дсп - + arc_through_groin_area Short measurement name. Don't use math symbols in name!!!! Дпоб - + waist_to_plane_seat Short measurement name. Don't use math symbols in name!!!! Вс - + neck_to_radial_point Short measurement name. Don't use math symbols in name!!!! Длуч - + neck_to_third_finger Short measurement name. Don't use math symbols in name!!!! ДIIIп - + neck_to_first_line_chest_circumference Short measurement name. Don't use math symbols in name!!!! Впрп - + front_waist_length Short measurement name. Don't use math symbols in name!!!! Дтп - + arc_through_shoulder_joint Short measurement name. Don't use math symbols in name!!!! Дп - + neck_to_back_line_chest_circumference Short measurement name. Don't use math symbols in name!!!! Впрз - + waist_to_neck_side Short measurement name. Don't use math symbols in name!!!! ДтсI - + arc_length_upper_body Short measurement name. Don't use math symbols in name!!!! Двчт - + chest_width Short measurement name. Don't use math symbols in name!!!! Шг - + anteroposterior_diameter_hands Short measurement name. Don't use math symbols in name!!!! dпзр - + height_clavicular_point Short measurement name. Don't use math symbols in name!!!! Вкт - + height_armhole_slash Short measurement name. Don't use math symbols in name!!!! Впрк - + slash_shoulder_height Short measurement name. Don't use math symbols in name!!!! Впк - + half_girth_neck Short measurement name. Don't use math symbols in name!!!! Сш - + half_girth_neck_for_shirts Short measurement name. Don't use math symbols in name!!!! Сш1 - + half_girth_chest_first Short measurement name. Don't use math symbols in name!!!! СгI - + half_girth_chest_second Short measurement name. Don't use math symbols in name!!!! СгII - + half_girth_chest_third Short measurement name. Don't use math symbols in name!!!! СгIII - + half_girth_waist Short measurement name. Don't use math symbols in name!!!! Ст - + half_girth_hips_considering_protruding_abdomen Short measurement name. Don't use math symbols in name!!!! Сб - + half_girth_hips_excluding_protruding_abdomen Short measurement name. Don't use math symbols in name!!!! СбI - + girth_knee_flexed_feet Short measurement name. Don't use math symbols in name!!!! Окс - + neck_transverse_diameter Short measurement name. Don't use math symbols in name!!!! dш - + front_slash_shoulder_height Short measurement name. Don't use math symbols in name!!!! Впкп - + neck_to_front_waist_line Short measurement name. Don't use math symbols in name!!!! Дтн1 - + hand_vertical_diameter Short measurement name. Don't use math symbols in name!!!! dвр - + neck_to_knee_point Short measurement name. Don't use math symbols in name!!!! Дшк - + waist_to_knee Short measurement name. Don't use math symbols in name!!!! Дтк - + shoulder_height Short measurement name. Don't use math symbols in name!!!! Вп - + head_height Short measurement name. Don't use math symbols in name!!!! Вгол - + body_position Short measurement name. Don't use math symbols in name!!!! Пкор - + arc_behind_shoulder_girdle Short measurement name. Don't use math symbols in name!!!! Дпз - + neck_to_neck_base Short measurement name. Don't use math symbols in name!!!! Дшош - + depth_waist_first Short measurement name. Don't use math symbols in name!!!! Гт1 - + depth_waist_second Short measurement name. Don't use math symbols in name!!!! ГтII @@ -4881,211 +5303,211 @@ Do you want to save your changes? MeasurementsDescriptions - + Around fullest part of Head Full measurement description Обхват голови - + Around middle part of Neck Full measurement description Навколо середньої частини шиї - + Around Neck at base Full measurement description Обхват шиї - + Vertical Distance from Crown to Nape Full measurement description Вертикальна відстань від тімені до затилку - + Front Neck Center over tape at Bustline to Front Waist Center Full measurement description Довжина переду до талії - + Back Neck Center to Back Waist Center Full measurement description Довжина спини до талії з урахуванням виступу лопаток - + NeckPoint to ShoulderTip Full measurement description Довжина плечового скату - + Armpit to Waist side Full measurement description Довжина бокової частини - + Around Body from middle of Shoulder length to BustPoint to Crotch up back to beginning point Full measurement description Around Body from middle of Shoulder length to BustPoint to Crotch up back to beginning point - + Around Arms and Torso, at bicep level parallel to floor, with arms hanging at the sides Full measurement description Around Arms and Torso, at bicep level parallel to floor, with arms hanging at the sides - + Around Chest at Armfold level, will be parallel to floor across back, will not be parallel to floor across front chest Full measurement description Обхват грудей перший - + Around fullest part of Bust, parallel to floor Full measurement description Обхват грудей другий - + Around Chest below the Bust, parallel to floor Full measurement description Обхват грудей третій - + Tie a string around smallest part of waist, keep string tied while taking meaasurements. Not usually parallel to floor for front waist or back waist. Full measurement description Обхват талії. - + Around HighHip, parallel to floor Full measurement description Around HighHip, parallel to floor - + Around Hip, parallel to floor Full measurement description Обхват стегон з урахуванням виступу живота - + Across Front UpperChest, smallest width from armscye to armscye Full measurement description Ширина грудей перша - + Across Front Chest, from armfold to armfold Full measurement description Ширина грудей друга - + From ShoulderTip to ShoulderTip, across Front Full measurement description Плечовий діаметр - + From ShoulderTip to ShoulderTip, across Back Full measurement description Around HighHip, parallel to floor - + Across Back UpperChest, smallest width from armscye to armscye Full measurement description Across Back UpperChest, smallest width from armscye to armscye - + Across Back Chest, from armfold to armfold Full measurement description Ширина спини - + Distance between BustPoints, across Chest Full measurement description Відстань між сосковими точками - + Distance from Bustpoint, behind neck, down to Bustpoint Full measurement description Distance from Bustpoint, behind neck, down to Bustpoint - + From NeckPoint to BustPoint Full measurement description Відстань від точки основи шиї збоку до соскової точки (висота грудей) - + From Front Waist Center, down to crotch, up to Back Waist Center Full measurement description From Front Waist Center, down to crotch, up to Back Waist Center - + Sit on hard chair, measure from side waist straight down to chair bottom Full measurement description Відстань від лінії талії до під сідничної складки - + Vertical Distance from NeckPoint level to ShoulderTip level Full measurement description Vertical Distance from NeckPoint level to ShoulderTip level - + Degrees of angle from NeckPoint to ShoulderTip – requires goniometer Full measurement description Degrees of angle from NeckPoint to ShoulderTip – requires goniometer - + ShoulderTip to Front Waist Center Full measurement description ShoulderTip to Front Waist Center - + ShoulderTip to Back Waist Center Full measurement description ShoulderTip to Back Waist Center - + NeckPoint straight down front chest to Waistline Full measurement description NeckPoint straight down front chest to Waistline - + Back NeckPoint straight down back chest to Waistline Full measurement description Back NeckPoint straight down back chest to Waistline - + NeckPoint to NeckPoint through Front Neck Center Full measurement description NeckPoint to NeckPoint through Front Neck Center - + NeckPoint to NeckPoint across Nape Full measurement description NeckPoint to NeckPoint across Nape @@ -5096,589 +5518,589 @@ Do you want to save your changes? front_upper-bust_arc - + Front upper-bust arc Full measurement description Front upper-bust arc - + Back UpperBust side to side Full measurement description Back UpperBust side to side - + Front Waist side to side Full measurement description Front Waist side to side - + Back Waist side to side Full measurement description Back Waist side to side - + Front UpperHip side to side Full measurement description Front UpperHip side to side - + Back UpperHip side to side Full measurement description Back UpperHip side to side - + Front Hip side to side Full measurement description Front Hip side to side - + Back Hip side to side Full measurement description Back Hip side to side - + NeckPoint to Front ArmfoldPoint Full measurement description NeckPoint to Front ArmfoldPoint - + NeckPoint to Back ArmfoldPoint Full measurement description NeckPoint to Back ArmfoldPoint - + NeckPoint across Front Chest to Waist side Full measurement description NeckPoint across Front Chest to Waist side - + NeckPoint across Back Chest to Waist side Full measurement description NeckPoint across Back Chest to Waist side - + Front Neck Center straight down to UpperChest line Full measurement description Front Neck Center straight down to UpperChest line - + Front Neck Center straight down to Bust line Full measurement description Front Neck Center straight down to Bust line - + Front Upper chest waist Full measurement description Довжина переду від лінії талії вгору по центру до початку ложбини - + Front waist to lower breast Full measurement description Довжина від талії до основи грудних залоз - + Back waist to upper chest Full measurement description Довжина спинки по спині від лінії талії вверх до виступаючого кута лопатки - + Strap length Full measurement description Довжина бретелі від виступаючого куточка лопатки вертикально до початку грудної залози - + Around Armscye Full measurement description Around Armscye - + Around Elbow with elbow bent Full measurement description Обхват локтя - + Around UpperArm Full measurement description Обхват плеча - + Around Wrist Full measurement description Обхват зап'ястя - + Nape straight down to UnderBust line (same as Back UpperBust height) Full measurement description Nape straight down to UnderBust line (same as Back UpperBust height) - + NeckPoint to ShoulderTip to Wrist, with elbow bent and hand on hip Full measurement description Відстань від точки основи шиї збоку до лінії обхвату зап'ястя - + Armpit to Wrist, with arm straight and hanging at side Full measurement description Внутрішня довжина рукава (з окатом) - + Nape to Wrist, with elbow bent and hand on hip Full measurement description Nape to Wrist, with elbow bent and hand on hip - + ShoulderTip to Elbow, with elbow bent and hand on hip Full measurement description Довжина руки до локтя - + ShoulderTip to Wrist, with elbow bent and hand on hip Full measurement description Довжина рукава до лінії обхвату зап'ястя - + Hand side to side Full measurement description Рука з боку в бік - + Hand Middle Finger tip to wrist Full measurement description Hand Middle Finger tip to wrist - + Around Hand Full measurement description Обхват кисті - + Around Thigh Full measurement description Обхват стегна - + Around MidThigh Full measurement description Around MidThigh - + Around Knee Full measurement description Обхват коліна - + Around Calf Full measurement description Обхват ікри - + Around Ankle Full measurement description Обхват щиколотки - + Knee to Floor Full measurement description Висота колінної точки - + Ankle to Floor Full measurement description Ankle to Floor - + Widest part of Foot side to side Full measurement description Widest part of Foot side to side - + Tip of Longest Toe straight to back of heel Full measurement description Кінчик довгого пальця прямо до задньої частини каблука - + Top of head to floor Full measurement description Верх голови до підлоги - + Nape to Floor Full measurement description Висота точки основи шиї ззаду - + Nape to Knee Full measurement description Довжина з потилицю до коліна - + Waist side to floor Full measurement description Висота лінії талії - + HighHip side to Floor Full measurement description HighHip side to Floor - + Hip side to Floor Full measurement description Бічна сторона ступні - + Waist side to Hip Full measurement description Waist side to Hip - + Waist side to Knee Full measurement description Waist side to Knee - + Crotch to Floor along inside leg Full measurement description Довжина ноги по внутрішній поверхні - + Size Full measurement description Розмір - + Height of the point base of the neck in front Full measurement description Висота точки основи шиї спереду - + Height of the base of the neck side point Full measurement description Висота точки основи шиї збоку - + The height of the shoulder point Full measurement description Висота плечової точки - + Height nipple point Full measurement description Висота соскової точки - + Height back angle axilla Full measurement description Висота заднього кута пахвової западини - + Height scapular point Full measurement description Висота лопаточной точки - + Height under buttock folds Full measurement description Висота під сідничної складки - + Hips excluding protruding abdomen Full measurement description Обхват стегон без урахування виступу живота - + Girth foot instep Full measurement description Обхват підйому стопи - + The distance from the side waist to floor Full measurement description Відстань від лінії талії до підлоги збоку - + The distance from the front waist to floor Full measurement description Відстань від лінії талії до підлоги спереду - + Arc through groin area Full measurement description Дуга через пахову область - + The distance from the waist to the plane seat Full measurement description Відстань від лінії талії до площини сидіння - + The distance from the base of the neck to the side of the radial point Full measurement description Відстань від точки основи шиї збоку до променевої точки - + Distance from the base of the neck side point to the end of the third finger Full measurement description Відстань від точки основи шиї збоку до кінця третього пальця - + The distance from the base of the neck to the side of the first line in front of chest circumference Full measurement description Відстань від точки основи шиї збоку до лінії обхвату грудей першого спереду - + The distance from the base of the neck to the waist side front (waist length in the front) Full measurement description Відстань від точки основи шиї збоку до лінії талії спереду (обхват талії спереду) - + Arc through the highest point of the shoulder joint Full measurement description Дуга через вищу точку плечового суглоба - + The distance from the base of the neck to the back line of chest circumference of the first and the second based on ledge vanes Full measurement description Відстань від точки основи шиї ззаду до лінії обхватів грудей першого і другого з урахуванням виступу лопаток - + The distance from the waist to the back base of the neck side point Full measurement description Відстань від лінії талії ззаду до точки основи шиї збоку - + Arc length of the upper body through the base of the neck side point Full measurement description Довжина дуги верхньої частини тулуба через точку підстави шиї збоку - + Chest width Full measurement description Ширина грудей - + Anteroposterior diameter of the hands Full measurement description Передньо-задній діаметр руки - + Height clavicular point Full measurement description Висота ключичної точки - + The distance from the point to the cervical level of the posterior angle of the front armpit (underarm height oblique) Full measurement description Відстань від шийної точки до рівня заднього кута пахвової западини спереду (коса висота пройми) - + Slash shoulder height Full measurement description Коса висота плеча - + Half girth neck Full measurement description Півобхват шиї - + Half girth neck for shirts Full measurement description Півобхват шиї для сорочок - + Half girth chest first Full measurement description Півобхват грудей перший - + Half girth chest second Full measurement description Півобхват грудей другий - + Half girth chest third Full measurement description Півобхват грудей третій - + Half girth waist Full measurement description Півобхват талії - + Half girth hips considering protruding abdomen Full measurement description Півобхват стегон з урахуванням виступу живота - + Half girth hips excluding protruding abdomen Full measurement description Півобхват стегон без урахування виступу живота - + Girth knee flexed feet Full measurement description Обхват коліна в зігнутому положенні ноги - + Neck transverse diameter Full measurement description Поперечний діаметр шиї - + Front slash shoulder height Full measurement description Коса висота плеча переду - + The distance from the base of the neck to the waist line front Full measurement description Відстань від точки основи шиї до лінії талії спереду - + Hand vertical diameter Full measurement description Вертикальний діаметр руки - + Distance from neck to knee point Full measurement description Відстань від шийної точки до коліна - + The distance from the waist to the knee Full measurement description Відстань від лінії талії до коліна - + Shoulder height Full measurement description Висота плеча - + Head height Full measurement description Висота голови - + Body position Full measurement description Положення корпусу - + Arc behind the shoulder girdle Full measurement description Дуга плечового пояса ззаду - + Distance from neck point to point on the base of the neck side neck girth measurement line Full measurement description Відстань від шийної точки до точки основи шиї збоку по лінії вимірювання обхвату шиї - + Depth waist first Full measurement description Глибина талії перша - + Depth waist second Full measurement description Глибина талії друга @@ -5687,799 +6109,799 @@ Do you want to save your changes? MeasurementsFullNames - + Head girth Full measurement name Обхват голови - + Mid-neck girth Full measurement name Половина обхвата шиї - + Neck Base girth Full measurement name Обхват шиї - + Head and Neck length Full measurement name Довжина шиї і голови - + Front Center length Full measurement name Довжина переду до талії - + Back Center length Full measurement name Довжина спини до талії з урахуванням виступу лопаток - + Shoulder length Full measurement name Довжина плечового ската - + Side Waist length Full measurement name Довжина бічної частини - + Trunk length Full measurement name Довжина тулуба - + Shoulder girth Full measurement name Обхват плеча - + Upper Chest girth Full measurement name Обхват грудей перший - + Bust girth Full measurement name Обхват грудей другий - + Under Bust girth Full measurement name Обхват грудей третій - + Waist girth Full measurement name Обхват талії - + HighHip girth Full measurement name HighHip girth - + Hip girth Full measurement name Обхват стегон з урахуванням виступу живота - + Front Upper Chest width Full measurement name Ширина грудей перша - + Front Chest width Full measurement name Ширина грудей друга - + Front Across Shoulder width Full measurement name Плечевий діаметр - + Back Across Shoulder width Full measurement name Back Across Shoulder width - + Back Upper Chest width Full measurement name Back Upper Chest width - + Back Chest width Full measurement name Ширина спини - + BustPoint to BustPoint Full measurement name Відстань між сосковими точками - + Halter Bustpoint to Bustpoint Full measurement name Halter Bustpoint to Bustpoint - + NeckPoint to BustPoint Full measurement name Відстань від точки основи шиї збоку до соскової точки (висота грудей) - + Crotch length Full measurement name Довжина промежини - + Rise height Full measurement name Відстань від лінії талії до под'ягодічной складки - + Shoulder Drop Full measurement name Shoulder Drop - + Shoulder Slope degrees Full measurement name Схил плеча в градусах - + Front Shoulder Balance Full measurement name Передній баланс плеча - + Back Shoulder Balance Full measurement name Задній баланс плеча - + Front Full Length Full measurement name Повна передня довжина - + Back Full Length Full measurement name Повна задня довжина - + Front Neck arc Full measurement name Передня дуга шиї - + Back Neck arc Full measurement name Задня дуга шиї - + Front upper-bust arc Full measurement name Front upper-bust arc - + Back UpperBust arc Full measurement name Back UpperBust arc - + Front Waist arc Full measurement name Передня дуга талії - + Back Waist arc Full measurement name Задня дуга талії - + Front UpperHip arc Full measurement name Front UpperHip arc - + Back UpperHip arc Full measurement name Back UpperHip arc - + Front Hip arc Full measurement name Front Hip arc - + Back Hip arc Full measurement name Back Hip arc - + Chest Balance Full measurement name Баланс грудей - + Back Balance Full measurement name Задній баланс - + Front Waist Balance Full measurement name Передній баланс талії - + Back Waist Balance Full measurement name Задній баланс талії - + Front UpperChest height Full measurement name Front UpperChest height - + Bust height Full measurement name Висота бюста - + Front Upper chest waist Full measurement name Довжина переду від лінії талії вгору по центру до початку улоговини - + Front waist to lower breast Full measurement name Довжина від талії до підстави грудних залоз - + Back waist to upper chest Full measurement name Довжина спинки - + Strap length Full measurement name Довжина бретелі - + Armscye Girth Full measurement name Armscye Girth - + Elbow Girth Full measurement name Обхват локтя - + Upperarm Girth Full measurement name Обхват плеча - + Wrist girth Full measurement name Обхват зап'ястя - + Armscye depth Full measurement name Armscye depth - + Shoulder and Arm length Full measurement name Відстань від точки основи шиї збоку до лінії обхвату зап'ястя - + Underarm length Full measurement name Внутрішня довжина рукава (з окатом) - + Nape to wrist length Full measurement name Nape to wrist length - + Elbow length Full measurement name Довжина руки до ліктя - + Arm length Full measurement name Довжина рукава до лінії обхвату зап'ястя - + Hand width Full measurement name Ширина руки - + Hand length Full measurement name Довжина руки - + Hand girth Full measurement name Обхват кисті - + Thigh girth Full measurement name Обхват стегна - + Midthigh girth Full measurement name Midthigh girth - + Knee girth Full measurement name Обхват коліна - + Calf girth Full measurement name Обхват ікри - + Ankle girth Full measurement name Обхват щиколотки - + Knee height Full measurement name Висота колінної точки - + Ankle height Full measurement name Висота щиколотки - + Foot width Full measurement name Ширина ноги - + Foot length Full measurement name Довжина ноги - + Total Height Full measurement name Загальна висота - + Nape height Full measurement name Висота точки основи шиї ззаду - + Nape to knee height Full measurement name Потилиця до висоти коліна - + Waist height Full measurement name Висота лінії талії - + HighHip height Full measurement name HighHip height - + Hip height Full measurement name Hip height - + Waist to Hip height Full measurement name Waist to Hip height - + Waist to Knee height Full measurement name Талія до висоти коліна - + Crotch height/Inseam Full measurement name Довжина ноги по внутрішній поверхні - + Size Full measurement name Розмір - + Height front neck base point Full measurement name Висота точки основи шиї спереду - + Height base neck side point Full measurement name Висота точки основи шиї збоку - + Height shoulder point Full measurement name Висота плечової точки - + Height nipple point Full measurement name Висота соскової точки - + Height back angle axilla Full measurement name Висота заднього кута пахвової западини - + Height scapular point Full measurement name Висота лопаточной точки - + Height under buttock folds Full measurement name Висота под'ягодічной складки - + Hips excluding protruding abdomen Full measurement name Обхват стегон без урахування виступу живота - + Girth foot instep Full measurement name Обхват підйому стопи - + Side waist to floor Full measurement name Відстань від лінії талії до підлоги збоку - + Front waist to floor Full measurement name Відстань від лінії талії до підлоги спереду - + Arc through groin area Full measurement name Дуга через пахову область - + Waist to plane seat Full measurement name Відстань від лінії талії до площини сидіння - + Neck to radial point Full measurement name Відстань від точки основи шиї збоку до променевої точки - + Neck to third finger Full measurement name Відстань від точки основи шиї збоку до кінця третього пальця - + Neck to first line chest circumference Full measurement name Відстань від точки основи шиї збоку до лінії обхвату грудей першого спереду - + Front waist length Full measurement name Відстань від точки основи шиї збоку до лінії талії спереду (довжина талії спереду) - + Arc through shoulder joint Full measurement name Дуга через вищу точку плечового суглоба - + Neck to back line chest circumference Full measurement name Відстань від точки основи шиї ззаду до лінії обхватів грудей першого і другого з урахуванням виступу лопаток - + Waist to neck side Full measurement name Відстань від лінії талії ззаду до точки основи шиї збоку - + Arc length upper body Full measurement name Довжина дуги верхньої частини тулуба через точку підстави шиї збоку - + Chest width Full measurement name Ширина грудей - + Anteroposterior diameter hands Full measurement name Передньо-задній діаметр руки - + Height clavicular point Full measurement name Висота ключичній точки - + Height armhole slash Full measurement name Відстань від шийної точки до рівня заднього кута пахвової западини спереду (висота пройми коса) - + Slash shoulder height Full measurement name Висота плеча коса - + Half girth neck Full measurement name Полуобхват шиї - + Half girth neck for shirts Full measurement name Полуобхват шиї для сорочок - + Half girth chest first Full measurement name Напівобхват грудей перший - + Half girth chest second Full measurement name Напівобхват грудей другий - + Half girth chest third Full measurement name Напівобхват грудей третій - + Half girth waist Full measurement name Полуобхват талії - + Half girth hips considering protruding abdomen Full measurement name Полуобхват стегон з урахуванням виступу живота - + Half girth hips excluding protruding abdomen Full measurement name Полуобхват стегон без урахування виступу живота - + Girth knee flexed feet Full measurement name Обхват коліна в зігнутому положенні ноги - + Neck transverse diameter Full measurement name Поперечний діаметр шиї - + Front slash shoulder height Full measurement name Висота плеча коса спереду - + Neck to front waist line Full measurement name Відстань від точки основи шиї до лінії талії спереду - + Hand vertical diameter Full measurement name Вертикальний діаметр руки - + Neck to knee point Full measurement name Відстань від шийної точки до коліна - + Waist to knee Full measurement name Відстань від лінії талії до коліна - + Shoulder height Full measurement name Висота плеча - + Head height Full measurement name Висота голови - + Body position Full measurement name Положення корпусу - + Arc behind shoulder girdle Full measurement name Дуга плечового пояса ззаду - + Neck to neck base Full measurement name Відстань від шийної точки до точки основи шиї збоку по лінії вимірювання обхвату шиї - + Depth waist first Full measurement name Глибина талії перша - + Depth waist second Full measurement name Глибина талії друга @@ -6596,19 +7018,19 @@ Do you want to save your changes? PostfixOperators - + cm centimeter см - + mm millimeter мм - + in inch дюйм @@ -6670,7 +7092,7 @@ Do you want to save your changes? QObject - + Create new pattern piece to start working. Створіть нове креслення для початку роботи. @@ -6685,18 +7107,18 @@ Do you want to save your changes? Перемістити деталь - + mm мм - - + + cm см - + inch дюйми @@ -6712,7 +7134,7 @@ Do you want to save your changes? STDescriptions - + Standard figures of men 1st group, chest 100 cm Standard table description Типові фігури чоловіків 1ї повнотної групи, обхват грудей 100 см @@ -6905,12 +7327,12 @@ Do you want to save your changes? VAbstractTool - + Confirm the deletion. Підтвердіть видалення. - + Do you really want delete? Ви дійсно хочете видалити? @@ -6922,35 +7344,45 @@ Do you want to save your changes? Помилка! - + Error parsing file. Program will be terminated. Помилка парсінгу файла. Програма буде закрита. - + Error bad id. Program will be terminated. Помилка неправильний id. Програма буде закрита. - + Error can't convert value. Program will be terminated. Помилка конвертації значення. Програма буде закрита. - + Error empty parameter. Program will be terminated. Помилка пустий параметр. Програма буде закрита. - + Error wrong id. Program will be terminated. Помилка неправильний id. Програма буде закрита. - + Something's wrong!! Щось не так!! + + + Could not copy temp file to document file + Не вдалося зкопіювати тимчасовий файл до файлу документа + + + + Could not remove document file + Не вдалося видалити файл документа + Something wrong!! Щось не так!! @@ -7004,49 +7436,54 @@ Do you want to save your changes? Не можу конвертувати toLongLong параметру - + Can't convert toUInt parameter Не можу конвертувати toUInt параметр - + Can't convert toBool parameter Не вдається перетворити параметр toBool - + Got empty parameter Отримано пустий параметр - + Can't convert toDouble parameter Не можу конвертувати toDouble параметру - - + + Can't open file %1: %2. Не можу відкрити файл%1: %2. - + Can't open schema file %1: %2. Не можу відкрити файл схеми %1:\n%2. - + Validation error file %3 in line %1 column %2 Помилка валідації файлу %3 в рядку %1 стовпця %2 - + Parsing error file %3 in line %1 column %2 Помилка розбору файлу %3 в рядку %1 стовпця %2 + + + Couldn't get node + Не вдалося отримати вузол + This id is not unique. Цей id не унікальний. @@ -7185,7 +7622,7 @@ Do you want to save your changes? VException - + Critical error! Критична помилка! @@ -7236,12 +7673,11 @@ Do you want to save your changes? VPattern - Can't find tool id = %1 in table. - Не можу знайти інструмент з id = %1 в таблиці. + Не можу знайти інструмент з id = %1 в таблиці. - + Error no unique id. Помилка не унікальний id. @@ -7250,178 +7686,195 @@ Do you want to save your changes? Помилка! - - + + Can't find tool in table. + Не можу знайти інструмент в таблиці. + + + + Error parsing file. Помилка парсингу файла. - + Error can't convert value. Помилка, не можу конвертувати значення. - + Error empty parameter. Помилка, пустий параметр. - + Error wrong id. Помикла, неправильний id. - + Critical error! Критична помилка! - + Error parsing file (std::bad_alloc). Помилка парсінгу файлу (std::bad_alloc). - + Error creating or updating detail Помилка створення чи оновлення деталі - + Error creating or updating single point Помилка створення чи оновлення простої точки - - + + Error creating or updating point of end line Помилка створення чи оновлення точки кінця відрізку - - + + Error creating or updating point along line Помилка створення чи оновлення точки вздовж лінії - - + + Error creating or updating point of shoulder Помилка створення чи оновлення точки плеча - - + + Error creating or updating point of normal Помилка створення чи оновлення точки нормалі - - + + Error creating or updating point of bisector Помилка створення чи оновлення точки бісектриси - + Error creating or updating point of lineintersection Помилка створення чи оновлення точки перетину ліній - - + + Error creating or updating point of contact Помилка створення чи оновлення точки дотику - + Error creating or updating modeling point Помилка створення чи оновлення модельної точки - + Error creating or updating height Помилка створення чи оновлення висоти - + Error creating or updating triangle Помилка створення чи оновлення трикутника - + Error creating or updating point of intersection Помилка створення чи оновлення точки перетину - - + + Error creating or updating cut spline point Помилка створення чи оновлення точки розрізання кривої - - + + Error creating or updating cut spline path point Помилка створення чи оновлення точки розрізаня складної кривої - - + + Error creating or updating cut arc point Помилка створення чи оновлення точки розрізання дуги - + + + Error creating or updating point of intersection line and axis + Помилка створення чи оновлення точки перетину лінії і осі + + + + + Error creating or updating point of intersection curve and axis + Помилка створення чи оновлення точки перетину кривої і осі + + + Error creating or updating line Помилка створення чи оновлення лінії - + Error creating or updating simple curve Помилка створення чи оновлення кривої - + Error creating or updating curve path Помилка створення чи оновлення шляху кривих - + Error creating or updating modeling simple curve Помилка створення чи оновлення модельної кривої - + Error creating or updating modeling curve path Помилка створення чи оновлення модельного шляху кривих - - + + Error creating or updating simple arc Помилка створення чи оновлення дуги - + Error creating or updating modeling arc Помилка створення чи оновлення модельної дуги - + Error creating or updating union details Помилка створення чи оновлення об'єднання деталей - + Got wrong parameter id. Need only id > 0. Отримано неправильний id. Допускаються тільки id > 0. - + This id is not unique. Цей id не унікальний. - + File error. Помилка файла. @@ -7475,173 +7928,185 @@ Do you want to save your changes? VToolOptionsPropertyBrowser - + Base point Базова точка - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + Point label Ім'я точки - + Position Позиція - + Point at distance and angle Інструмент точка на кінці лінії - - - - - - - + + + + + + + + + Line type Тип лінії - - - - - - - - + + + + + + + + Length Довжина - + + + Angle Кут - + Point at distance along line Інструмент точка вздовж лінії - + Arc Дуга - - + + Radius Радіус - + First angle Перший кут - + Second angle Другий кут - + Point along bisector Інструмент точка бісектриси кута - + Cut arc tool Інструмент розрізання дуги - + Tool for segmenting a curve Інструмент для сегментації кривої - + Tool segment a pathed curve Інструмент для сегментації складної кривої - + Perpendicular point along line Перпендикулярна точка вздовж лінії - + Line between points Лінія між двома точками - + Point at line intersection Точка перетину ліній - + Point along perpendicular Інструмент точка перпендикуляра - + Additional angle degrees Дод. кут градуси - + Point at intersection of arc and line Точка на перетині дуги та лінії - + Tool to make point from x & y of two other points Інструменд для створення точки з двух х и у координат двух інших точок - + Special point on shoulder Спеціальна точка на плече - + Curve tool Інструмент крива - - + + Curve factor Коефіцієнт кривої - + Tool for path curve Інструмент для створення складної кривої - + Tool triangle Інструмент трикутник + + + + Point intersection line and axis + Точка на перетині лінії і осі + VToolTriangle @@ -7660,31 +8125,31 @@ Do you want to save your changes? Variables - + Line_ Left symbol _ in name Лінія_ - + AngleLine_ Left symbol _ in name КутЛінії_ - + Arc_ Left symbol _ in name Дуга_ - + Spl_ Left symbol _ in name Спл_ - + SplPath Do not add symbol _ to the end of name СкСпл @@ -7699,6 +8164,14 @@ Do you want to save your changes? СкСпл_ + + VisToolCurveIntersectAxis + + + <b>Intersection curve and axis</b>: angle = %1°; <b>Shift</b> - sticking angle, <b>Enter</b> - finish creation + <b>Перетин кривої і осі</b>: кут =%1°; <b>Shift</b> - фіксація кута, <b>Enter</b> - завершення створення + + VisToolEndLine @@ -7707,6 +8180,14 @@ Do you want to save your changes? <b>Точка на кінці відрізка</b>: кут =%1°; <b>Shift</b> - фіксація кута, <b>Enter</b> - завершення створення + + VisToolLineIntersectAxis + + + <b>Intersection line and axis</b>: angle = %1°; <b>Shift</b> - sticking angle, <b>Enter</b> - finish creation + <b>Перетин лінії і осі</b>: кут =%1°; <b>Shift</b> - фіксація кута, <b>Enter</b> - завершення створення + + VisToolSplinePath @@ -7718,12 +8199,12 @@ Do you want to save your changes? main - + Pattern making program. Програма створення викрійок. - + Pattern file. Файл лекала. diff --git a/src/app/stable.h b/src/app/stable.h index 5bd360ac9..695fe3df7 100644 --- a/src/app/stable.h +++ b/src/app/stable.h @@ -54,23 +54,7 @@ #endif //In Windows you can't use same header in all modes. -#if defined(Q_OS_WIN) -# if defined(QT_NO_DEBUG)//release mode - -# ifdef QT_WIDGETS_LIB -# include -# endif - -# ifdef QT_SVG_LIB -# include -# endif - -# ifdef QT_PRINTSUPPORT_LIB -# include -# endif -# endif/*QT_NO_DEBUG*/ -#else - +#if !defined(Q_OS_WIN) # ifdef QT_WIDGETS_LIB # include # endif diff --git a/src/app/tools/drawTools/vtoolcutsplinepath.cpp b/src/app/tools/drawTools/vtoolcutsplinepath.cpp index 7ab4339fd..92678b185 100644 --- a/src/app/tools/drawTools/vtoolcutsplinepath.cpp +++ b/src/app/tools/drawTools/vtoolcutsplinepath.cpp @@ -171,16 +171,7 @@ VToolCutSplinePath* VToolCutSplinePath::Create(const quint32 _id, const QString splPath1->append(VSplinePoint(splP1.P(), splP1.KAsm1(), spl1.GetAngle1()+180, spl1.GetKasm1(), spl1.GetAngle1())); VSplinePoint cutPoint; -// if (typeCreation == Source::FromGui) -// { -// cutPoint = VSplinePoint(*p, spl1.GetKasm2(), spl1.GetAngle2(), spl2.GetKasm1(), -// spl1.GetAngle2()); -// } -// else -// { - cutPoint = VSplinePoint(*p, spl1.GetKasm2(), spl1.GetAngle2(), spl2.GetKasm1(), - spl1.GetAngle2()+180); -// } + cutPoint = VSplinePoint(*p, spl1.GetKasm2(), spl1.GetAngle2(), spl2.GetKasm1(), spl1.GetAngle2()+180); splPath1->append(cutPoint); continue; } @@ -200,6 +191,8 @@ VToolCutSplinePath* VToolCutSplinePath::Create(const quint32 _id, const QString splPath2->append(splPath->at(i)); } } + splPath1->setKCurve(splPath->getKCurve()); + splPath2->setKCurve(splPath->getKCurve()); splPath1->setMaxCountPoints(splPath->CountPoint()); splPath2->setMaxCountPoints(splPath->CountPoint()); diff --git a/src/app/tools/drawTools/vtoolendline.cpp b/src/app/tools/drawTools/vtoolendline.cpp index 07265ef6b..4a41806f3 100644 --- a/src/app/tools/drawTools/vtoolendline.cpp +++ b/src/app/tools/drawTools/vtoolendline.cpp @@ -142,8 +142,8 @@ VToolEndLine* VToolEndLine::Create(const quint32 _id, const QString &pointName, const QSharedPointer basePoint = data->GeometricObject(basePointId); QLineF line = QLineF(basePoint->toQPointF(), QPointF(basePoint->x()+100, basePoint->y())); + line.setAngle(CheckFormula(_id, formulaAngle, data)); //First set angle. line.setLength(qApp->toPixel(CheckFormula(_id, formulaLength, data))); - line.setAngle(CheckFormula(_id, formulaAngle, data)); quint32 id = _id; if (typeCreation == Source::FromGui) { diff --git a/src/app/tools/drawTools/vtoolline.cpp b/src/app/tools/drawTools/vtoolline.cpp index 2c0f98912..ec85c2b29 100644 --- a/src/app/tools/drawTools/vtoolline.cpp +++ b/src/app/tools/drawTools/vtoolline.cpp @@ -470,8 +470,8 @@ void VToolLine::RefreshGeometry() QDomElement domElement = doc->elementById(QString().setNum(id)); if (domElement.isElement()) { - firstPoint = doc->GetParametrUInt(domElement, VAbstractTool::AttrFirstPoint, "0"); - secondPoint = doc->GetParametrUInt(domElement, VAbstractTool::AttrSecondPoint, "0"); + firstPoint = doc->GetParametrUInt(domElement, VAbstractTool::AttrFirstPoint, NULL_ID_STR); + secondPoint = doc->GetParametrUInt(domElement, VAbstractTool::AttrSecondPoint, NULL_ID_STR); typeLine = doc->GetParametrString(domElement, VAbstractTool::AttrTypeLine, VAbstractTool::TypeLineLine); } const QSharedPointer first = VAbstractTool::data.GeometricObject(firstPoint); diff --git a/src/app/tools/vtooldetail.cpp b/src/app/tools/vtooldetail.cpp index 4e715b73c..b61ab160d 100644 --- a/src/app/tools/vtooldetail.cpp +++ b/src/app/tools/vtooldetail.cpp @@ -281,8 +281,8 @@ void VToolDetail::AddToFile() doc->SetAttribute(domElement, AttrName, detail.getName()); doc->SetAttribute(domElement, AttrMx, qApp->fromPixel(detail.getMx())); doc->SetAttribute(domElement, AttrMy, qApp->fromPixel(detail.getMy())); - doc->SetAttribute(domElement, AttrSupplement, detail.getSeamAllowance()); - doc->SetAttribute(domElement, AttrClosed, detail.getClosed()); + doc->SetAttribute(domElement, AttrSupplement, static_cast(detail.getSeamAllowance())); + doc->SetAttribute(domElement, AttrClosed, static_cast(detail.getClosed())); doc->SetAttribute(domElement, AttrWidth, detail.getWidth()); for (int i = 0; i < detail.CountNode(); ++i) @@ -306,8 +306,8 @@ void VToolDetail::RefreshDataInFile() { VDetail det = VAbstractTool::data.GetDetail(id); doc->SetAttribute(domElement, AttrName, det.getName()); - doc->SetAttribute(domElement, AttrSupplement, QString().setNum(det.getSeamAllowance())); - doc->SetAttribute(domElement, AttrClosed, QString().setNum(det.getClosed())); + doc->SetAttribute(domElement, AttrSupplement, QString().setNum(static_cast(det.getSeamAllowance()))); + doc->SetAttribute(domElement, AttrClosed, QString().setNum(static_cast(det.getClosed()))); doc->SetAttribute(domElement, AttrWidth, QString().setNum(det.getWidth())); doc->RemoveAllChild(domElement); for (int i = 0; i < det.CountNode(); ++i) @@ -399,8 +399,8 @@ void VToolDetail::mouseReleaseEvent(QGraphicsSceneMouseEvent *event) void VToolDetail::contextMenuEvent(QGraphicsSceneContextMenuEvent *event) { QMenu menu; - QAction *actionOption = menu.addAction(tr("Options")); - QAction *actionRemove = menu.addAction(tr("Delete")); + QAction *actionOption = menu.addAction(QIcon::fromTheme("preferences-other"), tr("Options")); + QAction *actionRemove = menu.addAction(QIcon::fromTheme("edit-delete"), tr("Delete")); if (_referens > 1) { actionRemove->setEnabled(false); diff --git a/src/app/tools/vtooluniondetails.cpp b/src/app/tools/vtooluniondetails.cpp index 2e9373bba..8baf5946a 100644 --- a/src/app/tools/vtooluniondetails.cpp +++ b/src/app/tools/vtooluniondetails.cpp @@ -691,7 +691,7 @@ QVector VToolUnionDetails::GetDetailFromFile(VPattern *doc, const QDomE { if (element.tagName() == VToolUnionDetails::TagNode) { - quint32 id = doc->GetParametrUInt(element, VToolDetail::AttrIdObject, "0"); + quint32 id = doc->GetParametrUInt(element, VToolDetail::AttrIdObject, NULL_ID_STR); qreal mx = qApp->toPixel(doc->GetParametrDouble(element, VAbstractTool::AttrMx, "0.0")); qreal my = qApp->toPixel(doc->GetParametrDouble(element, VAbstractTool::AttrMy, "0.0")); Tool tool = Tool::NodePoint; diff --git a/src/app/undocommands/addtocalc.cpp b/src/app/undocommands/addtocalc.cpp index 9074bd8c9..db5487e81 100644 --- a/src/app/undocommands/addtocalc.cpp +++ b/src/app/undocommands/addtocalc.cpp @@ -48,7 +48,7 @@ AddToCalc::~AddToCalc() //--------------------------------------------------------------------------------------------------------------------- void AddToCalc::undo() { - doc->ChangeActivPP(nameActivDraw); + doc->ChangeActivPP(nameActivDraw);//User will not see this change doc->setCursor(cursor); QDomElement calcElement; @@ -80,12 +80,13 @@ void AddToCalc::undo() } emit NeedFullParsing(); VAbstractTool::NewSceneRect(qApp->getCurrentScene(), qApp->getSceneView()); + doc->SetCurrentPP(nameActivDraw);//Return current pattern piece after undo } //--------------------------------------------------------------------------------------------------------------------- void AddToCalc::redo() { - doc->ChangeActivPP(nameActivDraw); + doc->ChangeActivPP(nameActivDraw);//User will not see this change doc->setCursor(cursor); QDomElement calcElement; @@ -118,3 +119,14 @@ void AddToCalc::redo() RedoFullParsing(); VAbstractTool::NewSceneRect(qApp->getCurrentScene(), qApp->getSceneView()); } + +//--------------------------------------------------------------------------------------------------------------------- +void AddToCalc::RedoFullParsing() +{ + if (redoFlag) + { + emit NeedFullParsing(); + doc->SetCurrentPP(nameActivDraw);//Return current pattern piece after undo + } + redoFlag = true; +} diff --git a/src/app/undocommands/addtocalc.h b/src/app/undocommands/addtocalc.h index e09e18cb5..81d589d82 100644 --- a/src/app/undocommands/addtocalc.h +++ b/src/app/undocommands/addtocalc.h @@ -39,6 +39,8 @@ public: virtual ~AddToCalc(); virtual void undo(); virtual void redo(); +protected: + virtual void RedoFullParsing(); private: Q_DISABLE_COPY(AddToCalc) const QString nameActivDraw; diff --git a/src/app/undocommands/deletedetail.cpp b/src/app/undocommands/deletedetail.cpp index 0993fe29d..c06c4e95a 100644 --- a/src/app/undocommands/deletedetail.cpp +++ b/src/app/undocommands/deletedetail.cpp @@ -32,7 +32,7 @@ //--------------------------------------------------------------------------------------------------------------------- DeleteDetail::DeleteDetail(VPattern *doc, quint32 id, QUndoCommand *parent) - : VUndoCommand(QDomElement(), doc, parent), parentNode(QDomNode()) + : VUndoCommand(QDomElement(), doc, parent), parentNode(QDomNode()), siblingId(NULL_ID) { setText(tr("Delete tool")); nodeId = id; @@ -41,6 +41,16 @@ DeleteDetail::DeleteDetail(VPattern *doc, quint32 id, QUndoCommand *parent) { xml = domElement.cloneNode().toElement(); parentNode = domElement.parentNode(); + QDomNode previousDetail = domElement.previousSibling(); + if (previousDetail.isNull()) + { + siblingId = NULL_ID; + } + else + { + // Better save id of previous detail instead of reference to node. + siblingId = doc->GetParametrUInt(previousDetail.toElement(), VPattern::AttrId, NULL_ID_STR); + } } else { @@ -56,7 +66,7 @@ DeleteDetail::~DeleteDetail() //--------------------------------------------------------------------------------------------------------------------- void DeleteDetail::undo() { - parentNode.appendChild(xml); + UndoDeleteAfterSibling(parentNode, siblingId); emit NeedFullParsing(); } @@ -68,14 +78,15 @@ void DeleteDetail::redo() { parentNode.removeChild(domElement); - //When UnionDetail delete detail we can't use FullParsing. So we hide detail on scene directly. + // UnionDetails delete two old details and create one new. + // So when UnionDetail delete detail we can't use FullParsing. So we hide detail on scene directly. QHash* tools = doc->getTools(); SCASSERT(tools != nullptr); VToolDetail *toolDet = qobject_cast(tools->value(nodeId)); SCASSERT(toolDet != nullptr); toolDet->hide(); - emit NeedFullParsing(); + emit NeedFullParsing(); // Doesn't work when UnionDetail delete detail. } else { diff --git a/src/app/undocommands/deletedetail.h b/src/app/undocommands/deletedetail.h index 90e2427e1..a5b5f62a0 100644 --- a/src/app/undocommands/deletedetail.h +++ b/src/app/undocommands/deletedetail.h @@ -43,6 +43,7 @@ public: private: Q_DISABLE_COPY(DeleteDetail) QDomNode parentNode; + quint32 siblingId; }; #endif // DELETEDETAIL_H diff --git a/src/app/undocommands/deltool.cpp b/src/app/undocommands/deltool.cpp index f7634f82d..5097f5a10 100644 --- a/src/app/undocommands/deltool.cpp +++ b/src/app/undocommands/deltool.cpp @@ -33,21 +33,14 @@ //--------------------------------------------------------------------------------------------------------------------- DelTool::DelTool(VPattern *doc, quint32 id, QUndoCommand *parent) - : VUndoCommand(QDomElement(), doc, parent), parentNode(QDomNode()), cursor(doc->getCursor()) + : VUndoCommand(QDomElement(), doc, parent), parentNode(QDomNode()), siblingId(NULL_ID), + nameActivDraw(doc->GetNameActivPP()) { setText(tr("Delete tool")); nodeId = id; - QDomElement domElement = doc->elementById(QString().setNum(id)); - if (domElement.isElement()) - { - xml = domElement.cloneNode().toElement(); - parentNode = domElement.parentNode(); - } - else - { - qDebug()<<"Can't get tool by id = "<SiblingNodeId(nodeId); + parentNode = doc->ParentNodeById(nodeId); + xml = doc->CloneNodeById(nodeId); } //--------------------------------------------------------------------------------------------------------------------- @@ -57,33 +50,16 @@ DelTool::~DelTool() //--------------------------------------------------------------------------------------------------------------------- void DelTool::undo() { - if (cursor <= 0) - { - parentNode.appendChild(xml); - } - else - { - QDomElement refElement = doc->elementById(QString().setNum(cursor)); - if (refElement.isElement()) - { - parentNode.insertAfter(xml, refElement); - } - } + UndoDeleteAfterSibling(parentNode, siblingId); emit NeedFullParsing(); + doc->SetCurrentPP(nameActivDraw); } //--------------------------------------------------------------------------------------------------------------------- void DelTool::redo() { - QDomElement domElement = doc->elementById(QString().setNum(nodeId)); - if (domElement.isElement()) - { - parentNode.removeChild(domElement); - emit NeedFullParsing(); - } - else - { - qDebug()<<"Can't get tool by id = "<NodeById(nodeId); + parentNode.removeChild(domElement); + emit NeedFullParsing(); + doc->SetCurrentPP(nameActivDraw); } diff --git a/src/app/undocommands/deltool.h b/src/app/undocommands/deltool.h index 433f2c809..df8c12377 100644 --- a/src/app/undocommands/deltool.h +++ b/src/app/undocommands/deltool.h @@ -42,8 +42,9 @@ public: virtual void redo(); private: Q_DISABLE_COPY(DelTool) - QDomNode parentNode; - quint32 cursor; + QDomNode parentNode; + quint32 siblingId; + const QString nameActivDraw; }; #endif // DELTOOL_H diff --git a/src/app/undocommands/vundocommand.cpp b/src/app/undocommands/vundocommand.cpp index a022f4f63..dc09e65ae 100644 --- a/src/app/undocommands/vundocommand.cpp +++ b/src/app/undocommands/vundocommand.cpp @@ -49,3 +49,17 @@ void VUndoCommand::RedoFullParsing() } redoFlag = true; } + +//--------------------------------------------------------------------------------------------------------------------- +void VUndoCommand::UndoDeleteAfterSibling(QDomNode &parentNode, const quint32 &siblingId) const +{ + if (siblingId == NULL_ID) + { + parentNode.appendChild(xml); + } + else + { + const QDomElement refElement = doc->NodeById(siblingId); + parentNode.insertAfter(xml, refElement); + } +} diff --git a/src/app/undocommands/vundocommand.h b/src/app/undocommands/vundocommand.h index 1b142007c..d14e85ca0 100644 --- a/src/app/undocommands/vundocommand.h +++ b/src/app/undocommands/vundocommand.h @@ -60,11 +60,12 @@ signals: void NeedFullParsing(); void NeedLiteParsing(const Document &parse); protected: - QDomElement xml; - VPattern *doc; - quint32 nodeId; - bool redoFlag; - void RedoFullParsing(); + QDomElement xml; + VPattern *doc; + quint32 nodeId; + bool redoFlag; + virtual void RedoFullParsing(); + void UndoDeleteAfterSibling(QDomNode &parentNode, const quint32 &siblingId) const; private: Q_DISABLE_COPY(VUndoCommand) }; diff --git a/src/app/version.h b/src/app/version.h index 49a67f980..f9653698d 100644 --- a/src/app/version.h +++ b/src/app/version.h @@ -37,7 +37,6 @@ extern const int DEBUG_VERSION; extern const QString APP_VERSION; -// Don't forget change version number in manifest file /src/app/share/resources/valentina.exe.manifest. // Change version number in version.cpp also. #define VER_FILEVERSION 0,2,8,0 diff --git a/src/app/visualization/vistoolcutsplinepath.cpp b/src/app/visualization/vistoolcutsplinepath.cpp index 59566ac58..fcea7e2ee 100644 --- a/src/app/visualization/vistoolcutsplinepath.cpp +++ b/src/app/visualization/vistoolcutsplinepath.cpp @@ -61,6 +61,7 @@ void VisToolCutSplinePath::RefreshGeometry() QPointF spl1p2, spl1p3, spl2p2, spl2p3; qint32 p1 = 0, p2 = 0; + // TODO make refactoring. CutSplPath repeat twice. Here and in VToolCutSpline. const QPointF cutPoint = splPath->CutSplinePath(length, p1, p2, spl1p2, spl1p3, spl2p2, spl2p3); VPointF p = VPointF(cutPoint); @@ -103,6 +104,9 @@ void VisToolCutSplinePath::RefreshGeometry() } } + spPath1.setKCurve(splPath->getKCurve()); + spPath2.setKCurve(splPath->getKCurve()); + DrawPoint(point, cutPoint, mainColor); DrawPath(splPath1, spPath1.GetPath(PathDirection::Show), Qt::darkGreen, Qt::SolidLine, Qt::RoundCap); diff --git a/src/app/widgets/vitem.cpp b/src/app/widgets/vitem.cpp index 6543f1d2c..b70c06833 100644 --- a/src/app/widgets/vitem.cpp +++ b/src/app/widgets/vitem.cpp @@ -62,7 +62,7 @@ VItem::VItem(int numInList, QGraphicsItem *parent):QGraphicsPathItem (parent), n //--------------------------------------------------------------------------------------------------------------------- /** - * @brief checkItemChange change item change. If detail create colission or moved out paper emit signal. + * @brief checkItemChange check item change. If detail create colission or moved out paper emit signal. */ void VItem::checkItemChange() { diff --git a/src/app/xml/vdomdocument.cpp b/src/app/xml/vdomdocument.cpp index 54e855dcc..e389c006d 100644 --- a/src/app/xml/vdomdocument.cpp +++ b/src/app/xml/vdomdocument.cpp @@ -600,3 +600,28 @@ void VDomDocument::RemoveAllChild(QDomElement &domElement) } } } + +//--------------------------------------------------------------------------------------------------------------------- +QDomNode VDomDocument::ParentNodeById(const quint32 &nodeId) +{ + QDomElement domElement = NodeById(nodeId); + return domElement.parentNode(); +} + +//--------------------------------------------------------------------------------------------------------------------- +QDomElement VDomDocument::CloneNodeById(const quint32 &nodeId) +{ + QDomElement domElement = NodeById(nodeId); + return domElement.cloneNode().toElement(); +} + +//--------------------------------------------------------------------------------------------------------------------- +QDomElement VDomDocument::NodeById(const quint32 &nodeId) +{ + QDomElement domElement = elementById(QString().setNum(nodeId)); + if (domElement.isNull() || domElement.isElement() == false) + { + throw VExceptionBadId(tr("Couldn't get node"), nodeId); + } + return domElement; +} diff --git a/src/app/xml/vdomdocument.h b/src/app/xml/vdomdocument.h index 088aaee7a..4cb915190 100644 --- a/src/app/xml/vdomdocument.h +++ b/src/app/xml/vdomdocument.h @@ -109,6 +109,10 @@ public: QString Minor() const; QString Patch() const; static void RemoveAllChild(QDomElement &domElement); + + QDomNode ParentNodeById(const quint32 &nodeId); + QDomElement CloneNodeById(const quint32 &nodeId); + QDomElement NodeById(const quint32 &nodeId); protected: /** @brief data container with data. */ VContainer *data; diff --git a/src/app/xml/vpattern.cpp b/src/app/xml/vpattern.cpp index 5312563d1..2dc7220f4 100644 --- a/src/app/xml/vpattern.cpp +++ b/src/app/xml/vpattern.cpp @@ -211,6 +211,7 @@ bool VPattern::GetActivDrawElement(QDomElement &element) const } } } + element = QDomElement(); } return false; } @@ -365,16 +366,18 @@ void VPattern::Parse(const Document &parse) */ VDataTool *VPattern::getTool(const quint32 &id) { - if (tools.contains(id)) + ToolExists(id); + return tools.value(id); +} + + +//--------------------------------------------------------------------------------------------------------------------- +void VPattern::ToolExists(const quint32 &id) const +{ + if (tools.contains(id) == false) { - return tools.value(id); + throw VExceptionBadId(tr("Can't find tool in table."), id); } - else - { - const QString error = QString(tr("Can't find tool id = %1 in table.")).arg(id); - throw VException(error); - } - return 0; } //--------------------------------------------------------------------------------------------------------------------- @@ -429,6 +432,7 @@ void VPattern::setCurrentData() } if (tools.size() > 0) { + ToolExists(id); const VDataTool *vTool = tools.value(id); *data = vTool->getData(); } @@ -459,6 +463,7 @@ void VPattern::UpdateToolData(const quint32 &id, VContainer *data) { Q_ASSERT_X(id > 0, Q_FUNC_INFO, "id <= 0"); SCASSERT(data != nullptr); + ToolExists(id); VDataTool *tool = tools.value(id); SCASSERT(tool != nullptr); tool->VDataTool::setData(data); @@ -472,6 +477,7 @@ void VPattern::UpdateToolData(const quint32 &id, VContainer *data) void VPattern::IncrementReferens(quint32 id) const { Q_ASSERT_X(id > 0, Q_FUNC_INFO, "id <= 0"); + ToolExists(id); VDataTool *tool = tools.value(id); SCASSERT(tool != nullptr); tool->incrementReferens(); @@ -485,6 +491,7 @@ void VPattern::IncrementReferens(quint32 id) const void VPattern::DecrementReferens(quint32 id) const { Q_ASSERT_X(id > 0, Q_FUNC_INFO, "id <= 0"); + ToolExists(id); VDataTool *tool = tools.value(id); SCASSERT(tool != nullptr); tool->decrementReferens(); @@ -704,7 +711,6 @@ bool VPattern::SaveDocument(const QString &fileName, QString &error) e.CriticalMessageBox(tr("Error no unique id."), qApp->getMainWindow()); return false; } - GarbageCollector(); return VDomDocument::SaveDocument(fileName, error); } @@ -792,6 +798,9 @@ void VPattern::LiteParseTree(const Document &parse) nameActivPP = namePP; setCurrentData(); emit FullUpdateFromFile(); + // Recalculate scene rect + VAbstractTool::NewSceneRect(sceneDraw, qApp->getSceneView()); + VAbstractTool::NewSceneRect(sceneDetail, qApp->getSceneView()); } //--------------------------------------------------------------------------------------------------------------------- @@ -959,7 +968,7 @@ void VPattern::ParseDetailElement(const QDomElement &domElement, const Document { if (element.tagName() == VToolDetail::TagNode) { - const quint32 id = GetParametrUInt(element, VToolDetail::AttrIdObject, "0"); + const quint32 id = GetParametrUInt(element, VToolDetail::AttrIdObject, NULL_ID_STR); const qreal mx = qApp->toPixel(GetParametrDouble(element, VAbstractTool::AttrMx, "0.0")); const qreal my = qApp->toPixel(GetParametrDouble(element, VAbstractTool::AttrMy, "0.0")); const NodeDetail nodeType = NodeDetail::Contour; @@ -1124,7 +1133,7 @@ void VPattern::ParsePointElement(VMainGraphicsScene *scene, QDomElement &domElem const QString formula = GetParametrString(domElement, VAbstractTool::AttrLength, "100.0"); QString f = formula;//need for saving fixed formula; - const quint32 basePointId = GetParametrUInt(domElement, VAbstractTool::AttrBasePoint, "0"); + const quint32 basePointId = GetParametrUInt(domElement, VAbstractTool::AttrBasePoint, NULL_ID_STR); const QString angle = GetParametrString(domElement, VAbstractTool::AttrAngle, "0.0"); QString angleFix = angle; @@ -1158,8 +1167,8 @@ void VPattern::ParsePointElement(VMainGraphicsScene *scene, QDomElement &domElem PointsCommonAttributes(domElement, id, name, mx, my, typeLine); const QString formula = GetParametrString(domElement, VAbstractTool::AttrLength, "100.0"); QString f = formula;//need for saving fixed formula; - const quint32 firstPointId = GetParametrUInt(domElement, VAbstractTool::AttrFirstPoint, "0"); - const quint32 secondPointId = GetParametrUInt(domElement, VAbstractTool::AttrSecondPoint, "0"); + const quint32 firstPointId = GetParametrUInt(domElement, VAbstractTool::AttrFirstPoint, NULL_ID_STR); + const quint32 secondPointId = GetParametrUInt(domElement, VAbstractTool::AttrSecondPoint, NULL_ID_STR); VToolAlongLine::Create(id, name, typeLine, f, firstPointId, secondPointId, mx, my, scene, this, data, parse, Source::FromFile); @@ -1189,9 +1198,9 @@ void VPattern::ParsePointElement(VMainGraphicsScene *scene, QDomElement &domElem PointsCommonAttributes(domElement, id, name, mx, my, typeLine); const QString formula = GetParametrString(domElement, VAbstractTool::AttrLength, "100.0"); QString f = formula;//need for saving fixed formula; - const quint32 p1Line = GetParametrUInt(domElement, VAbstractTool::AttrP1Line, "0"); - const quint32 p2Line = GetParametrUInt(domElement, VAbstractTool::AttrP2Line, "0"); - const quint32 pShoulder = GetParametrUInt(domElement, VAbstractTool::AttrPShoulder, "0"); + const quint32 p1Line = GetParametrUInt(domElement, VAbstractTool::AttrP1Line, NULL_ID_STR); + const quint32 p2Line = GetParametrUInt(domElement, VAbstractTool::AttrP2Line, NULL_ID_STR); + const quint32 pShoulder = GetParametrUInt(domElement, VAbstractTool::AttrPShoulder, NULL_ID_STR); VToolShoulderPoint::Create(id, f, p1Line, p2Line, pShoulder, typeLine, name, mx, my, scene, this, data, parse, Source::FromFile); @@ -1221,8 +1230,8 @@ void VPattern::ParsePointElement(VMainGraphicsScene *scene, QDomElement &domElem PointsCommonAttributes(domElement, id, name, mx, my, typeLine); const QString formula = GetParametrString(domElement, VAbstractTool::AttrLength, "100.0"); QString f = formula;//need for saving fixed formula; - const quint32 firstPointId = GetParametrUInt(domElement, VAbstractTool::AttrFirstPoint, "0"); - const quint32 secondPointId = GetParametrUInt(domElement, VAbstractTool::AttrSecondPoint, "0"); + const quint32 firstPointId = GetParametrUInt(domElement, VAbstractTool::AttrFirstPoint, NULL_ID_STR); + const quint32 secondPointId = GetParametrUInt(domElement, VAbstractTool::AttrSecondPoint, NULL_ID_STR); const qreal angle = GetParametrDouble(domElement, VAbstractTool::AttrAngle, "0.0"); VToolNormal::Create(id, f, firstPointId, secondPointId, typeLine, name, angle, mx, my, scene, @@ -1253,9 +1262,9 @@ void VPattern::ParsePointElement(VMainGraphicsScene *scene, QDomElement &domElem PointsCommonAttributes(domElement, id, name, mx, my, typeLine); const QString formula = GetParametrString(domElement, VAbstractTool::AttrLength, "100.0"); QString f = formula;//need for saving fixed formula; - const quint32 firstPointId = GetParametrUInt(domElement, VAbstractTool::AttrFirstPoint, "0"); - const quint32 secondPointId = GetParametrUInt(domElement, VAbstractTool::AttrSecondPoint, "0"); - const quint32 thirdPointId = GetParametrUInt(domElement, VAbstractTool::AttrThirdPoint, "0"); + const quint32 firstPointId = GetParametrUInt(domElement, VAbstractTool::AttrFirstPoint, NULL_ID_STR); + const quint32 secondPointId = GetParametrUInt(domElement, VAbstractTool::AttrSecondPoint, NULL_ID_STR); + const quint32 thirdPointId = GetParametrUInt(domElement, VAbstractTool::AttrThirdPoint, NULL_ID_STR); VToolBisector::Create(id, f, firstPointId, secondPointId, thirdPointId, typeLine, name, mx, my, scene, this, data, parse, Source::FromFile); @@ -1283,10 +1292,10 @@ void VPattern::ParsePointElement(VMainGraphicsScene *scene, QDomElement &domElem try { PointsCommonAttributes(domElement, id, name, mx, my); - const quint32 p1Line1Id = GetParametrUInt(domElement, VAbstractTool::AttrP1Line1, "0"); - const quint32 p2Line1Id = GetParametrUInt(domElement, VAbstractTool::AttrP2Line1, "0"); - const quint32 p1Line2Id = GetParametrUInt(domElement, VAbstractTool::AttrP1Line2, "0"); - const quint32 p2Line2Id = GetParametrUInt(domElement, VAbstractTool::AttrP2Line2, "0"); + const quint32 p1Line1Id = GetParametrUInt(domElement, VAbstractTool::AttrP1Line1, NULL_ID_STR); + const quint32 p2Line1Id = GetParametrUInt(domElement, VAbstractTool::AttrP2Line1, NULL_ID_STR); + const quint32 p1Line2Id = GetParametrUInt(domElement, VAbstractTool::AttrP1Line2, NULL_ID_STR); + const quint32 p2Line2Id = GetParametrUInt(domElement, VAbstractTool::AttrP2Line2, NULL_ID_STR); VToolLineIntersect::Create(id, p1Line1Id, p2Line1Id, p1Line2Id, p2Line2Id, name, mx, my, scene, this, data, parse, Source::FromFile); @@ -1304,9 +1313,9 @@ void VPattern::ParsePointElement(VMainGraphicsScene *scene, QDomElement &domElem PointsCommonAttributes(domElement, id, name, mx, my); const QString radius = GetParametrString(domElement, VAbstractTool::AttrRadius, "0"); QString f = radius;//need for saving fixed formula; - const quint32 center = GetParametrUInt(domElement, VAbstractTool::AttrCenter, "0"); - const quint32 firstPointId = GetParametrUInt(domElement, VAbstractTool::AttrFirstPoint, "0"); - const quint32 secondPointId = GetParametrUInt(domElement, VAbstractTool::AttrSecondPoint, "0"); + const quint32 center = GetParametrUInt(domElement, VAbstractTool::AttrCenter, NULL_ID_STR); + const quint32 firstPointId = GetParametrUInt(domElement, VAbstractTool::AttrFirstPoint, NULL_ID_STR); + const quint32 secondPointId = GetParametrUInt(domElement, VAbstractTool::AttrSecondPoint, NULL_ID_STR); VToolPointOfContact::Create(id, f, center, firstPointId, secondPointId, name, mx, my, scene, this, data, parse, Source::FromFile); @@ -1334,8 +1343,8 @@ void VPattern::ParsePointElement(VMainGraphicsScene *scene, QDomElement &domElem try { PointsCommonAttributes(domElement, id, mx, my); - const quint32 idObject = GetParametrUInt(domElement, VAbstractNode::AttrIdObject, "0"); - const quint32 idTool = GetParametrUInt(domElement, VAbstractNode::AttrIdTool, "0"); + const quint32 idObject = GetParametrUInt(domElement, VAbstractNode::AttrIdObject, NULL_ID_STR); + const quint32 idTool = GetParametrUInt(domElement, VAbstractNode::AttrIdTool, NULL_ID_STR); const QSharedPointer point = data->GeometricObject(idObject ); data->UpdateGObject(id, new VPointF(point->toQPointF(), point->name(), mx, my, idObject, Draw::Modeling)); @@ -1352,9 +1361,9 @@ void VPattern::ParsePointElement(VMainGraphicsScene *scene, QDomElement &domElem try { PointsCommonAttributes(domElement, id, name, mx, my, typeLine); - const quint32 basePointId = GetParametrUInt(domElement, VAbstractTool::AttrBasePoint, "0"); - const quint32 p1LineId = GetParametrUInt(domElement, VAbstractTool::AttrP1Line, "0"); - const quint32 p2LineId = GetParametrUInt(domElement, VAbstractTool::AttrP2Line, "0"); + const quint32 basePointId = GetParametrUInt(domElement, VAbstractTool::AttrBasePoint, NULL_ID_STR); + const quint32 p1LineId = GetParametrUInt(domElement, VAbstractTool::AttrP1Line, NULL_ID_STR); + const quint32 p2LineId = GetParametrUInt(domElement, VAbstractTool::AttrP2Line, NULL_ID_STR); VToolHeight::Create(id, name, typeLine, basePointId, p1LineId, p2LineId, mx, my, scene, this, data, parse, Source::FromFile); @@ -1370,10 +1379,10 @@ void VPattern::ParsePointElement(VMainGraphicsScene *scene, QDomElement &domElem try { PointsCommonAttributes(domElement, id, name, mx, my); - const quint32 axisP1Id = GetParametrUInt(domElement, VAbstractTool::AttrAxisP1, "0"); - const quint32 axisP2Id = GetParametrUInt(domElement, VAbstractTool::AttrAxisP2, "0"); - const quint32 firstPointId = GetParametrUInt(domElement, VAbstractTool::AttrFirstPoint, "0"); - const quint32 secondPointId = GetParametrUInt(domElement, VAbstractTool::AttrSecondPoint, "0"); + const quint32 axisP1Id = GetParametrUInt(domElement, VAbstractTool::AttrAxisP1, NULL_ID_STR); + const quint32 axisP2Id = GetParametrUInt(domElement, VAbstractTool::AttrAxisP2, NULL_ID_STR); + const quint32 firstPointId = GetParametrUInt(domElement, VAbstractTool::AttrFirstPoint, NULL_ID_STR); + const quint32 secondPointId = GetParametrUInt(domElement, VAbstractTool::AttrSecondPoint, NULL_ID_STR); VToolTriangle::Create(id, name, axisP1Id, axisP2Id, firstPointId, secondPointId, mx, my, scene, this, data, parse, Source::FromFile); @@ -1389,8 +1398,8 @@ void VPattern::ParsePointElement(VMainGraphicsScene *scene, QDomElement &domElem try { PointsCommonAttributes(domElement, id, name, mx, my); - const quint32 firstPointId = GetParametrUInt(domElement, VAbstractTool::AttrFirstPoint, "0"); - const quint32 secondPointId = GetParametrUInt(domElement, VAbstractTool::AttrSecondPoint, "0"); + const quint32 firstPointId = GetParametrUInt(domElement, VAbstractTool::AttrFirstPoint, NULL_ID_STR); + const quint32 secondPointId = GetParametrUInt(domElement, VAbstractTool::AttrSecondPoint, NULL_ID_STR); VToolPointOfIntersection::Create(id, name, firstPointId, secondPointId, mx, my, scene, this, data, parse, Source::FromFile); @@ -1408,7 +1417,7 @@ void VPattern::ParsePointElement(VMainGraphicsScene *scene, QDomElement &domElem PointsCommonAttributes(domElement, id, name, mx, my); const QString formula = GetParametrString(domElement, VAbstractTool::AttrLength, "0"); QString f = formula;//need for saving fixed formula; - const quint32 splineId = GetParametrUInt(domElement, VToolCutSpline::AttrSpline, "0"); + const quint32 splineId = GetParametrUInt(domElement, VToolCutSpline::AttrSpline, NULL_ID_STR); VToolCutSpline::Create(id, name, f, splineId, mx, my, scene, this, data, parse, Source::FromFile); //Rewrite attribute formula. Need for situation when we have wrong formula. @@ -1437,7 +1446,8 @@ void VPattern::ParsePointElement(VMainGraphicsScene *scene, QDomElement &domElem PointsCommonAttributes(domElement, id, name, mx, my); const QString formula = GetParametrString(domElement, VAbstractTool::AttrLength, "0"); QString f = formula;//need for saving fixed formula; - const quint32 splinePathId = GetParametrUInt(domElement, VToolCutSplinePath::AttrSplinePath, "0"); + const quint32 splinePathId = GetParametrUInt(domElement, VToolCutSplinePath::AttrSplinePath, + NULL_ID_STR); VToolCutSplinePath::Create(id, name, f, splinePathId, mx, my, scene, this, data, parse, Source::FromFile); @@ -1467,7 +1477,7 @@ void VPattern::ParsePointElement(VMainGraphicsScene *scene, QDomElement &domElem PointsCommonAttributes(domElement, id, name, mx, my); const QString formula = GetParametrString(domElement, VAbstractTool::AttrLength, "0"); QString f = formula;//need for saving fixed formula; - const quint32 arcId = GetParametrUInt(domElement, VToolCutArc::AttrArc, "0"); + const quint32 arcId = GetParametrUInt(domElement, VToolCutArc::AttrArc, NULL_ID_STR); VToolCutArc::Create(id, name, f, arcId, mx, my, scene, this, data, parse, Source::FromFile); //Rewrite attribute formula. Need for situation when we have wrong formula. @@ -1495,9 +1505,9 @@ void VPattern::ParsePointElement(VMainGraphicsScene *scene, QDomElement &domElem { PointsCommonAttributes(domElement, id, name, mx, my, typeLine); - const quint32 basePointId = GetParametrUInt(domElement, VAbstractTool::AttrBasePoint, "0"); - const quint32 firstPointId = GetParametrUInt(domElement, VAbstractTool::AttrP1Line, "0"); - const quint32 secondPointId = GetParametrUInt(domElement, VAbstractTool::AttrP2Line, "0"); + const quint32 basePointId = GetParametrUInt(domElement, VAbstractTool::AttrBasePoint, NULL_ID_STR); + const quint32 firstPointId = GetParametrUInt(domElement, VAbstractTool::AttrP1Line, NULL_ID_STR); + const quint32 secondPointId = GetParametrUInt(domElement, VAbstractTool::AttrP2Line, NULL_ID_STR); const QString angle = GetParametrString(domElement, VAbstractTool::AttrAngle, "0.0"); QString angleFix = angle; @@ -1531,8 +1541,8 @@ void VPattern::ParsePointElement(VMainGraphicsScene *scene, QDomElement &domElem { PointsCommonAttributes(domElement, id, name, mx, my, typeLine); - const quint32 basePointId = GetParametrUInt(domElement, VAbstractTool::AttrBasePoint, "0"); - const quint32 curveId = GetParametrUInt(domElement, VAbstractTool::AttrCurve, "0"); + const quint32 basePointId = GetParametrUInt(domElement, VAbstractTool::AttrBasePoint, NULL_ID_STR); + const quint32 curveId = GetParametrUInt(domElement, VAbstractTool::AttrCurve, NULL_ID_STR); const QString angle = GetParametrString(domElement, VAbstractTool::AttrAngle, "0.0"); QString angleFix = angle; @@ -1582,8 +1592,8 @@ void VPattern::ParseLineElement(VMainGraphicsScene *scene, const QDomElement &do try { ToolsCommonAttributes(domElement, id); - const quint32 firstPoint = GetParametrUInt(domElement, VAbstractTool::AttrFirstPoint, "0"); - const quint32 secondPoint = GetParametrUInt(domElement, VAbstractTool::AttrSecondPoint, "0"); + const quint32 firstPoint = GetParametrUInt(domElement, VAbstractTool::AttrFirstPoint, NULL_ID_STR); + const quint32 secondPoint = GetParametrUInt(domElement, VAbstractTool::AttrSecondPoint, NULL_ID_STR); const QString typeLine = GetParametrString(domElement, VAbstractTool::AttrTypeLine, VAbstractTool::TypeLineLine); @@ -1601,8 +1611,8 @@ void VPattern::ParseLineElement(VMainGraphicsScene *scene, const QDomElement &do void VPattern::SplinesCommonAttributes(const QDomElement &domElement, quint32 &id, quint32 &idObject, quint32 &idTool) { ToolsCommonAttributes(domElement, id); - idObject = GetParametrUInt(domElement, VAbstractNode::AttrIdObject, "0"); - idTool = GetParametrUInt(domElement, VAbstractNode::AttrIdTool, "0"); + idObject = GetParametrUInt(domElement, VAbstractNode::AttrIdObject, NULL_ID_STR); + idTool = GetParametrUInt(domElement, VAbstractNode::AttrIdTool, NULL_ID_STR); } //--------------------------------------------------------------------------------------------------------------------- @@ -1791,8 +1801,8 @@ void VPattern::ParseSplineElement(VMainGraphicsScene *scene, const QDomElement & try { ToolsCommonAttributes(domElement, id); - const quint32 point1 = GetParametrUInt(domElement, VAbstractTool::AttrPoint1, "0"); - const quint32 point4 = GetParametrUInt(domElement, VAbstractTool::AttrPoint4, "0"); + const quint32 point1 = GetParametrUInt(domElement, VAbstractTool::AttrPoint1, NULL_ID_STR); + const quint32 point4 = GetParametrUInt(domElement, VAbstractTool::AttrPoint4, NULL_ID_STR); const qreal angle1 = GetParametrDouble(domElement, VAbstractTool::AttrAngle1, "270.0"); const qreal angle2 = GetParametrDouble(domElement, VAbstractTool::AttrAngle2, "90.0"); const qreal kAsm1 = GetParametrDouble(domElement, VAbstractTool::AttrKAsm1, "1.0"); @@ -1828,7 +1838,7 @@ void VPattern::ParseSplineElement(VMainGraphicsScene *scene, const QDomElement & const qreal kAsm1 = GetParametrDouble(element, VAbstractTool::AttrKAsm1, "1.0"); const qreal angle = GetParametrDouble(element, VAbstractTool::AttrAngle, "0"); const qreal kAsm2 = GetParametrDouble(element, VAbstractTool::AttrKAsm2, "1.0"); - const quint32 pSpline = GetParametrUInt(element, VAbstractTool::AttrPSpline, "0"); + const quint32 pSpline = GetParametrUInt(element, VAbstractTool::AttrPSpline, NULL_ID_STR); const VPointF p = *data->GeometricObject(pSpline); QLineF line(0, 0, 100, 0); @@ -1917,7 +1927,7 @@ void VPattern::ParseArcElement(VMainGraphicsScene *scene, QDomElement &domElemen try { ToolsCommonAttributes(domElement, id); - const quint32 center = GetParametrUInt(domElement, VAbstractTool::AttrCenter, "0"); + const quint32 center = GetParametrUInt(domElement, VAbstractTool::AttrCenter, NULL_ID_STR); const QString radius = GetParametrString(domElement, VAbstractTool::AttrRadius, "10"); QString r = radius;//need for saving fixed formula; const QString f1 = GetParametrString(domElement, VAbstractTool::AttrAngle1, "180"); @@ -1952,8 +1962,8 @@ void VPattern::ParseArcElement(VMainGraphicsScene *scene, QDomElement &domElemen try { ToolsCommonAttributes(domElement, id); - const quint32 idObject = GetParametrUInt(domElement, VAbstractNode::AttrIdObject, "0"); - const quint32 idTool = GetParametrUInt(domElement, VAbstractNode::AttrIdTool, "0"); + const quint32 idObject = GetParametrUInt(domElement, VAbstractNode::AttrIdObject, NULL_ID_STR); + const quint32 idTool = GetParametrUInt(domElement, VAbstractNode::AttrIdTool, NULL_ID_STR); VArc *arc = new VArc(*data->GeometricObject(idObject)); arc->setIdObject(idObject); arc->setMode(Draw::Modeling); @@ -2065,7 +2075,7 @@ quint32 VPattern::GetParametrId(const QDomElement &domElement) const QString message = tr("Got wrong parameter id. Need only id > 0."); try { - id = GetParametrUInt(domElement, VDomDocument::AttrId, "0"); + id = GetParametrUInt(domElement, VDomDocument::AttrId, NULL_ID_STR); if (id <= 0) { throw VExceptionWrongId(message, domElement); @@ -2570,29 +2580,6 @@ void VPattern::UpdateMeasurements() } } -//--------------------------------------------------------------------------------------------------------------------- -void VPattern::GarbageCollector() -{ - QHashIterator t(tools); - while (t.hasNext()) - { - t.next(); - VDataTool *tool = t.value(); - if (tool->referens() <= 1) - { - QDomElement domElement = elementById(QString().setNum(t.key())); - if (domElement.isElement()) - { - QDomNode parent = domElement.parentNode(); - if (parent.isNull() == false && parent.toElement().tagName() == TagModeling) - { - parent.removeChild(domElement); - } - } - } - } -} - //--------------------------------------------------------------------------------------------------------------------- void VPattern::ToolsCommonAttributes(const QDomElement &domElement, quint32 &id) { @@ -2751,3 +2738,62 @@ QRectF VPattern::ToolBoundingRect(const QRectF &rec, const quint32 &id) const } return recTool; } + + +//--------------------------------------------------------------------------------------------------------------------- +QVector VPattern::getLocalHistory() const +{ + QVector historyPP; + for (qint32 i = 0; i< history.size(); ++i) + { + const VToolRecord tool = history.at(i); + if (tool.getNameDraw() != GetNameActivPP()) + { + continue; + } + historyPP.append(tool); + } + return historyPP; +} + +//--------------------------------------------------------------------------------------------------------------------- +quint32 VPattern::SiblingNodeId(const quint32 &nodeId) const +{ + quint32 siblingId = NULL_ID; + + const QVector history = getLocalHistory(); + for (qint32 i = 0; i < history.size(); ++i) + { + const VToolRecord tool = history.at(i); + if (nodeId == tool.getId()) + { + if (i == 0) + { + siblingId = NULL_ID; + } + else + { + for (qint32 j = i; j > 0; --j) + { + const VToolRecord tool = history.at(j-1); + switch ( tool.getTypeTool() ) + { + case Tool::Detail: + case Tool::UnionDetails: + case Tool::NodeArc: + case Tool::NodePoint: + case Tool::NodeSpline: + case Tool::NodeSplinePath: + continue; + break; + default: + siblingId = tool.getId(); + j = 0;// break loop + break; + } + } + } + } + } + return siblingId; +} diff --git a/src/app/xml/vpattern.h b/src/app/xml/vpattern.h index 94d31040c..50eb05f00 100644 --- a/src/app/xml/vpattern.h +++ b/src/app/xml/vpattern.h @@ -72,6 +72,7 @@ public: QHash* getTools(); VDataTool* getTool(const quint32 &id); QVector *getHistory(); + QVector getLocalHistory() const; quint32 getCursor() const; void setCursor(const quint32 &value); void setCurrentData(); @@ -182,6 +183,8 @@ public: void SetVersion(); QString GenerateLabel(const LabelType &type)const; + + quint32 SiblingNodeId(const quint32 &nodeId) const; signals: /** * @brief ChangedActivDraw change active pattern peace. @@ -218,6 +221,7 @@ signals: void UndoCommand(); void SetEnabledGUI(bool enabled); void CheckLayout(); + void SetCurrentPP(const QString &patterPiece); public slots: void LiteParseTree(const Document &parse); void haveLiteChange(); @@ -270,7 +274,6 @@ private: void CollectId(const QDomElement &node, QVector &vector)const; void PrepareForParse(const Document &parse); void UpdateMeasurements(); - void GarbageCollector(); void ToolsCommonAttributes(const QDomElement &domElement, quint32 &id); void PointsCommonAttributes(const QDomElement &domElement, quint32 &id, QString &name, qreal &mx, qreal &my, QString &typeLine); @@ -284,6 +287,7 @@ private: void ParseCurrentPP(); void CheckTagExists(const QString &tag); QString GetLabelBase(unsigned int index)const; + void ToolExists(const quint32 &id) const; }; //--------------------------------------------------------------------------------------------------------------------- diff --git a/src/app/xml/vtoolrecord.cpp b/src/app/xml/vtoolrecord.cpp index 9e95347d2..036d88583 100644 --- a/src/app/xml/vtoolrecord.cpp +++ b/src/app/xml/vtoolrecord.cpp @@ -71,3 +71,7 @@ VToolRecord &VToolRecord::operator=(const VToolRecord &record) VToolRecord::VToolRecord(const VToolRecord &record) :id(record.getId()), typeTool(record.getTypeTool()), nameDraw(record.getNameDraw()) {} + +//--------------------------------------------------------------------------------------------------------------------- +VToolRecord::~VToolRecord() +{} diff --git a/src/app/xml/vtoolrecord.h b/src/app/xml/vtoolrecord.h index f21276a0c..5cf185f5a 100644 --- a/src/app/xml/vtoolrecord.h +++ b/src/app/xml/vtoolrecord.h @@ -50,6 +50,7 @@ public: void setTypeTool(const Tool &value); QString getNameDraw() const; void setNameDraw(const QString &value); + ~VToolRecord(); private: /** @brief id tool id. */ quint32 id; diff --git a/src/libs/qmuparser/qmuparser.pro b/src/libs/qmuparser/qmuparser.pro index 0ec702b72..b5247f8ad 100644 --- a/src/libs/qmuparser/qmuparser.pro +++ b/src/libs/qmuparser/qmuparser.pro @@ -103,14 +103,20 @@ CONFIG(debug, debug|release){ # Release mode DEFINES += QT_NO_DEBUG_OUTPUT - unix:!macx{ + !unix:*-g++{ + QMAKE_CXXFLAGS += -fno-omit-frame-pointer # Need for exchndl.dll + } + + !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 = # Strip debug symbols. - QMAKE_POST_LINK += objcopy --only-keep-debug $(DESTDIR)/$(TARGET) $(DESTDIR)/$(TARGET).debug && - QMAKE_POST_LINK += strip --strip-debug --strip-unneeded $(DESTDIR)/$(TARGET) && - QMAKE_POST_LINK += objcopy --add-gnu-debuglink $(DESTDIR)/$(TARGET).debug $(DESTDIR)/$(TARGET) + QMAKE_POST_LINK += objcopy --only-keep-debug bin/${TARGET} bin/${TARGET}.dbg && + QMAKE_POST_LINK += objcopy --strip-debug bin/${TARGET} && + QMAKE_POST_LINK += objcopy --add-gnu-debuglink="bin/${TARGET}.dbg" bin/${TARGET} } } diff --git a/src/libs/qmuparser/qmuparserbase.cpp b/src/libs/qmuparser/qmuparserbase.cpp index b5e83a81e..c627e1f80 100644 --- a/src/libs/qmuparser/qmuparserbase.cpp +++ b/src/libs/qmuparser/qmuparserbase.cpp @@ -773,6 +773,10 @@ void QmuParserBase::ApplyFunc( QStack &a_stOpt, QStack & QVector stArg; for (int i=0; iGetPos(), funTok.GetAsString()); + } stArg.push_back( a_stVal.pop() ); if ( stArg.back().GetType()==tpSTR && funTok.GetType()!=tpSTR ) { diff --git a/src/libs/vpropertyexplorer/stable.h b/src/libs/vpropertyexplorer/stable.h index 6390189fc..119249ac7 100644 --- a/src/libs/vpropertyexplorer/stable.h +++ b/src/libs/vpropertyexplorer/stable.h @@ -36,23 +36,6 @@ # include #endif -//In Windows you can't use same header in all modes. -#if defined(Q_OS_WIN) -# if defined(QT_NO_DEBUG)//release mode - -# ifdef QT_WIDGETS_LIB -# include -# endif - -# endif/*QT_NO_DEBUG*/ -#else - -# ifdef QT_WIDGETS_LIB -# include -# endif - -#endif/*Q_OS_WIN*/ - #endif /*__cplusplus*/ #endif // STABLE_H diff --git a/src/libs/vpropertyexplorer/vpropertyexplorer.pro b/src/libs/vpropertyexplorer/vpropertyexplorer.pro index a797ab03c..c0f8f0f2f 100644 --- a/src/libs/vpropertyexplorer/vpropertyexplorer.pro +++ b/src/libs/vpropertyexplorer/vpropertyexplorer.pro @@ -145,13 +145,20 @@ CONFIG(debug, debug|release){ # Release mode DEFINES += QT_NO_DEBUG_OUTPUT - unix:!macx{ + !unix:*-g++{ + QMAKE_CXXFLAGS += -fno-omit-frame-pointer # Need for exchndl.dll + } + + !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 - # On Linux - QMAKE_POST_LINK += objcopy --only-keep-debug $(DESTDIR)/$(TARGET) $(DESTDIR)/$(TARGET).debug && - QMAKE_POST_LINK += strip --strip-debug --strip-unneeded $(DESTDIR)/$(TARGET) && - QMAKE_POST_LINK += objcopy --add-gnu-debuglink $(DESTDIR)/$(TARGET).debug $(DESTDIR)/$(TARGET) + QMAKE_CFLAGS_RELEASE += -g -gdwarf-3 + QMAKE_LFLAGS_RELEASE = + + # Strip debug symbols. + QMAKE_POST_LINK += objcopy --only-keep-debug bin/${TARGET} bin/${TARGET}.dbg && + QMAKE_POST_LINK += objcopy --strip-debug bin/${TARGET} && + QMAKE_POST_LINK += objcopy --add-gnu-debuglink="bin/${TARGET}.dbg" bin/${TARGET} } }