Skip to content

S
sdkjs
Commit faf65450 authored by Igor.Zotov's avatar Igor.Zotov Committed by Alexander.Trofimov
Browse files
Options

отрисовка текста в диаграммах(word) 

git-svn-id: svn://192.168.3.15/activex/AVS/Sources/TeamlabOffice/trunk/OfficeWeb@47667 954022d7-b5bf-4e40-9824-e11837661b57
parent 06748ba6
Show whitespace changes
Inline Side-by-side
Showing with 536 additions and 34 deletions
Common/Charts/charts.js
View file @ faf65450
......@@ -11,10 +11,10 @@ function ChartRender() {
g_bChartPreview = true;
else
g_bChartPreview = false;
if(window["editor"])
return;
if (chart.worksheet && !OfficeExcel.drawingCtxCharts)//выставление контекста для отрисовки
OfficeExcel.drawingCtxCharts = chart.worksheet.getDrawingContextCharts();
else if(window["editor"] && !OfficeExcel.drawingCtxCharts)
OfficeExcel.drawingCtxCharts = new CDrawingContextWord();
chartCanvas = document.createElement('canvas');
$(chartCanvas).css('width', width);
$(chartCanvas).css('height', height);
......@@ -1336,7 +1336,8 @@ function drawChart(chart, arrValues, width, height) {
var defaultXTitle = 'X Axis';
var defaultYTitle = 'Y Axis';
var defaultTitle = 'Diagram Title';
if(OfficeExcel.drawingCtxCharts)
OfficeExcel.drawingCtxCharts.setCanvas(chartCanvas);
// По типу
switch (chart.type) {
case c_oAscChartType.line:
......@@ -2017,34 +2018,37 @@ function getFontProperties(type)
var xAxisTitle = bar._xAxisTitle;
var yAxisTitle = bar._yAxisTitle;
var chartTitle = bar._chartTitle;
var fontProp = Asc.FontProperties;
if(!fontProp)
fontProp = FontProperties;
switch (type) {
case "xLabels":
{
return new Asc.FontProperties(props._xlabels_font,props._xlabels_size,props._xlabels_bold, props._xlabels_italic, props._xlabels_underline);
return new fontProp(props._xlabels_font,props._xlabels_size,props._xlabels_bold, props._xlabels_italic, props._xlabels_underline);
}
case "yLabels":
{
return new Asc.FontProperties(props._ylabels_font, props._ylabels_size, props._ylabels_bold, props._ylabels_italic, props._ylabels_underline);
return new fontProp(props._ylabels_font, props._ylabels_size, props._ylabels_bold, props._ylabels_italic, props._ylabels_underline);
}
case "xTitle":
{
return new Asc.FontProperties(xAxisTitle._font, xAxisTitle._size, xAxisTitle._bold, xAxisTitle._italic, xAxisTitle._underline);
return new fontProp(xAxisTitle._font, xAxisTitle._size, xAxisTitle._bold, xAxisTitle._italic, xAxisTitle._underline);
}
case "yTitle":
{
return new Asc.FontProperties(yAxisTitle._font, yAxisTitle._size, yAxisTitle._bold, yAxisTitle._italic, yAxisTitle._underline);
return new fontProp(yAxisTitle._font, yAxisTitle._size, yAxisTitle._bold, yAxisTitle._italic, yAxisTitle._underline);
}
case "key":
{
return new Asc.FontProperties(props._key_text_font,props._key_text_size,props._key_text_bold, props._key_text_italic, props._key_text_underline);
return new fontProp(props._key_text_font,props._key_text_size,props._key_text_bold, props._key_text_italic, props._key_text_underline);
}
case "title":
{
return new Asc.FontProperties(chartTitle._font, chartTitle._size, chartTitle._bold, chartTitle._italic, chartTitle._underline);
return new fontProp(chartTitle._font, chartTitle._size, chartTitle._bold, chartTitle._italic, chartTitle._underline);
}
case "labelsAbove":
{
return new Asc.FontProperties(props._ylabels_labels_above_labels_above_font, props._labels_above_size, props._labels_above_bold, props._labels_above_italic, props._labels_above_underline);
return new fontProp(props._ylabels_labels_above_labels_above_font, props._labels_above_size, props._labels_above_bold, props._labels_above_italic, props._labels_above_underline);
}
}
}
......
Common/Charts/libraries/OfficeExcel.common.core.js
View file @ faf65450
......@@ -1504,6 +1504,9 @@
{
scale = drwContext.scaleFactor;
drwContext.setCanvas(bar.canvas);
var fontProp = Asc.FontProperties;
if(!fontProp)
fontProp = FontProperties;
context = drwContext;
// Need these now the angle can be specified, ie defaults for the former two args
......@@ -1520,15 +1523,15 @@
}
// First, translate to x/y coords
context.save();
/*context.save();
context.canvas.__OfficeExcel_originalx__ = x;
context.canvas.__OfficeExcel_originaly__ = y;
context.translate(x, y);
context.translate(x, y);*/
var italic = arguments[13] && arguments[13].italic ? arguments[13].italic : false;
var underline = arguments[13] && arguments[13].underline ? arguments[13].underline : false;
var ascFont = new Asc.FontProperties(font, size, arguments[11], italic, underline);
var ascFont = new fontProp(font, size, arguments[11], italic, underline);
context.setFont(ascFont);
var width;
......@@ -1594,7 +1597,7 @@
context.fillText(text, x*0.75, y*0.75);
context.lineWidth = 1;
}
context.restore();
//context.restore();
}
else
{
......@@ -1756,6 +1759,17 @@
if(!angle)
angle = 90;
if(window["editor"])
{
//****TeST****
var m = new CMatrix();
drawingCtx.setFont(font, angle);
m.Rotate(90);
drawingCtx.transform(m.sx, m.shy, m.shx, m.sy, m.tx, m.ty);
drawingCtx.fillText(text, cx - 90, cy - 90, 0, 0, angle);
}
else
{
var m = new asc.Matrix();
m.rotate(angle, 0);
......@@ -1763,8 +1777,6 @@
mbt.translate(cx + textWidth, cy + textHeight);
drawingCtx.setFont(font, angle);
drawingCtx.setTextTransform(m.sx, m.shy, m.shx, m.sy, m.tx, m.ty);
drawingCtx.setTransform(mbt.sx, mbt.shy, mbt.shx, mbt.sy, mbt.tx, mbt.ty);
drawingCtx.updateTransforms();
......@@ -1773,6 +1785,7 @@
drawingCtx.resetTransforms();
}
}
OfficeExcel.TextWithoutFonts = function (context, font, size, x, y, text)
......
Excel/graphics/DrawingContextWord.js
View file @ faf65450
......@@ -2,14 +2,133 @@
var g_fontManagerExcel = new CFontManager();
g_fontManagerExcel.Initialize(true);
var oldPpi = undefined;
var lastColor = undefined,
lastResult = null,
reColor = /^\s*(?:#?([0-9a-f]{6})|#?([0-9a-f]{3})|rgba?\s*\(\s*((?:\d*\.?\d+)(?:\s*,\s*(?:\d*\.?\d+)){2,3})\s*\))\s*$/i;
var asc_round = function round(x) {
var y = x + (x >= 0 ? .5 : -.4);
return y | y;
//return Math.round(x);
};
var asc_floor = function floor(x) {
var y = x | x;
y -= x < 0 && y > x ? 1 : 0;
return y + (x - y > kLeftLim1 ? 1 : 0); // to fix float number precision caused by binary presentation
//return Math.floor(x);
};
var asc_typeof = function typeOf(obj) {
if (obj === undefined) {return kUndefinedL;}
if (obj === null) {return kNullL;}
return Object.prototype.toString.call(obj).slice(8, -1).toLowerCase();
};
function getCvtRatio(fromUnits, toUnits, ppi) {
if (ppi !== oldPpi || oldPpi === undefined) {
var _ppi = 1 / ppi,
_72 = 1 / 72,
_25_4 = 1 / 25.4;
cvt = [
/* px pt in mm */
/*px*/[ 1, 72*_ppi, _ppi, 25.4*_ppi ],
/*pt*/[ ppi*_72, 1, _72, 25.4*_72 ],
/*in*/[ ppi, 72, 1, 25.4 ],
/*mm*/[ ppi*_25_4, 72*_25_4, _25_4, 1 ]
];
oldPpi = ppi;
}
return cvt[fromUnits][toUnits];
}
function parseColor(c) {
if (lastColor === c) {return lastResult;}
var bin, m, x, type, r, g, b, a, css, s, rgb, rgba;
if (asc_typeof(c) === "number") {
type = 4;
r = (c >> 16) & 0xFF;
g = (c >> 8) & 0xFF;
b = c & 0xFF;
a = 1;
bin = c;
} else {
m = reColor.exec(c);
if (!m) {return null;}
if (m[1]) {
x = [ m[1].slice(0, 2), m[1].slice(2, 4), m[1].slice(4) ];
type = 1;
} else if (m[2]) {
x = [ m[2].slice(0, 1), m[2].slice(1, 2), m[2].slice(2) ];
type = 0;
} else {
x = m[3].split(/\s*,\s*/i);
type = x.length === 3 ? 2 : 3;
}
r = parseInt(type !== 0 ? x[0] : x[0] + x[0], type < 2 ? 16 : 10);
g = parseInt(type !== 0 ? x[1] : x[1] + x[1], type < 2 ? 16 : 10);
b = parseInt(type !== 0 ? x[2] : x[2] + x[2], type < 2 ? 16 : 10);
a = type === 3 ? (asc_round(parseFloat(x[3]) * 100) * 0.01) : 1;
bin = (r << 16) | (g << 8) | b;
}
css = bin.toString(16);
while (css.length < 6) {css = "0" + css;}
css = "#" + css;
s = r + ", " + g + ", " + b;
rgb = "rgb(" + s + ")";
rgba = "rgba(" + s + ", " + a + ")";
lastColor = c;
lastResult = {
r: r,
g: g,
b: b,
a: a,
rgb: rgb,
rgba: rgba,
color: css,
origColor: type < 2 ? css : (type === 2 ? rgb : (type === 3 ? rgba : bin)),
origType: type /* 0 = '#abc' form; 1 = '#aabbcc' form; 2 = 'rgb(r,g,b)' form; 3 = 'rgba(r,g,b,a)' form; 4 = 0xRRGGBB form */,
binary: bin
};
return lastResult;
}
function CDrawingContextWord()
{
this.Graphics = null;
this.scaleFactor = 1;
this.font = settings !== undefined && settings.font !== undefined ? settings.font : new FontProperties("Arial", 11);
this.font = new FontProperties("Arial", 11);
}
function TextMetrics(width, height, lineHeight, baseline, descender, fontSize, centerline, widthBB) {
if ( !(this instanceof TextMetrics) ) {
return new TextMetrics(width, height, lineHeight, baseline, descender, fontSize, centerline, widthBB);
}
this.width = width !== undefined ? width : 0;
this.height = height !== undefined ? height : 0;
this.lineHeight = lineHeight !== undefined ? lineHeight : 0;
this.baseline = baseline !== undefined ? baseline : 0;
this.descender = descender !== undefined ? descender : 0;
this.fontSize = fontSize !== undefined ? fontSize : 0;
this.centerline = centerline !== undefined ? centerline : 0;
this.widthBB = widthBB !== undefined ? widthBB : 0;
return this;
}
CDrawingContextWord.prototype =
{
initFromGraphics : function(graphics)
......@@ -80,7 +199,7 @@ CDrawingContextWord.prototype =
else
{
r = g_font_infos[ font.FontFamily.Index ].LoadFont(
g_font_loader, this.fmgrGraphics[0], font.FontSize, fontStyle, this.Graphics.m_dDpiX, this.Graphics.m_dDpiY);
g_font_loader, fm, font.FontSize, fontStyle, this.Graphics.m_dDpiX, this.Graphics.m_dDpiY);
}
if (r === false) {
......@@ -104,7 +223,14 @@ CDrawingContextWord.prototype =
fillText : function(text, x, y, maxWidth, charWidths, angle)
{
this.Graphics.t(text, x, y);
//коэффициэнт нужно высчитывать!
var kF = 0.3527;
this.Graphics.t(text, x*kF, y*kF);
},
transform : function(sx,shy,shx,sy,tx,ty)
{
this.Graphics.transform(sx,shy,shx,sy,tx,ty);
},
getHeightText : function()
......@@ -122,5 +248,364 @@ CDrawingContextWord.prototype =
b = fm.m_lAscender * factor,
d = Math.abs(fm.m_lDescender * factor);
return new TextMetrics(w, b + d, l, b, d, this.font.FontSize, 0, wBB);
},
setFillStyle: function(val)
{
var c = parseColor(val);
this.Graphics.b_color1(c.r, c.g, c.b, (c.a * 255 + 0.5) >> 0);
return this;
}
};
function FontProperties(family, size, bold, italic, underline, strikeout) {
if ( !(this instanceof FontProperties) ) {
return new FontProperties(family, size, bold, italic, underline, strikeout);
}
this.FontFamily = {Name: family, Index: -1, Angle : 0};
this.FontSize = size;
this.Bold = !!bold;
this.Italic = !!italic;
this.Underline = underline;
this.Strikeout = strikeout;
return this;
}
FontProperties.prototype = {
/** @type FontProperties */
constructor: FontProperties,
/**
* Assigns font preperties from another object
* @param {FontProperties} font
*/
copyFrom: function (font) {
this.FontFamily.Name = font.FontFamily.Name;
this.FontFamily.Index = font.FontFamily.Index;
this.FontSize = font.FontSize;
this.Bold = font.Bold;
this.Italic = font.Italic;
this.Underline = font.Underline;
this.Strikeout = font.Strikeout;
},
/** @return {FontProperties} */
clone: function () {
return new FontProperties(this.FontFamily.Name, this.FontSize,
this.Bold, this.Italic, this.Underline, this.Strikeout);
},
isEqual: function (font) {
return font !== undefined &&
this.FontFamily.Name.toLowerCase() === font.FontFamily.Name.toLowerCase() &&
this.FontSize === font.FontSize &&
this.Bold === font.Bold &&
this.Italic === font.Italic;
}
};
function Matrix() {
if ( !(this instanceof Matrix) ) {
return new Matrix();
}
this.sx = 1.0;
this.shx = 0.0;
this.shy = 0.0;
this.sy = 1.0;
this.tx = 0.0;
this.ty = 0.0;
return this;
}
Matrix.prototype = {
/** @type Matrix */
constructor: Matrix,
reset: function () {
this.sx = 1.0;
this.shx = 0.0;
this.shy = 0.0;
this.sy = 1.0;
this.tx = 0.0;
this.ty = 0.0;
},
assign: function (sx, shx, shy, sy, tx, ty) {
this.sx = sx;
this.shx = shx;
this.shy = shy;
this.sy = sy;
this.tx = tx;
this.ty = ty;
},
copyFrom: function (matrix) {
this.sx = matrix.sx;
this.shx = matrix.shx;
this.shy = matrix.shy;
this.sy = matrix.sy;
this.tx = matrix.tx;
this.ty = matrix.ty;
},
clone: function () {
var m = new Matrix();
m.copyFrom(this);
return m;
},
multiply: function (matrix, order) {
if (MATRIX_ORDER_PREPEND === order) {
var m = matrix.clone();
m.multiply(this, MATRIX_ORDER_APPEND);
this.copyFrom(m);
} else {
var t0 = this.sx * matrix.sx + this.shy * matrix.shx;
var t2 = this.shx * matrix.sx + this.sy * matrix.shx;
var t4 = this.tx * matrix.sx + this.ty * matrix.shx + matrix.tx;
this.shy = this.sx * matrix.shy + this.shy * matrix.sy;
this.sy = this.shx * matrix.shy + this.sy * matrix.sy;
this.ty = this.tx * matrix.shy + this.ty * matrix.sy + matrix.ty;
this.sx = t0;
this.shx = t2;
this.tx = t4;
}
},
translate: function (x, y, order) {
var m = new Matrix();
m.tx = x;
m.ty = y;
this.multiply(m, order);
},
scale: function (x, y, order) {
var m = new Matrix();
m.sx = x;
m.sy = y;
this.multiply(m, order);
},
rotate: function (a, order) {
var m = new Matrix();
var rad = deg2rad(a);
m.sx = Math.cos(rad);
m.shx = Math.sin(rad);
m.shy = -Math.sin(rad);
m.sy = Math.cos(rad);
this.multiply(m, order);
},
rotateAt: function (a, x, y, order) {
this.translate(-x, -y, order);
this.rotate(a, order);
this.translate(x, y, order);
},
determinant: function () {
return this.sx * this.sy - this.shy * this.shx;
},
invert: function () {
var det = this.determinant();
if (0.0001 > det) {return;}
var d = 1 / det;
var t0 = this.sy * d;
this.sy = this.sx * d;
this.shy = -this.shy * d;
this.shx = -this.shx * d;
var t4 = -this.tx * t0 - this.ty * this.shx;
this.ty = -this.tx * this.shy - this.ty * this.sy;
this.sx = t0;
this.tx = t4;
},
transformPointX: function (x, y) {
return x * this.sx + y * this.shx + this.tx;
},
transformPointY: function (x, y) {
return x * this.shy + y * this.sy + this.ty;
},
/** Calculates rotation angle */
getRotation: function () {
var x1 = 0.0;
var y1 = 0.0;
var x2 = 1.0;
var y2 = 0.0;
this.transformPoint(x1, y1);
this.transformPoint(x2, y2);
var a = Math.atan2(y2-y1, x2-x1);
return rad2deg(a);
}
};
function CMatrix()
{
this.sx = 1.0;
this.shx = 0.0;
this.shy = 0.0;
this.sy = 1.0;
this.tx = 0.0;
this.ty = 0.0;
}
CMatrix.prototype =
{
Reset : function(){
this.sx = 1.0;
this.shx = 0.0;
this.shy = 0.0;
this.sy = 1.0;
this.tx = 0.0;
this.ty = 0.0;
},
// ���������
Multiply : function(matrix,order){
if (MATRIX_ORDER_PREPEND == order)
{
var m = new CMatrix();
m.sx = matrix.sx;
m.shx = matrix.shx;
m.shy = matrix.shy;
m.sy = matrix.sy;
m.tx = matrix.tx;
m.ty = matrix.ty;
m.Multiply(this, MATRIX_ORDER_APPEND);
this.sx = m.sx;
this.shx = m.shx;
this.shy = m.shy;
this.sy = m.sy;
this.tx = m.tx;
this.ty = m.ty;
}
else
{
var t0 = this.sx * matrix.sx + this.shy * matrix.shx;
var t2 = this.shx * matrix.sx + this.sy * matrix.shx;
var t4 = this.tx * matrix.sx + this.ty * matrix.shx + matrix.tx;
this.shy = this.sx * matrix.shy + this.shy * matrix.sy;
this.sy = this.shx * matrix.shy + this.sy * matrix.sy;
this.ty = this.tx * matrix.shy + this.ty * matrix.sy + matrix.ty;
this.sx = t0;
this.shx = t2;
this.tx = t4;
}
return this;
},
// � ������ ������� ������ ���������� (��� �������� �����������)
Translate : function(x,y,order){
var m = new CMatrix();
m.tx = x;
m.ty = y;
this.Multiply(m,order);
},
Scale : function(x,y,order){
var m = new CMatrix();
m.sx = x;
m.sy = y;
this.Multiply(m,order);
},
Rotate : function(a,order){
var m = new CMatrix();
var rad = deg2rad(a);
m.sx = Math.cos(rad);
m.shx = Math.sin(rad);
m.shy = -Math.sin(rad);
m.sy = Math.cos(rad);
this.Multiply(m,order);
},
RotateAt : function(a,x,y,order){
this.Translate(-x,-y,order);
this.Rotate(a,order);
this.Translate(x,y,order);
},
// determinant
Determinant : function(){
return this.sx * this.sy - this.shy * this.shx;
},
// invert
Invert : function(){
var det = this.Determinant();
if (0.0001 > Math.abs(det))
return;
var d = 1 / det;
var t0 = this.sy * d;
this.sy = this.sx * d;
this.shy = -this.shy * d;
this.shx = -this.shx * d;
var t4 = -this.tx * t0 - this.ty * this.shx;
this.ty = -this.tx * this.shy - this.ty * this.sy;
this.sx = t0;
this.tx = t4;
return this;
},
// transform point
TransformPointX : function(x,y){
return x * this.sx + y * this.shx + this.tx;
},
TransformPointY : function(x,y){
return x * this.shy + y * this.sy + this.ty;
},
// calculate rotate angle
GetRotation : function(){
var x1 = 0.0;
var y1 = 0.0;
var x2 = 1.0;
var y2 = 0.0;
this.TransformPoint(x1, y1);
this.TransformPoint(x2, y2);
var a = Math.atan2(y2-y1,x2-x1);
return rad2deg(a);
},
// ������� ���������
CreateDublicate : function(){
var m = new CMatrix();
m.sx = this.sx;
m.shx = this.shx;
m.shy = this.shy;
m.sy = this.sy;
m.tx = this.tx;
m.ty = this.ty;
return m;
},
IsIdentity : function()
{
if (this.sx == 1.0 &&
this.shx == 0.0 &&
this.shy == 0.0 &&
this.sy == 1.0 &&
this.tx == 0.0 &&
this.ty == 0.0)
{
return true;
}
return false;
},
IsIdentity2 : function()
{
if (this.sx == 1.0 &&
this.shx == 0.0 &&
this.shy == 0.0 &&
this.sy == 1.0)
{
return true;
}
return false;
}
};
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7