Skip to content

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

Сделана поддержка шрифтов для диаграмм. 

***Необходимы доработки в релизном меню:
- Добавлен класс asc_CChartHeader(вместо chart.title и т.д)
- Проверка валидности диапазона диаграммы теперь через api.asc_checkChartInterval

git-svn-id: svn://192.168.3.15/activex/AVS/Sources/TeamlabOffice/trunk/OfficeWeb@47246 954022d7-b5bf-4e40-9824-e11837661b57
parent 7d4eb966
Show whitespace changes
Inline Side-by-side
Showing with 1184 additions and 873 deletions
Common/Charts/DrawingObjects.js
View file @ d1cf17e4
...@@ -9,29 +9,35 @@ ...@@ -9,29 +9,35 @@
// Chart interface // Chart interface
//----------------------------------------------------------------------------------- //-----------------------------------------------------------------------------------
// Global drawing pointer // Global drawing pointers
var DrawingObject = null; var DrawingObject = null;
var DrawingObjectLayer = null; var DrawingObjectLayer = null;
if ( !window["Asc"] ) if ( !window["Asc"] ) { // Для вставки диаграмм в Word
{window["Asc"] = {};} // Для вставки диаграмм в Word window["Asc"] = {};
}
// Defines
var TransactionState = {
No: -1,
Start: 0,
Stop: 1
};
var ECellAnchorType = { function isObject(what) {
cellanchorAbsolute: 0, return ( what && (typeof(what) == "object") );
cellanchorOneCell: 1, }
cellanchorTwoCell: 2
};
var ChartDefines = { function convertFormula(formula, ws) {
defaultChartWidth: 478, var range = null;
defaultChartHeight: 286
}; if (formula && ws) {
var ref3D = parserHelp.is3DRef(formula, 0);
if (!ref3D[0])
range = ws.model.getRange2(formula.toUpperCase());
else {
var resultRef = parserHelp.parse3DRef(formula);
if (null !== resultRef) {
var ws = ws.model.workbook.getWorksheetByName(resultRef.sheet);
if (ws)
range = ws.getRange2(resultRef.range);
}
}
}
return range;
}
// Интерфейс < Excel - Word > // Интерфейс < Excel - Word >
function CChartData(bWordContext, chart) { function CChartData(bWordContext, chart) {
...@@ -40,30 +46,30 @@ ...@@ -40,30 +46,30 @@
_this.Id = bWordContext ? g_oIdCounter.Get_NewId() : ""; _this.Id = bWordContext ? g_oIdCounter.Get_NewId() : "";
_this.img = chart ? chart.img : ""; _this.img = chart ? chart.img : "";
_this.width = chart ? chart.width : ChartDefines.defaultChartWidth; _this.width = chart ? chart.width : c_oAscChartDefines.defaultChartWidth;
_this.height = chart ? chart.height : ChartDefines.defaultChartHeight; _this.height = chart ? chart.height : c_oAscChartDefines.defaultChartHeight;
_this.bChartEditor = chart ? chart.bChartEditor : true; _this.bChartEditor = chart ? chart.bChartEditor : true;
_this.type = chart ? chart.type : ""; _this.type = chart ? chart.type : "";
_this.subType = chart ? chart.subType : c_oAscChartSubType.normal; _this.subType = chart ? chart.subType : c_oAscChartSubType.normal;
_this.title = chart ? chart.title : "";
_this.bDefaultTitle = chart ? chart.bDefaultTitle : false;
_this.subTitle = chart ? chart.subTitle : "";
if ( chart ) { if ( chart ) {
_this.header = { title: chart.header.title, subTitle: chart.header.subTitle, bDefaultTitle: chart.header.bDefaultTitle };
_this.range = { interval: chart.range.interval, rows: chart.range.rows, columns: chart.range.columns }; _this.range = { interval: chart.range.interval, rows: chart.range.rows, columns: chart.range.columns };
_this.xAxis = { title: chart.xAxis.title, bDefaultTitle: chart.xAxis.bDefaultTitle, show: chart.xAxis.show, grid: chart.xAxis.grid }; _this.xAxis = { title: chart.xAxis.title, bDefaultTitle: chart.xAxis.bDefaultTitle, bShow: chart.xAxis.bShow, bGrid: chart.xAxis.bGrid };
_this.yAxis = { title: chart.yAxis.title, bDefaultTitle: chart.yAxis.bDefaultTitle, show: chart.yAxis.show, grid: chart.yAxis.grid }; _this.yAxis = { title: chart.yAxis.title, bDefaultTitle: chart.yAxis.bDefaultTitle, bShow: chart.yAxis.bShow, bGrid: chart.yAxis.bGrid };
_this.legend = { position: chart.legend.position, show: chart.legend.show, overlay: chart.legend.overlay }; _this.legend = { position: chart.legend.position, bShow: chart.legend.bShow, bOverlay: chart.legend.bOverlay };
} }
else { else {
_this.header = { title: "", subTitle: "", bDefaultTitle: false };
_this.range = { interval: bWordContext ? "" : "Sheet1!A1:C3", rows: false, columns: true }; _this.range = { interval: bWordContext ? "" : "Sheet1!A1:C3", rows: false, columns: true };
_this.xAxis = { title: "", bDefaultTitle: false, show: true, grid: true }; _this.xAxis = { title: "", bDefaultTitle: false, bShow: true, bGrid: true };
_this.yAxis = { title: "", bDefaultTitle: false, show: true, grid: true }; _this.yAxis = { title: "", bDefaultTitle: false, bShow: true, bGrid: true };
_this.legend = { position: c_oAscChartLegend.right, show: true, overlay: false }; _this.legend = { position: c_oAscChartLegend.right, bShow: true, bOverlay: false };
} }
_this.showValue = chart ? chart.showValue : false; _this.bShowValue = chart ? chart.bShowValue : false;
_this.bShowBorder = chart ? chart.bShowBorder : true;
_this.styleId = chart ? chart.styleId : c_oAscChartStyle.Standart; _this.styleId = chart ? chart.styleId : c_oAscChartStyle.Standart;
_this.data = []; _this.data = [];
...@@ -126,13 +132,16 @@ ...@@ -126,13 +132,16 @@
chart["height"] = _this.height; chart["height"] = _this.height;
chart["type"] = _this.type; chart["type"] = _this.type;
chart["subType"] = _this.subType; chart["subType"] = _this.subType;
chart["title"] = _this.title; chart["bShowValue"] = _this.bShowValue;
chart["bDefaultTitle"] = _this.bDefaultTitle; chart["bShowBorder"] = _this.bShowBorder;
chart["subTitle"] = _this.subTitle;
chart["showValue"] = _this.showValue;
chart["styleId"] = _this.styleId; chart["styleId"] = _this.styleId;
chart["bChartEditor"] = _this.bChartEditor; chart["bChartEditor"] = _this.bChartEditor;
chart["header"] = {};
chart["header"]["title"] = _this.header.title;
chart["header"]["subTitle"] = _this.header.subTitle;
chart["header"]["bDefaultTitle"] = _this.header.bDefaultTitle;
chart["range"] = {}; chart["range"] = {};
chart["range"]["interval"] = _this.range.interval; chart["range"]["interval"] = _this.range.interval;
chart["range"]["rows"] = _this.range.rows; chart["range"]["rows"] = _this.range.rows;
...@@ -141,19 +150,19 @@ ...@@ -141,19 +150,19 @@
chart["xAxis"] = {}; chart["xAxis"] = {};
chart["xAxis"]["title"] = _this.xAxis.title; chart["xAxis"]["title"] = _this.xAxis.title;
chart["xAxis"]["bDefaultTitle"] = _this.xAxis.bDefaultTitle; chart["xAxis"]["bDefaultTitle"] = _this.xAxis.bDefaultTitle;
chart["xAxis"]["show"] = _this.xAxis.show; chart["xAxis"]["bShow"] = _this.xAxis.bShow;
chart["xAxis"]["grid"] = _this.xAxis.grid; chart["xAxis"]["bGrid"] = _this.xAxis.bGrid;
chart["yAxis"] = {}; chart["yAxis"] = {};
chart["yAxis"]["title"] = _this.yAxis.title; chart["yAxis"]["title"] = _this.yAxis.title;
chart["yAxis"]["bDefaultTitle"] = _this.yAxis.bDefaultTitle; chart["yAxis"]["bDefaultTitle"] = _this.yAxis.bDefaultTitle;
chart["yAxis"]["show"] = _this.yAxis.show; chart["yAxis"]["bShow"] = _this.yAxis.bShow;
chart["yAxis"]["grid"] = _this.yAxis.grid; chart["yAxis"]["bGrid"] = _this.yAxis.bGrid;
chart["legend"] = {}; chart["legend"] = {};
chart["legend"]["position"] = _this.legend.position; chart["legend"]["position"] = _this.legend.position;
chart["legend"]["show"] = _this.legend.show; chart["legend"]["bShow"] = _this.legend.bShow;
chart["legend"]["overlay"] = _this.legend.overlay; chart["legend"]["bOverlay"] = _this.legend.bOverlay;
if ( _this.data ) { if ( _this.data ) {
chart["data"] = []; chart["data"] = [];
...@@ -192,30 +201,32 @@ ...@@ -192,30 +201,32 @@
_this.type = chart["type"]; _this.type = chart["type"];
_this.subType = chart["subType"]; _this.subType = chart["subType"];
_this.title = chart["title"]; _this.bShowValue = chart["bShowValue"];
_this.bDefaultTitle = chart["bDefaultTitle"]; _this.bShowBorder = chart["bShowBorder"];
_this.subTitle = chart["subTitle"];
_this.showValue = chart["showValue"];
_this.styleId = chart["styleId"]; _this.styleId = chart["styleId"];
_this.bChartEditor = chart["bChartEditor"]; _this.bChartEditor = chart["bChartEditor"];
_this.header.title = chart["header"]["title"];
_this.header.subTitle = chart["header"]["subTitle"];
_this.header.bDefaultTitle = chart["range"]["bDefaultTitle"];
_this.range.interval = chart["range"]["interval"]; _this.range.interval = chart["range"]["interval"];
_this.range.rows = chart["range"]["rows"]; _this.range.rows = chart["range"]["rows"];
_this.range.columns = chart["range"]["columns"]; _this.range.columns = chart["range"]["columns"];
_this.xAxis.title = chart["xAxis"]["title"]; _this.xAxis.title = chart["xAxis"]["title"];
_this.xAxis.bDefaultTitle = chart["xAxis"]["bDefaultTitle"]; _this.xAxis.bDefaultTitle = chart["xAxis"]["bDefaultTitle"];
_this.xAxis.show = chart["xAxis"]["show"]; _this.xAxis.bShow = chart["xAxis"]["bShow"];
_this.xAxis.grid = chart["xAxis"]["grid"]; _this.xAxis.bGrid = chart["xAxis"]["bGrid"];
_this.yAxis.title = chart["yAxis"]["title"]; _this.yAxis.title = chart["yAxis"]["title"];
_this.yAxis.bDefaultTitle = chart["yAxis"]["bDefaultTitle"]; _this.yAxis.bDefaultTitle = chart["yAxis"]["bDefaultTitle"];
_this.yAxis.show = chart["yAxis"]["show"]; _this.yAxis.bShow = chart["yAxis"]["bShow"];
_this.yAxis.grid = chart["yAxis"]["grid"]; _this.yAxis.bGrid = chart["yAxis"]["bGrid"];
_this.legend.position = chart["legend"]["position"]; _this.legend.position = chart["legend"]["position"];
_this.legend.show = chart["legend"]["show"]; _this.legend.bShow = chart["legend"]["bShow"];
_this.legend.overlay = chart["legend"]["overlay"]; _this.legend.bOverlay = chart["legend"]["bOverlay"];
if ( chart["data"] ) { if ( chart["data"] ) {
_this.data = []; _this.data = [];
...@@ -255,30 +266,32 @@ ...@@ -255,30 +266,32 @@
_this.type = object.chart.type; _this.type = object.chart.type;
_this.subType = object.chart.subType; _this.subType = object.chart.subType;
_this.title = object.chart.title; _this.bShowValue = object.chart.bShowValue;
_this.bDefaultTitle = object.chart.bDefaultTitle; _this.bShowBorder = object.chart.bShowBorder;
_this.subTitle = object.chart.subTitle;
_this.showValue = object.chart.showValue;
_this.styleId = object.chart.styleId; _this.styleId = object.chart.styleId;
_this.bChartEditor = object.chart.bChartEditor; _this.bChartEditor = object.chart.bChartEditor;
_this.header.title = object.chart.header.title;
_this.header.subTitle = object.chart.header.subTitle;
_this.header.bDefaultTitle = object.chart.header.bDefaultTitle;
_this.range.interval = object.chart.range.interval; _this.range.interval = object.chart.range.interval;
_this.range.rows = object.chart.range.rows; _this.range.rows = object.chart.range.rows;
_this.range.columns = object.chart.range.columns; _this.range.columns = object.chart.range.columns;
_this.xAxis.title = object.chart.xAxis.title; _this.xAxis.title = object.chart.xAxis.title;
_this.xAxis.bDefaultTitle = object.chart.xAxis.bDefaultTitle; _this.xAxis.bDefaultTitle = object.chart.xAxis.bDefaultTitle;
_this.xAxis.show = object.chart.xAxis.show; _this.xAxis.bShow = object.chart.xAxis.bShow;
_this.xAxis.grid = object.chart.xAxis.grid; _this.xAxis.bGrid = object.chart.xAxis.bGrid;
_this.yAxis.title = object.chart.yAxis.title; _this.yAxis.title = object.chart.yAxis.title;
_this.yAxis.bDefaultTitle = object.chart.yAxis.bDefaultTitle; _this.yAxis.bDefaultTitle = object.chart.yAxis.bDefaultTitle;
_this.yAxis.show = object.chart.yAxis.show; _this.yAxis.bShow = object.chart.yAxis.bShow;
_this.yAxis.grid = object.chart.yAxis.grid; _this.yAxis.bGrid = object.chart.yAxis.bGrid;
_this.legend.position = object.chart.legend.position; _this.legend.position = object.chart.legend.position;
_this.legend.show = object.chart.legend.show; _this.legend.bShow = object.chart.legend.bShow;
_this.legend.overlay = object.chart.legend.overlay; _this.legend.bOverlay = object.chart.legend.bOverlay;
_this.data = []; _this.data = [];
if ( object.chart.range.intervalObject ) { if ( object.chart.range.intervalObject ) {
...@@ -316,30 +329,32 @@ ...@@ -316,30 +329,32 @@
Writer.WriteLong( _this.height ); Writer.WriteLong( _this.height );
Writer.WriteString2( _this.type ); Writer.WriteString2( _this.type );
Writer.WriteString2( _this.subType ); Writer.WriteString2( _this.subType );
Writer.WriteString2( _this.title ); Writer.WriteBool( _this.bShowValue );
Writer.WriteBool( _this.bDefaultTitle ); Writer.WriteBool( _this.bShowBorder );
Writer.WriteString2( _this.subTitle );
Writer.WriteBool( _this.showValue );
Writer.WriteLong( _this.styleId ); Writer.WriteLong( _this.styleId );
Writer.WriteBool( _this.bChartEditor ); Writer.WriteBool( _this.bChartEditor );
Writer.WriteString2( _this.header.title );
Writer.WriteString2( _this.header.subTitle );
Writer.WriteBool( _this.header.bDefaultTitle );
Writer.WriteString2( _this.range.interval ); Writer.WriteString2( _this.range.interval );
Writer.WriteBool( _this.range.rows ); Writer.WriteBool( _this.range.rows );
Writer.WriteBool( _this.range.columns ); Writer.WriteBool( _this.range.columns );
Writer.WriteString2( _this.xAxis.title ); Writer.WriteString2( _this.xAxis.title );
Writer.WriteBool( _this.xAxis.bDefaultTitle ); Writer.WriteBool( _this.xAxis.bDefaultTitle );
Writer.WriteBool( _this.xAxis.show ); Writer.WriteBool( _this.xAxis.bShow );
Writer.WriteBool( _this.xAxis.grid ); Writer.WriteBool( _this.xAxis.bGrid );
Writer.WriteString2( _this.yAxis.title ); Writer.WriteString2( _this.yAxis.title );
Writer.WriteBool( _this.yAxis.bDefaultTitle ); Writer.WriteBool( _this.yAxis.bDefaultTitle );
Writer.WriteBool( _this.yAxis.show ); Writer.WriteBool( _this.yAxis.bShow );
Writer.WriteBool( _this.yAxis.grid ); Writer.WriteBool( _this.yAxis.bGrid );
Writer.WriteString2( _this.legend.position ); Writer.WriteString2( _this.legend.position );
Writer.WriteBool( _this.legend.show ); Writer.WriteBool( _this.legend.bShow );
Writer.WriteBool( _this.legend.overlay ); Writer.WriteBool( _this.legend.bOverlay );
/* /*
* numFormatStr * numFormatStr
...@@ -373,30 +388,32 @@ ...@@ -373,30 +388,32 @@
_this.height = Reader.GetLong(); _this.height = Reader.GetLong();
_this.type = Reader.GetString2(); _this.type = Reader.GetString2();
_this.subType = Reader.GetString2(); _this.subType = Reader.GetString2();
_this.title = Reader.GetString2(); _this.bShowValue = Reader.GetBool();
_this.bDefaultTitle = Reader.GetBool(); _this.bShowBorder = Reader.GetBool();
_this.subTitle = Reader.GetString2();
_this.showValue = Reader.GetBool();
_this.styleId = Reader.GetLong(); _this.styleId = Reader.GetLong();
_this.bChartEditor = Reader.GetBool(); _this.bChartEditor = Reader.GetBool();
_this.header.title = Reader.GetString2();
_this.header.subTitle = Reader.GetString2();
_this.header.bDefaultTitle = Reader.GetBool();
_this.range.interval = Reader.GetString2(); _this.range.interval = Reader.GetString2();
_this.range.rows = Reader.GetBool(); _this.range.rows = Reader.GetBool();
_this.range.columns = Reader.GetBool(); _this.range.columns = Reader.GetBool();
_this.xAxis.title = Reader.GetString2(); _this.xAxis.title = Reader.GetString2();
_this.xAxis.bDefaultTitle = Reader.GetBool(); _this.xAxis.bDefaultTitle = Reader.GetBool();
_this.xAxis.show = Reader.GetBool(); _this.xAxis.bShow = Reader.GetBool();
_this.xAxis.grid = Reader.GetBool(); _this.xAxis.bGrid = Reader.GetBool();
_this.yAxis.title = Reader.GetString2(); _this.yAxis.title = Reader.GetString2();
_this.yAxis.bDefaultTitle = Reader.GetBool(); _this.yAxis.bDefaultTitle = Reader.GetBool();
_this.yAxis.show = Reader.GetBool(); _this.yAxis.bShow = Reader.GetBool();
_this.yAxis.grid = Reader.GetBool(); _this.yAxis.bGrid = Reader.GetBool();
_this.legend.position = Reader.GetString2(); _this.legend.position = Reader.GetString2();
_this.legend.show = Reader.GetBool(); _this.legend.bShow = Reader.GetBool();
_this.legend.overlay = Reader.GetBool(); _this.legend.bOverlay = Reader.GetBool();
/* /*
* numFormatStr * numFormatStr
...@@ -475,40 +492,60 @@ ...@@ -475,40 +492,60 @@
prot["asc_getImageUrl"] = prot.asc_getImageUrl; prot["asc_getImageUrl"] = prot.asc_getImageUrl;
prot["asc_setImageUrl"] = prot.asc_setImageUrl; prot["asc_setImageUrl"] = prot.asc_setImageUrl;
function asc_CChart(o) { function asc_CChart(object) {
this.bChartEditor = o.bChartEditor; var bCopy = isObject(object);
this.type = o.type;
this.subType = o.subType;
this.title = o.title;
this.bDefaultTitle = o.bDefaultTitle;
this.subTitle = o.subTitle;
this.showValue = o.showValue;
this.styleId = o.styleId;
this.range = new asc_CChartRange(o.range); this.bChartEditor = bCopy ? object.bChartEditor : false;
this.xAxis = new asc_CChartAxis(o.xAxis); this.type = bCopy ? object.type : null;
this.yAxis = new asc_CChartAxis(o.yAxis); this.subType = bCopy ? object.subType : null;
this.legend = new asc_CChartLegend(o.legend);
this.bShowValue = bCopy ? object.bShowValue : false;
this.bShowBorder = bCopy ? object.bShowBorder : true;
this.styleId = bCopy ? object.styleId : c_oAscChartStyle.Standart;
this.header = bCopy ? new asc_CChartHeader(object.header) : new asc_CChartHeader();
this.range = bCopy ? new asc_CChartRange(object.range) : new asc_CChartRange();
this.xAxis = bCopy ? new asc_CChartAxisX(object.xAxis) : new asc_CChartAxisX();
this.yAxis = bCopy ? new asc_CChartAxisY(object.yAxis) : new asc_CChartAxisY();
this.legend = bCopy ? new asc_CChartLegend(object.legend) : new asc_CChartLegend();
this.series = []; this.series = [];
for (var i = 0; i < o.series.length; i++) { if ( bCopy ) {
for (var i = 0; i < object.series.length; i++) {
var ser = new asc_CChartSeria(); var ser = new asc_CChartSeria();
ser.asc_setTitle(o.series[i].Tx); ser.asc_setTitle(object.series[i].Tx);
if (o.series[i].Val && o.series[i].Val.Formula) if (object.series[i].Val && object.series[i].Val.Formula)
ser.asc_setValFormula(o.series[i].Val.Formula); ser.asc_setValFormula(object.series[i].Val.Formula);
if (o.series[i].xVal && o.series[i].xVal.Formula) if (object.series[i].xVal && object.series[i].xVal.Formula)
ser.asc_setxValFormula(o.series[i].xVal.Formula); ser.asc_setxValFormula(object.series[i].xVal.Formula);
if (o.series[i].Marker) { if (object.series[i].Marker) {
ser.asc_setMarkerSize(o.series[i].Marker.Size); ser.asc_setMarkerSize(object.series[i].Marker.Size);
ser.asc_setMarkerSymbol(o.series[i].Marker.Symbol); ser.asc_setMarkerSymbol(object.series[i].Marker.Symbol);
} }
ser.asc_setOutlineColor(o.series[i].OutlineColor); ser.asc_setOutlineColor(object.series[i].OutlineColor);
this.series.push(ser); this.series.push(ser);
} }
this.buildSeries = o.buildSeries; }
this.Properties = {
bChartEditor: 0,
type: 1,
subType: 2,
bShowValue: 3,
bShowBorder: 4,
styleId: 5,
header: 6,
range: 7,
xAxis: 8,
yAxis: 9,
legend: 10,
series: 11
};
} }
asc_CChart.prototype = { asc_CChart.prototype = {
...@@ -518,20 +555,17 @@ ...@@ -518,20 +555,17 @@
asc_getSubType: function() { return this.subType; }, asc_getSubType: function() { return this.subType; },
asc_setSubType: function(subType) { this.subType = subType; }, asc_setSubType: function(subType) { this.subType = subType; },
asc_getTitle: function() { return this.title; },
asc_setTitle: function(title) { this.title = title; },
asc_getDefaultTitleFlag: function() { return this.bDefaultTitle; },
asc_setDefaultTitleFlag: function(defaultTitleFlag) { this.bDefaultTitle = defaultTitleFlag; },
asc_getSubTitle: function() { return this.subTitle; },
asc_setSubTitle: function(subTitle) { this.subTitle = subTitle; },
asc_getStyleId: function() { return this.styleId; }, asc_getStyleId: function() { return this.styleId; },
asc_setStyleId: function(styleId) { this.styleId = styleId; }, asc_setStyleId: function(styleId) { this.styleId = styleId; },
asc_getShowValueFlag: function() { return this.showValue; }, asc_getShowValueFlag: function() { return this.bShowValue; },
asc_setShowValueFlag: function(show) { this.showValue = show; }, asc_setShowValueFlag: function(show) { this.bShowValue = show; },
asc_getShowBorderFlag: function() { return this.bShowBorder; },
asc_setShowBorderFlag: function(show) { this.bShowBorder = show; },
asc_getHeader: function() { return this.header; },
asc_setHeader: function(headerObj) { this.header = headerObj; },
asc_getRange: function() { return this.range; }, asc_getRange: function() { return this.range; },
asc_setRange: function(rangeObj) { this.range = rangeObj; }, asc_setRange: function(rangeObj) { this.range = rangeObj; },
...@@ -550,7 +584,98 @@ ...@@ -550,7 +584,98 @@
asc_removeSeries: function() { this.series = []; }, asc_removeSeries: function() { this.series = []; },
asc_getChartEditorFlag: function() { return this.bChartEditor; }, asc_getChartEditorFlag: function() { return this.bChartEditor; },
asc_setChartEditorFlag: function(value) { this.bChartEditor = value; } asc_setChartEditorFlag: function(value) { this.bChartEditor = value; },
rebuildSeries: function() {
var _t = this;
var bbox = _t.range.intervalObject.getBBox0();
_t.series = [];
var nameIndex = 1;
if (_t.range.rows) {
for (var i = bbox.r1; i <= bbox.r2; i++) {
var ser = new window["Asc"]["asc_CChartSeria"];
var startCell = new CellAddress(i, bbox.c1, 0);
var endCell = new CellAddress(i, bbox.c2, 0);
if (startCell && endCell) {
if (startCell.getID() == endCell.getID())
ser.Val.Formula = startCell.getID();
else {
ser.Val.Formula = ( !rx_test_ws_name.test(_t.range.intervalObject.worksheet.sName) ? "'" +_t.range.intervalObject.worksheet.sName+ "'" : _t.range.intervalObject.worksheet.sName )
+ "!" + startCell.getID() + ":" + endCell.getID();
}
}
ser.Tx = "Series" + nameIndex;
_t.series.push(ser);
nameIndex++;
}
}
else {
for (var i = bbox.c1; i <= bbox.c2; i++) {
var ser = new window["Asc"]["asc_CChartSeria"];
var startCell = new CellAddress(bbox.r1, i, 0);
var endCell = new CellAddress(bbox.r2, i, 0);
if (startCell && endCell) {
if (startCell.getID() == endCell.getID())
ser.Val.Formula = startCell.getID();
else {
ser.Val.Formula = ( !rx_test_ws_name.test(_t.range.intervalObject.worksheet.sName) ? "'" +_t.range.intervalObject.worksheet.sName+ "'" : _t.range.intervalObject.worksheet.sName )
+ "!" + startCell.getID() + ":" + endCell.getID();
}
}
ser.Tx = "Series" + nameIndex;
_t.series.push(ser);
nameIndex++;
}
}
},
// For collaborative editing
getType: function() {
return UndoRedoDataTypes.ChartData;
},
getProperties: function() {
return this.Properties;
},
getProperty: function(nType) {
switch (nType) {
case this.Properties.bChartEditor: return this.bChartEditor; break;
case this.Properties.type: return this.type; break;
case this.Properties.subType: return this.subType; break;
case this.Properties.bShowValue: return this.bShowValue; break;
case this.Properties.bShowBorder: return this.bShowBorder; break;
case this.Properties.styleId: return this.styleId; break;
case this.Properties.header: return this.header; break;
case this.Properties.range: return this.range; break;
case this.Properties.xAxis: return this.xAxis; break;
case this.Properties.yAxis: return this.yAxis; break;
case this.Properties.legend: return this.legend; break;
case this.Properties.series: return this.series; break;
}
},
setProperty: function(nType, value) {
switch (nType) {
case this.Properties.bChartEditor: this.bChartEditor = value; break;
case this.Properties.type: this.type = value; break;
case this.Properties.subType: this.subType = value; break;
case this.Properties.bShowValue: this.bShowValue = value; break;
case this.Properties.bShowBorder: this.bShowBorder = value; break;
case this.Properties.styleId: this.styleId = value; break;
case this.Properties.header: this.header = value; break;
case this.Properties.range: this.range = value; break;
case this.Properties.xAxis: this.xAxis = value; break;
case this.Properties.yAxis: this.yAxis = value; break;
case this.Properties.legend: this.legend = value; break;
case this.Properties.series: this.series = value; break;
}
}
} }
window["Asc"].asc_CChart = asc_CChart; window["Asc"].asc_CChart = asc_CChart;
...@@ -563,21 +688,18 @@ ...@@ -563,21 +688,18 @@
prot["asc_getSubType"] = prot.asc_getSubType; prot["asc_getSubType"] = prot.asc_getSubType;
prot["asc_setSubType"] = prot.asc_setSubType; prot["asc_setSubType"] = prot.asc_setSubType;
prot["asc_getTitle"] = prot.asc_getTitle;
prot["asc_setTitle"] = prot.asc_setTitle;
prot["asc_getDefaultTitleFlag"] = prot.asc_getDefaultTitleFlag;
prot["asc_setDefaultTitleFlag"] = prot.asc_setDefaultTitleFlag;
prot["asc_getSubTitle"] = prot.asc_getSubTitle;
prot["asc_setSubTitle"] = prot.asc_setSubTitle;
prot["asc_getStyleId"] = prot.asc_getStyleId; prot["asc_getStyleId"] = prot.asc_getStyleId;
prot["asc_setStyleId"] = prot.asc_setStyleId; prot["asc_setStyleId"] = prot.asc_setStyleId;
prot["asc_getShowValueFlag"] = prot.asc_getShowValueFlag; prot["asc_getShowValueFlag"] = prot.asc_getShowValueFlag;
prot["asc_setShowValueFlag"] = prot.asc_setShowValueFlag; prot["asc_setShowValueFlag"] = prot.asc_setShowValueFlag;
prot["asc_getShowBorderFlag"] = prot.asc_getShowBorderFlag;
prot["asc_setShowBorderFlag"] = prot.asc_setShowBorderFlag;
prot["asc_getHeader"] = prot.asc_getHeader;
prot["asc_setHeader"] = prot.asc_setHeader;
prot["asc_getRange"] = prot.asc_getRange; prot["asc_getRange"] = prot.asc_getRange;
prot["asc_setRange"] = prot.asc_setRange; prot["asc_setRange"] = prot.asc_setRange;
...@@ -598,42 +720,62 @@ ...@@ -598,42 +720,62 @@
prot["asc_setChartEditorFlag"] = prot.asc_setChartEditorFlag; prot["asc_setChartEditorFlag"] = prot.asc_setChartEditorFlag;
// Chart range // Chart range
function asc_CChartRange(o) { function asc_CChartRange(object) {
this.calcInterval = o.calcInterval;
this.checkInterval = o.checkInterval; var bCopy = isObject(object);
this.intervalToIntervalObject = o.intervalToIntervalObject;
this.interval = o.interval; this.interval = bCopy ? object.interval : "";
this.intervalObject = o.intervalObject; this.intervalObject = bCopy ? object.intervalObject : null;
this.rows = o.rows; this.rows = bCopy ? object.rows : false;
this.columns = o.columns; this.columns = bCopy ? object.columns : true;
this.Properties = {
interval: 0,
rows: 1,
columns: 2
};
} }
asc_CChartRange.prototype = { asc_CChartRange.prototype = {
asc_getInterval: function() { return this.interval; }, asc_getInterval: function() { return this.interval; },
asc_setInterval: function(interval) { this.interval = interval; }, asc_setInterval: function(interval) { this.interval = interval; },
asc_checkInterval: function(type, subtype, interval, isRows) {
return this.checkInterval(type, subtype, interval, isRows); asc_getRowsFlag: function() { return this.rows; },
asc_setRowsFlag: function(value) {
this.rows = value;
this.columns = !value;
}, },
asc_calcInterval: function() {
return this.calcInterval(); asc_getColumnsFlag: function() { return this.columns; },
asc_setColumnsFlag: function(value) {
this.rows = !value;
this.columns = value;
}, },
asc_getIntervalObject: function() { return this.intervalObject; }, // For collaborative editing
asc_setIntervalObject: function(intervalObject) { this.intervalObject = intervalObject; }, getType: function() {
intervalToIntervalObject: function() { return this.intervalToIntervalObject(); }, return UndoRedoDataTypes.ChartRange;
},
asc_getRowsFlag: function() { return this.rows; }, getProperties: function() {
return this.Properties;
},
asc_setRowsFlag: function(rowsFlag) { getProperty: function(nType) {
this.rows = rowsFlag; switch (nType) {
this.columns = !rowsFlag; case this.Properties.interval: return this.interval; break;
case this.Properties.rows: return this.rows; break;
case this.Properties.columns: return this.columns; break;
}
}, },
asc_getColumnsFlag: function() { return this.columns; },
asc_setColumnsFlag: function(columnsFlag) { setProperty: function(nType, value) {
this.rows = !columnsFlag; switch (nType) {
this.columns = columnsFlag; case this.Properties.interval: this.interval = value; break;
case this.Properties.rows: this.rows = value; break;
case this.Properties.columns: this.columns = value; break;
}
} }
} }
...@@ -643,11 +785,6 @@ ...@@ -643,11 +785,6 @@
prot["asc_getInterval"] = prot.asc_getInterval; prot["asc_getInterval"] = prot.asc_getInterval;
prot["asc_setInterval"] = prot.asc_setInterval; prot["asc_setInterval"] = prot.asc_setInterval;
prot["asc_calcInterval"] = prot.asc_calcInterval;
prot["asc_checkInterval"] = prot.asc_checkInterval;
prot["asc_getIntervalObject"] = prot.asc_getIntervalObject;
prot["asc_setIntervalObject"] = prot.asc_setIntervalObject;
prot["asc_getRowsFlag"] = prot.asc_getRowsFlag; prot["asc_getRowsFlag"] = prot.asc_getRowsFlag;
prot["asc_setRowsFlag"] = prot.asc_setRowsFlag; prot["asc_setRowsFlag"] = prot.asc_setRowsFlag;
...@@ -655,31 +792,220 @@ ...@@ -655,31 +792,220 @@
prot["asc_getColumnsFlag"] = prot.asc_getColumnsFlag; prot["asc_getColumnsFlag"] = prot.asc_getColumnsFlag;
prot["asc_setColumnsFlag"] = prot.asc_setColumnsFlag; prot["asc_setColumnsFlag"] = prot.asc_setColumnsFlag;
// Chart axis // Chart title
function asc_CChartAxis(o) { function asc_CChartHeader(object) {
this.title = o.title;
this.bDefaultTitle = o.bDefaultTitle; var bCopy = isObject(object);
this.show = o.show;
this.grid = o.grid; this.title = bCopy ? object.title : "";
this.subTitle = bCopy ? object.subTitle : "";
this.bDefaultTitle = bCopy ? object.bDefaultTitle : false;
this.font = bCopy ? new asc_CChartFont(object.font) : new asc_CChartFont();
this.Properties = {
title: 0,
subTitle: 1,
bDefaultTitle: 2,
font: 3
};
}
asc_CChartHeader.prototype = {
asc_getTitle: function() { return this.title; },
asc_setTitle: function(title) { this.title = title; },
asc_getSubTitle: function() { return this.subTitle; },
asc_setSubTitle: function(subTitle) { this.subTitle = subTitle; },
asc_getDefaultTitleFlag: function() { return this.bDefaultTitle; },
asc_setDefaultTitleFlag: function(defaultTitleFlag) { this.bDefaultTitle = defaultTitleFlag; },
// For collaborative editing
getType: function() {
return UndoRedoDataTypes.ChartHeader;
},
getProperties: function() {
return this.Properties;
},
getProperty: function(nType) {
switch (nType) {
case this.Properties.title: return this.title; break;
case this.Properties.subTitle: return this.subTitle; break;
case this.Properties.bDefaultTitle: return this.bDefaultTitle; break;
case this.Properties.font: return this.font; break;
}
},
setProperty: function(nType, value) {
switch (nType) {
case this.Properties.title: this.title = value; break;
case this.Properties.subTitle: this.subTitle = value; break;
case this.Properties.bDefaultTitle: this.bDefaultTitle = value; break;
case this.Properties.font: this.font = value; break;
}
}
}
window["Asc"].asc_CChartHeader = asc_CChartHeader;
window["Asc"]["asc_CChartHeader"] = asc_CChartHeader;
prot = asc_CChartHeader.prototype;
prot["asc_getTitle"] = prot.asc_getTitle;
prot["asc_setTitle"] = prot.asc_setTitle;
prot["asc_getSubTitle"] = prot.asc_getSubTitle;
prot["asc_setSubTitle"] = prot.asc_setSubTitle;
prot["asc_getDefaultTitleFlag"] = prot.asc_getDefaultTitleFlag;
prot["asc_setDefaultTitleFlag"] = prot.asc_setDefaultTitleFlag;
// Chart axis X
function asc_CChartAxisX(object) {
var bCopy = isObject(object);
this.title = bCopy ? object.title : "";
this.bDefaultTitle = bCopy ? object.bDefaultTitle : false;
this.bShow = bCopy ? object.bShow : true;
this.bGrid = bCopy ? object.bGrid : true;
this.font = bCopy ? new asc_CChartFont(object.font) : new asc_CChartFont();
this.Properties = {
title: 0,
bDefaultTitle: 1,
bShow: 2,
bGrid: 3,
font: 4
};
} }
asc_CChartAxis.prototype = { asc_CChartAxisX.prototype = {
asc_getTitle: function() { return this.title; }, asc_getTitle: function() { return this.title; },
asc_setTitle: function(title) { this.title = title; }, asc_setTitle: function(title) { this.title = title; },
asc_getDefaultTitleFlag: function() { return this.bDefaultTitle; }, asc_getDefaultTitleFlag: function() { return this.bDefaultTitle; },
asc_setDefaultTitleFlag: function(defaultTitleFlag) { this.bDefaultTitle = defaultTitleFlag; }, asc_setDefaultTitleFlag: function(defaultTitleFlag) { this.bDefaultTitle = defaultTitleFlag; },
asc_getShowFlag: function() { return this.show; }, asc_getShowFlag: function() { return this.bShow; },
asc_setShowFlag: function(showFlag) { this.show = showFlag; }, asc_setShowFlag: function(showFlag) { this.bShow = showFlag; },
asc_getGridFlag: function() { return this.bGrid; },
asc_setGridFlag: function(gridFlag) { this.bGrid = gridFlag; },
// For collaborative editing
getType: function() {
return UndoRedoDataTypes.ChartAxisX;
},
getProperties: function() {
return this.Properties;
},
getProperty: function(nType) {
switch (nType) {
case this.Properties.title: return this.title; break;
case this.Properties.bDefaultTitle: return this.bDefaultTitle; break;
case this.Properties.bShow: return this.bShow; break;
case this.Properties.bGrid: return this.bGrid; break;
case this.Properties.font: return this.font; break;
}
},
asc_getGridFlag: function() { return this.grid; }, setProperty: function(nType, value) {
asc_setGridFlag: function(gridFlag) { this.grid = gridFlag; } switch (nType) {
case this.Properties.title: this.title = value; break;
case this.Properties.bDefaultTitle: this.bDefaultTitle = value; break;
case this.Properties.bShow: this.bShow = value; break;
case this.Properties.bGrid: this.bGrid = value; break;
case this.Properties.font: this.font = value; break;
}
}
} }
window["Asc"].asc_CChartAxis = asc_CChartAxis; window["Asc"].asc_CChartAxisX = asc_CChartAxisX;
window["Asc"]["asc_CChartAxis"] = asc_CChartAxis; window["Asc"]["asc_CChartAxisX"] = asc_CChartAxisX;
prot = asc_CChartAxis.prototype; prot = asc_CChartAxisX.prototype;
prot["asc_getTitle"] = prot.asc_getTitle;
prot["asc_setTitle"] = prot.asc_setTitle;
prot["asc_getDefaultTitleFlag"] = prot.asc_getDefaultTitleFlag;
prot["asc_setDefaultTitleFlag"] = prot.asc_setDefaultTitleFlag;
prot["asc_getShowFlag"] = prot.asc_getShowFlag;
prot["asc_setShowFlag"] = prot.asc_setShowFlag;
prot["asc_getGridFlag"] = prot.asc_getGridFlag;
prot["asc_setGridFlag"] = prot.asc_setGridFlag;
// Chart axis Y
function asc_CChartAxisY(object) {
var bCopy = isObject(object);
this.title = bCopy ? object.title : "";
this.bDefaultTitle = bCopy ? object.bDefaultTitle : false;
this.bShow = bCopy ? object.bShow : true;
this.bGrid = bCopy ? object.bGrid : true;
this.font = bCopy ? new asc_CChartFont(object.font) : new asc_CChartFont();
this.Properties = {
title: 0,
bDefaultTitle: 1,
bShow: 2,
bGrid: 3,
font: 4
};
}
asc_CChartAxisY.prototype = {
asc_getTitle: function() { return this.title; },
asc_setTitle: function(title) { this.title = title; },
asc_getDefaultTitleFlag: function() { return this.bDefaultTitle; },
asc_setDefaultTitleFlag: function(defaultTitleFlag) { this.bDefaultTitle = defaultTitleFlag; },
asc_getShowFlag: function() { return this.bShow; },
asc_setShowFlag: function(showFlag) { this.bShow = showFlag; },
asc_getGridFlag: function() { return this.bGrid; },
asc_setGridFlag: function(gridFlag) { this.bGrid = gridFlag; },
// For collaborative editing
getType: function() {
return UndoRedoDataTypes.ChartAxisY;
},
getProperties: function() {
return this.Properties;
},
getProperty: function(nType) {
switch (nType) {
case this.Properties.title: return this.title; break;
case this.Properties.bDefaultTitle: return this.bDefaultTitle; break;
case this.Properties.bShow: return this.bShow; break;
case this.Properties.bGrid: return this.bGrid; break;
case this.Properties.font: return this.font; break;
}
},
setProperty: function(nType, value) {
switch (nType) {
case this.Properties.title: this.title = value; break;
case this.Properties.bDefaultTitle: this.bDefaultTitle = value; break;
case this.Properties.bShow: this.bShow = value; break;
case this.Properties.bGrid: this.bGrid = value; break;
case this.Properties.font: this.font = value; break;
}
}
}
window["Asc"].asc_CChartAxisY = asc_CChartAxisY;
window["Asc"]["asc_CChartAxisY"] = asc_CChartAxisY;
prot = asc_CChartAxisY.prototype;
prot["asc_getTitle"] = prot.asc_getTitle; prot["asc_getTitle"] = prot.asc_getTitle;
prot["asc_setTitle"] = prot.asc_setTitle; prot["asc_setTitle"] = prot.asc_setTitle;
...@@ -694,21 +1020,59 @@ ...@@ -694,21 +1020,59 @@
prot["asc_setGridFlag"] = prot.asc_setGridFlag; prot["asc_setGridFlag"] = prot.asc_setGridFlag;
// Chart legend // Chart legend
function asc_CChartLegend(o) { function asc_CChartLegend(object) {
this.position = o.position;
this.show = o.show; var bCopy = isObject(object);
this.overlay = o.overlay;
this.position = bCopy ? object.position : c_oAscChartLegend.right;
this.bShow = bCopy ? object.bShow : true;
this.bOverlay = bCopy ? object.bOverlay : false;
this.font = bCopy ? new asc_CChartFont(object.font) : new asc_CChartFont();
this.Properties = {
position: 0,
bShow: 1,
bOverlay: 2,
font: 3
};
} }
asc_CChartLegend.prototype = { asc_CChartLegend.prototype = {
asc_getPosition: function() { return this.position; }, asc_getPosition: function() { return this.position; },
asc_setPosition: function(pos) { this.position = pos; }, asc_setPosition: function(pos) { this.position = pos; },
asc_getShowFlag: function() { return this.show; }, asc_getShowFlag: function() { return this.bShow; },
asc_setShowFlag: function(showFlag) { this.show = showFlag; }, asc_setShowFlag: function(showFlag) { this.bShow = showFlag; },
asc_getOverlayFlag: function() { return this.bOverlay; },
asc_setOverlayFlag: function(overlayFlag) { this.bOverlay = overlayFlag; },
// For collaborative editing
getType: function() {
return UndoRedoDataTypes.ChartLegend;
},
getProperties: function() {
return this.Properties;
},
asc_getOverlayFlag: function() { return this.overlay; }, getProperty: function(nType) {
asc_setOverlayFlag: function(overlayFlag) { this.overlay = overlayFlag; } switch (nType) {
case this.Properties.position: return this.position; break;
case this.Properties.bShow: return this.bShow; break;
case this.Properties.bOverlay: return this.bOverlay; break;
case this.Properties.font: return this.font; break;
}
},
setProperty: function(nType, value) {
switch (nType) {
case this.Properties.position: this.position = value; break;
case this.Properties.bShow: this.bShow = value; break;
case this.Properties.bOverlay: this.bOverlay = value; break;
case this.Properties.font: this.font = value; break;
}
}
} }
window["Asc"].asc_CChartLegend = asc_CChartLegend; window["Asc"].asc_CChartLegend = asc_CChartLegend;
...@@ -810,17 +1174,115 @@ ...@@ -810,17 +1174,115 @@
prot["asc_getxValFormula"] = prot.asc_getxValFormula; prot["asc_getxValFormula"] = prot.asc_getxValFormula;
prot["asc_setxValFormula"] = prot.asc_setxValFormula; prot["asc_setxValFormula"] = prot.asc_setxValFormula;
prot["asc_getTitle"] = prot.asc_getTitle; prot["asc_getTitle"] = prot.asc_getTitle;
prot["asc_setTitle"] = prot.asc_setTitle; prot["asc_setTitle"] = prot.asc_setTitle;
prot["asc_getMarkerSize"] = prot.asc_getMarkerSize;
prot["asc_setMarkerSize"] = prot.asc_setMarkerSize;
prot["asc_getMarkerSymbol"] = prot.asc_getMarkerSymbol;
prot["asc_setMarkerSymbol"] = prot.asc_setMarkerSymbol;
prot["asc_getOutlineColor"] = prot.asc_getOutlineColor;
prot["asc_setOutlineColor"] = prot.asc_setOutlineColor;
// Chart font
function asc_CChartFont(object) {
var bCopy = isObject(object);
this.name = bCopy ? object.name : "Arial";
this.size = bCopy ? object.size : 12;
this.color = bCopy ? object.color : "#000000";
this.bold = bCopy ? object.bold : 0;
this.italic = bCopy ? object.italic : 0;
this.underline = bCopy ? object.underline : 0;
this.Properties = {
name: 0,
size: 1,
color: 2,
bold: 3,
italic: 4,
underline: 5
}
}
asc_CChartFont.prototype = {
asc_getName: function() { return this.name; },
asc_setName: function(val) { this.name = val; },
asc_getSize: function() { return this.size; },
asc_setSize: function(val) { this.size = val; },
asc_getColor: function() { return this.color; },
asc_setColor: function(val) { this.color = val; },
asc_getBold: function() { return this.bold; },
asc_setBold: function(val) { this.bold = val; },
asc_getItalic: function() { return this.italic; },
asc_setItalic: function(val) { this.italic = val; },
asc_getUnderline: function() { return this.underline; },
asc_setUnderline: function(val) { this.underline = val; },
// For collaborative editing
getType: function() {
return UndoRedoDataTypes.ChartFont;
},
getProperties: function() {
return this.Properties;
},
getProperty: function(nType) {
switch (nType) {
case this.Properties.name: return this.name; break;
case this.Properties.size: return this.size; break;
case this.Properties.color: return this.color; break;
case this.Properties.bold: return this.bold; break;
case this.Properties.italic: return this.italic; break;
case this.Properties.underline: return this.underline; break;
}
},
setProperty: function(nType, value) {
switch (nType) {
case this.Properties.name: this.name = value; break;
case this.Properties.size: this.size = value; break;
case this.Properties.color: this.color = value; break;
case this.Properties.bold: this.bold = value; break;
case this.Properties.italic: this.italic = value; break;
case this.Properties.underline: this.underline = value; break;
}
}
}
window["Asc"].asc_CChartFont = asc_CChartFont;
window["Asc"]["asc_CChartFont"] = asc_CChartFont;
prot = asc_CChartFont.prototype;
prot["asc_getName"] = prot.asc_getName;
prot["asc_setName"] = prot.asc_setName;
prot["asc_getSize"] = prot.asc_getSize;
prot["asc_setSize"] = prot.asc_setSize;
prot["asc_getColor"] = prot.asc_getColor;
prot["asc_setColor"] = prot.asc_setColor;
prot["asc_getMarkerSize"] = prot.asc_getMarkerSize; prot["asc_getBold"] = prot.asc_getBold;
prot["asc_setMarkerSize"] = prot.asc_setMarkerSize; prot["asc_setBold"] = prot.asc_setBold;
prot["asc_getMarkerSymbol"] = prot.asc_getMarkerSymbol; prot["asc_getItalic"] = prot.asc_getItalic;
prot["asc_setMarkerSymbol"] = prot.asc_setMarkerSymbol; prot["asc_setItalic"] = prot.asc_setItalic;
prot["asc_getOutlineColor"] = prot.asc_getOutlineColor; prot["asc_getUnderline"] = prot.asc_getUnderline;
prot["asc_setOutlineColor"] = prot.asc_setOutlineColor; prot["asc_setUnderline"] = prot.asc_setUnderline;
// Undo / Redo // Undo / Redo
DrawingObjects.prototype = { DrawingObjects.prototype = {
...@@ -838,7 +1300,7 @@ DrawingObjects.prototype = { ...@@ -838,7 +1300,7 @@ DrawingObjects.prototype = {
break; break;
case historyitem_DrawingObject_Edit: case historyitem_DrawingObject_Edit:
if ((data.flags.transactionState == TransactionState.No) || (data.flags.transactionState == TransactionState.Start)) { if ((data.flags.transactionState == c_oAscTransactionState.No) || (data.flags.transactionState == c_oAscTransactionState.Start)) {
this.deleteDrawingObject(data); this.deleteDrawingObject(data);
this.addDrawingObject(data); this.addDrawingObject(data);
} }
...@@ -872,7 +1334,7 @@ DrawingObjects.prototype = { ...@@ -872,7 +1334,7 @@ DrawingObjects.prototype = {
break; break;
case historyitem_DrawingObject_Edit: case historyitem_DrawingObject_Edit:
if ((data.flags.transactionState == TransactionState.No) || (data.flags.transactionState == TransactionState.Stop)) { if ((data.flags.transactionState == c_oAscTransactionState.No) || (data.flags.transactionState == c_oAscTransactionState.Stop)) {
this.deleteDrawingObject(data); this.deleteDrawingObject(data);
this.addDrawingObject(data); this.addDrawingObject(data);
} }
...@@ -912,6 +1374,7 @@ function DrawingObjects() { ...@@ -912,6 +1374,7 @@ function DrawingObjects() {
var minChartWidth = 160; var minChartWidth = 160;
var minChartHeight = 160; var minChartHeight = 160;
var undoRedoObject = null; var undoRedoObject = null;
var shiftKey = false; var shiftKey = false;
var userId = null; var userId = null;
var documentId = null; var documentId = null;
...@@ -921,14 +1384,6 @@ function DrawingObjects() { ...@@ -921,14 +1384,6 @@ function DrawingObjects() {
// Public methods // Public methods
//----------------------------------------------------------------------------------- //-----------------------------------------------------------------------------------
_this.setShiftKey = function(bShiftKey) {
shiftKey = bShiftKey;
}
_this.getWorksheet = function() {
return worksheet;
}
_this.init = function(currentSheet) { _this.init = function(currentSheet) {
var api = window["Asc"]["editor"]; var api = window["Asc"]["editor"];
...@@ -940,16 +1395,15 @@ function DrawingObjects() { ...@@ -940,16 +1395,15 @@ function DrawingObjects() {
overlayCtx = currentSheet.overlayCtx; overlayCtx = currentSheet.overlayCtx;
isViewerMode = function() { return worksheet._trigger("getViewerMode"); }; isViewerMode = function() { return worksheet._trigger("getViewerMode"); };
// в currentSheet.model.Drawings содержатся объекты с worksheet == null. Для каждого вызываем cloneDrawingObject
aObjects = []; aObjects = [];
for (var i = 0; currentSheet.model.Drawings && (i < currentSheet.model.Drawings.length); i++) { for (var i = 0; currentSheet.model.Drawings && (i < currentSheet.model.Drawings.length); i++) {
currentSheet.model.Drawings[i].worksheet = worksheet;
aObjects[i] = _this.cloneDrawingObject(currentSheet.model.Drawings[i]); aObjects[i] = _this.cloneDrawingObject(currentSheet.model.Drawings[i]);
aObjects[i].worksheet = worksheet;
aObjects[i].flags.loaded = currentSheet.model.Drawings[i].flags.loaded; aObjects[i].flags.loaded = currentSheet.model.Drawings[i].flags.loaded;
if (aObjects[i].isChart()) if (aObjects[i].isChart())
aObjects[i].chart.range.calcInterval(); _this.calcChartInterval(aObjects[i].chart);
} }
lastObjectIndex = aObjects.length; lastObjectIndex = aObjects.length;
...@@ -964,6 +1418,14 @@ function DrawingObjects() { ...@@ -964,6 +1418,14 @@ function DrawingObjects() {
} }
} }
_this.setShiftKey = function(bShiftKey) {
shiftKey = bShiftKey;
}
_this.getWorksheet = function() {
return worksheet;
}
_this.initGlobalDrawingPointer = function() { _this.initGlobalDrawingPointer = function() {
DrawingObject = DrawingBase; DrawingObject = DrawingBase;
DrawingObjectLayer = DrawingLayer; DrawingObjectLayer = DrawingLayer;
...@@ -1044,25 +1506,6 @@ function DrawingObjects() { ...@@ -1044,25 +1506,6 @@ function DrawingObjects() {
return false; return false;
} }
_this.formulaToRange = function(formula, ws) {
var range = null;
if (formula && ws) {
var ref3D = parserHelp.is3DRef(formula, 0);
if (!ref3D[0])
range = ws.model.getRange2(formula.toUpperCase());
else {
var resultRef = parserHelp.parse3DRef(formula);
if (null !== resultRef) {
var ws = ws.model.workbook.getWorksheetByName(resultRef.sheet);
if (ws)
range = ws.getRange2(resultRef.range);
}
}
}
return range;
}
//----------------------------------------------------------------------------------- //-----------------------------------------------------------------------------------
// Optimization of drawing // Optimization of drawing
//----------------------------------------------------------------------------------- //-----------------------------------------------------------------------------------
...@@ -1148,13 +1591,13 @@ function DrawingObjects() { ...@@ -1148,13 +1591,13 @@ function DrawingObjects() {
History.Create_NewPoint(); History.Create_NewPoint();
History.StartTransaction(); History.StartTransaction();
undoRedoObject.flags.transactionState = TransactionState.Start; undoRedoObject.flags.transactionState = c_oAscTransactionState.Start;
History.Add(g_oUndoRedoDrawingObject, historyitem_DrawingObject_Edit, worksheet.model.getId(), null, undoRedoObject); History.Add(g_oUndoRedoDrawingObject, historyitem_DrawingObject_Edit, worksheet.model.getId(), null, undoRedoObject);
undoRedoObject = null; undoRedoObject = null;
History.Create_NewPoint(); History.Create_NewPoint();
var urObj = _this.cloneDrawingObject(obj); var urObj = _this.cloneDrawingObject(obj);
urObj.flags.transactionState = TransactionState.Stop; urObj.flags.transactionState = c_oAscTransactionState.Stop;
History.Add(g_oUndoRedoDrawingObject, historyitem_DrawingObject_Edit, worksheet.model.getId(), null, urObj); History.Add(g_oUndoRedoDrawingObject, historyitem_DrawingObject_Edit, worksheet.model.getId(), null, urObj);
History.EndTransaction(); History.EndTransaction();
...@@ -1172,8 +1615,8 @@ function DrawingObjects() { ...@@ -1172,8 +1615,8 @@ function DrawingObjects() {
var bOnload = false; var bOnload = false;
if ( obj.isChart() && bUpdateCharts ) { if ( obj.isChart() && bUpdateCharts ) {
if (!obj.chart.range.intervalObject) if ( !obj.chart.range.intervalObject )
obj.chart.range.intervalToIntervalObject(); _this.intervalToIntervalObject(obj.chart);
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 )
...@@ -1363,10 +1806,11 @@ function DrawingObjects() { ...@@ -1363,10 +1806,11 @@ function DrawingObjects() {
var DrawingBase = function(ws) { var DrawingBase = function(ws) {
var _th = this; var _t = this;
_th.worksheet = ws; _t.worksheet = ws;
_th.Properties = {
id: 1, _t.Properties = {
Id: 1,
Type: 2, Type: 2,
PosX: 3, PosX: 3,
PosY: 4, PosY: 4,
...@@ -1375,7 +1819,7 @@ function DrawingObjects() { ...@@ -1375,7 +1819,7 @@ function DrawingObjects() {
ImageSrc: 7, ImageSrc: 7,
FlagCurrentCursor: 8, FlagCurrentCursor: 8,
FlagsTransactionState: 9, FlagsTransactionState: 9,
imageUrl: 10, ImageUrl: 10,
FromCol: 11, FromCol: 11,
FromColOff: 12, FromColOff: 12,
FromRow: 13, FromRow: 13,
...@@ -1387,225 +1831,67 @@ function DrawingObjects() { ...@@ -1387,225 +1831,67 @@ function DrawingObjects() {
MoveX: 19, MoveX: 19,
MoveY: 20, MoveY: 20,
SizeCoeff: 21, SizeCoeff: 21,
ChartType: 22, ChartData: 22
ChartSubType: 23,
ChartTitle: 24,
ChartDefaultTitle: 25,
ChartSubTitle: 26,
ChartShowValue: 27,
ChartRangeInterval: 28,
ChartRangeRows: 29,
ChartRangeColumns: 30,
ChartxAxisTitle: 31,
ChartxAxisDefaultTitle: 32,
ChartxAxisShow: 33,
ChartxAxisGrid: 34,
ChartyAxisTitle: 35,
ChartyAxisDefaultTitle: 36,
ChartyAxisShow: 37,
ChartyAxisGrid: 38,
ChartLegendPosition: 39,
ChartLegendShow: 40,
ChartLegendOverlay: 41,
ChartSeries: 42,
ChartStyleId: 43
}; };
_th.id = null; _t.id = null;
_th.image = new Image(); _t.image = new Image();
_th.imageUrl = ""; _t.imageUrl = "";
_th.Type = ECellAnchorType.cellanchorTwoCell; _t.Type = c_oAscCellAnchorType.cellanchorTwoCell;
_th.Pos = { X: 0, Y: 0 }; _t.Pos = { X: 0, Y: 0 };
_th.from = { col: 0, colOff: 0, row: 0, rowOff: 0 };
_th.to = { col: 0, colOff: 0, row: 0, rowOff: 0 };
_th.ext = { cx: 0, cy: 0 };
_th.size = { width: 0, height: 0, coeff: 1 };
_th.move = { x: 0, y: 0, inAction: false };
this.chart = {
bChartEditor: false,
range: {
interval: function() {
var result = "";
if (_th.worksheet) {
var selectedRange = _th.worksheet.getSelectedRange();
if (selectedRange) {
var box = selectedRange.getBBox0();
var startCell = new CellAddress(box.r1, box.c1, 0);
var endCell = new CellAddress(box.r2, box.c2, 0);
if (startCell && endCell) {
var wsName = _th.worksheet.model.sName;
if ( !rx_test_ws_name.test(wsName) )
wsName = "'" + wsName + "'";
if (startCell.getID() == endCell.getID())
result = wsName + "!" + startCell.getID();
else
result = wsName + "!" + startCell.getID() + ":" + endCell.getID();
}
}
}
return result;
} (),
intervalObject: function() {
return _th.worksheet ? _th.worksheet.getSelectedRange() : null;
} (),
checkInterval: function(type, subtype, interval, isRows) {
var result = false;
if (interval && _th.worksheet) {
var _range = _this.formulaToRange(interval, _th.worksheet);
if (_range && checkDataRange(type, subtype, _range, isRows, _th.worksheet))
result = true;
}
return result;
},
calcInterval: function() {
if (this.intervalObject) {
var box = this.intervalObject.getBBox0();
var startCell = new CellAddress(box.r1, box.c1, 0);
var endCell = new CellAddress(box.r2, box.c2, 0);
if (startCell && endCell) {
if (startCell.getID() == endCell.getID())
this.interval = startCell.getID();
else {
var wsName = this.intervalObject.worksheet.sName;
if ( !rx_test_ws_name.test(wsName) )
wsName = "'" + wsName + "'";
this.interval = wsName + "!" + startCell.getID() + ":" + endCell.getID();
}
}
}
},
intervalToIntervalObject: function() {
if (this.interval && _th.worksheet) {
var _range = _this.formulaToRange(this.interval, _th.worksheet);
if (_range)
this.intervalObject = _range;
}
},
rows: false,
columns: true
},
type: null,
subType: null,
title: "",
bDefaultTitle: false,
subTitle: "",
xAxis: { title: "", bDefaultTitle: false, show: true, grid: true },
yAxis: { title: "", bDefaultTitle: false, show: true, grid: true },
legend: { position: c_oAscChartLegend.right, show: true, overlay: false },
showValue: false, _t.from = { col: 0, colOff: 0, row: 0, rowOff: 0 };
styleId: c_oAscChartStyle.Standart, _t.to = { col: 0, colOff: 0, row: 0, rowOff: 0 };
_t.ext = { cx: 0, cy: 0 };
series: [], // Массив объектов типа asc_CChartSeria, _t.size = { width: 0, height: 0, coeff: 1 };
_t.move = { x: 0, y: 0, inAction: false };
buildSeries: function() {
var _t = this;
var bbox = _t.range.intervalObject.getBBox0();
_t.series = [];
var nameIndex = 1;
if (_t.range.rows) {
for (var i = bbox.r1; i <= bbox.r2; i++) {
var ser = new window["Asc"]["asc_CChartSeria"];
var startCell = new CellAddress(i, bbox.c1, 0);
var endCell = new CellAddress(i, bbox.c2, 0);
if (startCell && endCell) {
if (startCell.getID() == endCell.getID())
ser.Val.Formula = startCell.getID();
else {
ser.Val.Formula = ( !rx_test_ws_name.test(_t.range.intervalObject.worksheet.sName) ? "'" +_t.range.intervalObject.worksheet.sName+ "'" : _t.range.intervalObject.worksheet.sName )
+ "!" + startCell.getID() + ":" + endCell.getID();
}
}
ser.Tx = "Series" + nameIndex;
_t.series.push(ser);
nameIndex++;
}
}
else {
for (var i = bbox.c1; i <= bbox.c2; i++) {
var ser = new window["Asc"]["asc_CChartSeria"];
var startCell = new CellAddress(bbox.r1, i, 0);
var endCell = new CellAddress(bbox.r2, i, 0);
if (startCell && endCell) { _t.chart = new asc_CChart();
if (startCell.getID() == endCell.getID())
ser.Val.Formula = startCell.getID();
else {
ser.Val.Formula = ( !rx_test_ws_name.test(_t.range.intervalObject.worksheet.sName) ? "'" +_t.range.intervalObject.worksheet.sName+ "'" : _t.range.intervalObject.worksheet.sName )
+ "!" + startCell.getID() + ":" + endCell.getID();
}
}
ser.Tx = "Series" + nameIndex;
_t.series.push(ser);
nameIndex++;
}
}
}
};
this.flags = { _t.flags = {
loaded: false, loaded: false,
selected: false, selected: false,
anchorUpdated: false, anchorUpdated: false,
lockState: c_oAscObjectLockState.No, lockState: c_oAscObjectLockState.No,
currentCursor: null, currentCursor: null,
transactionState: TransactionState.No transactionState: c_oAscTransactionState.No
}; };
// Свойства // Свойства
this.isImage = function() { _t.isImage = function() {
return !this.isChart(); return !_t.isChart();
} }
this.isChart = function() { _t.isChart = function() {
return this.chart.type ? true : false; return _t.chart.type ? true : false;
} }
// Проверяет выход за границы // Проверяет выход за границы
this.canDraw = function() { _t.canDraw = function() {
var result = true; var result = true;
if (!this.image.src || if (!_t.image.src ||
(_th.worksheet.getCellLeft(_th.worksheet.getFirstVisibleCol(), 0) > _th.worksheet.getCellLeft(this.to.col, 0) + mmToPx(this.to.colOff)) || (_t.worksheet.getCellLeft(_t.worksheet.getFirstVisibleCol(), 0) > _t.worksheet.getCellLeft(_t.to.col, 0) + mmToPx(_t.to.colOff)) ||
(_th.worksheet.getCellTop(_th.worksheet.getFirstVisibleRow(), 0) > _th.worksheet.getCellTop(this.to.row, 0) + mmToPx(this.to.rowOff))) (_t.worksheet.getCellTop(_t.worksheet.getFirstVisibleRow(), 0) > _t.worksheet.getCellTop(_t.to.row, 0) + mmToPx(_t.to.rowOff)))
{ result = false; } { result = false; }
return result; return result;
} }
this.canResize = function(width, height) { _t.canResize = function(width, height) {
var result = true; var result = true;
if (this.flags.currentCursor != "move") { if (_t.flags.currentCursor != "move") {
if (this.isChart()) { if (_t.isChart()) {
if (width == minChartWidth) { if (width == minChartWidth) {
switch (this.flags.currentCursor) { switch (_t.flags.currentCursor) {
case "w-resize": case "e-resize": case "ne-resize": case "w-resize": case "e-resize": case "ne-resize":
case "nw-resize": case "se-resize": case "sw-resize": case "nw-resize": case "se-resize": case "sw-resize":
result = false; result = false;
} }
} }
else if (height == minChartHeight) { else if (height == minChartHeight) {
switch (this.flags.currentCursor) { switch (_t.flags.currentCursor) {
case "n-resize": case "s-resize": case "ne-resize": case "n-resize": case "s-resize": case "ne-resize":
case "nw-resize": case "se-resize": case "sw-resize": case "nw-resize": case "se-resize": case "sw-resize":
result = false; result = false;
...@@ -1614,14 +1900,14 @@ function DrawingObjects() { ...@@ -1614,14 +1900,14 @@ function DrawingObjects() {
} }
else { // Image else { // Image
if (width == minImageWidth) { if (width == minImageWidth) {
switch (this.flags.currentCursor) { switch (_t.flags.currentCursor) {
case "w-resize": case "e-resize": case "ne-resize": case "w-resize": case "e-resize": case "ne-resize":
case "nw-resize": case "se-resize": case "sw-resize": case "nw-resize": case "se-resize": case "sw-resize":
result = false; result = false;
} }
} }
else if (height == minImageHeight) { else if (height == minImageHeight) {
switch (this.flags.currentCursor) { switch (_t.flags.currentCursor) {
case "n-resize": case "s-resize": case "ne-resize": case "n-resize": case "s-resize": case "ne-resize":
case "nw-resize": case "se-resize": case "sw-resize": case "nw-resize": case "se-resize": case "sw-resize":
result = false; result = false;
...@@ -1633,184 +1919,165 @@ function DrawingObjects() { ...@@ -1633,184 +1919,165 @@ function DrawingObjects() {
return result; return result;
} }
this.updateAnchorPosition = function() { _t.updateAnchorPosition = function() {
switch (this.Type) { switch (_t.Type) {
case ECellAnchorType.cellanchorOneCell: case c_oAscCellAnchorType.cellanchorOneCell:
{ {
var _left = this.getRealLeftOffset(); var _left = _t.getRealLeftOffset();
var _top = this.getRealTopOffset(); var _top = _t.getRealTopOffset();
var foundCol = _th.worksheet._findColUnderCursor(pxToPt(_left + mmToPx(this.ext.cx)), true); var foundCol = _t.worksheet._findColUnderCursor(pxToPt(_left + mmToPx(_t.ext.cx)), true);
while (foundCol == null) { while (foundCol == null) {
_th.worksheet.expandColsOnScroll(true); _t.worksheet.expandColsOnScroll(true);
_th.worksheet._trigger("reinitializeScrollX"); _t.worksheet._trigger("reinitializeScrollX");
foundCol = _th.worksheet._findColUnderCursor(pxToPt(_left + mmToPx(this.ext.cx)), true); foundCol = _t.worksheet._findColUnderCursor(pxToPt(_left + mmToPx(_t.ext.cx)), true);
} }
this.to.col = foundCol.col; _t.to.col = foundCol.col;
this.to.colOff = pxToMm(_left + mmToPx(this.ext.cx) - _th.worksheet.getCellLeft(this.to.col, 0)); _t.to.colOff = pxToMm(_left + mmToPx(_t.ext.cx) - _t.worksheet.getCellLeft(_t.to.col, 0));
var foundRow = _th.worksheet._findRowUnderCursor(pxToPt(_top + mmToPx(this.ext.cy)), true); var foundRow = _t.worksheet._findRowUnderCursor(pxToPt(_top + mmToPx(_t.ext.cy)), true);
while (foundRow == null) { while (foundRow == null) {
_th.worksheet.expandRowsOnScroll(true); _t.worksheet.expandRowsOnScroll(true);
_th.worksheet._trigger("reinitializeScrollY"); _t.worksheet._trigger("reinitializeScrollY");
foundRow = _th.worksheet._findRowUnderCursor(pxToPt(_top + mmToPx(this.ext.cy)), true); foundRow = _t.worksheet._findRowUnderCursor(pxToPt(_top + mmToPx(_t.ext.cy)), true);
} }
this.to.row = foundRow.row; _t.to.row = foundRow.row;
this.to.rowOff = pxToMm(_top + mmToPx(this.ext.cy) - _th.worksheet.getCellTop(this.to.row, 0)); _t.to.rowOff = pxToMm(_top + mmToPx(_t.ext.cy) - _t.worksheet.getCellTop(_t.to.row, 0));
} }
break; break;
case ECellAnchorType.cellanchorAbsolute: case c_oAscCellAnchorType.cellanchorAbsolute:
{ {
if ( this.Pos.X < 0 ) if ( _t.Pos.X < 0 )
this.Pos.X = 0; _t.Pos.X = 0;
if ( this.Pos.Y < 0 ) if ( _t.Pos.Y < 0 )
this.Pos.Y = 0; _t.Pos.Y = 0;
this.from.col = _th.worksheet._findColUnderCursor(pxToPt(mmToPx(this.Pos.X) + _th.worksheet.getCellLeft(0, 0)), true).col; _t.from.col = _t.worksheet._findColUnderCursor(pxToPt(mmToPx(_t.Pos.X) + _t.worksheet.getCellLeft(0, 0)), true).col;
this.from.colOff = pxToMm(mmToPx(this.Pos.X) + _th.worksheet.getCellLeft(0, 0) - _th.worksheet.getCellLeft(this.from.col, 0)); _t.from.colOff = pxToMm(mmToPx(_t.Pos.X) + _t.worksheet.getCellLeft(0, 0) - _t.worksheet.getCellLeft(_t.from.col, 0));
this.from.row = _th.worksheet._findRowUnderCursor(pxToPt(mmToPx(this.Pos.Y) + _th.worksheet.getCellTop(0, 0)), true).row; _t.from.row = _t.worksheet._findRowUnderCursor(pxToPt(mmToPx(_t.Pos.Y) + _t.worksheet.getCellTop(0, 0)), true).row;
this.from.rowOff = pxToMm(mmToPx(this.Pos.Y) + _th.worksheet.getCellTop(0, 0) - _th.worksheet.getCellTop(this.from.row, 0)); _t.from.rowOff = pxToMm(mmToPx(_t.Pos.Y) + _t.worksheet.getCellTop(0, 0) - _t.worksheet.getCellTop(_t.from.row, 0));
var _left = this.getRealLeftOffset(); var _left = _t.getRealLeftOffset();
var _top = this.getRealTopOffset(); var _top = _t.getRealTopOffset();
var foundCol = _th.worksheet._findColUnderCursor(pxToPt(_left + mmToPx(this.ext.cx)), true); var foundCol = _t.worksheet._findColUnderCursor(pxToPt(_left + mmToPx(_t.ext.cx)), true);
while (foundCol == null) { while (foundCol == null) {
_th.worksheet.expandColsOnScroll(true); _t.worksheet.expandColsOnScroll(true);
_th.worksheet._trigger("reinitializeScrollX"); _t.worksheet._trigger("reinitializeScrollX");
foundCol = _th.worksheet._findColUnderCursor(pxToPt(_left + mmToPx(this.ext.cx)), true); foundCol = _t.worksheet._findColUnderCursor(pxToPt(_left + mmToPx(_t.ext.cx)), true);
} }
this.to.col = foundCol.col; _t.to.col = foundCol.col;
this.to.colOff = pxToMm(_left + mmToPx(this.ext.cx) - _th.worksheet.getCellLeft(this.to.col, 0)); _t.to.colOff = pxToMm(_left + mmToPx(_t.ext.cx) - _t.worksheet.getCellLeft(_t.to.col, 0));
var foundRow = _th.worksheet._findRowUnderCursor(pxToPt(_top + mmToPx(this.ext.cy)), true); var foundRow = _t.worksheet._findRowUnderCursor(pxToPt(_top + mmToPx(_t.ext.cy)), true);
while (foundRow == null) { while (foundRow == null) {
_th.worksheet.expandRowsOnScroll(true); _t.worksheet.expandRowsOnScroll(true);
_th.worksheet._trigger("reinitializeScrollY"); _t.worksheet._trigger("reinitializeScrollY");
foundRow = _th.worksheet._findRowUnderCursor(pxToPt(_top + mmToPx(this.ext.cy)), true); foundRow = _t.worksheet._findRowUnderCursor(pxToPt(_top + mmToPx(_t.ext.cy)), true);
} }
this.to.row = foundRow.row; _t.to.row = foundRow.row;
this.to.rowOff = pxToMm(_top + mmToPx(this.ext.cy) - _th.worksheet.getCellTop(this.to.row, 0)); _t.to.rowOff = pxToMm(_top + mmToPx(_t.ext.cy) - _t.worksheet.getCellTop(_t.to.row, 0));
} }
break; break;
} }
this.flags.anchorUpdated = true; _t.flags.anchorUpdated = true;
} }
this.normalizeMetrics = function() { _t.normalizeMetrics = function() {
var width = this.getWidthFromTo(); var width = _t.getWidthFromTo();
var height = this.getHeightFromTo(); var height = _t.getHeightFromTo();
if ( width < 2 ) if ( width < 2 )
this.to.colOff = this.from.colOff + 4; _t.to.colOff = _t.from.colOff + 4;
if ( height < 2 ) if ( height < 2 )
this.to.rowOff = this.from.rowOff + 4; _t.to.rowOff = _t.from.rowOff + 4;
} }
// Реальное смещение по высоте // Реальное смещение по высоте
this.getRealTopOffset = function() { _t.getRealTopOffset = function() {
var val = _th.worksheet.getCellTop(this.from.row, 0) + mmToPx(this.from.rowOff); var val = _t.worksheet.getCellTop(_t.from.row, 0) + mmToPx(_t.from.rowOff);
return Asc.round(val); return Asc.round(val);
} }
// Реальное смещение по ширине // Реальное смещение по ширине
this.getRealLeftOffset = function() { _t.getRealLeftOffset = function() {
var val = _th.worksheet.getCellLeft(this.from.col, 0) + mmToPx(this.from.colOff); var val = _t.worksheet.getCellLeft(_t.from.col, 0) + mmToPx(_t.from.colOff);
return Asc.round(val); return Asc.round(val);
} }
// Ширина по координатам // Ширина по координатам
this.getWidthFromTo = function(withoutRound) { _t.getWidthFromTo = function(withoutRound) {
var val = _th.worksheet.getCellLeft(this.to.col, 0) + mmToPx(this.to.colOff) - _th.worksheet.getCellLeft(this.from.col, 0) - mmToPx(this.from.colOff); var val = _t.worksheet.getCellLeft(_t.to.col, 0) + mmToPx(_t.to.colOff) - _t.worksheet.getCellLeft(_t.from.col, 0) - mmToPx(_t.from.colOff);
return withoutRound ? val : Asc.round(val); return withoutRound ? val : Asc.round(val);
} }
// Высота по координатам // Высота по координатам
this.getHeightFromTo = function(withoutRound) { _t.getHeightFromTo = function(withoutRound) {
var val = _th.worksheet.getCellTop(this.to.row, 0) + mmToPx(this.to.rowOff) - _th.worksheet.getCellTop(this.from.row, 0) - mmToPx(this.from.rowOff); var val = _t.worksheet.getCellTop(_t.to.row, 0) + mmToPx(_t.to.rowOff) - _t.worksheet.getCellTop(_t.from.row, 0) - mmToPx(_t.from.rowOff);
return withoutRound ? val : Asc.round(val); return withoutRound ? val : Asc.round(val);
} }
// Видимая ширина при скролах // Видимая ширина при скролах
this.getVisibleWidth = function() { _t.getVisibleWidth = function() {
var fvc = _th.worksheet.getCellLeft(_th.worksheet.getFirstVisibleCol(), 0); var fvc = _t.worksheet.getCellLeft(_t.worksheet.getFirstVisibleCol(), 0);
var off = this.getRealLeftOffset() - fvc; var off = _t.getRealLeftOffset() - fvc;
off = (off >= 0) ? 0 : Math.abs(off); off = (off >= 0) ? 0 : Math.abs(off);
return this.getWidthFromTo() - off; return _t.getWidthFromTo() - off;
} }
// Видимая высота при скролах // Видимая высота при скролах
this.getVisibleHeight = function() { _t.getVisibleHeight = function() {
var fvr = _th.worksheet.getCellTop(_th.worksheet.getFirstVisibleRow(), 0); var fvr = _t.worksheet.getCellTop(_t.worksheet.getFirstVisibleRow(), 0);
var off = this.getRealTopOffset() - fvr; var off = _t.getRealTopOffset() - fvr;
off = (off >= 0) ? 0 : Math.abs(off); off = (off >= 0) ? 0 : Math.abs(off);
return this.getHeightFromTo() - off; return _t.getHeightFromTo() - off;
} }
// Видимое смещение объекта от первой видимой строки // Видимое смещение объекта от первой видимой строки
this.getVisibleTopOffset = function(withHeader) { _t.getVisibleTopOffset = function(withHeader) {
var headerRowOff = _th.worksheet.getCellTop(0, 0); var headerRowOff = _t.worksheet.getCellTop(0, 0);
var fvr = _th.worksheet.getCellTop(_th.worksheet.getFirstVisibleRow(), 0); var fvr = _t.worksheet.getCellTop(_t.worksheet.getFirstVisibleRow(), 0);
var off = this.getRealTopOffset() - fvr; var off = _t.getRealTopOffset() - fvr;
var off = (off > 0) ? off : 0; var off = (off > 0) ? off : 0;
return withHeader ? headerRowOff + off : off; return withHeader ? headerRowOff + off : off;
} }
// Видимое смещение объекта от первой видимой колонки // Видимое смещение объекта от первой видимой колонки
this.getVisibleLeftOffset = function(withHeader) { _t.getVisibleLeftOffset = function(withHeader) {
var headerColOff = _th.worksheet.getCellLeft(0, 0); var headerColOff = _t.worksheet.getCellLeft(0, 0);
var fvc = _th.worksheet.getCellLeft(_th.worksheet.getFirstVisibleCol(), 0); var fvc = _t.worksheet.getCellLeft(_t.worksheet.getFirstVisibleCol(), 0);
var off = this.getRealLeftOffset() - fvc; var off = _t.getRealLeftOffset() - fvc;
var off = (off > 0) ? off : 0; var off = (off > 0) ? off : 0;
return withHeader ? headerColOff + off : off; return withHeader ? headerColOff + off : off;
} }
// смещение по высоте внутри объекта // смещение по высоте внутри объекта
this.getInnerOffsetTop = function() { _t.getInnerOffsetTop = function() {
var fvr = _th.worksheet.getCellTop(_th.worksheet.getFirstVisibleRow(), 0); var fvr = _t.worksheet.getCellTop(_t.worksheet.getFirstVisibleRow(), 0);
var off = this.getRealTopOffset() - fvr; var off = _t.getRealTopOffset() - fvr;
return (off > 0) ? 0 : Asc.round(Math.abs(off) * this.getHeightCoeff()); return (off > 0) ? 0 : Asc.round(Math.abs(off) * _t.getHeightCoeff());
} }
// смещение по ширине внутри объекта // смещение по ширине внутри объекта
this.getInnerOffsetLeft = function() { _t.getInnerOffsetLeft = function() {
var fvc = _th.worksheet.getCellLeft(_th.worksheet.getFirstVisibleCol(), 0); var fvc = _t.worksheet.getCellLeft(_t.worksheet.getFirstVisibleCol(), 0);
var off = this.getRealLeftOffset() - fvc; var off = _t.getRealLeftOffset() - fvc;
return (off > 0) ? 0 : Asc.round(Math.abs(off) * this.getWidthCoeff()); return (off > 0) ? 0 : Asc.round(Math.abs(off) * _t.getWidthCoeff());
} }
// коэффициент по ширине если несоответствие с реальным размером // коэффициент по ширине если несоответствие с реальным размером
this.getWidthCoeff = function() { _t.getWidthCoeff = function() {
return this.image.width / this.getWidthFromTo(); return _t.image.width / _t.getWidthFromTo();
} }
// коэффициент по высоте если несоответствие с реальным размером // коэффициент по высоте если несоответствие с реальным размером
this.getHeightCoeff = function() { _t.getHeightCoeff = function() {
return this.image.height / this.getHeightFromTo(); return _t.image.height / _t.getHeightFromTo();
}
} }
//-----------------------------------------------------------------------------------
// Create drawing layer
//-----------------------------------------------------------------------------------
var DrawingLayer = function() {
this.Properties = {
aLayerBefore: 1,
aLayerAfter: 2
}
this.aLayerBefore = [];
this.aLayerAfter = [];
} }
//-----------------------------------------------------------------------------------
// For collaborative editing
//-----------------------------------------------------------------------------------
DrawingBase.prototype = { DrawingBase.prototype = {
getType: function() { getType: function() {
...@@ -1823,7 +2090,7 @@ function DrawingObjects() { ...@@ -1823,7 +2090,7 @@ function DrawingObjects() {
getProperty: function(nType) { getProperty: function(nType) {
switch (nType) { switch (nType) {
case this.Properties.id: return this.id; break; case this.Properties.Id: return this.id; break;
case this.Properties.Type: return this.Type; break; case this.Properties.Type: return this.Type; break;
case this.Properties.PosX: return this.Pos.X; break; case this.Properties.PosX: return this.Pos.X; break;
case this.Properties.PosY: return this.Pos.Y; break; case this.Properties.PosY: return this.Pos.Y; break;
...@@ -1851,40 +2118,13 @@ function DrawingObjects() { ...@@ -1851,40 +2118,13 @@ function DrawingObjects() {
case this.Properties.MoveY: return this.move.y; break; case this.Properties.MoveY: return this.move.y; break;
case this.Properties.SizeCoeff: return this.size.coeff; break; case this.Properties.SizeCoeff: return this.size.coeff; break;
case this.Properties.ChartData: return this.chart; break;
case this.Properties.ChartType: return this.chart.type; break;
case this.Properties.ChartSubType: return this.chart.subType; break;
case this.Properties.ChartTitle: return this.chart.title; break;
case this.Properties.ChartDefaultTitle: return this.chart.bDefaultTitle; break;
case this.Properties.ChartSubTitle: return this.chart.subTitle; break;
case this.Properties.ChartShowValue: return this.chart.showValue; break;
case this.Properties.ChartStyleId: return this.chart.styleId; break;
case this.Properties.ChartRangeInterval: return this.chart.range.interval; break;
case this.Properties.ChartRangeRows: return this.chart.range.rows; break;
case this.Properties.ChartRangeColumns: return this.chart.range.columns; break;
case this.Properties.ChartxAxisTitle: return this.chart.xAxis.title; break;
case this.Properties.ChartxAxisDefaultTitle: return this.chart.xAxis.bDefaultTitle; break;
case this.Properties.ChartxAxisShow: return this.chart.xAxis.show; break;
case this.Properties.ChartxAxisGrid: return this.chart.xAxis.grid; break;
case this.Properties.ChartyAxisTitle: return this.chart.yAxis.title; break;
case this.Properties.ChartyAxisDefaultTitle: return this.chart.yAxis.bDefaultTitle; break;
case this.Properties.ChartyAxisShow: return this.chart.yAxis.show; break;
case this.Properties.ChartyAxisGrid: return this.chart.yAxis.grid; break;
case this.Properties.ChartLegendPosition: return this.chart.legend.position; break;
case this.Properties.ChartLegendShow: return this.chart.legend.show; break;
case this.Properties.ChartLegendOverlay: return this.chart.legend.overlay; break;
case this.Properties.ChartSeries: return this.chart.series; break;
} }
}, },
setProperty: function(nType, value) { setProperty: function(nType, value) {
switch (nType) { switch (nType) {
case this.Properties.id: this.id = value; break; case this.Properties.Id: this.id = value; break;
case this.Properties.Type: this.Type = value; break; case this.Properties.Type: this.Type = value; break;
case this.Properties.PosX: this.Pos.X = value; break; case this.Properties.PosX: this.Pos.X = value; break;
case this.Properties.PosY: this.Pos.Y = value; break; case this.Properties.PosY: this.Pos.Y = value; break;
...@@ -1912,39 +2152,28 @@ function DrawingObjects() { ...@@ -1912,39 +2152,28 @@ function DrawingObjects() {
case this.Properties.MoveY: this.move.y = value; break; case this.Properties.MoveY: this.move.y = value; break;
case this.Properties.SizeCoeff: this.size.coeff = value; break; case this.Properties.SizeCoeff: this.size.coeff = value; break;
case this.Properties.ChartData: this.chart = value; break;
}
}
}
case this.Properties.ChartType: this.chart.type = value; break; //-----------------------------------------------------------------------------------
case this.Properties.ChartSubType: this.chart.subType = value; break; // Create drawing layer
case this.Properties.ChartTitle: this.chart.title = value; break; //-----------------------------------------------------------------------------------
case this.Properties.ChartDefaultTitle: this.chart.bDefaultTitle = value; break;
case this.Properties.ChartSubTitle: this.chart.subTitle = value; break;
case this.Properties.ChartShowValue: this.chart.showValue = value; break;
case this.Properties.ChartStyleId: this.chart.styleId = value; break;
case this.Properties.ChartRangeInterval: this.chart.range.interval = value; break;
case this.Properties.ChartRangeRows: this.chart.range.rows = value; break;
case this.Properties.ChartRangeColumns: this.chart.range.columns = value; break;
case this.Properties.ChartxAxisTitle: this.chart.xAxis.title = value; break;
case this.Properties.ChartxAxisDefaultTitle: this.chart.xAxis.bDefaultTitle = value; break;
case this.Properties.ChartxAxisShow: this.chart.xAxis.show = value; break;
case this.Properties.ChartxAxisGrid: this.chart.xAxis.grid = value; break;
case this.Properties.ChartyAxisTitle: this.chart.yAxis.title = value; break;
case this.Properties.ChartyAxisDefaultTitle: this.chart.yAxis.bDefaultTitle = value; break;
case this.Properties.ChartyAxisShow: this.chart.yAxis.show = value; break;
case this.Properties.ChartyAxisGrid: this.chart.yAxis.grid = value; break;
case this.Properties.ChartLegendPosition: this.chart.legend.position = value; break; var DrawingLayer = function() {
case this.Properties.ChartLegendShow: this.chart.legend.show = value; break;
case this.Properties.ChartLegendOverlay: this.chart.legend.overlay = value; break;
case this.Properties.ChartSeries: this.chart.series = value; break; this.Properties = {
} aLayerBefore: 1,
aLayerAfter: 2
} }
this.aLayerBefore = [];
this.aLayerAfter = [];
} }
DrawingLayer.prototype = { DrawingLayer.prototype = {
getType: function() { getType: function() {
return UndoRedoDataTypes.DrawingObjectLayer; return UndoRedoDataTypes.DrawingObjectLayer;
}, },
...@@ -1968,8 +2197,43 @@ function DrawingObjects() { ...@@ -1968,8 +2197,43 @@ function DrawingObjects() {
} }
} }
//-----------------------------------------------------------------------------------
// Constructor
//-----------------------------------------------------------------------------------
_this.createDrawingObject = function() { _this.createDrawingObject = function() {
return new DrawingBase(worksheet);
var drawing = new DrawingBase(worksheet);
drawing.chart.range.interval = function() {
var result = "";
if (worksheet) {
var selectedRange = worksheet.getSelectedRange();
if (selectedRange) {
var box = selectedRange.getBBox0();
var startCell = new CellAddress(box.r1, box.c1, 0);
var endCell = new CellAddress(box.r2, box.c2, 0);
if (startCell && endCell) {
var wsName = worksheet.model.sName;
if ( !rx_test_ws_name.test(wsName) )
wsName = "'" + wsName + "'";
if (startCell.getID() == endCell.getID())
result = wsName + "!" + startCell.getID();
else
result = wsName + "!" + startCell.getID() + ":" + endCell.getID();
}
}
}
return result;
}();
drawing.chart.range.intervalObject = function() {
return worksheet ? worksheet.getSelectedRange() : null;
}();
return drawing;
} }
_this.cloneDrawingObject = function(obj) { _this.cloneDrawingObject = function(obj) {
...@@ -2006,59 +2270,9 @@ function DrawingObjects() { ...@@ -2006,59 +2270,9 @@ function DrawingObjects() {
copyObject.move.x = obj.move.x; copyObject.move.x = obj.move.x;
copyObject.move.y = obj.move.y; copyObject.move.y = obj.move.y;
copyObject.size.coeff = obj.size.coeff; copyObject.size.coeff = obj.size.coeff;
copyObject.chart.bChartEditor = obj.chart.bChartEditor; copyObject.chart = new asc_CChart(obj.chart);
copyObject.chart.worksheet = obj.chart.worksheet;
copyObject.chart.type = obj.chart.type;
copyObject.chart.subType = obj.chart.subType ? obj.chart.subType : c_oAscChartSubType.normal;
copyObject.chart.title = obj.chart.title;
copyObject.chart.bDefaultTitle = obj.chart.bDefaultTitle;
copyObject.chart.subTitle = obj.chart.subTitle;
copyObject.chart.showValue = obj.chart.showValue;
copyObject.chart.styleId = obj.chart.styleId;
copyObject.chart.range.interval = obj.chart.range.interval;
copyObject.chart.range.intervalObject = obj.chart.range.intervalObject;
copyObject.chart.range.rows = obj.chart.range.rows;
copyObject.chart.range.columns = obj.chart.range.columns;
copyObject.chart.xAxis.title = obj.chart.xAxis.title;
copyObject.chart.xAxis.bDefaultTitle = obj.chart.xAxis.bDefaultTitle;
copyObject.chart.xAxis.show = obj.chart.xAxis.show;
copyObject.chart.xAxis.grid = obj.chart.xAxis.grid;
copyObject.chart.yAxis.title = obj.chart.yAxis.title;
copyObject.chart.yAxis.bDefaultTitle = obj.chart.yAxis.bDefaultTitle;
copyObject.chart.yAxis.show = obj.chart.yAxis.show;
copyObject.chart.yAxis.grid = obj.chart.yAxis.grid;
copyObject.chart.legend.position = obj.chart.legend.position;
copyObject.chart.legend.show = obj.chart.legend.show;
copyObject.chart.legend.overlay = obj.chart.legend.overlay;
copyObject.chart.series = [];
for (var i = 0; i < obj.chart.series.length; i++) {
var ser = new window["Asc"].asc_CChartSeria;
ser.asc_setTitle(obj.chart.series[i].Tx);
if (obj.chart.series[i].Val && obj.chart.series[i].Val.Formula) {
ser.asc_setValFormula(obj.chart.series[i].Val.Formula);
}
if (obj.chart.series[i].xVal && obj.chart.series[i].xVal.Formula) {
ser.asc_setxValFormula(obj.chart.series[i].xVal.Formula);
}
if (obj.chart.series[i].Marker) {
ser.asc_setMarkerSize(obj.chart.series[i].Marker.Size);
ser.asc_setMarkerSymbol(obj.chart.series[i].Marker.Symbol);
}
ser.asc_setOutlineColor(obj.chart.series[i].OutlineColor);
copyObject.chart.series.push(ser);
}
return copyObject; return copyObject;
} }
...@@ -2253,35 +2467,38 @@ function DrawingObjects() { ...@@ -2253,35 +2467,38 @@ function DrawingObjects() {
copyChart.chart.type = wordChart.type; copyChart.chart.type = wordChart.type;
copyChart.chart.subType = wordChart.subType; copyChart.chart.subType = wordChart.subType;
copyChart.chart.title = wordChart.title;
copyChart.chart.bDefaultTitle = wordChart.bDefaultTitle; copyChart.chart.bShowValue = wordChart.bShowValue;
copyChart.chart.subTitle = wordChart.subTitle; copyChart.chart.bShowBorder = wordChart.bShowBorder;
copyChart.chart.showValue = wordChart.showValue;
copyChart.chart.styleId = wordChart.styleId; copyChart.chart.styleId = wordChart.styleId;
copyChart.chart.bChartEditor = wordChart.bChartEditor; copyChart.chart.bChartEditor = wordChart.bChartEditor;
copyChart.chart.header.title = wordChart.header.title;
copyChart.chart.header.subTitle = wordChart.header.subTitle;
copyChart.chart.header.bDefaultTitle = wordChart.header.bDefaultTitle;
copyChart.chart.range.rows = wordChart.range.rows; copyChart.chart.range.rows = wordChart.range.rows;
copyChart.chart.range.columns = wordChart.range.columns; copyChart.chart.range.columns = wordChart.range.columns;
copyChart.chart.range.interval = wordChart.range.interval; copyChart.chart.range.interval = wordChart.range.interval;
copyChart.chart.xAxis.title = wordChart.xAxis.title; copyChart.chart.xAxis.title = wordChart.xAxis.title;
copyChart.chart.xAxis.bDefaultTitle = wordChart.xAxis.bDefaultTitle; copyChart.chart.xAxis.bDefaultTitle = wordChart.xAxis.bDefaultTitle;
copyChart.chart.xAxis.show = wordChart.xAxis.show; copyChart.chart.xAxis.bShow = wordChart.xAxis.bShow;
copyChart.chart.xAxis.grid = wordChart.xAxis.grid; copyChart.chart.xAxis.bGrid = wordChart.xAxis.bGrid;
copyChart.chart.yAxis.title = wordChart.yAxis.title; copyChart.chart.yAxis.title = wordChart.yAxis.title;
copyChart.chart.yAxis.bDefaultTitle = wordChart.yAxis.bDefaultTitle; copyChart.chart.yAxis.bDefaultTitle = wordChart.yAxis.bDefaultTitle;
copyChart.chart.yAxis.show = wordChart.yAxis.show; copyChart.chart.yAxis.bShow = wordChart.yAxis.bShow;
copyChart.chart.yAxis.grid = wordChart.yAxis.grid; copyChart.chart.yAxis.bGrid = wordChart.yAxis.bGrid;
copyChart.chart.legend.position = wordChart.legend.position; copyChart.chart.legend.position = wordChart.legend.position;
copyChart.chart.legend.show = wordChart.legend.show; copyChart.chart.legend.bShow = wordChart.legend.bShow;
copyChart.chart.legend.overlay = wordChart.legend.overlay; copyChart.chart.legend.bOverlay = wordChart.legend.bOverlay;
copyChart.chart.data = wordChart.data ? wordChart.data : []; copyChart.chart.data = wordChart.data ? wordChart.data : [];
chart = copyChart.chart; chart = copyChart.chart;
chart.range.intervalToIntervalObject(); _this.intervalToIntervalObject(chart);
// Заполняем таблицу // Заполняем таблицу
...@@ -2309,15 +2526,15 @@ function DrawingObjects() { ...@@ -2309,15 +2526,15 @@ function DrawingObjects() {
_this.showDrawingObjects(false); _this.showDrawingObjects(false);
} }
var _range = _this.formulaToRange(chart.range.interval, worksheet); var _range = convertFormula(chart.range.interval, worksheet);
if (_range) if (_range)
chart.range.intervalObject = _range; chart.range.intervalObject = _range;
chart.buildSeries(); chart.rebuildSeries();
var isNewChart = true; var isNewChart = true;
chart.worksheet = worksheet; // Для формул серий chart.worksheet = worksheet; // Для формул серий
var chartBase64 = chartRender.insertChart(chart, null, bWordChart ? wordChart.width : ChartDefines.defaultChartWidth, bWordChart ? wordChart.height : ChartDefines.defaultChartHeight, isNewChart); var chartBase64 = chartRender.insertChart(chart, null, bWordChart ? wordChart.width : c_oAscChartDefines.defaultChartWidth, bWordChart ? wordChart.height : c_oAscChartDefines.defaultChartHeight, isNewChart);
if ( !chartBase64 ) if ( !chartBase64 )
return false; return false;
...@@ -2327,8 +2544,8 @@ function DrawingObjects() { ...@@ -2327,8 +2544,8 @@ function DrawingObjects() {
obj.chart = chart; obj.chart = chart;
// center // center
var chartLeft = options && options.left ? ptToPx(options.left) : (parseInt($("#ws-canvas").css('width')) / 2) - ChartDefines.defaultChartWidth / 2; var chartLeft = options && options.left ? ptToPx(options.left) : (parseInt($("#ws-canvas").css('width')) / 2) - c_oAscChartDefines.defaultChartWidth / 2;
var chartTop = options && options.top ? ptToPx(options.top) : (parseInt($("#ws-canvas").css('height')) / 2) - ChartDefines.defaultChartHeight / 2; var chartTop = options && options.top ? ptToPx(options.top) : (parseInt($("#ws-canvas").css('height')) / 2) - c_oAscChartDefines.defaultChartHeight / 2;
obj.from.col = worksheet._findColUnderCursor(pxToPt(chartLeft), true).col; obj.from.col = worksheet._findColUnderCursor(pxToPt(chartLeft), true).col;
obj.from.row = worksheet._findRowUnderCursor(pxToPt(chartTop), true).row; obj.from.row = worksheet._findRowUnderCursor(pxToPt(chartTop), true).row;
...@@ -2412,7 +2629,7 @@ function DrawingObjects() { ...@@ -2412,7 +2629,7 @@ function DrawingObjects() {
History.StartTransaction(); History.StartTransaction();
var copyObject = _this.cloneDrawingObject(obj); var copyObject = _this.cloneDrawingObject(obj);
copyObject.flags.transactionState = TransactionState.Start; copyObject.flags.transactionState = c_oAscTransactionState.Start;
History.Add(g_oUndoRedoDrawingObject, historyitem_DrawingObject_Edit, worksheet.model.getId(), null, copyObject); History.Add(g_oUndoRedoDrawingObject, historyitem_DrawingObject_Edit, worksheet.model.getId(), null, copyObject);
// asc to self // asc to self
...@@ -2421,25 +2638,25 @@ function DrawingObjects() { ...@@ -2421,25 +2638,25 @@ function DrawingObjects() {
bRebuidSeries = true; bRebuidSeries = true;
obj.chart.range = chart.range; obj.chart.range = chart.range;
var _range = _this.formulaToRange(obj.chart.range.interval, worksheet); var _range = convertFormula(obj.chart.range.interval, worksheet);
if (_range) if (_range)
obj.chart.range.intervalObject = _range; obj.chart.range.intervalObject = _range;
obj.chart.type = chart.type; obj.chart.type = chart.type;
obj.chart.subType = chart.subType; obj.chart.subType = chart.subType;
obj.chart.title = chart.title; obj.chart.header = chart.header;
obj.chart.subTitle = chart.subTitle;
obj.chart.xAxis = chart.xAxis; obj.chart.xAxis = chart.xAxis;
obj.chart.yAxis = chart.yAxis; obj.chart.yAxis = chart.yAxis;
obj.chart.showValue = chart.showValue; obj.chart.bShowValue = chart.bShowValue;
obj.chart.bShowBorder = chart.bShowBorder;
obj.chart.styleId = chart.styleId; obj.chart.styleId = chart.styleId;
obj.chart.legend = chart.legend; obj.chart.legend = chart.legend;
if ( bRebuidSeries ) if ( bRebuidSeries )
obj.chart.buildSeries(); obj.chart.rebuildSeries();
var copyObject = _this.cloneDrawingObject(obj); var copyObject = _this.cloneDrawingObject(obj);
copyObject.flags.transactionState = TransactionState.Stop; copyObject.flags.transactionState = c_oAscTransactionState.Stop;
History.Add(g_oUndoRedoDrawingObject, historyitem_DrawingObject_Edit, worksheet.model.getId(), null, copyObject); History.Add(g_oUndoRedoDrawingObject, historyitem_DrawingObject_Edit, worksheet.model.getId(), null, copyObject);
History.EndTransaction(); History.EndTransaction();
...@@ -2792,12 +3009,12 @@ function DrawingObjects() { ...@@ -2792,12 +3009,12 @@ function DrawingObjects() {
if (changedRange || metrics) { if (changedRange || metrics) {
var copyObject = _this.cloneDrawingObject(obj); var copyObject = _this.cloneDrawingObject(obj);
copyObject.flags.transactionState = TransactionState.Start; copyObject.flags.transactionState = c_oAscTransactionState.Start;
History.Add(g_oUndoRedoDrawingObject, historyitem_DrawingObject_Edit, worksheet.model.getId(), null, copyObject); History.Add(g_oUndoRedoDrawingObject, historyitem_DrawingObject_Edit, worksheet.model.getId(), null, copyObject);
if (changedRange) { if (changedRange) {
obj.chart.range.intervalObject = changedRange; obj.chart.range.intervalObject = changedRange;
obj.chart.range.calcInterval(); _this.calcChartInterval(obj.chart);
} }
if (metrics) { if (metrics) {
obj.from.col = metrics.from.col; obj.from.col = metrics.from.col;
...@@ -2812,7 +3029,7 @@ function DrawingObjects() { ...@@ -2812,7 +3029,7 @@ function DrawingObjects() {
} }
var copyObject = _this.cloneDrawingObject(obj); var copyObject = _this.cloneDrawingObject(obj);
copyObject.flags.transactionState = TransactionState.Stop; copyObject.flags.transactionState = c_oAscTransactionState.Stop;
History.Add(g_oUndoRedoDrawingObject, historyitem_DrawingObject_Edit, worksheet.model.getId(), null, copyObject); History.Add(g_oUndoRedoDrawingObject, historyitem_DrawingObject_Edit, worksheet.model.getId(), null, copyObject);
} }
...@@ -2829,8 +3046,8 @@ function DrawingObjects() { ...@@ -2829,8 +3046,8 @@ function DrawingObjects() {
var copyObject = _this.cloneDrawingObject(chartObject); var copyObject = _this.cloneDrawingObject(chartObject);
copyObject.chart.range.intervalObject = worksheet._getRange(oBBoxTo.c1, oBBoxTo.r1, oBBoxTo.c2, oBBoxTo.r2); copyObject.chart.range.intervalObject = worksheet._getRange(oBBoxTo.c1, oBBoxTo.r1, oBBoxTo.c2, oBBoxTo.r2);
copyObject.chart.range.calcInterval(); _this.calcChartInterval(copyObject.chart);
copyObject.chart.buildSeries(); copyObject.chart.rebuildSeries();
_this.unselectDrawingObjects(); _this.unselectDrawingObjects();
chartObject.flags.selected = true; chartObject.flags.selected = true;
...@@ -2858,6 +3075,49 @@ function DrawingObjects() { ...@@ -2858,6 +3075,49 @@ function DrawingObjects() {
} }
} }
//-----------------------------------------------------------------------------------
// Chart
//-----------------------------------------------------------------------------------
_this.checkChartInterval = function(type, subtype, interval, isRows) {
var result = false;
if (interval && worksheet) {
var _range = convertFormula(interval, worksheet);
if (_range && checkDataRange(type, subtype, _range, isRows, worksheet))
result = true;
}
return result;
}
_this.calcChartInterval = function(chart) {
if (chart.range.intervalObject) {
var box = chart.range.intervalObject.getBBox0();
var startCell = new CellAddress(box.r1, box.c1, 0);
var endCell = new CellAddress(box.r2, box.c2, 0);
if (startCell && endCell) {
if (startCell.getID() == endCell.getID())
chart.range.interval = startCell.getID();
else {
var wsName = chart.range.intervalObject.worksheet.sName;
if ( !rx_test_ws_name.test(wsName) )
wsName = "'" + wsName + "'";
chart.range.interval = wsName + "!" + startCell.getID() + ":" + endCell.getID();
}
}
}
}
_this.intervalToIntervalObject = function(chart) {
if (chart.range.interval && worksheet) {
var _range = convertFormula(chart.range.interval, worksheet);
if (_range)
chart.range.intervalObject = _range;
}
}
//----------------------------------------------------------------------------------- //-----------------------------------------------------------------------------------
// Asc // Asc
//----------------------------------------------------------------------------------- //-----------------------------------------------------------------------------------
...@@ -3193,7 +3453,7 @@ function DrawingObjects() { ...@@ -3193,7 +3453,7 @@ function DrawingObjects() {
if (obj.canDraw() && obj.isChart()) { if (obj.canDraw() && obj.isChart()) {
if ( !obj.chart.range.intervalObject ) if ( !obj.chart.range.intervalObject )
obj.chart.range.intervalToIntervalObject(); _this.intervalToIntervalObject(obj.chart);
// Проверка для id листа // Проверка для id листа
if (obj.chart.range.intervalObject.worksheet.Id != worksheet.model.Id) if (obj.chart.range.intervalObject.worksheet.Id != worksheet.model.Id)
......
Common/Charts/charts.js
View file @ d1cf17e4
...@@ -26,7 +26,6 @@ function ChartRender() { ...@@ -26,7 +26,6 @@ function ChartRender() {
} }
} }
//var arrBaseColors = ["#4572A7", "#AA4643", "#89A54E", "#71588F", "#4198AF", "#DB843D"];
var arrBaseColors = []; var arrBaseColors = [];
function ChartStyleManager() { function ChartStyleManager() {
...@@ -287,9 +286,9 @@ function ChartPreviewManager() { ...@@ -287,9 +286,9 @@ function ChartPreviewManager() {
// Create and minimize properties // Create and minimize properties
var chart = new CChartData(false); var chart = new CChartData(false);
chart.xAxis.show = chart.xAxis.grid = false; chart.xAxis.bShow = chart.xAxis.bGrid = false;
chart.yAxis.show = chart.yAxis.grid = false; chart.yAxis.bShow = chart.yAxis.bGrid = false;
chart.legend.show = false; chart.legend.bShow = false;
chart.type = chartType; chart.type = chartType;
chart.styleId = parseInt(style); chart.styleId = parseInt(style);
...@@ -635,6 +634,7 @@ function calcAllMargin(isFormatCell,isformatCellScOy,minX,maxX,minY,maxY) { ...@@ -635,6 +634,7 @@ function calcAllMargin(isFormatCell,isformatCellScOy,minX,maxX,minY,maxY) {
//----------------------------------------------------------------------------------- //-----------------------------------------------------------------------------------
// Draw // Draw
//----------------------------------------------------------------------------------- //-----------------------------------------------------------------------------------
function checkDataRange(type,subType,dataRange,isRows,worksheet) { function checkDataRange(type,subType,dataRange,isRows,worksheet) {
var columns = false; var columns = false;
var rows = false; var rows = false;
...@@ -1387,12 +1387,12 @@ function drawChart(chart, arrValues, width, height) { ...@@ -1387,12 +1387,12 @@ function drawChart(chart, arrValues, width, height) {
break; break;
} }
if(!chart.yAxis.show) if(!chart.yAxis.bShow)
{ {
bar._otherProps._ylabels = false; bar._otherProps._ylabels = false;
bar._otherProps._noyaxis = true; bar._otherProps._noyaxis = true;
} }
if(!chart.xAxis.show) if(!chart.xAxis.bShow)
{ {
bar._otherProps._xlabels = false; bar._otherProps._xlabels = false;
bar._otherProps._noxaxis = true; bar._otherProps._noxaxis = true;
...@@ -1416,8 +1416,8 @@ function drawChart(chart, arrValues, width, height) { ...@@ -1416,8 +1416,8 @@ function drawChart(chart, arrValues, width, height) {
chart.yAxis.title = defaultYTitle; chart.yAxis.title = defaultYTitle;
if((!chart.xAxis.title || chart.xAxis.title == null || chart.xAxis.title == undefined || chart.xAxis.title == '') && chart.xAxis.bDefaultTitle) if((!chart.xAxis.title || chart.xAxis.title == null || chart.xAxis.title == undefined || chart.xAxis.title == '') && chart.xAxis.bDefaultTitle)
chart.xAxis.title = defaultXTitle; chart.xAxis.title = defaultXTitle;
if((!chart.title || chart.title == null || chart.title == undefined || chart.title == '') && chart.bDefaultTitle) if((!chart.header.title || chart.header.title == null || chart.header.title == undefined || chart.header.title == '') && chart.header.bDefaultTitle)
chart.title = defaultTitle; chart.header.title = defaultTitle;
if (chart.yAxis.title) if (chart.yAxis.title)
bar._chartGutter._left = 35 + 29; bar._chartGutter._left = 35 + 29;
...@@ -1433,7 +1433,7 @@ function drawChart(chart, arrValues, width, height) { ...@@ -1433,7 +1433,7 @@ function drawChart(chart, arrValues, width, height) {
//bar.Draw(); //bar.Draw();
// Легенда // Легенда
if (chart.legend.show && chart.legend.position != '') { if (chart.legend.bShow && chart.legend.position != '') {
bar._otherProps._key_position = 'graph'; bar._otherProps._key_position = 'graph';
bar._otherProps._key = []; bar._otherProps._key = [];
bar._otherProps._key_halign = chart.legend.position; bar._otherProps._key_halign = chart.legend.position;
...@@ -1494,9 +1494,9 @@ function drawChart(chart, arrValues, width, height) { ...@@ -1494,9 +1494,9 @@ function drawChart(chart, arrValues, width, height) {
// Подписи данных // Подписи данных
if(chart.type != 'Stock') if(chart.type != 'Stock')
{ {
if (chart.showValue && bar.type == 'pie') if (chart.bShowValue && bar.type == 'pie')
bar._otherProps._labels = data[0]; bar._otherProps._labels = data[0];
else if (chart.showValue) else if (chart.bShowValue)
bar._otherProps._labels_above = true; bar._otherProps._labels_above = true;
else else
bar._otherProps._labels_above = false; bar._otherProps._labels_above = false;
...@@ -1504,8 +1504,8 @@ function drawChart(chart, arrValues, width, height) { ...@@ -1504,8 +1504,8 @@ function drawChart(chart, arrValues, width, height) {
} }
// Название // Название
if (chart.title) { if (chart.header.title) {
bar._chartTitle._text = chart.title; bar._chartTitle._text = chart.header.title;
bar._chartTitle._vpos = 32; bar._chartTitle._vpos = 32;
bar._chartTitle._hpos = 0.5; bar._chartTitle._hpos = 0.5;
bar._chartTitle._size = 18; bar._chartTitle._size = 18;
...@@ -1513,7 +1513,7 @@ function drawChart(chart, arrValues, width, height) { ...@@ -1513,7 +1513,7 @@ function drawChart(chart, arrValues, width, height) {
if (chart.xAxis.title) { if (chart.xAxis.title) {
var legendTop = 0; var legendTop = 0;
var widthXtitle = bar.context.measureText(chart.xAxis.title).width var widthXtitle = bar.context.measureText(chart.xAxis.title).width;
if(chart.legend.position == 'bottom') if(chart.legend.position == 'bottom')
legendTop = 30; legendTop = 30;
bar._xAxisTitle._text = chart.xAxis.title; bar._xAxisTitle._text = chart.xAxis.title;
...@@ -1521,7 +1521,7 @@ function drawChart(chart, arrValues, width, height) { ...@@ -1521,7 +1521,7 @@ function drawChart(chart, arrValues, width, height) {
} }
if (chart.yAxis.title) { if (chart.yAxis.title) {
var widthYtitle = bar.context.measureText(chart.yAxis.title).width var widthYtitle = bar.context.measureText(chart.yAxis.title).width;
bar._yAxisTitle._text = chart.yAxis.title; bar._yAxisTitle._text = chart.yAxis.title;
bar._yAxisTitle._align = 'rev'; bar._yAxisTitle._align = 'rev';
var keyLeft = 0; var keyLeft = 0;
...@@ -1532,8 +1532,8 @@ function drawChart(chart, arrValues, width, height) { ...@@ -1532,8 +1532,8 @@ function drawChart(chart, arrValues, width, height) {
} }
// Основная сетка // Основная сетка
bar._otherProps._background_grid_hlines = chart.xAxis.grid; bar._otherProps._background_grid_hlines = chart.xAxis.bGrid;
bar._otherProps._background_grid_vlines = chart.yAxis.grid; bar._otherProps._background_grid_vlines = chart.yAxis.bGrid;
var axis; var axis;
calcGutter(axis,chart.min,chart.max,chart.ymin,chart.ymax,chart.isSkip,chart.isFormatCell); calcGutter(axis,chart.min,chart.max,chart.ymin,chart.ymax,chart.isSkip,chart.isFormatCell);
...@@ -1555,7 +1555,10 @@ function drawChart(chart, arrValues, width, height) { ...@@ -1555,7 +1555,10 @@ function drawChart(chart, arrValues, width, height) {
bar.Draw(chart.min,chart.max,chart.ymin,chart.ymax,chart.isSkip,chart.isFormatCell,chart.isformatCellScOy); bar.Draw(chart.min,chart.max,chart.ymin,chart.ymax,chart.isSkip,chart.isFormatCell,chart.isformatCellScOy);
} }
// //-----------------------------------------------------------------------------------
// Chart types
//-----------------------------------------------------------------------------------
function DrawScatterChart(chartCanvas, chartSubType, data, chart) { function DrawScatterChart(chartCanvas, chartSubType, data, chart) {
var colors = generateColors(data.length * data[0].length, arrBaseColors); var colors = generateColors(data.length * data[0].length, arrBaseColors);
...@@ -1646,6 +1649,7 @@ function DrawScatterChart(chartCanvas, chartSubType, data, chart) { ...@@ -1646,6 +1649,7 @@ function DrawScatterChart(chartCanvas, chartSubType, data, chart) {
//addOptions('chart.gutter.bottom',50); //addOptions('chart.gutter.bottom',50);
bar._chartGutter._bottom = 30; bar._chartGutter._bottom = 30;
//для соединения линий //для соединения линий
bar._otherProps._area_border = chart.bShowBorder;
bar._otherProps._line = true; bar._otherProps._line = true;
bar._otherProps._linewidth = 2; bar._otherProps._linewidth = 2;
bar._otherProps._background_grid_color = 'graytext'; bar._otherProps._background_grid_color = 'graytext';
...@@ -1703,6 +1707,7 @@ function DrawPieChart(chartCanvas, chartSubType, data, chart) { ...@@ -1703,6 +1707,7 @@ function DrawPieChart(chartCanvas, chartSubType, data, chart) {
//для разрезанной кольцевой или разрезанной круговой //для разрезанной кольцевой или разрезанной круговой
//bar._otherProps._exploded = 15; //bar._otherProps._exploded = 15;
bar._otherProps._area_border = chart.bShowBorder;
bar._otherProps._ylabels_count = 'auto'; bar._otherProps._ylabels_count = 'auto';
bar._otherProps._colors = ['steelblue', 'IndianRed', 'Silver']; bar._otherProps._colors = ['steelblue', 'IndianRed', 'Silver'];
bar._chartGutter._left = 45; bar._chartGutter._left = 45;
...@@ -1778,6 +1783,7 @@ function DrawLineChart(chartCanvas, chartType, chartSubType, data, chart) { ...@@ -1778,6 +1783,7 @@ function DrawLineChart(chartCanvas, chartType, chartSubType, data, chart) {
bar._chartGutter._bottom = 35; bar._chartGutter._bottom = 35;
} }
bar._otherProps._area_border = chart.bShowBorder;
bar._otherProps._background_grid_autofit_numvlines = data.length; bar._otherProps._background_grid_autofit_numvlines = data.length;
bar._otherProps._background_grid_color = 'graytext'; bar._otherProps._background_grid_color = 'graytext';
bar._otherProps._background_barcolor1 = 'white'; bar._otherProps._background_barcolor1 = 'white';
...@@ -1862,6 +1868,7 @@ function DrawBarChart(chartCanvas, chartSubType, data, chart) { ...@@ -1862,6 +1868,7 @@ function DrawBarChart(chartCanvas, chartSubType, data, chart) {
} }
} }
bar._otherProps._area_border = chart.bShowBorder;
bar._otherProps._ylabels_count = 'auto'; bar._otherProps._ylabels_count = 'auto';
bar._otherProps._variant = 'bar'; bar._otherProps._variant = 'bar';
bar._chartGutter._left = 35; bar._chartGutter._left = 35;
...@@ -1949,6 +1956,7 @@ function DrawHBarChart(chartCanvas, chartSubType, data, chart) { ...@@ -1949,6 +1956,7 @@ function DrawHBarChart(chartCanvas, chartSubType, data, chart) {
} }
//bar._otherProps._labels = ['Monday','Tuesday','Wednesday','Thursday','Friday','Saturday','Sunday']; //bar._otherProps._labels = ['Monday','Tuesday','Wednesday','Thursday','Friday','Saturday','Sunday'];
bar._otherProps._area_border = chart.bShowBorder;
bar._otherProps._ylabels_count = 'auto'; bar._otherProps._ylabels_count = 'auto';
bar._chartGutter._left = 35; bar._chartGutter._left = 35;
bar._chartGutter._bottom = 35; bar._chartGutter._bottom = 35;
......
Common/Charts/libraries/OfficeExcel.bar.js
View file @ d1cf17e4
...@@ -282,7 +282,7 @@ ...@@ -282,7 +282,7 @@
this.context.fillRect(0,0,this.canvas.width,this.canvas.height); this.context.fillRect(0,0,this.canvas.width,this.canvas.height);
// border // border
if ( !g_bChartPreview ) { if ( !g_bChartPreview && this._otherProps._area_border ) {
this.context.beginPath(); this.context.beginPath();
this.context.rect(0, 0, this.canvas.width,this.canvas.height); this.context.rect(0, 0, this.canvas.width,this.canvas.height);
this.context.strokeStyle = "black"; this.context.strokeStyle = "black";
......
Common/Charts/libraries/OfficeExcel.chartProperties.js
View file @ d1cf17e4
...@@ -178,6 +178,7 @@ OfficeExcel.OtherProps = function() ...@@ -178,6 +178,7 @@ OfficeExcel.OtherProps = function()
this._borders = true; this._borders = true;
this._border = false; this._border = false;
this._area_border = true; // ãðàíèöà äëÿ âñåé îáëàñòè äèàãðàììû
this._border_color = 'rgba(255,255,255,0.5)'; this._border_color = 'rgba(255,255,255,0.5)';
this._align = 'center'; this._align = 'center';
......
Common/Charts/libraries/OfficeExcel.hbar.js
View file @ d1cf17e4
...@@ -416,7 +416,7 @@ ...@@ -416,7 +416,7 @@
//this.context.strokeRect(10,10,this.canvas.width-150,this.canvas.height-150) //this.context.strokeRect(10,10,this.canvas.width-150,this.canvas.height-150)
// border // border
if ( !g_bChartPreview ) { if ( !g_bChartPreview && this._otherProps._area_border ) {
this.context.beginPath(); this.context.beginPath();
this.context.rect(0, 0, this.canvas.width,this.canvas.height); this.context.rect(0, 0, this.canvas.width,this.canvas.height);
this.context.strokeStyle = "black"; this.context.strokeStyle = "black";
......
Common/Charts/libraries/OfficeExcel.line.js
View file @ d1cf17e4
...@@ -499,7 +499,7 @@ ...@@ -499,7 +499,7 @@
//this.context.strokeRect(10,10,this.canvas.width-150,this.canvas.height-150) //this.context.strokeRect(10,10,this.canvas.width-150,this.canvas.height-150)
// border // border
if ( !g_bChartPreview ) { if ( !g_bChartPreview && this._otherProps._area_border ) {
this.context.beginPath(); this.context.beginPath();
this.context.rect(0, 0, this.canvas.width,this.canvas.height); this.context.rect(0, 0, this.canvas.width,this.canvas.height);
this.context.strokeStyle = "black"; this.context.strokeStyle = "black";
......
Common/Charts/libraries/OfficeExcel.pie.js
View file @ d1cf17e4
...@@ -540,7 +540,7 @@ ...@@ -540,7 +540,7 @@
//this.context.strokeRect(10,10,this.canvas.width-150,this.canvas.height-150) //this.context.strokeRect(10,10,this.canvas.width-150,this.canvas.height-150)
// border // border
if ( !g_bChartPreview ) { if ( !g_bChartPreview && this._otherProps._area_border ) {
this.context.beginPath(); this.context.beginPath();
this.context.rect(0, 0, this.canvas.width,this.canvas.height); this.context.rect(0, 0, this.canvas.width,this.canvas.height);
this.context.strokeStyle = "black"; this.context.strokeStyle = "black";
......
Common/Charts/libraries/OfficeExcel.scatter.js
View file @ d1cf17e4
...@@ -480,7 +480,7 @@ ...@@ -480,7 +480,7 @@
//this.context.strokeRect(10,10,this.canvas.width-150,this.canvas.height-150) //this.context.strokeRect(10,10,this.canvas.width-150,this.canvas.height-150)
// border // border
if ( !g_bChartPreview ) { if ( !g_bChartPreview && this._otherProps._area_border ) {
this.context.beginPath(); this.context.beginPath();
this.context.rect(0, 0, this.canvas.width,this.canvas.height); this.context.rect(0, 0, this.canvas.width,this.canvas.height);
this.context.strokeStyle = "black"; this.context.strokeStyle = "black";
......
Common/SerializeCommonWordExcel.js
View file @ d1cf17e4
...@@ -886,7 +886,7 @@ function BinaryChartWriter(memory) ...@@ -886,7 +886,7 @@ function BinaryChartWriter(memory)
this.WriteChartContent = function(chart) this.WriteChartContent = function(chart)
{ {
var oThis = this; var oThis = this;
if(null != chart.legend && true == chart.legend.show) if(null != chart.legend && true == chart.legend.bShow)
this.bs.WriteItem(c_oSer_ChartType.Legend, function(){oThis.WriteLegend(chart.legend);}); this.bs.WriteItem(c_oSer_ChartType.Legend, function(){oThis.WriteLegend(chart.legend);});
if(null != chart.title && ("" != chart.title || true == chart.bDefaultTitle)) if(null != chart.title && ("" != chart.title || true == chart.bDefaultTitle))
{ {
...@@ -913,8 +913,8 @@ function BinaryChartWriter(memory) ...@@ -913,8 +913,8 @@ function BinaryChartWriter(memory)
if(null != byteLegendPos) if(null != byteLegendPos)
this.bs.WriteItem(c_oSer_ChartLegendType.LegendPos, function(){oThis.memory.WriteByte(byteLegendPos);}); this.bs.WriteItem(c_oSer_ChartLegendType.LegendPos, function(){oThis.memory.WriteByte(byteLegendPos);});
} }
if(null != legend.overlay) if(null != legend.bOverlay)
this.bs.WriteItem(c_oSer_ChartLegendType.Overlay, function(){oThis.memory.WriteBool(legend.overlay);}); this.bs.WriteItem(c_oSer_ChartLegendType.Overlay, function(){oThis.memory.WriteBool(legend.bOverlay);});
}; };
this.WritePlotArea = function(chart) this.WritePlotArea = function(chart)
{ {
...@@ -946,10 +946,10 @@ function BinaryChartWriter(memory) ...@@ -946,10 +946,10 @@ function BinaryChartWriter(memory)
this.memory.WriteByte(c_oSer_ChartCatAxType.Title); this.memory.WriteByte(c_oSer_ChartCatAxType.Title);
this.memory.WriteString2(axis.title); this.memory.WriteString2(axis.title);
} }
if(null != axis.grid) if(null != axis.bGrid)
this.bs.WriteItem(c_oSer_ChartCatAxType.MajorGridlines, function(){oThis.memory.WriteBool(axis2.grid);}); this.bs.WriteItem(c_oSer_ChartCatAxType.MajorGridlines, function(){oThis.memory.WriteBool(axis2.bGrid);});
if(null != axis.show) if(null != axis.bShow)
this.bs.WriteItem(c_oSer_ChartCatAxType.Delete, function(){oThis.memory.WriteBool(!axis.show);}); this.bs.WriteItem(c_oSer_ChartCatAxType.Delete, function(){oThis.memory.WriteBool(!axis.bShow);});
if(bBottom) if(bBottom)
this.bs.WriteItem(c_oSer_ChartCatAxType.AxPos, function(){oThis.memory.WriteByte(EChartAxPos.chartaxposBottom);}); this.bs.WriteItem(c_oSer_ChartCatAxType.AxPos, function(){oThis.memory.WriteByte(EChartAxPos.chartaxposBottom);});
else else
...@@ -1025,7 +1025,7 @@ function BinaryChartWriter(memory) ...@@ -1025,7 +1025,7 @@ function BinaryChartWriter(memory)
this.bs.WriteItemWithLength(function(){oThis.WriteSeries(chartRange, chart.data, chart.type);}); this.bs.WriteItemWithLength(function(){oThis.WriteSeries(chartRange, chart.data, chart.type);});
} }
} }
if(null != chart.showValue) if(null != chart.bShowValue)
{ {
this.memory.WriteByte(c_oSer_BasicChartType.DataLabels); this.memory.WriteByte(c_oSer_BasicChartType.DataLabels);
this.memory.WriteByte(c_oSerPropLenType.Variable); this.memory.WriteByte(c_oSerPropLenType.Variable);
...@@ -1212,17 +1212,17 @@ function BinaryChartWriter(memory) ...@@ -1212,17 +1212,17 @@ function BinaryChartWriter(memory)
{ {
this.memory.WriteByte(c_oSer_ChartSeriesMarkerType.Symbol); this.memory.WriteByte(c_oSer_ChartSeriesMarkerType.Symbol);
this.memory.WriteByte(c_oSerPropLenType.Byte); this.memory.WriteByte(c_oSerPropLenType.Byte);
this.memory.WriteByte(marker.showValue); this.memory.WriteByte(marker.bShowValue);
} }
}; };
this.WriteDataLabels = function(chart) this.WriteDataLabels = function(chart)
{ {
var oThis = this; var oThis = this;
if(null != chart.showValue) if(null != chart.bShowValue)
{ {
this.memory.WriteByte(c_oSer_ChartSeriesDataLabelsType.ShowVal); this.memory.WriteByte(c_oSer_ChartSeriesDataLabelsType.ShowVal);
this.memory.WriteByte(c_oSerPropLenType.Byte); this.memory.WriteByte(c_oSerPropLenType.Byte);
this.memory.WriteBool(chart.showValue); this.memory.WriteBool(chart.bShowValue);
} }
}; };
} }
...@@ -1235,7 +1235,7 @@ function Binary_ChartReader(stream, chart) ...@@ -1235,7 +1235,7 @@ function Binary_ChartReader(stream, chart)
this.chartType = null; this.chartType = null;
this.PreRead = function() this.PreRead = function()
{ {
this.chart.legend.show = false; this.chart.legend.bShow = false;
} }
this.Read = function(length) this.Read = function(length)
{ {
...@@ -1277,16 +1277,16 @@ function Binary_ChartReader(stream, chart) ...@@ -1277,16 +1277,16 @@ function Binary_ChartReader(stream, chart)
var oThis = this; var oThis = this;
if ( c_oSer_ChartType.Legend === type ) if ( c_oSer_ChartType.Legend === type )
{ {
this.chart.legend.show = true; this.chart.legend.bShow = true;
res = this.bcr.Read1(length, function(t,l){ res = this.bcr.Read1(length, function(t,l){
return oThis.ReadLegend(t,l); return oThis.ReadLegend(t,l);
}); });
} }
else if ( c_oSer_ChartType.Title === type ) else if ( c_oSer_ChartType.Title === type )
{ {
this.chart.title = this.stream.GetString2LE(length); this.chart.header.title = this.stream.GetString2LE(length);
if("" == this.chart.title) if("" == this.chart.header.title)
this.chart.bDefaultTitle = true; this.chart.header.bDefaultTitle = true;
} }
else if ( c_oSer_ChartType.PlotArea === type ) else if ( c_oSer_ChartType.PlotArea === type )
{ {
...@@ -1318,8 +1318,8 @@ function Binary_ChartReader(stream, chart) ...@@ -1318,8 +1318,8 @@ function Binary_ChartReader(stream, chart)
} }
} }
} }
this.chart.xAxis.show = this.chart.yAxis.show = false; this.chart.xAxis.bShow = this.chart.yAxis.bShow = false;
this.chart.xAxis.grid = this.chart.yAxis.grid = false; this.chart.xAxis.bGrid = this.chart.yAxis.bGrid = false;
var fExecAxis = function(oFrom, oTo) var fExecAxis = function(oFrom, oTo)
{ {
for(var i in oFrom) for(var i in oFrom)
...@@ -1330,9 +1330,9 @@ function Binary_ChartReader(stream, chart) ...@@ -1330,9 +1330,9 @@ function Binary_ChartReader(stream, chart)
if(null != yAxis) if(null != yAxis)
fExecAxis(yAxis, this.chart.yAxis); fExecAxis(yAxis, this.chart.yAxis);
// //
var bTemp = this.chart.xAxis.grid; var bTemp = this.chart.xAxis.bGrid;
this.chart.xAxis.grid = this.chart.yAxis.grid; this.chart.xAxis.bGrid = this.chart.yAxis.bGrid;
this.chart.yAxis.grid = bTemp; this.chart.yAxis.bGrid = bTemp;
if(c_oAscChartType.hbar == this.chartType) if(c_oAscChartType.hbar == this.chartType)
{ {
var oTemp = this.chart.xAxis; var oTemp = this.chart.xAxis;
...@@ -1372,7 +1372,7 @@ function Binary_ChartReader(stream, chart) ...@@ -1372,7 +1372,7 @@ function Binary_ChartReader(stream, chart)
} }
} }
else if ( c_oSer_ChartLegendType.Overlay === type ) else if ( c_oSer_ChartLegendType.Overlay === type )
this.chart.legend.overlay = this.stream.GetBool(); this.chart.legend.bOverlay = this.stream.GetBool();
else else
res = c_oSerConstants.ReadUnknown; res = c_oSerConstants.ReadUnknown;
return res; return res;
...@@ -1452,9 +1452,9 @@ function Binary_ChartReader(stream, chart) ...@@ -1452,9 +1452,9 @@ function Binary_ChartReader(stream, chart)
oAx.bDefaultTitle = true; oAx.bDefaultTitle = true;
} }
else if ( c_oSer_ChartCatAxType.MajorGridlines === type ) else if ( c_oSer_ChartCatAxType.MajorGridlines === type )
oAx.grid = this.stream.GetBool(); oAx.bGrid = this.stream.GetBool();
else if ( c_oSer_ChartCatAxType.Delete === type ) else if ( c_oSer_ChartCatAxType.Delete === type )
oAx.show = !this.stream.GetBool(); oAx.bShow = !this.stream.GetBool();
else if ( c_oSer_ChartCatAxType.AxPos === type ) else if ( c_oSer_ChartCatAxType.AxPos === type )
oAx.axPos = this.stream.GetUChar(); oAx.axPos = this.stream.GetUChar();
else else
...@@ -1624,7 +1624,7 @@ function Binary_ChartReader(stream, chart) ...@@ -1624,7 +1624,7 @@ function Binary_ChartReader(stream, chart)
var res = c_oSerConstants.ReadOk; var res = c_oSerConstants.ReadOk;
var oThis = this; var oThis = this;
if ( c_oSer_ChartSeriesDataLabelsType.ShowVal === type ) if ( c_oSer_ChartSeriesDataLabelsType.ShowVal === type )
this.chart.showValue = this.stream.GetBool(); this.chart.bShowValue = this.stream.GetBool();
else else
res = c_oSerConstants.ReadUnknown; res = c_oSerConstants.ReadUnknown;
return res; return res;
......
Common/commonDefines.js
View file @ d1cf17e4
...@@ -56,3 +56,20 @@ var c_oAscChartType = { ...@@ -56,3 +56,20 @@ var c_oAscChartType = {
Accent5: 7, Accent5: 7,
Accent6: 8 Accent6: 8
}; };
var c_oAscTransactionState = {
No: -1,
Start: 0,
Stop: 1
};
var c_oAscCellAnchorType = {
cellanchorAbsolute: 0,
cellanchorOneCell: 1,
cellanchorTwoCell: 2
};
var c_oAscChartDefines = {
defaultChartWidth: 478,
defaultChartHeight: 286
};
\ No newline at end of file
Excel/SpreadsheetTestMenu.html
View file @ d1cf17e4
...@@ -2089,7 +2089,8 @@ ...@@ -2089,7 +2089,8 @@
<input type='text' style='margin-left: 10px;' id='xAxisTitle' value='X axis'><br> <input type='text' style='margin-left: 10px;' id='xAxisTitle' value='X axis'><br>
<span style='margin-left: 10px;'>Y axis title</span> <span style='margin-left: 10px;'>Y axis title</span>
<input type='text' style='margin-left: 10px;' id='yAxisTitle' value='Y axis'><br> <input type='text' style='margin-left: 10px;' id='yAxisTitle' value='Y axis'><br>
<input type='checkbox' id='valueShow' style='margin-left: 10px;'>Show values<br> <input type='checkbox' id='valueShow' style='margin-left: 10px;'>Show values
<input type='checkbox' id='borderShow' style='margin-left: 10px;'>Show border<br>
</fieldset> </fieldset>
<fieldset id="legendField"> <fieldset id="legendField">
<legend>Legend</legend> <legend>Legend</legend>
......
Excel/api.js
View file @ d1cf17e4
...@@ -1965,6 +1965,11 @@ var ASC_DOCS_API_USE_EMBEDDED_FONTS = "@@ASC_DOCS_API_USE_EMBEDDED_FONTS"; ...@@ -1965,6 +1965,11 @@ var ASC_DOCS_API_USE_EMBEDDED_FONTS = "@@ASC_DOCS_API_USE_EMBEDDED_FONTS";
} }
}, },
asc_checkChartInterval: function(type, subtype, interval, isRows) {
var ws = this.wb.getWorksheet();
return ws.objectRender.checkChartInterval(type, subtype, interval, isRows);
},
// Для вставки диаграмм в Word // Для вставки диаграмм в Word
asc_getBinaryFileWriter: function() { asc_getBinaryFileWriter: function() {
this.wb._initCommentsToSave(); this.wb._initCommentsToSave();
...@@ -2762,6 +2767,7 @@ var ASC_DOCS_API_USE_EMBEDDED_FONTS = "@@ASC_DOCS_API_USE_EMBEDDED_FONTS"; ...@@ -2762,6 +2767,7 @@ var ASC_DOCS_API_USE_EMBEDDED_FONTS = "@@ASC_DOCS_API_USE_EMBEDDED_FONTS";
prot["asc_deleteSelectedDrawingObject"] = prot.asc_deleteSelectedDrawingObject; prot["asc_deleteSelectedDrawingObject"] = prot.asc_deleteSelectedDrawingObject;
prot["asc_setSelectedDrawingObjectLayer"] = prot.asc_setSelectedDrawingObjectLayer; prot["asc_setSelectedDrawingObjectLayer"] = prot.asc_setSelectedDrawingObjectLayer;
prot["asc_getChartPreviews"] = prot.asc_getChartPreviews; prot["asc_getChartPreviews"] = prot.asc_getChartPreviews;
prot["asc_checkChartInterval"] = prot.asc_checkChartInterval;
prot["asc_getBinaryFileWriter"] = prot.asc_getBinaryFileWriter; prot["asc_getBinaryFileWriter"] = prot.asc_getBinaryFileWriter;
prot["asc_getWordChartObject"] = prot.asc_getWordChartObject; prot["asc_getWordChartObject"] = prot.asc_getWordChartObject;
prot["asc_cleanWorksheet"] = prot.asc_cleanWorksheet; prot["asc_cleanWorksheet"] = prot.asc_cleanWorksheet;
......
Excel/menu/menu.js
View file @ d1cf17e4
...@@ -2081,7 +2081,7 @@ ...@@ -2081,7 +2081,7 @@
chartForm.find("#chartRange").val(interval); chartForm.find("#chartRange").val(interval);
chartForm.find("#chartRange").bind("keyup", function() { chartForm.find("#chartRange").bind("keyup", function() {
var result = range.asc_checkInterval(chartForm.find("#chartType").val(),chartForm.find("#chartSubType").val(),chartForm.find("#chartRange").val(),chartForm.find("#dataRows").is(":checked")); var result = api.asc_checkChartInterval(chartForm.find("#chartType").val(), chartForm.find("#chartSubType").val(), chartForm.find("#chartRange").val(), chartForm.find("#dataRows").is(":checked"));
if (result) if (result)
chartForm.find("#chartRange").css("color", "black"); chartForm.find("#chartRange").css("color", "black");
else else
...@@ -2096,15 +2096,16 @@ ...@@ -2096,15 +2096,16 @@
else else
chartForm.find("#dataColumns").attr("checked", range.asc_getColumnsFlag()); chartForm.find("#dataColumns").attr("checked", range.asc_getColumnsFlag());
chartForm.find("#chartTitle").val(chart.asc_getTitle()); chartForm.find("#chartTitle").val(chart.asc_getHeader().asc_getTitle());
chartForm.find("#valueShow").attr("checked", chart.asc_getShowValueFlag()); chartForm.find("#valueShow").attr("checked", chart.asc_getShowValueFlag());
chartForm.find("#borderShow").attr("checked", chart.asc_getShowBorderFlag());
var xAxis = chart.asc_getXAxis(); var xAxis = chart.asc_getXAxis();
chartForm.find("#xAxisShow").attr("checked", xAxis.asc_getShowFlag()); chartForm.find("#xAxisShow").attr("checked", xAxis.asc_getShowFlag());
chartForm.find("#xGridShow").attr("checked", xAxis.asc_getGridFlag()); chartForm.find("#xGridShow").attr("checked", xAxis.asc_getGridFlag());
chartForm.find("#xAxisTitle").val(xAxis.asc_getTitle() ? xAxis.asc_getTitle() : ""); chartForm.find("#xAxisTitle").val(xAxis.asc_getTitle() ? xAxis.asc_getTitle() : "");
var yAxis = chart.asc_getXAxis(); var yAxis = chart.asc_getYAxis();
chartForm.find("#yAxisShow").attr("checked", yAxis.asc_getShowFlag()); chartForm.find("#yAxisShow").attr("checked", yAxis.asc_getShowFlag());
chartForm.find("#yGridShow").attr("checked", yAxis.asc_getGridFlag()); chartForm.find("#yGridShow").attr("checked", yAxis.asc_getGridFlag());
chartForm.find("#yAxisTitle").val(yAxis.asc_getTitle() ? yAxis.asc_getTitle() : ""); chartForm.find("#yAxisTitle").val(yAxis.asc_getTitle() ? yAxis.asc_getTitle() : "");
...@@ -2123,8 +2124,10 @@ ...@@ -2123,8 +2124,10 @@
var isSelected = (chart.type != null) && (chart.type != ""); var isSelected = (chart.type != null) && (chart.type != "");
var range = chart.asc_getRange(); var range = chart.asc_getRange();
if (!range.asc_checkInterval(chartForm.find("#chartType").val(),chartForm.find("#chartSubType").val(),chartForm.find("#chartRange").val(),chartForm.find("#dataRows").is(":checked")))
if ( !api.asc_checkChartInterval(chartForm.find("#chartType").val(),chartForm.find("#chartSubType").val(),chartForm.find("#chartRange").val(),chartForm.find("#dataRows").is(":checked")) )
return; return;
range.asc_setRowsFlag(chartForm.find("#dataRows").is(":checked")); range.asc_setRowsFlag(chartForm.find("#dataRows").is(":checked"));
range.asc_setColumnsFlag(chartForm.find("#dataColumns").is(":checked")); range.asc_setColumnsFlag(chartForm.find("#dataColumns").is(":checked"));
range.asc_setInterval(chartForm.find("#chartRange").val()); range.asc_setInterval(chartForm.find("#chartRange").val());
...@@ -2132,8 +2135,9 @@ ...@@ -2132,8 +2135,9 @@
chart.asc_setType(chartForm.find("#chartType").find("option:selected").val()); chart.asc_setType(chartForm.find("#chartType").find("option:selected").val());
chart.asc_setSubType(chartForm.find("#chartSubType").find("option:selected").val()); chart.asc_setSubType(chartForm.find("#chartSubType").find("option:selected").val());
chart.asc_setTitle(chartForm.find("#chartTitle").val()); chart.asc_getHeader().asc_setTitle(chartForm.find("#chartTitle").val());
chart.asc_setShowValueFlag(chartForm.find("#valueShow").is(":checked")); chart.asc_setShowValueFlag(chartForm.find("#valueShow").is(":checked"));
chart.asc_setShowBorderFlag(chartForm.find("#borderShow").is(":checked"));
if(chart.type != null && chart.type == 'Stock' && !isSelected) if(chart.type != null && chart.type == 'Stock' && !isSelected)
{ {
...@@ -2160,7 +2164,6 @@ ...@@ -2160,7 +2164,6 @@
var legend = chart.asc_getLegend(); var legend = chart.asc_getLegend();
legend.asc_setShowFlag(chartForm.find("#legendShow").is(":checked")); legend.asc_setShowFlag(chartForm.find("#legendShow").is(":checked"));
//legend.asc_setShowFlag(true);
legend.asc_setPosition(""); legend.asc_setPosition("");
if (chartForm.find("#legendLeft").is(":checked")) if (chartForm.find("#legendLeft").is(":checked"))
......
Excel/model/UndoRedo.js
View file @ d1cf17e4
...@@ -324,6 +324,14 @@ var UndoRedoDataTypes = new function() { ...@@ -324,6 +324,14 @@ var UndoRedoDataTypes = new function() {
this.SingleProperty = 33; this.SingleProperty = 33;
this.RgbColor = 34; this.RgbColor = 34;
this.ThemeColor = 35; this.ThemeColor = 35;
this.ChartData = 36;
this.ChartRange = 37;
this.ChartHeader = 38;
this.ChartAxisX = 39;
this.ChartAxisY = 40;
this.ChartLegend = 41;
this.ChartFont = 42;
this.Create = function(nType) this.Create = function(nType)
{ {
switch(nType) switch(nType)
...@@ -364,6 +372,13 @@ var UndoRedoDataTypes = new function() { ...@@ -364,6 +372,13 @@ var UndoRedoDataTypes = new function() {
case this.SingleProperty: return new UndoRedoData_SingleProperty(); break; case this.SingleProperty: return new UndoRedoData_SingleProperty(); break;
case this.RgbColor: return new RgbColor(); break; case this.RgbColor: return new RgbColor(); break;
case this.ThemeColor: return new ThemeColor(); break; case this.ThemeColor: return new ThemeColor(); break;
case this.ChartData: return new asc_CChart(); break;
case this.ChartRange: return new asc_CChartRange(); break;
case this.ChartHeader: return new asc_CChartHeader(); break;
case this.ChartAxisX: return new asc_CChartAxisX(); break;
case this.ChartAxisY: return new asc_CChartAxisY(); break;
case this.ChartLegend: return new asc_CChartLegend(); break;
case this.ChartFont: return new asc_CChartFont(); break;
} }
return null; return null;
}; };
...@@ -2021,12 +2036,12 @@ UndoRedoDrawingObject.prototype = { ...@@ -2021,12 +2036,12 @@ UndoRedoDrawingObject.prototype = {
if ( !api.wb ) if ( !api.wb )
return; return;
var ws = api.wb.getWorksheetById(nSheetId); var ws = api.wb.getWorksheetById(nSheetId);
var objectRender = ws.objectRender;
Data.worksheet = ws; Data.worksheet = ws;
if ( Data.isChart() ) if ( Data.isChart() )
Data.chart.range.intervalToIntervalObject(); objectRender.intervalToIntervalObject(Data.chart);
var objectRender = ws.objectRender;
if ( bUndo == true ) if ( bUndo == true )
objectRender.Undo(Type, Data); objectRender.Undo(Type, Data);
else 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