javascript/makemeahanzi
1
0
Fork 0
mirror of https://github.com/skishore/makemeahanzi.git synced 2025-11-02 04:37:30 +08:00
Code Issues Packages Projects Releases Wiki Activity

Pass manual bridges into stroke extractor

Browse Source
This commit is contained in:
Shaunak Kishore
2015-09-09 00:45:52 -04:00
parent 63e52e2fc3
commit 78e3a2ed26
2 changed files with 28 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

42
client/glyph.js
View File

@ -8,13 +8,7 @@ var COLORS = ['#0074D9', '#2ECC40', '#FFDC00', '#FF4136', '#7FDBFF',
function change_glyph(method, glyph) { function change_glyph(method, glyph) {
glyph = glyph || Session.get('glyph.data'); glyph = glyph || Session.get('glyph.data');
Meteor.call(method, glyph, function(error, data) { Meteor.call(method, glyph, function(error, data) {
data.render = get_glyph_render_data(data); data = fill_glyph_fields(data);
data.manual = data.manual || {};
data.manual.bridges_added = data.manual.bridges_added || [];
data.manual.bridges_removed = data.manual.bridges_removed || [];
data.manual.verified = data.manual.verified || false;
Session.set('glyph.data', data); Session.set('glyph.data', data);
if (method !== 'save_glyph') { if (method !== 'save_glyph') {
Session.set('glyph.show_strokes', data.manual.verified); Session.set('glyph.show_strokes', data.manual.verified);
@ -22,14 +16,26 @@ function change_glyph(method, glyph) {
}); });
} }
function fill_glyph_fields(glyph) {
glyph.manual = glyph.manual || {};
glyph.manual.bridges_added = glyph.manual.bridges_added || [];
glyph.manual.bridges_removed = glyph.manual.bridges_removed || [];
glyph.manual.verified = glyph.manual.verified || false;
glyph.render = get_glyph_render_data(glyph, glyph.manual.bridges);
return glyph;
}
window.get_glyph = function(name) { window.get_glyph = function(name) {
change_glyph('get_glyph', name); change_glyph('get_glyph', name);
} }
function push_new_bridge(bridges, bridge) { function contains(bridges, bridge) {
if (remove_bridges(bridges, [bridge]).length === bridges.length) { return remove_bridges(bridges, [bridge]).length < bridges.length;
bridges.push(bridge); }
}
function get_final_bridges(glyph) {
var add = glyph.render.bridges.concat(glyph.manual.bridges_added);
return remove_bridges(add, glyph.manual.bridges_removed);
} }
function remove_bridges(add, remove) { function remove_bridges(add, remove) {
@ -77,11 +83,12 @@ var bindings = {
change_glyph('get_previous_glyph_skip_verified'); change_glyph('get_previous_glyph_skip_verified');
}, },
's': function() { 's': function() {
var glyph = Session.get('glyph.data');
if (!Session.get('glyph.show_strokes')) { if (!Session.get('glyph.show_strokes')) {
Session.set('glyph.data', fill_glyph_fields(glyph));
Session.set('glyph.show_strokes', true); Session.set('glyph.show_strokes', true);
return; return;
} }
var glyph = Session.get('glyph.data');
glyph.manual.verified = !glyph.manual.verified; glyph.manual.verified = !glyph.manual.verified;
Session.set('glyph.data', glyph); Session.set('glyph.data', glyph);
change_glyph('save_glyph', glyph); change_glyph('save_glyph', glyph);
@ -126,9 +133,10 @@ Template.glyph.events({
var added = remove_bridges(glyph.manual.bridges_added, [bridge]); var added = remove_bridges(glyph.manual.bridges_added, [bridge]);
if (added.length < glyph.manual.bridges_added.length) { if (added.length < glyph.manual.bridges_added.length) {
glyph.manual.bridges_added = added; glyph.manual.bridges_added = added;
} else { } else if (!contains(glyph.manual.bridges_removed, bridge)) {
push_new_bridge(glyph.manual.bridges_removed, bridge); glyph.manual.bridges_removed.push(bridge);
} }
glyph.manual.bridges = get_final_bridges(glyph);
Session.set('glyph.selected_point', undefined); Session.set('glyph.selected_point', undefined);
Session.set('glyph.data', glyph); Session.set('glyph.data', glyph);
}, },
@ -151,9 +159,11 @@ Template.glyph.events({
var removed = remove_bridges(glyph.manual.bridges_removed, [bridge]); var removed = remove_bridges(glyph.manual.bridges_removed, [bridge]);
if (removed.length < glyph.manual.bridges_removed.length) { if (removed.length < glyph.manual.bridges_removed.length) {
glyph.manual.bridges_removed = removed; glyph.manual.bridges_removed = removed;
} else { } else if (!contains(glyph.render.bridges, bridge) &&
push_new_bridge(glyph.manual.bridges_added, bridge); !contains(glyph.manual.bridges_added, bridge)) {
glyph.manual.bridges_added.push(bridge);
} }
glyph.manual.bridges = get_final_bridges(glyph);
Session.set('glyph.selected_point', undefined); Session.set('glyph.selected_point', undefined);
Session.set('glyph.data', glyph); Session.set('glyph.data', glyph);
}, },

4
lib/stroke_extractor.js
View File

@ -380,7 +380,7 @@ function extract_strokes(paths, endpoints, bridges) {
// Exports go below this fold. // Exports go below this fold.
this.get_glyph_render_data = function(glyph) { this.get_glyph_render_data = function(glyph, manual_bridges) {
var paths = orient_paths(split_path(glyph.path)); var paths = orient_paths(split_path(glyph.path));
var endpoints = []; var endpoints = [];
for (var i = 0; i < paths.length; i++) { for (var i = 0; i < paths.length; i++) {
@ -389,7 +389,7 @@ this.get_glyph_render_data = function(glyph) {
} }
} }
var bridges = get_bridges(endpoints); var bridges = get_bridges(endpoints);
var strokes = extract_strokes(paths, endpoints, bridges); var strokes = extract_strokes(paths, endpoints, manual_bridges || bridges);
return { return {
bridges: bridges, bridges: bridges,
d: Glyphs.get_svg_path(glyph), d: Glyphs.get_svg_path(glyph),