LPub3D v2.4.2

trevorsandy · Mar 30, 2021 · d08cc88 · d08cc88
1 parent d95505a
commit d08cc88
Show file tree

Hide file tree

Showing 15 changed files with 56 additions and 29 deletions.
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 - 2021 by Trevor SANDY
 pkgname=lpub3d
-pkgver=2.4.2.2431
+pkgver=2.4.2.2432
 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.2.2431) debian; urgency=medium
+lpub3d (2.4.2.2432) debian; urgency=medium
 
-  * LPub3D version 2.4.2.1.2431_20210330 for Linux
+  * LPub3D version 2.4.2.1.2432_20210330 for Linux
 
- -- Trevor SANDY <[email protected]>  Tue, 30 Mar 2021 21:56:58 +0200
+ -- Trevor SANDY <[email protected]>  Tue, 30 Mar 2021 21:58:03 +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.2.2431
+Version: 2.4.2.2432
 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
@@ -116,7 +116,7 @@ BuildRequires: fdupes
 Summary: An LDraw Building Instruction Editor
 Name: lpub3d
 Icon: lpub3d.xpm
-Version: 2.4.2.2431
+Version: 2.4.2.2432
 Release: <B_CNT>%{?dist}
 URL: https://trevorsandy.github.io/lpub3d
 Vendor: Trevor SANDY
@@ -731,5 +731,5 @@ update-mime-database /usr/share/mime >/dev/null || true
 update-desktop-database || true
 %endif
 
-* Tue Mar 30 2021 - trevor.dot.sandy.at.gmail.dot.com 2.4.2.2431
+* Tue Mar 30 2021 - trevor.dot.sandy.at.gmail.dot.com 2.4.2.2432
 - 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 2 1 2431 37583a6
+2 4 2 1 2432 d95505a
diff --git a/mainApp/color.cpp b/mainApp/color.cpp
@@ -154,11 +154,6 @@ QString LDrawColor::edge(const QString& code)
 QString LDrawColor::name(const QString &code)
 {
 //  logTrace() << QString("RECEIVED Color CODE  [%1] for NAME").arg(code);
-    QString name(code.toLower());
-    if (name2QColor.contains(name))
-        return code;
-
-    QRegExp hexRx("\\s*(0x|#)([\\da-fA-F]+)\\s*$",Qt::CaseInsensitive);
     if (color2name.contains(code))
         return color2name[code];
 

diff --git a/mainApp/docs/README.txt b/mainApp/docs/README.txt
@@ -1,4 +1,25 @@
-LPub3D 2.4.2.1.2431 (30 03 2021 21:56:58)
+LPub3D 2.4.2.1.2432 (30 03 2021 21:58:03)
+
+Features, enhancements, fixes and changes
+------------
+LPub3D Official release.
+
+Create and follow the links as described below to review additional details for enhancements, changes, and fixes deployed in this release.
+Cheers.
+
+Navigate to an item's GitHub ticket by appending its #NNN to this URL: https://github.com/trevorsandy/lpub3d/issues/
+
+Example, Add option to centre justify step group steps #333 => https://github.com/trevorsandy/lpub3d/issues/333
+
+Revisions:
+
+--------------------------------------------------------------------------------------------------
+
+- Enhancement - Global setting for callout pointer (and page pointer) border #510
+- Submodel image does not show at first step of Step Group #512
+
+
+LPub3D 2.4.0.1.2220 (03 10 2020 22:44:10)
 
 Features, enhancements, fixes and changes
 ------------

diff --git a/mainApp/docs/RELEASE_NOTES.html b/mainApp/docs/RELEASE_NOTES.html
@@ -9,7 +9,23 @@
 <table class="tg">
   <tr>
     <th class="tg-0pky">
-      <h4><a id="LPub3D_0"></a>LPub3D 2.4.2.1.2431 (30 03 2021 21:56:58)</h4>
+      <h4><a id="LPub3D_0"></a>LPub3D 2.4.2.1.2432 (30 03 2021 21:58:03)</h4>
+        <hr>
+          <p>
+             LPub3D Official release.<br>
+             Follow the links in the list below to review additional details for<br>
+             enhancements, changes, and fixes deployed in this release.<br>
+             Cheers.
+          </p>
+        <hr>
+      <h4><a id="Features_enhancements_fixes_and_changes_7"></a>Features, enhancements, fixes and changes</h4>
+    </th>
+  </tr>
+  <tr><td class="tg-0lax"><a href="https://github.com/trevorsandy/lpub3d/issues/510">Enhancement - Global setting for callout pointer (and page pointer) border #510</td></tr>
+  <tr><td class="tg-buh4"><a href="https://github.com/trevorsandy/lpub3d/issues/512">Fix - Submodel image does not show at first step of Step Group #512</td></tr>
+  <tr>
+    <th class="tg-0pky">
+      <h4><a id="LPub3D_0"></a>LPub3D 2.4.1.0.2220 (03 10 2020 22:44:10)</h4>
         <hr>
           <p>
              LPub3D Official release.<br>

diff --git a/mainApp/ldrawfiles.cpp b/mainApp/ldrawfiles.cpp
@@ -3237,7 +3237,7 @@ int LDrawFile::getStepIndex(const QString &modelName, const int &lineNumber)
     int modelIndex = getSubmodelIndex(modelName);
     QVector<int> topOfStep = { modelIndex, lineNumber };
     int stepIndex = _buildModStepIndexes.indexOf(topOfStep);
-    if (stepIndex == -1)
+    if (stepIndex == BM_INVALID_INDEX)
         stepIndex = getStepIndex(modelIndex, lineNumber);
     return stepIndex;
 }
