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.

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

Implementation of basic image attachment sketching capability #5149

Merged
merged 32 commits into from Apr 9, 2024
Merged

Conversation

nirvn
Copy link
Member

@nirvn nirvn commented Mar 27, 2024

This PR implements an in-house drawing/sketching functionality to QField, and exposes it in the attachment widget allowing for users to quickly sketch over images they have taken.

Video showing UI to add a new drawing (blank or based on template) as attachment:

Screencast.from.2024-03-29.17-43-43.webm

Video showing UI/UX to draw over pre-existing image attachment:

Screencast.from.2024-03-28.14-06-47.webm

The UI is minimalist in nature and aims at being light while offering basic functionalities needed. Follow up PRs will cover sketch background templates and more UI changes to expose e.g. sketching from scratch attachment.

@qfield-fairy
Copy link
Collaborator

qfield-fairy commented Mar 27, 2024

@Fertuesta25
Copy link

Esto se podría usar a futuro para recopilar firmas digitales...

src/qml/QFieldSketcher.qml Outdated Show resolved Hide resolved
@nirvn nirvn force-pushed the sketch branch 4 times, most recently from 31b6eb5 to 3a4eec5 Compare April 3, 2024 06:29
@m-kuhn m-kuhn closed this Apr 4, 2024
@m-kuhn m-kuhn reopened this Apr 4, 2024
@nirvn nirvn force-pushed the sketch branch 3 times, most recently from a26ecb2 to 9d269ff Compare April 5, 2024 01:19
Copy link
Contributor

@github-actions github-actions bot left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

clang-tidy made some suggestions

There were too many comments to post at once. Showing the first 25 out of 26. Check the log or trigger a new build to see more.

src/core/drawingcanvas.cpp Outdated Show resolved Hide resolved
src/core/drawingcanvas.cpp Show resolved Hide resolved
src/core/drawingcanvas.cpp Show resolved Hide resolved
src/core/drawingcanvas.cpp Outdated Show resolved Hide resolved
src/core/drawingcanvas.cpp Show resolved Hide resolved
src/core/drawingtemplatemodel.cpp Outdated Show resolved Hide resolved
src/core/drawingtemplatemodel.cpp Show resolved Hide resolved
src/core/drawingtemplatemodel.h Show resolved Hide resolved
src/core/drawingtemplatemodel.h Show resolved Hide resolved
src/core/drawingtemplatemodel.h Show resolved Hide resolved
Copy link
Contributor

@github-actions github-actions bot left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

clang-tidy made some suggestions

src/core/drawingcanvas.h Show resolved Hide resolved
src/core/drawingtemplatemodel.h Show resolved Hide resolved
Copy link
Member

@domi4484 domi4484 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

code looks generally good to me. Just the two issues i found out by testing:

  • Buttons to small to hit
  • Feature form tabs reacting strange

@nirvn
Copy link
Member Author

nirvn commented Apr 9, 2024

Alright let's merge and deal with those lingering issues in separate PRs.

@nirvn nirvn merged commit 2e5c7b6 into master Apr 9, 2024
23 checks passed
@nirvn nirvn deleted the sketch branch April 9, 2024 14:47
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

5 participants