mirror of
https://github.com/publiclab/image-sequencer.git
synced 2025-12-06 08:20:04 +01:00
Compare commits
45 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
85e1f9335d | ||
|
|
bc1f79a8b9 | ||
|
|
45d95b3443 | ||
|
|
856446db45 | ||
|
|
f3d94b62ac | ||
|
|
ad1d08902a | ||
|
|
45635b5310 | ||
|
|
657707ade5 | ||
|
|
103e7f9081 | ||
|
|
579a0afbe6 | ||
|
|
e6094b7b88 | ||
|
|
de31ac18f8 | ||
|
|
52e91dc3d8 | ||
|
|
3563664802 | ||
|
|
2585ab3319 | ||
|
|
415b781e3e | ||
|
|
25f7628192 | ||
|
|
038ea03d1d | ||
|
|
28e2476d44 | ||
|
|
799b2bb80d | ||
|
|
1e0981ba2a | ||
|
|
e69c9790c5 | ||
|
|
ce2cc86a91 | ||
|
|
e55c95edb0 | ||
|
|
a3db5d895f | ||
|
|
5d84a5e690 | ||
|
|
9410c4f44f | ||
|
|
49eb144402 | ||
|
|
5351db0038 | ||
|
|
d58491c36d | ||
|
|
80f2ceb637 | ||
|
|
287d7e2be1 | ||
|
|
28b648361b | ||
|
|
b077aba555 | ||
|
|
f9b1611381 | ||
|
|
712c6164ed | ||
|
|
ab54cf14c6 | ||
|
|
1d12ac1a15 | ||
|
|
4384b87923 | ||
|
|
94d6e82993 | ||
|
|
0089ed1eca | ||
|
|
8853a2217c | ||
|
|
4a940be85a | ||
|
|
e7fb17e692 | ||
|
|
a4020cddad |
18
.github/ISSUE_TEMPLATE/release_workflow.md
vendored
18
.github/ISSUE_TEMPLATE/release_workflow.md
vendored
@@ -13,26 +13,26 @@ Discuss with @publiclab/is-maintainers if anything is ambiguous!
|
||||
<!-- NOTE: Change v0.0.0 to the appropriate release version -->
|
||||
|
||||
* [x] open an issue using the "release" template with this checklist with title `Checklist and coordination for v0.0.0 major/minor/patch release` (see [semantic versioning](https://docs.npmjs.com/about-semantic-versioning/))
|
||||
* [ ] create a release [project](https://github.com/publiclab/image-sequencer/projects) from [this template](https://github.com/publiclab/image-sequencer/projects/5). You can copy a project from its menu.
|
||||
* [ ] compile release notes below from corresponding [release project](https://github.com/publiclab/image-sequencer/projects).
|
||||
* [ ] create a release draft in https://github.com/publiclab/image-sequencer/releases
|
||||
* [ ] auto-compile release notes and copy below from corresponding release draft
|
||||
* [ ] open a pull request with updated version numbers
|
||||
* [ ] update version number in `examples/sw.js` (ex #1734) and `package.json` (ex #1695)
|
||||
* [ ] update version number in `package.json`
|
||||
* [ ] update version number in `package.json` (ex #1695)
|
||||
* [ ] update version number in `examples/sw.js` (ex #1734)
|
||||
* [ ] run `npm install` to update `package-lock.json` (from recent node version - 16 at time of writing, in GitPod should work)
|
||||
* [ ] check in `package-lock.json`
|
||||
* [ ] finalize and merge to `main` branch (freeze merges to `main` branch until next step)
|
||||
|
||||
Now, move to `stable` branch:
|
||||
|
||||
* [ ] force push from `main` to `stable`
|
||||
* [ ] then in `stable` branch, compile `/dist/` files with `grunt build`
|
||||
* [ ] add `/dist/` files with `git add -f /dist/*` and commit them to `stable` branch
|
||||
* [ ] run `npm publish`
|
||||
* [ ] then in `stable` branch, compile `dist/` files with `grunt build`
|
||||
* [ ] add `dist/` files with `git add -f dist/*` and commit them to `stable` branch
|
||||
* [ ] publish `stable` branch to `npm` with `npm publish` (logging in first as necessary)
|
||||
|
||||
Draft a release:
|
||||
|
||||
* [ ] [create a release on GitHub](https://github.com/publiclab/image-sequencer/releases) and use features description + release notes from below
|
||||
* [ ] [create a release on GitHub](https://github.com/publiclab/image-sequencer/releases) and reconcile with features description + release notes from below
|
||||
* [ ] tag version number branch (i.e. `v0.0.0`) based on `stable` or choose `stable`
|
||||
* [ ] publish tagged branch to `npm` with `npm publish` (logging in first as necessary)
|
||||
* [ ] publish to live Github pages [demo](https://sequencer.publiclab.org) (with [bash script](https://github.com/publiclab/image-sequencer/pull/1703) from `/scripts/update-demo`) (from within GitPod works well)
|
||||
* [ ] move anything necessary to next release project, i.e. <!-- Update this link -->https://github.com/publiclab/image-sequencer/projects/[insert project number]
|
||||
* [ ] close this issue!
|
||||
|
||||
16
.github/PULL_REQUEST_TEMPLATE.md
vendored
16
.github/PULL_REQUEST_TEMPLATE.md
vendored
@@ -1,6 +1,8 @@
|
||||
Fixes #0000 (<=== Replace `0000` with the Issue Number)
|
||||
<!--- (Replace `0000` with the Issue Number below) --->
|
||||
Fixes #0000
|
||||
|
||||
Make sure these boxes are checked before your pull request (PR) is ready to be reviewed and merged. Thanks!
|
||||
|
||||
<!---Make sure these boxes are checked before your pull request (PR) is ready to be reviewed and merged. Thanks!--->
|
||||
|
||||
* [ ] tests pass -- look for a green checkbox ✔️ a few minutes after opening your PR -- or run tests locally with `npm run test-all`
|
||||
* [ ] code is in uniquely-named feature branch and has no merge conflicts
|
||||
@@ -8,10 +10,10 @@ Make sure these boxes are checked before your pull request (PR) is ready to be r
|
||||
* [ ] ask `@publiclab/is-reviewers` for help, in a comment below
|
||||
* [ ] at least 2 reviews required for getting pull request merged
|
||||
* [ ] Insert-step functionality is working correct as expected.
|
||||
> We're happy to help you get this ready -- don't be afraid to ask for help, and **don't be discouraged** if your tests fail at first!
|
||||
<!--- We're happy to help you get this ready -- don't be afraid to ask for help, and **don't be discouraged** if your tests fail at first!--->
|
||||
|
||||
If tests do fail, click on the red `X` to learn why by reading the logs.
|
||||
<!---If tests do fail, click on the red `X` to learn why by reading the logs.--->
|
||||
|
||||
Please be sure you've reviewed our contribution guidelines at https://publiclab.org/contributing-to-public-lab-software
|
||||
Please make sure to get at least two reviews before asking for merging the PR as that would make the PR more reliable on our part
|
||||
Thanks!
|
||||
<!---Please be sure you've reviewed our contribution guidelines at https://publiclab.org/contributing-to-public-lab-software--->
|
||||
<!---Please make sure to get at least two reviews before asking for merging the PR as that would make the PR more reliable on our part
|
||||
Thanks!--->
|
||||
|
||||
50103
dist/image-sequencer-ui.js
vendored
Normal file
50103
dist/image-sequencer-ui.js
vendored
Normal file
File diff suppressed because it is too large
Load Diff
1
dist/image-sequencer-ui.min.js
vendored
Normal file
1
dist/image-sequencer-ui.min.js
vendored
Normal file
File diff suppressed because one or more lines are too long
134798
dist/image-sequencer.js
vendored
Normal file
134798
dist/image-sequencer.js
vendored
Normal file
File diff suppressed because one or more lines are too long
1
dist/image-sequencer.min.js
vendored
Normal file
1
dist/image-sequencer.min.js
vendored
Normal file
File diff suppressed because one or more lines are too long
@@ -407,7 +407,7 @@ function DefaultHtmlStepUi(_sequencer, options) {
|
||||
*/
|
||||
function updateDimensions(step){
|
||||
_sequencer.getImageDimensions(step.imgElement.src, function (dim) {
|
||||
step.ui.querySelector('.' + step.name).attributes['data-original-title'].value = `<div style="text-align: center"><p>Image Width: ${dim.width}<br>Image Height: ${dim.height}</br>${isGIF(step.output) ? `Frames: ${dim.frames}` : ''}</div>`;
|
||||
step.ui.querySelector('.' + step.name).attributes['data-original-title'].value = `<div style="text-align: center"><p>Image Width: ${dim.width} px<br>Image Height: ${dim.height} px</br>${isGIF(step.output) ? `Frames: ${dim.frames}` : ''}</div>`;
|
||||
});
|
||||
}
|
||||
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
const staticCacheName = 'image-sequencer-static-v3.7.1';
|
||||
const staticCacheName = 'image-sequencer-static-v3.7.3';
|
||||
self.addEventListener('install', function(e) {
|
||||
e.waitUntil(
|
||||
caches.open(staticCacheName).then(function(cache) {
|
||||
|
||||
7667
package-lock.json
generated
7667
package-lock.json
generated
File diff suppressed because it is too large
Load Diff
12
package.json
12
package.json
@@ -1,6 +1,6 @@
|
||||
{
|
||||
"name": "image-sequencer",
|
||||
"version": "3.7.1",
|
||||
"version": "3.7.3",
|
||||
"description": "A modular JavaScript image manipulation library modeled on a storyboard.",
|
||||
"main": "src/ImageSequencer.js",
|
||||
"scripts": {
|
||||
@@ -41,7 +41,7 @@
|
||||
"bootstrap": "^3.4.1",
|
||||
"bootstrap-colorpicker": "^2.5.3",
|
||||
"buffer": "~6.0.2",
|
||||
"commander": "^8.0.0",
|
||||
"commander": "^9.0.0",
|
||||
"compressorjs": "^1.0.5",
|
||||
"data-uri-to-buffer": "^3.0.0",
|
||||
"downloadjs": "^1.4.7",
|
||||
@@ -56,12 +56,12 @@
|
||||
"gpu.js": "^2.3.1",
|
||||
"imgareaselect": "git+https://git@github.com/jywarren/imgareaselect.git#v1.0.0-rc.2",
|
||||
"image-sequencer-invert": "^1.0.0",
|
||||
"imagejs": "0.0.9",
|
||||
"imagejs": "git+https://git@github.com/glennjones/imagejs.git#1119a31e6eabc87563bc573cd62c11bd487ce8a9",
|
||||
"imagemin": "^7.0.1",
|
||||
"imagemin-jpegtran": "^7.0.0",
|
||||
"imagemin-pngquant": "^9.0.1",
|
||||
"istanbul": "^0.4.5",
|
||||
"jasmine": "^3.4.0",
|
||||
"jasmine": "^4.0.2",
|
||||
"jpegtran-bin": "^6.0.1",
|
||||
"jquery": "^3.3.1",
|
||||
"jsdom": "^19.0.0",
|
||||
@@ -100,7 +100,7 @@
|
||||
"husky": "^7.0.0",
|
||||
"image-filter-core": "~2.0.2",
|
||||
"image-filter-threshold": "~2.0.1",
|
||||
"jasmine-core": "^3.3.0",
|
||||
"jasmine-core": "^4.0.0",
|
||||
"jasmine-jquery": "^2.1.1",
|
||||
"jasmine-spec-reporter": "^7.0.0",
|
||||
"jest": "^27.0.1",
|
||||
@@ -108,7 +108,7 @@
|
||||
"lint-staged": "^12.1.3",
|
||||
"looks-same": "^7.0.0",
|
||||
"matchdep": "^2.0.0",
|
||||
"resemblejs": "^3.2.5",
|
||||
"resemblejs": "^4.0.1",
|
||||
"tap-spec": "^5.0.0",
|
||||
"tape": "^5.2.0",
|
||||
"tape-run": "^9.0.0",
|
||||
|
||||
@@ -10,9 +10,15 @@ module.exports = function BlobAnalysis(options, UI){
|
||||
|
||||
var step = this;
|
||||
|
||||
function extraManipulation(pixels){
|
||||
|
||||
pixels = require('./BlobAnalysis')(pixels);
|
||||
function extraManipulation(pixels, setRenderState, generateOutput){
|
||||
setRenderState(false);
|
||||
if (!options.inBrowser) {
|
||||
require('../_nomodule/gl-context')(input, callback, step, options);
|
||||
} else{
|
||||
pixels = require('./BlobAnalysis')(pixels);
|
||||
setRenderState(true);
|
||||
generateOutput();
|
||||
}
|
||||
return pixels;
|
||||
}
|
||||
|
||||
|
||||
@@ -15,19 +15,21 @@ module.exports = function runInBrowserContext(input, callback, step, options) {
|
||||
is not available otherwise */
|
||||
page.goto('https://google.com').then(() => {
|
||||
page.addScriptTag({ path: require('path').join(__dirname, '../../../dist/image-sequencer.js') }).then(() => {
|
||||
page.evaluate((options) => {
|
||||
return new Promise((resolve, reject) => {
|
||||
var sequencer = ImageSequencer();
|
||||
sequencer.loadImage(options.input.src);
|
||||
sequencer.addSteps(options.modOptions.step, options.modOptions);
|
||||
sequencer.run(function cb(out) {
|
||||
resolve(sequencer.steps[1].output.src);
|
||||
page.addScriptTag({path: require('path').join(__dirname, '../../../node_modules/opencv.js/opencv.js')}).then(() => {
|
||||
page.evaluate((options) => {
|
||||
return new Promise((resolve, reject) => {
|
||||
var sequencer = ImageSequencer();
|
||||
sequencer.loadImage(options.input.src);
|
||||
sequencer.addSteps(options.modOptions.step, options.modOptions);
|
||||
sequencer.run(function cb(out) {
|
||||
resolve(sequencer.steps[1].output.src);
|
||||
});
|
||||
});
|
||||
}, obj).then(el => {
|
||||
browser.close().then(() => {
|
||||
step.output = { src: el, format: input.format };
|
||||
callback();
|
||||
});
|
||||
});
|
||||
}, obj).then(el => {
|
||||
browser.close().then(() => {
|
||||
step.output = { src: el, format: input.format };
|
||||
callback();
|
||||
});
|
||||
});
|
||||
});
|
||||
|
||||
Reference in New Issue
Block a user