From e729ed0bc255bd103612a3ba52336004e77cd5d3 Mon Sep 17 00:00:00 2001 From: Trevor SANDY Date: Mon, 19 Jun 2023 17:38:13 +0200 Subject: [PATCH] Fade and highlight - spurious LPUB_FADE, LPUB_HIGHLIGHT warning #710 --- builds/linux/obs/PKGBUILD | 2 +- builds/linux/obs/alldeps/PKGBUILD | 2 +- builds/linux/obs/alldeps/debian/changelog | 6 +++--- builds/linux/obs/alldeps/debian/lpub3d.dsc | 2 +- builds/linux/obs/alldeps/lpub3d.spec | 4 ++-- builds/linux/obs/debian/changelog | 6 +++--- builds/linux/obs/debian/lpub3d.dsc | 2 +- builds/linux/obs/lpub3d.spec | 4 ++-- builds/utilities/version.info | 2 +- gitversion.pri | 6 +++--- mainApp/docs/README.txt | 2 +- mainApp/docs/RELEASE_NOTES.html | 2 +- mainApp/extras/LPub3D_Npp_UDL.xml | 4 ++-- mainApp/lpub_object.cpp | 22 ++++++++++++---------- 14 files changed, 34 insertions(+), 32 deletions(-) diff --git a/builds/linux/obs/PKGBUILD b/builds/linux/obs/PKGBUILD index f68db01ef..8c5f1b45c 100755 --- a/builds/linux/obs/PKGBUILD +++ b/builds/linux/obs/PKGBUILD @@ -2,7 +2,7 @@ # Last Update: July 19, 2020 # Copyright (C) 2017 - 2023 by Trevor SANDY pkgname=lpub3d -pkgver=2.4.6.3470 +pkgver=2.4.6.3471 pkgrel=1 pkgdesc="An LDraw Building Instruction Editor" url="https://github.com/trevorsandy/lpub3d.git" diff --git a/builds/linux/obs/alldeps/PKGBUILD b/builds/linux/obs/alldeps/PKGBUILD index ee3cc08ac..54fe51615 100644 --- a/builds/linux/obs/alldeps/PKGBUILD +++ b/builds/linux/obs/alldeps/PKGBUILD @@ -2,7 +2,7 @@ # Last Update: July 19, 2020 # Copyright (C) 2017 - 2023 by Trevor SANDY pkgname=lpub3d -pkgver=2.4.6.3470 +pkgver=2.4.6.3471 pkgrel=1 pkgdesc="An LDraw Building Instruction Editor" url="https://github.com/trevorsandy/lpub3d.git" diff --git a/builds/linux/obs/alldeps/debian/changelog b/builds/linux/obs/alldeps/debian/changelog index 2d3845964..8cf4d7421 100644 --- a/builds/linux/obs/alldeps/debian/changelog +++ b/builds/linux/obs/alldeps/debian/changelog @@ -1,5 +1,5 @@ -lpub3d (2.4.6.3470) debian; urgency=medium +lpub3d (2.4.6.3471) debian; urgency=medium - * LPub3D version 2.4.6.359.3470_20230619 for Linux + * LPub3D version 2.4.6.360.3471_20230619 for Linux - -- Trevor SANDY Mon, 19 Jun 2023 17:36:02 +0200 + -- Trevor SANDY Mon, 19 Jun 2023 17:38:14 +0200 diff --git a/builds/linux/obs/alldeps/debian/lpub3d.dsc b/builds/linux/obs/alldeps/debian/lpub3d.dsc index 73d445cea..912cb1fd1 100644 --- a/builds/linux/obs/alldeps/debian/lpub3d.dsc +++ b/builds/linux/obs/alldeps/debian/lpub3d.dsc @@ -2,7 +2,7 @@ Format: 1.0 Source: lpub3d Binary: lpub3d Architecture: any -Version: 2.4.6.3470 +Version: 2.4.6.3471 Maintainer: Trevor SANDY Homepage: https://trevorsandy.github.io/lpub3d/ Standards-Version: 3.9.7 diff --git a/builds/linux/obs/alldeps/lpub3d.spec b/builds/linux/obs/alldeps/lpub3d.spec index 14403ff47..dcab2085d 100644 --- a/builds/linux/obs/alldeps/lpub3d.spec +++ b/builds/linux/obs/alldeps/lpub3d.spec @@ -120,7 +120,7 @@ BuildRequires: fdupes Summary: An LDraw Building Instruction Editor Name: lpub3d Icon: lpub3d.xpm -Version: 2.4.6.3470 +Version: 2.4.6.3471 Release: %{?dist} URL: https://trevorsandy.github.io/lpub3d Vendor: Trevor SANDY @@ -797,7 +797,7 @@ update-desktop-database || true %endif %changelog -* Mon Jun 19 2023 - trevor.dot.sandy.at.gmail.dot.com 2.4.6.3470 +* Mon Jun 19 2023 - trevor.dot.sandy.at.gmail.dot.com 2.4.6.3471 - LPub3D 2.4.4 enhancements and fixes - see RELEASE_NOTES for details * Tue May 31 2022 - trevor dot sandy at gmail dot com 2.4.4.2670 diff --git a/builds/linux/obs/debian/changelog b/builds/linux/obs/debian/changelog index 29fca901d..48063124e 100644 --- a/builds/linux/obs/debian/changelog +++ b/builds/linux/obs/debian/changelog @@ -1,5 +1,5 @@ -lpub3d (2.4.6.3470) debian; urgency=medium +lpub3d (2.4.6.3471) debian; urgency=medium - * LPub3D version 2.4.6.359.3470_20230619 for Linux + * LPub3D version 2.4.6.360.3471_20230619 for Linux - -- Trevor SANDY Mon, 19 Jun 2023 17:36:04 +0200 + -- Trevor SANDY Mon, 19 Jun 2023 17:38:16 +0200 diff --git a/builds/linux/obs/debian/lpub3d.dsc b/builds/linux/obs/debian/lpub3d.dsc index 9000329c2..521fd3aec 100755 --- a/builds/linux/obs/debian/lpub3d.dsc +++ b/builds/linux/obs/debian/lpub3d.dsc @@ -2,7 +2,7 @@ Format: 1.0 Source: lpub3d Binary: lpub3d Architecture: any -Version: 2.4.6.3470 +Version: 2.4.6.3471 Maintainer: Trevor SANDY Homepage: https://trevorsandy.github.io/lpub3d/ Standards-Version: 3.9.7 diff --git a/builds/linux/obs/lpub3d.spec b/builds/linux/obs/lpub3d.spec index d24c83e68..dd4c0ea71 100755 --- a/builds/linux/obs/lpub3d.spec +++ b/builds/linux/obs/lpub3d.spec @@ -82,7 +82,7 @@ BuildRequires: fdupes Summary: An LDraw Building Instruction Editor Name: lpub3d Icon: lpub3d.xpm -Version: 2.4.6.3470 +Version: 2.4.6.3471 Release: 1%{?dist} URL: https://trevorsandy.github.io/lpub3d Vendor: Trevor SANDY @@ -313,7 +313,7 @@ update-desktop-database || true %endif %changelog -* Mon Jun 19 2023 - trevor.dot.sandy.at.gmail.dot.com 2.4.6.3470 +* Mon Jun 19 2023 - trevor.dot.sandy.at.gmail.dot.com 2.4.6.3471 - LPub3D 2.4.4 enhancements and fixes - see RELEASE_NOTES for details * Tue May 31 2022 - trevor dot sandy at gmail dot com 2.4.4.2670 diff --git a/builds/utilities/version.info b/builds/utilities/version.info index 158d349a8..34686d660 100755 --- a/builds/utilities/version.info +++ b/builds/utilities/version.info @@ -1 +1 @@ -2 4 6 359 3470 221bb9b14 +2 4 6 360 3471 64695cb65 diff --git a/gitversion.pri b/gitversion.pri index 8049a6673..e486ebe71 100644 --- a/gitversion.pri +++ b/gitversion.pri @@ -41,7 +41,7 @@ equals(GIT_DIR, undefined) { # Check if we do not have a valid version number (i.e. no version tag found) isEmpty(GIT_VERSION) { - GIT_REVISION = 359 + GIT_REVISION = 360 GIT_SHA = $$system($$GIT_BASE_COMMAND rev-parse --short HEAD 2> $$NULL_DEVICE) GIT_COMMIT = $$system($$GIT_BASE_COMMAND rev-list --count HEAD 2> $$NULL_DEVICE) GIT_VERSION = v$${VERSION}-$${GIT_REVISION}-$${GIT_SHA} @@ -69,7 +69,7 @@ equals(GIT_DIR, undefined) { # Get commit count GIT_COMMIT = $$system($$GIT_BASE_COMMAND rev-list --count HEAD 2> $$NULL_DEVICE) isEmpty(GIT_COMMIT) { - GIT_COMMIT = 3470 + GIT_COMMIT = 3471 message("~~~ ERROR! GIT_COMMIT NOT DEFINED, USING $$GIT_COMMIT ~~~") } @@ -117,7 +117,7 @@ if (equals(USE_GIT_VER_FILE, true)|equals(USE_VERSION_INFO_VAR, true)) { GIT_VERSION = $$cat($$GIT_VER_FILE, lines) } else { message("~~~ ERROR! $$GIT_DIR_ENV VERSION_INFO FILE $$GIT_VER_FILE NOT FOUND ~~~") - GIT_VERSION = $${VERSION}.359.3470.221bb9b14 + GIT_VERSION = $${VERSION}.360.3471.64695cb65 message("~~~ GIT_DIR [$$GIT_DIR_ENV, USING VERSION] $$GIT_VERSION ~~~") GIT_VERSION ~= s/\./" " } diff --git a/mainApp/docs/README.txt b/mainApp/docs/README.txt index 9dcf06d5c..399fe89cc 100755 --- a/mainApp/docs/README.txt +++ b/mainApp/docs/README.txt @@ -1,4 +1,4 @@ -LPub3D 2.4.6.359.3470 (19 06 2023 17:36:04) +LPub3D 2.4.6.360.3471 (19 06 2023 17:38:16) Features, enhancements, fixes and changes ------------ diff --git a/mainApp/docs/RELEASE_NOTES.html b/mainApp/docs/RELEASE_NOTES.html index 7e5264dc8..cd0a5397b 100644 --- a/mainApp/docs/RELEASE_NOTES.html +++ b/mainApp/docs/RELEASE_NOTES.html @@ -18,7 +18,7 @@
-

