From 0cadc66c0e1fc26e6f5049bb8506b95aa67fa8ce Mon Sep 17 00:00:00 2001 From: Trevor SANDY Date: Sat, 17 Jun 2023 01:06:44 +0200 Subject: [PATCH] Insert display model - reverse fade submodel for display step #704 --- 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/step.cpp | 38 +++------------------- 14 files changed, 26 insertions(+), 56 deletions(-) diff --git a/builds/linux/obs/PKGBUILD b/builds/linux/obs/PKGBUILD index 331ddf2d4..7f744d494 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.3441 +pkgver=2.4.6.3442 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 7f82c900f..00c0cfc5a 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.3441 +pkgver=2.4.6.3442 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 9f1d4d083..1135704f0 100644 --- a/builds/linux/obs/alldeps/debian/changelog +++ b/builds/linux/obs/alldeps/debian/changelog @@ -1,5 +1,5 @@ -lpub3d (2.4.6.3441) debian; urgency=medium +lpub3d (2.4.6.3442) debian; urgency=medium - * LPub3D version 2.4.6.330.3441_20230617 for Linux + * LPub3D version 2.4.6.331.3442_20230617 for Linux - -- Trevor SANDY Sat, 17 Jun 2023 01:04:44 +0200 + -- Trevor SANDY Sat, 17 Jun 2023 01:06:46 +0200 diff --git a/builds/linux/obs/alldeps/debian/lpub3d.dsc b/builds/linux/obs/alldeps/debian/lpub3d.dsc index 19fbc0f57..861689af2 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.3441 +Version: 2.4.6.3442 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 8d271c399..10b0e311b 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.3441 +Version: 2.4.6.3442 Release: %{?dist} URL: https://trevorsandy.github.io/lpub3d Vendor: Trevor SANDY @@ -797,7 +797,7 @@ update-desktop-database || true %endif %changelog -* Sat Jun 17 2023 - trevor.dot.sandy.at.gmail.dot.com 2.4.6.3441 +* Sat Jun 17 2023 - trevor.dot.sandy.at.gmail.dot.com 2.4.6.3442 - 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 5404a0c47..56f3c9642 100644 --- a/builds/linux/obs/debian/changelog +++ b/builds/linux/obs/debian/changelog @@ -1,5 +1,5 @@ -lpub3d (2.4.6.3441) debian; urgency=medium +lpub3d (2.4.6.3442) debian; urgency=medium - * LPub3D version 2.4.6.330.3441_20230617 for Linux + * LPub3D version 2.4.6.331.3442_20230617 for Linux - -- Trevor SANDY Sat, 17 Jun 2023 01:04:45 +0200 + -- Trevor SANDY Sat, 17 Jun 2023 01:06:47 +0200 diff --git a/builds/linux/obs/debian/lpub3d.dsc b/builds/linux/obs/debian/lpub3d.dsc index 2327fbbe1..29cfeb75d 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.3441 +Version: 2.4.6.3442 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 7f9c009eb..d4102cd87 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.3441 +Version: 2.4.6.3442 Release: 1%{?dist} URL: https://trevorsandy.github.io/lpub3d Vendor: Trevor SANDY @@ -313,7 +313,7 @@ update-desktop-database || true %endif %changelog -* Sat Jun 17 2023 - trevor.dot.sandy.at.gmail.dot.com 2.4.6.3441 +* Sat Jun 17 2023 - trevor.dot.sandy.at.gmail.dot.com 2.4.6.3442 - 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 b9090acfc..d751ce555 100755 --- a/builds/utilities/version.info +++ b/builds/utilities/version.info @@ -1 +1 @@ -2 4 6 330 3441 201fc5e84 +2 4 6 331 3442 bf4841073 diff --git a/gitversion.pri b/gitversion.pri index 51222b106..fe50b2117 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 = 330 + GIT_REVISION = 331 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 = 3441 + GIT_COMMIT = 3442 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}.330.3441.201fc5e84 + GIT_VERSION = $${VERSION}.331.3442.bf4841073 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 5a808ecb3..d7fae89f9 100755 --- a/mainApp/docs/README.txt +++ b/mainApp/docs/README.txt @@ -1,4 +1,4 @@ -LPub3D 2.4.6.330.3441 (17 06 2023 01:04:45) +LPub3D 2.4.6.331.3442 (17 06 2023 01:06:47) Features, enhancements, fixes and changes ------------ diff --git a/mainApp/docs/RELEASE_NOTES.html b/mainApp/docs/RELEASE_NOTES.html index 4e6fa24ee..9fcd358bd 100644 --- a/mainApp/docs/RELEASE_NOTES.html +++ b/mainApp/docs/RELEASE_NOTES.html @@ -18,7 +18,7 @@
-

LPub3D 2.4.6.330.3441 (17 06 2023 01:04:45)

+

LPub3D 2.4.6.331.3442 (17 06 2023 01:06:47)

LPub3D Official release.
diff --git a/mainApp/extras/LPub3D_Npp_UDL.xml b/mainApp/extras/LPub3D_Npp_UDL.xml index 697f40256..e121606b8 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.330.3441 -;; Last Update.: Sat, 17 Jun 2023 01:04:45 +0200 +;; Version.....: 2.4.6.331.3442 +;; Last Update.: Sat, 17 Jun 2023 01:06:47 +0200 ;; License.....: GPLv3 ;; Homepage....: https://trevorsandy.github.io/lpub3d ;; Copyright (C) 2021 - 2023 by Trevor SANDY diff --git a/mainApp/step.cpp b/mainApp/step.cpp index a5ae2987d..a846353a0 100644 --- a/mainApp/step.cpp +++ b/mainApp/step.cpp @@ -967,40 +967,10 @@ QStringList Step::configureModelStep(const QStringList &csiParts, Where ¤t // check if part is submodel is_submodel_file = lpub->ldrawFile.isSubmodel(fileNameStr); - // process submodel parts if display step - if (displayStep && is_submodel_file) { - QStringList const &contents = lpub->ldrawFile.contents(fileNameStr); - if (contents.size()) { - // remove the submodel line from the parts list - parts.takeAt(index); - int j = index; - for (int i = 0; i < contents.size(); i++) { - QString const &line = contents.at(i); - bool validLine = false; - if(line.isEmpty()) - continue; - if ((validLine = !line.startsWith("0"))) - parts.insert(j, line); - else if ((validLine = line.startsWith("0 !FADE"))) - parts.insert(j, line); - else if ((validLine = line.startsWith("0 !SILHOUETTE"))) - parts.insert(j, line); - if (validLine) { - // return the previous index to reprocess the current line in csiLine - if (j == index) - index--; - // inserting top-down so increment index to insert after current - j++; - } - } - } - // finished processing the subfile so return to previous index - continue; - } // display step submodel - /* - if (is_colour_part) - emit messageSig(LOG_NOTICE, "Static color part - " + fileNameStr); - */ + /* + if (is_colour_part) + emit messageSig(LOG_NOTICE, "Static color part - " + fileNameStr); + */ } // type_1_line // write fade step entries