- Breaking change: Rename "svgutils.js" to "utilities.js" (make in conformity with JSDoc module naming convention) - Breaking change: Rename "svgedit.js" to "namespaces.js" (to make clear purpose and avoid confusing with editor) - Breaking change: Rename "jquery-svg.js" to "jQuery.attr.js" - Breaking change: Rename "jquery.contextMenu.js" to "jQuery.contextMenu.js" - Breaking change: Rename "jquery.jpicker.js" to "jQuery.jPicker.js" - Breaking change: Rename "JQuerySpinBtn.css" to "jQuery.SpinButton.css" - Breaking change: Rename "JQuerySpinBtn.js" to "jQuery.SpinButton.js" (to have file name more closely reflect name) - Breaking change: Rename "jquery.svgicons.js" to "jQuery.svgIcons.js" - Breaking change: Rename "jquery.jgraduate.js" to "jQuery.jGraduate.js" - Breaking change: Rename "pathseg.js" to "svgpathseg.js" (as it is a poyfill of SVGPathSeg) - Breaking change: Rename `addSvgElementFromJson()` to `addSVGElementFromJson` for consistency - Breaking change: Rename `changeSvgContent()` to `changeSVGContent()` for consistency - Breaking change: Have `exportPDF` resolve with `output` and `outputType` rather than `dataurlstring` (as type may vary) - Breaking change: Rename `extensions/mathjax/MathJax.js` to `extensions/mathjax/MathJax.min.js` - Breaking change: Avoid recent change to have editor ready callbacks return Promises (we're not using and advantageous to keep sequential) - Breaking change: Avoid recent addition of locale-side function in ext-imagelib for l10n - Breaking change: Change name of ext-arrows.js from `Arrows` to `arrows` for sake of file path (not localized anyways). - Breaking change: Change `addlangData` extension event to `addLangData` for consistency with method name - Breaking change: Have `readLang` return lang and data but do not call `setLang` - Fix: Have general locales load first so extensions may use - Fix: Provide `importLocale` to extensions `init` so it may delay adding of the extension until locale data loaded - Fix: Ensure call to `rasterExport` without `imgType` properly sets MIME type to PNG - Fix: Wrong name for moinsave - Update: Update WebAppFind per new API changes - Enhancement: Make `setStrings` public on editor for late setting (used by `ext-shapes.js`) - Enhancement: Add `extensions_added` event - Enhancement: Add `message` event (Relay messages including those which have been been received prior to extension load) - Enhancement: Allow SVGEdit to work out of the box--avoid need for copying sample config file. Should also help with Github-based file servers - Enhancement: Allow avoiding "name" in extension export (just extract out of file name) - Enhancement: Add stack blur to canvg by default (and refactoring it) - Enhancement: Return `Promise` for `embedImage` (as with some other loading methods) - Enhancement: Supply `importLocale` to `langReady` to facilitate extension locale loading - Enhancement: Recover if an extension fails to load (just log and otherwise ignore) - Enhancement: More i18n of extensions (also fixed issue with some console warnings about missing locale strings); i18nize Hello World too - Enhancement: Allowing importing of locales within `addLangData` - npm: Update devDeps - Docs: Migrate copies of all old wiki pages to docs/from-old-wiki folder; intended for a possible move to Markdown, so raw HTML (with formatting) was not preserved, though named links had their absolute URL links preserved - Docs: Begin deleting `SvgCanvas.md` as ensuring jsdoc has replacements - Docs: Add Edtior doc file for help to general users - Docs: Clarify/simplify install instructions - npm/Docs (JSDoc): Add script to check for overly generic types - Docs (JSDoc): For config/prefs and extension creating, link to tutorials (moved tutorials to own directory to avoid recursion problems by jsdoc) - Docs (JSDoc): Add modules (upper case for usual main entrance files or regular names) - Docs (JSDoc): Fill out missing areas; indicate return of `undefined`; consistency with `@returns` - Docs (JSDoc): Add our own layout template to support overflow - Docs (JSDoc): Use cleverLinks and disallow unknown tags - Docs (JSDoc): Insist on "pedantic" flag; put output directory in config - Docs (JSDoc): Use more precise Integer/Float over number, the specific type of array/function/object - Docs (JSDoc): Use `@throws`, `@enum`, `@event`/`@fires`/`@listens` - Docs: Generally update/improve docs (fixes #92) - Docs: Update links to `latest` path (Avoid needing to update such references upon each release) - Docs: 80 chars max - Refactoring: Drop code for extension as function (already requiring export to be an object) - Refactoring: Object destructuring, `Object.entries`, Object shorthand, array extras, more camelCase variable names - Refactoring: Add a `Command` base class - Refactoring: Simplify svgicons `callback` ready detection - Refactoring: Put `let` or `const` closer to scope - Refactoring: Remove unneeded `delimiter` from regex escaping utility - Refactoring: Clearer variable names - Refactoring: Use (non-deprecated) Event constructors - Testing: Use new Sinon
168 lines
6.0 KiB
JavaScript
168 lines
6.0 KiB
JavaScript
/* eslint-env qunit */
|
|
import '../editor/svgpathseg.js';
|
|
import {NS} from '../editor/namespaces.js';
|
|
import * as utilities from '../editor/utilities.js';
|
|
import * as transformlist from '../editor/svgtransformlist.js';
|
|
import * as math from '../editor/math.js';
|
|
|
|
// log function
|
|
QUnit.log((details) => {
|
|
if (window.console && window.console.log) {
|
|
window.console.log(details.result + ' :: ' + details.message);
|
|
}
|
|
});
|
|
|
|
const currentLayer = document.getElementById('layer1');
|
|
|
|
function mockCreateSVGElement (jsonMap) {
|
|
const elem = document.createElementNS(NS.SVG, jsonMap['element']);
|
|
for (const attr in jsonMap['attr']) {
|
|
elem.setAttribute(attr, jsonMap['attr'][attr]);
|
|
}
|
|
return elem;
|
|
}
|
|
function mockaddSVGElementFromJson (json) {
|
|
const elem = mockCreateSVGElement(json);
|
|
currentLayer.append(elem);
|
|
return elem;
|
|
}
|
|
|
|
// const svg = document.createElementNS(NS.SVG, 'svg');
|
|
const groupWithMatrixTransform = document.getElementById('svg_group_with_matrix_transform');
|
|
const textWithMatrixTransform = document.getElementById('svg_text_with_matrix_transform');
|
|
|
|
function fillDocumentByCloningElement (elem, count) {
|
|
const elemId = elem.getAttribute('id') + '-';
|
|
for (let index = 0; index < count; index++) {
|
|
const clone = elem.cloneNode(true); // t: deep clone
|
|
// Make sure you set a unique ID like a real document.
|
|
clone.setAttribute('id', elemId + index);
|
|
const parent = elem.parentNode;
|
|
parent.append(clone);
|
|
}
|
|
}
|
|
|
|
QUnit.module('svgedit.utilities_performance', {
|
|
beforeEach () {
|
|
},
|
|
afterEach () {
|
|
}
|
|
});
|
|
|
|
const mockPathActions = {
|
|
resetOrientation (path) {
|
|
if (path == null || path.nodeName !== 'path') { return false; }
|
|
const tlist = transformlist.getTransformList(path);
|
|
const m = math.transformListToTransform(tlist).matrix;
|
|
tlist.clear();
|
|
path.removeAttribute('transform');
|
|
const segList = path.pathSegList;
|
|
|
|
const len = segList.numberOfItems;
|
|
// let lastX, lastY;
|
|
|
|
for (let i = 0; i < len; ++i) {
|
|
const seg = segList.getItem(i);
|
|
const type = seg.pathSegType;
|
|
if (type === 1) { continue; }
|
|
const pts = [];
|
|
['', 1, 2].forEach(function (n, j) {
|
|
const x = seg['x' + n], y = seg['y' + n];
|
|
if (x !== undefined && y !== undefined) {
|
|
const pt = math.transformPoint(x, y, m);
|
|
pts.splice(pts.length, 0, pt.x, pt.y);
|
|
}
|
|
});
|
|
// path.replacePathSeg(type, i, pts, path);
|
|
}
|
|
|
|
// utilities.reorientGrads(path, m);
|
|
}
|
|
};
|
|
|
|
// //////////////////////////////////////////////////////////
|
|
// Performance times with various browsers on Macbook 2011 8MB RAM OS X El Capitan 10.11.4
|
|
//
|
|
// To see 'Before Optimization' performance, making the following two edits.
|
|
// 1. utilities.getStrokedBBox - change if( elems.length === 1) to if( false && elems.length === 1)
|
|
// 2. utilities.getBBoxWithTransform - uncomment 'Old technique that was very slow'
|
|
|
|
// Chrome
|
|
// Before Optimization
|
|
// Pass1 svgCanvas.getStrokedBBox total ms 4,218, ave ms 41.0, min/max 37 51
|
|
// Pass2 svgCanvas.getStrokedBBox total ms 4,458, ave ms 43.3, min/max 32 63
|
|
// Optimized Code
|
|
// Pass1 svgCanvas.getStrokedBBox total ms 1,112, ave ms 10.8, min/max 9 20
|
|
// Pass2 svgCanvas.getStrokedBBox total ms 34, ave ms 0.3, min/max 0 20
|
|
|
|
// Firefox
|
|
// Before Optimization
|
|
// Pass1 svgCanvas.getStrokedBBox total ms 3,794, ave ms 36.8, min/max 33 48
|
|
// Pass2 svgCanvas.getStrokedBBox total ms 4,049, ave ms 39.3, min/max 28 53
|
|
// Optimized Code
|
|
// Pass1 svgCanvas.getStrokedBBox total ms 104, ave ms 1.0, min/max 0 23
|
|
// Pass2 svgCanvas.getStrokedBBox total ms 71, ave ms 0.7, min/max 0 23
|
|
|
|
// Safari
|
|
// Before Optimization
|
|
// Pass1 svgCanvas.getStrokedBBox total ms 4,840, ave ms 47.0, min/max 45 62
|
|
// Pass2 svgCanvas.getStrokedBBox total ms 4,849, ave ms 47.1, min/max 34 62
|
|
// Optimized Code
|
|
// Pass1 svgCanvas.getStrokedBBox total ms 42, ave ms 0.4, min/max 0 23
|
|
// Pass2 svgCanvas.getStrokedBBox total ms 17, ave ms 0.2, min/max 0 23
|
|
|
|
QUnit.test('Test svgCanvas.getStrokedBBox() performance with matrix transforms', function (assert) {
|
|
const done = assert.async();
|
|
assert.expect(2);
|
|
const {getStrokedBBox} = utilities;
|
|
const {children} = currentLayer;
|
|
|
|
let lastTime, now,
|
|
min = Number.MAX_VALUE,
|
|
max = 0,
|
|
total = 0;
|
|
|
|
fillDocumentByCloningElement(groupWithMatrixTransform, 50);
|
|
fillDocumentByCloningElement(textWithMatrixTransform, 50);
|
|
|
|
// The first pass through all elements is slower.
|
|
const count = children.length;
|
|
const start = lastTime = now = Date.now();
|
|
// Skip the first child which is the title.
|
|
for (let index = 1; index < count; index++) {
|
|
const child = children[index];
|
|
/* const obj = */ getStrokedBBox([child], mockaddSVGElementFromJson, mockPathActions);
|
|
now = Date.now(); const delta = now - lastTime; lastTime = now;
|
|
total += delta;
|
|
min = Math.min(min, delta);
|
|
max = Math.max(max, delta);
|
|
}
|
|
total = lastTime - start;
|
|
const ave = total / count;
|
|
assert.ok(ave < 20, 'svgedit.utilities.getStrokedBBox average execution time is less than 20 ms');
|
|
console.log('Pass1 svgCanvas.getStrokedBBox total ms ' + total + ', ave ms ' + ave.toFixed(1) + ',\t min/max ' + min + ' ' + max);
|
|
|
|
// The second pass is two to ten times faster.
|
|
setTimeout(function () {
|
|
const count = children.length;
|
|
|
|
const start = lastTime = now = Date.now();
|
|
// Skip the first child which is the title.
|
|
for (let index = 1; index < count; index++) {
|
|
const child = children[index];
|
|
/* const obj = */ getStrokedBBox([child], mockaddSVGElementFromJson, mockPathActions);
|
|
now = Date.now(); const delta = now - lastTime; lastTime = now;
|
|
total += delta;
|
|
min = Math.min(min, delta);
|
|
max = Math.max(max, delta);
|
|
}
|
|
|
|
total = lastTime - start;
|
|
const ave = total / count;
|
|
assert.ok(ave < 2, 'svgedit.utilities.getStrokedBBox average execution time is less than 1 ms');
|
|
console.log('Pass2 svgCanvas.getStrokedBBox total ms ' + total + ', ave ms ' + ave.toFixed(1) + ',\t min/max ' + min + ' ' + max);
|
|
|
|
done();
|
|
});
|
|
});
|