Insert display model - interrogate submodel for invalid lines #704

trevorsandy · Jun 16, 2023 · c1cb337 · c1cb337
1 parent 0cadc66
commit c1cb337
Show file tree

Hide file tree

Showing 14 changed files with 52 additions and 22 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.3442
+pkgver=2.4.6.3443
 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.3442
+pkgver=2.4.6.3443
 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.3442) debian; urgency=medium
+lpub3d (2.4.6.3443) debian; urgency=medium
 
-  * LPub3D version 2.4.6.331.3442_20230617 for Linux
+  * LPub3D version 2.4.6.332.3443_20230617 for Linux
 
- -- Trevor SANDY <[email protected]>  Sat, 17 Jun 2023 01:06:46 +0200
+ -- Trevor SANDY <[email protected]>  Sat, 17 Jun 2023 01:08:50 +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.3442
+Version: 2.4.6.3443
 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.3442
+Version: 2.4.6.3443
 Release: <B_CNT>%{?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.3442
+* Sat Jun 17 2023 - trevor.dot.sandy.at.gmail.dot.com 2.4.6.3443
 - 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.3442) debian; urgency=medium
+lpub3d (2.4.6.3443) debian; urgency=medium
 
-  * LPub3D version 2.4.6.331.3442_20230617 for Linux
+  * LPub3D version 2.4.6.332.3443_20230617 for Linux
 
- -- Trevor SANDY <[email protected]>  Sat, 17 Jun 2023 01:06:47 +0200
+ -- Trevor SANDY <[email protected]>  Sat, 17 Jun 2023 01:08:51 +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.3442
+Version: 2.4.6.3443
 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.3442
+Version: 2.4.6.3443
 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.3442
+* Sat Jun 17 2023 - trevor.dot.sandy.at.gmail.dot.com 2.4.6.3443
 - 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 331 3442 bf4841073
+2 4 6 332 3443 0cadc66c0
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 = 331
+        GIT_REVISION = 332
         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 = 3442
+            GIT_COMMIT = 3443
             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}.331.3442.bf4841073
+            GIT_VERSION = $${VERSION}.332.3443.0cadc66c0
             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.331.3442 (17 06 2023 01:06:47)
+LPub3D 2.4.6.332.3443 (17 06 2023 01:08:51)
 
 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.331.3442 (17 06 2023 01:06:47)</h4>
+      <h4><a id="LPub3D_0"></a>LPub3D 2.4.6.332.3443 (17 06 2023 01:08:51)</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.331.3442
-;; Last Update.: Sat, 17 Jun 2023 01:06:47 +0200
+;; Version.....: 2.4.6.332.3443
+;; Last Update.: Sat, 17 Jun 2023 01:08:51 +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
@@ -967,6 +967,36 @@ QStringList Step::configureModelStep(const QStringList &csiParts, Where &current
           // check if part is submodel
           is_submodel_file = lpub->ldrawFile.isSubmodel(fileNameStr);
 
+          // interrogate submodel contents for invalid lines
+          if (displayStep && is_submodel_file) {
+            std::function<void(const QString&)> processSubmodel;
+            processSubmodel = [&](const QString &submodelName)
+            {
+              QStringList const &contents = lpub->ldrawFile.contents(submodelName);
+              if (contents.size()) {
+                QRegExp invalidMetaRx("^0 STEP|^0 ROTSTEP|^0 !?FADE|^0 !?SILHOUETTE|^0 !?LPUB (?:MULTI_STEP|CALLOUT|INSERT (?:PAGE|BOM|MODEL|DISPLAY_MODEL|COVER_PAGE))");
+                for (int i = 0; i < contents.size(); i++) {
+                  QString const &line = contents.at(i);
+                  if(line.isEmpty())
+                    continue;
+                  else if (line.contains(invalidMetaRx)) {
+                    Where where(submodelName, lpub->ldrawFile.getSubmodelIndex(submodelName), i);
+                    QString const &message = QObject::tr("Meta command not supported in display step submodel '%1'.<br>Line [%2]").arg(submodelName).arg(line);
+                    gui->parseError(message,where,Preferences::ParseErrors,true,false,QMessageBox::Warning);
+                  } else {
+                    QStringList argv;
+                    split(line, argv);
+                    if (argv[0] == "1" && argv.size() == 15) {
+                      if (lpub->ldrawFile.isSubmodel(argv[argv.size()-1]))
+                        processSubmodel(argv[argv.size()-1]);
+                    }
+                  }
+                }
+              }
+            };
+            processSubmodel(fileNameStr);
+          } // display step submodel
+
           /*
           if (is_colour_part)
             emit messageSig(LOG_NOTICE, "Static color part - " + fileNameStr);