diff --git a/builds/linux/obs/alldeps/PKGBUILD b/builds/linux/obs/alldeps/PKGBUILD index bf83c2e4c..722d32101 100644 --- 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.1975 +pkgver=2.4.0.1976 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 index 6854df7f8..b4fffa589 100644 --- a/builds/linux/obs/alldeps/debian/changelog +++ b/builds/linux/obs/alldeps/debian/changelog @@ -1,5 +1,5 @@ -lpub3d (2.4.0.1975) debian; urgency=medium +lpub3d (2.4.0.1976) debian; urgency=medium - * LPub3D version 2.4.0.1.1975_20201002 for Linux + * LPub3D version 2.4.0.1.1976_20201002 for Linux - -- Trevor SANDY Fri, 02 Oct 2020 01:40:14 +0200 + -- Trevor SANDY Fri, 02 Oct 2020 01:40:55 +0200 diff --git a/builds/linux/obs/alldeps/debian/lpub3d.dsc b/builds/linux/obs/alldeps/debian/lpub3d.dsc index c6c274914..b181555ff 100644 --- 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.1975 +Version: 2.4.0.1976 Maintainer: Trevor SANDY 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 index 111a332fa..b9ac32882 100644 --- 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.1975 +Version: 2.4.0.1976 Release: %{?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.1975 +* Fri Oct 02 2020 - trevor.dot.sandy.at.gmail.dot.com 2.4.0.1976 - LPub3D Linux package (rpm) release diff --git a/builds/utilities/ci/secure/.secrets.tar.enc b/builds/utilities/ci/secure/.secrets.tar.enc index cfbb8a602..909d63311 100644 Binary files a/builds/utilities/ci/secure/.secrets.tar.enc and b/builds/utilities/ci/secure/.secrets.tar.enc differ diff --git a/builds/utilities/version.info b/builds/utilities/version.info index d27c1335f..bb0f9f5de 100755 --- a/builds/utilities/version.info +++ b/builds/utilities/version.info @@ -1 +1 @@ -2 4 0 1 1975 5059b4e +2 4 0 1 1976 78f7b96 diff --git a/mainApp/docs/README.txt b/mainApp/docs/README.txt index f915f6aa6..2fe837dd9 100755 --- a/mainApp/docs/README.txt +++ b/mainApp/docs/README.txt @@ -1,4 +1,4 @@ -LPub3D 2.4.0.1.1975 (02 10 2020 01:40:14) +LPub3D 2.4.0.1.1976 (02 10 2020 01:40:55) Features, enhancements, fixes and changes ------------ diff --git a/mainApp/docs/RELEASE_NOTES.html b/mainApp/docs/RELEASE_NOTES.html index 474e73dec..2783b5717 100644 --- a/mainApp/docs/RELEASE_NOTES.html +++ b/mainApp/docs/RELEASE_NOTES.html @@ -9,7 +9,7 @@
-

LPub3D 2.4.0.1.1975 (02 10 2020 01:40:14)

+

LPub3D 2.4.0.1.1976 (02 10 2020 01:40:55)

LPub3D Continuous release.
diff --git a/mainApp/name.h b/mainApp/name.h index a78ea553c..20d21542b 100644 --- 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 index ec26b2521..847a4c789 100644 --- a/mainApp/nativeviewer.cpp +++ b/mainApp/nativeviewer.cpp @@ -3101,7 +3101,8 @@ void Gui::SelectedPartLines(QVector &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 &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 &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 index 407710691..eeda86a16 100644 --- a/mainApp/org.trevorsandy.lpub3d.appdata.xml +++ b/mainApp/org.trevorsandy.lpub3d.appdata.xml @@ -68,7 +68,7 @@ lpub3d24 ​ - +

LPub3D Linux AppImage package