From 30e9a5a5cd771ea5be080f8ae6af86c7af53c1a3 Mon Sep 17 00:00:00 2001 From: alban Date: Sat, 31 Oct 2020 22:54:55 +0100 Subject: [PATCH] [enh] It should be possible to crop and reuse the same snap --- index.html | 3 +- js/canvas.js | 44 +- js/cropper/.editorconfig | 9 + js/cropper/.eslintrc | 26 + js/cropper/.gitattributes | 2 + js/cropper/.github/CODE_OF_CONDUCT.md | 13 + js/cropper/.github/CONTRIBUTING.md | 201 + js/cropper/.github/ISSUE_TEMPLATE.md | 60 + js/cropper/.github/PULL_REQUEST_TEMPLATE.md | 47 + js/cropper/.gitignore | 4 + js/cropper/.travis.yml | 9 + js/cropper/cropper.css | 304 ++ js/cropper/cropper.js | 3624 +++++++++++++++++++ js/cropper/cropper.min.css | 9 + js/cropper/cropper.min.js | 10 + 15 files changed, 4356 insertions(+), 9 deletions(-) create mode 100644 js/cropper/.editorconfig create mode 100644 js/cropper/.eslintrc create mode 100644 js/cropper/.gitattributes create mode 100644 js/cropper/.github/CODE_OF_CONDUCT.md create mode 100644 js/cropper/.github/CONTRIBUTING.md create mode 100644 js/cropper/.github/ISSUE_TEMPLATE.md create mode 100644 js/cropper/.github/PULL_REQUEST_TEMPLATE.md create mode 100644 js/cropper/.gitignore create mode 100644 js/cropper/.travis.yml create mode 100644 js/cropper/cropper.css create mode 100644 js/cropper/cropper.js create mode 100644 js/cropper/cropper.min.css create mode 100644 js/cropper/cropper.min.js diff --git a/index.html b/index.html index ba20910..bbea976 100644 --- a/index.html +++ b/index.html @@ -13,8 +13,9 @@ - + + diff --git a/js/canvas.js b/js/canvas.js index 2529b1b..d80b438 100644 --- a/js/canvas.js +++ b/js/canvas.js @@ -3,6 +3,10 @@ $(document).ready(function(){ var binary_level = 100 var url = document.URL + var cropper = null + var snap = null + var width; + var height; // Grab elements, create settings, etc. var canvas = document.getElementById('canvas'); @@ -13,17 +17,40 @@ $(document).ready(function(){ console.log('An error has occurred!', e) }; - function snap(){ - context.drawImage(video, 0, 0, 640, 480); + /** + Take a new snapshot from the camera and store it + **/ + function doSnap(){ + cropper && cropper.destroy() + context.drawImage(video, 0, 0, width, height); + snap = context.createImageData(width, height); + snap.data.set( context.getImageData(0, 0, width, height).data ) + console.log(snap) + console.log(context.getImageData(0, 0, width, height)) binary(context) $("#result").show() $('html, body').animate({scrollTop: $("#result").offset().top}, 2000); + + cropper = new Cropper(canvas,{ + viewMode: 3, + autoCropArea: 1 + }); + } + + function doContrast(){ + cropper && cropper.destroy() + context.putImageData(snap,0,0) + binary(context) + cropper = new Cropper(canvas,{ + viewMode: 3, + autoCropArea: 1 + }); } function setCameraResolution( track ){ - var width = track.getSettings().width - var height = track.getSettings().height + width = track.getSettings().width + height = track.getSettings().height $("#video").attr("width",width) $("#video").attr("height",height) $("#canvas").attr("width",width) @@ -62,7 +89,7 @@ $(document).ready(function(){ // Trigger photo take $('.snap').on('click', function() { - snap() + doSnap() }); function binary(context){ @@ -104,12 +131,12 @@ $(document).ready(function(){ max : 255, change: function(event,ui){ binary_level = ui.value - snap() + doContrast() } }); $("#send").on("click",function(){ - var canvas = document.getElementById('canvas'); - image_data = canvas.toDataURL(); + var cropCanvas = cropper.getCroppedCanvas(); + image_data = cropCanvas.toDataURL(); $("#messages").html('') $.ajax({ @@ -137,4 +164,5 @@ $(document).ready(function(){ }) }) + }) diff --git a/js/cropper/.editorconfig b/js/cropper/.editorconfig new file mode 100644 index 0000000..0f17867 --- /dev/null +++ b/js/cropper/.editorconfig @@ -0,0 +1,9 @@ +root = true + +[*] +charset = utf-8 +end_of_line = lf +indent_size = 2 +indent_style = space +insert_final_newline = true +trim_trailing_whitespace = true diff --git a/js/cropper/.eslintrc b/js/cropper/.eslintrc new file mode 100644 index 0000000..a2a220e --- /dev/null +++ b/js/cropper/.eslintrc @@ -0,0 +1,26 @@ +{ + "extends": "airbnb-base", + "env": { + "browser": true + }, + "root": true, + "rules": { + "import/no-extraneous-dependencies": "off" + }, + "overrides": [ + { + "files": "test/**/*.js", + "env": { + "jquery": true, + "mocha": true + }, + "globals": { + "$": true, + "expect": true + }, + "rules": { + "no-unused-expressions": "off" + } + } + ] +} diff --git a/js/cropper/.gitattributes b/js/cropper/.gitattributes new file mode 100644 index 0000000..dfe0770 --- /dev/null +++ b/js/cropper/.gitattributes @@ -0,0 +1,2 @@ +# Auto detect text files and perform LF normalization +* text=auto diff --git a/js/cropper/.github/CODE_OF_CONDUCT.md b/js/cropper/.github/CODE_OF_CONDUCT.md new file mode 100644 index 0000000..760ee26 --- /dev/null +++ b/js/cropper/.github/CODE_OF_CONDUCT.md @@ -0,0 +1,13 @@ +# Contributor Code of Conduct + +As contributors and maintainers of this project, we pledge to respect all people who contribute through reporting issues, posting feature requests, updating documentation, submitting pull requests or patches, and other activities. + +We are committed to making participation in this project a harassment-free experience for everyone, regardless of level of experience, gender, gender identity and expression, sexual orientation, disability, personal appearance, body size, race, ethnicity, age, or religion. + +Examples of unacceptable behavior by participants include the use of sexual language or imagery, derogatory comments or personal attacks, trolling, public or private harassment, insults, or other unprofessional conduct. + +Project maintainers have the right and responsibility to remove, edit, or reject comments, commits, code, wiki edits, issues, and other contributions that are not aligned to this Code of Conduct. Project maintainers who do not follow the Code of Conduct may be removed from the project team. + +Instances of abusive, harassing, or otherwise unacceptable behavior may be reported by opening an issue or contacting one or more of the project maintainers. + +This Code of Conduct is adapted from the [Contributor Covenant](http:contributor-covenant.org), version 1.0.0, available at https://www.contributor-covenant.org/version/1/0/0/code-of-conduct.html diff --git a/js/cropper/.github/CONTRIBUTING.md b/js/cropper/.github/CONTRIBUTING.md new file mode 100644 index 0000000..fdc9747 --- /dev/null +++ b/js/cropper/.github/CONTRIBUTING.md @@ -0,0 +1,201 @@ +# Contributing to jquery-cropper + +> Based on [Angular's contributing guidelines](https://github.com/angular/angular/blob/master/CONTRIBUTING.md). + +We would love for you to contribute to jquery-cropper and help make it even better than it is today! As a contributor, here are the guidelines we would like you to follow: + +- [Code of Conduct](#code-of-conduct) +- [Question or Problem](#question-or-problem) +- [Issues and Bugs](#issues-and-bugs) +- [Feature Requests](#feature-requests) +- [Submission Guidelines](#submission-guidelines) +- [Coding Rules](#coding-rules) +- [Commit Message Guidelines](#commit-message-guidelines) + +## Code of Conduct + +Help us keep jquery-cropper open and inclusive. Please read and follow our [Code of Conduct](CODE_OF_CONDUCT.md). + +## Question or Problem + +Do not open issues for general support questions as we want to keep GitHub issues for bug reports and feature requests. You've got much better chances of getting your question answered on [Stack Overflow](https://stackoverflow.com/questions/tagged/jquery-cropper) where the questions should be tagged with tag `jquery-cropper`. + +Stack Overflow is a much better place to ask questions since: + +- There are thousands of people willing to help on Stack Overflow. +- Questions and answers stay available for public viewing so your question / answer might help someone else. +- Stack Overflow's voting system assures that the best answers are prominently visible. + +To save your and our time, we will systematically close all issues that are requests for general support and redirect people to Stack Overflow. + +## Issues and Bugs + +If you find a bug in the source code, you can help us by [submitting an issue](#submitting-an-issue) to our [GitHub Repository](https://github.com/fengyuanchen/jquery-cropper). Even better, you can [submit a Pull Request](#submitting-a-pull-request-pr) with a fix. + +## Feature Requests + +You can *request* a new feature by [submitting an issue](#submitting-an-issue) to our [GitHub Repository](https://github.com/fengyuanchen/jquery-cropper). If you would like to *implement* a new feature, please submit an issue with a proposal for your work first, to be sure that we can use it. + +Please consider what kind of change it is: + +- For a **Major Feature**, first open an issue and outline your proposal so that it can be discussed. This will also allow us to better coordinate our efforts, prevent duplication of work, and help you to craft the change so that it is successfully accepted into the project. +- **Small Features** can be crafted and directly [submitted as a Pull Request](#submitting-a-pull-request-pr). + +## Submission Guidelines + +### Submitting an Issue + +Before you submit an issue, please search the [issue tracker](https://github.com/fengyuanchen/jquery-cropper/issues), maybe an issue for your problem already exists and the discussion might inform you of workarounds readily available. + +We want to fix all the issues as soon as possible, but before fixing a bug we need to reproduce and confirm it. In order to reproduce bugs we will systematically ask you to provide a minimal reproduction scenario using [CodePen](https://codepen.io/pen). Having a live, reproducible scenario gives us wealth of important information without going back & forth to you with additional questions like: + +- version of jquery-cropper used +- 3rd-party libraries and their versions +- and most importantly - a use-case that fails + +A minimal reproduce scenario using [CodePen](https://codepen.io/pen) allows us to quickly confirm a bug (or point out coding problem) as well as confirm that we are fixing the right problem. If [CodePen](https://codepen.io/pen) is not a suitable way to demonstrate the problem (for example for issues related to our npm packaging), please create a standalone git repository demonstrating the problem. + +We will be insisting on a minimal reproduce scenario in order to save maintainers time and ultimately be able to fix more bugs. Interestingly, from our experience users often find coding problems themselves while preparing a minimal reproduce scenario. We understand that sometimes it might be hard to extract essentials bits of code from a larger code-base but we really need to isolate the problem before we can fix it. + +Unfortunately we are not able to investigate / fix bugs without a minimal reproduce scenario, so if we don't hear back from you we are going to close an issue that don't have enough info to be reproduced. + +You can file new issues by filling out our [new issue form](https://github.com/fengyuanchen/jquery-cropper/issues/new). + +### Submitting a Pull Request (PR) + +Before you submit your Pull Request (PR) consider the following guidelines: + +1. Search [GitHub](https://github.com/fengyuanchen/jquery-cropper/pulls) for an open or closed PR that relates to your submission. You don't want to duplicate effort. +1. Fork the **fengyuanchen/jquery-cropper** repo. +1. Make your changes in a new git branch: + + ```shell + git checkout -b my-fix-branch master + ``` + +1. Create your patch, **including appropriate test cases**. +1. Follow our [Coding Rules](#coding-rules). +1. Run the full jquery-cropper test suite, and ensure that all tests pass. +1. Commit your changes using a descriptive commit message that follows our [Commit Message Guidelines](#commit-message-guidelines). Adherence to these guidelines is necessary because release notes are automatically generated from these messages. + + ```shell + git commit -a + ``` + + Note: the optional commit `-a` command line option will automatically "add" and "rm" edited files. +1. Push your branch to GitHub: + + ```shell + git push origin my-fix-branch + ``` + +1. In GitHub, send a pull request to `jquery-cropper:master`. +1. If we suggest changes then: + - Make the required updates. + - Re-run the jquery-cropper test suites to ensure tests are still passing. + - Rebase your branch and force push to your GitHub repository (this will update your Pull Request): + + ```shell + git rebase master -i + git push -f + ``` + +That's it! Thank you for your contribution! + +#### After your pull request is merged + +After your pull request is merged, you can safely delete your branch and pull the changes from the main (upstream) repository: + +1. Delete the remote branch on GitHub either through the GitHub web UI or your local shell as follows: + + ```shell + git push origin --delete my-fix-branch + ``` + +1. Check out the master branch: + + ```shell + git checkout master -f + ``` + +1. Delete the local branch: + + ```shell + git branch -D my-fix-branch + ``` + +1. Update your master with the latest upstream version: + + ```shell + git pull --ff upstream master + ``` + +## Coding Rules + +To ensure consistency throughout the source code, keep these rules in mind as you are working: + +- All features or bug fixes **must be tested** by one or more specs (unit-tests). +- All public API methods **must be documented**. +- We follow [Airbnb's JavaScript Style Guide](https://github.com/airbnb/javascript). + +## Commit Message Guidelines + +### Commit Message Format + +A commit message consists of a **header**, **body** and **footer**. The header has a **type**, **scope** and **subject**: + +``` +(): + + + +