Insert display model - submodel at first step when pli-per-step is fa…

…lse #704
trevorsandy · Apr 22, 2023 · 5d5166e · 5d5166e
1 parent 1cdacce
commit 5d5166e
Show file tree

Hide file tree

Showing 14 changed files with 58 additions and 55 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.3268
+pkgver=2.4.6.3269
 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.3268
+pkgver=2.4.6.3269
 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.3268) debian; urgency=medium
+lpub3d (2.4.6.3269) debian; urgency=medium
 
-  * LPub3D version 2.4.6.157.3268_20230422 for Linux
+  * LPub3D version 2.4.6.158.3269_20230422 for Linux
 
- -- Trevor SANDY <trevor.sandy@gmail.com>  Sat, 22 Apr 2023 03:42:36 +0200
+ -- Trevor SANDY <trevor.sandy@gmail.com>  Sat, 22 Apr 2023 03:42:58 +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.3268
+Version: 2.4.6.3269
 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.3268
+Version: 2.4.6.3269
 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.3268
+* Sat Apr 22 2023 - trevor.dot.sandy.at.gmail.dot.com 2.4.6.3269
 - 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.3268) debian; urgency=medium
+lpub3d (2.4.6.3269) debian; urgency=medium
 
-  * LPub3D version 2.4.6.157.3268_20230422 for Linux
+  * LPub3D version 2.4.6.158.3269_20230422 for Linux
 
- -- Trevor SANDY <trevor.sandy@gmail.com>  Sat, 22 Apr 2023 03:42:37 +0200
+ -- Trevor SANDY <trevor.sandy@gmail.com>  Sat, 22 Apr 2023 03:43:00 +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.3268
+Version: 2.4.6.3269
 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.3268
+Version: 2.4.6.3269
 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.3268
+* Sat Apr 22 2023 - trevor.dot.sandy.at.gmail.dot.com 2.4.6.3269
 - 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 157 3268 4cc40dfec
+2 4 6 158 3269 1cdacce1e
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 = 157
+        GIT_REVISION = 158
         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 = 3268
+            GIT_COMMIT = 3269
             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}.157.3268.4cc40dfec
+            GIT_VERSION = $${VERSION}.158.3269.1cdacce1e
             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.157.3268 (22 04 2023 03:42:37)
+LPub3D 2.4.6.158.3269 (22 04 2023 03:43:00)
 
 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.157.3268 (22 04 2023 03:42:37)</h4>
+      <h4><a id="LPub3D_0"></a>LPub3D 2.4.6.158.3269 (22 04 2023 03:43:00)</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.157.3268
-;; Last Update.: Sat, 22 Apr 2023 03:42:37 +0200
+;; Version.....: 2.4.6.158.3269
+;; Last Update.: Sat, 22 Apr 2023 03:43:00 +0200
 ;; License.....: GPLv3
 ;; Homepage....: https://trevorsandy.github.io/lpub3d
 ;; Copyright (C) 2021 - 2023 by Trevor SANDY