@@ -3271,7 +3271,7 @@ void LDrawFile::getTopOfStepWhere(const QString &modelName, int &modelIndex, int
 {
     const QStringList keys = getViewerStepKeyWhere(getSubmodelIndex(modelName), lineNumber).split(";");
     bool valid = false;
-    if (keys.size() > 2) {
+    if (keys.size() > BM_STEP_NUM_KEY) {
         bool ok[2];
         modelIndex = keys.at(BM_STEP_MODEL_KEY).toInt(&ok[0]);
         lineNumber = keys.at(BM_STEP_LINE_KEY).toInt(&ok[1]);
@@ -3348,7 +3348,7 @@ QStringList LDrawFile::getBuildModPathsFromStep(const QString &modStepKey, const
     ++i;
   }
 
-  if (list.size())
+  if (list.size() > 1)
     list.removeDuplicates();
 
   return list;

diff --git a/mainApp/openclose.cpp b/mainApp/openclose.cpp
@@ -745,16 +745,11 @@ void Gui::closeModelFile(){
     QString windowName = VER_FILEDESCRIPTION_STR;
     QString windowVersion;
 #if defined LP3D_CONTINUOUS_BUILD || defined LP3D_DEVOPS_BUILD || defined LP3D_NEXT_BUILD
-    windowVersion = QString("v%1 r%2 (%3)")
-            .arg(VER_PRODUCTVERSION_STR)
-            .arg(VER_REVISION_STR)
-            .arg(VER_BUILD_TYPE_STR);
+    windowVersion = QString("v%1 r%2 (%3)").arg(VER_PRODUCTVERSION_STR).arg(VER_REVISION_STR).arg(VER_BUILD_TYPE_STR);
 #else
     windowVersion = QString("v%1%2")
             .arg(VER_PRODUCTVERSION_STR)
-            .arg(QString(VER_REVISION_STR).toInt() ?
-                     QString(" r%1").arg(VER_REVISION_STR) :
-                     QString());
+            .arg(QString(VER_REVISION_STR).toInt() ? QString(" r%1").arg(VER_REVISION_STR) : QString());
 #endif
 
     setWindowTitle(tr("%1[*] - %2").arg(windowName).arg(windowVersion));

diff --git a/mainApp/org.trevorsandy.lpub3d.appdata.xml b/mainApp/org.trevorsandy.lpub3d.appdata.xml
@@ -70,7 +70,7 @@
         <binary>lpub3d24</binary>
     </provides>
     <releases>
-        <release version="2.4.2.2431" date="2021-03-30">
+        <release version="2.4.2.2432" date="2021-03-30">
             <description>
                 <p>LPub3D Linux AppImage package</p>
             </description>

diff --git a/mainApp/pli.cpp b/mainApp/pli.cpp
@@ -1015,7 +1015,7 @@ int Pli::createPartImage(
 
         // assemble image name using nameKey - create unique file when a value that impacts the image changes
         QString imageDir = isSubModel ? Paths::submodelDir : Paths::partsDir;
-        imageName = QDir::toNativeSeparators(QDir::currentPath() + QDir::separator() + imageDir + QDir::separator() + nameKey + ".png");
+        imageName = QDir::toNativeSeparators(QDir::currentPath() + QDir::separator() + imageDir + QDir::separator() + nameKey + ptn[pT].typeName + ".png");
         ldrNames  = QStringList() << QDir::toNativeSeparators(QDir::currentPath() + QDir::separator() + Paths::tmpDir + QDir::separator() + "pli.ldr");
 
         QFile part(imageName);

diff --git a/mainApp/render.cpp b/mainApp/render.cpp
@@ -273,7 +273,7 @@ int Render::setLDrawHeaderAndFooterMeta(QStringList &lines, const QString &_mode
         }
     }
 
-    // special case where the modelName will match the line type name so we append '_Preview' to the modelName
+    // special case where the modelName will match the line type name so we append '_smi' to the modelName
     if (imageType == Options::SMP) {
          QString smi(SUBMODEL_IMAGE_BASENAME);
          baseName = baseName.append(QString("-%1").arg(smi.replace(smi.indexOf(smi.at(0)),1,smi.at(0).toUpper())));

diff --git a/mainApp/traverse.cpp b/mainApp/traverse.cpp
@@ -3055,7 +3055,7 @@ int Gui::findPage(
                                   findPage(view, scene, meta, line, submodelOpts);
 
                                   saveStepPageNum = stepPageNum;
-                                  buildMod = saveBuildMod2;            // restore old buildMod
+                                  buildMod = saveBuildMod2;                 // restore old buildMod
                                   meta.rotStep  = saveRotStep2;             // restore old rotstep
                                   meta.submodelStack.pop_back();            // remove where we stopped in the parent model