Validate highlight line out of bounds lines #417

trevorsandy · Oct 2, 2020 · debf60a · debf60a
1 parent d782b13
commit debf60a
Show file tree

Hide file tree

Showing 11 changed files with 21 additions and 17 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 - 2020 by Trevor SANDY
 pkgname=lpub3d
-pkgver=2.4.0.1986
+pkgver=2.4.0.1987
 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.1986) debian; urgency=medium
+lpub3d (2.4.0.1987) debian; urgency=medium
 
-  * LPub3D version 2.4.0.1.1986_20201002 for Linux
+  * LPub3D version 2.4.0.1.1987_20201002 for Linux
 
- -- Trevor SANDY <[email protected]>  Fri, 02 Oct 2020 13:24:10 +0200
+ -- Trevor SANDY <[email protected]>  Fri, 02 Oct 2020 13:24:52 +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.1986
+Version: 2.4.0.1987
 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.0.1986
+Version: 2.4.0.1987
 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
 
-* Fri Oct 02 2020 - trevor.dot.sandy.at.gmail.dot.com 2.4.0.1986
+* Fri Oct 02 2020 - trevor.dot.sandy.at.gmail.dot.com 2.4.0.1987
 - 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 1986 fbdb61a
+2 4 0 1 1987 d782b13
diff --git a/mainApp/docs/README.txt b/mainApp/docs/README.txt
@@ -1,4 +1,4 @@
-LPub3D 2.4.0.1.1986 (02 10 2020 13:24:10)
+LPub3D 2.4.0.1.1987 (02 10 2020 13:24:52)
 
 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.1986 (02 10 2020 13:24:10)</h4>
+      <h4><a id="LPub3D_0"></a>LPub3D 2.4.0.1.1987 (02 10 2020 13:24:52)</h4>
         <hr>
           <p>
              LPub3D Continuous release.<br>

diff --git a/mainApp/name.h b/mainApp/name.h
@@ -65,6 +65,7 @@ enum SceneObjectInfo { ObjectId };
 
 enum PartSource {
     NOT_FOUND          = -1,                   // -1
+    OUT_OF_BOUNDS      = NOT_FOUND,            // -1
     NEW_PART           = NOT_FOUND,            // -1
     NEW_MODEL          = NOT_FOUND,            // -1
     EDITOR_LINE,                               //  0

diff --git a/mainApp/nativeviewer.cpp b/mainApp/nativeviewer.cpp
@@ -3101,7 +3101,8 @@ void Gui::SelectedPartLines(QVector<TypeLine> &indexes, PartSource source){
             // New part lines are added in createBuildModification() routine
             if (lineIndex != NEW_PART) {
                 validLine = getSelectedLine(modelIndex, lineIndex, source, lineNumber);
-                lines.append(lineNumber);
+                if (lineNumber != OUT_OF_BOUNDS)
+                    lines.append(lineNumber);
             }
 
             if (validLine) {
@@ -3129,17 +3130,19 @@ void Gui::SelectedPartLines(QVector<TypeLine> &indexes, PartSource source){
                                      .arg(modelName);
                     } else if (validLine) {
                         Message = tr("Selected part modelName [%1] lineNumber: [%2] at step line index [%3]")
-                                     .arg(modelName).arg(lineNumber).arg(lineIndex);
+                                     .arg(modelName).arg(lineNumber).arg(lineIndex < 0 ? "undefined" : QString::number(lineIndex));
                     } else {
                         Message = tr("%1 part lineNumber [%2] for step line index [%3]")
-                                     .arg(indexes.size() ? "Out of bounds" : "Invalid").arg(lineNumber).arg(lineIndex);
+                                     .arg(indexes.size() ? "Out of bounds" : "Invalid")
+                                     .arg(lineNumber).arg(lineIndex < 0 ? "undefined" : QString::number(lineNumber));
                     }
                 } else if (validLine) { // valid and not from viewer
                     Message = tr("Selected part modelName [%1] lineNumber: [%2] at step line index [%3]")
-                                 .arg(modelName).arg(lineIndex).arg(lineNumber);
+                                 .arg(modelName).arg(lineIndex).arg(lineNumber < 0 ? "undefined" : QString::number(lineIndex));
                 } else {                // invalid and not from viewer
                     Message = tr("%1 part lineNumber [%2] for step line index [%3]") // index and number flipped
-                                 .arg(indexes.size() ? "Out of bounds" : "Invalid").arg(lineIndex).arg(lineNumber);
+                                 .arg(indexes.size() ? "Out of bounds" : "Invalid")
+                                 .arg(lineIndex).arg(lineNumber < 0 ? "undefined" : QString::number(lineNumber));
                 }
                 emit messageSig(LOG_TRACE, Message);
             }
@@ -3159,7 +3162,7 @@ void Gui::SelectedPartLines(QVector<TypeLine> &indexes, PartSource source){
                                               .arg(modelName));
             }
         } else { // indexes from editor
-            if (gMainWindow->isVisible())
+            if (lines.size() && gMainWindow->isVisible())
                 emit setSelectedPiecesSig(lines);
         }
     } // not exporting

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.1986" date="2020-10-02">
+        <release version="2.4.0.1987" date="2020-10-02">
             <description>
                 <p>LPub3D Linux AppImage package</p>
             </description>