[MERGE] forward port of branch saas-1 up to revid 4887 chs@openerp.com-20130612153934-qyp6pb3bc4za4taf
bzr revid: chs@openerp.com-20130613172414-dln3g4j0ykcwaa02 bzr revid: chs@openerp.com-20130613173900-xl7rh321nnw2b04b
This commit is contained in:
Christophe Simonis
@@ -1,7 +1,7 @@
|
||||
/**
|
||||
* This code is released to the public domain by Jim Studt, 2007.
|
||||
* He may keep some sort of up to date copy at http://www.federated.com/~jim/canvastext/
|
||||
* It as been modified by Fabien Ménager to handle font style like size, weight, color and rotation.
|
||||
* It as been modified by Fabien Ménager to handle font style like size, weight, color and rotation.
|
||||
* A partial support for special characters has been added too.
|
||||
*/
|
||||
var CanvasText = {
|
||||
@@ -108,71 +108,71 @@ var CanvasText = {
|
||||
'~': { width: 24, points: [[3,6],[3,8],[4,11],[6,12],[8,12],[10,11],[14,8],[16,7],[18,7],[20,8],[21,10],null,[3,8],[4,10],[6,11],[8,11],[10,10],[14,7],[16,6],[18,6],[20,7],[21,10],[21,12]] },
|
||||
|
||||
// Lower case Latin-1
|
||||
'à': { diacritic: '`', letter: 'a' },
|
||||
'á': { diacritic: '´', letter: 'a' },
|
||||
'â': { diacritic: '^', letter: 'a' },
|
||||
'ä': { diacritic: '¨', letter: 'a' },
|
||||
'ã': { diacritic: '~', letter: 'a' },
|
||||
'à': { diacritic: '`', letter: 'a' },
|
||||
'á': { diacritic: '´', letter: 'a' },
|
||||
'â': { diacritic: '^', letter: 'a' },
|
||||
'ä': { diacritic: '¨', letter: 'a' },
|
||||
'ã': { diacritic: '~', letter: 'a' },
|
||||
|
||||
'è': { diacritic: '`', letter: 'e' },
|
||||
'é': { diacritic: '´', letter: 'e' },
|
||||
'ê': { diacritic: '^', letter: 'e' },
|
||||
'ë': { diacritic: '¨', letter: 'e' },
|
||||
'è': { diacritic: '`', letter: 'e' },
|
||||
'é': { diacritic: '´', letter: 'e' },
|
||||
'ê': { diacritic: '^', letter: 'e' },
|
||||
'ë': { diacritic: '¨', letter: 'e' },
|
||||
|
||||
'ì': { diacritic: '`', letter: 'i' },
|
||||
'í': { diacritic: '´', letter: 'i' },
|
||||
'î': { diacritic: '^', letter: 'i' },
|
||||
'ï': { diacritic: '¨', letter: 'i' },
|
||||
'ì': { diacritic: '`', letter: 'i' },
|
||||
'í': { diacritic: '´', letter: 'i' },
|
||||
'î': { diacritic: '^', letter: 'i' },
|
||||
'ï': { diacritic: '¨', letter: 'i' },
|
||||
|
||||
'ò': { diacritic: '`', letter: 'o' },
|
||||
'ó': { diacritic: '´', letter: 'o' },
|
||||
'ô': { diacritic: '^', letter: 'o' },
|
||||
'ö': { diacritic: '¨', letter: 'o' },
|
||||
'õ': { diacritic: '~', letter: 'o' },
|
||||
'ò': { diacritic: '`', letter: 'o' },
|
||||
'ó': { diacritic: '´', letter: 'o' },
|
||||
'ô': { diacritic: '^', letter: 'o' },
|
||||
'ö': { diacritic: '¨', letter: 'o' },
|
||||
'õ': { diacritic: '~', letter: 'o' },
|
||||
|
||||
'ù': { diacritic: '`', letter: 'u' },
|
||||
'ú': { diacritic: '´', letter: 'u' },
|
||||
'û': { diacritic: '^', letter: 'u' },
|
||||
'ü': { diacritic: '¨', letter: 'u' },
|
||||
'ù': { diacritic: '`', letter: 'u' },
|
||||
'ú': { diacritic: '´', letter: 'u' },
|
||||
'û': { diacritic: '^', letter: 'u' },
|
||||
'ü': { diacritic: '¨', letter: 'u' },
|
||||
|
||||
'ý': { diacritic: '´', letter: 'y' },
|
||||
'ÿ': { diacritic: '¨', letter: 'y' },
|
||||
'ý': { diacritic: '´', letter: 'y' },
|
||||
'ÿ': { diacritic: '¨', letter: 'y' },
|
||||
|
||||
'ç': { diacritic: '¸', letter: 'c' },
|
||||
'ñ': { diacritic: '~', letter: 'n' },
|
||||
'ç': { diacritic: '¸', letter: 'c' },
|
||||
'ñ': { diacritic: '~', letter: 'n' },
|
||||
|
||||
// Upper case Latin-1
|
||||
'À': { diacritic: '`', letter: 'A' },
|
||||
'Á': { diacritic: '´', letter: 'A' },
|
||||
'Â': { diacritic: '^', letter: 'A' },
|
||||
'Ä': { diacritic: '¨', letter: 'A' },
|
||||
'Ã': { diacritic: '~', letter: 'A' },
|
||||
'À': { diacritic: '`', letter: 'A' },
|
||||
'Á': { diacritic: '´', letter: 'A' },
|
||||
'Â': { diacritic: '^', letter: 'A' },
|
||||
'Ä': { diacritic: '¨', letter: 'A' },
|
||||
'Ã': { diacritic: '~', letter: 'A' },
|
||||
|
||||
'È': { diacritic: '`', letter: 'E' },
|
||||
'É': { diacritic: '´', letter: 'E' },
|
||||
'Ê': { diacritic: '^', letter: 'E' },
|
||||
'Ë': { diacritic: '¨', letter: 'E' },
|
||||
'È': { diacritic: '`', letter: 'E' },
|
||||
'É': { diacritic: '´', letter: 'E' },
|
||||
'Ê': { diacritic: '^', letter: 'E' },
|
||||
'Ë': { diacritic: '¨', letter: 'E' },
|
||||
|
||||
'Ì': { diacritic: '`', letter: 'I' },
|
||||
'Í': { diacritic: '´', letter: 'I' },
|
||||
'Î': { diacritic: '^', letter: 'I' },
|
||||
'Ï': { diacritic: '¨', letter: 'I' },
|
||||
'Ì': { diacritic: '`', letter: 'I' },
|
||||
'Í': { diacritic: '´', letter: 'I' },
|
||||
'Î': { diacritic: '^', letter: 'I' },
|
||||
'Ï': { diacritic: '¨', letter: 'I' },
|
||||
|
||||
'Ò': { diacritic: '`', letter: 'O' },
|
||||
'Ó': { diacritic: '´', letter: 'O' },
|
||||
'Ô': { diacritic: '^', letter: 'O' },
|
||||
'Ö': { diacritic: '¨', letter: 'O' },
|
||||
'Õ': { diacritic: '~', letter: 'O' },
|
||||
'Ò': { diacritic: '`', letter: 'O' },
|
||||
'Ó': { diacritic: '´', letter: 'O' },
|
||||
'Ô': { diacritic: '^', letter: 'O' },
|
||||
'Ö': { diacritic: '¨', letter: 'O' },
|
||||
'Õ': { diacritic: '~', letter: 'O' },
|
||||
|
||||
'Ù': { diacritic: '`', letter: 'U' },
|
||||
'Ú': { diacritic: '´', letter: 'U' },
|
||||
'Û': { diacritic: '^', letter: 'U' },
|
||||
'Ü': { diacritic: '¨', letter: 'U' },
|
||||
'Ù': { diacritic: '`', letter: 'U' },
|
||||
'Ú': { diacritic: '´', letter: 'U' },
|
||||
'Û': { diacritic: '^', letter: 'U' },
|
||||
'Ü': { diacritic: '¨', letter: 'U' },
|
||||
|
||||
'Ý': { diacritic: '´', letter: 'Y' },
|
||||
'Ý': { diacritic: '´', letter: 'Y' },
|
||||
|
||||
'Ç': { diacritic: '¸', letter: 'C' },
|
||||
'Ñ': { diacritic: '~', letter: 'N' }
|
||||
'Ç': { diacritic: '¸', letter: 'C' },
|
||||
'Ñ': { diacritic: '~', letter: 'N' }
|
||||
},
|
||||
|
||||
specialchars: {
|
||||
@@ -181,11 +181,11 @@ var CanvasText = {
|
||||
|
||||
/** Diacritics, used to draw accentuated letters */
|
||||
diacritics: {
|
||||
'¸': { entity: 'cedil', points: [[6,-4],[4,-6],[2,-7],[1,-7]] },
|
||||
'´': { entity: 'acute', points: [[8,19],[13,22]] },
|
||||
'¸': { entity: 'cedil', points: [[6,-4],[4,-6],[2,-7],[1,-7]] },
|
||||
'´': { entity: 'acute', points: [[8,19],[13,22]] },
|
||||
'`': { entity: 'grave', points: [[7,22],[12,19]] },
|
||||
'^': { entity: 'circ', points: [[5.5,19],[9.5,23],[12.5,19]] },
|
||||
'¨': { entity: 'trema', points: [[5,21],[6,20],[7,21],[6,22],[5,21],null,[12,21],[13,20],[14,21],[13,22],[12,21]] },
|
||||
'¨': { entity: 'trema', points: [[5,21],[6,20],[7,21],[6,22],[5,21],null,[12,21],[13,20],[14,21],[13,22],[12,21]] },
|
||||
'~': { entity: 'tilde', points: [[4,18],[7,22],[10,18],[13,22]] }
|
||||
},
|
||||
|
||||
|
||||
Binary file not shown.
|
Before Width: | Height: | Size: 905 B After Width: | Height: | Size: 700 B |
@@ -5,6 +5,7 @@
|
||||
openerp.web_graph = function (instance) {
|
||||
|
||||
var _lt = instance.web._lt;
|
||||
var _t = instance.web._t;
|
||||
|
||||
// removed ``undefined`` values
|
||||
var filter_values = function (o) {
|
||||
@@ -343,7 +344,7 @@ instance.web_graph.GraphView = instance.web.View.extend({
|
||||
var defs = [];
|
||||
_.each(axis, function(x) {
|
||||
var key = x[xaxis[0]]
|
||||
defs.push(obj.call("read_group", [domain, yaxis.concat(xaxis.slice(1, 2)), xaxis.slice(1, 2)], {context: context}).then(function(res) {
|
||||
defs.push(obj.call("read_group", [x['__domain'], yaxis.concat(xaxis.slice(1, 2)), xaxis.slice(1, 2)], {context: context}).then(function(res) {
|
||||
return [x, key, res];
|
||||
}));
|
||||
});
|
||||
@@ -365,7 +366,7 @@ instance.web_graph.GraphView = instance.web.View.extend({
|
||||
}).then(function() {
|
||||
var res = {
|
||||
'data': result,
|
||||
'ticks': _.map(ticks, function(el, key) { return [el, key] })
|
||||
'ticks': _.map(ticks, function(el, key) { return [el, key || _t("Undefined")] })
|
||||
};
|
||||
return res;
|
||||
}));
|
||||
|
||||
Reference in New Issue
Block a user