Insert display model - build modification for next step #704

trevorsandy · Apr 22, 2023 · a3d81fa · a3d81fa
1 parent 17f1f6c
commit a3d81fa
Show file tree

Hide file tree

Showing 15 changed files with 27 additions and 23 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.3279
+pkgver=2.4.6.3280
 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.3279
+pkgver=2.4.6.3280
 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.3279) debian; urgency=medium
+lpub3d (2.4.6.3280) debian; urgency=medium
 
-  * LPub3D version 2.4.6.168.3279_20230422 for Linux
+  * LPub3D version 2.4.6.169.3280_20230422 for Linux
 
- -- Trevor SANDY <trevor.sandy@gmail.com>  Sat, 22 Apr 2023 03:46:38 +0200
+ -- Trevor SANDY <trevor.sandy@gmail.com>  Sat, 22 Apr 2023 03:47:00 +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.3279
+Version: 2.4.6.3280
 Maintainer: Trevor SANDY <trevor.sandy@gmail.com>
 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.3279
+Version: 2.4.6.3280
 Release: <B_CNT>%{?dist}
 URL: https://trevorsandy.github.io/lpub3d
 Vendor: Trevor SANDY
@@ -797,7 +797,7 @@ update-desktop-database || true
 %endif
 
 %changelog
-* Sat Apr 22 2023 - trevor.dot.sandy.at.gmail.dot.com 2.4.6.3279
+* Sat Apr 22 2023 - trevor.dot.sandy.at.gmail.dot.com 2.4.6.3280
 - 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.3279) debian; urgency=medium
+lpub3d (2.4.6.3280) debian; urgency=medium
 
-  * LPub3D version 2.4.6.168.3279_20230422 for Linux
+  * LPub3D version 2.4.6.169.3280_20230422 for Linux
 
- -- Trevor SANDY <trevor.sandy@gmail.com>  Sat, 22 Apr 2023 03:46:40 +0200
+ -- Trevor SANDY <trevor.sandy@gmail.com>  Sat, 22 Apr 2023 03:47:02 +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.3279
+Version: 2.4.6.3280
 Maintainer: Trevor SANDY <trevor.sandy@gmail.com>
 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.3279
+Version: 2.4.6.3280
 Release: 1%{?dist}
 URL: https://trevorsandy.github.io/lpub3d
 Vendor: Trevor SANDY
@@ -313,7 +313,7 @@ update-desktop-database || true
 %endif
 
 %changelog
-* Sat Apr 22 2023 - trevor.dot.sandy.at.gmail.dot.com 2.4.6.3279
+* Sat Apr 22 2023 - trevor.dot.sandy.at.gmail.dot.com 2.4.6.3280
 - 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 168 3279 0adec41a7
+2 4 6 169 3280 17f1f6c61
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 = 168
+        GIT_REVISION = 169
         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 = 3279
+            GIT_COMMIT = 3280
             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}.168.3279.0adec41a7
+            GIT_VERSION = $${VERSION}.169.3280.17f1f6c61
             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.168.3279 (22 04 2023 03:46:40)
+LPub3D 2.4.6.169.3280 (22 04 2023 03:47:02)
 
 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.168.3279 (22 04 2023 03:46:40)</h4>
+      <h4><a id="LPub3D_0"></a>LPub3D 2.4.6.169.3280 (22 04 2023 03:47:02)</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.168.3279
-;; Last Update.: Sat, 22 Apr 2023 03:46:40 +0200
+;; Version.....: 2.4.6.169.3280
+;; Last Update.: Sat, 22 Apr 2023 03:47:02 +0200
 ;; License.....: GPLv3
 ;; Homepage....: https://trevorsandy.github.io/lpub3d
 ;; Copyright (C) 2021 - 2023 by Trevor SANDY

diff --git a/mainApp/lpub.h b/mainApp/lpub.h
@@ -614,6 +614,10 @@ class Gui : public QMainWindow
   {
     return lpub->ldrawFile.isSubmodel(modelName);
   }
+  bool isDisplayModel(const QString &modelName)
+  {
+    return lpub->ldrawFile.isDisplayModel(modelName);
+  }
   bool isMpd()
   {
     return lpub->ldrawFile.isMpd();

diff --git a/mainApp/traverse.cpp b/mainApp/traverse.cpp
@@ -5718,7 +5718,7 @@ int Gui::setBuildModForNextStep(
                 split(line,token);
                 if (token.size() == 15) {
                     const QString modelName = token[token.size() - 1];
-                    if (isSubmodel(modelName)) {
+                    if (isSubmodel(modelName) && !isDisplayModel(modelName)) {
                         Where topOfSubmodel(modelName, getSubmodelIndex(modelName), 0);
                         const TraverseRc nrc = static_cast<TraverseRc>(setBuildModForNextStep(topOfNextStep, topOfSubmodel));
                         if (nrc == HitAbortProcess) {