Skip to content

S
sdkjs
Commit 520c3817 authored by Dmitry.Vikulov's avatar Dmitry.Vikulov Committed by Alexander.Trofimov
Browse files
Options

- Добавлены шрифты для подписей осей 

- Добавлен функционал для вычисления хидеров диапвзона диаграммы

git-svn-id: svn://192.168.3.15/activex/AVS/Sources/TeamlabOffice/trunk/OfficeWeb@47366 954022d7-b5bf-4e40-9824-e11837661b57
parent 1b9efda5
Show whitespace changes
Inline Side-by-side
Showing with 349 additions and 125 deletions
Common/Charts/DrawingObjects.js
View file @ 520c3817
...@@ -80,13 +80,21 @@ function CChartData(bWordContext, chart) { ...@@ -80,13 +80,21 @@ function CChartData(bWordContext, chart) {
bDefaultTitle: chart.xAxis.bDefaultTitle, bDefaultTitle: chart.xAxis.bDefaultTitle,
bShow: chart.xAxis.bShow, bShow: chart.xAxis.bShow,
bGrid: chart.xAxis.bGrid, bGrid: chart.xAxis.bGrid,
font: { titleFont: {
name: chart.xAxis.font.name, name: chart.xAxis.titleFont.name,
size: chart.xAxis.font.size, size: chart.xAxis.titleFont.size,
color: chart.xAxis.font.color, color: chart.xAxis.titleFont.color,
bold: chart.xAxis.font.bold, bold: chart.xAxis.titleFont.bold,
italic: chart.xAxis.font.italic, italic: chart.xAxis.titleFont.italic,
underline: chart.xAxis.font.underline underline: chart.xAxis.titleFont.underline
},
labelFont: {
name: chart.xAxis.labelFont.name,
size: chart.xAxis.labelFont.size,
color: chart.xAxis.labelFont.color,
bold: chart.xAxis.labelFont.bold,
italic: chart.xAxis.labelFont.italic,
underline: chart.xAxis.labelFont.underline
} }
}; };
_this.yAxis = { _this.yAxis = {
...@@ -94,13 +102,21 @@ function CChartData(bWordContext, chart) { ...@@ -94,13 +102,21 @@ function CChartData(bWordContext, chart) {
bDefaultTitle: chart.yAxis.bDefaultTitle, bDefaultTitle: chart.yAxis.bDefaultTitle,
bShow: chart.yAxis.bShow, bShow: chart.yAxis.bShow,
bGrid: chart.yAxis.bGrid, bGrid: chart.yAxis.bGrid,
font: { titleFont: {
name: chart.yAxis.font.name, name: chart.yAxis.titleFont.name,
size: chart.yAxis.font.size, size: chart.yAxis.titleFont.size,
color: chart.yAxis.font.color, color: chart.yAxis.titleFont.color,
bold: chart.yAxis.font.bold, bold: chart.yAxis.titleFont.bold,
italic: chart.yAxis.font.italic, italic: chart.yAxis.titleFont.italic,
underline: chart.yAxis.font.underline underline: chart.yAxis.titleFont.underline
},
labelFont: {
name: chart.xAxis.labelFont.name,
size: chart.xAxis.labelFont.size,
color: chart.xAxis.labelFont.color,
bold: chart.xAxis.labelFont.bold,
italic: chart.xAxis.labelFont.italic,
underline: chart.xAxis.labelFont.underline
} }
}; };
_this.legend = { _this.legend = {
...@@ -141,7 +157,15 @@ function CChartData(bWordContext, chart) { ...@@ -141,7 +157,15 @@ function CChartData(bWordContext, chart) {
bDefaultTitle: false, bDefaultTitle: false,
bShow: true, bShow: true,
bGrid: true, bGrid: true,
font: { titleFont: {
name: "Arial",
size: 12,
color: "#000000",
bold: 0,
italic: 0,
underline: 0
},
labelFont: {
name: "Arial", name: "Arial",
size: 12, size: 12,
color: "#000000", color: "#000000",
...@@ -155,7 +179,15 @@ function CChartData(bWordContext, chart) { ...@@ -155,7 +179,15 @@ function CChartData(bWordContext, chart) {
bDefaultTitle: false, bDefaultTitle: false,
bShow: true, bShow: true,
bGrid: true, bGrid: true,
font: { titleFont: {
name: "Arial",
size: 12,
color: "#000000",
bold: 0,
italic: 0,
underline: 0
},
labelFont: {
name: "Arial", name: "Arial",
size: 12, size: 12,
color: "#000000", color: "#000000",
...@@ -275,13 +307,21 @@ function CChartData(bWordContext, chart) { ...@@ -275,13 +307,21 @@ function CChartData(bWordContext, chart) {
chart["xAxis"]["bShow"] = _this.xAxis.bShow; chart["xAxis"]["bShow"] = _this.xAxis.bShow;
chart["xAxis"]["bGrid"] = _this.xAxis.bGrid; chart["xAxis"]["bGrid"] = _this.xAxis.bGrid;
chart["xAxis"]["font"] = {}; chart["xAxis"]["titleFont"] = {};
chart["xAxis"]["font"]["name"] = _this.xAxis.font.name; chart["xAxis"]["titleFont"]["name"] = _this.xAxis.titleFont.name;
chart["xAxis"]["font"]["size"] = _this.xAxis.font.size; chart["xAxis"]["titleFont"]["size"] = _this.xAxis.titleFont.size;
chart["xAxis"]["font"]["color"] = _this.xAxis.font.color; chart["xAxis"]["titleFont"]["color"] = _this.xAxis.titleFont.color;
chart["xAxis"]["font"]["bold"] = _this.xAxis.font.bold; chart["xAxis"]["titleFont"]["bold"] = _this.xAxis.titleFont.bold;
chart["xAxis"]["font"]["italic"] = _this.xAxis.font.italic; chart["xAxis"]["titleFont"]["italic"] = _this.xAxis.titleFont.italic;
chart["xAxis"]["font"]["underline"] = _this.xAxis.font.underline; chart["xAxis"]["titleFont"]["underline"] = _this.xAxis.titleFont.underline;
chart["xAxis"]["labelFont"] = {};
chart["xAxis"]["labelFont"]["name"] = _this.xAxis.labelFont.name;
chart["xAxis"]["labelFont"]["size"] = _this.xAxis.labelFont.size;
chart["xAxis"]["labelFont"]["color"] = _this.xAxis.labelFont.color;
chart["xAxis"]["labelFont"]["bold"] = _this.xAxis.labelFont.bold;
chart["xAxis"]["labelFont"]["italic"] = _this.xAxis.labelFont.italic;
chart["xAxis"]["labelFont"]["underline"] = _this.xAxis.labelFont.underline;
// Axis Y // Axis Y
chart["yAxis"] = {}; chart["yAxis"] = {};
...@@ -290,13 +330,21 @@ function CChartData(bWordContext, chart) { ...@@ -290,13 +330,21 @@ function CChartData(bWordContext, chart) {
chart["yAxis"]["bShow"] = _this.yAxis.bShow; chart["yAxis"]["bShow"] = _this.yAxis.bShow;
chart["yAxis"]["bGrid"] = _this.yAxis.bGrid; chart["yAxis"]["bGrid"] = _this.yAxis.bGrid;
chart["yAxis"]["font"] = {}; chart["yAxis"]["titleFont"] = {};
chart["yAxis"]["font"]["name"] = _this.yAxis.font.name; chart["yAxis"]["titleFont"]["name"] = _this.yAxis.titleFont.name;
chart["yAxis"]["font"]["size"] = _this.yAxis.font.size; chart["yAxis"]["titleFont"]["size"] = _this.yAxis.titleFont.size;
chart["yAxis"]["font"]["color"] = _this.yAxis.font.color; chart["yAxis"]["titleFont"]["color"] = _this.yAxis.titleFont.color;
chart["yAxis"]["font"]["bold"] = _this.yAxis.font.bold; chart["yAxis"]["titleFont"]["bold"] = _this.yAxis.titleFont.bold;
chart["yAxis"]["font"]["italic"] = _this.yAxis.font.italic; chart["yAxis"]["titleFont"]["italic"] = _this.yAxis.titleFont.italic;
chart["yAxis"]["font"]["underline"] = _this.yAxis.font.underline; chart["yAxis"]["titleFont"]["underline"] = _this.yAxis.titleFont.underline;
chart["yAxis"]["labelFont"] = {};
chart["yAxis"]["labelFont"]["name"] = _this.yAxis.labelFont.name;
chart["yAxis"]["labelFont"]["size"] = _this.yAxis.labelFont.size;
chart["yAxis"]["labelFont"]["color"] = _this.yAxis.labelFont.color;
chart["yAxis"]["labelFont"]["bold"] = _this.yAxis.labelFont.bold;
chart["yAxis"]["labelFont"]["italic"] = _this.yAxis.labelFont.italic;
chart["yAxis"]["labelFont"]["underline"] = _this.yAxis.labelFont.underline;
// Legeng // Legeng
chart["legend"] = {}; chart["legend"] = {};
...@@ -378,13 +426,21 @@ function CChartData(bWordContext, chart) { ...@@ -378,13 +426,21 @@ function CChartData(bWordContext, chart) {
_this.xAxis.bShow = chart["xAxis"]["bShow"]; _this.xAxis.bShow = chart["xAxis"]["bShow"];
_this.xAxis.bGrid = chart["xAxis"]["bGrid"]; _this.xAxis.bGrid = chart["xAxis"]["bGrid"];
_this.xAxis.font = {}; _this.xAxis.titleFont = {};
_this.xAxis.font.name = chart["xAxis"]["font"]["name"]; _this.xAxis.titleFont.name = chart["xAxis"]["titleFont"]["name"];
_this.xAxis.font.size = chart["xAxis"]["font"]["size"]; _this.xAxis.titleFont.size = chart["xAxis"]["titleFont"]["size"];
_this.xAxis.font.color = chart["xAxis"]["font"]["color"]; _this.xAxis.titleFont.color = chart["xAxis"]["titleFont"]["color"];
_this.xAxis.font.bold = chart["xAxis"]["font"]["bold"]; _this.xAxis.titleFont.bold = chart["xAxis"]["titleFont"]["bold"];
_this.xAxis.font.italic = chart["xAxis"]["font"]["italic"]; _this.xAxis.titleFont.italic = chart["xAxis"]["titleFont"]["italic"];
_this.xAxis.font.underline = chart["xAxis"]["font"]["underline"]; _this.xAxis.titleFont.underline = chart["xAxis"]["titleFont"]["underline"];
_this.xAxis.labelFont = {};
_this.xAxis.labelFont.name = chart["xAxis"]["labelFont"]["name"];
_this.xAxis.labelFont.size = chart["xAxis"]["labelFont"]["size"];
_this.xAxis.labelFont.color = chart["xAxis"]["labelFont"]["color"];
_this.xAxis.labelFont.bold = chart["xAxis"]["labelFont"]["bold"];
_this.xAxis.labelFont.italic = chart["xAxis"]["labelFont"]["italic"];
_this.xAxis.labelFont.underline = chart["xAxis"]["labelFont"]["underline"];
// Axis Y // Axis Y
_this.yAxis.title = chart["yAxis"]["title"]; _this.yAxis.title = chart["yAxis"]["title"];
...@@ -392,13 +448,21 @@ function CChartData(bWordContext, chart) { ...@@ -392,13 +448,21 @@ function CChartData(bWordContext, chart) {
_this.yAxis.bShow = chart["yAxis"]["bShow"]; _this.yAxis.bShow = chart["yAxis"]["bShow"];
_this.yAxis.bGrid = chart["yAxis"]["bGrid"]; _this.yAxis.bGrid = chart["yAxis"]["bGrid"];
_this.yAxis.font = {}; _this.yAxis.titleFont = {};
_this.yAxis.font.name = chart["yAxis"]["font"]["name"]; _this.yAxis.titleFont.name = chart["yAxis"]["titleFont"]["name"];
_this.yAxis.font.size = chart["yAxis"]["font"]["size"]; _this.yAxis.titleFont.size = chart["yAxis"]["titleFont"]["size"];
_this.yAxis.font.color = chart["yAxis"]["font"]["color"]; _this.yAxis.titleFont.color = chart["yAxis"]["titleFont"]["color"];
_this.yAxis.font.bold = chart["yAxis"]["font"]["bold"]; _this.yAxis.titleFont.bold = chart["yAxis"]["titleFont"]["bold"];
_this.yAxis.font.italic = chart["yAxis"]["font"]["italic"]; _this.yAxis.titleFont.italic = chart["yAxis"]["titleFont"]["italic"];
_this.yAxis.font.underline = chart["yAxis"]["font"]["underline"]; _this.yAxis.titleFont.underline = chart["yAxis"]["titleFont"]["underline"];
_this.yAxis.labelFont = {};
_this.yAxis.labelFont.name = chart["yAxis"]["labelFont"]["name"];
_this.yAxis.labelFont.size = chart["yAxis"]["labelFont"]["size"];
_this.yAxis.labelFont.color = chart["yAxis"]["labelFont"]["color"];
_this.yAxis.labelFont.bold = chart["yAxis"]["labelFont"]["bold"];
_this.yAxis.labelFont.italic = chart["yAxis"]["labelFont"]["italic"];
_this.yAxis.labelFont.underline = chart["yAxis"]["labelFont"]["underline"];
// Legend // Legend
_this.legend.position = chart["legend"]["position"]; _this.legend.position = chart["legend"]["position"];
...@@ -480,13 +544,21 @@ function CChartData(bWordContext, chart) { ...@@ -480,13 +544,21 @@ function CChartData(bWordContext, chart) {
_this.xAxis.bShow = object.chart.xAxis.bShow; _this.xAxis.bShow = object.chart.xAxis.bShow;
_this.xAxis.bGrid = object.chart.xAxis.bGrid; _this.xAxis.bGrid = object.chart.xAxis.bGrid;
_this.xAxis.font = {}; _this.xAxis.titleFont = {};
_this.xAxis.font.name = object.chart.xAxis.font.name; _this.xAxis.titleFont.name = object.chart.xAxis.titleFont.name;
_this.xAxis.font.size = object.chart.xAxis.font.size; _this.xAxis.titleFont.size = object.chart.xAxis.titleFont.size;
_this.xAxis.font.color = object.chart.xAxis.font.color; _this.xAxis.titleFont.color = object.chart.xAxis.titleFont.color;
_this.xAxis.font.bold = object.chart.xAxis.font.bold; _this.xAxis.titleFont.bold = object.chart.xAxis.titleFont.bold;
_this.xAxis.font.italic = object.chart.xAxis.font.italic; _this.xAxis.titleFont.italic = object.chart.xAxis.titleFont.italic;
_this.xAxis.font.underline = object.chart.xAxis.font.underline; _this.xAxis.titleFont.underline = object.chart.xAxis.titleFont.underline;
_this.xAxis.labelFont = {};
_this.xAxis.labelFont.name = object.chart.xAxis.labelFont.name;
_this.xAxis.labelFont.size = object.chart.xAxis.labelFont.size;
_this.xAxis.labelFont.color = object.chart.xAxis.labelFont.color;
_this.xAxis.labelFont.bold = object.chart.xAxis.labelFont.bold;
_this.xAxis.labelFont.italic = object.chart.xAxis.labelFont.italic;
_this.xAxis.labelFont.underline = object.chart.xAxis.labelFont.underline;
// Axis Y // Axis Y
_this.yAxis.title = object.chart.yAxis.title; _this.yAxis.title = object.chart.yAxis.title;
...@@ -494,13 +566,21 @@ function CChartData(bWordContext, chart) { ...@@ -494,13 +566,21 @@ function CChartData(bWordContext, chart) {
_this.yAxis.bShow = object.chart.yAxis.bShow; _this.yAxis.bShow = object.chart.yAxis.bShow;
_this.yAxis.bGrid = object.chart.yAxis.bGrid; _this.yAxis.bGrid = object.chart.yAxis.bGrid;
_this.yAxis.font = {}; _this.yAxis.titleFont = {};
_this.yAxis.font.name = object.chart.yAxis.font.name; _this.yAxis.titleFont.name = object.chart.yAxis.titleFont.name;
_this.yAxis.font.size = object.chart.yAxis.font.size; _this.yAxis.titleFont.size = object.chart.yAxis.titleFont.size;
_this.yAxis.font.color = object.chart.yAxis.font.color; _this.yAxis.titleFont.color = object.chart.yAxis.titleFont.color;
_this.yAxis.font.bold = object.chart.yAxis.font.bold; _this.yAxis.titleFont.bold = object.chart.yAxis.titleFont.bold;
_this.yAxis.font.italic = object.chart.yAxis.font.italic; _this.yAxis.titleFont.italic = object.chart.yAxis.titleFont.italic;
_this.yAxis.font.underline = object.chart.yAxis.font.underline; _this.yAxis.titleFont.underline = object.chart.yAxis.titleFont.underline;
_this.yAxis.labelFont = {};
_this.yAxis.labelFont.name = object.chart.yAxis.labelFont.name;
_this.yAxis.labelFont.size = object.chart.yAxis.labelFont.size;
_this.yAxis.labelFont.color = object.chart.yAxis.labelFont.color;
_this.yAxis.labelFont.bold = object.chart.yAxis.labelFont.bold;
_this.yAxis.labelFont.italic = object.chart.yAxis.labelFont.italic;
_this.yAxis.labelFont.underline = object.chart.yAxis.labelFont.underline;
// Legend // Legend
_this.legend.position = object.chart.legend.position; _this.legend.position = object.chart.legend.position;
...@@ -579,12 +659,19 @@ function CChartData(bWordContext, chart) { ...@@ -579,12 +659,19 @@ function CChartData(bWordContext, chart) {
Writer.WriteBool( _this.xAxis.bShow ); Writer.WriteBool( _this.xAxis.bShow );
Writer.WriteBool( _this.xAxis.bGrid ); Writer.WriteBool( _this.xAxis.bGrid );
Writer.WriteString2( _this.xAxis.font.name ); Writer.WriteString2( _this.xAxis.titleFont.name );
Writer.WriteLong( _this.xAxis.font.size ); Writer.WriteLong( _this.xAxis.titleFont.size );
Writer.WriteString2( _this.xAxis.font.color ); Writer.WriteString2( _this.xAxis.titleFont.color );
Writer.WriteLong( _this.xAxis.font.bold ); Writer.WriteLong( _this.xAxis.titleFont.bold );
Writer.WriteLong( _this.xAxis.font.italic ); Writer.WriteLong( _this.xAxis.titleFont.italic );
Writer.WriteLong( _this.xAxis.font.underline ); Writer.WriteLong( _this.xAxis.titleFont.underline );
Writer.WriteString2( _this.xAxis.labelFont.name );
Writer.WriteLong( _this.xAxis.labelFont.size );
Writer.WriteString2( _this.xAxis.labelFont.color );
Writer.WriteLong( _this.xAxis.labelFont.bold );
Writer.WriteLong( _this.xAxis.labelFont.italic );
Writer.WriteLong( _this.xAxis.labelFont.underline );
// Axis Y // Axis Y
Writer.WriteString2( _this.yAxis.title ); Writer.WriteString2( _this.yAxis.title );
...@@ -592,12 +679,19 @@ function CChartData(bWordContext, chart) { ...@@ -592,12 +679,19 @@ function CChartData(bWordContext, chart) {
Writer.WriteBool( _this.yAxis.bShow ); Writer.WriteBool( _this.yAxis.bShow );
Writer.WriteBool( _this.yAxis.bGrid ); Writer.WriteBool( _this.yAxis.bGrid );
Writer.WriteString2( _this.yAxis.font.name ); Writer.WriteString2( _this.yAxis.titleFont.name );
Writer.WriteLong( _this.yAxis.font.size ); Writer.WriteLong( _this.yAxis.titleFont.size );
Writer.WriteString2( _this.yAxis.font.color ); Writer.WriteString2( _this.yAxis.titleFont.color );
Writer.WriteLong( _this.yAxis.font.bold ); Writer.WriteLong( _this.yAxis.titleFont.bold );
Writer.WriteLong( _this.yAxis.font.italic ); Writer.WriteLong( _this.yAxis.titleFont.italic );
Writer.WriteLong( _this.yAxis.font.underline ); Writer.WriteLong( _this.yAxis.titleFont.underline );
Writer.WriteString2( _this.yAxis.labelFont.name );
Writer.WriteLong( _this.yAxis.labelFont.size );
Writer.WriteString2( _this.yAxis.labelFont.color );
Writer.WriteLong( _this.yAxis.labelFont.bold );
Writer.WriteLong( _this.yAxis.labelFont.italic );
Writer.WriteLong( _this.yAxis.labelFont.underline );
// Legend // Legend
Writer.WriteString2( _this.legend.position ); Writer.WriteString2( _this.legend.position );
...@@ -671,12 +765,19 @@ function CChartData(bWordContext, chart) { ...@@ -671,12 +765,19 @@ function CChartData(bWordContext, chart) {
_this.xAxis.bShow = Reader.GetBool(); _this.xAxis.bShow = Reader.GetBool();
_this.xAxis.bGrid = Reader.GetBool(); _this.xAxis.bGrid = Reader.GetBool();
_this.xAxis.font.name = Reader.GetString2(); _this.xAxis.titleFont.name = Reader.GetString2();
_this.xAxis.font.size = Reader.GetLong(); _this.xAxis.titleFont.size = Reader.GetLong();
_this.xAxis.font.color = Reader.GetString2(); _this.xAxis.titleFont.color = Reader.GetString2();
_this.xAxis.font.bold = Reader.GetLong(); _this.xAxis.titleFont.bold = Reader.GetLong();
_this.xAxis.font.italic = Reader.GetLong(); _this.xAxis.titleFont.italic = Reader.GetLong();
_this.xAxis.font.underline = Reader.GetLong(); _this.xAxis.titleFont.underline = Reader.GetLong();
_this.xAxis.labelFont.name = Reader.GetString2();
_this.xAxis.labelFont.size = Reader.GetLong();
_this.xAxis.labelFont.color = Reader.GetString2();
_this.xAxis.labelFont.bold = Reader.GetLong();
_this.xAxis.labelFont.italic = Reader.GetLong();
_this.xAxis.labelFont.underline = Reader.GetLong();
// Axis Y // Axis Y
_this.yAxis.title = Reader.GetString2(); _this.yAxis.title = Reader.GetString2();
...@@ -684,12 +785,19 @@ function CChartData(bWordContext, chart) { ...@@ -684,12 +785,19 @@ function CChartData(bWordContext, chart) {
_this.yAxis.bShow = Reader.GetBool(); _this.yAxis.bShow = Reader.GetBool();
_this.yAxis.bGrid = Reader.GetBool(); _this.yAxis.bGrid = Reader.GetBool();
_this.yAxis.font.name = Reader.GetString2(); _this.yAxis.titleFont.name = Reader.GetString2();
_this.yAxis.font.size = Reader.GetLong(); _this.yAxis.titleFont.size = Reader.GetLong();
_this.yAxis.font.color = Reader.GetString2(); _this.yAxis.titleFont.color = Reader.GetString2();
_this.yAxis.font.bold = Reader.GetLong(); _this.yAxis.titleFont.bold = Reader.GetLong();
_this.yAxis.font.italic = Reader.GetLong(); _this.yAxis.titleFont.italic = Reader.GetLong();
_this.yAxis.font.underline = Reader.GetLong(); _this.yAxis.titleFont.underline = Reader.GetLong();
_this.yAxis.labelFont.name = Reader.GetString2();
_this.yAxis.labelFont.size = Reader.GetLong();
_this.yAxis.labelFont.color = Reader.GetString2();
_this.yAxis.labelFont.bold = Reader.GetLong();
_this.yAxis.labelFont.italic = Reader.GetLong();
_this.yAxis.labelFont.underline = Reader.GetLong();
// Legend // Legend
_this.legend.position = Reader.GetString2(); _this.legend.position = Reader.GetString2();
...@@ -891,13 +999,69 @@ asc_CChart.prototype = { ...@@ -891,13 +999,69 @@ asc_CChart.prototype = {
_t.series = []; _t.series = [];
var nameIndex = 1; var nameIndex = 1;
function isNumber(n) {
return !isNaN(parseFloat(n)) && isFinite(n);
}
function getNumCache(c1, c2, r1, r2) {
// (c1 == c2) || (r1 == r2)
var cache = [];
if ( c1 == c2 ) { // vertical cache
for (var row = r1; row <= r2; row++) {
var cell = _t.range.intervalObject.worksheet.getCell( new CellAddress(row, c1, 0) );
cache.push(cell.getValue());
}
}
else /*r1 == r2*/ { // horizontal cache
for (var col = c1; col <= c2; col++) {
var cell = _t.range.intervalObject.worksheet.getCell( new CellAddress(r1, col, 0) );
cache.push(cell.getValue());
}
}
return cache;
}
function parseSeriesHeaders() {
var cntLeft = 0, cntTop = 0;
var headers = { bLeft: false, bTop: false };
/*for (var i = bbox.r1; i <= bbox.r2; i++) {
var cell = _t.range.intervalObject.worksheet.getCell( new CellAddress(i, bbox.c1, 0) );
var value = cell.getValue();
if ( !isNumber(value) )
cntLeft++;
}
if ( cntLeft >= (bbox.r2 - bbox.r1) )
headers.bLeft = true;
for (var i = bbox.c1; i <= bbox.c2; i++) {
var cell = _t.range.intervalObject.worksheet.getCell( new CellAddress(bbox.r1, i, 0) );
var value = cell.getValue();
if ( !isNumber(value) )
cntTop++;
}
if ( cntTop >= (bbox.c2 - bbox.c1) )
headers.bTop = true;*/
return headers;
}
var parsedHeaders = parseSeriesHeaders();
if (_t.range.rows) { if (_t.range.rows) {
for (var i = bbox.r1; i <= bbox.r2; i++) { for (var i = bbox.r1 + (parsedHeaders.bTop ? 1 : 0); i <= bbox.r2; i++) {
var ser = new window["Asc"]["asc_CChartSeria"];
var startCell = new CellAddress(i, bbox.c1, 0); var ser = new asc_CChartSeria();
var startCell = new CellAddress(i, bbox.c1 + (parsedHeaders.bLeft ? 1 : 0), 0);
var endCell = new CellAddress(i, bbox.c2, 0); var endCell = new CellAddress(i, bbox.c2, 0);
// Val
if (startCell && endCell) { if (startCell && endCell) {
if (startCell.getID() == endCell.getID()) if (startCell.getID() == endCell.getID())
ser.Val.Formula = startCell.getID(); ser.Val.Formula = startCell.getID();
...@@ -906,18 +1070,33 @@ asc_CChart.prototype = { ...@@ -906,18 +1070,33 @@ asc_CChart.prototype = {
+ "!" + startCell.getID() + ":" + endCell.getID(); + "!" + startCell.getID() + ":" + endCell.getID();
} }
} }
ser.Tx = "Series" + nameIndex; ser.Val.NumCache = getNumCache(bbox.c1 + (parsedHeaders.bLeft ? 1 : 0), bbox.c2, i, i);
// xVal
if ( parsedHeaders.bTop ) {
var start = new CellAddress(bbox.r1, bbox.c1 + (parsedHeaders.bLeft ? 1 : 0), 0);
var end = new CellAddress(bbox.r1, bbox.c2, 0);
ser.xVal.Formula = ( !rx_test_ws_name.test(_t.range.intervalObject.worksheet.sName) ? "'" +_t.range.intervalObject.worksheet.sName+ "'" : _t.range.intervalObject.worksheet.sName )
+ "!" + start.getID() + ":" + end.getID();
ser.xVal.NumCache = getNumCache( bbox.c1 + (parsedHeaders.bLeft ? 1 : 0), bbox.c2, bbox.r1, bbox.r1 );
}
var seriaName = parsedHeaders.bLeft ? ( _t.range.intervalObject.worksheet.getCell(new CellAddress(i, bbox.c1, 0)).getValue() ) : ("Series" + nameIndex);
ser.Tx = seriaName;
_t.series.push(ser); _t.series.push(ser);
nameIndex++; nameIndex++;
} }
} }
else { else {
for (var i = bbox.c1; i <= bbox.c2; i++) { for (var i = bbox.c1 + (parsedHeaders.bLeft ? 1 : 0); i <= bbox.c2; i++) {
var ser = new window["Asc"]["asc_CChartSeria"];
var startCell = new CellAddress(bbox.r1, i, 0); var ser = new asc_CChartSeria();
var startCell = new CellAddress(bbox.r1 + (parsedHeaders.bTop ? 1 : 0), i, 0);
var endCell = new CellAddress(bbox.r2, i, 0); var endCell = new CellAddress(bbox.r2, i, 0);
// Val
if (startCell && endCell) { if (startCell && endCell) {
if (startCell.getID() == endCell.getID()) if (startCell.getID() == endCell.getID())
ser.Val.Formula = startCell.getID(); ser.Val.Formula = startCell.getID();
...@@ -926,7 +1105,21 @@ asc_CChart.prototype = { ...@@ -926,7 +1105,21 @@ asc_CChart.prototype = {
+ "!" + startCell.getID() + ":" + endCell.getID(); + "!" + startCell.getID() + ":" + endCell.getID();
} }
} }
ser.Tx = "Series" + nameIndex; ser.Val.NumCache = getNumCache(i, i, bbox.r1 + (parsedHeaders.bTop ? 1 : 0), bbox.r2);
// xVal
if ( parsedHeaders.bLeft ) {
var start = new CellAddress(bbox.r1 + (parsedHeaders.bTop ? 1 : 0), bbox.c1, 0);
var end = new CellAddress(bbox.r2, bbox.c1, 0);
ser.xVal.Formula = ( !rx_test_ws_name.test(_t.range.intervalObject.worksheet.sName) ? "'" +_t.range.intervalObject.worksheet.sName+ "'" : _t.range.intervalObject.worksheet.sName )
+ "!" + start.getID() + ":" + end.getID();
ser.xVal.NumCache = getNumCache( bbox.c1, bbox.c1, bbox.r1 + (parsedHeaders.bTop ? 1 : 0), bbox.r2 );
}
var seriaName = parsedHeaders.bTop ? ( _t.range.intervalObject.worksheet.getCell(new CellAddress(bbox.r1, i, 0)).getValue() ) : ("Series" + nameIndex);
ser.Tx = seriaName;
_t.series.push(ser); _t.series.push(ser);
nameIndex++; nameIndex++;
} }
...@@ -1110,6 +1303,9 @@ function asc_CChartHeader(object) { ...@@ -1110,6 +1303,9 @@ function asc_CChartHeader(object) {
this.subTitle = bCopy ? object.subTitle : ""; this.subTitle = bCopy ? object.subTitle : "";
this.bDefaultTitle = bCopy ? object.bDefaultTitle : false; this.bDefaultTitle = bCopy ? object.bDefaultTitle : false;
this.font = bCopy ? new asc_CChartFont(object.font) : new asc_CChartFont(); this.font = bCopy ? new asc_CChartFont(object.font) : new asc_CChartFont();
if ( !bCopy ) {
this.font.asc_setSize(14);
}
this.Properties = { this.Properties = {
title: 0, title: 0,
...@@ -1190,14 +1386,17 @@ function asc_CChartAxisX(object) { ...@@ -1190,14 +1386,17 @@ function asc_CChartAxisX(object) {
this.bDefaultTitle = bCopy ? object.bDefaultTitle : false; this.bDefaultTitle = bCopy ? object.bDefaultTitle : false;
this.bShow = bCopy ? object.bShow : true; this.bShow = bCopy ? object.bShow : true;
this.bGrid = bCopy ? object.bGrid : true; this.bGrid = bCopy ? object.bGrid : true;
this.font = bCopy ? new asc_CChartFont(object.font) : new asc_CChartFont();
this.titleFont = bCopy ? new asc_CChartFont(object.titleFont) : new asc_CChartFont();
this.labelFont = bCopy ? new asc_CChartFont(object.labelFont) : new asc_CChartFont();
this.Properties = { this.Properties = {
title: 0, title: 0,
bDefaultTitle: 1, bDefaultTitle: 1,
bShow: 2, bShow: 2,
bGrid: 3, bGrid: 3,
font: 4 titleFont: 4,
labelFont: 5
}; };
} }
...@@ -1214,8 +1413,11 @@ asc_CChartAxisX.prototype = { ...@@ -1214,8 +1413,11 @@ asc_CChartAxisX.prototype = {
asc_getGridFlag: function() { return this.bGrid; }, asc_getGridFlag: function() { return this.bGrid; },
asc_setGridFlag: function(gridFlag) { this.bGrid = gridFlag; }, asc_setGridFlag: function(gridFlag) { this.bGrid = gridFlag; },
asc_getFont: function() { return this.font; }, asc_getTitleFont: function() { return this.titleFont; },
asc_setFont: function(fontObj) { this.font = fontObj; }, asc_setTitleFont: function(fontObj) { this.titleFont = fontObj; },
asc_getLabelFont: function() { return this.labelFont; },
asc_setLabelFont: function(fontObj) { this.labelFont = fontObj; },
// For collaborative editing // For collaborative editing
getType: function() { getType: function() {
...@@ -1232,7 +1434,8 @@ asc_CChartAxisX.prototype = { ...@@ -1232,7 +1434,8 @@ asc_CChartAxisX.prototype = {
case this.Properties.bDefaultTitle: return this.bDefaultTitle; break; case this.Properties.bDefaultTitle: return this.bDefaultTitle; break;
case this.Properties.bShow: return this.bShow; break; case this.Properties.bShow: return this.bShow; break;
case this.Properties.bGrid: return this.bGrid; break; case this.Properties.bGrid: return this.bGrid; break;
case this.Properties.font: return this.font; break; case this.Properties.titleFont: return this.titleFont; break;
case this.Properties.labelFont: return this.labelFont; break;
} }
}, },
...@@ -1242,7 +1445,8 @@ asc_CChartAxisX.prototype = { ...@@ -1242,7 +1445,8 @@ asc_CChartAxisX.prototype = {
case this.Properties.bDefaultTitle: this.bDefaultTitle = value; break; case this.Properties.bDefaultTitle: this.bDefaultTitle = value; break;
case this.Properties.bShow: this.bShow = value; break; case this.Properties.bShow: this.bShow = value; break;
case this.Properties.bGrid: this.bGrid = value; break; case this.Properties.bGrid: this.bGrid = value; break;
case this.Properties.font: this.font = value; break; case this.Properties.titleFont: this.titleFont = value; break;
case this.Properties.labelFont: this.labelFont = value; break;
} }
} }
} }
...@@ -1264,8 +1468,11 @@ prot["asc_setShowFlag"] = prot.asc_setShowFlag; ...@@ -1264,8 +1468,11 @@ prot["asc_setShowFlag"] = prot.asc_setShowFlag;
prot["asc_getGridFlag"] = prot.asc_getGridFlag; prot["asc_getGridFlag"] = prot.asc_getGridFlag;
prot["asc_setGridFlag"] = prot.asc_setGridFlag; prot["asc_setGridFlag"] = prot.asc_setGridFlag;
prot["asc_getFont"] = prot.asc_getFont; prot["asc_getTitleFont"] = prot.asc_getTitleFont;
prot["asc_setFont"] = prot.asc_setFont; prot["asc_setTitleFont"] = prot.asc_setTitleFont;
prot["asc_getLabelFont"] = prot.asc_getLabelFont;
prot["asc_setLabelFont"] = prot.asc_setLabelFont;
//} //}
//----------------------------------------------------------------------------------- //-----------------------------------------------------------------------------------
...@@ -1280,14 +1487,17 @@ function asc_CChartAxisY(object) { ...@@ -1280,14 +1487,17 @@ function asc_CChartAxisY(object) {
this.bDefaultTitle = bCopy ? object.bDefaultTitle : false; this.bDefaultTitle = bCopy ? object.bDefaultTitle : false;
this.bShow = bCopy ? object.bShow : true; this.bShow = bCopy ? object.bShow : true;
this.bGrid = bCopy ? object.bGrid : true; this.bGrid = bCopy ? object.bGrid : true;
this.font = bCopy ? new asc_CChartFont(object.font) : new asc_CChartFont();
this.titleFont = bCopy ? new asc_CChartFont(object.titleFont) : new asc_CChartFont();
this.labelFont = bCopy ? new asc_CChartFont(object.labelFont) : new asc_CChartFont();
this.Properties = { this.Properties = {
title: 0, title: 0,
bDefaultTitle: 1, bDefaultTitle: 1,
bShow: 2, bShow: 2,
bGrid: 3, bGrid: 3,
font: 4 titleFont: 4,
labelFont: 5
}; };
} }
...@@ -1304,8 +1514,11 @@ asc_CChartAxisY.prototype = { ...@@ -1304,8 +1514,11 @@ asc_CChartAxisY.prototype = {
asc_getGridFlag: function() { return this.bGrid; }, asc_getGridFlag: function() { return this.bGrid; },
asc_setGridFlag: function(gridFlag) { this.bGrid = gridFlag; }, asc_setGridFlag: function(gridFlag) { this.bGrid = gridFlag; },
asc_getFont: function() { return this.font; }, asc_getTitleFont: function() { return this.titleFont; },
asc_setFont: function(fontObj) { this.font = fontObj; }, asc_setTitleFont: function(fontObj) { this.titleFont = fontObj; },
asc_getLabelFont: function() { return this.labelFont; },
asc_setLabelFont: function(fontObj) { this.labelFont = fontObj; },
// For collaborative editing // For collaborative editing
getType: function() { getType: function() {
...@@ -1322,7 +1535,8 @@ asc_CChartAxisY.prototype = { ...@@ -1322,7 +1535,8 @@ asc_CChartAxisY.prototype = {
case this.Properties.bDefaultTitle: return this.bDefaultTitle; break; case this.Properties.bDefaultTitle: return this.bDefaultTitle; break;
case this.Properties.bShow: return this.bShow; break; case this.Properties.bShow: return this.bShow; break;
case this.Properties.bGrid: return this.bGrid; break; case this.Properties.bGrid: return this.bGrid; break;
case this.Properties.font: return this.font; break; case this.Properties.titleFont: return this.titleFont; break;
case this.Properties.labelFont: return this.labelFont; break;
} }
}, },
...@@ -1332,7 +1546,8 @@ asc_CChartAxisY.prototype = { ...@@ -1332,7 +1546,8 @@ asc_CChartAxisY.prototype = {
case this.Properties.bDefaultTitle: this.bDefaultTitle = value; break; case this.Properties.bDefaultTitle: this.bDefaultTitle = value; break;
case this.Properties.bShow: this.bShow = value; break; case this.Properties.bShow: this.bShow = value; break;
case this.Properties.bGrid: this.bGrid = value; break; case this.Properties.bGrid: this.bGrid = value; break;
case this.Properties.font: this.font = value; break; case this.Properties.titleFont: this.titleFont = value; break;
case this.Properties.labelFont: this.labelFont = value; break;
} }
} }
} }
...@@ -1354,8 +1569,11 @@ prot["asc_setShowFlag"] = prot.asc_setShowFlag; ...@@ -1354,8 +1569,11 @@ prot["asc_setShowFlag"] = prot.asc_setShowFlag;
prot["asc_getGridFlag"] = prot.asc_getGridFlag; prot["asc_getGridFlag"] = prot.asc_getGridFlag;
prot["asc_setGridFlag"] = prot.asc_setGridFlag; prot["asc_setGridFlag"] = prot.asc_setGridFlag;
prot["asc_getFont"] = prot.asc_getFont; prot["asc_getTitleFont"] = prot.asc_getTitleFont;
prot["asc_setFont"] = prot.asc_setFont; prot["asc_setTitleFont"] = prot.asc_setTitleFont;
prot["asc_getLabelFont"] = prot.asc_getLabelFont;
prot["asc_setLabelFont"] = prot.asc_setLabelFont;
//} //}
//----------------------------------------------------------------------------------- //-----------------------------------------------------------------------------------
...@@ -2001,10 +2219,11 @@ function DrawingObjects() { ...@@ -2001,10 +2219,11 @@ function DrawingObjects() {
worksheet.expandRowsOnScroll(true); worksheet.expandRowsOnScroll(true);
} }
if ( obj.isChart() && bUpdateCharts ) { if ( obj.isChart() && (obj.flags.redrawChart || bUpdateCharts) ) {
if ( !obj.chart.range.intervalObject ) if ( !obj.chart.range.intervalObject )
_this.intervalToIntervalObject(obj.chart); _this.intervalToIntervalObject(obj.chart);
obj.chart.rebuildSeries();
var chartBase64 = chartRender.insertChart(obj.chart, null, obj.getWidthFromTo(), obj.getHeightFromTo()); var chartBase64 = chartRender.insertChart(obj.chart, null, obj.getWidthFromTo(), obj.getHeightFromTo());
if ( !chartBase64 ) if ( !chartBase64 )
continue; continue;
...@@ -2017,6 +2236,7 @@ function DrawingObjects() { ...@@ -2017,6 +2236,7 @@ function DrawingObjects() {
} }
obj.image.src = chartBase64; obj.image.src = chartBase64;
obj.flags.redrawChart = false;
continue; continue;
} }
...@@ -2208,7 +2428,8 @@ function DrawingObjects() { ...@@ -2208,7 +2428,8 @@ function DrawingObjects() {
anchorUpdated: false, anchorUpdated: false,
lockState: c_oAscObjectLockState.No, lockState: c_oAscObjectLockState.No,
currentCursor: null, currentCursor: null,
transactionState: c_oAscTransactionState.No transactionState: c_oAscTransactionState.No,
redrawChart: false
}; };
// Свойства // Свойства
...@@ -2609,6 +2830,7 @@ function DrawingObjects() { ...@@ -2609,6 +2830,7 @@ function DrawingObjects() {
copyObject.flags.currentCursor = obj.flags.currentCursor; copyObject.flags.currentCursor = obj.flags.currentCursor;
copyObject.flags.transactionState = obj.flags.transactionState; copyObject.flags.transactionState = obj.flags.transactionState;
copyObject.flags.redrawChart = obj.flags.redrawChart;
copyObject.imageUrl = obj.imageUrl; copyObject.imageUrl = obj.imageUrl;
...@@ -2870,6 +3092,7 @@ function DrawingObjects() { ...@@ -2870,6 +3092,7 @@ function DrawingObjects() {
var obj = _this.createDrawingObject(); var obj = _this.createDrawingObject();
obj.id = generateId(); obj.id = generateId();
obj.chart = chart; obj.chart = chart;
obj.flags.redrawChart = true;
// center // center
var chartLeft = options && options.left ? ptToPx(options.left) : (parseInt($("#ws-canvas").css('width')) / 2) - c_oAscChartDefines.defaultChartWidth / 2; var chartLeft = options && options.left ? ptToPx(options.left) : (parseInt($("#ws-canvas").css('width')) / 2) - c_oAscChartDefines.defaultChartWidth / 2;
...@@ -2915,10 +3138,7 @@ function DrawingObjects() { ...@@ -2915,10 +3138,7 @@ function DrawingObjects() {
History.Add(g_oUndoRedoDrawingObject, historyitem_DrawingObject_Add, worksheet.model.getId(), null, copyObject); History.Add(g_oUndoRedoDrawingObject, historyitem_DrawingObject_Add, worksheet.model.getId(), null, copyObject);
} }
if(options) _this.showDrawingObjects(false);
_this.showDrawingObjects(true, null/*printOptions*/, true/*bUpdateCharts*/);
else
_this.showDrawingObjects(true);
worksheet._trigger("reinitializeScroll"); worksheet._trigger("reinitializeScroll");
worksheet.autoFilters.drawAutoF(worksheet); worksheet.autoFilters.drawAutoF(worksheet);
...@@ -2978,7 +3198,8 @@ function DrawingObjects() { ...@@ -2978,7 +3198,8 @@ function DrawingObjects() {
_this.selectDrawingObject(index); _this.selectDrawingObject(index);
_this.selectDrawingObjectRange(index); _this.selectDrawingObjectRange(index);
_this.showDrawingObjects(false, null/*printOptions*/, true/*bUpdateCharts*/); obj.flags.redrawChart = true;
_this.showDrawingObjects(false);
} }
} }
...@@ -4151,7 +4372,6 @@ function DrawingObjects() { ...@@ -4151,7 +4372,6 @@ function DrawingObjects() {
obj.to.row = foundRow.row; obj.to.row = foundRow.row;
obj.to.rowOff = pxToMm(top + obj.size.height - worksheet.getCellTop(obj.to.row, 0)); obj.to.rowOff = pxToMm(top + obj.size.height - worksheet.getCellTop(obj.to.row, 0));
} }
//_this.showDrawingObjects(true, null, false, true);
} }
_this.checkCursorDrawingObject = function(x, y) { _this.checkCursorDrawingObject = function(x, y) {
...@@ -4426,7 +4646,6 @@ function DrawingObjects() { ...@@ -4426,7 +4646,6 @@ function DrawingObjects() {
worksheet._trigger("reinitializeScrollX"); worksheet._trigger("reinitializeScrollX");
foundCol = worksheet._findColUnderCursor(pxToPt(realLeftOffset + widthFromTo), true); foundCol = worksheet._findColUnderCursor(pxToPt(realLeftOffset + widthFromTo), true);
} }
obj.move.x = x; obj.move.x = x;
// выход за границу сверху // выход за границу сверху
...@@ -4457,6 +4676,9 @@ function DrawingObjects() { ...@@ -4457,6 +4676,9 @@ function DrawingObjects() {
obj.to.row = foundRow.row; obj.to.row = foundRow.row;
obj.to.rowOff = pxToMm(realTopOffset + heightFromTo - worksheet.getCellTop(obj.to.row, 0)); obj.to.rowOff = pxToMm(realTopOffset + heightFromTo - worksheet.getCellTop(obj.to.row, 0));
if ( obj.flags.currentCursor && (obj.flags.currentCursor != "move") )
obj.flags.redrawChart = true;
} }
} }
...@@ -4580,7 +4802,6 @@ function ImageLoader() { ...@@ -4580,7 +4802,6 @@ function ImageLoader() {
if ( !container[i].bReady ) if ( !container[i].bReady )
return false; return false;
} }
container = []; // remove cache
return true; return true;
} }
...@@ -4599,5 +4820,6 @@ function ImageLoader() { ...@@ -4599,5 +4820,6 @@ function ImageLoader() {
_this.removeReadyCallback = function(callback) { _this.removeReadyCallback = function(callback) {
readyCallback = null; readyCallback = null;
container = [];
} }
} }
\ No newline at end of file
Excel/view/WorksheetView.js
View file @ 520c3817
...@@ -3424,7 +3424,7 @@ ...@@ -3424,7 +3424,7 @@
t.overlayCtx.ctx.globalAlpha = 1; t.overlayCtx.ctx.globalAlpha = 1;
if (res) { if (res) {
// Все хорошо, мы залочили, теперь применяем // Все хорошо, мы залочили, теперь применяем
t.objectRender.showDrawingObjects(true, null, true); t.objectRender.showDrawingObjects(true, null, false);
} }
else { else {
// Не удалось, восстанавливаем состояние // Не удалось, восстанавливаем состояние
...@@ -3468,6 +3468,8 @@ ...@@ -3468,6 +3468,8 @@
} }
else else
t.objectRender.clearUndoRedoDrawingObject(); t.objectRender.clearUndoRedoDrawingObject();
t.overlayCtx.ctx.globalAlpha = 1;
}, },
......
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