Update highlighted lines #417

trevorsandy · Mar 12, 2021 · 2d4d7c1 · 2d4d7c1
1 parent 7cc2501
commit 2d4d7c1
Show file tree

Hide file tree

Showing 15 changed files with 273 additions and 112 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.1.2034
+pkgver=2.4.1.2035
 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.1.2034) debian; urgency=medium
+lpub3d (2.4.1.2035) debian; urgency=medium
 
-  * LPub3D version 2.4.1.1.2034_20210312 for Linux
+  * LPub3D version 2.4.1.1.2035_20210312 for Linux
 
- -- Trevor SANDY <[email protected]>  Fri, 12 Mar 2021 06:32:04 +0100
+ -- Trevor SANDY <[email protected]>  Fri, 12 Mar 2021 06:32:42 +0100
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.1.2034
+Version: 2.4.1.2035
 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.1.2034
+Version: 2.4.1.2035
 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
 
-* Fri Mar 12 2021 - trevor.dot.sandy.at.gmail.dot.com 2.4.1.2034
+* Fri Mar 12 2021 - trevor.dot.sandy.at.gmail.dot.com 2.4.1.2035
 - 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 1 1 2034 f4d5b67
+2 4 1 1 2035 7cc2501
diff --git a/lclib/common/lc_mainwindow.cpp b/lclib/common/lc_mainwindow.cpp
@@ -2393,9 +2393,22 @@ void lcMainWindow::UpdateSelectedObjects(bool SelectionChanged, int SelectionTyp
 	lcObject* Focus = nullptr;
 
 	lcModel* ActiveModel = GetActiveModel();
-	if (ActiveModel)
+	if (ActiveModel) {
 		ActiveModel->GetSelectionInformation(&Flags, Selection, &Focus);
 
+		const QString TypeNames[] =
+		{
+			"VIEWER_NONE", // 0
+			"VIEWER_LINE", // 1
+			"VIEWER_MOD",  // 2
+			"VIEWER_DEL",  // 3
+			"VIEWER_SEL",  // 4
+			"VIEWER_CLR"   // 5
+		};
+		QString _Message = tr("Update Selection Type: %1 (%2), ModAction: %3").arg(TypeNames[SelectionType], QString::number(SelectionType), ActiveModel->GetModAction() ? "True" : "False");
+		emit gui->messageSig(LOG_DEBUG, _Message);
+	}
+
 	lcTool Tool = GetTool();
 	bool BuildModTool = false;
 	switch (Tool)
@@ -2458,7 +2471,7 @@ void lcMainWindow::UpdateSelectedObjects(bool SelectionChanged, int SelectionTyp
 							TypeLine typeLine(gui->getSubmodelIndex(ActiveModel->GetModelName().toLower()),((lcPiece*)SelectedItem)->GetLineTypeIndex());
 							LineTypeIndexes.append(typeLine);
 
-							Message = tr("Selected Piece: %1 (ID: %2), LineTypeIndex: %3")
+							Message = tr("Selected Object: %1 (ID: %2), LineTypeIndex: %3")
 										 .arg(((lcPiece*)SelectedItem)->GetName())
 										 .arg(((lcPiece*)SelectedItem)->GetID())
 										 .arg(LineTypeIndexes.last().lineIndex);
@@ -2475,7 +2488,7 @@ void lcMainWindow::UpdateSelectedObjects(bool SelectionChanged, int SelectionTyp
 								LineTypeIndexes.append(typeLine);
 
 								if (Preferences::debugLogging) {
-									Message = tr("Selected Piece: %1 (ID: %2), LineTypeIndex: %3")
+									Message = tr("Selected Object: %1 (ID: %2), LineTypeIndex: %3")
 												 .arg(((lcPiece*)SelectedItem)->GetName())
 												 .arg(((lcPiece*)SelectedItem)->GetID())
 												 .arg(LineTypeIndexes.last().lineIndex);
@@ -2485,8 +2498,11 @@ void lcMainWindow::UpdateSelectedObjects(bool SelectionChanged, int SelectionTyp
 						}
 					}
 				}
-				if (SelectionType != VIEWER_LINE)
-					emit SelectedPartLinesSig(LineTypeIndexes, PartSource(SelectionType));
+				if (SelectionType != VIEWER_LINE) {
+					PartSource Selection = ActiveModel->GetModAction() ? PartSource(SelectionType) : VIEWER_SEL;
+					emit SelectedPartLinesSig(LineTypeIndexes, Selection);
+					ActiveModel->ResetModAction();
+				}
 			}
 			/*** LPub3D Mod end ***/
 		}