Skip to content

S
sdkjs
Commit ea51179d authored by Alexey.Musinov's avatar Alexey.Musinov Committed by Alexander.Trofimov
Browse files
Options

правка для числовых форматов 

git-svn-id: svn://192.168.3.15/activex/AVS/Sources/TeamlabOffice/trunk/OfficeWeb@51283 954022d7-b5bf-4e40-9824-e11837661b57
parent 1336be8b
Hide whitespace changes
Inline Side-by-side
Showing with 32 additions and 97 deletions
Excel/view/StringRender.js
View file @ ea51179d
......@@ -210,14 +210,15 @@
* @param {Number} textW
* @param {String} alignHorizontal
* @param {String} alignVertical
* @param {Number} maxWidth
*/
getTransformBound: function(angle, x, y, w, h, textW, alignHorizontal, alignVertical) {
getTransformBound: function(angle, x, y, w, h, textW, alignHorizontal, alignVertical, maxWidth) {
this.angle = 0; // angle;
this.fontNeedUpdate = true;
var dx = 0, dy = 0, sx = 0, sw = 0;
var tm = this._doMeasure();
var tm = this._doMeasure(maxWidth);
var mul = (90 - (Math.abs(angle)) ) / 90;
var posh = (angle === 90 || angle === -90) ? textW : Math.abs(Math.sin(angle * Math.PI / 180.0) * textW);
......@@ -838,15 +839,17 @@
this.charWidths[this.charWidths.length - 1] += delta;
}
if (hasRepeats) {
if (maxWidth === undefined) {throw "Undefined width of cell width Numeric Format";}
this._insertRepeatChars(maxWidth);
}
if (hasRepeats) {
if (maxWidth === undefined) {
throw "Undefined width of cell width Numeric Format";
}
this._insertRepeatChars(maxWidth);
}
return this._calcTextMetrics();
},
return this._calcTextMetrics();
},
/**
/**
* @param {Number} maxWidth
* @return {TextMetrics}
*/
......@@ -998,92 +1001,6 @@
}
},
/**
* @param {Number} angle
* @param {Object} tm
* @param {Number} x
* @param {Number} y
* @param {Number} w
* @param {Number} h
* @param {Number} textW
* @param {Number} alignH
* @param {Number} alignV
* */
_boundTransform: function(angle, tm, x, y, w, h, textW, alignH, alignV) {
var dx = 0, dy = 0;
var mbt = new asc.Matrix();
var ah = alignH[0], av = alignV[0];
var mul = (90 - (Math.abs(angle)) ) / 90;
var posh = (angle === 90 || angle === -90) ? textW : Math.abs(Math.sin(angle * Math.PI / 180.0) * textW);
var posv = (angle === 90 || angle === -90) ? 0 : Math.abs(Math.cos(angle * Math.PI / 180.0) * textW);
if ('b' === av) {
if (posh < h) {
if (angle < 0) {
if ('l' === ah) dx = (1 - mul * 0.5) * tm.height;
if ('c' === ah) dx = (w + tm.height - posv) * 0.5;
if ('r' === ah) dx = w - (mul * 0.5) * tm.height - posv;
dy = h - (posh + mul * tm.height);
} else {
if ('c' === ah) dx = (w - tm.height - posv) * 0.5;
if ('r' === ah) dx = w - posv - tm.height;
dy = h - mul * tm.height;
}
} else {
if (angle < 0) {
if ('l' === ah) dx = (1 - mul * 0.5) * tm.height;
if ('c' === ah) dx = (w + tm.height - posv) * 0.5;
if ('r' === ah) dx = w - (mul * 0.5) * tm.height - posv;
} else {
if ('c' === ah) dx = (w - tm.height - posv) * 0.5;
if ('r' === ah) dx = w - posv - tm.height;
dy = h - mul * tm.height;
}
}
}
if ('c' === av) {
if (posh < h) {
if (angle < 0) {
if ('l' === ah) dx = (1 - mul * 0.5) * tm.height;
if ('c' === ah) dx = (w + tm.height - posv) * 0.5;
if ('r' === ah) dx = w - (mul * 0.5) * tm.height - posv;
dy = (h - posh) * 0.5;
} else {
if ('c' == ah) dx = (w - tm.height - posv) * 0.5;
if ('r' === ah) dx = w - posv - tm.height;
dy = (h + posh) * 0.5;
}
} else {
if (angle < 0) {
if ('l' === ah) dx = (1 - mul * 0.5) * tm.height;
if ('c' === ah) dx = (w + tm.height - posv) * 0.5;
if ('r' === ah) dx = w - (mul * 0.5) * tm.height - posv;
} else {
if ('c' === ah) dx = (w - tm.height - posv) * 0.5;
if ('r' === ah) dx = w - posv - tm.height;
dy = Math.min(h + tm.height * mul, posh);
}
}
}
if ('t' === av) {
if (angle < 0) {
if ('l' === ah) dx = (1 - mul * 0.5) * tm.height;
if ('c' === ah) dx = (w + tm.height - posv) * 0.5;
if ('r' === ah) dx = w - (mul * 0.5) * tm.height - posv;
} else {
if ('c' === ah) dx = (w - tm.height - posv) * 0.5;
if ('r' === ah) dx = w - posv - tm.height;
dy = Math.min(h + tm.height * mul, posh);
}
}
mbt.translate(x + dx, y + dy);
return mbt;
},
getInternalState: function () {
//for (var fr = [], i = 0; i < this.fragments.length; ++i) {
// fr.push(this.fragments[i]);
......
Excel/view/WorksheetView.js
View file @ ea51179d
......@@ -3768,7 +3768,25 @@
}
}
textBound = this.stringRender.getTransformBound(c.getAngle(), 0, 0, colWidth, rowHeight, tm.width, ha, va);
textBound = this.stringRender.getTransformBound(c.getAngle(), 0, 0, colWidth, rowHeight, tm.width, ha, va, maxW);
// NOTE: надо сделать как в экселе если проекция строчки на Y больше высоты ячейки подставлять # и рисовать все по центру
// if (isNumberFormat) {
// var prj = Math.abs(Math.sin(c.getAngle() * Math.PI / 180.0) * tm.width);
// if (prj > rowHeight) {
// //if (maxW === undefined) {}
// maxW = rowHeight / Math.abs(Math.cos(c.getAngle() * Math.PI / 180.0));
// str = c.getValue2(gc_nMaxDigCountView, makeFnIsGoodNumFormat(fl, maxW));
//
// for (i = 0; i < str.length; ++i) {
// var f = str[i].format;
// if (f) f.repeat = true;
// }
//
// tm = this._roundTextMetrics(this.stringRender.measureString(str, fl, maxW));
// }
// }
}
this._fetchCellCache(col, row).text = {
......@@ -3827,7 +3845,7 @@
}
this._fetchCellCache(col, row).text.textBound =
this.stringRender.getTransformBound(c.getAngle(), 0, 0, colWidth, rowHeight, tm.width, ha, va);
this.stringRender.getTransformBound(c.getAngle(), 0, 0, colWidth, rowHeight, tm.width, ha, va, maxW);
}
else {
......
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