Skip to content

S
sdkjs
Commit 8f14c2c2 authored by Alexander.Trofimov's avatar Alexander.Trofimov
Browse files
Options

add RemoveClipRect and AddClipRect to match with pdf printer

parent e3ea6a80
Show whitespace changes
Inline Side-by-side
Showing with 153 additions and 294 deletions
cell/graphics/DrawingContext.js
View file @ 8f14c2c2
......@@ -635,6 +635,14 @@
return this;
};
DrawingContext.prototype.AddClipRect = function (x, y, w, h) {
return this.save().beginPath().rect(x, y, w, h).clip();
};
DrawingContext.prototype.RemoveClipRect = function () {
return this.restore();
};
DrawingContext.prototype.save = function () {
this.ctx.save();
return this;
......
cell/view/WorksheetView.js
View file @ 8f14c2c2
......@@ -2258,17 +2258,9 @@
var textX = this._calcTextHorizPos(x, x2WithoutBorder, tm, tm.width < w ? AscCommon.align_Center : AscCommon.align_Left);
var textY = this._calcTextVertPos(y, y2WithoutBorder, bl, tm, Asc.c_oAscVAlign.Bottom);
if (drawingCtx) {
ctx.AddClipRect(x, y, w, h);
} else {
ctx.save().beginPath().rect(x, y, w, h).clip();
}
ctx.setFillStyle(st.color).fillText(text, textX, textY + tm.baseline, undefined, sr.charWidths);
if (drawingCtx) {
ctx.RemoveClipRect();
} else {
ctx.restore();
}
};
WorksheetView.prototype._cleanColumnHeaders = function (colStart, colEnd) {
......@@ -2572,34 +2564,35 @@
};
/** Рисует текст ячейки */
WorksheetView.prototype._drawCellText = function ( drawingCtx, col, row, colStart, colEnd, offsetX, offsetY, drawMergedCells ) {
var ct = this._getCellTextCache( col, row );
if ( ct === undefined ) {
WorksheetView.prototype._drawCellText =
function (drawingCtx, col, row, colStart, colEnd, offsetX, offsetY, drawMergedCells) {
var ct = this._getCellTextCache(col, row);
if (!ct) {
return null;
}
var isMerged = ct.flags.isMerged(), range = undefined, isWrapped = ct.flags.wrapText;
var ctx = drawingCtx || this.drawingCtx;
if ( isMerged ) {
if (isMerged) {
range = ct.flags.merged;
if ( !drawMergedCells ) {
if (!drawMergedCells) {
return range;
}
if ( col !== range.c1 || row !== range.r1 ) {
if (col !== range.c1 || row !== range.r1) {
return null;
}
}
var colL = isMerged ? range.c1 : Math.max( colStart, col - ct.sideL );
var colR = isMerged ? Math.min( range.c2, this.nColsCount - 1 ) : Math.min( colEnd, col + ct.sideR );
var colL = isMerged ? range.c1 : Math.max(colStart, col - ct.sideL);
var colR = isMerged ? Math.min(range.c2, this.nColsCount - 1) : Math.min(colEnd, col + ct.sideR);
var rowT = isMerged ? range.r1 : row;
var rowB = isMerged ? Math.min( range.r2, this.nRowsCount - 1 ) : row;
var rowB = isMerged ? Math.min(range.r2, this.nRowsCount - 1) : row;
var isTrimmedR = !isMerged && colR !== col + ct.sideR;
if ( !(ct.angle || 0) ) {
if ( !isMerged && !isWrapped ) {
this._eraseCellRightBorder( drawingCtx, colL, colR + (isTrimmedR ? 1 : 0), row, offsetX, offsetY );
if (!(ct.angle || 0)) {
if (!isMerged && !isWrapped) {
this._eraseCellRightBorder(drawingCtx, colL, colR + (isTrimmedR ? 1 : 0), row, offsetX, offsetY);
}
}
......@@ -2609,141 +2602,18 @@
var h = this.rows[rowB].top + this.rows[rowB].height - offsetY - y1;
var x2 = x1 + w - (isTrimmedR ? 0 : this.width_1px);
var y2 = y1 + h - this.height_1px;
var bl = !isMerged ? (y2 - this.rows[rowB].descender) : (y2 - ct.metrics.height + ct.metrics.baseline - this.height_1px);
var bl = !isMerged ? (y2 - this.rows[rowB].descender) :
(y2 - ct.metrics.height + ct.metrics.baseline - this.height_1px);
var x1ct = isMerged ? x1 : this.cols[col].left - offsetX;
var x2ct = isMerged ? x2 : x1ct + this.cols[col].width - this.width_1px;
var textX = this._calcTextHorizPos( x1ct, x2ct, ct.metrics, ct.cellHA );
var textY = this._calcTextVertPos( y1, y2, bl, ct.metrics, ct.cellVA );
var textW = this._calcTextWidth( x1ct, x2ct, ct.metrics, ct.cellHA );
var textX = this._calcTextHorizPos(x1ct, x2ct, ct.metrics, ct.cellHA);
var textY = this._calcTextVertPos(y1, y2, bl, ct.metrics, ct.cellVA);
var textW = this._calcTextWidth(x1ct, x2ct, ct.metrics, ct.cellHA);
var xb1, yb1, wb, hb, colLeft, colRight, i, textAlign;
var xb1, yb1, wb, hb, colLeft, colRight, i;
var txtRotX, txtRotW, clipUse = false;
if ( drawingCtx ) {
// для печати
if ( ct.angle || 0 ) {
xb1 = this.cols[col].left - offsetX;
yb1 = this.rows[row].top - offsetY;
wb = this.cols[col].width;
hb = this.rows[row].height;
txtRotX = xb1 - ct.textBound.offsetX;
txtRotW = ct.textBound.width + xb1 - ct.textBound.offsetX;
if ( isMerged ) {
wb = 0;
for ( i = colL; i <= colR && i < this.nColsCount; ++i ) {
wb += this.cols[i].width;
}
hb = 0;
for ( i = rowT; i <= rowB && i < this.nRowsCount; ++i ) {
hb += this.rows[i].height;
}
ctx.AddClipRect( xb1, yb1, wb, hb );
clipUse = true;
}
this.stringRender.angle = ct.angle;
this.stringRender.fontNeedUpdate = true;
if ( 90 === ct.angle || -90 === ct.angle ) {
// клип по ячейке
if ( !isMerged ) {
ctx.AddClipRect( xb1, yb1, wb, hb );
clipUse = true;
}
}
else {
// клип по строке
if ( !isMerged ) {
ctx.AddClipRect( 0, yb1, this.drawingCtx.getWidth(), h );
clipUse = true;
}
if ( !isMerged && !isWrapped ) {
colLeft = col;
if ( 0 !== txtRotX ) {
while ( true ) {
if ( 0 == colLeft ) {
break;
}
if ( txtRotX >= this.cols[colLeft].left ) {
break;
}
--colLeft;
}
}
colRight = Math.min( col, this.nColsCount - 1 );
if ( 0 !== txtRotW ) {
while ( true ) {
++colRight;
if ( colRight >= this.nColsCount ) {
--colRight;
break;
}
if ( txtRotW <= this.cols[colRight].left ) {
--colRight;
break;
}
}
}
colLeft = isMerged ? range.c1 : colLeft;
colRight = isMerged ? Math.min( range.c2, this.nColsCount - 1 ) : colRight;
this._eraseCellRightBorder( drawingCtx, colLeft, colRight + (isTrimmedR ? 1 : 0), row, offsetX, offsetY );
}
}
this.stringRender.rotateAtPoint( drawingCtx, ct.angle, xb1, yb1, ct.textBound.dx, ct.textBound.dy );
this.stringRender.restoreInternalState( ct.state ).render( drawingCtx, 0, 0, textW, ct.color );
textAlign = this.stringRender.flags.textAlign;
if (isWrapped) {
if (ct.angle < 0) {
if (Asc.c_oAscVAlign.Top === ct.cellVA)
this.stringRender.flags.textAlign = AscCommon.align_Left;
else if (Asc.c_oAscVAlign.Center === ct.cellVA)
this.stringRender.flags.textAlign = AscCommon.align_Center;
else if (Asc.c_oAscVAlign.Bottom === ct.cellVA)
this.stringRender.flags.textAlign = AscCommon.align_Right;
}
else {
if (Asc.c_oAscVAlign.Top === ct.cellVA)
this.stringRender.flags.textAlign = AscCommon.align_Right;
else if (Asc.c_oAscVAlign.Center === ct.cellVA)
this.stringRender.flags.textAlign = AscCommon.align_Center;
else if (Asc.c_oAscVAlign.Bottom === ct.cellVA)
this.stringRender.flags.textAlign = AscCommon.align_Left;
}
}
this.stringRender.resetTransform( drawingCtx );
if ( clipUse ) {
ctx.RemoveClipRect();
}
}
else {
ctx.AddClipRect( x1, y1, w, h );
this.stringRender.restoreInternalState( ct.state ).render( drawingCtx, textX, textY, textW, ct.color );
ctx.RemoveClipRect();
}
}
else {
// для отрисовки
if ( ct.angle || 0 ) {
if (ct.angle || 0) {
xb1 = this.cols[col].left - offsetX;
yb1 = this.rows[row].top - offsetY;
......@@ -2753,64 +2623,63 @@
txtRotX = xb1 - ct.textBound.offsetX;
txtRotW = ct.textBound.width + xb1 - ct.textBound.offsetX;
if ( isMerged ) {
if (isMerged) {
wb = 0;
for ( i = colL; i <= colR && i < this.nColsCount; ++i ) {
for (i = colL; i <= colR && i < this.nColsCount; ++i) {
wb += this.cols[i].width;
}
hb = 0;
for ( i = rowT; i <= rowB && i < this.nRowsCount; ++i ) {
for (i = rowT; i <= rowB && i < this.nRowsCount; ++i) {
hb += this.rows[i].height;
}
ctx.save().beginPath().rect( xb1, yb1, wb, hb ).clip();
ctx.AddClipRect(xb1, yb1, wb, hb);
clipUse = true;
}
this.stringRender.angle = ct.angle;
this.stringRender.fontNeedUpdate = true;
if ( 90 === ct.angle || -90 === ct.angle ) {
if (90 === ct.angle || -90 === ct.angle) {
// клип по ячейке
if ( !isMerged ) {
ctx.save().beginPath().rect( xb1, yb1, wb, hb ).clip();
if (!isMerged) {
ctx.AddClipRect(xb1, yb1, wb, hb);
clipUse = true;
}
}
else {
} else {
// клип по строке
if ( !isMerged ) {
ctx.save().beginPath().rect( 0, y1, this.drawingCtx.getWidth(), h ).clip();
if (!isMerged) {
ctx.AddClipRect(0, y1, this.drawingCtx.getWidth(), h);
clipUse = true;
}
if ( !isMerged && !isWrapped ) {
if (!isMerged && !isWrapped) {
colLeft = col;
if ( 0 !== txtRotX ) {
while ( true ) {
if ( 0 == colLeft ) {
if (0 !== txtRotX) {
while (true) {
if (0 == colLeft) {
break;
}
if ( txtRotX >= this.cols[colLeft].left ) {
if (txtRotX >= this.cols[colLeft].left) {
break;
}
--colLeft;
}
}
colRight = Math.min( col, this.nColsCount - 1 );
if ( 0 !== txtRotW ) {
while ( true ) {
colRight = Math.min(col, this.nColsCount - 1);
if (0 !== txtRotW) {
while (true) {
++colRight;
if ( colRight >= this.nColsCount ) {
if (colRight >= this.nColsCount) {
--colRight;
break;
}
if ( txtRotW <= this.cols[colRight].left ) {
if (txtRotW <= this.cols[colRight].left) {
--colRight;
break;
}
......@@ -2818,64 +2687,46 @@
}
colLeft = isMerged ? range.c1 : colLeft;
colRight = isMerged ? Math.min( range.c2, this.nColsCount - 1 ) : colRight;
colRight = isMerged ? Math.min(range.c2, this.nColsCount - 1) : colRight;
this._eraseCellRightBorder( drawingCtx, colLeft, colRight + (isTrimmedR ? 1 : 0), row, offsetX, offsetY );
this._eraseCellRightBorder(drawingCtx, colLeft, colRight + (isTrimmedR ? 1 : 0), row, offsetX,
offsetY);
}
}
this.stringRender.rotateAtPoint(null, ct.angle, xb1, yb1, ct.textBound.dx, ct.textBound.dy);
this.stringRender.rotateAtPoint(drawingCtx, ct.angle, xb1, yb1, ct.textBound.dx, ct.textBound.dy);
this.stringRender.restoreInternalState(ct.state);
textAlign = this.stringRender.flags.textAlign;
if (isWrapped) {
if (ct.angle < 0) {
if (Asc.c_oAscVAlign.Top === ct.cellVA)
if (Asc.c_oAscVAlign.Top === ct.cellVA) {
this.stringRender.flags.textAlign = AscCommon.align_Left;
else if (Asc.c_oAscVAlign.Center === ct.cellVA)
} else if (Asc.c_oAscVAlign.Center === ct.cellVA) {
this.stringRender.flags.textAlign = AscCommon.align_Center;
else if (Asc.c_oAscVAlign.Bottom === ct.cellVA)
} else if (Asc.c_oAscVAlign.Bottom === ct.cellVA) {
this.stringRender.flags.textAlign = AscCommon.align_Right;
}
else {
if (Asc.c_oAscVAlign.Top === ct.cellVA)
} else {
if (Asc.c_oAscVAlign.Top === ct.cellVA) {
this.stringRender.flags.textAlign = AscCommon.align_Right;
else if (Asc.c_oAscVAlign.Center === ct.cellVA)
} else if (Asc.c_oAscVAlign.Center === ct.cellVA) {
this.stringRender.flags.textAlign = AscCommon.align_Center;
else if (Asc.c_oAscVAlign.Bottom === ct.cellVA)
} else if (Asc.c_oAscVAlign.Bottom === ct.cellVA) {
this.stringRender.flags.textAlign = AscCommon.align_Left;
}
}
}
this.stringRender.render(drawingCtx, 0, 0, textW, ct.color);
this.stringRender.resetTransform(drawingCtx);
// var color = new CColor(0, 0, 255, 0.5);
//
// ctx.setStrokeStyle(color).
// moveTo(0, 0).
// lineTo(ct.metrics.width, 0).
// lineTo(ct.metrics.width, ct.metrics.height).
// lineTo(0, ct.metrics.height).
// closePath().
// stroke();
this.stringRender.resetTransform( null );
if ( clipUse ) {
ctx.restore();
}
// color = new CColor( 255, 0, 0, 0.5 );
// ctx.save().
// setStrokeStyle(color).
// strokeRect(xb1 - ct.textBound.offsetX, yb1, ct.textBound.width, ct.textBound.height).
// restore();
}
else {
ctx.save().beginPath().rect( x1, y1, w, h ).clip();
this.stringRender.restoreInternalState( ct.state ).render( drawingCtx, textX, textY, textW, ct.color );
ctx.restore();
if (clipUse) {
ctx.RemoveClipRect();
}
} else {
ctx.AddClipRect(x1, y1, w, h);
this.stringRender.restoreInternalState(ct.state).render(drawingCtx, textX, textY, textW, ct.color);
ctx.RemoveClipRect();
}
return null;
......
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