Skip to content

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

Переделал печать (ранее были проблемы с тем, что отрисовывались на каждую... 

Переделал печать (ранее были проблемы с тем, что отрисовывались на каждую строчку все бордеры страницы. Баг http://bugzserver/show_bug.cgi?id=20738)
Теперь печать идет как draw (в _drawCells добавил необходимые параметры)
Также мы visibleRange выставляем при печати равным range страницы (иначе бордеры merge ячеек не печатались)

git-svn-id: svn://192.168.3.15/activex/AVS/Sources/TeamlabOffice/trunk/OfficeWeb@51585 954022d7-b5bf-4e40-9824-e11837661b57
parent b211511d
Hide whitespace changes
Inline Side-by-side
Showing with 77 additions and 94 deletions
Common/Charts/DrawingObjects.js
View file @ bac93ffa
...@@ -3233,9 +3233,9 @@ function DrawingObjects() { ...@@ -3233,9 +3233,9 @@ function DrawingObjects() {
drawingCtx.clearRect( x1, y1, w, h ); drawingCtx.clearRect( x1, y1, w, h );
drawingCtx.setFillStyle(worksheet.settings.cells.defaultState.background).fillRect(x1, y1, w, h); drawingCtx.setFillStyle(worksheet.settings.cells.defaultState.background).fillRect(x1, y1, w, h);
worksheet._drawGrid(undefined, r_); worksheet._drawGrid(/*drawingCtx*/undefined, r_);
worksheet._drawCells(r_); worksheet._drawCells(/*drawingCtx*/undefined, r_);
worksheet._drawCellsBorders(undefined, r_); worksheet._drawCellsBorders(/*drawingCtx*/undefined, r_);
} }
} }
} }
......
Excel/view/WorksheetView.js
View file @ bac93ffa
...@@ -1469,27 +1469,26 @@ ...@@ -1469,27 +1469,26 @@
// ----- Drawing for print ----- // ----- Drawing for print -----
calcPagesPrint: function (pageOptions, printOnlySelection, indexWorksheet, layoutPageType) { calcPagesPrint: function (pageOptions, printOnlySelection, indexWorksheet, layoutPageType) {
var range;
var maxCols = this.model.getColsCount(); var maxCols = this.model.getColsCount();
var maxRows = this.model.getRowsCount(); var maxRows = this.model.getRowsCount();
var lastC = -1, lastR = -1; var lastC = -1, lastR = -1;
var activeRange = printOnlySelection ? this.activeRange : null; var activeRange = printOnlySelection ? this.activeRange : null;
if (null === activeRange) { if (null === activeRange) {
range = asc_Range(0, 0, maxCols, maxRows);
this._prepareCellTextMetricsCache(range);
for (var c = 0; c < maxCols; ++c) { for (var c = 0; c < maxCols; ++c) {
for (var r = 0; r < maxRows; ++r) { for (var r = 0; r < maxRows; ++r) {
if (!this._isCellEmptyOrMergedOrBackgroundColorOrBorders(c, r)) { if (!this._isCellEmptyOrMergedOrBackgroundColorOrBorders(c, r)) {
var ct = this._getCellTextCache(c, r); var ct = this._getCellTextCache(c, r);
if (ct === undefined) { if (undefined == ct)
// Мы печатаем и могут быть невидимые области, попробуем добавить текст и взять его снова continue;
this._addCellTextToCache (c, r);
ct = this._getCellTextCache(c, r);
}
var rightSide = 0; var rightSide = 0;
if (ct !== undefined) { var isMerged = ct.flags.isMerged, isWrapped = ct.flags.wrapText;
var isMerged = ct.flags.isMerged, isWrapped = ct.flags.wrapText; if (!isMerged && !isWrapped)
if (!isMerged && !isWrapped) rightSide = ct.sideR;
rightSide = ct.sideR;
}
lastC = Math.max(lastC, c + rightSide); lastC = Math.max(lastC, c + rightSide);
lastR = Math.max(lastR, r); lastR = Math.max(lastR, r);
...@@ -1509,6 +1508,8 @@ ...@@ -1509,6 +1508,8 @@
else { else {
maxCols = activeRange.c2 + 1; maxCols = activeRange.c2 + 1;
maxRows = activeRange.r2 + 1; maxRows = activeRange.r2 + 1;
range = asc_Range(0, 0, maxCols, maxRows);
this._prepareCellTextMetricsCache(range);
} }
var pageMargins, pageSetup, pageGridLines, pageHeadings; var pageMargins, pageSetup, pageGridLines, pageHeadings;
...@@ -1712,72 +1713,56 @@ ...@@ -1712,72 +1713,56 @@
drawingCtx.EndPage(); drawingCtx.EndPage();
} else { } else {
drawingCtx.BeginPage (printPagesData.pageWidth, printPagesData.pageHeight); drawingCtx.BeginPage (printPagesData.pageWidth, printPagesData.pageHeight);
drawingCtx.AddClipRect (printPagesData.pageClipRectLeft, printPagesData.pageClipRectTop, printPagesData.pageClipRectWidth, printPagesData.pageClipRectHeight); drawingCtx.AddClipRect (printPagesData.pageClipRectLeft, printPagesData.pageClipRectTop,
printPagesData.pageClipRectWidth, printPagesData.pageClipRectHeight);
if (isAppBridge) {window['appBridge']['dummyCommandUpdate'] ();} if (isAppBridge) {window['appBridge']['dummyCommandUpdate'] ();}
var offsetCols = printPagesData.startOffsetPt; var offsetCols = printPagesData.startOffsetPt;
var range = printPagesData.pageRange; var range = printPagesData.pageRange;
for (var row = range.r1; row <= range.r2; ++row) { var offsetX = this.cols[range.c1].left - printPagesData.leftFieldInPt + offsetCols;
var rangeTmpRow = asc_Range(range.c1, row, range.c2, row); var offsetY = this.rows[range.r1].top - printPagesData.topFieldInPt;
if (isAppBridge) {window['appBridge']['dummyCommandUpdate'] ();}
// Рисуем сетку var tmpVisibleRange = this.visibleRange;
if (printPagesData.pageGridLines) { // Сменим visibleRange для прохождения проверок отрисовки
this._drawGrid(drawingCtx, rangeTmpRow, this.cols[range.c1].left - printPagesData.leftFieldInPt + offsetCols, this.rows[range.r1].top - printPagesData.topFieldInPt, printPagesData.pageWidth / vector_koef, printPagesData.pageHeight / vector_koef); this.visibleRange = range;
}
if (isAppBridge) {window['appBridge']['dummyCommandUpdate'] ();} if (isAppBridge) {window['appBridge']['dummyCommandUpdate'] ();}
// Рисуем строку для печати // Нужно отрисовать заголовки
var mergedCells = {}; if (printPagesData.pageHeadings) {
$.extend (mergedCells, this._drawColumnHeaders(drawingCtx, range.c1, range.c2, /*style*/ undefined,
this._drawRowBG(drawingCtx, row, range.c1, range.c2, this.cols[range.c1].left - printPagesData.leftFieldInPt + offsetCols, this.rows[range.r1].top - printPagesData.topFieldInPt, null), offsetX, printPagesData.topFieldInPt - this.cellsTop);
this._drawRowText(drawingCtx, row, range.c1, range.c2, this.cols[range.c1].left - printPagesData.leftFieldInPt + offsetCols, this.rows[range.r1].top - printPagesData.topFieldInPt)); this._drawRowHeaders(drawingCtx, range.r1, range.r2, /*style*/ undefined,
printPagesData.leftFieldInPt - this.cellsLeft, offsetY);
}
if (isAppBridge) {window['appBridge']['dummyCommandUpdate'] ();} if (isAppBridge) {window['appBridge']['dummyCommandUpdate'] ();}
// draw merged cells at last stage to fix cells background issue // Рисуем сетку
for (var i in mergedCells) if (mergedCells.hasOwnProperty(i)) { if (printPagesData.pageGridLines) {
var mc = mergedCells[i]; this._drawGrid(drawingCtx, range, offsetX, offsetY,
this._drawRowBG(drawingCtx, mc.r1, mc.c1, mc.c1, this.cols[range.c1].left - printPagesData.leftFieldInPt + offsetCols, this.rows[range.r1].top - printPagesData.topFieldInPt, mc); printPagesData.pageWidth / vector_koef, printPagesData.pageHeight / vector_koef);
this._drawCellText(drawingCtx, mc.c1, mc.r1, range.c1, range.c2, this.cols[range.c1].left - printPagesData.leftFieldInPt + offsetCols, this.rows[range.r1].top - printPagesData.topFieldInPt, true); }
if (isAppBridge) {window['appBridge']['dummyCommandUpdate'] ();} if (isAppBridge) {window['appBridge']['dummyCommandUpdate'] ();}
}
if (isAppBridge) {window['appBridge']['dummyCommandUpdate'] ();} // Отрисовываем ячейки
this._drawCells(drawingCtx, range, offsetX, offsetY);
// Отрисовываем бордеры if (isAppBridge) {window['appBridge']['dummyCommandUpdate'] ();}
this._drawCellsBorders (drawingCtx, range, /*mergedCellsStage*/undefined, this.cols[range.c1].left - printPagesData.leftFieldInPt + offsetCols, this.rows[range.r1].top - printPagesData.topFieldInPt);
if (isAppBridge) {window['appBridge']['dummyCommandUpdate'] ();} // Отрисовываем бордеры
} this._drawCellsBorders(drawingCtx, range, /*mergedCellsStage*/undefined, offsetX, offsetY);
if (printPagesData.pageHeadings) {
// Нужно отрисовать заголовки
this._drawColumnHeaders (drawingCtx, range.c1, range.c2, /*style*/ undefined, this.cols[range.c1].left - printPagesData.leftFieldInPt + offsetCols, printPagesData.topFieldInPt - this.cellsTop);
this._drawRowHeaders (drawingCtx, range.r1, range.r2, /*style*/ undefined, printPagesData.leftFieldInPt - this.cellsLeft, this.rows[range.r1].top - printPagesData.topFieldInPt);
}
if (isAppBridge) {window['appBridge']['dummyCommandUpdate'] ();} if (isAppBridge) {window['appBridge']['dummyCommandUpdate'] ();}
// Отрисовываем картинки и графики (для этого должны выставить видимую область)
// Сохраняем копию и на время меняем область (стоит рисовать от входных параметров функции, а не от методов класса)
var tmpVisibleRange = this.visibleRange.clone(true);
this.visibleRange.c1 = range.c1;
this.visibleRange.c2 = range.c2;
this.visibleRange.r1 = range.r1;
this.visibleRange.r2 = range.r2;
var drawingPrintOptions = { var drawingPrintOptions = {
ctx: drawingCtx, ctx: drawingCtx,
printPagesData: printPagesData printPagesData: printPagesData
}; };
this.objectRender.showDrawingObjectsEx(false, drawingPrintOptions); this.objectRender.showDrawingObjectsEx(false, drawingPrintOptions);
this.visibleRange = tmpVisibleRange.clone(true); this.visibleRange = tmpVisibleRange;
if (isAppBridge) {window['appBridge']['dummyCommandUpdate'] ();} if (isAppBridge) {window['appBridge']['dummyCommandUpdate'] ();}
...@@ -1795,7 +1780,7 @@ ...@@ -1795,7 +1780,7 @@
this._drawColumnHeaders(/*drawingCtx*/ undefined); this._drawColumnHeaders(/*drawingCtx*/ undefined);
this._drawRowHeaders(/*drawingCtx*/ undefined); this._drawRowHeaders(/*drawingCtx*/ undefined);
this._drawGrid(/*drawingCtx*/ undefined); this._drawGrid(/*drawingCtx*/ undefined);
this._drawCells(); this._drawCells(/*drawingCtx*/undefined);
this._drawCellsBorders(/*drawingCtx*/undefined); this._drawCellsBorders(/*drawingCtx*/undefined);
this._fixSelectionOfMergedCells(); this._fixSelectionOfMergedCells();
this._fixSelectionOfHiddenCells(); this._fixSelectionOfHiddenCells();
...@@ -2139,41 +2124,49 @@ ...@@ -2139,41 +2124,49 @@
}, },
/** Рисует ячейки таблицы */ /** Рисует ячейки таблицы */
_drawCells: function (range) { _drawCells: function (drawingCtx, range, offsetX, offsetY) {
if (range === undefined) { if (range === undefined) {
range = this.visibleRange; range = this.visibleRange;
} }
this._prepareCellTextMetricsCache(range); this._prepareCellTextMetricsCache(range);
var ctx = this.drawingCtx; var ctx = (undefined === drawingCtx) ? this.drawingCtx : drawingCtx;
var offsetX = this.cols[this.visibleRange.c1].left - this.cellsLeft; offsetX = (undefined === offsetX) ? this.cols[this.visibleRange.c1].left - this.cellsLeft : offsetX;
var offsetY = this.rows[this.visibleRange.r1].top - this.cellsTop; offsetY = (undefined === offsetY) ? this.rows[this.visibleRange.r1].top - this.cellsTop : offsetY;
var mergedCells = {}, mc, i; var mergedCells = {}, mc, i;
// set clipping rect to cells area
ctx.save() if (!drawingCtx) {
// set clipping rect to cells area
ctx.save()
.beginPath() .beginPath()
.rect(this.cellsLeft, this.cellsTop, ctx.getWidth() - this.cellsLeft, ctx.getHeight() - this.cellsTop) .rect(this.cellsLeft, this.cellsTop, ctx.getWidth() - this.cellsLeft, ctx.getHeight() - this.cellsTop)
.clip(); .clip();
}
for (var row = range.r1; row <= range.r2; ++row) { for (var row = range.r1; row <= range.r2; ++row) {
$.extend( mergedCells, $.extend( mergedCells,
this._drawRowBG(/*drawingCtx*/undefined, row, range.c1, range.c2, offsetX, offsetY, null), this._drawRowBG(drawingCtx, row, range.c1, range.c2, offsetX, offsetY, null),
this._drawRowText(/*drawingCtx*/undefined, row, range.c1, range.c2, offsetX, offsetY) ); this._drawRowText(drawingCtx, row, range.c1, range.c2, offsetX, offsetY) );
} }
// draw merged cells at last stage to fix cells background issue // draw merged cells at last stage to fix cells background issue
for (i in mergedCells) if (mergedCells.hasOwnProperty(i)) { for (i in mergedCells) if (mergedCells.hasOwnProperty(i)) {
mc = mergedCells[i]; mc = mergedCells[i];
this._drawRowBG(/*drawingCtx*/undefined, mc.r1, mc.c1, mc.c1, offsetX, offsetY, mc); this._drawRowBG(drawingCtx, mc.r1, mc.c1, mc.c1, offsetX, offsetY, mc);
this._drawCellText(/*drawingCtx*/undefined, mc.c1, mc.r1, range.c1, range.c2, offsetX, offsetY, true); this._drawCellText(drawingCtx, mc.c1, mc.r1, range.c1, range.c2, offsetX, offsetY, true);
}
if (!drawingCtx) {
// restore canvas' original clipping range
ctx.restore();
} }
// restore canvas' original clipping range
ctx.restore();
}, },
/** Рисует фон ячеек в строке */ /** Рисует фон ячеек в строке */
_drawRowBG: function (drawingCtx, row, colStart, colEnd, offsetX, offsetY, oMergedCell) { _drawRowBG: function (drawingCtx, row, colStart, colEnd, offsetX, offsetY, oMergedCell) {
if (this.rows[row].height < this.height_1px && null === oMergedCell) {return {};} if (this.rows[row].height < this.height_1px && null === oMergedCell) {return {};}
var ctx = (undefined === drawingCtx) ? this.drawingCtx : drawingCtx;
for (var mergedCells = {}, col = colStart; col <= colEnd; ++col) { for (var mergedCells = {}, col = colStart; col <= colEnd; ++col) {
if (this.cols[col].width < this.width_1px && null === oMergedCell) {continue;} if (this.cols[col].width < this.width_1px && null === oMergedCell) {continue;}
...@@ -2181,7 +2174,6 @@ ...@@ -2181,7 +2174,6 @@
var c = this._getVisibleCell(col, row); var c = this._getVisibleCell(col, row);
if (!c) {continue;} if (!c) {continue;}
var ctx = (undefined === drawingCtx) ? this.drawingCtx : drawingCtx;
var bg = c.getFill(); var bg = c.getFill();
if(null != bg) if(null != bg)
bg = bg.getRgb(); bg = bg.getRgb();
...@@ -2277,17 +2269,8 @@ ...@@ -2277,17 +2269,8 @@
/** Рисует текст ячейки */ /** Рисует текст ячейки */
_drawCellText: function (drawingCtx, col, row, colStart, colEnd, offsetX, offsetY, drawMergedCells) { _drawCellText: function (drawingCtx, col, row, colStart, colEnd, offsetX, offsetY, drawMergedCells) {
var ct = this._getCellTextCache(col, row); var ct = this._getCellTextCache(col, row);
if (ct === undefined) { if (ct === undefined)
if (drawingCtx) { return null;
// Мы печатаем и могут быть невидимые области, попробуем добавить текст и взять его снова
this._addCellTextToCache (col, row);
ct = this._getCellTextCache(col, row);
if (ct === undefined)
return null;
}
else
return null;
}
var isMerged = ct.flags.isMerged, range = undefined, isWrapped = ct.flags.wrapText; var isMerged = ct.flags.isMerged, range = undefined, isWrapped = ct.flags.wrapText;
var ctx = (undefined === drawingCtx) ? this.drawingCtx : drawingCtx; var ctx = (undefined === drawingCtx) ? this.drawingCtx : drawingCtx;
...@@ -2324,7 +2307,7 @@ ...@@ -2324,7 +2307,7 @@
var textW = this._calcTextWidth(x1ct, x2ct, ct.metrics, ct.cellHA); var textW = this._calcTextWidth(x1ct, x2ct, ct.metrics, ct.cellHA);
var xb1, yb1, wb, hb, bound, colLeft, colRight, i; var xb1, yb1, wb, hb, bound, colLeft, colRight, i;
var txtRotX, txtRotW, clipUse = false;; var txtRotX, txtRotW, clipUse = false;
if (drawingCtx) { if (drawingCtx) {
...@@ -4773,13 +4756,13 @@ ...@@ -4773,13 +4756,13 @@
var r_ = asc_Range(c2, r1_, c2, r2_); var r_ = asc_Range(c2, r1_, c2, r2_);
if (r2_ >= r1_) { if (r2_ >= r1_) {
this._drawGrid(/*drawingCtx*/ undefined, r_); this._drawGrid(/*drawingCtx*/ undefined, r_);
this._drawCells(r_); this._drawCells(/*drawingCtx*/undefined, r_);
this._drawCellsBorders(/*drawingCtx*/undefined, r_); this._drawCellsBorders(/*drawingCtx*/undefined, r_);
} }
} }
} }
this._drawGrid(/*drawingCtx*/ undefined, range); this._drawGrid(/*drawingCtx*/ undefined, range);
this._drawCells(range); this._drawCells(/*drawingCtx*/undefined, range);
this._drawCellsBorders(/*drawingCtx*/undefined, range); this._drawCellsBorders(/*drawingCtx*/undefined, range);
this._fixSelectionOfMergedCells(); this._fixSelectionOfMergedCells();
this._drawSelection(); this._drawSelection();
...@@ -4846,7 +4829,7 @@ ...@@ -4846,7 +4829,7 @@
var range = asc_Range(c1, r1, c2, r2); var range = asc_Range(c1, r1, c2, r2);
this._drawColumnHeaders(/*drawingCtx*/ undefined, c1, c2); this._drawColumnHeaders(/*drawingCtx*/ undefined, c1, c2);
this._drawGrid(/*drawingCtx*/ undefined, range); this._drawGrid(/*drawingCtx*/ undefined, range);
this._drawCells(range); this._drawCells(/*drawingCtx*/undefined, range);
this._drawCellsBorders(/*drawingCtx*/undefined, range); this._drawCellsBorders(/*drawingCtx*/undefined, range);
this._fixSelectionOfMergedCells(); this._fixSelectionOfMergedCells();
this._drawSelection(); this._drawSelection();
...@@ -5778,14 +5761,14 @@ ...@@ -5778,14 +5761,14 @@
case align_Center : horAlign = "center"; break; case align_Center : horAlign = "center"; break;
case align_Justify : horAlign = "justify"; break; case align_Justify : horAlign = "justify"; break;
} }
var vertAlign = "center"; var vertAlign = "center";
switch (paraPr.anchor) { switch (paraPr.anchor) {
case VERTICAL_ANCHOR_TYPE_BOTTOM: vertAlign = "bottom"; break; case VERTICAL_ANCHOR_TYPE_BOTTOM: vertAlign = "bottom"; break;
case VERTICAL_ANCHOR_TYPE_CENTER: vertAlign = "center"; break; case VERTICAL_ANCHOR_TYPE_CENTER: vertAlign = "center"; break;
case VERTICAL_ANCHOR_TYPE_TOP: case VERTICAL_ANCHOR_TYPE_TOP:
case VERTICAL_ANCHOR_TYPE_DISTRIBUTED: case VERTICAL_ANCHOR_TYPE_DISTRIBUTED:
case VERTICAL_ANCHOR_TYPE_JUSTIFIED: vertAlign = "top"; break; case VERTICAL_ANCHOR_TYPE_JUSTIFIED: vertAlign = "top"; break;
} }
objectInfo.halign = horAlign; objectInfo.halign = horAlign;
......
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