LPub3D 2.4.6.359.3470 (19 06 2023 17:36:04)

+

LPub3D 2.4.6.360.3471 (19 06 2023 17:38:16)

LPub3D Official release.
diff --git a/mainApp/extras/LPub3D_Npp_UDL.xml b/mainApp/extras/LPub3D_Npp_UDL.xml index 7f09945b2..496475163 100644 --- a/mainApp/extras/LPub3D_Npp_UDL.xml +++ b/mainApp/extras/LPub3D_Npp_UDL.xml @@ -14,8 +14,8 @@ ;; ;; Author......: Trevor SANDY ;; Name........: LPub3D_Npp_UDL.xml -;; Version.....: 2.4.6.359.3470 -;; Last Update.: Mon, 19 Jun 2023 17:36:04 +0200 +;; Version.....: 2.4.6.360.3471 +;; Last Update.: Mon, 19 Jun 2023 17:38:16 +0200 ;; License.....: GPLv3 ;; Homepage....: https://trevorsandy.github.io/lpub3d ;; Copyright (C) 2021 - 2023 by Trevor SANDY diff --git a/mainApp/lpub_object.cpp b/mainApp/lpub_object.cpp index 148b97a31..f02f5b5e0 100644 --- a/mainApp/lpub_object.cpp +++ b/mainApp/lpub_object.cpp @@ -637,11 +637,12 @@ bool LPub::setFadeStepsFromCommand() if (lpubFade) { if (result != QLatin1String("GLOBAL")) emit lpub->messageSig(LOG_WARNING,tr("Top level LPUB_FADE command missing GLOBAL qualifier."),true/*Show Dialog*/); - } else if (Preferences::preferredRenderer != RENDERER_NATIVE) { - emit lpub->messageSig(LOG_WARNING,tr("LPUB_FADE command IGNORED.
" - "LPUB_FADE command requires preferred render RENDERER_NATIVE.
" - "PREFERRED_RENDERER command must precede LPUB_FADE."),true/*Show Dialog*/); - lpubFade = true; + if (!nativeRenderer) { + emit lpub->messageSig(LOG_WARNING,tr("LPUB_FADE command IGNORED.
" + "LPUB_FADE command requires preferred render RENDERER_NATIVE.
" + "PREFERRED_RENDERER command must precede LPUB_FADE."),true/*Show Dialog*/); + lpubFade = false; + } } if (!Preferences::enableFadeSteps) { @@ -740,11 +741,12 @@ bool LPub::setHighlightStepFromCommand() if (lpubHighlight) { if (result != QLatin1String("GLOBAL")) emit lpub->messageSig(LOG_WARNING,tr("Top level LPUB_FADE command missing GLOBAL qualifier."),true/*Show Dialog*/); - } else if (Preferences::preferredRenderer != RENDERER_NATIVE) { - emit lpub->messageSig(LOG_WARNING,tr("LPUB_HIGHLIGHT command IGNORED.
" - "LPUB_HIGHLIGHT command requires preferred render RENDERER_NATIVE.
" - "PREFERRED_RENDERER command must precede LPUB_HIGHLIGHT."),true/*Show Dialog*/); - lpubHighlight = true; + if (!nativeRenderer) { + emit lpub->messageSig(LOG_WARNING,tr("LPUB_HIGHLIGHT command IGNORED.
" + "LPUB_HIGHLIGHT command requires preferred render RENDERER_NATIVE.
" + "PREFERRED_RENDERER command must precede LPUB_HIGHLIGHT."),true/*Show Dialog*/); + lpubHighlight = false; + } } if (!Preferences::enableHighlightStep) {