Merge branch 'release/v1.3.3'

Author: panzergame

.github/workflows/deploy-linux-appimage.yml

@@ -6,7 +6,7 @@ on:
 
 jobs:
   deploy:
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-latest
     steps:
       - name: Checkout code
         uses: actions/checkout@v2
@@ -15,7 +15,7 @@ jobs:
       - name: Install package
         run: |
           sudo apt-get update
-          sudo apt-get -y install qt6-base-dev libqt6svg6-dev freeglut3-dev fuse
+          sudo apt-get -y install qtbase5-dev libqt5svg5-dev freeglut3-dev
       - name: Build and test
         run: ci/buildappimage.sh
       - name: Create Release

.github/workflows/sonarcloud.yml

@@ -5,7 +5,7 @@ on:
 
 jobs:
   static_analysis:
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-latest
     steps:
       - name: Checkout
         uses: actions/checkout@v2
@@ -14,7 +14,7 @@ jobs:
       - name: Install package
         run: |
           sudo apt-get update
-          sudo apt-get -y install qt6-base-dev libqt6svg6-dev freeglut3-dev lcov
+          sudo apt-get -y install qtbase5-dev libqt5svg5-dev freeglut3-dev lcov
       - name: Install build wrapper
         run: |
           wget http://sonarcloud.io/static/cpp/build-wrapper-linux-x86.zip

CMakeLists.txt

@@ -38,7 +38,7 @@ find_package(codecov)
 
 find_package(PythonInterp)
 
-find_package(Qt6 COMPONENTS REQUIRED
+find_package(Qt5 COMPONENTS REQUIRED
 	Core
 	Widgets
 	Gui
@@ -58,8 +58,8 @@ set(INCLUDE_DIRS
 	template
 	${CMAKE_BINARY_DIR}/src
 	${CMAKE_BINARY_DIR}/template
-	${Qt6Widgets_INCLUDE_DIRS}
-	${Qt6Gui_INCLUDE_DIRS}
+	${Qt5Widgets_INCLUDE_DIRS}
+	${Qt5Gui_INCLUDE_DIRS}
 )
 
 set(LINK_LIBRARIES

resource/CMakeLists.txt

@@ -1,4 +1,4 @@
-qt_add_resources(SOURCES resource.qrc)
+qt5_add_resources(SOURCES resource.qrc)
 
 add_library(resource ${SOURCES})
 

resource/icons/layer-lower.svg

@@ -13,6 +13,8 @@
 		<file>icons/edit-copy.svg</file>
 		<file>icons/go-down.svg</file>
 		<file>icons/go-up.svg</file>
+		<file>icons/layer-lower.svg</file>
+		<file>icons/layer-raise.svg</file>
 		<file>icons/layer-visible-off.svg</file>
 		<file>icons/layer-visible-on.svg</file>
 		<file>icons/list-add.svg</file>
@@ -21,6 +23,7 @@
 		<file>icons/path-outset.svg</file>
 		<file>icons/pocket-shape.svg</file>
 		<file>icons/resizecol.svg</file>
+		<file>icons/set-origin.svg</file>
 		<file>icons/show-path-outline.svg</file>
 		<file>icons/transform-rotate.svg</file>
 		<file>icons/zoom-in.svg</file>

resource/icons/layer-raise.svg

@@ -11,6 +11,7 @@ set(SRC
 	polyline.cpp
 	quadraticspline.cpp
 	rect.cpp
+	sorter.cpp
 	spline.cpp
 
 	arc.h
@@ -23,6 +24,7 @@ set(SRC
 	cubicspline.h
 	polyline.h
 	quadraticspline.h
+	sorter.h
 	spline.h
 	rect.h
 	utils.h

resource/icons/set-origin.svg

@@ -1,4 +1,3 @@
-#include "qvectornd.h"
 #include <rect.h>
 
 namespace geometry
@@ -36,6 +35,24 @@ const QVector2D &Rect::max() const
 	return m_max;
 }
 
+QVector2D Rect::bottomLeft() const
+{
+	return m_min;
+}
+
+QVector2D Rect::topLeft() const
+{
+	return QVector2D(m_min.x(), m_max.y());
+}
+QVector2D Rect::topRight() const
+{
+	return m_max;
+}
+QVector2D Rect::bottomRight() const
+{
+	return QVector2D(m_max.x(), m_min.y());
+}
+
 QRectF Rect::toQt() const
 {
 	const QPointF topLeft(m_min.x(), m_max.y());