Fade and highlight - parse step FADE or SILHOUETTE commands #710

trevorsandy · May 8, 2023 · 0138bed · 0138bed
1 parent 60d8e21
commit 0138bed
Show file tree

Hide file tree

Showing 14 changed files with 33 additions and 37 deletions.
diff --git 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.3340
+pkgver=2.4.6.3341
 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
@@ -2,7 +2,7 @@
 #  Last Update: July 19, 2020
 #  Copyright (C) 2017 - 2023 by Trevor SANDY
 pkgname=lpub3d
-pkgver=2.4.6.3340
+pkgver=2.4.6.3341
 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
@@ -1,5 +1,5 @@
-lpub3d (2.4.6.3340) debian; urgency=medium
+lpub3d (2.4.6.3341) debian; urgency=medium
 
-  * LPub3D version 2.4.6.229.3340_20230508 for Linux
+  * LPub3D version 2.4.6.230.3341_20230508 for Linux
 
- -- Trevor SANDY <[email protected]>  Mon, 08 May 2023 15:14:50 +0200
+ -- Trevor SANDY <[email protected]>  Mon, 08 May 2023 15:15:14 +0200
diff --git 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.3340
+Version: 2.4.6.3341
 Maintainer: Trevor SANDY <[email protected]>
 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
@@ -120,7 +120,7 @@ BuildRequires: fdupes
 Summary: An LDraw Building Instruction Editor
 Name: lpub3d
 Icon: lpub3d.xpm
-Version: 2.4.6.3340
+Version: 2.4.6.3341
 Release: <B_CNT>%{?dist}
 URL: https://trevorsandy.github.io/lpub3d
 Vendor: Trevor SANDY
@@ -797,7 +797,7 @@ update-desktop-database || true
 %endif
 
 %changelog
-* Mon May 08 2023 - trevor.dot.sandy.at.gmail.dot.com 2.4.6.3340
+* Mon May 08 2023 - trevor.dot.sandy.at.gmail.dot.com 2.4.6.3341
 - 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
@@ -1,5 +1,5 @@
-lpub3d (2.4.6.3340) debian; urgency=medium
+lpub3d (2.4.6.3341) debian; urgency=medium
 
-  * LPub3D version 2.4.6.229.3340_20230508 for Linux
+  * LPub3D version 2.4.6.230.3341_20230508 for Linux
 
- -- Trevor SANDY <[email protected]>  Mon, 08 May 2023 15:14:51 +0200
+ -- Trevor SANDY <[email protected]>  Mon, 08 May 2023 15:15:15 +0200
diff --git 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.3340
+Version: 2.4.6.3341
 Maintainer: Trevor SANDY <[email protected]>
 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
@@ -82,7 +82,7 @@ BuildRequires: fdupes
 Summary: An LDraw Building Instruction Editor
 Name: lpub3d
 Icon: lpub3d.xpm
-Version: 2.4.6.3340
+Version: 2.4.6.3341
 Release: 1%{?dist}
 URL: https://trevorsandy.github.io/lpub3d
 Vendor: Trevor SANDY
@@ -313,7 +313,7 @@ update-desktop-database || true
 %endif
 
 %changelog
-* Mon May 08 2023 - trevor.dot.sandy.at.gmail.dot.com 2.4.6.3340
+* Mon May 08 2023 - trevor.dot.sandy.at.gmail.dot.com 2.4.6.3341
 - 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
@@ -1 +1 @@
-2 4 6 229 3340 70da754de
+2 4 6 230 3341 60d8e217e
diff --git 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 = 229
+        GIT_REVISION = 230
         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 = 3340
+            GIT_COMMIT = 3341
             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}.229.3340.70da754de
+            GIT_VERSION = $${VERSION}.230.3341.60d8e217e
             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
@@ -1,4 +1,4 @@
-LPub3D 2.4.6.229.3340 (08 05 2023 15:14:52)
+LPub3D 2.4.6.230.3341 (08 05 2023 15:15:15)
 
 Features, enhancements, fixes and changes
 ------------

diff --git a/mainApp/docs/RELEASE_NOTES.html b/mainApp/docs/RELEASE_NOTES.html
@@ -18,7 +18,7 @@
 <table class="tg">
   <tr>
     <th class="tg-0pky">
-      <h4><a id="LPub3D_0"></a>LPub3D 2.4.6.229.3340 (08 05 2023 15:14:52)</h4>
+      <h4><a id="LPub3D_0"></a>LPub3D 2.4.6.230.3341 (08 05 2023 15:15:15)</h4>
         <hr>
           <p>
              <span class="tg-1pky">LPub3D Official release.</span><br>

diff --git 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.229.3340
-;; Last Update.: Mon, 08 May 2023 15:14:51 +0200
+;; Version.....: 2.4.6.230.3341
+;; Last Update.: Mon, 08 May 2023 15:15:15 +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
@@ -1091,32 +1091,28 @@ QStringList Step::configureModelStep(const QStringList &csiParts, Where &current
       // current step parts
       processedCsiParts << csiLine;
 
-      // insert closing fade meta
-      if (!displayStep) {
+      // insert closing meta commands
+      if (!displayStep && !fadeCommand && !highlightCommand) {
+        // insert closing fade meta
         if (updatePosition == prevStepPosition) {
           if (FadeMetaAdded)
-            AddCloseFadeMeta = true;
+            processedCsiParts.append(QStringLiteral("0 !FADE"));
         }
 
         // insert closing silhouette meta
         if (index+1 == parts.size()) {
           if (SilhouetteMetaAdded)
-            AddCloseSilhouetteMeta = true;
+            processedCsiParts.append(QStringLiteral("0 !SILHOUETTE"));
         }
       }
-
-      // insert missing closing command for manually entered FADE or SILHOUETTE
-      if (fadeCommand)
-        AddCloseFadeMeta = true;
-      if (highlightCommand)
-        AddCloseSilhouetteMeta = false;
-
-      if (AddCloseFadeMeta)
-        processedCsiParts.append(QStringLiteral("0 !FADE"));
-      if (AddCloseSilhouetteMeta)
-        processedCsiParts.append(QStringLiteral("0 !SILHOUETTE"));
     }
 
+    // insert missing closing command for manually entered FADE or SILHOUETTE
+    if (fadeCommand)
+      processedCsiParts.append(QStringLiteral("0 !FADE"));
+    if (highlightCommand)
+      processedCsiParts.append(QStringLiteral("0 !SILHOUETTE"));
+
     // save the current step position
     if (!displayStep)
       lpub->ldrawFile.setPrevStepPosition(current.modelName,stepNum,type_1_5_line_count);