Insert DISPLAY_MODEL as a step #415

trevorsandy · Sep 20, 2020 · e9ef54a · e9ef54a
1 parent 7c7547d
commit e9ef54a
Show file tree

Hide file tree

Showing 11 changed files with 34 additions and 22 deletions.
diff --git a/builds/linux/obs/alldeps/PKGBUILD b/builds/linux/obs/alldeps/PKGBUILD
@@ -2,7 +2,7 @@
 #  Last Update: July 23, 2019
 #  Copyright (c) 2017 - 2020 by Trevor SANDY
 pkgname=lpub3d
-pkgver=2.4.0.1766
+pkgver=2.4.0.1767
 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.0.1766) debian; urgency=medium
+lpub3d (2.4.0.1767) debian; urgency=medium
 
-  * LPub3D version 2.4.0.1.1766_20200920 for Linux
+  * LPub3D version 2.4.0.1.1767_20200920 for Linux
 
- -- Trevor SANDY <trevor.sandy@gmail.com>  Sun, 20 Sep 2020 10:12:48 +0200
+ -- Trevor SANDY <trevor.sandy@gmail.com>  Sun, 20 Sep 2020 10:13:27 +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.0.1766
+Version: 2.4.0.1767
 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
@@ -116,7 +116,7 @@ BuildRequires: fdupes
 Summary: An LDraw Building Instruction Editor
 Name: lpub3d
 Icon: lpub3d.xpm
-Version: 2.4.0.1766
+Version: 2.4.0.1767
 Release: <B_CNT>%{?dist}
 URL: https://trevorsandy.github.io/lpub3d
 Vendor: Trevor SANDY
@@ -728,5 +728,5 @@ update-mime-database /usr/share/mime >/dev/null || true
 update-desktop-database || true
 %endif
 
-* Sun Sep 20 2020 - trevor.dot.sandy.at.gmail.dot.com 2.4.0.1766
+* Sun Sep 20 2020 - trevor.dot.sandy.at.gmail.dot.com 2.4.0.1767
 - LPub3D Linux package (rpm) release
diff --git a/builds/utilities/ci/secure/.secrets.tar.enc b/builds/utilities/ci/secure/.secrets.tar.enc
diff --git a/builds/utilities/version.info b/builds/utilities/version.info
@@ -1 +1 @@
-2 4 0 1 1766 4e68815
+2 4 0 1 1767 7c7547d
diff --git a/mainApp/docs/README.txt b/mainApp/docs/README.txt
@@ -1,4 +1,4 @@
-LPub3D 2.4.0.1.1766 (20 09 2020 10:12:48)
+LPub3D 2.4.0.1.1767 (20 09 2020 10:13:27)
 
 Features, enhancements, fixes and changes
 ------------

diff --git a/mainApp/docs/RELEASE_NOTES.html b/mainApp/docs/RELEASE_NOTES.html
@@ -9,7 +9,7 @@
 <table class="tg">
   <tr>
     <th class="tg-0pky">
-      <h4><a id="LPub3D_0"></a>LPub3D 2.4.0.1.1766 (20 09 2020 10:12:48)</h4>
+      <h4><a id="LPub3D_0"></a>LPub3D 2.4.0.1.1767 (20 09 2020 10:13:27)</h4>
         <hr>
           <p>
              LPub3D Continuous release.<br>

diff --git a/mainApp/meta.cpp b/mainApp/meta.cpp
@@ -2576,11 +2576,16 @@ void SceneObjectMeta::doc(QStringList &out, QString preamble)
 
 /*
  *  INSERT (
- *   PICTURE "name" (SCALE x) |
- *   TEXT "text" "font" color  |
- *   ARROW HDX HDY TLX TLY HD HFX HFY |
+ *   PICTURE "name" (SCALE x)
+ *   ARROW HDX HDY TLX TLY HD HFX HFY
+ *   TEXT "text" "font" color (PLACEMENT)
+ *   RICH_TEXT | HTML_TEXT "text" (PLACEMENT)
+ *   PAGE
  *   BOM
- *   MODEL)
+ *   MODEL
+ *   DISPLAY_MODEL
+ *   COVER_PAGE
+ *   ROTATE_ICON)
  *   OFFSET x y
  */
 
@@ -2774,7 +2779,7 @@ QString InsertMeta::format(bool local, bool global)
 
 void InsertMeta::doc(QStringList &out, QString preamble)
 {
-  out << preamble + " <placement> PICTURE \"file\"|ARROW x y x y |BOM|TEXT|MODEL|ROTATE_ICON OFFSET \"<floatX>\" \"<floatY>\"";
+   out << preamble + " <placement> PICTURE \"<file>\"|ARROW x y x y|TEXT \"text\" \"<text>\" <color> |RICH_TEXT \"<text>\"|HTML_TEXT \"<text>\"|PAGE|BOM|MODEL|DISPLAY_MODEL|COVER_PAGE|ROTATE_ICON OFFSET \"<floatX>\" \"<floatY>\"";
 }
 
 /* ------------------ */

diff --git a/mainApp/org.trevorsandy.lpub3d.appdata.xml b/mainApp/org.trevorsandy.lpub3d.appdata.xml
@@ -68,7 +68,7 @@
         <binary>lpub3d24</binary>
     </provides>
     <releases>
-        <release version="2.4.0.1766" date="2020-09-20">
+        <release version="2.4.0.1767" date="2020-09-20">
             <description>
                 <p>LPub3D Linux AppImage package</p>
             </description>

diff --git a/mainApp/traverse.cpp b/mainApp/traverse.cpp
@@ -1103,14 +1103,21 @@ int Gui::drawPage(
             case InsertFinalModelRc:
             case InsertDisplayModelRc:
               {
-                // this is not a step but it's necessary to use the step object to place the model
-                // increment the step number down - so basically use the previous step number for this step.
-                // Do this before creating the step so we can use in the file name during
-                // csi generation to indicate this step file is not an actual step - just a model display
+                // This is not a step but it's necessary to use the step object to place the model
+                // Increment the step number down - so basically use the previous step number for this step.
+                // Do this before creating the step so we can use the file name during csi generation
+                // to indicate this step file is not an actual step - just a model display
+                // The Display Model command syntax is:
+                // 0 STEP
+                // 0 !LPUB ASSEM CAMERA_ANGLES LOCAL 40.0000 65.0000
+                // 0 !LPUB ASSEM MODEL_SCALE LOCAL  2.0000
+                // 0 !LPUB INSERT PAGE
+                // 0 !LPUB INSERT DISPLAY_MODEL
+                // 0 STEP
+                // Note that LOCAL settings must be placed before INSERT PAGE meta command
                 bool proceed = true;
-                if (rc == InsertFinalModelRc) {
+                if (rc == InsertFinalModelRc)
                     proceed = curMeta.LPub.fadeStep.fadeStep.value() || curMeta.LPub.highlightStep.highlightStep.value();
-                }
                 if (proceed) {
                     opts.stepNum--;
                     if (step == nullptr) {