Merge 9bd1631103 into 2244f3f528

Export: Cleanup jqplot Module References.
Clean up references to the jqplot modules that were overlooked in #4350. Signed-off-by: Michael Keller <mikeller@042.ch>
2024-11-28 05:00:20 +00:00 · 2024-10-22 12:08:21 +13:00 · 2024-10-22 10:23:29 +13:00 · 2024-08-28 15:40:29 +02:00 · 2024-08-27 14:51:39 +02:00 · 2024-08-27 13:51:37 +02:00
7 changed files with 80 additions and 42 deletions
--- a/.gitattributes
+++ b/.gitattributes
@ -1,8 +1,9 @@
 .gitignore	export-ignore
 .gitattributes	export-ignore
 Documentation/*.html.git text=auto
-theme/jqplot.canvasAxisTickRenderer.min.js binary
-theme/jqplot.highlighter.min.js binary
+theme/jqplot.canvasAxisTickRenderer.js binary
+theme/jqplot.canvasTextRenderer.js binary
+theme/jqplot.highlighter.js binary
 theme/jquery.jqplot.min.js binary
 theme/jquery.min.js binary
 CHANGELOG.md -text merge=union
--- a/core/divelogexportlogic.cpp
+++ b/core/divelogexportlogic.cpp
@ -155,10 +155,10 @@ void exportHtmlInitLogic(const QString &filename, struct htmlExportSetting &hes)
 	file_copy_and_overwrite(searchPath + "dive_export.html", filename);
 	file_copy_and_overwrite(searchPath + "list_lib.js", exportFiles + "list_lib.js");
 	file_copy_and_overwrite(searchPath + "poster.png", exportFiles + "poster.png");
-	file_copy_and_overwrite(searchPath + "jqplot.highlighter.min.js", exportFiles + "jqplot.highlighter.min.js");
 	file_copy_and_overwrite(searchPath + "jquery.jqplot.min.js", exportFiles + "jquery.jqplot.min.js");
-	file_copy_and_overwrite(searchPath + "jqplot.canvasAxisTickRenderer.min.js", exportFiles + "jqplot.canvasAxisTickRenderer.min.js");
-	file_copy_and_overwrite(searchPath + "jqplot.canvasTextRenderer.min.js", exportFiles + "jqplot.canvasTextRenderer.min.js");
+	file_copy_and_overwrite(searchPath + "jqplot.canvasAxisTickRenderer.js", exportFiles + "jqplot.canvasAxisTickRenderer.js");
+	file_copy_and_overwrite(searchPath + "jqplot.canvasTextRenderer.js", exportFiles + "jqplot.canvasTextRenderer.js");
+	file_copy_and_overwrite(searchPath + "jqplot.highlighter.js", exportFiles + "jqplot.highlighter.js");
 	file_copy_and_overwrite(searchPath + "jquery.min.js", exportFiles + "jquery.min.js");
 	file_copy_and_overwrite(searchPath + "jquery.jqplot.min.css", exportFiles + "jquery.jqplot.min.css");
 	file_copy_and_overwrite(searchPath + hes.themeFile, exportFiles + "theme.css");
--- a/map-widget/qml/MapWidget.qml
+++ b/map-widget/qml/MapWidget.qml
@ -1,7 +1,7 @@
 // SPDX-License-Identifier: GPL-2.0
-import QtQuick 2.5
-import QtLocation 5.3
-import QtPositioning 5.3
+import QtQuick 
+import QtLocation 
+import QtPositioning 
 import org.subsurfacedivelog.mobile 1.0

 Item {
@ -15,7 +15,7 @@ Item {
 		id: mapHelper
 		map: map
 		editMode: false
-		onSelectedDivesChanged: rootItem.selectedDivesChanged(list)
+		onSelectedDivesChanged: (list) => { rootItem.selectedDivesChanged(list) }
 		onEditModeChanged: editMessage.isVisible = editMode === true ? 1 : 0
 		onCoordinatesChanged: {}
 		Component.onCompleted: {
@ -29,7 +29,6 @@ Item {
 		id: map
 		anchors.fill: parent
 		zoomLevel: defaultZoomIn
-
 		property var mapType
 		readonly property var defaultCenter: QtPositioning.coordinate(0, 0)
 		readonly property real defaultZoomIn: 12.0
@ -41,12 +40,46 @@ Item {
 		property real newZoomOut: 1.0
 		property var clickCoord: QtPositioning.coordinate(0, 0)
 		property bool isReady: false
-
 		Component.onCompleted: isReady = true
 		onZoomLevelChanged: {
 			if (isReady)
 				mapHelper.calculateSmallCircleRadius(map.center)
 		}
+        property geoCoordinate startCentroid
+        startCentroid: newCenter
+
+        PinchHandler {
+            id: pinch
+            target: null
+            onActiveChanged: if (active) {
+                map.startCentroid = map.toCoordinate(pinch.centroid.position, false)
+            }
+            onScaleChanged: (delta) => {
+                map.zoomLevel += Math.log2(delta)
+                map.alignCoordinateToPoint(map.startCentroid, pinch.centroid.position)
+            }
+            onRotationChanged: (delta) => {
+                map.bearing -= delta
+                map.alignCoordinateToPoint(map.startCentroid, pinch.centroid.position)
+            }
+            grabPermissions: PointerHandler.TakeOverForbidden
+        }
+        WheelHandler {
+            id: wheel
+            // workaround for QTBUG-87646 / QTBUG-112394 / QTBUG-112432:
+            // Magic Mouse pretends to be a trackpad but doesn't work with PinchHandler
+            // and we don't yet distinguish mice and trackpads on Wayland either
+            acceptedDevices: Qt.platform.pluginName === "cocoa" || Qt.platform.pluginName === "wayland"
+                             ? PointerDevice.Mouse | PointerDevice.TouchPad
+                             : PointerDevice.Mouse
+            rotationScale: 1/120
+            property: "zoomLevel"
+        }
+        DragHandler {
+            id: drag
+            target: null
+            onTranslationChanged: (delta) => map.pan(-delta.x, -delta.y)
+        }

 		MapItemView {
 			id: mapItemView
@ -68,6 +101,8 @@ Item {
 					MouseArea {
 						drag.target: (mapHelper.editMode && model.isSelected) ? mapItem : undefined
            anchors.fill: parent
+            hoverEnabled: true
+
 						onClicked: {
 							if (!mapHelper.editMode && model.divesite)
 								mapHelper.selectedLocationChanged(model.divesite)
@ -122,8 +157,8 @@ Item {

 		MouseArea {
 			anchors.fill: parent
-			onPressed: { map.stopZoomAnimations(); mouse.accepted = false }
-			onWheel: { map.stopZoomAnimations(); wheel.accepted = false }
+			onPressed: (mouse) => { map.stopZoomAnimations(); mouse.accepted = false }
+			onWheel: (wheel) => { map.stopZoomAnimations(); wheel.accepted = false }
 			onDoubleClicked: map.doubleClickHandler(map.toCoordinate(Qt.point(mouseX, mouseY)))
 		}

--- a/map-widget/qmlmapwidgethelper.cpp
+++ b/map-widget/qmlmapwidgethelper.cpp
@ -4,15 +4,15 @@
 #include <QDebug>
 #include <QVector>

-#include "qmlmapwidgethelper.h"
 #include "core/divefilter.h"
 #include "core/divelist.h"
 #include "core/divelog.h"
 #include "core/divesite.h"
 #include "core/qthelper.h"
 #include "core/range.h"
-#include "qt-models/maplocationmodel.h"
+#include "qmlmapwidgethelper.h"
 #include "qt-models/divelocationmodel.h"
+#include "qt-models/maplocationmodel.h"
 #ifndef SUBSURFACE_MOBILE
 #include "desktop-widgets/mapwidget.h"
 #endif
@ -44,7 +44,7 @@ void MapWidgetHelper::centerOnDiveSite(struct dive_site *ds)
 	} else {
 		// dive site with GPS
 		m_mapLocationModel->setSelected(ds);
-		QGeoCoordinate dsCoord (ds->location.lat.udeg * 0.000001, ds->location.lon.udeg * 0.000001);
+		QGeoCoordinate dsCoord(ds->location.lat.udeg * 0.000001, ds->location.lon.udeg * 0.000001);
 		QMetaObject::invokeMethod(m_map, "centerOnCoordinate", Q_ARG(QVariant, QVariant::fromValue(dsCoord)));
 	}
 }
@ -69,7 +69,7 @@ void MapWidgetHelper::centerOnSelectedDiveSite()
 	// find the most top-left and bottom-right dive sites on the map coordinate system.
 	qreal minLat = 0.0, minLon = 0.0, maxLat = 0.0, maxLon = 0.0;
 	int count = 0;
-	for(struct dive_site *dss: selDS) {
+	for (struct dive_site *dss : selDS) {
 		if (!has_location(&dss->location))
 			continue;
 		qreal lat = dss->location.lat.udeg * 0.000001;
@ -92,7 +92,7 @@ void MapWidgetHelper::centerOnSelectedDiveSite()
 	// Pass coordinates to QML, either as a point or as a rectangle.
 	// If we didn't find any coordinates, do nothing.
 	if (count == 1) {
-		QGeoCoordinate dsCoord (selDS[0]->location.lat.udeg * 0.000001, selDS[0]->location.lon.udeg * 0.000001);
+		QGeoCoordinate dsCoord(selDS[0]->location.lat.udeg * 0.000001, selDS[0]->location.lon.udeg * 0.000001);
 		QMetaObject::invokeMethod(m_map, "centerOnCoordinate", Q_ARG(QVariant, QVariant::fromValue(dsCoord)));
 	} else if (count > 1) {
 		QGeoCoordinate coordTopLeft(minLat, minLon);
@ -134,7 +134,7 @@ void MapWidgetHelper::selectedLocationChanged(struct dive_site *ds_in)
 		return;
 	QGeoCoordinate locationCoord = location->coordinate;

-	for (auto [idx, dive]: enumerated_range(divelog.dives)) {
+	for (auto [idx, dive] : enumerated_range(divelog.dives)) {
 		struct dive_site *ds = dive->dive_site;
 		if (!ds || !ds->has_gps_location())
 			continue;
@ -162,7 +162,7 @@ void MapWidgetHelper::selectedLocationChanged(struct dive_site *ds_in)
 void MapWidgetHelper::selectVisibleLocations()
 {
 	QList<int> selectedDiveIds;
-	for (auto [idx, dive]: enumerated_range(divelog.dives)) {
+	for (auto [idx, dive] : enumerated_range(divelog.dives)) {
 		struct dive_site *ds = dive->dive_site;
 		if (!ds || ds->has_gps_location())
 			continue;
@ -251,8 +251,8 @@ QString MapWidgetHelper::pluginObject()
 {
 	QString lang = getUiLanguage().replace('_', '-');
 	QString cacheFolder = QString::fromStdString(system_default_directory() + "/googlemaps").replace("\\", "/");
-	return QStringLiteral("import QtQuick 2.0;"
-			      "import QtLocation 5.3;"
+	return QStringLiteral("import QtQuick;"
+			      "import QtLocation;"
 			      "Plugin {"
 			      "    id: mapPlugin;"
 			      "    name: 'googlemaps';"
@ -263,5 +263,6 @@ QString MapWidgetHelper::pluginObject()
 			      "            console.warn('MapWidget.qml: cannot find a plugin named: ' + name);"
 			      "        }"
 			      "    }"
-			      "}").arg(lang, cacheFolder);
+			      "}")
+		.arg(lang, cacheFolder);
 }
--- a/packaging/ubuntu/debian/source.lintian-overrides
+++ b/packaging/ubuntu/debian/source.lintian-overrides
@ -1,7 +1,7 @@
 # We use the package
-subsurface source: source-is-missing theme/jqplot.canvasAxisTickRenderer.min.js
-subsurface source: source-is-missing theme/jqplot.canvasTextRenderer.min.js
-subsurface source: source-is-missing theme/jqplot.highlighter.min.js
+subsurface source: source-is-missing theme/jqplot.canvasAxisTickRenderer.js
+subsurface source: source-is-missing theme/jqplot.canvasTextRenderer.js
+subsurface source: source-is-missing theme/jqplot.highlighter.js
 subsurface source: source-is-missing theme/jquery.jqplot.min.js
 subsurface source: source-is-missing theme/jquery.min.js
 subsurface source: source-is-missing theme/list_lib.js
--- a/scripts/get-dep-lib.sh
+++ b/scripts/get-dep-lib.sh
@ -169,7 +169,8 @@ for package in "${PACKAGES[@]}" ; do
 			git_checkout_library breeze-icons $CURRENT_BREEZE_ICONS https://github.com/kde/breeze-icons.git
 			;;
 		googlemaps)
-			git_checkout_library googlemaps master https://github.com/Subsurface/googlemaps.git
+			#git_checkout_library googlemaps master https://github.com/Subsurface/googlemaps.git
+			git_checkout_library googlemaps master https://github.com/vladest/googlemaps.git
      ;;
 		hidapi)
 			git_checkout_library hidapi master https://github.com/libusb/hidapi.git
--- a/theme/dive_export.html
+++ b/theme/dive_export.html
@ -49,9 +49,9 @@ function load_scripts()
 	load_script_sync("list_lib.js");
 	load_script_sync("jquery.min.js");
 	load_script_sync("jquery.jqplot.min.js");
-	load_script_sync("jqplot.highlighter.min.js");
-	load_script_sync("jqplot.canvasAxisTickRenderer.min.js");
-	load_script_sync("jqplot.canvasTextRenderer.min.js");
+	load_script_sync("jqplot.canvasAxisTickRenderer.js");
+	load_script_sync("jqplot.canvasTextRenderer.js");
+	load_script_sync("jqplot.highlighter.js");
 }

 var advanced_shown=false;
Author	SHA1	Message	Date
Egbert de Pauw	a149434511	Merge `9bd1631103` into `2244f3f528`	2024-10-22 12:08:21 +13:00
Michael Keller	2244f3f528	Export: Cleanup jqplot Module References. Clean up references to the jqplot modules that were overlooked in #4350. Signed-off-by: Michael Keller <mikeller@042.ch>	2024-10-22 10:23:29 +13:00
Egbert de Pauw	9bd1631103	Merge branch 'subsurface:master' into qt6devel	2024-08-28 15:40:29 +02:00
Egbertdepauw	7201a40c5f	Removed some testing code. There was an unneeded line in the code, just for my own testing purposes. Signed-off-by: Egbertdepauw <egbert@despaankamer.nl>	2024-08-27 14:51:39 +02:00
Egbertdepauw	c5e5535f51	qt6: Make subsurface buildable with Qt6 on Macos Building on macos with the Qt6 framework. made changes to several files to make it possible to build subsurface desktop with the Qt 6.5.x and higher framework. Tested versions: 6.5.2, 6.6.3, 6.7.2 code builds and googlemaps works, made some adjustments to get panning and zooming with mouse or trackpad working. See issue #3577 "Build Fails, macOS" for build details. Signed-off-by: Egbertdepauw <egbert@despaankamer.nl>	2024-08-27 13:51:37 +02:00