Skip to content

Commit

Permalink
Do not trigger selected parts signal from editor when no part lines s…
Browse files Browse the repository at this point in the history
…elected #417
  • Loading branch information
trevorsandy committed Sep 20, 2020
1 parent a4cc037 commit e65e665
Show file tree
Hide file tree
Showing 11 changed files with 16 additions and 13 deletions.
2 changes: 1 addition & 1 deletion builds/linux/obs/alldeps/PKGBUILD
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
# Last Update: July 19, 2020
# Copyright (c) 2017 - 2020 by Trevor SANDY
pkgname=lpub3d
pkgver=2.4.0.1898
pkgver=2.4.0.1899
pkgrel=1
pkgdesc="An LDraw Building Instruction Editor"
url="https://github.com/trevorsandy/lpub3d.git"
Expand Down
6 changes: 3 additions & 3 deletions builds/linux/obs/alldeps/debian/changelog
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
lpub3d (2.4.0.1898) debian; urgency=medium
lpub3d (2.4.0.1899) debian; urgency=medium

* LPub3D version 2.4.0.1.1898_20200920 for Linux
* LPub3D version 2.4.0.1.1899_20200920 for Linux

-- Trevor SANDY <[email protected]> Sun, 20 Sep 2020 11:41:14 +0200
-- Trevor SANDY <[email protected]> Sun, 20 Sep 2020 11:41:54 +0200
2 changes: 1 addition & 1 deletion builds/linux/obs/alldeps/debian/lpub3d.dsc
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ Format: 1.0
Source: lpub3d
Binary: lpub3d
Architecture: any
Version: 2.4.0.1898
Version: 2.4.0.1899
Maintainer: Trevor SANDY <[email protected]>
Homepage: https://trevorsandy.github.io/lpub3d/
Standards-Version: 3.9.7
Expand Down
4 changes: 2 additions & 2 deletions builds/linux/obs/alldeps/lpub3d.spec
Original file line number Diff line number Diff line change
Expand Up @@ -116,7 +116,7 @@ BuildRequires: fdupes
Summary: An LDraw Building Instruction Editor
Name: lpub3d
Icon: lpub3d.xpm
Version: 2.4.0.1898
Version: 2.4.0.1899
Release: <B_CNT>%{?dist}
URL: https://trevorsandy.github.io/lpub3d
Vendor: Trevor SANDY
Expand Down Expand Up @@ -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.1898
* Sun Sep 20 2020 - trevor.dot.sandy.at.gmail.dot.com 2.4.0.1899
- LPub3D Linux package (rpm) release
Binary file modified builds/utilities/ci/secure/.secrets.tar.enc
Binary file not shown.
2 changes: 1 addition & 1 deletion builds/utilities/version.info
Original file line number Diff line number Diff line change
@@ -1 +1 @@
2 4 0 1 1898 e0442a4
2 4 0 1 1899 a4cc037
3 changes: 3 additions & 0 deletions lclib/common/lc_model.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -2757,6 +2757,9 @@ void lcModel::MoveDefaultCamera(lcCamera *Camera, const lcVector3& ObjectDistanc
/*** LPub3D Mod - Selected Parts ***/
void lcModel::SetSelectedPieces(QVector<int> &LineTypeIndexes){

if (!LineTypeIndexes.size())
return;

QString Message;
if (Preferences::debugLogging) {
Message = tr("%n Editor object(s) selected","", LineTypeIndexes.size());
Expand Down
2 changes: 1 addition & 1 deletion mainApp/docs/README.txt
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
LPub3D 2.4.0.1.1898 (20 09 2020 11:41:14)
LPub3D 2.4.0.1.1899 (20 09 2020 11:41:54)

Features, enhancements, fixes and changes
------------
Expand Down
2 changes: 1 addition & 1 deletion mainApp/docs/RELEASE_NOTES.html
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
<table class="tg">
<tr>
<th class="tg-0pky">
<h4><a id="LPub3D_0"></a>LPub3D 2.4.0.1.1898 (20 09 2020 11:41:14)</h4>
<h4><a id="LPub3D_0"></a>LPub3D 2.4.0.1.1899 (20 09 2020 11:41:54)</h4>
<hr>
<p>
LPub3D Continuous release.<br>
Expand Down
4 changes: 2 additions & 2 deletions mainApp/nativeviewer.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -2583,7 +2583,7 @@ bool Gui::getSelectedLine(int modelIndex, int lineIndex, int source, int &lineNu

void Gui::SelectedPartLines(QVector<TypeLine> &indexes, PartSource source){
if (! exporting()) {
if (!currentStep)
if (!currentStep || (source == EDITOR_LINE && !indexes.size()))
return;

QVector<int> lines;
Expand Down Expand Up @@ -2666,7 +2666,7 @@ void Gui::SelectedPartLines(QVector<TypeLine> &indexes, PartSource source){
.arg(currentStep->stepNumber.number)
.arg(modelName));
}
} else {
} else { /*fromEditor*/
emit setSelectedPiecesSig(lines);
}
}
Expand Down
2 changes: 1 addition & 1 deletion mainApp/org.trevorsandy.lpub3d.appdata.xml
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,7 @@
<binary>lpub3d24</binary>
​</provides>
<releases>
<release version="2.4.0.1898" date="2020-09-20">
<release version="2.4.0.1899" date="2020-09-20">
<description>
<p>LPub3D Linux AppImage package</p>
</description>
Expand Down

0 comments on commit e65e665

Please sign in to comment.