Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Angle snapping tolerance functionality #5945

Merged
merged 4 commits into from
Feb 7, 2025
Merged

Angle snapping tolerance functionality #5945

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
d8c6997
**NEW** snapping to every angle and tolerance user interface.
mohsenD98 Jan 15, 2025
aa21c33
Add getToleranceMultiplier.
mohsenD98 Jan 20, 2025
b8d7c3d
Default snappingTolerance on Normal.
mohsenD98 Jan 31, 2025
d0f8a2a
Show snapping config until clicked outside, smooth movement of options.
mohsenD98 Feb 4, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
21 changes: 20 additions & 1 deletion src/qml/CoordinateLocator.qml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,7 @@ Item {
property bool snapToCommonAngles: false
property bool snappingIsRelative: false
property real snappingAngleDegrees: 45.0
property real snappingTolerance: 1

/**
* Overrides any possibility for the user to modify the coordinate.
Expand Down Expand Up @@ -392,6 +393,24 @@ Item {
flashAnimation.start();
}

/** Function to get the multiplier based on the selected tolerance
*
* - Narrow tolerance (index 0) divides by 2.
* - Normal tolerance (index 1) keeps unchanged.
* - Large tolerance (index 2) multiplies by 4.
*/
function getToleranceMultiplier() {
switch (snappingTolerance) {
case 0:
return 0.5;
case 2:
return 4;
case 1:
default:
return 1;
}
}

/**
* Computes the possible common angle
*
Expand All @@ -407,7 +426,7 @@ Item {
return;
}
const MINIMAL_PIXEL_DISTANCE_TRESHOLD = 20;
const SOFT_CONSTRAINT_TOLERANCE_DEGREES = 20;
const SOFT_CONSTRAINT_TOLERANCE_DEGREES = 20 * getToleranceMultiplier();
const SOFT_CONSTRAINT_TOLERANCE_PIXEL = 40;
const rubberbandPointsCount = rubberbandModel.vertexCount;
const targetPoint = mapCanvas.mapSettings.coordinateToScreen(forwardMode ? rubberbandModel.firstCoordinate : rubberbandModel.lastCoordinate);
Expand Down
167 changes: 147 additions & 20 deletions src/qml/qgismobileapp.qml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -600,7 +600,7 @@ ApplicationWindow {
id: mapCanvasMap

property bool isEnabled: !dashBoard.opened && !aboutDialog.visible && !welcomeScreen.visible && !qfieldSettings.visible && !qfieldLocalDataPickerScreen.visible && !qfieldCloudScreen.visible && !qfieldCloudPopup.visible && !codeReader.visible && !sketcher.visible && !overlayFeatureFormDrawer.visible && !rotateFeaturesToolbar.rotateFeaturesRequested
interactive: isEnabled && !screenLocker.enabled
interactive: isEnabled && !screenLocker.enabled && !snapToCommonAngleMenu.visible
isMapRotationEnabled: qfieldSettings.enableMapRotation
incrementalRendering: true
quality: qfieldSettings.quality
Expand Down Expand Up @@ -1697,10 +1697,12 @@ ApplicationWindow {
coordinateLocator.snapToCommonAngles = settings.valueBool("/QField/Digitizing/SnapToCommonAngleIsEnabled", false);
coordinateLocator.snappingIsRelative = settings.valueBool("/QField/Digitizing/SnapToCommonAngleIsRelative", true);
coordinateLocator.snappingAngleDegrees = settings.valueInt("/QField/Digitizing/SnapToCommonAngleDegrees", 45);
coordinateLocator.snappingTolerance = settings.valueInt("/QField/Digitizing/SnappingTolerance", 1);
}

Menu {
id: snapToCommonAngleMenu
width: Theme.menuItemIconlessLeftPadding + Math.max(angles.count * 35, tolorences.count * 55) + 24

MenuItem {
text: qsTr("Relative angle")
Expand All @@ -1721,31 +1723,156 @@ ApplicationWindow {
width: parent.width
}

Repeater {
// list of common angles to snap to
Text {
text: qsTr("Snapping to every")
color: Theme.mainTextColor
font: Theme.defaultFont
leftPadding: Theme.menuItemIconlessLeftPadding
}

Item {
width: 1
height: 8
}

ListView {
id: angles
height: 35
anchors {
left: parent.left
leftMargin: Theme.menuItemIconlessLeftPadding
rightMargin: 4
}
spacing: 3
orientation: ListView.Horizontal
model: [10, 15, 30, 45, 90]
delegate: MenuItem {
required property int modelData
currentIndex: Math.max(model.findIndex(q => q === coordinateLocator.snappingAngleDegrees), 0)
highlightFollowsCurrentItem: true

highlight: Rectangle {
width: 35
height: parent.height
color: Theme.mainColor
radius: width / 2
}

delegate: Item {
width: 35
height: width
enabled: !selected

property bool selected: modelData === coordinateLocator.snappingAngleDegrees

Text {
text: qsTr("%1°").arg(modelData)
font: parent.selected ? Theme.strongTipFont : Theme.tipFont
anchors.centerIn: parent
color: Theme.mainTextColor
}

Ripple {
clip: true
anchors.fill: parent
clipRadius: width / 2
pressed: angleMouseArea.pressed
anchor: parent
active: angleMouseArea.pressed
color: "#22aaaaaa"
}

MouseArea {
id: angleMouseArea
anchors.fill: parent
onClicked: {
if (parent.selected) {
return;
}
coordinateLocator.snapToCommonAngles = true;
coordinateLocator.snappingAngleDegrees = modelData;
settings.setValue("/QField/Digitizing/SnapToCommonAngleDegrees", coordinateLocator.snappingAngleDegrees);
displayToast(qsTr("Snap to %1° angle turned on").arg(modelData));
}
}
}
}

Item {
width: 1
height: 8
}

Text {
text: qsTr("Snapping tolerance")
color: Theme.mainTextColor
font: Theme.defaultFont
leftPadding: Theme.menuItemIconlessLeftPadding
}

text: qsTr("Snap every %1°").arg(modelData)
Item {
width: 1
height: 8
}

font: Theme.defaultFont
height: 48
leftPadding: Theme.menuItemCheckLeftPadding
ListView {
id: tolorences
height: 35
anchors {
left: parent.left
leftMargin: Theme.menuItemIconlessLeftPadding
rightMargin: 4
}
spacing: 3
orientation: ListView.Horizontal
model: [qsTr("Narrow"), qsTr("Normal"), qsTr("Large")]
highlight: Rectangle {
width: 35
height: parent.height
color: Theme.mainColor
radius: 4
}
currentIndex: coordinateLocator.snappingTolerance
highlightFollowsCurrentItem: true
delegate: Item {
id: tolorenceDelegate
width: (angles.contentWidth) / 3
height: 35
enabled: !selected

property bool selected: index === coordinateLocator.snappingTolerance

Text {
id: tolorenceText
text: modelData
font: parent.selected ? Theme.strongTipFont : Theme.tipFont
anchors.centerIn: parent
color: Theme.mainTextColor
elide: Text.ElideRight
width: parent.width
horizontalAlignment: Text.AlignHCenter
}

checkable: true
checked: modelData === coordinateLocator.snappingAngleDegrees
enabled: modelData !== coordinateLocator.snappingAngleDegrees
Ripple {
clip: true
anchors.fill: parent
clipRadius: 4
pressed: tolerancesMouseArea.pressed
anchor: parent
active: tolerancesMouseArea.pressed
color: "#22aaaaaa"
}

onTriggered: {
if (!checked) {
return;
MouseArea {
id: tolerancesMouseArea
anchors.fill: parent
onClicked: {
if (parent.selected) {
return;
}
coordinateLocator.snapToCommonAngles = true;
coordinateLocator.snappingTolerance = index;
settings.setValue("/QField/Digitizing/SnappingTolerance", coordinateLocator.snappingTolerance);
displayToast(qsTr("Snapping tolerance setted to %1").arg(modelData));
}
coordinateLocator.snapToCommonAngles = true;
coordinateLocator.snappingAngleDegrees = modelData;
settings.setValue("/QField/Digitizing/SnapToCommonAngleDegrees", coordinateLocator.snappingAngleDegrees);
displayToast(qsTr("Snap to %1° angle turned on").arg(modelData));
snapToCommonAngleMenu.close();
}
}
}
Expand Down
Loading