diff --git a/.travis.yml b/.travis.yml index 21e3d075c..f127c76aa 100644 --- a/.travis.yml +++ b/.travis.yml @@ -4,53 +4,31 @@ jobs: - stage: main test os: linux dist: xenial - sudo: required compiler: clang env: - DEPLOY=false - CCACHE_CPP2=yes - RUN_TESTS=true - cache: - - ccache - directories: - - "$HOME/.sonar/cache" + cache: + ccache: true + directories: + - "$HOME/.sonar/cache" - os: linux dist: bionic - sudo: required compiler: clang env: - DEPLOY=false - CCACHE_CPP2=yes - RUN_TESTS=true cache: - - ccache - directories: - - "$HOME/.sonar/cache" + ccache: true + directories: + - "$HOME/.sonar/cache" - os: osx compiler: clang env: - DEPLOY=true - - LEGACY=false osx_image: xcode11 - - os: osx - compiler: clang - env: - - DEPLOY=true - - LEGACY=true - osx_image: xcode8 - - stage: sonarcloud - os: linux - dist: xenial - sudo: required - compiler: clang - env: - - DEPLOY=false - - CCACHE_CPP2=yes - - RUN_TESTS=false - cache: - - ccache - directories: - - "$HOME/.sonar/cache" before_install: - | if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then @@ -73,12 +51,7 @@ before_install: sudo dpkg -i ccache_3.3.4-1_amd64.deb; else brew update > /dev/null; - if [[ "$LEGACY" = false ]]; then - brew install qt5; - else - unset SSL_CERT_FILE; - brew install https://gist.githubusercontent.com/dismine/c3ac01de38e12edcf22d9e05791adf82/raw/20544ac8e68ef3523f92e15f432bbaf9a6aa2c22/qt5.rb; - fi + brew install qt5; chmod -R 755 /usr/local/opt/qt5/* fi before_script: @@ -111,14 +84,10 @@ script: - "$CXX --version" - | if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then + make -j$(nproc); if [[ "$RUN_TESTS" == "true" ]]; then - make -j$(nproc); export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:"$TRAVIS_BUILD_DIR/build/src/libs/vpropertyexplorer/bin:$TRAVIS_BUILD_DIR/build/src/libs/qmuparser/bin"; xvfb-run -a make --silent check TESTARGS="-silent"; - else - build-wrapper-linux-x86-64 --out-dir ../bw-outputs make -j$(nproc); - cd ..; - sonar-scanner; fi else make -j1; @@ -133,27 +102,15 @@ before_deploy: - | if [[ "$DEPLOY" == "true" ]]; then ../scripts/macfixqtdylibrpath.py $TRAVIS_BUILD_DIR/build/src/app/valentina/bin/Valentina.app; - if [[ "$LEGACY" = false ]]; then - tar -C $TRAVIS_BUILD_DIR/build/src/app/valentina/bin --exclude "*.DS_Store" -cvzf valentina-osx-${TRAVIS_COMMIT}.tar.gz Valentina.app/; - else - tar -C $TRAVIS_BUILD_DIR/build/src/app/valentina/bin --exclude "*.DS_Store" -cvzf valentina-osx-${TRAVIS_COMMIT}-legacy.tar.gz Valentina.app/; - fi + tar -C $TRAVIS_BUILD_DIR/build/src/app/valentina/bin --exclude "*.DS_Store" -cvzf valentina-osx-${TRAVIS_COMMIT}.tar.gz Valentina.app/; fi deploy: - edge: - branch: v1.8.47 provider: bintray skip_cleanup: true file: "../share/bintray.json" user: dismine key: secure: q9rcswyUyOqHAnxL0FLEQ8tdFkE21kNlv/TUpZgk0MbcsWRhBWaKJVv5kz6ABkjeLMB7c7eS7KfYRui0RFBKHI7ZnpzHBZN4f1aGd/rf9m5qaZdKFFBlpz4tXPHvXOVyXRwOReqFj7brAz6NB+oqJN8HFA4Q1y039yZOaHt28JkwYSDqS5lRvbwegYS8kaJupGZcm8NaNeB8tuXuZ/8DIQpZdVKmBUwpgpPAewCEqYP4z9DUpsmMZ5h63g7mJKm9di91cQr65eS24io6m1ZfAx8M6kTaKwyR5nz8a8bnqR48AAnbNoM8Xj1sgJqnT40DZKPCNr7KL3JSNRglKNgHVMFBOj0v9F5YxsDs8twWuqFVbywB+lNSHDyvGVgmS2+EdwKLQT0YBxYfIL1nh34ed7GffZZmBcAJGfxo8ieAMRgyylSyQIHJ0ZBl6X6DzOvLpvFlcva9yhqZfkx3P/Dgarqklnj3DdvzTDW2vxCT4yVLpMySlBXW2I3s7m8xpOjZbM7eZfMZkwjd/e8IYp8jxdQnxlzNe15mzxSXnZjLz3Rwi1qzhJZyZf4OGVxuQuR9oW+c5q55OOY5hImtZELlJyu1K0zKTd85g0D+WwKj4J30J0QWl1pxZlln59Q5cMmpyQ7sc8zN1WPoWAEyavwPrf4028TpEJqaUw/0cQGg9I4= - dry-run: false on: all_branches: true condition: "$DEPLOY = true" -addons: - sonarcloud: - organization: "dismine" - token: - secure: L8uC9uH9d+coVwndZ+UzDpMFS+fxk8dCSEcoAIXC22xg4PhHACbZJqrSANRNy8UC7LZHdFlGDozeHLqw6FPanKIoNy6yX7ngGjuR2azLOdqNhBvlhH6Knc0ua7zSpQuHDkkv3vwdJHS4MNXvAwTr+ErLXmEBvuekiM2HEHGRA8MtdEo9naq+m65/ZTkn3iiA654HT2gh3afYDONyTbEa6WkGmoI1Z597PoIJ/0HaKf9TqO/FahXhLYmLL9UW7rPCwj8rUyLiJ39lRrmo2JAPdRT/QoxAA5l97OI+IMjv5ut5p1KZUozuAedxj8kx43QAw+YuRqBZAuZOy5meFSHV62WG5CbqCuZPE79+JyLTYSKxuuzK6v8F6jnQRXC79EdYEIRbXtC86ZftFDgHTt1LP4JaBoPV9ee3DiY7PHO65oSjey7831Ou18UcjmV0BqtQfVVAWsRKYTqjFCBKa9hNDbzIKHLbmj5/K5TitBMTBpjSYnLYJdkDWY3DPGpWDFyT2oo2bRrSl9/UsuT27hi5psMTQSlrYqIGezVz0KDf3TjWPS5RhHjMr+Lt4Ykh5YxKw9zmvH9gvPwOQbfTtPNZHGOMt1Q8aZhovruYDlBleBFuDaHnKV8U9lJr2BOb44nvx+BBURo/Xq1cNew9UNitjTvtEmPeocOLMb2lFMkXAbs= diff --git a/ChangeLog.txt b/ChangeLog.txt index 92225cdc2..a505b4469 100644 --- a/ChangeLog.txt +++ b/ChangeLog.txt @@ -1,4 +1,14 @@ -# Version 0.7.0 (unreleased) +# Version 0.7.37 (unreleased) +- Fix Tape crash on Mac OS X. +- Fix issue in VAbstractCurve::CurveIntersectAxis. +- Improve editing a spline path through control points for locked angles. +- [smart-pattern/valentina#73] Notes for tools. +- Fix crash while synchronize measurements. +- Object alias. +- Change value for an uninitialized local variable to NAN. +- Independent pen style and color after a group operation. + +# Version 0.7.36 October 24, 2020 - [#892] Show tooltip for piece node point. - [#894] Quick way to disable a passmark. - [#895] Improve path validation. Do not allow repeat the same curve twice. @@ -50,6 +60,10 @@ - Improve the property browser. Show full arc name. - [smart-pattern/valentina#45] Optimize tool box position for big screen resolutions. - [smart-pattern/valentina#40] Invalid name of arc in modeling mode. +- New warning. Error calculating segment of curve. +- Improve searching lost measurements. Additional case with underscores instead of regular spaces. +- Redesign multisize measurements. +- [smart-pattern/valentina#5] New versioning schema. # Version 0.6.2 (unreleased) - [#903] Bug in tool Cut Spline path. @@ -89,6 +103,9 @@ - Fix crash after uniting three pieces in sequence. - Incorrect conversion to newer curve format. - Elide a variable description in the formula wizard. +- Fix removing a pin in the Seam Allowance tool dialog. +- Fix label size for case with two pins. +- Fix crash while synchronize measurements. # Version 0.6.1 October 23, 2018 - [#885] Regression. Broken support for multi size measurements. diff --git a/appveyor.yml b/appveyor.yml index d29638b3d..2488ff2b3 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -39,10 +39,10 @@ shallow_clone: false # default is "false" environment: matrix: - APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2019 - QT5: Qt\5.14\mingw73_32 - QT_VERSION: Qt5.14 + QT5: Qt\5.15\mingw81_32 + QT_VERSION: Qt5.15 QMAKE_GENERATOR: "MinGW Makefiles" - MINGW_PATH: C:\Qt\Tools\mingw730_32\bin + MINGW_PATH: C:\Qt\Tools\mingw810_32\bin PLATFORM: x86 DEPLOY: true - APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2015 @@ -52,6 +52,26 @@ environment: MINGW_PATH: C:\Qt\Tools\mingw492_32\bin PLATFORM: x86 DEPLOY: true + - APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2019 + QT5: Qt\5.15\mingw81_64 + QT_VERSION: Qt5.15 + QMAKE_GENERATOR: "MinGW Makefiles" + MINGW_PATH: C:\Qt\Tools\mingw810_64\bin + PLATFORM: x64 + DEPLOY: false + - APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2019 + QT5: Qt\5.15\msvc2019_64 + QMAKE_GENERATOR: "NMake Makefiles JOM" + VSVER: 16 + PLATFORM: x64 + DEPLOY: false + - APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2019 + QT5: Qt\5.14\mingw73_32 + QT_VERSION: Qt5.14 + QMAKE_GENERATOR: "MinGW Makefiles" + MINGW_PATH: C:\Qt\Tools\mingw730_32\bin + PLATFORM: x86 + DEPLOY: false - APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2019 QT5: Qt\5.14\mingw73_64 QT_VERSION: Qt5.14 @@ -238,7 +258,7 @@ deploy: package: valentina-win_auto-upload publish: true override: true - version: 0.7.0a + version: 0.7.36 on: DEPLOY: true artifact: valentina-win-$(QT_VERSION)-$(APPVEYOR_REPO_BRANCH)-$(APPVEYOR_REPO_COMMIT) diff --git a/common.pri b/common.pri index efdd80636..858645b51 100644 --- a/common.pri +++ b/common.pri @@ -19,6 +19,19 @@ unix{ } else { VCOPY = $$QMAKE_COPY -u } + + # Default prefix. Use for creation install path. + DEFAULT_PREFIX = /usr + + # Prefix for binary file. + isEmpty(PREFIX){ + PREFIX = $$DEFAULT_PREFIX + } + + BINDIR = $$PREFIX/bin + DATADIR = $$PREFIX/share + PKGDATADIR = $$DATADIR/valentina + DEFINES += BINDIR=\\\"$$BINDIR\\\" DATADIR=\\\"$$DATADIR\\\" PKGDATADIR=\\\"$$PKGDATADIR\\\" } win32{ @@ -310,9 +323,6 @@ defineReplace(FindLatestTagDistance){ } } -# Default prefix. Use for creation install path. -DEFAULT_PREFIX = /usr - # In debug mode on Unix system we use all usefull for us compilers keys for checking errors. # Also trying make all possible for speed up build time. unix { @@ -934,6 +944,7 @@ MSVC_DEBUG_CXXFLAGS += \ -wd5027 \ # move assignment operator was implicitly defined as deleted -wd5039 \ # pointer or reference to potentially throwing function passed to extern C function under -EHc. -wd4774 \ # format string expected in argument 3 is not a string literal - -wd5204 # class has virtual functions, but its trivial destructor is not virtual; instances of objects derived - # from this class may not be destructed correctly + -wd5204 \ # class has virtual functions, but its trivial destructor is not virtual; instances of objects derived + # from this class may not be destructed correctly + -wd5219 # implicit conversion from '' to '', possible loss of data } diff --git a/dist/OBS_debian/debian.changelog b/dist/OBS_debian/debian.changelog index fc240c30c..384fbf8ed 100644 --- a/dist/OBS_debian/debian.changelog +++ b/dist/OBS_debian/debian.changelog @@ -1,5 +1,5 @@ -valentina (0.7.0) trusty; urgency=low +valentina (0.7.36) trusty; urgency=low * Auto build. - -- dismine Mon, 12 Oct 2018 12:27:00 +0300 + -- dismine Sat, 24 Oct 2020 12:27:00 +0300 diff --git a/dist/OBS_debian/debian.control b/dist/OBS_debian/debian.control index 8f3c4651c..31a0b8ca4 100644 --- a/dist/OBS_debian/debian.control +++ b/dist/OBS_debian/debian.control @@ -16,8 +16,7 @@ Vcs-Browser: https://gitlab.com/smart-pattern/valentina Package: valentina Architecture: i386 amd64 -Depends: libc6 (>= 2.4), libgcc1 (>= 1:4.1.1), libqt5core5a (>= 5.4.0) | libqt5core5 (>= 5.4.0), libqt5gui5 (>= 5.4.0) | libqt5gui5-gles (>= 5.4.0), libqt5printsupport5 (>= 5.4.0), libqt5svg5 (>= 5.4.0), libqt5widgets5 (>= 5.4.0), libqt5xml5 (>= 5.4.0), libqt5xmlpatterns5 (>= 5.4.0), libqt5concurrent5(>= 5.4.0), libqt5opengl5 (>= 5.4.0), libstdc++6 (>= 4.8) -Suggests: xpdf +Depends: libc6 (>= 2.4), libgcc1 (>= 1:4.1.1), libqt5core5a (>= 5.4.0) | libqt5core5 (>= 5.4.0), libqt5gui5 (>= 5.4.0) | libqt5gui5-gles (>= 5.4.0), libqt5printsupport5 (>= 5.4.0), libqt5svg5 (>= 5.4.0), libqt5widgets5 (>= 5.4.0), libqt5xml5 (>= 5.4.0), libqt5xmlpatterns5 (>= 5.4.0), libqt5concurrent5(>= 5.4.0), libqt5opengl5 (>= 5.4.0), libstdc++6 (>= 4.8), poppler-utils Conflicts: seamly2d Description: Pattern making program. Valentina is a cross-platform patternmaking program which allows designers diff --git a/dist/OBS_debian/debian.tape.1 b/dist/OBS_debian/debian.tape.1 index 83d3dfc27..97e240551 100644 --- a/dist/OBS_debian/debian.tape.1 +++ b/dist/OBS_debian/debian.tape.1 @@ -1,6 +1,6 @@ .\" Manpage for tape. .\" Contact dismine@gmail.com to correct errors. -.TH tape 1 "10 March, 2017" "tape man page" +.TH tape 1 "3 October, 2020" "tape man page" .SH NAME Tape \- Valentina's measurements editor. .SH SYNOPSIS @@ -20,12 +20,14 @@ is a part of Valentina. And used for creating and editing measurement files. Displays this help. .IP "-v, --version" Displays version information. -.IP "-e, --height " -Open with the base height. Valid values: 92, 98, 104, 110, 116, 122, 128, 134, 140, 146, 152, 158, 164, 170, 176, 182, 188, 194, 200cm. -.IP "-s, --size " -Open with the base size. Valid values: 22, 24, 26, 28, 30, 32, 34, 36, 38, 40, 42, 44, 46, 48, 50, 52, 54, 56cm. -.IP "-u, --unit " -Set pattern file unit: cm, mm, inch. +.IP "-a, --dimensionA " +Set base for dimension A in the table units. +.IP "-b, --dimensionB " +Set base for dimension B in the table units. +.IP "-c, --dimensionA " +Set base for dimension C in the table units. +.IP "-u, --units " +Set pattern file units: cm, mm, inch. .IP "--test" Use for unit testing. Run the program and open a file without showing the main window. .IP "--no-scaling" @@ -35,9 +37,5 @@ Disable high dpi scaling. Call this option if has problem with scaling (by defau \- the measurement file. .SH AUTHOR .RI "This manual page was written by Roman Telezhynskyi <" dismine@gmail.com ">" -.SH "SEE ALSO" -.RB "Full " "User Manual" " is availiable in" -.UR https://bitbucket.org/dismine/valentina/wiki/manual/Content -.UE .BR valentina (1) diff --git a/dist/OBS_debian/debian.valentina.1 b/dist/OBS_debian/debian.valentina.1 index 48c841dd1..44803fad8 100644 --- a/dist/OBS_debian/debian.valentina.1 +++ b/dist/OBS_debian/debian.valentina.1 @@ -139,10 +139,12 @@ The path to output destination folder. By default the directory at which the app .RB "Export only details. Export details as they positioned in the details mode. Any layout related options will be ignored." .IP "--exportSuchDetails " .RB "Export only details that match a piece name regex." -.IP "-x, --gsize " -.RB "Set size value a pattern file, that was opened with multisize measurements " "(export mode)" ". Valid values: 22, 24, 26, 28, 30, 32, 34, 36, 38, 40, 42, 44, 46, 48, 50, 52, 54, 56cm." -.IP "-e, --gheight " -.RB "Set height value a pattern file, that was opened with multisize measurements (" "export mode" "). Valid values: 92, 98, 104, 110, 116, 122, 128, 134, 140, 146, 152, 158, 164, 170, 176, 182, 188, 194, 200cm." +.IP "--dimensionA " +.RB "Set base for dimension A in the multisize measurements units " "(export mode)" "." +.IP "--dimensionB " +.RB "Set base for dimension B in the multisize measurements units " "(export mode)" "." +.IP "--dimensionC " +.RB "Set base for dimension C in the multisize measurements units " "(export mode)" "." .IP "--userMaterial " .RB "Use this option to override user material defined in pattern. The value must be in form @. The number should be in range from 1 to 20. For example, 1@Fabric2. The key can be used multiple times. Has no effect in GUI mode." .IP "-p, --pageformat