diff --git a/mainApp/traverse.cpp b/mainApp/traverse.cpp
@@ -2393,7 +2393,9 @@ int Gui::drawPage(
                           step->lightList = lightList;
 
                           PlacementType relativeType = SingleStepType;
-                          if (pliPerStep) { // Pli per Step
+
+                          // Pli per Step
+                          if (pliPerStep) {
                               if (multiStep) {
                                   relativeType = StepGroupType;
                               } else if (opts.calledOut) {
@@ -2409,43 +2411,44 @@ int Gui::drawPage(
                               emit messageSig(LOG_INFO, "Processing PLI for " + topOfStep.modelName + "...");
 
                               step->pli.sizePli(&steps->meta,relativeType,pliPerStep);
+                          } // Pli per Step
 
-                              if (step->placeSubModel) { // Place SubModel at Step 1
-                                  emit messageSig(LOG_INFO, "Set first step submodel display for " + topOfStep.modelName + "...");
-
-                                  // get the number of submodel instances in the model file
-                                  instances = lpub->ldrawFile.instances(opts.current.modelName, opts.isMirrored);
-                                  if (steps->meta.LPub.subModel.showInstanceCount.value())
-                                     displayInstanceCount = instances > 1 || steps->meta.LPub.page.countInstanceOverride.value() > 1;
-                                  // lpub->ldrawFile.instances() configuration is CountAtTop - the historic LPub count scheme. However,
-                                  // the updated countInstances routine's configuration is CountAtModel - this is the default options set
-                                  // and configurable in Project globals
-                                  if (displayInstanceCount) {
-                                      // manually override the count instance value using 0 !LPUB SUBMODEL_INSTANCE_COUNT_OVERRIDE
-                                      if (steps->groupStepMeta.LPub.page.countInstanceOverride.value())
-                                          instances = steps->groupStepMeta.LPub.page.countInstanceOverride.value();
-                                      else
-                                      if (countInstances == CountAtStep)
-                                          instances = lpub->mi.countInstancesInStep(&steps->meta, opts.current.modelName);
-                                      else
-                                      if (countInstances > CountFalse && countInstances < CountAtStep)
-                                          instances = lpub->mi.countInstancesInModel(&steps->meta, opts.current.modelName);
-                                  }
+                          // Place submodel
+                          if (step->placeSubModel) { // Place SubModel at Step 1
+                              emit messageSig(LOG_INFO, "Set first step submodel display for " + topOfStep.modelName + "...");
+
+                              // get the number of submodel instances in the model file
+                              instances = lpub->ldrawFile.instances(opts.current.modelName, opts.isMirrored);
+                              if (steps->meta.LPub.subModel.showInstanceCount.value())
+                                  displayInstanceCount = instances > 1 || steps->meta.LPub.page.countInstanceOverride.value() > 1;
+                              // lpub->ldrawFile.instances() configuration is CountAtTop - the historic LPub count scheme. However,
+                              // the updated countInstances routine's configuration is CountAtModel - this is the default options set
+                              // and configurable in Project globals
+                              if (displayInstanceCount) {
+                                  // manually override the count instance value using 0 !LPUB SUBMODEL_INSTANCE_COUNT_OVERRIDE
+                                  if (steps->groupStepMeta.LPub.page.countInstanceOverride.value())
+                                      instances = steps->groupStepMeta.LPub.page.countInstanceOverride.value();
+                                  else
+                                  if (countInstances == CountAtStep)
+                                      instances = lpub->mi.countInstancesInStep(&steps->meta, opts.current.modelName);
+                                  else
+                                  if (countInstances > CountFalse && countInstances < CountAtStep)
+                                      instances = lpub->mi.countInstancesInModel(&steps->meta, opts.current.modelName);
+                              }
 
-                                  steps->meta.LPub.subModel.instance.setValue(instances);
+                              steps->meta.LPub.subModel.instance.setValue(instances);
 
-                                  step->subModel.setSubModel(opts.current.modelName,steps->meta);
+                              step->subModel.setSubModel(opts.current.modelName,steps->meta);
 
-                                  step->subModel.displayInstanceCount = displayInstanceCount;
+                              step->subModel.displayInstanceCount = displayInstanceCount;
 
-                                  if (step->subModel.sizeSubModel(&steps->meta,relativeType,pliPerStep) != 0)
-                                      emit messageSig(LOG_ERROR, "Failed to set first step submodel display for " + topOfStep.modelName + "...");
-                              } // Place SubModel
-                              else
-                              {
-                                  step->subModel.clear();
-                              }
-                          } // Pli per Step
+                              if (step->subModel.sizeSubModel(&steps->meta,relativeType,pliPerStep) != 0)
+                                  emit messageSig(LOG_ERROR, "Failed to set first step submodel display for " + topOfStep.modelName + "...");
+                          }
+                          else
+                          {
+                              step->subModel.clear();
+                          } // Place SubModel
 
                           switch (dividerType) {
                           // for range divider, we set the dividerType for the last STEP of the previous RANGE.