From 1559f66b4e6fe627536312eb0359a9c0928c33d8 Mon Sep 17 00:00:00 2001 From: Dmitriy Alexandrov Date: Tue, 25 Jul 2023 16:33:43 +0600 Subject: [PATCH 01/30] add class CAddress --- common/Drawings/Format/ChartEx.js | 92 +++++++++++++++++++++++++++++++ 1 file changed, 92 insertions(+) create mode 100644 common/Drawings/Format/ChartEx.js diff --git a/common/Drawings/Format/ChartEx.js b/common/Drawings/Format/ChartEx.js new file mode 100644 index 0000000000..ee4ba200e6 --- /dev/null +++ b/common/Drawings/Format/ChartEx.js @@ -0,0 +1,92 @@ +"use strict"; + +(/** + * @param {Window} window + * @param {undefined} undefined + */ + function(window, undefined) { + + var drawingsChangesMap = window['AscDFH'].drawingsChangesMap; + var drawingContentChanges = window['AscDFH'].drawingContentChanges; + + drawingsChangesMap[AscDFH.historyitem_Address_SetAddress1] = function(oClass, value) { + oClass.address1 = value; + }; + drawingsChangesMap[AscDFH.historyitem_Address_SetCountryRegion] = function(oClass, value) { + oClass.countryRegion = value; + }; + drawingsChangesMap[AscDFH.historyitem_Address_SetAdminDistrict1] = function(oClass, value) { + oClass.adminDistrict1 = value; + }; + drawingsChangesMap[AscDFH.historyitem_Address_SetAdminDistrict2] = function(oClass, value) { + oClass.adminDistrict2 = value; + }; + drawingsChangesMap[AscDFH.historyitem_Address_SetPostalCode] = function(oClass, value) { + oClass.postalCode = value; + }; + drawingsChangesMap[AscDFH.historyitem_Address_SetLocality] = function(oClass, value) { + oClass.locality = value; + }; + drawingsChangesMap[AscDFH.historyitem_Address_SetISOCountryCode] = function(oClass, value) { + oClass.isoCountryCode = value; + }; + + AscDFH.changesFactory[AscDFH.historyitem_Address_SetAddress1] = window['AscDFH'].CChangesDrawingsString; + AscDFH.changesFactory[AscDFH.historyitem_Address_SetCountryRegion] = window['AscDFH'].CChangesDrawingsString; + AscDFH.changesFactory[AscDFH.historyitem_Address_SetAdminDistrict1] = window['AscDFH'].CChangesDrawingsString; + AscDFH.changesFactory[AscDFH.historyitem_Address_SetAdminDistrict2] = window['AscDFH'].CChangesDrawingsString; + AscDFH.changesFactory[AscDFH.historyitem_Address_SetPostalCode] = window['AscDFH'].CChangesDrawingsString; + AscDFH.changesFactory[AscDFH.historyitem_Address_SetLocality] = window['AscDFH'].CChangesDrawingsString; + AscDFH.changesFactory[AscDFH.historyitem_Address_SetISOCountryCode] = window['AscDFH'].CChangesDrawingsString; + +// Import + const History = AscCommon.History; + var InitClass = AscFormat.InitClass; + var CBaseChartObject = AscFormat.CBaseChartObject; + + function CAddress() { + CBaseChartObject.call(this); + this.address1 = null; + this.countryRegion = null; + this.adminDistrict1 = null; + this.adminDistrict2 = null; + this.postalCode = null; + this.locality = null; + this.isoCountryCode = null; + } + + InitClass(CAddress, CBaseChartObject, AscDFH.historyitem_type_Address); + + CAddress.prototype.setAddress1 = function(pr) { + History.CanAddChanges() && History.Add(new CChangesDrawingsString(this, AscDFH.historyitem_Address_SetAddress1, this.address1, pr)); + this.address1 = pr; + }; + CAddress.prototype.setCountryRegion = function(pr) { + History.CanAddChanges() && History.Add(new CChangesDrawingsString(this, AscDFH.historyitem_Address_SetCountryRegion, this.countryRegion, pr)); + this.countryRegion = pr; + }; + CAddress.prototype.setAdminDistrict1 = function(pr) { + History.CanAddChanges() && History.Add(new CChangesDrawingsString(this, AscDFH.historyitem_Address_SetAdminDistrict1, this.adminDistrict1, pr)); + this.adminDistrict1 = pr; + }; + CAddress.prototype.setAdminDistrict2 = function(pr) { + History.CanAddChanges() && History.Add(new CChangesDrawingsString(this, AscDFH.historyitem_Address_SetAdminDistrict2, this.adminDistrict2, pr)); + this.adminDistrict2 = pr; + }; + CAddress.prototype.setPostalCode = function(pr) { + History.CanAddChanges() && History.Add(new CChangesDrawingsString(this, AscDFH.historyitem_Address_SetPostalCode, this.postalCode, pr)); + this.postalCode = pr; + }; + CAddress.prototype.setLocality = function(pr) { + History.CanAddChanges() && History.Add(new CChangesDrawingsString(this, AscDFH.historyitem_Address_SetLocality, this.locality, pr)); + this.locality = pr; + }; + CAddress.prototype.setISOCountryCode = function(pr) { + History.CanAddChanges() && History.Add(new CChangesDrawingsString(this, AscDFH.historyitem_Address_SetISOCountryCode, this.isoCountryCode, pr)); + this.isoCountryCode = pr; + }; + + //--------------------------------------------------------export---------------------------------------------------- + window['AscFormat'] = window['AscFormat'] || {}; + window['AscFormat'].CAddress = CAddress; +})(window); \ No newline at end of file From e9f0e86b4d390e9585fa0f69bda136a64099dae1 Mon Sep 17 00:00:00 2001 From: Dmitriy Alexandrov Date: Thu, 27 Jul 2023 14:21:49 +0600 Subject: [PATCH 02/30] add classes --- common/Drawings/Format/ChartEx.js | 347 ++++++++++++++++++++++++++++++ 1 file changed, 347 insertions(+) diff --git a/common/Drawings/Format/ChartEx.js b/common/Drawings/Format/ChartEx.js index ee4ba200e6..62487584c4 100644 --- a/common/Drawings/Format/ChartEx.js +++ b/common/Drawings/Format/ChartEx.js @@ -9,6 +9,7 @@ var drawingsChangesMap = window['AscDFH'].drawingsChangesMap; var drawingContentChanges = window['AscDFH'].drawingContentChanges; + // CAddress drawingsChangesMap[AscDFH.historyitem_Address_SetAddress1] = function(oClass, value) { oClass.address1 = value; }; @@ -31,6 +32,7 @@ oClass.isoCountryCode = value; }; + // CAddress AscDFH.changesFactory[AscDFH.historyitem_Address_SetAddress1] = window['AscDFH'].CChangesDrawingsString; AscDFH.changesFactory[AscDFH.historyitem_Address_SetCountryRegion] = window['AscDFH'].CChangesDrawingsString; AscDFH.changesFactory[AscDFH.historyitem_Address_SetAdminDistrict1] = window['AscDFH'].CChangesDrawingsString; @@ -85,6 +87,351 @@ History.CanAddChanges() && History.Add(new CChangesDrawingsString(this, AscDFH.historyitem_Address_SetISOCountryCode, this.isoCountryCode, pr)); this.isoCountryCode = pr; }; + + drawingsChangesMap[AscDFH.historyitem_Aggregation_SetTest] = function(oClass, value) { + oClass.test = value; + }; + AscDFH.changesFactory[AscDFH.historyitem_Aggregation_SetTest] = window['AscDFH'].CChangesDrawingsString; + function CAggregation() { // todo + CBaseChartObject.call(this); + this.test = null; + } + + InitClass(CAggregation, CBaseChartObject, AscDFH.historyitem_type_Aggregation); + + CAggregation.prototype.setTest = function(pr) { + History.CanAddChanges() && History.Add(new CChangesDrawingsString(this, AscDFH.historyitem_Address_SetTest, this.test, pr)); + this.test = pr; + }; + window['AscFormat'].CAggregation = CAggregation; + + // Axis + drawingsChangesMap[AscDFH.historyitem_Axis_SetCatScaling] = function(oClass, value) { + oClass.catScaling = value; + }; + drawingsChangesMap[AscDFH.historyitem_Axis_SetValScaling] = function(oClass, value) { + oClass.valScaling = value; + }; + drawingsChangesMap[AscDFH.historyitem_Axis_SetTitle] = function(oClass, value) { + oClass.title = value; + }; + drawingsChangesMap[AscDFH.historyitem_Axis_SetUnits] = function(oClass, value) { + oClass.units = value; + }; + drawingsChangesMap[AscDFH.historyitem_Axis_SetMajorGridlines] = function(oClass, value) { + oClass.majorGridlines = value; + }; + drawingsChangesMap[AscDFH.historyitem_Axis_SetMinorGridlines] = function(oClass, value) { + oClass.minorGridlines = value; + }; + drawingsChangesMap[AscDFH.historyitem_Axis_SetMajorTickMarks] = function(oClass, value) { + oClass.majorTickMarks = value; + }; + drawingsChangesMap[AscDFH.historyitem_Axis_SetMinorTickMarks] = function(oClass, value) { + oClass.minorTickMarks = value; + }; + drawingsChangesMap[AscDFH.historyitem_Axis_SetTickLabels] = function(oClass, value) { + oClass.tickLabels = value; + }; + drawingsChangesMap[AscDFH.historyitem_Axis_SetNumFmt] = function(oClass, value) { + oClass.numFmt = value; + }; + drawingsChangesMap[AscDFH.historyitem_Axis_SetSpPr] = function(oClass, value) { + oClass.spPr = value; + }; + drawingsChangesMap[AscDFH.historyitem_Axis_SetTxPr] = function(oClass, value) { + oClass.txPr = value; + }; + drawingsChangesMap[AscDFH.historyitem_Axis_SetExtLst] = function(oClass, value) { + oClass.extLst = value; + }; + drawingsChangesMap[AscDFH.historyitem_Axis_SetId] = function(oClass, value) { + oClass.id = value; + }; + drawingsChangesMap[AscDFH.historyitem_Axis_SetHidden] = function(oClass, value) { + oClass.hidden = value; + }; + AscDFH.changesFactory[AscDFH.historyitem_Axis_SetCatScaling] = window['AscDFH'].CChangesDrawingsString; + AscDFH.changesFactory[AscDFH.historyitem_Axis_SetValScaling] = window['AscDFH'].CChangesDrawingsString; + AscDFH.changesFactory[AscDFH.historyitem_Axis_SetTitle] = window['AscDFH'].CChangesDrawingsString; + AscDFH.changesFactory[AscDFH.historyitem_Axis_SetUnits] = window['AscDFH'].CChangesDrawingsString; + AscDFH.changesFactory[AscDFH.historyitem_Axis_SetMajorGridlines] = window['AscDFH'].CChangesDrawingsString; + AscDFH.changesFactory[AscDFH.historyitem_Axis_SetMinorGridlines] = window['AscDFH'].CChangesDrawingsString; + AscDFH.changesFactory[AscDFH.historyitem_Axis_SetMajorTickMarks] = window['AscDFH'].CChangesDrawingsString; + AscDFH.changesFactory[AscDFH.historyitem_Axis_SetMinorTickMarks] = window['AscDFH'].CChangesDrawingsString; + AscDFH.changesFactory[AscDFH.historyitem_Axis_SetTickLabels] = window['AscDFH'].CChangesDrawingsString; + AscDFH.changesFactory[AscDFH.historyitem_Axis_SetNumFmt] = window['AscDFH'].CChangesDrawingsString; + AscDFH.changesFactory[AscDFH.historyitem_Axis_SetSpPr] = window['AscDFH'].CChangesDrawingsString; + AscDFH.changesFactory[AscDFH.historyitem_Axis_SetTxPr] = window['AscDFH'].CChangesDrawingsString; + AscDFH.changesFactory[AscDFH.historyitem_Axis_SetExtLst] = window['AscDFH'].CChangesDrawingsString; + AscDFH.changesFactory[AscDFH.historyitem_Axis_SetId] = window['AscDFH'].CChangesDrawingsString; + AscDFH.changesFactory[AscDFH.historyitem_Axis_SetHidden] = window['AscDFH'].CChangesDrawingsString; + + function CAxis() { + CBaseChartObject.call(this); + this.catScaling = null; + this.valScaling = null; + this.title = null; + this.units = null; + this.majorGridlines = null; + this.minorGridlines = null; + this.majorTickMarks = null; + this.minorTickMarks = null; + this.tickLabels = null; + this.numFmt = null; + this.spPr = null; + this.txPr = null; + this.extLst = null; + this.id = null; + this.hidden = null; + } + + InitClass(CAxis, CBaseChartObject, AscDFH.historyitem_type_Axis); + + CAxis.prototype.setCatScaling = function(pr) { + History.CanAddChanges() && History.Add(new CChangesDrawingsString(this, AscDFH.historyitem_Axis_SetCatScaling, this.catScaling, pr)); + this.catScaling = pr; + }; + CAxis.prototype.setValScaling = function(pr) { + History.CanAddChanges() && History.Add(new CChangesDrawingsString(this, AscDFH.historyitem_Axis_SetValScaling, this.valScaling, pr)); + this.valScaling = pr; + }; + CAxis.prototype.setTitle = function(pr) { + History.CanAddChanges() && History.Add(new CChangesDrawingsString(this, AscDFH.historyitem_Axis_SetTitle, this.title, pr)); + this.title = pr; + }; + CAxis.prototype.setUnits = function(pr) { + History.CanAddChanges() && History.Add(new CChangesDrawingsString(this, AscDFH.historyitem_Axis_SetUnits, this.units, pr)); + this.units = pr; + }; + CAxis.prototype.setMajorGridlines = function(pr) { + History.CanAddChanges() && History.Add(new CChangesDrawingsString(this, AscDFH.historyitem_Axis_SetMajorGridlines, this.majorGridlines, pr)); + this.majorGridlines = pr; + }; + CAxis.prototype.setMinorGridlines = function(pr) { + History.CanAddChanges() && History.Add(new CChangesDrawingsString(this, AscDFH.historyitem_Axis_SetMinorGridlines, this.minorGridlines, pr)); + this.minorGridlines = pr; + }; + CAxis.prototype.setMajorTickMarks = function(pr) { + History.CanAddChanges() && History.Add(new CChangesDrawingsString(this, AscDFH.historyitem_Axis_SetMajorTickMarks, this.majorTickMarks, pr)); + this.majorTickMarks = pr; + }; + CAxis.prototype.setMinorTickMarks = function(pr) { + History.CanAddChanges() && History.Add(new CChangesDrawingsString(this, AscDFH.historyitem_Axis_SetMinorTickMarks, this.minorTickMarks, pr)); + this.minorTickMarks = pr; + }; + CAxis.prototype.setTickLabels = function(pr) { + History.CanAddChanges() && History.Add(new CChangesDrawingsString(this, AscDFH.historyitem_Axis_SetTickLabels, this.tickLabels, pr)); + this.tickLabels = pr; + }; + CAxis.prototype.setNumFmt = function(pr) { + History.CanAddChanges() && History.Add(new CChangesDrawingsString(this, AscDFH.historyitem_Axis_SetNumFmt, this.numFmt, pr)); + this.numFmt = pr; + }; + CAxis.prototype.setSpPr = function(pr) { + History.CanAddChanges() && History.Add(new CChangesDrawingsString(this, AscDFH.historyitem_Axis_SetSpPr, this.spPr, pr)); + this.spPr = pr; + }; + CAxis.prototype.setTxPr = function(pr) { + History.CanAddChanges() && History.Add(new CChangesDrawingsString(this, AscDFH.historyitem_Axis_SetTxPr, this.txPr, pr)); + this.txPr = pr; + }; + CAxis.prototype.setExtLst = function(pr) { + History.CanAddChanges() && History.Add(new CChangesDrawingsString(this, AscDFH.historyitem_Axis_SetExtLst, this.extLst, pr)); + this.extLst = pr; + }; + CAxis.prototype.setId = function(pr) { + History.CanAddChanges() && History.Add(new CChangesDrawingsString(this, AscDFH.historyitem_Axis_SetId, this.id, pr)); + this.id = pr; + }; + CAxis.prototype.setHidden = function(pr) { + History.CanAddChanges() && History.Add(new CChangesDrawingsString(this, AscDFH.historyitem_Axis_SetHidden, this.hidden, pr)); + this.hidden = pr; + }; + window['AscFormat'].CAxis = CAxis; + + // AxisTitle + drawingsChangesMap[AscDFH.historyitem_AxisTitle_SetTx] = function(oClass, value) { + oClass.tx = value; + }; + drawingsChangesMap[AscDFH.historyitem_AxisTitle_SetSpPr] = function(oClass, value) { + oClass.spPr = value; + }; + drawingsChangesMap[AscDFH.historyitem_AxisTitle_SetTxPr] = function(oClass, value) { + oClass.txPr = value; + }; + drawingsChangesMap[AscDFH.historyitem_AxisTitle_SetExtLst] = function(oClass, value) { + oClass.extLst = value; + }; + AscDFH.changesFactory[AscDFH.historyitem_AxisTitle_SetTx] = window['AscDFH'].CChangesDrawingsString; + AscDFH.changesFactory[AscDFH.historyitem_AxisTitle_SetSpPr] = window['AscDFH'].CChangesDrawingsString; + AscDFH.changesFactory[AscDFH.historyitem_AxisTitle_SetTxPr] = window['AscDFH'].CChangesDrawingsString; + AscDFH.changesFactory[AscDFH.historyitem_AxisTitle_SetExtLst] = window['AscDFH'].CChangesDrawingsString; + function CAxisTitle() { + CBaseChartObject.call(this); + this.tx = null; + this.spPr = null; + this.txPr = null; + this.extLst = null; + } + + InitClass(CAxisTitle, CBaseChartObject, AscDFH.historyitem_type_AxisTitle); + + CAxisTitle.prototype.setTx = function(pr) { + History.CanAddChanges() && History.Add(new CChangesDrawingsString(this, AscDFH.historyitem_AxisTitle_SetTx, this.tx, pr)); + this.tx = pr; + }; + CAxisTitle.prototype.setSpPr = function(pr) { + History.CanAddChanges() && History.Add(new CChangesDrawingsString(this, AscDFH.historyitem_AxisTitle_SetSpPr, this.spPr, pr)); + this.spPr = pr; + }; + CAxisTitle.prototype.setTxPr = function(pr) { + History.CanAddChanges() && History.Add(new CChangesDrawingsString(this, AscDFH.historyitem_AxisTitle_SetTxPr, this.txPr, pr)); + this.txPr = pr; + }; + CAxisTitle.prototype.setExtLst = function(pr) { + History.CanAddChanges() && History.Add(new CChangesDrawingsString(this, AscDFH.historyitem_AxisTitle_SetExtLst, this.extLst, pr)); + this.extLst = pr; + }; + window['AscFormat'].CAxisTitle = CAxisTitle; + + // AxisUnits + drawingsChangesMap[AscDFH.historyitem_AxisUnit_SetUnitsLabel] = function(oClass, value) { + oClass.unitsLabel = value; + }; + drawingsChangesMap[AscDFH.historyitem_AxisUnit_SetExtLst] = function(oClass, value) { + oClass.extLst = value; + }; + drawingsChangesMap[AscDFH.historyitem_AxisUnit_SetUnit] = function(oClass, value) { + oClass.unit = value; + }; + AscDFH.changesFactory[AscDFH.historyitem_AxisUnit_SetUnitsLabel] = window['AscDFH'].CChangesDrawingsString; + AscDFH.changesFactory[AscDFH.historyitem_AxisUnit_SetExtLst] = window['AscDFH'].CChangesDrawingsString; + AscDFH.changesFactory[AscDFH.historyitem_AxisUnit_SetUnit] = window['AscDFH'].CChangesDrawingsString; + function CAxisUnits() { + CBaseChartObject.call(this); + this.unitsLabel = null; + this.extLst = null; + this.unit = null; + } + + InitClass(CAxisUnits, CBaseChartObject, AscDFH.historyitem_type_AxisUnits); + + CAxisUnits.prototype.setTest = function(pr) { + History.CanAddChanges() && History.Add(new CChangesDrawingsString(this, AscDFH.historyitem_AxisUnit_SetUnitsLabel, this.unitsLabel, pr)); + this.unitsLabel = pr; + }; + CAxisUnits.prototype.setTest = function(pr) { + History.CanAddChanges() && History.Add(new CChangesDrawingsString(this, AscDFH.historyitem_AxisUnit_SetExtLst, this.extLst, pr)); + this.extLst = pr; + }; + CAxisUnits.prototype.setTest = function(pr) { + History.CanAddChanges() && History.Add(new CChangesDrawingsString(this, AscDFH.historyitem_AxisUnit_SetUnit, this.unit, pr)); + this.unit = pr; + }; + window['AscFormat'].CAxisUnits = CAxisUnits; + + // AxisUnitsLabel + drawingsChangesMap[AscDFH.historyitem_AxisUnitsLabel_SetTx] = function(oClass, value) { + oClass.tx = value; + }; + drawingsChangesMap[AscDFH.historyitem_AxisUnitsLabel_SetSpPr] = function(oClass, value) { + oClass.spPr = value; + }; + drawingsChangesMap[AscDFH.historyitem_AxisUnitsLabel_SetTxPr] = function(oClass, value) { + oClass.txPr = value; + }; + drawingsChangesMap[AscDFH.historyitem_AxisUnitsLabel_SetExtLst] = function(oClass, value) { + oClass.extLst = value; + }; + AscDFH.changesFactory[AscDFH.historyitem_AxisUnitsLabel_SetTx] = window['AscDFH'].CChangesDrawingsString; + AscDFH.changesFactory[AscDFH.historyitem_AxisUnitsLabel_SetSpPr] = window['AscDFH'].CChangesDrawingsString; + AscDFH.changesFactory[AscDFH.historyitem_AxisUnitsLabel_SetTxPr] = window['AscDFH'].CChangesDrawingsString; + AscDFH.changesFactory[AscDFH.historyitem_AxisUnitsLabel_SetExtLst] = window['AscDFH'].CChangesDrawingsString; + function CAxisUnitsLabel() { + CBaseChartObject.call(this); + this.tx = null; + this.spPr = null; + this.txPr = null; + this.extLst = null; + } + + InitClass(CAxisUnitsLabel, CBaseChartObject, AscDFH.historyitem_type_Test); + + CAxisUnitsLabel.prototype.setTx = function(pr) { + History.CanAddChanges() && History.Add(new CChangesDrawingsString(this, AscDFH.historyitem_AxisUnitsLabel_SetTx, this.tx, pr)); + this.tx = pr; + }; + CAxisUnitsLabel.prototype.setSpPr = function(pr) { + History.CanAddChanges() && History.Add(new CChangesDrawingsString(this, AscDFH.historyitem_AxisUnitsLabel_SetSpPr, this.spPr, pr)); + this.spPr = pr; + }; + CAxisUnitsLabel.prototype.setTxPr = function(pr) { + History.CanAddChanges() && History.Add(new CChangesDrawingsString(this, AscDFH.historyitem_AxisUnitsLabel_SetTxPr, this.txPr, pr)); + this.txPr = pr; + }; + CAxisUnitsLabel.prototype.setExtLst = function(pr) { + History.CanAddChanges() && History.Add(new CChangesDrawingsString(this, AscDFH.historyitem_AxisUnitsLabel_SetExtLst, this.extLst, pr)); + this.extLst = pr; + }; + window['AscFormat'].CAxisUnitsLabel = CAxisUnitsLabel; + + // Binning + drawingsChangesMap[AscDFH.historyitem_Binning_SetTest] = function(oClass, value) { + oClass.test = value; + }; + AscDFH.changesFactory[AscDFH.historyitem_Binning_SetTest] = window['AscDFH'].CChangesDrawingsString; + function CBinning() { + CBaseChartObject.call(this); + this.binSize = null; + this.binCount = null; + this.intervalClosed = null; + this.underflow = null; + this.overflow = null; + } + + InitClass(CBinning, CBaseChartObject, AscDFH.historyitem_type_Binning); + + CBinning.prototype.setBinSize = function(pr) { + History.CanAddChanges() && History.Add(new CChangesDrawingsString(this, AscDFH.historyitem_Binning_SetBinSize, this.binSize, pr)); + this.binSize = pr; + }; + CBinning.prototype.setBinCount = function(pr) { + History.CanAddChanges() && History.Add(new CChangesDrawingsString(this, AscDFH.historyitem_Binning_SetBinCount, this.binCount, pr)); + this.binCount = pr; + }; + CBinning.prototype.setIntervalClosed = function(pr) { + History.CanAddChanges() && History.Add(new CChangesDrawingsString(this, AscDFH.historyitem_Binning_SetIntervalClosed, this.intervalClosed, pr)); + this.intervalClosed = pr; + }; + CBinning.prototype.setUnderflow = function(pr) { + History.CanAddChanges() && History.Add(new CChangesDrawingsString(this, AscDFH.historyitem_Binning_SetUnderflow, this.underflow, pr)); + this.underflow = pr; + }; + CBinning.prototype.setOverflow = function(pr) { + History.CanAddChanges() && History.Add(new CChangesDrawingsString(this, AscDFH.historyitem_Binning_SetOverflow, this.overflow, pr)); + this.overflow = pr; + }; + window['AscFormat'].CBinning = CBinning; + + // template + drawingsChangesMap[AscDFH.historyitem_Address_SetTest] = function(oClass, value) { + oClass.test = value; + }; + AscDFH.changesFactory[AscDFH.historyitem_Address_SetTest] = window['AscDFH'].CChangesDrawingsString; + function CTest() { + CBaseChartObject.call(this); + this.test = null; + } + + InitClass(CTest, CBaseChartObject, AscDFH.historyitem_type_Test); + + CTest.prototype.setTest = function(pr) { + History.CanAddChanges() && History.Add(new CChangesDrawingsString(this, AscDFH.historyitem_Address_SetTest, this.test, pr)); + this.test = pr; + }; + window['AscFormat'].CTest = CTest; + // end template //--------------------------------------------------------export---------------------------------------------------- window['AscFormat'] = window['AscFormat'] || {}; From 8baeb6345b62d46a8e59dd8dbb1e235dc0ad418c Mon Sep 17 00:00:00 2001 From: Dmitriy Alexandrov Date: Thu, 27 Jul 2023 21:28:55 +0600 Subject: [PATCH 03/30] add classes --- common/Drawings/Format/ChartEx.js | 1902 +++++++++++++++++++++++++++++ 1 file changed, 1902 insertions(+) diff --git a/common/Drawings/Format/ChartEx.js b/common/Drawings/Format/ChartEx.js index 62487584c4..8e9615ddcd 100644 --- a/common/Drawings/Format/ChartEx.js +++ b/common/Drawings/Format/ChartEx.js @@ -414,6 +414,1908 @@ }; window['AscFormat'].CBinning = CBinning; + // CategoryAxisScaling + drawingsChangesMap[AscDFH.historyitem_CategoryAxisScaling_SetGapWidth] = function(oClass, value) { + oClass.gapWidth = value; + }; + AscDFH.changesFactory[AscDFH.historyitem_CategoryAxisScaling_SetGapWidth] = window['AscDFH'].CChangesDrawingsString; + function CCategoryAxisScaling() { + CBaseChartObject.call(this); + this.gapWidth = null; + } + + InitClass(CCategoryAxisScaling, CBaseChartObject, AscDFH.historyitem_type_CategoryAxisScaling); + + CCategoryAxisScaling.prototype.setGapWidth = function(pr) { + History.CanAddChanges() && History.Add(new CChangesDrawingsString(this, AscDFH.historyitem_CategoryAxisScaling_SetGapWidth, this.gapWidth, pr)); + this.gapWidth = pr; + }; + window['AscFormat'].CCategoryAxisScaling = CCategoryAxisScaling; + + // Chart + drawingsChangesMap[AscDFH.historyitem_Chart_SetTitle] = function(oClass, value) { + oClass.title = value; + }; + drawingsChangesMap[AscDFH.historyitem_Chart_SetPlotArea] = function(oClass, value) { + oClass.plotArea = value; + }; + drawingsChangesMap[AscDFH.historyitem_Chart_SetLegend] = function(oClass, value) { + oClass.legend = value; + }; + drawingsChangesMap[AscDFH.historyitem_Chart_SetExtLst] = function(oClass, value) { + oClass.extLst = value; + }; + AscDFH.changesFactory[AscDFH.historyitem_Chart_SetTitle] = window['AscDFH'].CChangesDrawingsString; + AscDFH.changesFactory[AscDFH.historyitem_Chart_SetPlotArea] = window['AscDFH'].CChangesDrawingsString; + AscDFH.changesFactory[AscDFH.historyitem_Chart_SetLegend] = window['AscDFH'].CChangesDrawingsString; + AscDFH.changesFactory[AscDFH.historyitem_Chart_SetExtLst] = window['AscDFH'].CChangesDrawingsString; + function CChart() { + CBaseChartObject.call(this); + this.title = null; + this.plotArea = null; + this.legend = null; + this.extLst = null; + } + + InitClass(CChart, CBaseChartObject, AscDFH.historyitem_type_Chart); + + CChart.prototype.setTitle = function(pr) { + History.CanAddChanges() && History.Add(new CChangesDrawingsString(this, AscDFH.historyitem_Chart_SetTitle, this.title, pr)); + this.title = pr; + }; + CChart.prototype.setPlotArea = function(pr) { + History.CanAddChanges() && History.Add(new CChangesDrawingsString(this, AscDFH.historyitem_Chart_SetPlotArea, this.plotArea, pr)); + this.plotArea = pr; + }; + CChart.prototype.setLegend = function(pr) { + History.CanAddChanges() && History.Add(new CChangesDrawingsString(this, AscDFH.historyitem_Chart_SetLegend, this.legend, pr)); + this.legend = pr; + }; + CChart.prototype.setExtLst = function(pr) { + History.CanAddChanges() && History.Add(new CChangesDrawingsString(this, AscDFH.historyitem_Chart_SetExtLst, this.extLst, pr)); + this.extLst = pr; + }; + window['AscFormat'].CChart = CChart; + + // ChartData + drawingsChangesMap[AscDFH.historyitem_ChartData_SetExternalData] = function(oClass, value) { + oClass.externalData = value; + }; + drawingsChangesMap[AscDFH.historyitem_ChartData_SetData] = function(oClass, value) { + oClass.data = value; + }; + drawingsChangesMap[AscDFH.historyitem_ChartData_SetExtLst] = function(oClass, value) { + oClass.extLst = value; + }; + AscDFH.changesFactory[AscDFH.historyitem_ChartData_SetExternalData] = window['AscDFH'].CChangesDrawingsString; + AscDFH.changesFactory[AscDFH.historyitem_ChartData_SetData] = window['AscDFH'].CChangesDrawingsString; + AscDFH.changesFactory[AscDFH.historyitem_ChartData_SetExtLst] = window['AscDFH'].CChangesDrawingsString; + function CChartData() { + CBaseChartObject.call(this); + this.externalData = null; + this.data = null; + this.extLst = null; + } + + InitClass(CChartData, CBaseChartObject, AscDFH.historyitem_type_ChartData); + + CChartData.prototype.setExternalData = function(pr) { + History.CanAddChanges() && History.Add(new CChangesDrawingsString(this, AscDFH.historyitem_ChartData_SetExternalData, this.externalData, pr)); + this.externalData = pr; + }; + CChartData.prototype.setData = function(pr) { + History.CanAddChanges() && History.Add(new CChangesDrawingsString(this, AscDFH.historyitem_ChartData_SetData, this.data, pr)); + this.data = pr; + }; + CChartData.prototype.setExtLst = function(pr) { + History.CanAddChanges() && History.Add(new CChangesDrawingsString(this, AscDFH.historyitem_ChartData_SetExtLst, this.extLst, pr)); + this.extLst = pr; + }; + window['AscFormat'].CChartData = CChartData; + + // ChartSpace + drawingsChangesMap[AscDFH.historyitem_ChartSpace_SetChartData] = function(oClass, value) { + oClass.chartData = value; + }; + drawingsChangesMap[AscDFH.historyitem_ChartSpace_SetChart] = function(oClass, value) { + oClass.chart = value; + }; + drawingsChangesMap[AscDFH.historyitem_ChartSpace_SetSpPr] = function(oClass, value) { + oClass.spPr = value; + }; + drawingsChangesMap[AscDFH.historyitem_ChartSpace_SetTxPr] = function(oClass, value) { + oClass.txPr = value; + }; + drawingsChangesMap[AscDFH.historyitem_ChartSpace_SetClrMapOvr] = function(oClass, value) { + oClass.clrMapOvr = value; + }; + drawingsChangesMap[AscDFH.historyitem_ChartSpace_SetFmtOvrs] = function(oClass, value) { + oClass.fmtOvrs = value; + }; + drawingsChangesMap[AscDFH.historyitem_ChartSpace_SetPrintSettings] = function(oClass, value) { + oClass.printSettings = value; + }; + drawingsChangesMap[AscDFH.historyitem_ChartSpace_SetExtLst] = function(oClass, value) { + oClass.extLst = value; + }; + AscDFH.changesFactory[AscDFH.historyitem_ChartSpace_SetChartData] = window['AscDFH'].CChangesDrawingsString; + AscDFH.changesFactory[AscDFH.historyitem_ChartSpace_SetChart] = window['AscDFH'].CChangesDrawingsString; + AscDFH.changesFactory[AscDFH.historyitem_ChartSpace_SetSpPr] = window['AscDFH'].CChangesDrawingsString; + AscDFH.changesFactory[AscDFH.historyitem_ChartSpace_SetTxPr] = window['AscDFH'].CChangesDrawingsString; + AscDFH.changesFactory[AscDFH.historyitem_ChartSpace_SetClrMapOvr] = window['AscDFH'].CChangesDrawingsString; + AscDFH.changesFactory[AscDFH.historyitem_ChartSpace_SetFmtOvrs] = window['AscDFH'].CChangesDrawingsString; + AscDFH.changesFactory[AscDFH.historyitem_ChartSpace_SetPrintSettings] = window['AscDFH'].CChangesDrawingsString; + AscDFH.changesFactory[AscDFH.historyitem_ChartSpace_SetExtLst] = window['AscDFH'].CChangesDrawingsString; + function CChartSpace() { + CBaseChartObject.call(this); + this.chartData = null; + this.chart = null; + this.spPr = null; + this.txPr = null; + this.clrMapOvr = null; + this.fmtOvrs = null; + this.printSettings = null; + this.extLst = null; + } + + InitClass(CChartSpace, CBaseChartObject, AscDFH.historyitem_type_ChartSpace); + + CChartSpace.prototype.setChartData = function(pr) { + History.CanAddChanges() && History.Add(new CChangesDrawingsString(this, AscDFH.historyitem_ChartSpace_SetChartData, this.chartData, pr)); + this.chartData = pr; + }; + CChartSpace.prototype.setChart = function(pr) { + History.CanAddChanges() && History.Add(new CChangesDrawingsString(this, AscDFH.historyitem_ChartSpace_SetChart, this.chart, pr)); + this.chart = pr; + }; + CChartSpace.prototype.setSpPr = function(pr) { + History.CanAddChanges() && History.Add(new CChangesDrawingsString(this, AscDFH.historyitem_ChartSpace_SetSpPr, this.spPr, pr)); + this.spPr = pr; + }; + CChartSpace.prototype.setTxPr = function(pr) { + History.CanAddChanges() && History.Add(new CChangesDrawingsString(this, AscDFH.historyitem_ChartSpace_SetTxPr, this.txPr, pr)); + this.txPr = pr; + }; + CChartSpace.prototype.setClrMapOvr = function(pr) { + History.CanAddChanges() && History.Add(new CChangesDrawingsString(this, AscDFH.historyitem_ChartSpace_SetClrMapOvr, this.clrMapOvr, pr)); + this.clrMapOvr = pr; + }; + CChartSpace.prototype.setFmtOvrs = function(pr) { + History.CanAddChanges() && History.Add(new CChangesDrawingsString(this, AscDFH.historyitem_ChartSpace_SetFmtOvrs, this.fmtOvrs, pr)); + this.fmtOvrs = pr; + }; + CChartSpace.prototype.setPrintSettings = function(pr) { + History.CanAddChanges() && History.Add(new CChangesDrawingsString(this, AscDFH.historyitem_ChartSpace_SetPrintSettings, this.printSettings, pr)); + this.printSettings = pr; + }; + CChartSpace.prototype.setExtLst = function(pr) { + History.CanAddChanges() && History.Add(new CChangesDrawingsString(this, AscDFH.historyitem_ChartSpace_SetExtLst, this.extLst, pr)); + this.extLst = pr; + }; + window['AscFormat'].CChartSpace = CChartSpace; + + // ChartTitle + drawingsChangesMap[AscDFH.historyitem_ChartTitle_SetTx] = function(oClass, value) { + oClass.tx = value; + }; + drawingsChangesMap[AscDFH.historyitem_ChartTitle_SetSpPr] = function(oClass, value) { + oClass.spPr = value; + }; + drawingsChangesMap[AscDFH.historyitem_ChartTitle_SetTxPr] = function(oClass, value) { + oClass.txPr = value; + }; + drawingsChangesMap[AscDFH.historyitem_ChartTitle_SetExtLst] = function(oClass, value) { + oClass.extLst = value; + }; + drawingsChangesMap[AscDFH.historyitem_ChartTitle_SetPos] = function(oClass, value) { + oClass.pos = value; + }; + drawingsChangesMap[AscDFH.historyitem_ChartTitle_SetAlign] = function(oClass, value) { + oClass.align = value; + }; + drawingsChangesMap[AscDFH.historyitem_ChartTitle_SetOverlay] = function(oClass, value) { + oClass.overlay = value; + }; + AscDFH.changesFactory[AscDFH.historyitem_ChartTitle_SetTx] = window['AscDFH'].CChangesDrawingsString; + AscDFH.changesFactory[AscDFH.historyitem_ChartTitle_SetSpPr] = window['AscDFH'].CChangesDrawingsString; + AscDFH.changesFactory[AscDFH.historyitem_ChartTitle_SetTxPr] = window['AscDFH'].CChangesDrawingsString; + AscDFH.changesFactory[AscDFH.historyitem_ChartTitle_SetExtLst] = window['AscDFH'].CChangesDrawingsString; + AscDFH.changesFactory[AscDFH.historyitem_ChartTitle_SetPos] = window['AscDFH'].CChangesDrawingsString; + AscDFH.changesFactory[AscDFH.historyitem_ChartTitle_SetAlign] = window['AscDFH'].CChangesDrawingsString; + AscDFH.changesFactory[AscDFH.historyitem_ChartTitle_SetOverlay] = window['AscDFH'].CChangesDrawingsString; + function CChartTitle() { + CBaseChartObject.call(this); + this.tx = null; + this.spPr = null; + this.txPr = null; + this.extLst = null; + this.pos = null; + this.align = null; + this.overlay = null; + } + + InitClass(CChartTitle, CBaseChartObject, AscDFH.historyitem_type_ChartTitle); + + CChartTitle.prototype.setTx = function(pr) { + History.CanAddChanges() && History.Add(new CChangesDrawingsString(this, AscDFH.historyitem_ChartTitle_SetTx, this.tx, pr)); + this.tx = pr; + }; + CChartTitle.prototype.setSpPr = function(pr) { + History.CanAddChanges() && History.Add(new CChangesDrawingsString(this, AscDFH.historyitem_ChartTitle_SetSpPr, this.spPr, pr)); + this.spPr = pr; + }; + CChartTitle.prototype.setTxPr = function(pr) { + History.CanAddChanges() && History.Add(new CChangesDrawingsString(this, AscDFH.historyitem_ChartTitle_SetTxPr, this.txPr, pr)); + this.txPr = pr; + }; + CChartTitle.prototype.setExtLst = function(pr) { + History.CanAddChanges() && History.Add(new CChangesDrawingsString(this, AscDFH.historyitem_ChartTitle_SetExtLst, this.extLst, pr)); + this.extLst = pr; + }; + CChartTitle.prototype.setPos = function(pr) { + History.CanAddChanges() && History.Add(new CChangesDrawingsString(this, AscDFH.historyitem_ChartTitle_SetPos, this.pos, pr)); + this.pos = pr; + }; + CChartTitle.prototype.setAlign = function(pr) { + History.CanAddChanges() && History.Add(new CChangesDrawingsString(this, AscDFH.historyitem_ChartTitle_SetAlign, this.align, pr)); + this.align = pr; + }; + CChartTitle.prototype.setOverlay = function(pr) { + History.CanAddChanges() && History.Add(new CChangesDrawingsString(this, AscDFH.historyitem_ChartTitle_SetOverlay, this.overlay, pr)); + this.overlay = pr; + }; + window['AscFormat'].CChartTitle = CChartTitle; + + // Clear + drawingsChangesMap[AscDFH.historyitem_Clear_SetGeoLocationQueryResults] = function(oClass, value) { + oClass.geoLocationQueryResults = value; + }; + drawingsChangesMap[AscDFH.historyitem_Clear_SetGeoDataEntityQueryResults] = function(oClass, value) { + oClass.geoDataEntityQueryResults = value; + }; + drawingsChangesMap[AscDFH.historyitem_Clear_SetGeoDataPointToEntityQueryResults] = function(oClass, value) { + oClass.geoDataPointToEntityQueryResults = value; + }; + drawingsChangesMap[AscDFH.historyitem_Clear_SetGeoChildEntitiesQueryResults] = function(oClass, value) { + oClass.geoChildEntitiesQueryResults = value; + }; + AscDFH.changesFactory[AscDFH.historyitem_Clear_SetGeoLocationQueryResults] = window['AscDFH'].CChangesDrawingsString; + AscDFH.changesFactory[AscDFH.historyitem_Clear_SetGeoDataEntityQueryResults] = window['AscDFH'].CChangesDrawingsString; + AscDFH.changesFactory[AscDFH.historyitem_Clear_SetGeoDataPointToEntityQueryResults] = window['AscDFH'].CChangesDrawingsString; + AscDFH.changesFactory[AscDFH.historyitem_Clear_SetGeoChildEntitiesQueryResults] = window['AscDFH'].CChangesDrawingsString; + function CClear() { + CBaseChartObject.call(this); + this.geoLocationQueryResults = null; + this.geoDataEntityQueryResults = null; + this.geoDataPointToEntityQueryResults = null; + this.geoChildEntitiesQueryResults = null; + } + + InitClass(CClear, CBaseChartObject, AscDFH.historyitem_type_Clear); + + CClear.prototype.setGeoLocationQueryResults = function(pr) { + History.CanAddChanges() && History.Add(new CChangesDrawingsString(this, AscDFH.historyitem_Clear_SetGeoLocationQueryResults, this.geoLocationQueryResults, pr)); + this.geoLocationQueryResults = pr; + }; + CClear.prototype.setGeoDataEntityQueryResults = function(pr) { + History.CanAddChanges() && History.Add(new CChangesDrawingsString(this, AscDFH.historyitem_Clear_SetGeoDataEntityQueryResults, this.geoDataEntityQueryResults, pr)); + this.geoDataEntityQueryResults = pr; + }; + CClear.prototype.setGeoDataPointToEntityQueryResults = function(pr) { + History.CanAddChanges() && History.Add(new CChangesDrawingsString(this, AscDFH.historyitem_Clear_SetGeoDataPointToEntityQueryResults, this.geoDataPointToEntityQueryResults, pr)); + this.geoDataPointToEntityQueryResults = pr; + }; + CClear.prototype.setGeoChildEntitiesQueryResults = function(pr) { + History.CanAddChanges() && History.Add(new CChangesDrawingsString(this, AscDFH.historyitem_Clear_SetGeoChildEntitiesQueryResults, this.geoChildEntitiesQueryResults, pr)); + this.geoChildEntitiesQueryResults = pr; + }; + window['AscFormat'].CClear = CClear; + + // Copyrights + drawingsChangesMap[AscDFH.historyitem_Copyrights_SetCopyright] = function(oClass, value) { + oClass.copyright = value; + }; + AscDFH.changesFactory[AscDFH.historyitem_Copyrights_SetCopyright] = window['AscDFH'].CChangesDrawingsString; + function CCopyrights() { + CBaseChartObject.call(this); + this.copyright = null; + } + + InitClass(CCopyrights, CBaseChartObject, AscDFH.historyitem_type_Copyrights); + + CCopyrights.prototype.setCopyright = function(pr) { + History.CanAddChanges() && History.Add(new CChangesDrawingsString(this, AscDFH.historyitem_Copyrights_SetCopyright, this.copyright, pr)); + this.copyright = pr; + }; + window['AscFormat'].CCopyrights = CCopyrights; + + // Data + drawingsChangesMap[AscDFH.historyitem_Data_SetNumDim] = function(oClass, value) { + oClass.numDim = value; + }; + drawingsChangesMap[AscDFH.historyitem_Data_SetStrDim] = function(oClass, value) { + oClass.strDim = value; + }; + drawingsChangesMap[AscDFH.historyitem_Data_SetExtLst] = function(oClass, value) { + oClass.extLst = value; + }; + drawingsChangesMap[AscDFH.historyitem_Data_SetId] = function(oClass, value) { + oClass.id = value; + }; + AscDFH.changesFactory[AscDFH.historyitem_Data_SetNumDim] = window['AscDFH'].CChangesDrawingsString; + AscDFH.changesFactory[AscDFH.historyitem_Data_SetStrDim] = window['AscDFH'].CChangesDrawingsString; + AscDFH.changesFactory[AscDFH.historyitem_Data_SetExtLst] = window['AscDFH'].CChangesDrawingsString; + AscDFH.changesFactory[AscDFH.historyitem_Data_SetId] = window['AscDFH'].CChangesDrawingsString; + function CData() { + CBaseChartObject.call(this); + this.numDim = null; + this.strDim = null; + this.extLst = null; + this.id = null; + } + + InitClass(CData, CBaseChartObject, AscDFH.historyitem_type_Data); + + CData.prototype.setNumDim = function(pr) { + History.CanAddChanges() && History.Add(new CChangesDrawingsString(this, AscDFH.historyitem_Data_SetNumDim, this.numDim, pr)); + this.numDim = pr; + }; + CData.prototype.setStrDim = function(pr) { + History.CanAddChanges() && History.Add(new CChangesDrawingsString(this, AscDFH.historyitem_Data_SetStrDim, this.strDim, pr)); + this.strDim = pr; + }; + CData.prototype.setExtLst = function(pr) { + History.CanAddChanges() && History.Add(new CChangesDrawingsString(this, AscDFH.historyitem_Data_SetExtLst, this.extLst, pr)); + this.extLst = pr; + }; + CData.prototype.setId = function(pr) { + History.CanAddChanges() && History.Add(new CChangesDrawingsString(this, AscDFH.historyitem_Data_SetId, this.id, pr)); + this.id = pr; + }; + window['AscFormat'].CData = CData; + + // DataId + drawingsChangesMap[AscDFH.historyitem_DataId_SetVal] = function(oClass, value) { + oClass.val = value; + }; + AscDFH.changesFactory[AscDFH.historyitem_DataId_SetVal] = window['AscDFH'].CChangesDrawingsString; + function CDataId() { + CBaseChartObject.call(this); + this.val = null; + } + + InitClass(CDataId, CBaseChartObject, AscDFH.historyitem_type_DataId); + + CDataId.prototype.setVal = function(pr) { + History.CanAddChanges() && History.Add(new CChangesDrawingsString(this, AscDFH.historyitem_DataId_SetVal, this.val, pr)); + this.val = pr; + }; + window['AscFormat'].CDataId = CDataId; + + // DataLabel + drawingsChangesMap[AscDFH.historyitem_DataLabel_SetNumFmt] = function(oClass, value) { + oClass.numFmt = value; + }; + drawingsChangesMap[AscDFH.historyitem_DataLabel_SetSpPr] = function(oClass, value) { + oClass.spPr = value; + }; + drawingsChangesMap[AscDFH.historyitem_DataLabel_SetTxPr] = function(oClass, value) { + oClass.txPr = value; + }; + drawingsChangesMap[AscDFH.historyitem_DataLabel_SetVisibility] = function(oClass, value) { + oClass.visibility = value; + }; + drawingsChangesMap[AscDFH.historyitem_DataLabel_SetSeparator] = function(oClass, value) { + oClass.separator = value; + }; + drawingsChangesMap[AscDFH.historyitem_DataLabel_SetExtLst] = function(oClass, value) { + oClass.extLst = value; + }; + drawingsChangesMap[AscDFH.historyitem_DataLabel_SetIdx] = function(oClass, value) { + oClass.idx = value; + }; + drawingsChangesMap[AscDFH.historyitem_DataLabel_SetPos] = function(oClass, value) { + oClass.pos = value; + }; + AscDFH.changesFactory[AscDFH.historyitem_DataLabel_SetNumFmt] = window['AscDFH'].CChangesDrawingsString; + function CDataLabel() { + CBaseChartObject.call(this); + this.numFmt = null; + this.spPr = null; + this.txPr = null; + this.visibility = null; + this.separator = null; + this.extLst = null; + this.idx = null; + this.pos = null; + } + + InitClass(CDataLabel, CBaseChartObject, AscDFH.historyitem_type_DataLabel); + + CDataLabel.prototype.setNumFmt = function(pr) { + History.CanAddChanges() && History.Add(new CChangesDrawingsString(this, AscDFH.historyitem_DataLabel_SetNumFmt, this.numFmt, pr)); + this.numFmt = pr; + }; + CDataLabel.prototype.setSpPr = function(pr) { + History.CanAddChanges() && History.Add(new CChangesDrawingsString(this, AscDFH.historyitem_DataLabel_SetSpPr, this.spPr, pr)); + this.spPr = pr; + }; + CDataLabel.prototype.setTxPr = function(pr) { + History.CanAddChanges() && History.Add(new CChangesDrawingsString(this, AscDFH.historyitem_DataLabel_SetTxPr, this.txPr, pr)); + this.txPr = pr; + }; + CDataLabel.prototype.setVisibility = function(pr) { + History.CanAddChanges() && History.Add(new CChangesDrawingsString(this, AscDFH.historyitem_DataLabel_SetVisibility, this.visibility, pr)); + this.visibility = pr; + }; + CDataLabel.prototype.setSeparator = function(pr) { + History.CanAddChanges() && History.Add(new CChangesDrawingsString(this, AscDFH.historyitem_DataLabel_SetSeparator, this.separator, pr)); + this.separator = pr; + }; + CDataLabel.prototype.setExtLst = function(pr) { + History.CanAddChanges() && History.Add(new CChangesDrawingsString(this, AscDFH.historyitem_DataLabel_SetExtLst, this.extLst, pr)); + this.extLst = pr; + }; + CDataLabel.prototype.setIdx = function(pr) { + History.CanAddChanges() && History.Add(new CChangesDrawingsString(this, AscDFH.historyitem_DataLabel_SetIdx, this.idx, pr)); + this.idx = pr; + }; + CDataLabel.prototype.setPos = function(pr) { + History.CanAddChanges() && History.Add(new CChangesDrawingsString(this, AscDFH.historyitem_DataLabel_SetPos, this.pos, pr)); + this.pos = pr; + }; + window['AscFormat'].CDataLabel = CDataLabel; + + // DataLabelHidden + drawingsChangesMap[AscDFH.historyitem_DataLabelHidden_SetIdx] = function(oClass, value) { + oClass.idx = value; + }; + AscDFH.changesFactory[AscDFH.historyitem_DataLabelHidden_SetIdx] = window['AscDFH'].CChangesDrawingsString; + function CDataLabelHidden() { + CBaseChartObject.call(this); + this.idx = null; + } + + InitClass(CDataLabelHidden, CBaseChartObject, AscDFH.historyitem_type_DataLabelHidden); + + CDataLabelHidden.prototype.setIdx = function(pr) { + History.CanAddChanges() && History.Add(new CChangesDrawingsString(this, AscDFH.historyitem_DataLabelHidden_SetIdx, this.idx, pr)); + this.idx = pr; + }; + window['AscFormat'].CDataLabelHidden = CDataLabelHidden; + + // DataLabels + drawingsChangesMap[AscDFH.historyitem_DataLabels_SetNumFmt] = function(oClass, value) { + oClass.numFmt = value; + }; + drawingsChangesMap[AscDFH.historyitem_DataLabels_SetSpPr] = function(oClass, value) { + oClass.spPr = value; + }; + drawingsChangesMap[AscDFH.historyitem_DataLabels_SetTxPr] = function(oClass, value) { + oClass.txPr = value; + }; + drawingsChangesMap[AscDFH.historyitem_DataLabels_SetVisibility] = function(oClass, value) { + oClass.visibility = value; + }; + drawingsChangesMap[AscDFH.historyitem_DataLabels_SetSeparator] = function(oClass, value) { + oClass.separator = value; + }; + drawingsChangesMap[AscDFH.historyitem_DataLabels_SetDataLabel] = function(oClass, value) { + oClass.dataLabel = value; + }; + drawingsChangesMap[AscDFH.historyitem_DataLabels_SetDataLabelHidden] = function(oClass, value) { + oClass.dataLabelHidden = value; + }; + drawingsChangesMap[AscDFH.historyitem_DataLabels_SetExtLst] = function(oClass, value) { + oClass.extLst = value; + }; + drawingsChangesMap[AscDFH.historyitem_DataLabels_SetPos] = function(oClass, value) { + oClass.pos = value; + }; + AscDFH.changesFactory[AscDFH.historyitem_DataLabels_SetNumFmt] = window['AscDFH'].CChangesDrawingsString; + AscDFH.changesFactory[AscDFH.historyitem_DataLabels_SetSpPr] = window['AscDFH'].CChangesDrawingsString; + AscDFH.changesFactory[AscDFH.historyitem_DataLabels_SetTxPr] = window['AscDFH'].CChangesDrawingsString; + AscDFH.changesFactory[AscDFH.historyitem_DataLabels_SetVisibility] = window['AscDFH'].CChangesDrawingsString; + AscDFH.changesFactory[AscDFH.historyitem_DataLabels_SetSeparator] = window['AscDFH'].CChangesDrawingsString; + AscDFH.changesFactory[AscDFH.historyitem_DataLabels_SetDataLabel] = window['AscDFH'].CChangesDrawingsString; + AscDFH.changesFactory[AscDFH.historyitem_DataLabels_SetDataLabelHidden] = window['AscDFH'].CChangesDrawingsString; + AscDFH.changesFactory[AscDFH.historyitem_DataLabels_SetExtLst] = window['AscDFH'].CChangesDrawingsString; + AscDFH.changesFactory[AscDFH.historyitem_DataLabels_SetPos] = window['AscDFH'].CChangesDrawingsString; + function CDataLabels() { + CBaseChartObject.call(this); + this.numFmt = null; + this.spPr = null; + this.txPr = null; + this.visibility = null; + this.separator = null; + this.dataLabel = null; + this.dataLabelHidden = null; + this.extLst = null; + this.pos = null; + } + + InitClass(CDataLabels, CBaseChartObject, AscDFH.historyitem_type_DataLabels); + + CDataLabels.prototype.setNumFmt = function(pr) { + History.CanAddChanges() && History.Add(new CChangesDrawingsString(this, AscDFH.historyitem_DataLabels_SetNumFmt, this.numFmt, pr)); + this.numFmt = pr; + }; + CDataLabels.prototype.setSpPr = function(pr) { + History.CanAddChanges() && History.Add(new CChangesDrawingsString(this, AscDFH.historyitem_DataLabels_SetSpPr, this.spPr, pr)); + this.spPr = pr; + }; + CDataLabels.prototype.setTxPr = function(pr) { + History.CanAddChanges() && History.Add(new CChangesDrawingsString(this, AscDFH.historyitem_DataLabels_SetTxPr, this.txPr, pr)); + this.txPr = pr; + }; + CDataLabels.prototype.setVisibility = function(pr) { + History.CanAddChanges() && History.Add(new CChangesDrawingsString(this, AscDFH.historyitem_DataLabels_SetVisibility, this.visibility, pr)); + this.visibility = pr; + }; + CDataLabels.prototype.setSeparator = function(pr) { + History.CanAddChanges() && History.Add(new CChangesDrawingsString(this, AscDFH.historyitem_DataLabels_SetSeparator, this.separator, pr)); + this.separator = pr; + }; + CDataLabels.prototype.setDataLabel = function(pr) { + History.CanAddChanges() && History.Add(new CChangesDrawingsString(this, AscDFH.historyitem_DataLabels_SetDataLabel, this.dataLabel, pr)); + this.dataLabel = pr; + }; + CDataLabels.prototype.setDataLabelHidden = function(pr) { + History.CanAddChanges() && History.Add(new CChangesDrawingsString(this, AscDFH.historyitem_DataLabels_SetDataLabelHidden, this.dataLabelHidden, pr)); + this.dataLabelHidden = pr; + }; + CDataLabels.prototype.setExtLst = function(pr) { + History.CanAddChanges() && History.Add(new CChangesDrawingsString(this, AscDFH.historyitem_DataLabels_SetExtLst, this.extLst, pr)); + this.extLst = pr; + }; + CDataLabels.prototype.setPos = function(pr) { + History.CanAddChanges() && History.Add(new CChangesDrawingsString(this, AscDFH.historyitem_DataLabels_SetPos, this.pos, pr)); + this.pos = pr; + }; + window['AscFormat'].CDataLabels = CDataLabels; + + // DataLabelVisibilities + drawingsChangesMap[AscDFH.historyitem_DataLabelVisibilities_SetSeriesName] = function(oClass, value) { + oClass.seriesName = value; + }; + drawingsChangesMap[AscDFH.historyitem_DataLabelVisibilities_SetCategoryName] = function(oClass, value) { + oClass.categoryName = value; + }; + drawingsChangesMap[AscDFH.historyitem_DataLabelVisibilities_SetValue] = function(oClass, value) { + oClass.value = value; + }; + AscDFH.changesFactory[AscDFH.historyitem_DataLabelVisibilities_SetSeriesName] = window['AscDFH'].CChangesDrawingsString; + AscDFH.changesFactory[AscDFH.historyitem_DataLabelVisibilities_SetCategoryName] = window['AscDFH'].CChangesDrawingsString; + AscDFH.changesFactory[AscDFH.historyitem_DataLabelVisibilities_SetValue] = window['AscDFH'].CChangesDrawingsString; + function CDataLabelVisibilities() { + CBaseChartObject.call(this); + this.seriesName = null; + this.categoryName = null; + this.value = null; + } + + InitClass(CDataLabelVisibilities, CBaseChartObject, AscDFH.historyitem_type_DataLabelVisibilities); + + CDataLabelVisibilities.prototype.setSeriesName = function(pr) { + History.CanAddChanges() && History.Add(new CChangesDrawingsString(this, AscDFH.historyitem_DataLabelVisibilities_SetSeriesName, this.seriesName, pr)); + this.seriesName = pr; + }; + CDataLabelVisibilities.prototype.setCategoryName = function(pr) { + History.CanAddChanges() && History.Add(new CChangesDrawingsString(this, AscDFH.historyitem_DataLabelVisibilities_SetCategoryName, this.categoryName, pr)); + this.categoryName = pr; + }; + CDataLabelVisibilities.prototype.setValue = function(pr) { + History.CanAddChanges() && History.Add(new CChangesDrawingsString(this, AscDFH.historyitem_DataLabelVisibilities_SetValue, this.value, pr)); + this.value = pr; + }; + window['AscFormat'].CDataLabelVisibilities = CDataLabelVisibilities; + + // DataPoint + drawingsChangesMap[AscDFH.historyitem_DataPoint_SetSpPr] = function(oClass, value) { + oClass.spPr = value; + }; + drawingsChangesMap[AscDFH.historyitem_DataPoint_SetExtLst] = function(oClass, value) { + oClass.extLst = value; + }; + drawingsChangesMap[AscDFH.historyitem_DataPoint_SetIdx] = function(oClass, value) { + oClass.idx = value; + }; + AscDFH.changesFactory[AscDFH.historyitem_DataPoint_SetSpPr] = window['AscDFH'].CChangesDrawingsString; + AscDFH.changesFactory[AscDFH.historyitem_DataPoint_SetExtLst] = window['AscDFH'].CChangesDrawingsString; + AscDFH.changesFactory[AscDFH.historyitem_DataPoint_SetIdx] = window['AscDFH'].CChangesDrawingsString; + function CDataPoint() { + CBaseChartObject.call(this); + this.spPr = null; + this.extLst = null; + this.idx = null; + } + + InitClass(CDataPoint, CBaseChartObject, AscDFH.historyitem_type_DataPoint); + + CDataPoint.prototype.setSpPr = function(pr) { + History.CanAddChanges() && History.Add(new CChangesDrawingsString(this, AscDFH.historyitem_DataPoint_SetSpPr, this.spPr, pr)); + this.spPr = pr; + }; + CDataPoint.prototype.setExtLst = function(pr) { + History.CanAddChanges() && History.Add(new CChangesDrawingsString(this, AscDFH.historyitem_DataPoint_SetExtLst, this.extLst, pr)); + this.extLst = pr; + }; + CDataPoint.prototype.setIdx = function(pr) { + History.CanAddChanges() && History.Add(new CChangesDrawingsString(this, AscDFH.historyitem_DataPoint_SetIdx, this.idx, pr)); + this.idx = pr; + }; + window['AscFormat'].CDataPoint = CDataPoint; + + // Extension + drawingsChangesMap[AscDFH.historyitem_Extension_SetUri] = function(oClass, value) { + oClass.uri = value; + }; + AscDFH.changesFactory[AscDFH.historyitem_Extension_SetUri] = window['AscDFH'].CChangesDrawingsString; + function CExtension() { + CBaseChartObject.call(this); + this.uri = null; + } + + InitClass(CExtension, CBaseChartObject, AscDFH.historyitem_type_Extension); + + CExtension.prototype.setUri = function(pr) { + History.CanAddChanges() && History.Add(new CChangesDrawingsString(this, AscDFH.historyitem_Extension_SetUri, this.uri, pr)); + this.uri = pr; + }; + window['AscFormat'].CExtension = CExtension; + + // ExtensionList + drawingsChangesMap[AscDFH.historyitem_ExtensionList_SetExt] = function(oClass, value) { + oClass.ext = value; + }; + AscDFH.changesFactory[AscDFH.historyitem_ExtensionList_SetExt] = window['AscDFH'].CChangesDrawingsString; + function CExtensionList() { + CBaseChartObject.call(this); + this.ext = null; + } + + InitClass(CExtensionList, CBaseChartObject, AscDFH.historyitem_type_ExtensionList); + + CExtensionList.prototype.setExt = function(pr) { + History.CanAddChanges() && History.Add(new CChangesDrawingsString(this, AscDFH.historyitem_ExtensionList_SetExt, this.ext, pr)); + this.ext = pr; + }; + window['AscFormat'].CExtensionList = CExtensionList; + + // ExternalData + drawingsChangesMap[AscDFH.historyitem_ExternalData_SetR] = function(oClass, value) { + oClass.r = value; + }; + drawingsChangesMap[AscDFH.historyitem_ExternalData_SetAutoUpdate] = function(oClass, value) { + oClass.autoUpdate = value; + }; + AscDFH.changesFactory[AscDFH.historyitem_ExternalData_SetR] = window['AscDFH'].CChangesDrawingsString; + AscDFH.changesFactory[AscDFH.historyitem_ExternalData_SetAutoUpdate] = window['AscDFH'].CChangesDrawingsString; + function CExternalData() { + CBaseChartObject.call(this); + this.r = null; + this.autoUpdate = null; + } + + InitClass(CExternalData, CBaseChartObject, AscDFH.historyitem_type_ExternalData); + + CExternalData.prototype.setR = function(pr) { + History.CanAddChanges() && History.Add(new CChangesDrawingsString(this, AscDFH.historyitem_ExternalData_SetR, this.r, pr)); + this.r = pr; + }; + CExternalData.prototype.setAutoUpdate = function(pr) { + History.CanAddChanges() && History.Add(new CChangesDrawingsString(this, AscDFH.historyitem_ExternalData_SetAutoUpdate, this.autoUpdate, pr)); + this.autoUpdate = pr; + }; + window['AscFormat'].CExternalData = CExternalData; + + // ExtremeValueColorPosition todo + drawingsChangesMap[AscDFH.historyitem_Address_SetTest] = function(oClass, value) { + oClass.test = value; + }; + AscDFH.changesFactory[AscDFH.historyitem_Address_SetTest] = window['AscDFH'].CChangesDrawingsString; + function CExtremeValueColorPosition() { + CBaseChartObject.call(this); + this.test = null; + } + + InitClass(CExtremeValueColorPosition, CBaseChartObject, AscDFH.historyitem_type_ExtremeValueColorPosition); + + CExtremeValueColorPosition.prototype.setTest = function(pr) { + History.CanAddChanges() && History.Add(new CChangesDrawingsString(this, AscDFH.historyitem_ExtremeValueColorPosition_SetTest, this.test, pr)); + this.test = pr; + }; + window['AscFormat'].CExtremeValueColorPosition = CExtremeValueColorPosition; + + // FormatOverride + drawingsChangesMap[AscDFH.historyitem_FormatOverride_SetSpPr] = function(oClass, value) { + oClass.spPr = value; + }; + drawingsChangesMap[AscDFH.historyitem_FormatOverride_SetExtLst] = function(oClass, value) { + oClass.extLst = value; + }; + drawingsChangesMap[AscDFH.historyitem_FormatOverride_SetIdx] = function(oClass, value) { + oClass.idx = value; + }; + AscDFH.changesFactory[AscDFH.historyitem_FormatOverride_SetSpPr] = window['AscDFH'].CChangesDrawingsString; + AscDFH.changesFactory[AscDFH.historyitem_FormatOverride_SetExtLst] = window['AscDFH'].CChangesDrawingsString; + AscDFH.changesFactory[AscDFH.historyitem_FormatOverride_SetIdx] = window['AscDFH'].CChangesDrawingsString; + function CFormatOverride() { + CBaseChartObject.call(this); + this.spPr = null; + this.extLst = null; + this.idx = null; + } + + InitClass(CFormatOverride, CBaseChartObject, AscDFH.historyitem_type_FormatOverride); + + CFormatOverride.prototype.setSpPr = function(pr) { + History.CanAddChanges() && History.Add(new CChangesDrawingsString(this, AscDFH.historyitem_FormatOverride_SetSpPr, this.spPr, pr)); + this.spPr = pr; + }; + CFormatOverride.prototype.setExtLst = function(pr) { + History.CanAddChanges() && History.Add(new CChangesDrawingsString(this, AscDFH.historyitem_FormatOverride_SetExtLst, this.extLst, pr)); + this.extLst = pr; + }; + CFormatOverride.prototype.setIdx = function(pr) { + History.CanAddChanges() && History.Add(new CChangesDrawingsString(this, AscDFH.historyitem_FormatOverride_SetIdx, this.idx, pr)); + this.idx = pr; + }; + window['AscFormat'].CFormatOverride = CFormatOverride; + + // FormatOverrides + drawingsChangesMap[AscDFH.historyitem_FormatOverrides_SetFmtOvr] = function(oClass, value) { + oClass.fmtOvr = value; + }; + AscDFH.changesFactory[AscDFH.historyitem_FormatOverrides_SetFmtOvr] = window['AscDFH'].CChangesDrawingsString; + function CFormatOverrides() { + CBaseChartObject.call(this); + this.fmtOvr = null; + } + + InitClass(CFormatOverrides, CBaseChartObject, AscDFH.historyitem_type_FormatOverrides); + + CFormatOverrides.prototype.setFmtOvr = function(pr) { + History.CanAddChanges() && History.Add(new CChangesDrawingsString(this, AscDFH.historyitem_FormatOverrides_SetFmtOvr, this.fmtOvr, pr)); + this.fmtOvr = pr; + }; + window['AscFormat'].CFormatOverrides = CFormatOverrides; + + // Formula + drawingsChangesMap[AscDFH.historyitem_Formula_SetDir] = function(oClass, value) { + oClass.dir = value; + }; + AscDFH.changesFactory[AscDFH.historyitem_Formula_SetDir] = window['AscDFH'].CChangesDrawingsString; + function CFormula() { + CBaseChartObject.call(this); + this.dir = null; + } + + InitClass(CFormula, CBaseChartObject, AscDFH.historyitem_type_Formula); + + CFormula.prototype.setDir = function(pr) { + History.CanAddChanges() && History.Add(new CChangesDrawingsString(this, AscDFH.historyitem_Formula_SetDir, this.dir, pr)); + this.dir = pr; + }; + window['AscFormat'].CFormula = CFormula; + + // GeoCache + drawingsChangesMap[AscDFH.historyitem_GeoCache_SetBinary] = function(oClass, value) { + oClass.binary = value; + }; + drawingsChangesMap[AscDFH.historyitem_GeoCache_SetClear] = function(oClass, value) { + oClass.clear = value; + }; + drawingsChangesMap[AscDFH.historyitem_GeoCache_SetProvider] = function(oClass, value) { + oClass.provider = value; + }; + AscDFH.changesFactory[AscDFH.historyitem_GeoCache_SetBinary] = window['AscDFH'].CChangesDrawingsString; + AscDFH.changesFactory[AscDFH.historyitem_GeoCache_SetClear] = window['AscDFH'].CChangesDrawingsString; + AscDFH.changesFactory[AscDFH.historyitem_GeoCache_SetProvider] = window['AscDFH'].CChangesDrawingsString; + function CGeoCache() { + CBaseChartObject.call(this); + this.binary = null; + this.clear = null; + this.provider = null; + } + + InitClass(CGeoCache, CBaseChartObject, AscDFH.historyitem_type_GeoCache); + + CGeoCache.prototype.setBinary = function(pr) { + History.CanAddChanges() && History.Add(new CChangesDrawingsString(this, AscDFH.historyitem_GeoCache_SetBinary, this.binary, pr)); + this.binary = pr; + }; + CGeoCache.prototype.setClear = function(pr) { + History.CanAddChanges() && History.Add(new CChangesDrawingsString(this, AscDFH.historyitem_GeoCache_SetClear, this.clear, pr)); + this.clear = pr; + }; + CGeoCache.prototype.setProvider = function(pr) { + History.CanAddChanges() && History.Add(new CChangesDrawingsString(this, AscDFH.historyitem_GeoCache_SetProvider, this.provider, pr)); + this.provider = pr; + }; + window['AscFormat'].CGeoCache = CGeoCache; + + // GeoChildEntities + drawingsChangesMap[AscDFH.historyitem_GeoChildEntities_SetGeoHierarchyEntity] = function(oClass, value) { + oClass.geoHierarchyEntity = value; + }; + AscDFH.changesFactory[AscDFH.historyitem_GeoChildEntities_SetGeoHierarchyEntity] = window['AscDFH'].CChangesDrawingsString; + function CGeoChildEntities() { + CBaseChartObject.call(this); + this.geoHierarchyEntity = null; + } + + InitClass(CGeoChildEntities, CBaseChartObject, AscDFH.historyitem_type_GeoChildEntities); + + CGeoChildEntities.prototype.setGeoHierarchyEntity = function(pr) { + History.CanAddChanges() && History.Add(new CChangesDrawingsString(this, AscDFH.historyitem_GeoChildEntities_SetGeoHierarchyEntity, this.geoHierarchyEntity, pr)); + this.geoHierarchyEntity = pr; + }; + window['AscFormat'].CGeoChildEntities = CGeoChildEntities; + + // GeoChildEntitiesQuery + drawingsChangesMap[AscDFH.historyitem_GeoChildEntitiesQuery_SetGeoChildTypes] = function(oClass, value) { + oClass.geoChildTypes = value; + }; + drawingsChangesMap[AscDFH.historyitem_GeoChildEntitiesQuery_SetEntityId] = function(oClass, value) { + oClass.entityId = value; + }; + AscDFH.changesFactory[AscDFH.historyitem_GeoChildEntitiesQuery_SetGeoChildTypes] = window['AscDFH'].CChangesDrawingsString; + AscDFH.changesFactory[AscDFH.historyitem_GeoChildEntitiesQuery_SetEntityId] = window['AscDFH'].CChangesDrawingsString; + function CGeoChildEntitiesQuery() { + CBaseChartObject.call(this); + this.geoChildTypes = null; + this.entityId = null; + } + + InitClass(CGeoChildEntitiesQuery, CBaseChartObject, AscDFH.historyitem_type_GeoChildEntitiesQuery); + + CGeoChildEntitiesQuery.prototype.setGeoChildTypes = function(pr) { + History.CanAddChanges() && History.Add(new CChangesDrawingsString(this, AscDFH.historyitem_GeoChildEntitiesQuery_SetGeoChildTypes, this.geoChildTypes, pr)); + this.geoChildTypes = pr; + }; + CGeoChildEntitiesQuery.prototype.setEntityId = function(pr) { + History.CanAddChanges() && History.Add(new CChangesDrawingsString(this, AscDFH.historyitem_GeoChildEntitiesQuery_SetEntityId, this.entityId, pr)); + this.entityId = pr; + }; + window['AscFormat'].CGeoChildEntitiesQuery = CGeoChildEntitiesQuery; + + // GeoChildEntitiesQueryResult + drawingsChangesMap[AscDFH.historyitem_GeoChildEntitiesQueryResult_SetGeoChildEntitiesQuery] = function(oClass, value) { + oClass.geoChildEntitiesQuery = value; + }; + drawingsChangesMap[AscDFH.historyitem_GeoChildEntitiesQueryResult_SetGeoChildEntities] = function(oClass, value) { + oClass.geoChildEntities = value; + }; + AscDFH.changesFactory[AscDFH.historyitem_GeoChildEntitiesQueryResult_SetGeoChildEntitiesQuery] = window['AscDFH'].CChangesDrawingsString; + AscDFH.changesFactory[AscDFH.historyitem_GeoChildEntitiesQueryResult_SetGeoChildEntities] = window['AscDFH'].CChangesDrawingsString; + function CGeoChildEntitiesQueryResult() { + CBaseChartObject.call(this); + this.geoChildEntitiesQuery = null; + this.geoChildEntities = null; + } + + InitClass(CGeoChildEntitiesQueryResult, CBaseChartObject, AscDFH.historyitem_type_GeoChildEntitiesQueryResult); + + CGeoChildEntitiesQueryResult.prototype.setGeoChildEntitiesQuery = function(pr) { + History.CanAddChanges() && History.Add(new CChangesDrawingsString(this, AscDFH.historyitem_GeoChildEntitiesQueryResult_SetGeoChildEntitiesQuery, this.geoChildEntitiesQuery, pr)); + this.geoChildEntitiesQuery = pr; + }; + CGeoChildEntitiesQueryResult.prototype.setGeoChildEntities = function(pr) { + History.CanAddChanges() && History.Add(new CChangesDrawingsString(this, AscDFH.historyitem_GeoChildEntitiesQueryResult_SetGeoChildEntities, this.geoChildEntities, pr)); + this.geoChildEntities = pr; + }; + window['AscFormat'].CGeoChildEntitiesQueryResult = CGeoChildEntitiesQueryResult; + + // GeoChildEntitiesQueryResults + drawingsChangesMap[AscDFH.historyitem_GeoChildEntitiesQueryResults_SetGeoChildEntitiesQueryResult] = function(oClass, value) { + oClass.geoChildEntitiesQueryResult = value; + }; + AscDFH.changesFactory[AscDFH.historyitem_GeoChildEntitiesQueryResults_SetGeoChildEntitiesQueryResult] = window['AscDFH'].CChangesDrawingsString; + function CGeoChildEntitiesQueryResults() { + CBaseChartObject.call(this); + this.geoChildEntitiesQueryResult = null; + } + + InitClass(CGeoChildEntitiesQueryResults, CBaseChartObject, AscDFH.historyitem_type_GeoChildEntitiesQueryResults); + + CGeoChildEntitiesQueryResults.prototype.setGeoChildEntitiesQueryResult = function(pr) { + History.CanAddChanges() && History.Add(new CChangesDrawingsString(this, AscDFH.historyitem_GeoChildEntitiesQueryResults_SetGeoChildEntitiesQueryResult, this.geoChildEntitiesQueryResult, pr)); + this.geoChildEntitiesQueryResult = pr; + }; + window['AscFormat'].CGeoChildEntitiesQueryResults = CGeoChildEntitiesQueryResults; + + // GeoChildTypes + drawingsChangesMap[AscDFH.historyitem_GeoChildTypes_SetEntityType] = function(oClass, value) { + oClass.entityType = value; + }; + AscDFH.changesFactory[AscDFH.historyitem_GeoChildTypes_SetEntityType] = window['AscDFH'].CChangesDrawingsString; + function CGeoChildTypes() { + CBaseChartObject.call(this); + this.entityType = null; + } + + InitClass(CGeoChildTypes, CBaseChartObject, AscDFH.historyitem_type_GeoChildTypes); + + CGeoChildTypes.prototype.setEntityType = function(pr) { + History.CanAddChanges() && History.Add(new CChangesDrawingsString(this, AscDFH.historyitem_GeoChildTypes_SetEntityType, this.entityType, pr)); + this.entityType = pr; + }; + window['AscFormat'].CGeoChildTypes = CGeoChildTypes; + + // GeoData + drawingsChangesMap[AscDFH.historyitem_GeoData_SetGeoPolygons] = function(oClass, value) { + oClass.geoPolygons = value; + }; + drawingsChangesMap[AscDFH.historyitem_GeoData_SetCopyrights] = function(oClass, value) { + oClass.copyrights = value; + }; + drawingsChangesMap[AscDFH.historyitem_GeoData_SetEntityName] = function(oClass, value) { + oClass.entityName = value; + }; + drawingsChangesMap[AscDFH.historyitem_GeoData_SetEntityId] = function(oClass, value) { + oClass.entityId = value; + }; + drawingsChangesMap[AscDFH.historyitem_GeoData_SetEast] = function(oClass, value) { + oClass.east = value; + }; + drawingsChangesMap[AscDFH.historyitem_GeoData_SetWest] = function(oClass, value) { + oClass.west = value; + }; + drawingsChangesMap[AscDFH.historyitem_GeoData_SetNorth] = function(oClass, value) { + oClass.north = value; + }; + drawingsChangesMap[AscDFH.historyitem_GeoData_SetSouth] = function(oClass, value) { + oClass.south = value; + }; + AscDFH.changesFactory[AscDFH.historyitem_GeoData_SetGeoPolygons] = window['AscDFH'].CChangesDrawingsString; + AscDFH.changesFactory[AscDFH.historyitem_GeoData_SetGeoPolygons] = window['AscDFH'].CChangesDrawingsString; + AscDFH.changesFactory[AscDFH.historyitem_GeoData_SetGeoPolygons] = window['AscDFH'].CChangesDrawingsString; + AscDFH.changesFactory[AscDFH.historyitem_GeoData_SetGeoPolygons] = window['AscDFH'].CChangesDrawingsString; + AscDFH.changesFactory[AscDFH.historyitem_GeoData_SetGeoPolygons] = window['AscDFH'].CChangesDrawingsString; + AscDFH.changesFactory[AscDFH.historyitem_GeoData_SetGeoPolygons] = window['AscDFH'].CChangesDrawingsString; + AscDFH.changesFactory[AscDFH.historyitem_GeoData_SetGeoPolygons] = window['AscDFH'].CChangesDrawingsString; + AscDFH.changesFactory[AscDFH.historyitem_GeoData_SetGeoPolygons] = window['AscDFH'].CChangesDrawingsString; + function CGeoData() { + CBaseChartObject.call(this); + this.geoPolygons = null; + this.copyrights = null; + this.entityName = null; + this.entityId = null; + this.east = null; + this.west = null; + this.north = null; + this.south = null; + } + + InitClass(CGeoData, CBaseChartObject, AscDFH.historyitem_type_GeoData); + + CGeoData.prototype.setGeoPolygons = function(pr) { + History.CanAddChanges() && History.Add(new CChangesDrawingsString(this, AscDFH.historyitem_GeoData_SetGeoPolygons, this.geoPolygons, pr)); + this.geoPolygons = pr; + }; + CGeoData.prototype.setCopyrights = function(pr) { + History.CanAddChanges() && History.Add(new CChangesDrawingsString(this, AscDFH.historyitem_GeoData_SetCopyrights, this.copyrights, pr)); + this.copyrights = pr; + }; + CGeoData.prototype.setEntityName = function(pr) { + History.CanAddChanges() && History.Add(new CChangesDrawingsString(this, AscDFH.historyitem_GeoData_SetEntityName, this.entityName, pr)); + this.entityName = pr; + }; + CGeoData.prototype.setEntityId = function(pr) { + History.CanAddChanges() && History.Add(new CChangesDrawingsString(this, AscDFH.historyitem_GeoData_SetEntityId, this.entityId, pr)); + this.entityId = pr; + }; + CGeoData.prototype.setEast = function(pr) { + History.CanAddChanges() && History.Add(new CChangesDrawingsString(this, AscDFH.historyitem_GeoData_SetEast, this.east, pr)); + this.east = pr; + }; + CGeoData.prototype.setWest = function(pr) { + History.CanAddChanges() && History.Add(new CChangesDrawingsString(this, AscDFH.historyitem_GeoData_SetWest, this.west, pr)); + this.west = pr; + }; + CGeoData.prototype.setNorth = function(pr) { + History.CanAddChanges() && History.Add(new CChangesDrawingsString(this, AscDFH.historyitem_GeoData_SetNorth, this.north, pr)); + this.north = pr; + }; + CGeoData.prototype.setSouth = function(pr) { + History.CanAddChanges() && History.Add(new CChangesDrawingsString(this, AscDFH.historyitem_GeoData_SetSouth, this.south, pr)); + this.south = pr; + }; + window['AscFormat'].CGeoData = CGeoData; + + // GeoDataEntityQuery + drawingsChangesMap[AscDFH.historyitem_GeoDataEntityQuery_SetEntityType] = function(oClass, value) { + oClass.entityType = value; + }; + drawingsChangesMap[AscDFH.historyitem_GeoDataEntityQuery_SetEntityId] = function(oClass, value) { + oClass.entityId = value; + }; + AscDFH.changesFactory[AscDFH.historyitem_GeoDataEntityQuery_SetEntityType] = window['AscDFH'].CChangesDrawingsString; + AscDFH.changesFactory[AscDFH.historyitem_GeoDataEntityQuery_SetEntityId] = window['AscDFH'].CChangesDrawingsString; + function CGeoDataEntityQuery() { + CBaseChartObject.call(this); + this.entityType = null; + this.entityId = null; + } + + InitClass(CGeoDataEntityQuery, CBaseChartObject, AscDFH.historyitem_type_GeoDataEntityQuery); + + CGeoDataEntityQuery.prototype.setEntityType = function(pr) { + History.CanAddChanges() && History.Add(new CChangesDrawingsString(this, AscDFH.historyitem_GeoDataEntityQuery_SetEntityType, this.entityType, pr)); + this.entityType = pr; + }; + CGeoDataEntityQuery.prototype.setEntityId = function(pr) { + History.CanAddChanges() && History.Add(new CChangesDrawingsString(this, AscDFH.historyitem_GeoDataEntityQuery_SetEntityId, this.entityId, pr)); + this.entityId = pr; + }; + window['AscFormat'].CGeoDataEntityQuery = CGeoDataEntityQuery; + + // GeoDataEntityQueryResult + drawingsChangesMap[AscDFH.historyitem_GeoDataEntityQueryResult_SetGeoDataEntityQuery] = function(oClass, value) { + oClass.geoDataEntityQuery = value; + }; + drawingsChangesMap[AscDFH.historyitem_GeoDataEntityQueryResult_SetGeoData] = function(oClass, value) { + oClass.geoData = value; + }; + AscDFH.changesFactory[AscDFH.historyitem_GeoDataEntityQueryResult_SetGeoDataEntityQuery] = window['AscDFH'].CChangesDrawingsString; + AscDFH.changesFactory[AscDFH.historyitem_GeoDataEntityQueryResult_SetGeoData] = window['AscDFH'].CChangesDrawingsString; + function CGeoDataEntityQueryResult() { + CBaseChartObject.call(this); + this.geoDataEntityQuery = null; + this.geoData = null; + } + + InitClass(CGeoDataEntityQueryResult, CBaseChartObject, AscDFH.historyitem_type_GeoDataEntityQueryResult); + + CGeoDataEntityQueryResult.prototype.setGeoDataEntityQuery = function(pr) { + History.CanAddChanges() && History.Add(new CChangesDrawingsString(this, AscDFH.historyitem_GeoDataEntityQueryResult_SetGeoDataEntityQuery, this.geoDataEntityQuery, pr)); + this.geoDataEntityQuery = pr; + }; + CGeoDataEntityQueryResult.prototype.setGeoData = function(pr) { + History.CanAddChanges() && History.Add(new CChangesDrawingsString(this, AscDFH.historyitem_GeoDataEntityQueryResult_SetGeoData, this.geoData, pr)); + this.geoData = pr; + }; + window['AscFormat'].CGeoDataEntityQueryResult = CGeoDataEntityQueryResult; + + // GeoDataEntityQueryResults + drawingsChangesMap[AscDFH.historyitem_GeoDataEntityQueryResults_SetGeoDataEntityQueryResult] = function(oClass, value) { + oClass.geoDataEntityQueryResult = value; + }; + AscDFH.changesFactory[AscDFH.historyitem_GeoDataEntityQueryResults_SetGeoDataEntityQueryResult] = window['AscDFH'].CChangesDrawingsString; + function CGeoDataEntityQueryResults() { + CBaseChartObject.call(this); + this.geoDataEntityQueryResult = null; + } + + InitClass(CGeoDataEntityQueryResults, CBaseChartObject, AscDFH.historyitem_type_GeoDataEntityQueryResults); + + CGeoDataEntityQueryResults.prototype.setGeoDataEntityQueryResult = function(pr) { + History.CanAddChanges() && History.Add(new CChangesDrawingsString(this, AscDFH.historyitem_GeoDataEntityQueryResults_SetGeoDataEntityQueryResult, this.geoDataEntityQueryResult, pr)); + this.geoDataEntityQueryResult = pr; + }; + window['AscFormat'].CGeoDataEntityQueryResults = CGeoDataEntityQueryResults; + + // GeoDataPointQuery + drawingsChangesMap[AscDFH.historyitem_GeoDataPointQuery_SetEntityType] = function(oClass, value) { + oClass.entityType = value; + }; + drawingsChangesMap[AscDFH.historyitem_GeoDataPointQuery_SetLatitude] = function(oClass, value) { + oClass.latitude = value; + }; + drawingsChangesMap[AscDFH.historyitem_GeoDataPointQuery_SetLongitude] = function(oClass, value) { + oClass.longitude = value; + }; + AscDFH.changesFactory[AscDFH.historyitem_GeoDataPointQuery_SetEntityType] = window['AscDFH'].CChangesDrawingsString; + AscDFH.changesFactory[AscDFH.historyitem_GeoDataPointQuery_SetLatitude] = window['AscDFH'].CChangesDrawingsString; + AscDFH.changesFactory[AscDFH.historyitem_GeoDataPointQuery_SetLongitude] = window['AscDFH'].CChangesDrawingsString; + function CGeoDataPointQuery() { + CBaseChartObject.call(this); + this.entityType = null; + this.latitude = null; + this.longitude = null; + } + + InitClass(CGeoDataPointQuery, CBaseChartObject, AscDFH.historyitem_type_GeoDataPointQuery); + + CGeoDataPointQuery.prototype.setEntityType = function(pr) { + History.CanAddChanges() && History.Add(new CChangesDrawingsString(this, AscDFH.historyitem_GeoDataPointQuery_SetEntityType, this.entityType, pr)); + this.entityType = pr; + }; + CGeoDataPointQuery.prototype.setLatitude = function(pr) { + History.CanAddChanges() && History.Add(new CChangesDrawingsString(this, AscDFH.historyitem_GeoDataPointQuery_SetLatitude, this.latitude, pr)); + this.latitude = pr; + }; + CGeoDataPointQuery.prototype.setLongitude = function(pr) { + History.CanAddChanges() && History.Add(new CChangesDrawingsString(this, AscDFH.historyitem_GeoDataPointQuery_SetLongitude, this.longitude, pr)); + this.longitude = pr; + }; + window['AscFormat'].CGeoDataPointQuery = CGeoDataPointQuery; + + // GeoDataPointToEntityQuery + drawingsChangesMap[AscDFH.historyitem_GeoDataPointToEntityQuery_SetEntityType] = function(oClass, value) { + oClass.entityType = value; + }; + drawingsChangesMap[AscDFH.historyitem_GeoDataPointToEntityQuery_SetEntityId] = function(oClass, value) { + oClass.entityId = value; + }; + AscDFH.changesFactory[AscDFH.historyitem_GeoDataPointToEntityQuery_SetEntityType] = window['AscDFH'].CChangesDrawingsString; + AscDFH.changesFactory[AscDFH.historyitem_GeoDataPointToEntityQuery_SetEntityId] = window['AscDFH'].CChangesDrawingsString; + function CGeoDataPointToEntityQuery() { + CBaseChartObject.call(this); + this.entityType = null; + this.entityId = null; + } + + InitClass(CGeoDataPointToEntityQuery, CBaseChartObject, AscDFH.historyitem_type_GeoDataPointToEntityQuery); + + CGeoDataPointToEntityQuery.prototype.setEntityType = function(pr) { + History.CanAddChanges() && History.Add(new CChangesDrawingsString(this, AscDFH.historyitem_GeoDataPointToEntityQuery_SetEntityType, this.entityType, pr)); + this.entityType = pr; + }; + CGeoDataPointToEntityQuery.prototype.setEntityId = function(pr) { + History.CanAddChanges() && History.Add(new CChangesDrawingsString(this, AscDFH.historyitem_GeoDataPointToEntityQuery_SetEntityId, this.entityId, pr)); + this.entityId = pr; + }; + window['AscFormat'].CGeoDataPointToEntityQuery = CGeoDataPointToEntityQuery; + + // GeoDataPointToEntityQueryResult + drawingsChangesMap[AscDFH.historyitem_GeoDataPointToEntityQueryResult_SetGeoDataPointQuery] = function(oClass, value) { + oClass.geoDataPointQuery = value; + }; + drawingsChangesMap[AscDFH.historyitem_GeoDataPointToEntityQueryResult_SetGeoDataPointToEntityQuery] = function(oClass, value) { + oClass.geoDataPointToEntityQuery = value; + }; + AscDFH.changesFactory[AscDFH.historyitem_GeoDataPointToEntityQueryResult_SetGeoDataPointQuery] = window['AscDFH'].CChangesDrawingsString; + AscDFH.changesFactory[AscDFH.historyitem_GeoDataPointToEntityQueryResult_SetGeoDataPointToEntityQuery] = window['AscDFH'].CChangesDrawingsString; + function CGeoDataPointToEntityQueryResult() { + CBaseChartObject.call(this); + this.geoDataPointQuery = null; + this.geoDataPointToEntityQuery = null; + } + + InitClass(CGeoDataPointToEntityQueryResult, CBaseChartObject, AscDFH.historyitem_type_GeoDataPointToEntityQueryResult); + + CGeoDataPointToEntityQueryResult.prototype.setGeoDataPointQuery = function(pr) { + History.CanAddChanges() && History.Add(new CChangesDrawingsString(this, AscDFH.historyitem_GeoDataPointToEntityQueryResult_SetGeoDataPointQuery, this.geoDataPointQuery, pr)); + this.geoDataPointQuery = pr; + }; + CGeoDataPointToEntityQueryResult.prototype.setGeoDataPointToEntityQuery = function(pr) { + History.CanAddChanges() && History.Add(new CChangesDrawingsString(this, AscDFH.historyitem_GeoDataPointToEntityQueryResult_SetGeoDataPointToEntityQuery, this.geoDataPointToEntityQuery, pr)); + this.geoDataPointToEntityQuery = pr; + }; + window['AscFormat'].CGeoDataPointToEntityQueryResult = CGeoDataPointToEntityQueryResult; + + // GeoDataPointToEntityQueryResults + drawingsChangesMap[AscDFH.historyitem_GeoDataPointToEntityQueryResults_SetGeoDataPointToEntityQueryResult] = function(oClass, value) { + oClass.geoDataPointToEntityQueryResult = value; + }; + AscDFH.changesFactory[AscDFH.historyitem_GeoDataPointToEntityQueryResults_SetGeoDataPointToEntityQueryResult] = window['AscDFH'].CChangesDrawingsString; + function CGeoDataPointToEntityQueryResults() { + CBaseChartObject.call(this); + this.geoDataPointToEntityQueryResult = null; + } + + InitClass(CGeoDataPointToEntityQueryResults, CBaseChartObject, AscDFH.historyitem_type_GeoDataPointToEntityQueryResults); + + CGeoDataPointToEntityQueryResults.prototype.setTest = function(pr) { + History.CanAddChanges() && History.Add(new CChangesDrawingsString(this, AscDFH.historyitem_GeoDataPointToEntityQueryResults_SetGeoDataPointToEntityQueryResult, this.geoDataPointToEntityQueryResult, pr)); + this.geoDataPointToEntityQueryResult = pr; + }; + window['AscFormat'].CGeoDataPointToEntityQueryResults = CGeoDataPointToEntityQueryResults; + + // Geography + drawingsChangesMap[AscDFH.historyitem_Geography_SetGeoCache] = function(oClass, value) { + oClass.geoCache = value; + }; + drawingsChangesMap[AscDFH.historyitem_Geography_SetProjectionType] = function(oClass, value) { + oClass.projectionType = value; + }; + drawingsChangesMap[AscDFH.historyitem_Geography_SetViewedRegionType] = function(oClass, value) { + oClass.viewedRegionType = value; + }; + drawingsChangesMap[AscDFH.historyitem_Geography_SetCultureLanguage] = function(oClass, value) { + oClass.cultureLanguage = value; + }; + drawingsChangesMap[AscDFH.historyitem_Geography_SetCultureRegion] = function(oClass, value) { + oClass.cultureRegion = value; + }; + drawingsChangesMap[AscDFH.historyitem_Geography_SetAttribution] = function(oClass, value) { + oClass.attribution = value; + }; + AscDFH.changesFactory[AscDFH.historyitem_Geography_SetGeoCache] = window['AscDFH'].CChangesDrawingsString; + AscDFH.changesFactory[AscDFH.historyitem_Geography_SetProjectionType] = window['AscDFH'].CChangesDrawingsString; + AscDFH.changesFactory[AscDFH.historyitem_Geography_SetViewedRegionType] = window['AscDFH'].CChangesDrawingsString; + AscDFH.changesFactory[AscDFH.historyitem_Geography_SetCultureLanguage] = window['AscDFH'].CChangesDrawingsString; + AscDFH.changesFactory[AscDFH.historyitem_Geography_SetGeoCache] = window['AscDFH'].CChangesDrawingsString; + AscDFH.changesFactory[AscDFH.historyitem_Geography_SetGeoCache] = window['AscDFH'].CChangesDrawingsString; + function CGeography() { + CBaseChartObject.call(this); + this.geoCache = null; + this.projectionType = null; + this.viewedRegionType = null; + this.cultureLanguage = null; + this.cultureRegion = null; + this.attribution = null; + } + + InitClass(CGeography, CBaseChartObject, AscDFH.historyitem_type_Geography); + + CGeography.prototype.setGeoCache = function(pr) { + History.CanAddChanges() && History.Add(new CChangesDrawingsString(this, AscDFH.historyitem_Geography_SetGeoCache, this.geoCache, pr)); + this.geoCache = pr; + }; + CGeography.prototype.setProjectionType = function(pr) { + History.CanAddChanges() && History.Add(new CChangesDrawingsString(this, AscDFH.historyitem_Geography_SetProjectionType, this.projectionType, pr)); + this.projectionType = pr; + }; + CGeography.prototype.setViewedRegionType = function(pr) { + History.CanAddChanges() && History.Add(new CChangesDrawingsString(this, AscDFH.historyitem_Geography_SetViewedRegionType, this.viewedRegionType, pr)); + this.viewedRegionType = pr; + }; + CGeography.prototype.setCultureLanguage = function(pr) { + History.CanAddChanges() && History.Add(new CChangesDrawingsString(this, AscDFH.historyitem_Geography_SetCultureLanguage, this.cultureLanguage, pr)); + this.cultureLanguage = pr; + }; + CGeography.prototype.setCultureRegion = function(pr) { + History.CanAddChanges() && History.Add(new CChangesDrawingsString(this, AscDFH.historyitem_Geography_SetCultureRegion, this.cultureRegion, pr)); + this.cultureRegion = pr; + }; + CGeography.prototype.setAttribution = function(pr) { + History.CanAddChanges() && History.Add(new CChangesDrawingsString(this, AscDFH.historyitem_Geography_SetAttribution, this.attribution, pr)); + this.attribution = pr; + }; + window['AscFormat'].CGeography = CGeography; + + // GeoHierarchyEntity + drawingsChangesMap[AscDFH.historyitem_GeoHierarchyEntity_SetEntityName] = function(oClass, value) { + oClass.entityName = value; + }; + drawingsChangesMap[AscDFH.historyitem_GeoHierarchyEntity_SetEntityId] = function(oClass, value) { + oClass.entityId = value; + }; + drawingsChangesMap[AscDFH.historyitem_GeoHierarchyEntity_SetEntityType] = function(oClass, value) { + oClass.entityType = value; + }; + AscDFH.changesFactory[AscDFH.historyitem_GeoHierarchyEntity_SetEntityName] = window['AscDFH'].CChangesDrawingsString; + AscDFH.changesFactory[AscDFH.historyitem_GeoHierarchyEntity_SetEntityId] = window['AscDFH'].CChangesDrawingsString; + AscDFH.changesFactory[AscDFH.historyitem_GeoHierarchyEntity_SetEntityType] = window['AscDFH'].CChangesDrawingsString; + function CGeoHierarchyEntity() { + CBaseChartObject.call(this); + this.entityName = null; + this.entityId = null; + this.entityType = null; + } + + InitClass(CGeoHierarchyEntity, CBaseChartObject, AscDFH.historyitem_type_GeoHierarchyEntity); + + CGeoHierarchyEntity.prototype.setEntityName = function(pr) { + History.CanAddChanges() && History.Add(new CChangesDrawingsString(this, AscDFH.historyitem_GeoHierarchyEntity_SetEntityName, this.entityName, pr)); + this.entityName = pr; + }; + CGeoHierarchyEntity.prototype.setEntityId = function(pr) { + History.CanAddChanges() && History.Add(new CChangesDrawingsString(this, AscDFH.historyitem_GeoHierarchyEntity_SetEntityId, this.entityId, pr)); + this.entityId = pr; + }; + CGeoHierarchyEntity.prototype.setEntityType = function(pr) { + History.CanAddChanges() && History.Add(new CChangesDrawingsString(this, AscDFH.historyitem_GeoHierarchyEntity_SetEntityType, this.entityType, pr)); + this.entityType = pr; + }; + window['AscFormat'].CGeoHierarchyEntity = CGeoHierarchyEntity; + + // GeoLocation + drawingsChangesMap[AscDFH.historyitem_GeoLocation_SetAddress] = function(oClass, value) { + oClass.address = value; + }; + drawingsChangesMap[AscDFH.historyitem_GeoLocation_SetLatitude] = function(oClass, value) { + oClass.latitude = value; + }; + drawingsChangesMap[AscDFH.historyitem_GeoLocation_SetLongitude] = function(oClass, value) { + oClass.longitude = value; + }; + drawingsChangesMap[AscDFH.historyitem_GeoLocation_SetEntityName] = function(oClass, value) { + oClass.entityName = value; + }; + drawingsChangesMap[AscDFH.historyitem_GeoLocation_SetEntityType] = function(oClass, value) { + oClass.entityType = value; + }; + AscDFH.changesFactory[AscDFH.historyitem_GeoLocation_SetAddress] = window['AscDFH'].CChangesDrawingsString; + AscDFH.changesFactory[AscDFH.historyitem_GeoLocation_SetLatitude] = window['AscDFH'].CChangesDrawingsString; + AscDFH.changesFactory[AscDFH.historyitem_GeoLocation_SetLongitude] = window['AscDFH'].CChangesDrawingsString; + AscDFH.changesFactory[AscDFH.historyitem_GeoLocation_SetEntityName] = window['AscDFH'].CChangesDrawingsString; + AscDFH.changesFactory[AscDFH.historyitem_GeoLocation_SetEntityType] = window['AscDFH'].CChangesDrawingsString; + function CGeoLocation() { + CBaseChartObject.call(this); + this.address = null; + this.latitude = null; + this.longitude = null; + this.entityName = null; + this.entityType = null; + } + + InitClass(CGeoLocation, CBaseChartObject, AscDFH.historyitem_type_GeoLocation); + + CGeoLocation.prototype.setAddress = function(pr) { + History.CanAddChanges() && History.Add(new CChangesDrawingsString(this, AscDFH.historyitem_GeoLocation_SetAddress, this.address, pr)); + this.address = pr; + }; + CGeoLocation.prototype.setLatitude = function(pr) { + History.CanAddChanges() && History.Add(new CChangesDrawingsString(this, AscDFH.historyitem_GeoLocation_SetLatitude, this.latitude, pr)); + this.latitude = pr; + }; + CGeoLocation.prototype.setLongitude = function(pr) { + History.CanAddChanges() && History.Add(new CChangesDrawingsString(this, AscDFH.historyitem_GeoLocation_SetLongitude, this.longitude, pr)); + this.longitude = pr; + }; + CGeoLocation.prototype.setEntityName = function(pr) { + History.CanAddChanges() && History.Add(new CChangesDrawingsString(this, AscDFH.historyitem_GeoLocation_SetEntityName, this.entityName, pr)); + this.entityName = pr; + }; + CGeoLocation.prototype.setEntityType = function(pr) { + History.CanAddChanges() && History.Add(new CChangesDrawingsString(this, AscDFH.historyitem_GeoLocation_SetEntityType, this.entityType, pr)); + this.entityType = pr; + }; + window['AscFormat'].CGeoLocation = CGeoLocation; + + // GeoLocationQuery + drawingsChangesMap[AscDFH.historyitem_GeoLocationQuery_SetCountryRegion] = function(oClass, value) { + oClass.countryRegion = value; + }; + drawingsChangesMap[AscDFH.historyitem_GeoLocationQuery_SetAdminDistrict1] = function(oClass, value) { + oClass.adminDistrict1 = value; + }; + drawingsChangesMap[AscDFH.historyitem_GeoLocationQuery_SetAdminDistrict2] = function(oClass, value) { + oClass.adminDistrict2 = value; + }; + drawingsChangesMap[AscDFH.historyitem_GeoLocationQuery_SetPostalCode] = function(oClass, value) { + oClass.postalCode = value; + }; + drawingsChangesMap[AscDFH.historyitem_GeoLocationQuery_SetEntityType] = function(oClass, value) { + oClass.entityType = value; + }; + AscDFH.changesFactory[AscDFH.historyitem_GeoLocationQuery_SetCountryRegion] = window['AscDFH'].CChangesDrawingsString; + AscDFH.changesFactory[AscDFH.historyitem_GeoLocationQuery_SetAdminDistrict1] = window['AscDFH'].CChangesDrawingsString; + AscDFH.changesFactory[AscDFH.historyitem_GeoLocationQuery_SetAdminDistrict2] = window['AscDFH'].CChangesDrawingsString; + AscDFH.changesFactory[AscDFH.historyitem_GeoLocationQuery_SetPostalCode] = window['AscDFH'].CChangesDrawingsString; + AscDFH.changesFactory[AscDFH.historyitem_GeoLocationQuery_SetEntityType] = window['AscDFH'].CChangesDrawingsString; + function CGeoLocationQuery() { + CBaseChartObject.call(this); + this.countryRegion = null; + this.adminDistrict1 = null; + this.adminDistrict2 = null; + this.postalCode = null; + this.entityType = null; + } + + InitClass(CGeoLocationQuery, CBaseChartObject, AscDFH.historyitem_type_GeoLocationQuery); + + CGeoLocationQuery.prototype.setCountryRegion = function(pr) { + History.CanAddChanges() && History.Add(new CChangesDrawingsString(this, AscDFH.historyitem_GeoLocationQuery_SetCountryRegion, this.countryRegion, pr)); + this.countryRegion = pr; + }; + CGeoLocationQuery.prototype.setAdminDistrict1 = function(pr) { + History.CanAddChanges() && History.Add(new CChangesDrawingsString(this, AscDFH.historyitem_GeoLocationQuery_SetAdminDistrict1, this.adminDistrict1, pr)); + this.adminDistrict1 = pr; + }; + CGeoLocationQuery.prototype.setAdminDistrict2 = function(pr) { + History.CanAddChanges() && History.Add(new CChangesDrawingsString(this, AscDFH.historyitem_GeoLocationQuery_SetAdminDistrict2, this.adminDistrict2, pr)); + this.adminDistrict2 = pr; + }; + CGeoLocationQuery.prototype.setPostalCode = function(pr) { + History.CanAddChanges() && History.Add(new CChangesDrawingsString(this, AscDFH.historyitem_GeoLocationQuery_SetPostalCode, this.postalCode, pr)); + this.postalCode = pr; + }; + CGeoLocationQuery.prototype.setEntityType = function(pr) { + History.CanAddChanges() && History.Add(new CChangesDrawingsString(this, AscDFH.historyitem_GeoLocationQuery_SetEntityType, this.entityType, pr)); + this.entityType = pr; + }; + window['AscFormat'].CGeoLocationQuery = CGeoLocationQuery; + + // GeoLocationQueryResult + drawingsChangesMap[AscDFH.historyitem_GeoLocationQueryResult_SetGeoLocationQuery] = function(oClass, value) { + oClass.geoLocationQuery = value; + }; + drawingsChangesMap[AscDFH.historyitem_GeoLocationQueryResult_SetGeoLocations] = function(oClass, value) { + oClass.geoLocations = value; + }; + AscDFH.changesFactory[AscDFH.historyitem_GeoLocationQueryResult_SetGeoLocationQuery] = window['AscDFH'].CChangesDrawingsString; + AscDFH.changesFactory[AscDFH.historyitem_GeoLocationQueryResult_SetGeoLocations] = window['AscDFH'].CChangesDrawingsString; + function CGeoLocationQueryResult() { + CBaseChartObject.call(this); + this.geoLocationQuery = null; + this.geoLocations = null; + } + + InitClass(CGeoLocationQueryResult, CBaseChartObject, AscDFH.historyitem_type_GeoLocationQueryResult); + + CGeoLocationQueryResult.prototype.setGeoLocationQuery = function(pr) { + History.CanAddChanges() && History.Add(new CChangesDrawingsString(this, AscDFH.historyitem_GeoLocationQueryResult_SetGeoLocationQuery, this.geoLocationQuery, pr)); + this.geoLocationQuery = pr; + }; + CGeoLocationQueryResult.prototype.setGeoLocations = function(pr) { + History.CanAddChanges() && History.Add(new CChangesDrawingsString(this, AscDFH.historyitem_GeoLocationQueryResult_SetGeoLocations, this.geoLocations, pr)); + this.geoLocations = pr; + }; + window['AscFormat'].CGeoLocationQueryResult = CGeoLocationQueryResult; + + // GeoLocationQueryResults + drawingsChangesMap[AscDFH.historyitem_GeoLocationQueryResults_SetGeoLocationQueryResult] = function(oClass, value) { + oClass.geoLocationQueryResult = value; + }; + AscDFH.changesFactory[AscDFH.historyitem_GeoLocationQueryResults_SetGeoLocationQueryResult] = window['AscDFH'].CChangesDrawingsString; + function CGeoLocationQueryResults() { + CBaseChartObject.call(this); + this.geoLocationQueryResult = null; + } + + InitClass(CGeoLocationQueryResults, CBaseChartObject, AscDFH.historyitem_type_GeoLocationQueryResults); + + CGeoLocationQueryResults.prototype.setTest = function(pr) { + History.CanAddChanges() && History.Add(new CChangesDrawingsString(this, AscDFH.historyitem_GeoLocationQueryResults_SetGeoLocationQueryResult, this.geoLocationQueryResult, pr)); + this.geoLocationQueryResult = pr; + }; + window['AscFormat'].CGeoLocationQueryResults = CGeoLocationQueryResults; + + // GeoLocations + drawingsChangesMap[AscDFH.historyitem_GeoLocations_SetGeoLocation] = function(oClass, value) { + oClass.geoLocation = value; + }; + AscDFH.changesFactory[AscDFH.historyitem_GeoLocations_SetGeoLocation] = window['AscDFH'].CChangesDrawingsString; + function CGeoLocations() { + CBaseChartObject.call(this); + this.geoLocation = null; + } + + InitClass(CGeoLocations, CBaseChartObject, AscDFH.historyitem_type_GeoLocations); + + CGeoLocations.prototype.setGeoLocation = function(pr) { + History.CanAddChanges() && History.Add(new CChangesDrawingsString(this, AscDFH.historyitem_GeoLocations_SetGeoLocation, this.test, pr)); + this.geoLocation = pr; + }; + window['AscFormat'].CGeoLocations = CGeoLocations; + + // GeoPolygon + drawingsChangesMap[AscDFH.historyitem_GeoPolygon_SetPolygonId] = function(oClass, value) { + oClass.polygonId = value; + }; + drawingsChangesMap[AscDFH.historyitem_GeoPolygon_SetNumPoints] = function(oClass, value) { + oClass.numPoints = value; + }; + drawingsChangesMap[AscDFH.historyitem_GeoPolygon_SetPcaRings] = function(oClass, value) { + oClass.pcaRings = value; + }; + AscDFH.changesFactory[AscDFH.historyitem_GeoPolygon_SetPolygonId] = window['AscDFH'].CChangesDrawingsString; + AscDFH.changesFactory[AscDFH.historyitem_GeoPolygon_SetNumPoints] = window['AscDFH'].CChangesDrawingsString; + AscDFH.changesFactory[AscDFH.historyitem_GeoPolygon_SetPcaRings] = window['AscDFH'].CChangesDrawingsString; + function CGeoPolygon() { + CBaseChartObject.call(this); + this.polygonId = null; + this.numPoints = null; + this.pcaRings = null; + } + + InitClass(CGeoPolygon, CBaseChartObject, AscDFH.historyitem_type_GeoPolygon); + + CGeoPolygon.prototype.setPolygonId = function(pr) { + History.CanAddChanges() && History.Add(new CChangesDrawingsString(this, AscDFH.historyitem_GeoPolygon_SetPolygonId, this.polygonId, pr)); + this.polygonId = pr; + }; + CGeoPolygon.prototype.setNumPoints = function(pr) { + History.CanAddChanges() && History.Add(new CChangesDrawingsString(this, AscDFH.historyitem_GeoPolygon_SetNumPoints, this.numPoints, pr)); + this.numPoints = pr; + }; + CGeoPolygon.prototype.setPcaRings = function(pr) { + History.CanAddChanges() && History.Add(new CChangesDrawingsString(this, AscDFH.historyitem_GeoPolygon_SetPcaRings, this.pcaRings, pr)); + this.pcaRings = pr; + }; + window['AscFormat'].CGeoPolygon = CGeoPolygon; + + // GeoPolygons + drawingsChangesMap[AscDFH.historyitem_GeoPolygons_SetGeoPolygon] = function(oClass, value) { + oClass.geoPolygon = value; + }; + AscDFH.changesFactory[AscDFH.historyitem_GeoPolygons_SetGeoPolygon] = window['AscDFH'].CChangesDrawingsString; + function CGeoPolygons() { + CBaseChartObject.call(this); + this.geoPolygon = null; + } + + InitClass(CGeoPolygons, CBaseChartObject, AscDFH.historyitem_type_GeoPolygons); + + CGeoPolygons.prototype.setGeoPolygon = function(pr) { + History.CanAddChanges() && History.Add(new CChangesDrawingsString(this, AscDFH.historyitem_GeoPolygons_SetGeoPolygon, this.geoPolygon, pr)); + this.geoPolygon = pr; + }; + window['AscFormat'].CGeoPolygons = CGeoPolygons; + + // Gridlines + drawingsChangesMap[AscDFH.historyitem_Gridlines_SetSpPr] = function(oClass, value) { + oClass.spPr = value; + }; + drawingsChangesMap[AscDFH.historyitem_Gridlines_SetExtLst] = function(oClass, value) { + oClass.extLst = value; + }; + AscDFH.changesFactory[AscDFH.historyitem_Gridlines_SetSpPr] = window['AscDFH'].CChangesDrawingsString; + AscDFH.changesFactory[AscDFH.historyitem_Gridlines_SetExtLst] = window['AscDFH'].CChangesDrawingsString; + function CGridlines() { + CBaseChartObject.call(this); + this.spPr = null; + this.extLst = null; + } + + InitClass(CGridlines, CBaseChartObject, AscDFH.historyitem_type_Gridlines); + + CGridlines.prototype.setSpPr = function(pr) { + History.CanAddChanges() && History.Add(new CChangesDrawingsString(this, AscDFH.historyitem_Gridlines_SetSpPr, this.spPr, pr)); + this.spPr = pr; + }; + CGridlines.prototype.setExtLst = function(pr) { + History.CanAddChanges() && History.Add(new CChangesDrawingsString(this, AscDFH.historyitem_Gridlines_SetExtLst, this.extLst, pr)); + this.extLst = pr; + }; + window['AscFormat'].CGridlines = CGridlines; + + // HeaderFooter + drawingsChangesMap[AscDFH.historyitem_HeaderFooter_SetOddHeader] = function(oClass, value) { + oClass.oddHeader = value; + }; + drawingsChangesMap[AscDFH.historyitem_HeaderFooter_SetOddFooter] = function(oClass, value) { + oClass.oddFooter = value; + }; + drawingsChangesMap[AscDFH.historyitem_HeaderFooter_SetEvenHeader] = function(oClass, value) { + oClass.evenHeader = value; + }; + drawingsChangesMap[AscDFH.historyitem_HeaderFooter_SetEvenFooter] = function(oClass, value) { + oClass.evenFooter = value; + }; + drawingsChangesMap[AscDFH.historyitem_HeaderFooter_SetFirstHeader] = function(oClass, value) { + oClass.firstHeader = value; + }; + drawingsChangesMap[AscDFH.historyitem_HeaderFooter_SetFirstFooter] = function(oClass, value) { + oClass.firstFooter = value; + }; + drawingsChangesMap[AscDFH.historyitem_HeaderFooter_SetAlignWithMargins] = function(oClass, value) { + oClass.alignWithMargins = value; + }; + drawingsChangesMap[AscDFH.historyitem_HeaderFooter_SetDifferentOddEven] = function(oClass, value) { + oClass.differentOddEven = value; + }; + drawingsChangesMap[AscDFH.historyitem_HeaderFooter_SetDifferentFirst] = function(oClass, value) { + oClass.differentFirst = value; + }; + AscDFH.changesFactory[AscDFH.historyitem_Address_SetTest] = window['AscDFH'].CChangesDrawingsString; + function CHeaderFooter() { + CBaseChartObject.call(this); + this.oddHeader = null; + this.oddFooter = null; + this.evenHeader = null; + this.evenFooter = null; + this.firstHeader = null; + this.firstFooter = null; + this.alignWithMargins = null; + this.differentOddEven = null; + this.differentFirst = null; + } + + InitClass(CHeaderFooter, CBaseChartObject, AscDFH.historyitem_type_HeaderFooter); + + CHeaderFooter.prototype.setOddHeader = function(pr) { + History.CanAddChanges() && History.Add(new CChangesDrawingsString(this, AscDFH.historyitem_HeaderFooter_SetOddHeader, this.oddHeader, pr)); + this.oddHeader = pr; + }; + CHeaderFooter.prototype.setOddFooter = function(pr) { + History.CanAddChanges() && History.Add(new CChangesDrawingsString(this, AscDFH.historyitem_HeaderFooter_SetOddFooter, this.oddFooter, pr)); + this.oddFooter = pr; + }; + CHeaderFooter.prototype.setEvenHeader = function(pr) { + History.CanAddChanges() && History.Add(new CChangesDrawingsString(this, AscDFH.historyitem_HeaderFooter_SetEvenHeader, this.evenHeader, pr)); + this.evenHeader = pr; + }; + CHeaderFooter.prototype.setEvenFooter = function(pr) { + History.CanAddChanges() && History.Add(new CChangesDrawingsString(this, AscDFH.historyitem_HeaderFooter_SetEvenFooter, this.evenFooter, pr)); + this.evenFooter = pr; + }; + CHeaderFooter.prototype.setFirstHeader = function(pr) { + History.CanAddChanges() && History.Add(new CChangesDrawingsString(this, AscDFH.historyitem_HeaderFooter_SetFirstHeader, this.firstHeader, pr)); + this.firstHeader = pr; + }; + CHeaderFooter.prototype.setFirstFooter = function(pr) { + History.CanAddChanges() && History.Add(new CChangesDrawingsString(this, AscDFH.historyitem_HeaderFooter_SetFirstFooter, this.firstFooter, pr)); + this.firstFooter = pr; + }; + CHeaderFooter.prototype.setAlignWithMargins = function(pr) { + History.CanAddChanges() && History.Add(new CChangesDrawingsString(this, AscDFH.historyitem_HeaderFooter_SetAlignWithMargins, this.alignWithMargins, pr)); + this.alignWithMargins = pr; + }; + CHeaderFooter.prototype.setDifferentOddEven = function(pr) { + History.CanAddChanges() && History.Add(new CChangesDrawingsString(this, AscDFH.historyitem_HeaderFooter_SetDifferentOddEven, this.differentOddEven, pr)); + this.differentOddEven = pr; + }; + CHeaderFooter.prototype.setDifferentFirst = function(pr) { + History.CanAddChanges() && History.Add(new CChangesDrawingsString(this, AscDFH.historyitem_HeaderFooter_SetDifferentFirst, this.differentFirst, pr)); + this.differentFirst = pr; + }; + window['AscFormat'].CHeaderFooter = CHeaderFooter; + + // Legend + drawingsChangesMap[AscDFH.historyitem_Legend_SetSpPr] = function(oClass, value) { + oClass.spPr = value; + }; + drawingsChangesMap[AscDFH.historyitem_Legend_SetTxPr] = function(oClass, value) { + oClass.txPr = value; + }; + drawingsChangesMap[AscDFH.historyitem_Legend_SetExtLst] = function(oClass, value) { + oClass.extLst = value; + }; + drawingsChangesMap[AscDFH.historyitem_Legend_SetPos] = function(oClass, value) { + oClass.pos = value; + }; + drawingsChangesMap[AscDFH.historyitem_Legend_SetAlign] = function(oClass, value) { + oClass.align = value; + }; + drawingsChangesMap[AscDFH.historyitem_Legend_SetOverlay] = function(oClass, value) { + oClass.overlay = value; + }; + AscDFH.changesFactory[AscDFH.historyitem_Legend_SetSpPr] = window['AscDFH'].CChangesDrawingsString; + AscDFH.changesFactory[AscDFH.historyitem_Legend_SetTxPr] = window['AscDFH'].CChangesDrawingsString; + AscDFH.changesFactory[AscDFH.historyitem_Legend_SetExtLst] = window['AscDFH'].CChangesDrawingsString; + AscDFH.changesFactory[AscDFH.historyitem_Legend_SetPos] = window['AscDFH'].CChangesDrawingsString; + AscDFH.changesFactory[AscDFH.historyitem_Legend_SetAlign] = window['AscDFH'].CChangesDrawingsString; + AscDFH.changesFactory[AscDFH.historyitem_Legend_SetOverlay] = window['AscDFH'].CChangesDrawingsString; + function CLegend() { + CBaseChartObject.call(this); + this.spPr = null; + this.txPr = null; + this.extLst = null; + this.pos = null; + this.align = null; + this.overlay = null; + } + + InitClass(CLegend, CBaseChartObject, AscDFH.historyitem_type_Legend); + + CLegend.prototype.setSpPr = function(pr) { + History.CanAddChanges() && History.Add(new CChangesDrawingsString(this, AscDFH.historyitem_Legend_SetSpPr, this.spPr, pr)); + this.spPr = pr; + }; + CLegend.prototype.setTxPr = function(pr) { + History.CanAddChanges() && History.Add(new CChangesDrawingsString(this, AscDFH.historyitem_Legend_SetTxPr, this.txPr, pr)); + this.txPr = pr; + }; + CLegend.prototype.setExtLst = function(pr) { + History.CanAddChanges() && History.Add(new CChangesDrawingsString(this, AscDFH.historyitem_Legend_SetExtLst, this.extLst, pr)); + this.extLst = pr; + }; + CLegend.prototype.setPos = function(pr) { + History.CanAddChanges() && History.Add(new CChangesDrawingsString(this, AscDFH.historyitem_Legend_SetPos, this.pos, pr)); + this.pos = pr; + }; + CLegend.prototype.setAlign = function(pr) { + History.CanAddChanges() && History.Add(new CChangesDrawingsString(this, AscDFH.historyitem_Legend_SetAlign, this.align, pr)); + this.align = pr; + }; + CLegend.prototype.setOverlay = function(pr) { + History.CanAddChanges() && History.Add(new CChangesDrawingsString(this, AscDFH.historyitem_Legend_SetOverlay, this.overlay, pr)); + this.overlay = pr; + }; + window['AscFormat'].CLegend = CLegend; + + // NumberColorPosition + drawingsChangesMap[AscDFH.historyitem_NumberColorPosition_SetVal] = function(oClass, value) { + oClass.val = value; + }; + AscDFH.changesFactory[AscDFH.historyitem_NumberColorPosition_SetVal] = window['AscDFH'].CChangesDrawingsString; + function CNumberColorPosition() { + CBaseChartObject.call(this); + this.val = null; + } + + InitClass(CNumberColorPosition, CBaseChartObject, AscDFH.historyitem_type_NumberColorPosition); + + CNumberColorPosition.prototype.setVal = function(pr) { + History.CanAddChanges() && History.Add(new CChangesDrawingsString(this, AscDFH.historyitem_NumberColorPosition_SetVal, this.val, pr)); + this.val = pr; + }; + window['AscFormat'].CNumberColorPosition = CNumberColorPosition; + + // NumberFormat + drawingsChangesMap[AscDFH.historyitem_NumberFormat_SetFormatCode] = function(oClass, value) { + oClass.formatCode = value; + }; + drawingsChangesMap[AscDFH.historyitem_NumberFormat_SetSourceLinked] = function(oClass, value) { + oClass.sourceLinked = value; + }; + AscDFH.changesFactory[AscDFH.historyitem_NumberFormat_SetFormatCode] = window['AscDFH'].CChangesDrawingsString; + AscDFH.changesFactory[AscDFH.historyitem_NumberFormat_SetSourceLinked] = window['AscDFH'].CChangesDrawingsString; + function CNumberFormat() { + CBaseChartObject.call(this); + this.formatCode = null; + this.sourceLinked = null; + } + + InitClass(CNumberFormat, CBaseChartObject, AscDFH.historyitem_type_NumberFormat); + + CNumberFormat.prototype.setFormatCode = function(pr) { + History.CanAddChanges() && History.Add(new CChangesDrawingsString(this, AscDFH.historyitem_NumberFormat_SetFormatCode, this.formatCode, pr)); + this.formatCode = pr; + }; + CNumberFormat.prototype.setSourceLinked = function(pr) { + History.CanAddChanges() && History.Add(new CChangesDrawingsString(this, AscDFH.historyitem_NumberFormat_SetSourceLinked, this.sourceLinked, pr)); + this.sourceLinked = pr; + }; + window['AscFormat'].CNumberFormat = CNumberFormat; + + // NumericDimension + drawingsChangesMap[AscDFH.historyitem_NumericDimension_SetF] = function(oClass, value) { + oClass.f = value; + }; + drawingsChangesMap[AscDFH.historyitem_NumericDimension_SetNf] = function(oClass, value) { + oClass.nf = value; + }; + drawingsChangesMap[AscDFH.historyitem_NumericDimension_SetLvl] = function(oClass, value) { + oClass.lvl = value; + }; + drawingsChangesMap[AscDFH.historyitem_NumericDimension_SetType] = function(oClass, value) { + oClass.type = value; + }; + AscDFH.changesFactory[AscDFH.historyitem_NumericDimension_SetF] = window['AscDFH'].CChangesDrawingsString; + AscDFH.changesFactory[AscDFH.historyitem_NumericDimension_SetNf] = window['AscDFH'].CChangesDrawingsString; + AscDFH.changesFactory[AscDFH.historyitem_NumericDimension_SetLvl] = window['AscDFH'].CChangesDrawingsString; + AscDFH.changesFactory[AscDFH.historyitem_NumericDimension_SetType] = window['AscDFH'].CChangesDrawingsString; + function CNumericDimension() { + CBaseChartObject.call(this); + this.f = null; + this.nf = null; + this.lvl = null; + this.type = null; + } + + InitClass(CNumericDimension, CBaseChartObject, AscDFH.historyitem_type_NumericDimension); + + CNumericDimension.prototype.setF = function(pr) { + History.CanAddChanges() && History.Add(new CChangesDrawingsString(this, AscDFH.historyitem_NumericDimension_SetF, this.f, pr)); + this.f = pr; + }; + CNumericDimension.prototype.setNf = function(pr) { + History.CanAddChanges() && History.Add(new CChangesDrawingsString(this, AscDFH.historyitem_NumericDimension_SetNf, this.nf, pr)); + this.nf = pr; + }; + CNumericDimension.prototype.setLvl = function(pr) { + History.CanAddChanges() && History.Add(new CChangesDrawingsString(this, AscDFH.historyitem_NumericDimension_SetLvl, this.lvl, pr)); + this.lvl = pr; + }; + CNumericDimension.prototype.setType = function(pr) { + History.CanAddChanges() && History.Add(new CChangesDrawingsString(this, AscDFH.historyitem_NumericDimension_SetType, this.type, pr)); + this.type = pr; + }; + window['AscFormat'].CNumericDimension = CNumericDimension; + + // NumericLevel + drawingsChangesMap[AscDFH.historyitem_NumericLevel_SetPt] = function(oClass, value) { + oClass.pt = value; + }; + drawingsChangesMap[AscDFH.historyitem_NumericLevel_SetPtCount] = function(oClass, value) { + oClass.ptCount = value; + }; + drawingsChangesMap[AscDFH.historyitem_NumericLevel_SetFormatCode] = function(oClass, value) { + oClass.formatCode = value; + }; + drawingsChangesMap[AscDFH.historyitem_NumericLevel_SetName] = function(oClass, value) { + oClass.name = value; + }; + AscDFH.changesFactory[AscDFH.historyitem_NumericLevel_SetPt] = window['AscDFH'].CChangesDrawingsString; + AscDFH.changesFactory[AscDFH.historyitem_NumericLevel_SetPtCount] = window['AscDFH'].CChangesDrawingsString; + AscDFH.changesFactory[AscDFH.historyitem_NumericLevel_SetFormatCode] = window['AscDFH'].CChangesDrawingsString; + AscDFH.changesFactory[AscDFH.historyitem_NumericLevel_SetName] = window['AscDFH'].CChangesDrawingsString; + function CNumericLevel() { + CBaseChartObject.call(this); + this.pt = null; + this.ptCount = null; + this.formatCode = null; + this.name = null; + } + + InitClass(CNumericLevel, CBaseChartObject, AscDFH.historyitem_type_NumericLevel); + + CNumericLevel.prototype.setPt = function(pr) { + History.CanAddChanges() && History.Add(new CChangesDrawingsString(this, AscDFH.historyitem_NumericLevel_SetPt, this.pt, pr)); + this.pt = pr; + }; + CNumericLevel.prototype.setPtCount = function(pr) { + History.CanAddChanges() && History.Add(new CChangesDrawingsString(this, AscDFH.historyitem_NumericLevel_SetPtCount, this.ptCount, pr)); + this.ptCount = pr; + }; + CNumericLevel.prototype.setFormatCode = function(pr) { + History.CanAddChanges() && History.Add(new CChangesDrawingsString(this, AscDFH.historyitem_NumericLevel_SetFormatCode, this.formatCode, pr)); + this.formatCode = pr; + }; + CNumericLevel.prototype.setName = function(pr) { + History.CanAddChanges() && History.Add(new CChangesDrawingsString(this, AscDFH.historyitem_NumericLevel_SetName, this.name, pr)); + this.name = pr; + }; + window['AscFormat'].CNumericLevel = CNumericLevel; + + // NumericValue + drawingsChangesMap[AscDFH.historyitem_NumericValue_SetIdx] = function(oClass, value) { + oClass.idx = value; + }; + AscDFH.changesFactory[AscDFH.historyitem_NumericValue_SetIdx] = window['AscDFH'].CChangesDrawingsString; + function CNumericValue() { + CBaseChartObject.call(this); + this.idx = null; + } + + InitClass(CNumericValue, CBaseChartObject, AscDFH.historyitem_type_NumericValue); + + CNumericValue.prototype.setIdx = function(pr) { + History.CanAddChanges() && History.Add(new CChangesDrawingsString(this, AscDFH.historyitem_NumericValue_SetIdx, this.idx, pr)); + this.idx = pr; + }; + window['AscFormat'].CNumericValue = CNumericValue; + + // PageMargins + drawingsChangesMap[AscDFH.historyitem_PageMargins_SetL] = function(oClass, value) { + oClass.l = value; + }; + drawingsChangesMap[AscDFH.historyitem_PageMargins_SetR] = function(oClass, value) { + oClass.r = value; + }; + drawingsChangesMap[AscDFH.historyitem_PageMargins_SetT] = function(oClass, value) { + oClass.t = value; + }; + drawingsChangesMap[AscDFH.historyitem_PageMargins_SetB] = function(oClass, value) { + oClass.b = value; + }; + drawingsChangesMap[AscDFH.historyitem_PageMargins_SetHeader] = function(oClass, value) { + oClass.header = value; + }; + drawingsChangesMap[AscDFH.historyitem_PageMargins_SetFooter] = function(oClass, value) { + oClass.footer = value; + }; + AscDFH.changesFactory[AscDFH.historyitem_PageMargins_SetL] = window['AscDFH'].CChangesDrawingsString; + AscDFH.changesFactory[AscDFH.historyitem_PageMargins_SetR] = window['AscDFH'].CChangesDrawingsString; + AscDFH.changesFactory[AscDFH.historyitem_PageMargins_SetT] = window['AscDFH'].CChangesDrawingsString; + AscDFH.changesFactory[AscDFH.historyitem_PageMargins_SetB] = window['AscDFH'].CChangesDrawingsString; + AscDFH.changesFactory[AscDFH.historyitem_PageMargins_SetHeader] = window['AscDFH'].CChangesDrawingsString; + AscDFH.changesFactory[AscDFH.historyitem_PageMargins_SetFooter] = window['AscDFH'].CChangesDrawingsString; + function CPageMargins() { + CBaseChartObject.call(this); + this.l = null; + this.r = null; + this.t = null; + this.b = null; + this.header = null; + this.footer = null; + } + + InitClass(CPageMargins, CBaseChartObject, AscDFH.historyitem_type_PageMargins); + + CPageMargins.prototype.setL = function(pr) { + History.CanAddChanges() && History.Add(new CChangesDrawingsString(this, AscDFH.historyitem_PageMargins_SetL, this.l, pr)); + this.l = pr; + }; + CPageMargins.prototype.setR = function(pr) { + History.CanAddChanges() && History.Add(new CChangesDrawingsString(this, AscDFH.historyitem_PageMargins_SetR, this.r, pr)); + this.r = pr; + }; + CPageMargins.prototype.setT = function(pr) { + History.CanAddChanges() && History.Add(new CChangesDrawingsString(this, AscDFH.historyitem_PageMargins_SetT, this.t, pr)); + this.t = pr; + }; + CPageMargins.prototype.setB = function(pr) { + History.CanAddChanges() && History.Add(new CChangesDrawingsString(this, AscDFH.historyitem_PageMargins_SetB, this.b, pr)); + this.b = pr; + }; + CPageMargins.prototype.setHeader = function(pr) { + History.CanAddChanges() && History.Add(new CChangesDrawingsString(this, AscDFH.historyitem_PageMargins_SetHeader, this.header, pr)); + this.header = pr; + }; + CPageMargins.prototype.setFooter = function(pr) { + History.CanAddChanges() && History.Add(new CChangesDrawingsString(this, AscDFH.historyitem_PageMargins_SetFooter, this.footer, pr)); + this.footer = pr; + }; + window['AscFormat'].CPageMargins = CPageMargins; + // template drawingsChangesMap[AscDFH.historyitem_Address_SetTest] = function(oClass, value) { oClass.test = value; From 37d176547ddaa8ecddfb4ddad1b1442493a6b38c Mon Sep 17 00:00:00 2001 From: Dmitriy Alexandrov Date: Fri, 28 Jul 2023 21:06:44 +0600 Subject: [PATCH 04/30] add classes --- common/Drawings/Format/ChartEx.js | 1017 +++++++++++++++++++++++++++++ 1 file changed, 1017 insertions(+) diff --git a/common/Drawings/Format/ChartEx.js b/common/Drawings/Format/ChartEx.js index 8e9615ddcd..e73a1b6dd9 100644 --- a/common/Drawings/Format/ChartEx.js +++ b/common/Drawings/Format/ChartEx.js @@ -2316,6 +2316,1023 @@ }; window['AscFormat'].CPageMargins = CPageMargins; + // PageSetup + drawingsChangesMap[AscDFH.historyitem_PageSetup_SetPaperSize] = function(oClass, value) { + oClass.paperSize = value; + }; + drawingsChangesMap[AscDFH.historyitem_PageSetup_SetFirstPageNumber] = function(oClass, value) { + oClass.firstPageNumber = value; + }; + drawingsChangesMap[AscDFH.historyitem_PageSetup_SetOrientation] = function(oClass, value) { + oClass.orientation = value; + }; + drawingsChangesMap[AscDFH.historyitem_PageSetup_SetBlackAndWhite] = function(oClass, value) { + oClass.blackAndWhite = value; + }; + drawingsChangesMap[AscDFH.historyitem_PageSetup_SetDraft] = function(oClass, value) { + oClass.draft = value; + }; + drawingsChangesMap[AscDFH.historyitem_PageSetup_SetUseFirstPageNumber] = function(oClass, value) { + oClass.useFirstPageNumber = value; + }; + drawingsChangesMap[AscDFH.historyitem_PageSetup_SetHorizontalDpi] = function(oClass, value) { + oClass.horizontalDpi = value; + }; + drawingsChangesMap[AscDFH.historyitem_PageSetup_SetVerticalDpi] = function(oClass, value) { + oClass.verticalDpi = value; + }; + drawingsChangesMap[AscDFH.historyitem_PageSetup_SetCopies] = function(oClass, value) { + oClass.copies = value; + }; + AscDFH.changesFactory[AscDFH.historyitem_PageSetup_SetPaperSize] = window['AscDFH'].CChangesDrawingsString; + AscDFH.changesFactory[AscDFH.historyitem_PageSetup_SetFirstPageNumber] = window['AscDFH'].CChangesDrawingsString; + AscDFH.changesFactory[AscDFH.historyitem_PageSetup_SetOrientation] = window['AscDFH'].CChangesDrawingsString; + AscDFH.changesFactory[AscDFH.historyitem_PageSetup_SetBlackAndWhite] = window['AscDFH'].CChangesDrawingsString; + AscDFH.changesFactory[AscDFH.historyitem_PageSetup_SetDraft] = window['AscDFH'].CChangesDrawingsString; + AscDFH.changesFactory[AscDFH.historyitem_PageSetup_SetUseFirstPageNumber] = window['AscDFH'].CChangesDrawingsString; + AscDFH.changesFactory[AscDFH.historyitem_PageSetup_SetHorizontalDpi] = window['AscDFH'].CChangesDrawingsString; + AscDFH.changesFactory[AscDFH.historyitem_PageSetup_SetVerticalDpi] = window['AscDFH'].CChangesDrawingsString; + AscDFH.changesFactory[AscDFH.historyitem_PageSetup_SetCopies] = window['AscDFH'].CChangesDrawingsString; + function CPageSetup() { + CBaseChartObject.call(this); + this.paperSize = null; + this.firstPageNumber = null; + this.orientation = null; + this.blackAndWhite = null; + this.draft = null; + this.useFirstPageNumber = null; + this.horizontalDpi = null; + this.verticalDpi = null; + this.copies = null; + } + + InitClass(CPageSetup, CBaseChartObject, AscDFH.historyitem_type_PageSetup); + + CPageSetup.prototype.setPaperSize = function(pr) { + History.CanAddChanges() && History.Add(new CChangesDrawingsString(this, AscDFH.historyitem_PageSetup_SetPaperSize, this.paperSize, pr)); + this.paperSize = pr; + }; + CPageSetup.prototype.setFirstPageNumber = function(pr) { + History.CanAddChanges() && History.Add(new CChangesDrawingsString(this, AscDFH.historyitem_PageSetup_SetFirstPageNumber, this.firstPageNumber, pr)); + this.firstPageNumber = pr; + }; + CPageSetup.prototype.setOrientation = function(pr) { + History.CanAddChanges() && History.Add(new CChangesDrawingsString(this, AscDFH.historyitem_PageSetup_SetOrientation, this.orientation, pr)); + this.orientation = pr; + }; + CPageSetup.prototype.setBlackAndWhite = function(pr) { + History.CanAddChanges() && History.Add(new CChangesDrawingsString(this, AscDFH.historyitem_PageSetup_SetBlackAndWhite, this.blackAndWhite, pr)); + this.blackAndWhite = pr; + }; + CPageSetup.prototype.setDraft = function(pr) { + History.CanAddChanges() && History.Add(new CChangesDrawingsString(this, AscDFH.historyitem_PageSetup_SetDraft, this.draft, pr)); + this.draft = pr; + }; + CPageSetup.prototype.setUseFirstPageNumber = function(pr) { + History.CanAddChanges() && History.Add(new CChangesDrawingsString(this, AscDFH.historyitem_PageSetup_SetUseFirstPageNumber, this.useFirstPageNumber, pr)); + this.useFirstPageNumber = pr; + }; + CPageSetup.prototype.setHorizontalDpi = function(pr) { + History.CanAddChanges() && History.Add(new CChangesDrawingsString(this, AscDFH.historyitem_PageSetup_SetHorizontalDpi, this.horizontalDpi, pr)); + this.horizontalDpi = pr; + }; + CPageSetup.prototype.setVerticalDpi = function(pr) { + History.CanAddChanges() && History.Add(new CChangesDrawingsString(this, AscDFH.historyitem_PageSetup_SetVerticalDpi, this.verticalDpi, pr)); + this.verticalDpi = pr; + }; + CPageSetup.prototype.setCopies = function(pr) { + History.CanAddChanges() && History.Add(new CChangesDrawingsString(this, AscDFH.historyitem_PageSetup_SetCopies, this.copies, pr)); + this.copies = pr; + }; + window['AscFormat'].CPageSetup = CPageSetup; + + // ParentLabelLayout + drawingsChangesMap[AscDFH.historyitem_ParentLabelLayout_SetVal] = function(oClass, value) { + oClass.val = value; + }; + AscDFH.changesFactory[AscDFH.historyitem_ParentLabelLayout_SetVal] = window['AscDFH'].CChangesDrawingsString; + function CParentLabelLayout() { + CBaseChartObject.call(this); + this.val = null; + } + + InitClass(CParentLabelLayout, CBaseChartObject, AscDFH.historyitem_type_ParentLabelLayout); + + CParentLabelLayout.prototype.setVal = function(pr) { + History.CanAddChanges() && History.Add(new CChangesDrawingsString(this, AscDFH.historyitem_ParentLabelLayout_SetVal, this.val, pr)); + this.val = pr; + }; + window['AscFormat'].CParentLabelLayout = CParentLabelLayout; + + // PercentageColorPosition + drawingsChangesMap[AscDFH.historyitem_PercentageColorPosition_SetVal] = function(oClass, value) { + oClass.val = value; + }; + AscDFH.changesFactory[AscDFH.historyitem_PercentageColorPosition_SetVal] = window['AscDFH'].CChangesDrawingsString; + function CPercentageColorPosition() { + CBaseChartObject.call(this); + this.val = null; + } + + InitClass(CPercentageColorPosition, CBaseChartObject, AscDFH.historyitem_type_PercentageColorPosition); + + CPercentageColorPosition.prototype.setVal = function(pr) { + History.CanAddChanges() && History.Add(new CChangesDrawingsString(this, AscDFH.historyitem_PercentageColorPosition_SetVal, this.val, pr)); + this.val = pr; + }; + window['AscFormat'].CPercentageColorPosition = CPercentageColorPosition; + + // PlotArea + drawingsChangesMap[AscDFH.historyitem_PlotArea_SetPlotAreaRegion] = function(oClass, value) { + oClass.plotAreaRegion = value; + }; + drawingsChangesMap[AscDFH.historyitem_PlotArea_SetAxis] = function(oClass, value) { + oClass.axis = value; + }; + drawingsChangesMap[AscDFH.historyitem_PlotArea_SetSpPr] = function(oClass, value) { + oClass.spPr = value; + }; + drawingsChangesMap[AscDFH.historyitem_PlotArea_SetExtLst] = function(oClass, value) { + oClass.extLst = value; + }; + AscDFH.changesFactory[AscDFH.historyitem_PlotArea_SetPlotAreaRegion] = window['AscDFH'].CChangesDrawingsString; + AscDFH.changesFactory[AscDFH.historyitem_PlotArea_SetAxis] = window['AscDFH'].CChangesDrawingsString; + AscDFH.changesFactory[AscDFH.historyitem_PlotArea_SetSpPr] = window['AscDFH'].CChangesDrawingsString; + AscDFH.changesFactory[AscDFH.historyitem_PlotArea_SetExtLst] = window['AscDFH'].CChangesDrawingsString; + function CPlotArea() { + CBaseChartObject.call(this); + this.plotAreaRegion = null; + this.axis = null; + this.spPr = null; + this.extLst = null; + } + + InitClass(CPlotArea, CBaseChartObject, AscDFH.historyitem_type_PlotArea); + + CPlotArea.prototype.setPlotAreaRegion = function(pr) { + History.CanAddChanges() && History.Add(new CChangesDrawingsString(this, AscDFH.historyitem_PlotArea_SetPlotAreaRegion, this.plotAreaRegion, pr)); + this.plotAreaRegion = pr; + }; + CPlotArea.prototype.setAxis = function(pr) { + History.CanAddChanges() && History.Add(new CChangesDrawingsString(this, AscDFH.historyitem_PlotArea_SetAxis, this.axis, pr)); + this.axis = pr; + }; + CPlotArea.prototype.setSpPr = function(pr) { + History.CanAddChanges() && History.Add(new CChangesDrawingsString(this, AscDFH.historyitem_PlotArea_SetSpPr, this.spPr, pr)); + this.spPr = pr; + }; + CPlotArea.prototype.setExtLst = function(pr) { + History.CanAddChanges() && History.Add(new CChangesDrawingsString(this, AscDFH.historyitem_PlotArea_SetExtLst, this.extLst, pr)); + this.extLst = pr; + }; + window['AscFormat'].CPlotArea = CPlotArea; + + // PlotAreaRegion + drawingsChangesMap[AscDFH.historyitem_PlotAreaRegion_SetPlotSurface] = function(oClass, value) { + oClass.plotSurface = value; + }; + drawingsChangesMap[AscDFH.historyitem_PlotAreaRegion_SetSeries] = function(oClass, value) { + oClass.series = value; + }; + drawingsChangesMap[AscDFH.historyitem_PlotAreaRegion_SetExtLst] = function(oClass, value) { + oClass.extLst = value; + }; + AscDFH.changesFactory[AscDFH.historyitem_PlotAreaRegion_SetPlotSurface] = window['AscDFH'].CChangesDrawingsString; + AscDFH.changesFactory[AscDFH.historyitem_PlotAreaRegion_SetSeries] = window['AscDFH'].CChangesDrawingsString; + AscDFH.changesFactory[AscDFH.historyitem_PlotAreaRegion_SetExtLst] = window['AscDFH'].CChangesDrawingsString; + function CPlotAreaRegion() { + CBaseChartObject.call(this); + this.plotSurface = null; + this.series = null; + this.extLst = null; + } + + InitClass(CPlotAreaRegion, CBaseChartObject, AscDFH.historyitem_type_PlotAreaRegion); + + CPlotAreaRegion.prototype.setPlotSurface = function(pr) { + History.CanAddChanges() && History.Add(new CChangesDrawingsString(this, AscDFH.historyitem_PlotAreaRegion_SetPlotSurface, this.plotSurface, pr)); + this.plotSurface = pr; + }; + CPlotAreaRegion.prototype.setSeries = function(pr) { + History.CanAddChanges() && History.Add(new CChangesDrawingsString(this, AscDFH.historyitem_PlotAreaRegion_SetSeries, this.series, pr)); + this.series = pr; + }; + CPlotAreaRegion.prototype.setExtLst = function(pr) { + History.CanAddChanges() && History.Add(new CChangesDrawingsString(this, AscDFH.historyitem_PlotAreaRegion_SetExtLst, this.extLst, pr)); + this.extLst = pr; + }; + window['AscFormat'].CPlotAreaRegion = CPlotAreaRegion; + + // PlotSurface + drawingsChangesMap[AscDFH.historyitem_PlotSurface_SetSpPr] = function(oClass, value) { + oClass.spPr = value; + }; + drawingsChangesMap[AscDFH.historyitem_PlotSurface_SetExtLst] = function(oClass, value) { + oClass.extLst = value; + }; + AscDFH.changesFactory[AscDFH.historyitem_PlotSurface_SetSpPr] = window['AscDFH'].CChangesDrawingsString; + AscDFH.changesFactory[AscDFH.historyitem_PlotSurface_SetExtLst] = window['AscDFH'].CChangesDrawingsString; + function CPlotSurface() { + CBaseChartObject.call(this); + this.spPr = null; + this.extLst = null; + } + + InitClass(CPlotSurface, CBaseChartObject, AscDFH.historyitem_type_PlotSurface); + + CPlotSurface.prototype.setSpPr = function(pr) { + History.CanAddChanges() && History.Add(new CChangesDrawingsString(this, AscDFH.historyitem_PlotSurface_SetSpPr, this.spPr, pr)); + this.spPr = pr; + }; + CPlotSurface.prototype.setExtLst = function(pr) { + History.CanAddChanges() && History.Add(new CChangesDrawingsString(this, AscDFH.historyitem_PlotSurface_SetExtLst, this.extLst, pr)); + this.extLst = pr; + }; + window['AscFormat'].CPlotSurface = CPlotSurface; + + // PrintSettings + drawingsChangesMap[AscDFH.historyitem_PrintSettings_SetHeaderFooter] = function(oClass, value) { + oClass.headerFooter = value; + }; + drawingsChangesMap[AscDFH.historyitem_PrintSettings_SetPageMargins] = function(oClass, value) { + oClass.pageMargins = value; + }; + drawingsChangesMap[AscDFH.historyitem_PrintSettings_SetPageSetup] = function(oClass, value) { + oClass.pageSetup = value; + }; + AscDFH.changesFactory[AscDFH.historyitem_PrintSettings_SetHeaderFooter] = window['AscDFH'].CChangesDrawingsString; + AscDFH.changesFactory[AscDFH.historyitem_PrintSettings_SetPageMargins] = window['AscDFH'].CChangesDrawingsString; + AscDFH.changesFactory[AscDFH.historyitem_PrintSettings_SetPageSetup] = window['AscDFH'].CChangesDrawingsString; + function CPrintSettings() { + CBaseChartObject.call(this); + this.headerFooter = null; + this.pageMargins = null; + this.pageSetup = null; + } + + InitClass(CPrintSettings, CBaseChartObject, AscDFH.historyitem_type_PrintSettings); + + CPrintSettings.prototype.setHeaderFooter = function(pr) { + History.CanAddChanges() && History.Add(new CChangesDrawingsString(this, AscDFH.historyitem_PrintSettings_SetHeaderFooter, this.headerFooter, pr)); + this.headerFooter = pr; + }; + CPrintSettings.prototype.setPageMargins = function(pr) { + History.CanAddChanges() && History.Add(new CChangesDrawingsString(this, AscDFH.historyitem_PrintSettings_SetPageMargins, this.pageMargins, pr)); + this.pageMargins = pr; + }; + CPrintSettings.prototype.setPageSetup = function(pr) { + History.CanAddChanges() && History.Add(new CChangesDrawingsString(this, AscDFH.historyitem_PrintSettings_SetPageSetup, this.pageSetup, pr)); + this.pageSetup = pr; + }; + window['AscFormat'].CPrintSettings = CPrintSettings; + + // RegionLabelLayout + drawingsChangesMap[AscDFH.historyitem_RegionLabelLayout_SetVal] = function(oClass, value) { + oClass.val = value; + }; + AscDFH.changesFactory[AscDFH.historyitem_RegionLabelLayout_SetVal] = window['AscDFH'].CChangesDrawingsString; + function CRegionLabelLayout() { + CBaseChartObject.call(this); + this.val = null; + } + + InitClass(CRegionLabelLayout, CBaseChartObject, AscDFH.historyitem_type_RegionLabelLayout); + + CRegionLabelLayout.prototype.setVal = function(pr) { + History.CanAddChanges() && History.Add(new CChangesDrawingsString(this, AscDFH.historyitem_RegionLabelLayout_SetVal, this.val, pr)); + this.val = pr; + }; + window['AscFormat'].CRegionLabelLayout = CRegionLabelLayout; + + // RelId + drawingsChangesMap[AscDFH.historyitem_RelId_SetR] = function(oClass, value) { + oClass.r = value; + }; + AscDFH.changesFactory[AscDFH.historyitem_RelId_SetR] = window['AscDFH'].CChangesDrawingsString; + function CRelId() { + CBaseChartObject.call(this); + this.r = null; + } + + InitClass(CRelId, CBaseChartObject, AscDFH.historyitem_type_RelId); + + CRelId.prototype.setR = function(pr) { + History.CanAddChanges() && History.Add(new CChangesDrawingsString(this, AscDFH.historyitem_RelId_SetR, this.r, pr)); + this.r = pr; + }; + window['AscFormat'].CRelId = CRelId; + + // Series + drawingsChangesMap[AscDFH.historyitem_Series_SetTx] = function(oClass, value) { + oClass.tx = value; + }; + drawingsChangesMap[AscDFH.historyitem_Series_SetSpPr] = function(oClass, value) { + oClass.spPr = value; + }; + drawingsChangesMap[AscDFH.historyitem_Series_SetValueColors] = function(oClass, value) { + oClass.valueColors = value; + }; + drawingsChangesMap[AscDFH.historyitem_Series_SetValueColorPositions] = function(oClass, value) { + oClass.valueColorPositions = value; + }; + drawingsChangesMap[AscDFH.historyitem_Series_SetDataPt] = function(oClass, value) { + oClass.dataPt = value; + }; + drawingsChangesMap[AscDFH.historyitem_Series_SetDataLabels] = function(oClass, value) { + oClass.dataLabels = value; + }; + drawingsChangesMap[AscDFH.historyitem_Series_SetDataId] = function(oClass, value) { + oClass.dataId = value; + }; + drawingsChangesMap[AscDFH.historyitem_Series_SetLayoutPr] = function(oClass, value) { + oClass.layoutPr = value; + }; + drawingsChangesMap[AscDFH.historyitem_Series_SetAxisId] = function(oClass, value) { + oClass.axisId = value; + }; + drawingsChangesMap[AscDFH.historyitem_Series_SetExtLst] = function(oClass, value) { + oClass.extLst = value; + }; + drawingsChangesMap[AscDFH.historyitem_Series_SetLayoutId] = function(oClass, value) { + oClass.layoutId = value; + }; + drawingsChangesMap[AscDFH.historyitem_Series_SetHidden] = function(oClass, value) { + oClass.hidden = value; + }; + drawingsChangesMap[AscDFH.historyitem_Series_SetOwnerIdx] = function(oClass, value) { + oClass.ownerIdx = value; + }; + drawingsChangesMap[AscDFH.historyitem_Series_SetUniqueId] = function(oClass, value) { + oClass.uniqueId = value; + }; + drawingsChangesMap[AscDFH.historyitem_Series_SetFormatIdx] = function(oClass, value) { + oClass.formatIdx = value; + }; + AscDFH.changesFactory[AscDFH.historyitem_Series_SetTx] = window['AscDFH'].CChangesDrawingsString; + AscDFH.changesFactory[AscDFH.historyitem_Series_SetSpPr] = window['AscDFH'].CChangesDrawingsString; + AscDFH.changesFactory[AscDFH.historyitem_Series_SetValueColors] = window['AscDFH'].CChangesDrawingsString; + AscDFH.changesFactory[AscDFH.historyitem_Series_SetValueColorPositions] = window['AscDFH'].CChangesDrawingsString; + AscDFH.changesFactory[AscDFH.historyitem_Series_SetDataPt] = window['AscDFH'].CChangesDrawingsString; + AscDFH.changesFactory[AscDFH.historyitem_Series_SetDataLabels] = window['AscDFH'].CChangesDrawingsString; + AscDFH.changesFactory[AscDFH.historyitem_Series_SetDataId] = window['AscDFH'].CChangesDrawingsString; + AscDFH.changesFactory[AscDFH.historyitem_Series_SetLayoutPr] = window['AscDFH'].CChangesDrawingsString; + AscDFH.changesFactory[AscDFH.historyitem_Series_SetAxisId] = window['AscDFH'].CChangesDrawingsString; + AscDFH.changesFactory[AscDFH.historyitem_Series_SetExtLst] = window['AscDFH'].CChangesDrawingsString; + AscDFH.changesFactory[AscDFH.historyitem_Series_SetLayoutId] = window['AscDFH'].CChangesDrawingsString; + AscDFH.changesFactory[AscDFH.historyitem_Series_SetHidden] = window['AscDFH'].CChangesDrawingsString; + AscDFH.changesFactory[AscDFH.historyitem_Series_SetOwnerIdx] = window['AscDFH'].CChangesDrawingsString; + AscDFH.changesFactory[AscDFH.historyitem_Series_SetUniqueId] = window['AscDFH'].CChangesDrawingsString; + AscDFH.changesFactory[AscDFH.historyitem_Series_SetFormatIdx] = window['AscDFH'].CChangesDrawingsString; + function CSeries() { + CBaseChartObject.call(this); + this.tx = null; + this.spPr = null; + this.valueColors = null; + this.valueColorPositions = null; + this.dataPt = null; + this.dataLabels = null; + this.dataId = null; + this.layoutPr = null; + this.axisId = null; + this.extLst = null; + this.layoutId = null; + this.hidden = null; + this.ownerIdx = null; + this.uniqueId = null; + this.formatIdx = null; + } + + InitClass(CSeries, CBaseChartObject, AscDFH.historyitem_type_Series); + + CSeries.prototype.setTx = function(pr) { + History.CanAddChanges() && History.Add(new CChangesDrawingsString(this, AscDFH.historyitem_Series_SetTx, this.tx, pr)); + this.tx = pr; + }; + CSeries.prototype.setSpPr = function(pr) { + History.CanAddChanges() && History.Add(new CChangesDrawingsString(this, AscDFH.historyitem_Series_SetSpPr, this.spPr, pr)); + this.spPr = pr; + }; + CSeries.prototype.setValueColors = function(pr) { + History.CanAddChanges() && History.Add(new CChangesDrawingsString(this, AscDFH.historyitem_Series_SetValueColors, this.valueColors, pr)); + this.valueColors = pr; + }; + CSeries.prototype.setValueColorPositions = function(pr) { + History.CanAddChanges() && History.Add(new CChangesDrawingsString(this, AscDFH.historyitem_Series_SetValueColorPositions, this.valueColorPositions, pr)); + this.valueColorPositions = pr; + }; + CSeries.prototype.setDataPt = function(pr) { + History.CanAddChanges() && History.Add(new CChangesDrawingsString(this, AscDFH.historyitem_Series_SetDataPt, this.dataPt, pr)); + this.dataPt = pr; + }; + CSeries.prototype.setDataLabels = function(pr) { + History.CanAddChanges() && History.Add(new CChangesDrawingsString(this, AscDFH.historyitem_Series_SetDataLabels, this.dataLabels, pr)); + this.dataLabels = pr; + }; + CSeries.prototype.setDataId = function(pr) { + History.CanAddChanges() && History.Add(new CChangesDrawingsString(this, AscDFH.historyitem_Series_SetDataId, this.dataId, pr)); + this.dataId = pr; + }; + CSeries.prototype.setLayoutPr = function(pr) { + History.CanAddChanges() && History.Add(new CChangesDrawingsString(this, AscDFH.historyitem_Series_SetLayoutPr, this.layoutPr, pr)); + this.layoutPr = pr; + }; + CSeries.prototype.setAxisId = function(pr) { + History.CanAddChanges() && History.Add(new CChangesDrawingsString(this, AscDFH.historyitem_Series_SetAxisId, this.axisId, pr)); + this.axisId = pr; + }; + CSeries.prototype.setExtLst = function(pr) { + History.CanAddChanges() && History.Add(new CChangesDrawingsString(this, AscDFH.historyitem_Series_SetExtLst, this.extLst, pr)); + this.extLst = pr; + }; + CSeries.prototype.setLayoutId = function(pr) { + History.CanAddChanges() && History.Add(new CChangesDrawingsString(this, AscDFH.historyitem_Series_SetLayoutId, this.layoutId, pr)); + this.layoutId = pr; + }; + CSeries.prototype.setHidden = function(pr) { + History.CanAddChanges() && History.Add(new CChangesDrawingsString(this, AscDFH.historyitem_Series_SetHidden, this.hidden, pr)); + this.hidden = pr; + }; + CSeries.prototype.setOwnerIdx = function(pr) { + History.CanAddChanges() && History.Add(new CChangesDrawingsString(this, AscDFH.historyitem_Series_SetOwnerIdx, this.ownerIdx, pr)); + this.ownerIdx = pr; + }; + CSeries.prototype.setUniqueId = function(pr) { + History.CanAddChanges() && History.Add(new CChangesDrawingsString(this, AscDFH.historyitem_Series_SetUniqueId, this.uniqueId, pr)); + this.uniqueId = pr; + }; + CSeries.prototype.setFormatIdx = function(pr) { + History.CanAddChanges() && History.Add(new CChangesDrawingsString(this, AscDFH.historyitem_Series_SetFormatIdx, this.formatIdx, pr)); + this.formatIdx = pr; + }; + window['AscFormat'].CSeries = CSeries; + + // SeriesElementVisibilities + drawingsChangesMap[AscDFH.historyitem_SeriesElementVisibilities_SetConnectorLines] = function(oClass, value) { + oClass.connectorLines = value; + }; + drawingsChangesMap[AscDFH.historyitem_SeriesElementVisibilities_SetMeanLine] = function(oClass, value) { + oClass.meanLine = value; + }; + drawingsChangesMap[AscDFH.historyitem_SeriesElementVisibilities_SetMeanMarker] = function(oClass, value) { + oClass.meanMarker = value; + }; + drawingsChangesMap[AscDFH.historyitem_SeriesElementVisibilities_SetNonoutliers] = function(oClass, value) { + oClass.nonoutliers = value; + }; + drawingsChangesMap[AscDFH.historyitem_SeriesElementVisibilities_SetOutliers] = function(oClass, value) { + oClass.outliers = value; + }; + AscDFH.changesFactory[AscDFH.historyitem_SeriesElementVisibilities_SetConnectorLines] = window['AscDFH'].CChangesDrawingsString; + AscDFH.changesFactory[AscDFH.historyitem_SeriesElementVisibilities_SetMeanLine] = window['AscDFH'].CChangesDrawingsString; + AscDFH.changesFactory[AscDFH.historyitem_SeriesElementVisibilities_SetMeanMarker] = window['AscDFH'].CChangesDrawingsString; + AscDFH.changesFactory[AscDFH.historyitem_SeriesElementVisibilities_SetNonoutliers] = window['AscDFH'].CChangesDrawingsString; + AscDFH.changesFactory[AscDFH.historyitem_SeriesElementVisibilities_SetOutliers] = window['AscDFH'].CChangesDrawingsString; + function CSeriesElementVisibilities() { + CBaseChartObject.call(this); + this.connectorLines = null; + this.meanLine = null; + this.meanMarker = null; + this.nonoutliers = null; + this.outliers = null; + } + + InitClass(CSeriesElementVisibilities, CBaseChartObject, AscDFH.historyitem_type_SeriesElementVisibilities); + + CSeriesElementVisibilities.prototype.setConnectorLines = function(pr) { + History.CanAddChanges() && History.Add(new CChangesDrawingsString(this, AscDFH.historyitem_SeriesElementVisibilities_SetConnectorLines, this.connectorLines, pr)); + this.connectorLines = pr; + }; + CSeriesElementVisibilities.prototype.setMeanLine = function(pr) { + History.CanAddChanges() && History.Add(new CChangesDrawingsString(this, AscDFH.historyitem_SeriesElementVisibilities_SetMeanLine, this.meanLine, pr)); + this.meanLine = pr; + }; + CSeriesElementVisibilities.prototype.setMeanMarker = function(pr) { + History.CanAddChanges() && History.Add(new CChangesDrawingsString(this, AscDFH.historyitem_SeriesElementVisibilities_SetMeanMarker, this.meanMarker, pr)); + this.meanMarker = pr; + }; + CSeriesElementVisibilities.prototype.setNonoutliers = function(pr) { + History.CanAddChanges() && History.Add(new CChangesDrawingsString(this, AscDFH.historyitem_SeriesElementVisibilities_SetNonoutliers, this.nonoutliers, pr)); + this.nonoutliers = pr; + }; + CSeriesElementVisibilities.prototype.setOutliers = function(pr) { + History.CanAddChanges() && History.Add(new CChangesDrawingsString(this, AscDFH.historyitem_SeriesElementVisibilities_SetOutliers, this.outliers, pr)); + this.outliers = pr; + }; + window['AscFormat'].CSeriesElementVisibilities = CSeriesElementVisibilities; + + // SeriesLayoutProperties + drawingsChangesMap[AscDFH.historyitem_SeriesLayoutProperties_SetParentLabelLayout] = function(oClass, value) { + oClass.parentLabelLayout = value; + }; + drawingsChangesMap[AscDFH.historyitem_SeriesLayoutProperties_SetRegionLabelLayout] = function(oClass, value) { + oClass.regionLabelLayout = value; + }; + drawingsChangesMap[AscDFH.historyitem_SeriesLayoutProperties_SetVisibility] = function(oClass, value) { + oClass.visibility = value; + }; + drawingsChangesMap[AscDFH.historyitem_SeriesLayoutProperties_SetAggregation] = function(oClass, value) { + oClass.aggregation = value; + }; + drawingsChangesMap[AscDFH.historyitem_SeriesLayoutProperties_SetBinning] = function(oClass, value) { + oClass.binning = value; + }; + drawingsChangesMap[AscDFH.historyitem_SeriesLayoutProperties_SetGeography] = function(oClass, value) { + oClass.geography = value; + }; + drawingsChangesMap[AscDFH.historyitem_SeriesLayoutProperties_SetStatistics] = function(oClass, value) { + oClass.statistics = value; + }; + drawingsChangesMap[AscDFH.historyitem_SeriesLayoutProperties_SetSubtotals] = function(oClass, value) { + oClass.subtotals = value; + }; + drawingsChangesMap[AscDFH.historyitem_SeriesLayoutProperties_SetExtLst] = function(oClass, value) { + oClass.extLst = value; + }; + AscDFH.changesFactory[AscDFH.historyitem_SeriesLayoutProperties_SetParentLabelLayout] = window['AscDFH'].CChangesDrawingsString; + AscDFH.changesFactory[AscDFH.historyitem_SeriesLayoutProperties_SetRegionLabelLayout] = window['AscDFH'].CChangesDrawingsString; + AscDFH.changesFactory[AscDFH.historyitem_SeriesLayoutProperties_SetVisibility] = window['AscDFH'].CChangesDrawingsString; + AscDFH.changesFactory[AscDFH.historyitem_SeriesLayoutProperties_SetAggregation] = window['AscDFH'].CChangesDrawingsString; + AscDFH.changesFactory[AscDFH.historyitem_SeriesLayoutProperties_SetBinning] = window['AscDFH'].CChangesDrawingsString; + AscDFH.changesFactory[AscDFH.historyitem_SeriesLayoutProperties_SetGeography] = window['AscDFH'].CChangesDrawingsString; + AscDFH.changesFactory[AscDFH.historyitem_SeriesLayoutProperties_SetStatistics] = window['AscDFH'].CChangesDrawingsString; + AscDFH.changesFactory[AscDFH.historyitem_SeriesLayoutProperties_SetSubtotals] = window['AscDFH'].CChangesDrawingsString; + AscDFH.changesFactory[AscDFH.historyitem_SeriesLayoutProperties_SetExtLst] = window['AscDFH'].CChangesDrawingsString; + function CSeriesLayoutProperties() { + CBaseChartObject.call(this); + this.parentLabelLayout = null; + this.regionLabelLayout = null; + this.visibility = null; + this.aggregation = null; + this.binning = null; + this.geography = null; + this.statistics = null; + this.subtotals = null; + this.extLst = null; + } + + InitClass(CSeriesLayoutProperties, CBaseChartObject, AscDFH.historyitem_type_SeriesLayoutProperties); + + CSeriesLayoutProperties.prototype.setParentLabelLayout = function(pr) { + History.CanAddChanges() && History.Add(new CChangesDrawingsString(this, AscDFH.historyitem_SeriesLayoutProperties_SetParentLabelLayout, this.parentLabelLayout, pr)); + this.parentLabelLayout = pr; + }; + CSeriesLayoutProperties.prototype.setRegionLabelLayout = function(pr) { + History.CanAddChanges() && History.Add(new CChangesDrawingsString(this, AscDFH.historyitem_SeriesLayoutProperties_SetRegionLabelLayout, this.regionLabelLayout, pr)); + this.regionLabelLayout = pr; + }; + CSeriesLayoutProperties.prototype.setVisibility = function(pr) { + History.CanAddChanges() && History.Add(new CChangesDrawingsString(this, AscDFH.historyitem_SeriesLayoutProperties_SetVisibility, this.visibility, pr)); + this.visibility = pr; + }; + CSeriesLayoutProperties.prototype.setAggregation = function(pr) { + History.CanAddChanges() && History.Add(new CChangesDrawingsString(this, AscDFH.historyitem_SeriesLayoutProperties_SetAggregation, this.aggregation, pr)); + this.aggregation = pr; + }; + CSeriesLayoutProperties.prototype.setBinning = function(pr) { + History.CanAddChanges() && History.Add(new CChangesDrawingsString(this, AscDFH.historyitem_SeriesLayoutProperties_SetBinning, this.binning, pr)); + this.binning = pr; + }; + CSeriesLayoutProperties.prototype.setGeography = function(pr) { + History.CanAddChanges() && History.Add(new CChangesDrawingsString(this, AscDFH.historyitem_SeriesLayoutProperties_SetGeography, this.geography, pr)); + this.geography = pr; + }; + CSeriesLayoutProperties.prototype.setStatistics = function(pr) { + History.CanAddChanges() && History.Add(new CChangesDrawingsString(this, AscDFH.historyitem_SeriesLayoutProperties_SetStatistics, this.statistics, pr)); + this.statistics = pr; + }; + CSeriesLayoutProperties.prototype.setSubtotals = function(pr) { + History.CanAddChanges() && History.Add(new CChangesDrawingsString(this, AscDFH.historyitem_SeriesLayoutProperties_SetSubtotals, this.subtotals, pr)); + this.subtotals = pr; + }; + CSeriesLayoutProperties.prototype.setExtLst = function(pr) { + History.CanAddChanges() && History.Add(new CChangesDrawingsString(this, AscDFH.historyitem_SeriesLayoutProperties_SetExtLst, this.extLst, pr)); + this.extLst = pr; + }; + window['AscFormat'].CSeriesLayoutProperties = CSeriesLayoutProperties; + + // Statistics + drawingsChangesMap[AscDFH.historyitem_Statistics_SetQuartileMethod] = function(oClass, value) { + oClass.quartileMethod = value; + }; + AscDFH.changesFactory[AscDFH.historyitem_Statistics_SetQuartileMethod] = window['AscDFH'].CChangesDrawingsString; + function CStatistics() { + CBaseChartObject.call(this); + this.quartileMethod = null; + } + + InitClass(CStatistics, CBaseChartObject, AscDFH.historyitem_type_Statistics); + + CStatistics.prototype.setQuartileMethod = function(pr) { + History.CanAddChanges() && History.Add(new CChangesDrawingsString(this, AscDFH.historyitem_Statistics_SetQuartileMethod, this.quartileMethod, pr)); + this.quartileMethod = pr; + }; + window['AscFormat'].CStatistics = CStatistics; + + // StringDimension + drawingsChangesMap[AscDFH.historyitem_StringDimension_SetF] = function(oClass, value) { + oClass.f = value; + }; + drawingsChangesMap[AscDFH.historyitem_StringDimension_SetNf] = function(oClass, value) { + oClass.nf = value; + }; + drawingsChangesMap[AscDFH.historyitem_StringDimension_SetLvl] = function(oClass, value) { + oClass.lvl = value; + }; + drawingsChangesMap[AscDFH.historyitem_StringDimension_SetType] = function(oClass, value) { + oClass.type = value; + }; + AscDFH.changesFactory[AscDFH.historyitem_StringDimension_SetF] = window['AscDFH'].CChangesDrawingsString; + AscDFH.changesFactory[AscDFH.historyitem_StringDimension_SetNf] = window['AscDFH'].CChangesDrawingsString; + AscDFH.changesFactory[AscDFH.historyitem_StringDimension_SetLvl] = window['AscDFH'].CChangesDrawingsString; + AscDFH.changesFactory[AscDFH.historyitem_StringDimension_SetType] = window['AscDFH'].CChangesDrawingsString; + function CStringDimension() { + CBaseChartObject.call(this); + this.f = null; + this.nf = null; + this.lvl = null; + this.type = null; + } + + InitClass(CStringDimension, CBaseChartObject, AscDFH.historyitem_type_StringDimension); + + CStringDimension.prototype.setF = function(pr) { + History.CanAddChanges() && History.Add(new CChangesDrawingsString(this, AscDFH.historyitem_StringDimension_SetF, this.f, pr)); + this.f = pr; + }; + CStringDimension.prototype.setNf = function(pr) { + History.CanAddChanges() && History.Add(new CChangesDrawingsString(this, AscDFH.historyitem_StringDimension_SetNf, this.nf, pr)); + this.nf = pr; + }; + CStringDimension.prototype.setLvl = function(pr) { + History.CanAddChanges() && History.Add(new CChangesDrawingsString(this, AscDFH.historyitem_StringDimension_SetLvl, this.lvl, pr)); + this.lvl = pr; + }; + CStringDimension.prototype.setType = function(pr) { + History.CanAddChanges() && History.Add(new CChangesDrawingsString(this, AscDFH.historyitem_StringDimension_SetType, this.type, pr)); + this.type = pr; + }; + window['AscFormat'].CStringDimension = CStringDimension; + + // StringLevel + drawingsChangesMap[AscDFH.historyitem_StringLevel_SetPt] = function(oClass, value) { + oClass.pt = value; + }; + drawingsChangesMap[AscDFH.historyitem_StringLevel_SetPtCount] = function(oClass, value) { + oClass.ptCount = value; + }; + drawingsChangesMap[AscDFH.historyitem_StringLevel_SetName] = function(oClass, value) { + oClass.name = value; + }; + AscDFH.changesFactory[AscDFH.historyitem_StringLevel_SetPt] = window['AscDFH'].CChangesDrawingsString; + AscDFH.changesFactory[AscDFH.historyitem_StringLevel_SetPtCount] = window['AscDFH'].CChangesDrawingsString; + AscDFH.changesFactory[AscDFH.historyitem_StringLevel_SetName] = window['AscDFH'].CChangesDrawingsString; + function CStringLevel() { + CBaseChartObject.call(this); + this.pt = null; + this.ptCount = null; + this.name = null; + } + + InitClass(CStringLevel, CBaseChartObject, AscDFH.historyitem_type_StringLevel); + + CStringLevel.prototype.setPt = function(pr) { + History.CanAddChanges() && History.Add(new CChangesDrawingsString(this, AscDFH.historyitem_StringLevel_SetPt, this.pt, pr)); + this.pt = pr; + }; + CStringLevel.prototype.setPtCount = function(pr) { + History.CanAddChanges() && History.Add(new CChangesDrawingsString(this, AscDFH.historyitem_StringLevel_SetPtCount, this.ptCount, pr)); + this.ptCount = pr; + }; + CStringLevel.prototype.setName = function(pr) { + History.CanAddChanges() && History.Add(new CChangesDrawingsString(this, AscDFH.historyitem_StringLevel_SetName, this.name, pr)); + this.name = pr; + }; + window['AscFormat'].CStringLevel = CStringLevel; + + // StringValue + drawingsChangesMap[AscDFH.historyitem_StringValue_SetIdx] = function(oClass, value) { + oClass.idx = value; + }; + AscDFH.changesFactory[AscDFH.historyitem_StringValue_SetIdx] = window['AscDFH'].CChangesDrawingsString; + function CStringValue() { + CBaseChartObject.call(this); + this.idx = null; + } + + InitClass(CStringValue, CBaseChartObject, AscDFH.historyitem_type_StringValue); + + CStringValue.prototype.setIdx = function(pr) { + History.CanAddChanges() && History.Add(new CChangesDrawingsString(this, AscDFH.historyitem_StringValue_SetIdx, this.idx, pr)); + this.idx = pr; + }; + window['AscFormat'].CStringValue = CStringValue; + + // Subtotals + drawingsChangesMap[AscDFH.historyitem_Subtotals_SetIdx] = function(oClass, value) { + oClass.idx = value; + }; + AscDFH.changesFactory[AscDFH.historyitem_Subtotals_SetIdx] = window['AscDFH'].CChangesDrawingsString; + function CSubtotals() { + CBaseChartObject.call(this); + this.idx = null; + } + + InitClass(CSubtotals, CBaseChartObject, AscDFH.historyitem_type_Subtotals); + + CSubtotals.prototype.setIdx = function(pr) { + History.CanAddChanges() && History.Add(new CChangesDrawingsString(this, AscDFH.historyitem_Subtotals_SetIdx, this.idx, pr)); + this.idx = pr; + }; + window['AscFormat'].CSubtotals = CSubtotals; + + // Text + drawingsChangesMap[AscDFH.historyitem_Text_SetTxData] = function(oClass, value) { + oClass.txData = value; + }; + drawingsChangesMap[AscDFH.historyitem_Text_SetRich] = function(oClass, value) { + oClass.rich = value; + }; + AscDFH.changesFactory[AscDFH.historyitem_Text_SetTxData] = window['AscDFH'].CChangesDrawingsString; + AscDFH.changesFactory[AscDFH.historyitem_Text_SetRich] = window['AscDFH'].CChangesDrawingsString; + function CText() { + CBaseChartObject.call(this); + this.txData = null; + this.rich = null; + } + + InitClass(CText, CBaseChartObject, AscDFH.historyitem_type_Text); + + CText.prototype.setTxData = function(pr) { + History.CanAddChanges() && History.Add(new CChangesDrawingsString(this, AscDFH.historyitem_Text_SetTxData, this.txData, pr)); + this.txData = pr; + }; + CText.prototype.setRich = function(pr) { + History.CanAddChanges() && History.Add(new CChangesDrawingsString(this, AscDFH.historyitem_Text_SetRich, this.rich, pr)); + this.rich = pr; + }; + window['AscFormat'].CText = CText; + + // TextData + drawingsChangesMap[AscDFH.historyitem_TextData_SetF] = function(oClass, value) { + oClass.f = value; + }; + drawingsChangesMap[AscDFH.historyitem_TextData_SetV] = function(oClass, value) { + oClass.v = value; + }; + AscDFH.changesFactory[AscDFH.historyitem_TextData_SetF] = window['AscDFH'].CChangesDrawingsString; + AscDFH.changesFactory[AscDFH.historyitem_TextData_SetV] = window['AscDFH'].CChangesDrawingsString; + function CTextData() { + CBaseChartObject.call(this); + this.f = null; + this.v = null; + } + + InitClass(CTextData, CBaseChartObject, AscDFH.historyitem_type_TextData); + + CTextData.prototype.setF = function(pr) { + History.CanAddChanges() && History.Add(new CChangesDrawingsString(this, AscDFH.historyitem_TextData_SetF, this.f, pr)); + this.f = pr; + }; + CTextData.prototype.setV = function(pr) { + History.CanAddChanges() && History.Add(new CChangesDrawingsString(this, AscDFH.historyitem_TextData_SetV, this.v, pr)); + this.v = pr; + }; + window['AscFormat'].CTextData = CTextData; + + // TickLabels + drawingsChangesMap[AscDFH.historyitem_TickLabels_SetExtLst] = function(oClass, value) { + oClass.extLst = value; + }; + AscDFH.changesFactory[AscDFH.historyitem_TickLabels_SetExtLst] = window['AscDFH'].CChangesDrawingsString; + function CTickLabels() { + CBaseChartObject.call(this); + this.extLst = null; + } + + InitClass(CTickLabels, CBaseChartObject, AscDFH.historyitem_type_TickLabels); + + CTickLabels.prototype.setExtLst = function(pr) { + History.CanAddChanges() && History.Add(new CChangesDrawingsString(this, AscDFH.historyitem_TickLabels_SetExtLst, this.extLst, pr)); + this.extLst = pr; + }; + window['AscFormat'].CTickLabels = CTickLabels; + + // TickMarks + drawingsChangesMap[AscDFH.historyitem_TickMarks_SetExtLst] = function(oClass, value) { + oClass.extLst = value; + }; + drawingsChangesMap[AscDFH.historyitem_TickMarks_SetType] = function(oClass, value) { + oClass.type = value; + }; + AscDFH.changesFactory[AscDFH.historyitem_TickMarks_SetExtLst] = window['AscDFH'].CChangesDrawingsString; + AscDFH.changesFactory[AscDFH.historyitem_TickMarks_SetType] = window['AscDFH'].CChangesDrawingsString; + function CTickMarks() { + CBaseChartObject.call(this); + this.extLst = null; + this.type = null; + } + + InitClass(CTickMarks, CBaseChartObject, AscDFH.historyitem_type_TickMarks); + + CTickMarks.prototype.setExtLst = function(pr) { + History.CanAddChanges() && History.Add(new CChangesDrawingsString(this, AscDFH.historyitem_TickMarks_SetExtLst, this.extLst, pr)); + this.extLst = pr; + }; + CTickMarks.prototype.setType = function(pr) { + History.CanAddChanges() && History.Add(new CChangesDrawingsString(this, AscDFH.historyitem_TickMarks_SetType, this.type, pr)); + this.type = pr; + }; + window['AscFormat'].CTickMarks = CTickMarks; + + // ValueAxisScaling + drawingsChangesMap[AscDFH.historyitem_ValueAxisScaling_SetMax] = function(oClass, value) { + oClass.max = value; + }; + drawingsChangesMap[AscDFH.historyitem_ValueAxisScaling_SetMin] = function(oClass, value) { + oClass.min = value; + }; + drawingsChangesMap[AscDFH.historyitem_ValueAxisScaling_SetMajorUnit] = function(oClass, value) { + oClass.majorUnit = value; + }; + drawingsChangesMap[AscDFH.historyitem_ValueAxisScaling_SetMinorUnit] = function(oClass, value) { + oClass.minorUnit = value; + }; + AscDFH.changesFactory[AscDFH.historyitem_ValueAxisScaling_SetMax] = window['AscDFH'].CChangesDrawingsString; + AscDFH.changesFactory[AscDFH.historyitem_ValueAxisScaling_SetMin] = window['AscDFH'].CChangesDrawingsString; + AscDFH.changesFactory[AscDFH.historyitem_ValueAxisScaling_SetMajorUnit] = window['AscDFH'].CChangesDrawingsString; + AscDFH.changesFactory[AscDFH.historyitem_ValueAxisScaling_SetMinorUnit] = window['AscDFH'].CChangesDrawingsString; + function CValueAxisScaling() { + CBaseChartObject.call(this); + this.max = null; + this.min = null; + this.majorUnit = null; + this.minorUnit = null; + } + + InitClass(CValueAxisScaling, CBaseChartObject, AscDFH.historyitem_type_ValueAxisScaling); + + CValueAxisScaling.prototype.setMax = function(pr) { + History.CanAddChanges() && History.Add(new CChangesDrawingsString(this, AscDFH.historyitem_ValueAxisScaling_SetMax, this.max, pr)); + this.max = pr; + }; + CValueAxisScaling.prototype.setMin = function(pr) { + History.CanAddChanges() && History.Add(new CChangesDrawingsString(this, AscDFH.historyitem_ValueAxisScaling_SetMin, this.min, pr)); + this.min = pr; + }; + CValueAxisScaling.prototype.setMajorUnit = function(pr) { + History.CanAddChanges() && History.Add(new CChangesDrawingsString(this, AscDFH.historyitem_ValueAxisScaling_SetMajorUnit, this.majorUnit, pr)); + this.majorUnit = pr; + }; + CValueAxisScaling.prototype.setMinorUnit = function(pr) { + History.CanAddChanges() && History.Add(new CChangesDrawingsString(this, AscDFH.historyitem_ValueAxisScaling_SetMinorUnit, this.minorUnit, pr)); + this.minorUnit = pr; + }; + window['AscFormat'].CValueAxisScaling = CValueAxisScaling; + + // ValueColorEndPosition + drawingsChangesMap[AscDFH.historyitem_ValueColorEndPosition_SetExtremeValue] = function(oClass, value) { + oClass.extremeValue = value; + }; + drawingsChangesMap[AscDFH.historyitem_ValueColorEndPosition_SetNumber] = function(oClass, value) { + oClass.number = value; + }; + drawingsChangesMap[AscDFH.historyitem_ValueColorEndPosition_SetPercent] = function(oClass, value) { + oClass.percent = value; + }; + AscDFH.changesFactory[AscDFH.historyitem_ValueColorEndPosition_SetExtremeValue] = window['AscDFH'].CChangesDrawingsString; + AscDFH.changesFactory[AscDFH.historyitem_ValueColorEndPosition_SetNumber] = window['AscDFH'].CChangesDrawingsString; + AscDFH.changesFactory[AscDFH.historyitem_ValueColorEndPosition_SetPercent] = window['AscDFH'].CChangesDrawingsString; + function CValueColorEndPosition() { + CBaseChartObject.call(this); + this.extremeValue = null; + this.number = null; + this.percent = null; + } + + InitClass(CValueColorEndPosition, CBaseChartObject, AscDFH.historyitem_type_ValueColorEndPosition); + + CValueColorEndPosition.prototype.setExtremeValue = function(pr) { + History.CanAddChanges() && History.Add(new CChangesDrawingsString(this, AscDFH.historyitem_ValueColorEndPosition_SetExtremeValue, this.extremeValue, pr)); + this.extremeValue = pr; + }; + CValueColorEndPosition.prototype.setNumber = function(pr) { + History.CanAddChanges() && History.Add(new CChangesDrawingsString(this, AscDFH.historyitem_ValueColorEndPosition_SetNumber, this.number, pr)); + this.number = pr; + }; + CValueColorEndPosition.prototype.setPercent = function(pr) { + History.CanAddChanges() && History.Add(new CChangesDrawingsString(this, AscDFH.historyitem_ValueColorEndPosition_SetPercent, this.percent, pr)); + this.percent = pr; + }; + window['AscFormat'].CValueColorEndPosition = CValueColorEndPosition; + + // ValueColorMiddlePosition + drawingsChangesMap[AscDFH.historyitem_ValueColorMiddlePosition_SetNumber] = function(oClass, value) { + oClass.number = value; + }; + drawingsChangesMap[AscDFH.historyitem_ValueColorMiddlePosition_SetPercent] = function(oClass, value) { + oClass.percent = value; + }; + AscDFH.changesFactory[AscDFH.historyitem_ValueColorMiddlePosition_SetNumber] = window['AscDFH'].CChangesDrawingsString; + AscDFH.changesFactory[AscDFH.historyitem_ValueColorMiddlePosition_SetPercent] = window['AscDFH'].CChangesDrawingsString; + function CValueColorMiddlePosition() { + CBaseChartObject.call(this); + this.number = null; + this.percent = null; + } + + InitClass(CValueColorMiddlePosition, CBaseChartObject, AscDFH.historyitem_type_ValueColorMiddlePosition); + + CValueColorMiddlePosition.prototype.setNumber = function(pr) { + History.CanAddChanges() && History.Add(new CChangesDrawingsString(this, AscDFH.historyitem_ValueColorMiddlePosition_SetNumber, this.number, pr)); + this.number = pr; + }; + CValueColorMiddlePosition.prototype.setPercent = function(pr) { + History.CanAddChanges() && History.Add(new CChangesDrawingsString(this, AscDFH.historyitem_ValueColorMiddlePosition_SetPercent, this.percent, pr)); + this.percent = pr; + }; + window['AscFormat'].CValueColorMiddlePosition = CValueColorMiddlePosition; + + // ValueColorPositions + drawingsChangesMap[AscDFH.historyitem_ValueColorPositions_SetMin] = function(oClass, value) { + oClass.min = value; + }; + drawingsChangesMap[AscDFH.historyitem_ValueColorPositions_SetMid] = function(oClass, value) { + oClass.mid = value; + }; + drawingsChangesMap[AscDFH.historyitem_ValueColorPositions_SetMax] = function(oClass, value) { + oClass.max = value; + }; + drawingsChangesMap[AscDFH.historyitem_ValueColorPositions_SetCount] = function(oClass, value) { + oClass.count = value; + }; + AscDFH.changesFactory[AscDFH.historyitem_ValueColorPositions_SetMin] = window['AscDFH'].CChangesDrawingsString; + AscDFH.changesFactory[AscDFH.historyitem_ValueColorPositions_SetMid] = window['AscDFH'].CChangesDrawingsString; + AscDFH.changesFactory[AscDFH.historyitem_ValueColorPositions_SetMax] = window['AscDFH'].CChangesDrawingsString; + AscDFH.changesFactory[AscDFH.historyitem_ValueColorPositions_SetCount] = window['AscDFH'].CChangesDrawingsString; + function CValueColorPositions() { + CBaseChartObject.call(this); + this.min = null; + this.mid = null; + this.max = null; + this.count = null; + } + + InitClass(CValueColorPositions, CBaseChartObject, AscDFH.historyitem_type_ValueColorPositions); + + CValueColorPositions.prototype.setMin = function(pr) { + History.CanAddChanges() && History.Add(new CChangesDrawingsString(this, AscDFH.historyitem_ValueColorPositions_SetMin, this.min, pr)); + this.min = pr; + }; + CValueColorPositions.prototype.setMid = function(pr) { + History.CanAddChanges() && History.Add(new CChangesDrawingsString(this, AscDFH.historyitem_ValueColorPositions_SetMid, this.mid, pr)); + this.mid = pr; + }; + CValueColorPositions.prototype.setMax = function(pr) { + History.CanAddChanges() && History.Add(new CChangesDrawingsString(this, AscDFH.historyitem_ValueColorPositions_SetMax, this.max, pr)); + this.max = pr; + }; + CValueColorPositions.prototype.setCount = function(pr) { + History.CanAddChanges() && History.Add(new CChangesDrawingsString(this, AscDFH.historyitem_ValueColorPositions_SetCount, this.count, pr)); + this.count = pr; + }; + window['AscFormat'].CValueColorPositions = CValueColorPositions; + + // ValueColors + drawingsChangesMap[AscDFH.historyitem_ValueColors_SetMinColor] = function(oClass, value) { + oClass.minColor = value; + }; + drawingsChangesMap[AscDFH.historyitem_ValueColors_SetMidColor] = function(oClass, value) { + oClass.midColor = value; + }; + drawingsChangesMap[AscDFH.historyitem_ValueColors_SetMaxColor] = function(oClass, value) { + oClass.maxColor = value; + }; + AscDFH.changesFactory[AscDFH.historyitem_ValueColors_SetMinColor] = window['AscDFH'].CChangesDrawingsString; + AscDFH.changesFactory[AscDFH.historyitem_ValueColors_SetMidColor] = window['AscDFH'].CChangesDrawingsString; + AscDFH.changesFactory[AscDFH.historyitem_ValueColors_SetMaxColor] = window['AscDFH'].CChangesDrawingsString; + function CValueColors() { + CBaseChartObject.call(this); + this.minColor = null; + this.midColor = null; + this.maxColor = null; + } + + InitClass(CValueColors, CBaseChartObject, AscDFH.historyitem_type_ValueColors); + + CValueColors.prototype.setMinColor = function(pr) { + History.CanAddChanges() && History.Add(new CChangesDrawingsString(this, AscDFH.historyitem_ValueColors_SetMinColor, this.minColor, pr)); + this.minColor = pr; + }; + CValueColors.prototype.setMidColor = function(pr) { + History.CanAddChanges() && History.Add(new CChangesDrawingsString(this, AscDFH.historyitem_ValueColors_SetMidColor, this.midColor, pr)); + this.midColor = pr; + }; + CValueColors.prototype.setMaxColor = function(pr) { + History.CanAddChanges() && History.Add(new CChangesDrawingsString(this, AscDFH.historyitem_ValueColors_SetMaxColor, this.maxColor, pr)); + this.maxColor = pr; + }; + window['AscFormat'].CValueColors = CValueColors; + // template drawingsChangesMap[AscDFH.historyitem_Address_SetTest] = function(oClass, value) { oClass.test = value; From fdd994bd4ed559427c3f60ff766b5ae219d0cda6 Mon Sep 17 00:00:00 2001 From: Dmitriy Alexandrov Date: Mon, 31 Jul 2023 15:16:30 +0600 Subject: [PATCH 05/30] edit names in classes --- common/Drawings/Format/ChartEx.js | 49 +++++++++++++++++++++++-------- 1 file changed, 37 insertions(+), 12 deletions(-) diff --git a/common/Drawings/Format/ChartEx.js b/common/Drawings/Format/ChartEx.js index e73a1b6dd9..dc237249fd 100644 --- a/common/Drawings/Format/ChartEx.js +++ b/common/Drawings/Format/ChartEx.js @@ -88,11 +88,12 @@ this.isoCountryCode = pr; }; + // Aggregation todo drawingsChangesMap[AscDFH.historyitem_Aggregation_SetTest] = function(oClass, value) { oClass.test = value; }; AscDFH.changesFactory[AscDFH.historyitem_Aggregation_SetTest] = window['AscDFH'].CChangesDrawingsString; - function CAggregation() { // todo + function CAggregation() { CBaseChartObject.call(this); this.test = null; } @@ -317,15 +318,15 @@ InitClass(CAxisUnits, CBaseChartObject, AscDFH.historyitem_type_AxisUnits); - CAxisUnits.prototype.setTest = function(pr) { + CAxisUnits.prototype.setUnitsLabel = function(pr) { History.CanAddChanges() && History.Add(new CChangesDrawingsString(this, AscDFH.historyitem_AxisUnit_SetUnitsLabel, this.unitsLabel, pr)); this.unitsLabel = pr; }; - CAxisUnits.prototype.setTest = function(pr) { + CAxisUnits.prototype.setExtLst = function(pr) { History.CanAddChanges() && History.Add(new CChangesDrawingsString(this, AscDFH.historyitem_AxisUnit_SetExtLst, this.extLst, pr)); this.extLst = pr; }; - CAxisUnits.prototype.setTest = function(pr) { + CAxisUnits.prototype.setUnit = function(pr) { History.CanAddChanges() && History.Add(new CChangesDrawingsString(this, AscDFH.historyitem_AxisUnit_SetUnit, this.unit, pr)); this.unit = pr; }; @@ -356,7 +357,7 @@ this.extLst = null; } - InitClass(CAxisUnitsLabel, CBaseChartObject, AscDFH.historyitem_type_Test); + InitClass(CAxisUnitsLabel, CBaseChartObject, AscDFH.historyitem_type_AxisUnitsLabel); CAxisUnitsLabel.prototype.setTx = function(pr) { History.CanAddChanges() && History.Add(new CChangesDrawingsString(this, AscDFH.historyitem_AxisUnitsLabel_SetTx, this.tx, pr)); @@ -377,10 +378,26 @@ window['AscFormat'].CAxisUnitsLabel = CAxisUnitsLabel; // Binning - drawingsChangesMap[AscDFH.historyitem_Binning_SetTest] = function(oClass, value) { - oClass.test = value; + drawingsChangesMap[AscDFH.historyitem_Binning_SetBinSize] = function(oClass, value) { + oClass.binSize = value; + }; + drawingsChangesMap[AscDFH.historyitem_Binning_SetBinCount] = function(oClass, value) { + oClass.binCount = value; + }; + drawingsChangesMap[AscDFH.historyitem_Binning_SetIntervalClosed] = function(oClass, value) { + oClass.intervalClosed = value; }; - AscDFH.changesFactory[AscDFH.historyitem_Binning_SetTest] = window['AscDFH'].CChangesDrawingsString; + drawingsChangesMap[AscDFH.historyitem_Binning_SetUnderflow] = function(oClass, value) { + oClass.underflow = value; + }; + drawingsChangesMap[AscDFH.historyitem_Binning_SetOverflow] = function(oClass, value) { + oClass.overflow = value; + }; + AscDFH.changesFactory[AscDFH.historyitem_Binning_SetBinSize] = window['AscDFH'].CChangesDrawingsString; + AscDFH.changesFactory[AscDFH.historyitem_Binning_SetBinCount] = window['AscDFH'].CChangesDrawingsString; + AscDFH.changesFactory[AscDFH.historyitem_Binning_SetIntervalClosed] = window['AscDFH'].CChangesDrawingsString; + AscDFH.changesFactory[AscDFH.historyitem_Binning_SetUnderflow] = window['AscDFH'].CChangesDrawingsString; + AscDFH.changesFactory[AscDFH.historyitem_Binning_SetOverflow] = window['AscDFH'].CChangesDrawingsString; function CBinning() { CBaseChartObject.call(this); this.binSize = null; @@ -1598,7 +1615,7 @@ InitClass(CGeoDataPointToEntityQueryResults, CBaseChartObject, AscDFH.historyitem_type_GeoDataPointToEntityQueryResults); - CGeoDataPointToEntityQueryResults.prototype.setTest = function(pr) { + CGeoDataPointToEntityQueryResults.prototype.setGeoDataPointToEntityQueryResult = function(pr) { History.CanAddChanges() && History.Add(new CChangesDrawingsString(this, AscDFH.historyitem_GeoDataPointToEntityQueryResults_SetGeoDataPointToEntityQueryResult, this.geoDataPointToEntityQueryResult, pr)); this.geoDataPointToEntityQueryResult = pr; }; @@ -1850,7 +1867,7 @@ InitClass(CGeoLocationQueryResults, CBaseChartObject, AscDFH.historyitem_type_GeoLocationQueryResults); - CGeoLocationQueryResults.prototype.setTest = function(pr) { + CGeoLocationQueryResults.prototype.setGeoLocationQueryResult = function(pr) { History.CanAddChanges() && History.Add(new CChangesDrawingsString(this, AscDFH.historyitem_GeoLocationQueryResults_SetGeoLocationQueryResult, this.geoLocationQueryResult, pr)); this.geoLocationQueryResult = pr; }; @@ -1869,7 +1886,7 @@ InitClass(CGeoLocations, CBaseChartObject, AscDFH.historyitem_type_GeoLocations); CGeoLocations.prototype.setGeoLocation = function(pr) { - History.CanAddChanges() && History.Add(new CChangesDrawingsString(this, AscDFH.historyitem_GeoLocations_SetGeoLocation, this.test, pr)); + History.CanAddChanges() && History.Add(new CChangesDrawingsString(this, AscDFH.historyitem_GeoLocations_SetGeoLocation, this.geoLocation, pr)); this.geoLocation = pr; }; window['AscFormat'].CGeoLocations = CGeoLocations; @@ -1983,7 +2000,15 @@ drawingsChangesMap[AscDFH.historyitem_HeaderFooter_SetDifferentFirst] = function(oClass, value) { oClass.differentFirst = value; }; - AscDFH.changesFactory[AscDFH.historyitem_Address_SetTest] = window['AscDFH'].CChangesDrawingsString; + AscDFH.changesFactory[AscDFH.historyitem_HeaderFooter_SetOddHeader] = window['AscDFH'].CChangesDrawingsString; + AscDFH.changesFactory[AscDFH.historyitem_HeaderFooter_SetOddFooter] = window['AscDFH'].CChangesDrawingsString; + AscDFH.changesFactory[AscDFH.historyitem_HeaderFooter_SetEvenHeader] = window['AscDFH'].CChangesDrawingsString; + AscDFH.changesFactory[AscDFH.historyitem_HeaderFooter_SetEvenFooter] = window['AscDFH'].CChangesDrawingsString; + AscDFH.changesFactory[AscDFH.historyitem_HeaderFooter_SetFirstHeader] = window['AscDFH'].CChangesDrawingsString; + AscDFH.changesFactory[AscDFH.historyitem_HeaderFooter_SetFirstFooter] = window['AscDFH'].CChangesDrawingsString; + AscDFH.changesFactory[AscDFH.historyitem_HeaderFooter_SetAlignWithMargins] = window['AscDFH'].CChangesDrawingsString; + AscDFH.changesFactory[AscDFH.historyitem_HeaderFooter_SetDifferentOddEven] = window['AscDFH'].CChangesDrawingsString; + AscDFH.changesFactory[AscDFH.historyitem_HeaderFooter_SetDifferentFirst] = window['AscDFH'].CChangesDrawingsString; function CHeaderFooter() { CBaseChartObject.call(this); this.oddHeader = null; From dc7e4be57177d59e36bfe4a0e1dbbf51861f3fff Mon Sep 17 00:00:00 2001 From: Dmitriy Alexandrov Date: Tue, 1 Aug 2023 16:09:08 +0600 Subject: [PATCH 06/30] edit names in classes --- common/Drawings/Format/ChartEx.js | 156 ++++++++++++------------------ 1 file changed, 64 insertions(+), 92 deletions(-) diff --git a/common/Drawings/Format/ChartEx.js b/common/Drawings/Format/ChartEx.js index dc237249fd..6fbb5aea4f 100644 --- a/common/Drawings/Format/ChartEx.js +++ b/common/Drawings/Format/ChartEx.js @@ -9,6 +9,14 @@ var drawingsChangesMap = window['AscDFH'].drawingsChangesMap; var drawingContentChanges = window['AscDFH'].drawingContentChanges; + var CChangesDrawingsBool = AscDFH.CChangesDrawingsBool; + var CChangesDrawingsLong = AscDFH.CChangesDrawingsLong; + var CChangesDrawingsString = AscDFH.CChangesDrawingsString; + var CChangesDrawingsContent = AscDFH.CChangesDrawingsContent; + var CChangesDrawingsObject = AscDFH.CChangesDrawingsObject; + var CChangesDrawingsObjectNoId = AscDFH.CChangesDrawingsObjectNoId; + var CChangesDrawingsDouble2 = AscDFH.CChangesDrawingsDouble2; + // CAddress drawingsChangesMap[AscDFH.historyitem_Address_SetAddress1] = function(oClass, value) { oClass.address1 = value; @@ -88,24 +96,6 @@ this.isoCountryCode = pr; }; - // Aggregation todo - drawingsChangesMap[AscDFH.historyitem_Aggregation_SetTest] = function(oClass, value) { - oClass.test = value; - }; - AscDFH.changesFactory[AscDFH.historyitem_Aggregation_SetTest] = window['AscDFH'].CChangesDrawingsString; - function CAggregation() { - CBaseChartObject.call(this); - this.test = null; - } - - InitClass(CAggregation, CBaseChartObject, AscDFH.historyitem_type_Aggregation); - - CAggregation.prototype.setTest = function(pr) { - History.CanAddChanges() && History.Add(new CChangesDrawingsString(this, AscDFH.historyitem_Address_SetTest, this.test, pr)); - this.test = pr; - }; - window['AscFormat'].CAggregation = CAggregation; - // Axis drawingsChangesMap[AscDFH.historyitem_Axis_SetCatScaling] = function(oClass, value) { oClass.catScaling = value; @@ -152,21 +142,21 @@ drawingsChangesMap[AscDFH.historyitem_Axis_SetHidden] = function(oClass, value) { oClass.hidden = value; }; - AscDFH.changesFactory[AscDFH.historyitem_Axis_SetCatScaling] = window['AscDFH'].CChangesDrawingsString; - AscDFH.changesFactory[AscDFH.historyitem_Axis_SetValScaling] = window['AscDFH'].CChangesDrawingsString; - AscDFH.changesFactory[AscDFH.historyitem_Axis_SetTitle] = window['AscDFH'].CChangesDrawingsString; - AscDFH.changesFactory[AscDFH.historyitem_Axis_SetUnits] = window['AscDFH'].CChangesDrawingsString; - AscDFH.changesFactory[AscDFH.historyitem_Axis_SetMajorGridlines] = window['AscDFH'].CChangesDrawingsString; - AscDFH.changesFactory[AscDFH.historyitem_Axis_SetMinorGridlines] = window['AscDFH'].CChangesDrawingsString; - AscDFH.changesFactory[AscDFH.historyitem_Axis_SetMajorTickMarks] = window['AscDFH'].CChangesDrawingsString; - AscDFH.changesFactory[AscDFH.historyitem_Axis_SetMinorTickMarks] = window['AscDFH'].CChangesDrawingsString; - AscDFH.changesFactory[AscDFH.historyitem_Axis_SetTickLabels] = window['AscDFH'].CChangesDrawingsString; - AscDFH.changesFactory[AscDFH.historyitem_Axis_SetNumFmt] = window['AscDFH'].CChangesDrawingsString; - AscDFH.changesFactory[AscDFH.historyitem_Axis_SetSpPr] = window['AscDFH'].CChangesDrawingsString; - AscDFH.changesFactory[AscDFH.historyitem_Axis_SetTxPr] = window['AscDFH'].CChangesDrawingsString; - AscDFH.changesFactory[AscDFH.historyitem_Axis_SetExtLst] = window['AscDFH'].CChangesDrawingsString; - AscDFH.changesFactory[AscDFH.historyitem_Axis_SetId] = window['AscDFH'].CChangesDrawingsString; - AscDFH.changesFactory[AscDFH.historyitem_Axis_SetHidden] = window['AscDFH'].CChangesDrawingsString; + AscDFH.changesFactory[AscDFH.historyitem_Axis_SetCatScaling] = window['AscDFH'].CChangesDrawingsObject; + AscDFH.changesFactory[AscDFH.historyitem_Axis_SetValScaling] = window['AscDFH'].CChangesDrawingsObject; + AscDFH.changesFactory[AscDFH.historyitem_Axis_SetTitle] = window['AscDFH'].CChangesDrawingsObject; + AscDFH.changesFactory[AscDFH.historyitem_Axis_SetUnits] = window['AscDFH'].CChangesDrawingsObject; + AscDFH.changesFactory[AscDFH.historyitem_Axis_SetMajorGridlines] = window['AscDFH'].CChangesDrawingsObject; + AscDFH.changesFactory[AscDFH.historyitem_Axis_SetMinorGridlines] = window['AscDFH'].CChangesDrawingsObject; + AscDFH.changesFactory[AscDFH.historyitem_Axis_SetMajorTickMarks] = window['AscDFH'].CChangesDrawingsObject; + AscDFH.changesFactory[AscDFH.historyitem_Axis_SetMinorTickMarks] = window['AscDFH'].CChangesDrawingsObject; + AscDFH.changesFactory[AscDFH.historyitem_Axis_SetTickLabels] = window['AscDFH'].CChangesDrawingsObject; + AscDFH.changesFactory[AscDFH.historyitem_Axis_SetNumFmt] = window['AscDFH'].CChangesDrawingsObject; + AscDFH.changesFactory[AscDFH.historyitem_Axis_SetSpPr] = window['AscDFH'].CChangesDrawingsObject; + AscDFH.changesFactory[AscDFH.historyitem_Axis_SetTxPr] = window['AscDFH'].CChangesDrawingsObject; + AscDFH.changesFactory[AscDFH.historyitem_Axis_SetExtLst] = window['AscDFH'].CChangesDrawingsObject; + AscDFH.changesFactory[AscDFH.historyitem_Axis_SetId] = window['AscDFH'].CChangesDrawingsObject; + AscDFH.changesFactory[AscDFH.historyitem_Axis_SetHidden] = window['AscDFH'].CChangesDrawingsBool; function CAxis() { CBaseChartObject.call(this); @@ -190,63 +180,63 @@ InitClass(CAxis, CBaseChartObject, AscDFH.historyitem_type_Axis); CAxis.prototype.setCatScaling = function(pr) { - History.CanAddChanges() && History.Add(new CChangesDrawingsString(this, AscDFH.historyitem_Axis_SetCatScaling, this.catScaling, pr)); + History.CanAddChanges() && History.Add(new CChangesDrawingsObject(this, AscDFH.historyitem_Axis_SetCatScaling, this.catScaling, pr)); this.catScaling = pr; }; CAxis.prototype.setValScaling = function(pr) { - History.CanAddChanges() && History.Add(new CChangesDrawingsString(this, AscDFH.historyitem_Axis_SetValScaling, this.valScaling, pr)); + History.CanAddChanges() && History.Add(new CChangesDrawingsObject(this, AscDFH.historyitem_Axis_SetValScaling, this.valScaling, pr)); this.valScaling = pr; }; CAxis.prototype.setTitle = function(pr) { - History.CanAddChanges() && History.Add(new CChangesDrawingsString(this, AscDFH.historyitem_Axis_SetTitle, this.title, pr)); + History.CanAddChanges() && History.Add(new CChangesDrawingsObject(this, AscDFH.historyitem_Axis_SetTitle, this.title, pr)); this.title = pr; }; CAxis.prototype.setUnits = function(pr) { - History.CanAddChanges() && History.Add(new CChangesDrawingsString(this, AscDFH.historyitem_Axis_SetUnits, this.units, pr)); + History.CanAddChanges() && History.Add(new CChangesDrawingsObject(this, AscDFH.historyitem_Axis_SetUnits, this.units, pr)); this.units = pr; }; CAxis.prototype.setMajorGridlines = function(pr) { - History.CanAddChanges() && History.Add(new CChangesDrawingsString(this, AscDFH.historyitem_Axis_SetMajorGridlines, this.majorGridlines, pr)); + History.CanAddChanges() && History.Add(new CChangesDrawingsObject(this, AscDFH.historyitem_Axis_SetMajorGridlines, this.majorGridlines, pr)); this.majorGridlines = pr; }; CAxis.prototype.setMinorGridlines = function(pr) { - History.CanAddChanges() && History.Add(new CChangesDrawingsString(this, AscDFH.historyitem_Axis_SetMinorGridlines, this.minorGridlines, pr)); + History.CanAddChanges() && History.Add(new CChangesDrawingsObject(this, AscDFH.historyitem_Axis_SetMinorGridlines, this.minorGridlines, pr)); this.minorGridlines = pr; }; CAxis.prototype.setMajorTickMarks = function(pr) { - History.CanAddChanges() && History.Add(new CChangesDrawingsString(this, AscDFH.historyitem_Axis_SetMajorTickMarks, this.majorTickMarks, pr)); + History.CanAddChanges() && History.Add(new CChangesDrawingsObject(this, AscDFH.historyitem_Axis_SetMajorTickMarks, this.majorTickMarks, pr)); this.majorTickMarks = pr; }; CAxis.prototype.setMinorTickMarks = function(pr) { - History.CanAddChanges() && History.Add(new CChangesDrawingsString(this, AscDFH.historyitem_Axis_SetMinorTickMarks, this.minorTickMarks, pr)); + History.CanAddChanges() && History.Add(new CChangesDrawingsObject(this, AscDFH.historyitem_Axis_SetMinorTickMarks, this.minorTickMarks, pr)); this.minorTickMarks = pr; }; CAxis.prototype.setTickLabels = function(pr) { - History.CanAddChanges() && History.Add(new CChangesDrawingsString(this, AscDFH.historyitem_Axis_SetTickLabels, this.tickLabels, pr)); + History.CanAddChanges() && History.Add(new CChangesDrawingsObject(this, AscDFH.historyitem_Axis_SetTickLabels, this.tickLabels, pr)); this.tickLabels = pr; }; CAxis.prototype.setNumFmt = function(pr) { - History.CanAddChanges() && History.Add(new CChangesDrawingsString(this, AscDFH.historyitem_Axis_SetNumFmt, this.numFmt, pr)); + History.CanAddChanges() && History.Add(new CChangesDrawingsObject(this, AscDFH.historyitem_Axis_SetNumFmt, this.numFmt, pr)); this.numFmt = pr; }; CAxis.prototype.setSpPr = function(pr) { - History.CanAddChanges() && History.Add(new CChangesDrawingsString(this, AscDFH.historyitem_Axis_SetSpPr, this.spPr, pr)); + History.CanAddChanges() && History.Add(new CChangesDrawingsObject(this, AscDFH.historyitem_Axis_SetSpPr, this.spPr, pr)); this.spPr = pr; }; CAxis.prototype.setTxPr = function(pr) { - History.CanAddChanges() && History.Add(new CChangesDrawingsString(this, AscDFH.historyitem_Axis_SetTxPr, this.txPr, pr)); + History.CanAddChanges() && History.Add(new CChangesDrawingsObject(this, AscDFH.historyitem_Axis_SetTxPr, this.txPr, pr)); this.txPr = pr; }; CAxis.prototype.setExtLst = function(pr) { - History.CanAddChanges() && History.Add(new CChangesDrawingsString(this, AscDFH.historyitem_Axis_SetExtLst, this.extLst, pr)); + History.CanAddChanges() && History.Add(new CChangesDrawingsObject(this, AscDFH.historyitem_Axis_SetExtLst, this.extLst, pr)); this.extLst = pr; }; CAxis.prototype.setId = function(pr) { - History.CanAddChanges() && History.Add(new CChangesDrawingsString(this, AscDFH.historyitem_Axis_SetId, this.id, pr)); + History.CanAddChanges() && History.Add(new CChangesDrawingsObject(this, AscDFH.historyitem_Axis_SetId, this.id, pr)); this.id = pr; }; CAxis.prototype.setHidden = function(pr) { - History.CanAddChanges() && History.Add(new CChangesDrawingsString(this, AscDFH.historyitem_Axis_SetHidden, this.hidden, pr)); + History.CanAddChanges() && History.Add(new CChangesDrawingsBool(this, AscDFH.historyitem_Axis_SetHidden, this.hidden, pr)); this.hidden = pr; }; window['AscFormat'].CAxis = CAxis; @@ -264,10 +254,10 @@ drawingsChangesMap[AscDFH.historyitem_AxisTitle_SetExtLst] = function(oClass, value) { oClass.extLst = value; }; - AscDFH.changesFactory[AscDFH.historyitem_AxisTitle_SetTx] = window['AscDFH'].CChangesDrawingsString; - AscDFH.changesFactory[AscDFH.historyitem_AxisTitle_SetSpPr] = window['AscDFH'].CChangesDrawingsString; - AscDFH.changesFactory[AscDFH.historyitem_AxisTitle_SetTxPr] = window['AscDFH'].CChangesDrawingsString; - AscDFH.changesFactory[AscDFH.historyitem_AxisTitle_SetExtLst] = window['AscDFH'].CChangesDrawingsString; + AscDFH.changesFactory[AscDFH.historyitem_AxisTitle_SetTx] = window['AscDFH'].CChangesDrawingsObject; + AscDFH.changesFactory[AscDFH.historyitem_AxisTitle_SetSpPr] = window['AscDFH'].CChangesDrawingsObject; + AscDFH.changesFactory[AscDFH.historyitem_AxisTitle_SetTxPr] = window['AscDFH'].CChangesDrawingsObject; + AscDFH.changesFactory[AscDFH.historyitem_AxisTitle_SetExtLst] = window['AscDFH'].CChangesDrawingsObject; function CAxisTitle() { CBaseChartObject.call(this); this.tx = null; @@ -279,19 +269,19 @@ InitClass(CAxisTitle, CBaseChartObject, AscDFH.historyitem_type_AxisTitle); CAxisTitle.prototype.setTx = function(pr) { - History.CanAddChanges() && History.Add(new CChangesDrawingsString(this, AscDFH.historyitem_AxisTitle_SetTx, this.tx, pr)); + History.CanAddChanges() && History.Add(new CChangesDrawingsObject(this, AscDFH.historyitem_AxisTitle_SetTx, this.tx, pr)); this.tx = pr; }; CAxisTitle.prototype.setSpPr = function(pr) { - History.CanAddChanges() && History.Add(new CChangesDrawingsString(this, AscDFH.historyitem_AxisTitle_SetSpPr, this.spPr, pr)); + History.CanAddChanges() && History.Add(new CChangesDrawingsObject(this, AscDFH.historyitem_AxisTitle_SetSpPr, this.spPr, pr)); this.spPr = pr; }; CAxisTitle.prototype.setTxPr = function(pr) { - History.CanAddChanges() && History.Add(new CChangesDrawingsString(this, AscDFH.historyitem_AxisTitle_SetTxPr, this.txPr, pr)); + History.CanAddChanges() && History.Add(new CChangesDrawingsObject(this, AscDFH.historyitem_AxisTitle_SetTxPr, this.txPr, pr)); this.txPr = pr; }; CAxisTitle.prototype.setExtLst = function(pr) { - History.CanAddChanges() && History.Add(new CChangesDrawingsString(this, AscDFH.historyitem_AxisTitle_SetExtLst, this.extLst, pr)); + History.CanAddChanges() && History.Add(new CChangesDrawingsObject(this, AscDFH.historyitem_AxisTitle_SetExtLst, this.extLst, pr)); this.extLst = pr; }; window['AscFormat'].CAxisTitle = CAxisTitle; @@ -306,8 +296,8 @@ drawingsChangesMap[AscDFH.historyitem_AxisUnit_SetUnit] = function(oClass, value) { oClass.unit = value; }; - AscDFH.changesFactory[AscDFH.historyitem_AxisUnit_SetUnitsLabel] = window['AscDFH'].CChangesDrawingsString; - AscDFH.changesFactory[AscDFH.historyitem_AxisUnit_SetExtLst] = window['AscDFH'].CChangesDrawingsString; + AscDFH.changesFactory[AscDFH.historyitem_AxisUnit_SetUnitsLabel] = window['AscDFH'].CChangesDrawingsObject; + AscDFH.changesFactory[AscDFH.historyitem_AxisUnit_SetExtLst] = window['AscDFH'].CChangesDrawingsObject; AscDFH.changesFactory[AscDFH.historyitem_AxisUnit_SetUnit] = window['AscDFH'].CChangesDrawingsString; function CAxisUnits() { CBaseChartObject.call(this); @@ -319,11 +309,11 @@ InitClass(CAxisUnits, CBaseChartObject, AscDFH.historyitem_type_AxisUnits); CAxisUnits.prototype.setUnitsLabel = function(pr) { - History.CanAddChanges() && History.Add(new CChangesDrawingsString(this, AscDFH.historyitem_AxisUnit_SetUnitsLabel, this.unitsLabel, pr)); + History.CanAddChanges() && History.Add(new CChangesDrawingsObject(this, AscDFH.historyitem_AxisUnit_SetUnitsLabel, this.unitsLabel, pr)); this.unitsLabel = pr; }; CAxisUnits.prototype.setExtLst = function(pr) { - History.CanAddChanges() && History.Add(new CChangesDrawingsString(this, AscDFH.historyitem_AxisUnit_SetExtLst, this.extLst, pr)); + History.CanAddChanges() && History.Add(new CChangesDrawingsObject(this, AscDFH.historyitem_AxisUnit_SetExtLst, this.extLst, pr)); this.extLst = pr; }; CAxisUnits.prototype.setUnit = function(pr) { @@ -345,10 +335,10 @@ drawingsChangesMap[AscDFH.historyitem_AxisUnitsLabel_SetExtLst] = function(oClass, value) { oClass.extLst = value; }; - AscDFH.changesFactory[AscDFH.historyitem_AxisUnitsLabel_SetTx] = window['AscDFH'].CChangesDrawingsString; - AscDFH.changesFactory[AscDFH.historyitem_AxisUnitsLabel_SetSpPr] = window['AscDFH'].CChangesDrawingsString; - AscDFH.changesFactory[AscDFH.historyitem_AxisUnitsLabel_SetTxPr] = window['AscDFH'].CChangesDrawingsString; - AscDFH.changesFactory[AscDFH.historyitem_AxisUnitsLabel_SetExtLst] = window['AscDFH'].CChangesDrawingsString; + AscDFH.changesFactory[AscDFH.historyitem_AxisUnitsLabel_SetTx] = window['AscDFH'].CChangesDrawingsObject; + AscDFH.changesFactory[AscDFH.historyitem_AxisUnitsLabel_SetSpPr] = window['AscDFH'].CChangesDrawingsObject; + AscDFH.changesFactory[AscDFH.historyitem_AxisUnitsLabel_SetTxPr] = window['AscDFH'].CChangesDrawingsObject; + AscDFH.changesFactory[AscDFH.historyitem_AxisUnitsLabel_SetExtLst] = window['AscDFH'].CChangesDrawingsObject; function CAxisUnitsLabel() { CBaseChartObject.call(this); this.tx = null; @@ -360,19 +350,19 @@ InitClass(CAxisUnitsLabel, CBaseChartObject, AscDFH.historyitem_type_AxisUnitsLabel); CAxisUnitsLabel.prototype.setTx = function(pr) { - History.CanAddChanges() && History.Add(new CChangesDrawingsString(this, AscDFH.historyitem_AxisUnitsLabel_SetTx, this.tx, pr)); + History.CanAddChanges() && History.Add(new CChangesDrawingsObject(this, AscDFH.historyitem_AxisUnitsLabel_SetTx, this.tx, pr)); this.tx = pr; }; CAxisUnitsLabel.prototype.setSpPr = function(pr) { - History.CanAddChanges() && History.Add(new CChangesDrawingsString(this, AscDFH.historyitem_AxisUnitsLabel_SetSpPr, this.spPr, pr)); + History.CanAddChanges() && History.Add(new CChangesDrawingsObject(this, AscDFH.historyitem_AxisUnitsLabel_SetSpPr, this.spPr, pr)); this.spPr = pr; }; CAxisUnitsLabel.prototype.setTxPr = function(pr) { - History.CanAddChanges() && History.Add(new CChangesDrawingsString(this, AscDFH.historyitem_AxisUnitsLabel_SetTxPr, this.txPr, pr)); + History.CanAddChanges() && History.Add(new CChangesDrawingsObject(this, AscDFH.historyitem_AxisUnitsLabel_SetTxPr, this.txPr, pr)); this.txPr = pr; }; CAxisUnitsLabel.prototype.setExtLst = function(pr) { - History.CanAddChanges() && History.Add(new CChangesDrawingsString(this, AscDFH.historyitem_AxisUnitsLabel_SetExtLst, this.extLst, pr)); + History.CanAddChanges() && History.Add(new CChangesDrawingsObject(this, AscDFH.historyitem_AxisUnitsLabel_SetExtLst, this.extLst, pr)); this.extLst = pr; }; window['AscFormat'].CAxisUnitsLabel = CAxisUnitsLabel; @@ -410,11 +400,11 @@ InitClass(CBinning, CBaseChartObject, AscDFH.historyitem_type_Binning); CBinning.prototype.setBinSize = function(pr) { - History.CanAddChanges() && History.Add(new CChangesDrawingsString(this, AscDFH.historyitem_Binning_SetBinSize, this.binSize, pr)); + History.CanAddChanges() && History.Add(new CChangesDrawingsDouble2(this, AscDFH.historyitem_Binning_SetBinSize, this.binSize, pr)); this.binSize = pr; }; CBinning.prototype.setBinCount = function(pr) { - History.CanAddChanges() && History.Add(new CChangesDrawingsString(this, AscDFH.historyitem_Binning_SetBinCount, this.binCount, pr)); + History.CanAddChanges() && History.Add(new CChangesDrawingsLong(this, AscDFH.historyitem_Binning_SetBinCount, this.binCount, pr)); this.binCount = pr; }; CBinning.prototype.setIntervalClosed = function(pr) { @@ -1126,24 +1116,6 @@ }; window['AscFormat'].CExternalData = CExternalData; - // ExtremeValueColorPosition todo - drawingsChangesMap[AscDFH.historyitem_Address_SetTest] = function(oClass, value) { - oClass.test = value; - }; - AscDFH.changesFactory[AscDFH.historyitem_Address_SetTest] = window['AscDFH'].CChangesDrawingsString; - function CExtremeValueColorPosition() { - CBaseChartObject.call(this); - this.test = null; - } - - InitClass(CExtremeValueColorPosition, CBaseChartObject, AscDFH.historyitem_type_ExtremeValueColorPosition); - - CExtremeValueColorPosition.prototype.setTest = function(pr) { - History.CanAddChanges() && History.Add(new CChangesDrawingsString(this, AscDFH.historyitem_ExtremeValueColorPosition_SetTest, this.test, pr)); - this.test = pr; - }; - window['AscFormat'].CExtremeValueColorPosition = CExtremeValueColorPosition; - // FormatOverride drawingsChangesMap[AscDFH.historyitem_FormatOverride_SetSpPr] = function(oClass, value) { oClass.spPr = value; @@ -2876,7 +2848,7 @@ AscDFH.changesFactory[AscDFH.historyitem_SeriesLayoutProperties_SetParentLabelLayout] = window['AscDFH'].CChangesDrawingsString; AscDFH.changesFactory[AscDFH.historyitem_SeriesLayoutProperties_SetRegionLabelLayout] = window['AscDFH'].CChangesDrawingsString; AscDFH.changesFactory[AscDFH.historyitem_SeriesLayoutProperties_SetVisibility] = window['AscDFH'].CChangesDrawingsString; - AscDFH.changesFactory[AscDFH.historyitem_SeriesLayoutProperties_SetAggregation] = window['AscDFH'].CChangesDrawingsString; + AscDFH.changesFactory[AscDFH.historyitem_SeriesLayoutProperties_SetAggregation] = window['AscDFH'].CChangesDrawingsBool; AscDFH.changesFactory[AscDFH.historyitem_SeriesLayoutProperties_SetBinning] = window['AscDFH'].CChangesDrawingsString; AscDFH.changesFactory[AscDFH.historyitem_SeriesLayoutProperties_SetGeography] = window['AscDFH'].CChangesDrawingsString; AscDFH.changesFactory[AscDFH.historyitem_SeriesLayoutProperties_SetStatistics] = window['AscDFH'].CChangesDrawingsString; @@ -2910,7 +2882,7 @@ this.visibility = pr; }; CSeriesLayoutProperties.prototype.setAggregation = function(pr) { - History.CanAddChanges() && History.Add(new CChangesDrawingsString(this, AscDFH.historyitem_SeriesLayoutProperties_SetAggregation, this.aggregation, pr)); + History.CanAddChanges() && History.Add(new CChangesDrawingsBool(this, AscDFH.historyitem_SeriesLayoutProperties_SetAggregation, this.aggregation, pr)); this.aggregation = pr; }; CSeriesLayoutProperties.prototype.setBinning = function(pr) { @@ -3224,7 +3196,7 @@ drawingsChangesMap[AscDFH.historyitem_ValueColorEndPosition_SetPercent] = function(oClass, value) { oClass.percent = value; }; - AscDFH.changesFactory[AscDFH.historyitem_ValueColorEndPosition_SetExtremeValue] = window['AscDFH'].CChangesDrawingsString; + AscDFH.changesFactory[AscDFH.historyitem_ValueColorEndPosition_SetExtremeValue] = window['AscDFH'].CChangesDrawingsBool; AscDFH.changesFactory[AscDFH.historyitem_ValueColorEndPosition_SetNumber] = window['AscDFH'].CChangesDrawingsString; AscDFH.changesFactory[AscDFH.historyitem_ValueColorEndPosition_SetPercent] = window['AscDFH'].CChangesDrawingsString; function CValueColorEndPosition() { @@ -3237,7 +3209,7 @@ InitClass(CValueColorEndPosition, CBaseChartObject, AscDFH.historyitem_type_ValueColorEndPosition); CValueColorEndPosition.prototype.setExtremeValue = function(pr) { - History.CanAddChanges() && History.Add(new CChangesDrawingsString(this, AscDFH.historyitem_ValueColorEndPosition_SetExtremeValue, this.extremeValue, pr)); + History.CanAddChanges() && History.Add(new CChangesDrawingsBool(this, AscDFH.historyitem_ValueColorEndPosition_SetExtremeValue, this.extremeValue, pr)); this.extremeValue = pr; }; CValueColorEndPosition.prototype.setNumber = function(pr) { From c92c2e367342e131058d34b90f4563e5b0c1cbe7 Mon Sep 17 00:00:00 2001 From: Dmitriy Alexandrov Date: Wed, 2 Aug 2023 20:59:58 +0600 Subject: [PATCH 07/30] add Simple Types, edit names in classes --- common/Drawings/Format/ChartEx.js | 595 +++++++++++++++++++++--------- 1 file changed, 426 insertions(+), 169 deletions(-) diff --git a/common/Drawings/Format/ChartEx.js b/common/Drawings/Format/ChartEx.js index 6fbb5aea4f..14b69335fc 100644 --- a/common/Drawings/Format/ChartEx.js +++ b/common/Drawings/Format/ChartEx.js @@ -142,20 +142,20 @@ drawingsChangesMap[AscDFH.historyitem_Axis_SetHidden] = function(oClass, value) { oClass.hidden = value; }; - AscDFH.changesFactory[AscDFH.historyitem_Axis_SetCatScaling] = window['AscDFH'].CChangesDrawingsObject; - AscDFH.changesFactory[AscDFH.historyitem_Axis_SetValScaling] = window['AscDFH'].CChangesDrawingsObject; - AscDFH.changesFactory[AscDFH.historyitem_Axis_SetTitle] = window['AscDFH'].CChangesDrawingsObject; - AscDFH.changesFactory[AscDFH.historyitem_Axis_SetUnits] = window['AscDFH'].CChangesDrawingsObject; - AscDFH.changesFactory[AscDFH.historyitem_Axis_SetMajorGridlines] = window['AscDFH'].CChangesDrawingsObject; - AscDFH.changesFactory[AscDFH.historyitem_Axis_SetMinorGridlines] = window['AscDFH'].CChangesDrawingsObject; - AscDFH.changesFactory[AscDFH.historyitem_Axis_SetMajorTickMarks] = window['AscDFH'].CChangesDrawingsObject; - AscDFH.changesFactory[AscDFH.historyitem_Axis_SetMinorTickMarks] = window['AscDFH'].CChangesDrawingsObject; - AscDFH.changesFactory[AscDFH.historyitem_Axis_SetTickLabels] = window['AscDFH'].CChangesDrawingsObject; - AscDFH.changesFactory[AscDFH.historyitem_Axis_SetNumFmt] = window['AscDFH'].CChangesDrawingsObject; - AscDFH.changesFactory[AscDFH.historyitem_Axis_SetSpPr] = window['AscDFH'].CChangesDrawingsObject; - AscDFH.changesFactory[AscDFH.historyitem_Axis_SetTxPr] = window['AscDFH'].CChangesDrawingsObject; - AscDFH.changesFactory[AscDFH.historyitem_Axis_SetExtLst] = window['AscDFH'].CChangesDrawingsObject; - AscDFH.changesFactory[AscDFH.historyitem_Axis_SetId] = window['AscDFH'].CChangesDrawingsObject; + AscDFH.changesFactory[AscDFH.historyitem_Axis_SetCatScaling] = window['AscDFH'].CChangesDrawingsObjectNoId; + AscDFH.changesFactory[AscDFH.historyitem_Axis_SetValScaling] = window['AscDFH'].CChangesDrawingsObjectNoId; + AscDFH.changesFactory[AscDFH.historyitem_Axis_SetTitle] = window['AscDFH'].CChangesDrawingsObjectNoId; + AscDFH.changesFactory[AscDFH.historyitem_Axis_SetUnits] = window['AscDFH'].CChangesDrawingsObjectNoId; + AscDFH.changesFactory[AscDFH.historyitem_Axis_SetMajorGridlines] = window['AscDFH'].CChangesDrawingsObjectNoId; + AscDFH.changesFactory[AscDFH.historyitem_Axis_SetMinorGridlines] = window['AscDFH'].CChangesDrawingsObjectNoId; + AscDFH.changesFactory[AscDFH.historyitem_Axis_SetMajorTickMarks] = window['AscDFH'].CChangesDrawingsObjectNoId; + AscDFH.changesFactory[AscDFH.historyitem_Axis_SetMinorTickMarks] = window['AscDFH'].CChangesDrawingsObjectNoId; + AscDFH.changesFactory[AscDFH.historyitem_Axis_SetTickLabels] = window['AscDFH'].CChangesDrawingsBool; + AscDFH.changesFactory[AscDFH.historyitem_Axis_SetNumFmt] = window['AscDFH'].CChangesDrawingsObjectNoId; + AscDFH.changesFactory[AscDFH.historyitem_Axis_SetSpPr] = window['AscDFH'].CChangesDrawingsObjectNoId; + AscDFH.changesFactory[AscDFH.historyitem_Axis_SetTxPr] = window['AscDFH'].CChangesDrawingsObjectNoId; + AscDFH.changesFactory[AscDFH.historyitem_Axis_SetExtLst] = window['AscDFH'].CChangesDrawingsObjectNoId; + AscDFH.changesFactory[AscDFH.historyitem_Axis_SetId] = window['AscDFH'].CChangesDrawingsLong; AscDFH.changesFactory[AscDFH.historyitem_Axis_SetHidden] = window['AscDFH'].CChangesDrawingsBool; function CAxis() { @@ -180,59 +180,59 @@ InitClass(CAxis, CBaseChartObject, AscDFH.historyitem_type_Axis); CAxis.prototype.setCatScaling = function(pr) { - History.CanAddChanges() && History.Add(new CChangesDrawingsObject(this, AscDFH.historyitem_Axis_SetCatScaling, this.catScaling, pr)); + History.CanAddChanges() && History.Add(new CChangesDrawingsObjectNoId(this, AscDFH.historyitem_Axis_SetCatScaling, this.catScaling, pr)); this.catScaling = pr; }; CAxis.prototype.setValScaling = function(pr) { - History.CanAddChanges() && History.Add(new CChangesDrawingsObject(this, AscDFH.historyitem_Axis_SetValScaling, this.valScaling, pr)); + History.CanAddChanges() && History.Add(new CChangesDrawingsObjectNoId(this, AscDFH.historyitem_Axis_SetValScaling, this.valScaling, pr)); this.valScaling = pr; }; CAxis.prototype.setTitle = function(pr) { - History.CanAddChanges() && History.Add(new CChangesDrawingsObject(this, AscDFH.historyitem_Axis_SetTitle, this.title, pr)); + History.CanAddChanges() && History.Add(new CChangesDrawingsObjectNoId(this, AscDFH.historyitem_Axis_SetTitle, this.title, pr)); this.title = pr; }; CAxis.prototype.setUnits = function(pr) { - History.CanAddChanges() && History.Add(new CChangesDrawingsObject(this, AscDFH.historyitem_Axis_SetUnits, this.units, pr)); + History.CanAddChanges() && History.Add(new CChangesDrawingsObjectNoId(this, AscDFH.historyitem_Axis_SetUnits, this.units, pr)); this.units = pr; }; CAxis.prototype.setMajorGridlines = function(pr) { - History.CanAddChanges() && History.Add(new CChangesDrawingsObject(this, AscDFH.historyitem_Axis_SetMajorGridlines, this.majorGridlines, pr)); + History.CanAddChanges() && History.Add(new CChangesDrawingsObjectNoId(this, AscDFH.historyitem_Axis_SetMajorGridlines, this.majorGridlines, pr)); this.majorGridlines = pr; }; CAxis.prototype.setMinorGridlines = function(pr) { - History.CanAddChanges() && History.Add(new CChangesDrawingsObject(this, AscDFH.historyitem_Axis_SetMinorGridlines, this.minorGridlines, pr)); + History.CanAddChanges() && History.Add(new CChangesDrawingsObjectNoId(this, AscDFH.historyitem_Axis_SetMinorGridlines, this.minorGridlines, pr)); this.minorGridlines = pr; }; CAxis.prototype.setMajorTickMarks = function(pr) { - History.CanAddChanges() && History.Add(new CChangesDrawingsObject(this, AscDFH.historyitem_Axis_SetMajorTickMarks, this.majorTickMarks, pr)); + History.CanAddChanges() && History.Add(new CChangesDrawingsObjectNoId(this, AscDFH.historyitem_Axis_SetMajorTickMarks, this.majorTickMarks, pr)); this.majorTickMarks = pr; }; CAxis.prototype.setMinorTickMarks = function(pr) { - History.CanAddChanges() && History.Add(new CChangesDrawingsObject(this, AscDFH.historyitem_Axis_SetMinorTickMarks, this.minorTickMarks, pr)); + History.CanAddChanges() && History.Add(new CChangesDrawingsObjectNoId(this, AscDFH.historyitem_Axis_SetMinorTickMarks, this.minorTickMarks, pr)); this.minorTickMarks = pr; }; CAxis.prototype.setTickLabels = function(pr) { - History.CanAddChanges() && History.Add(new CChangesDrawingsObject(this, AscDFH.historyitem_Axis_SetTickLabels, this.tickLabels, pr)); + History.CanAddChanges() && History.Add(new CChangesDrawingsBool(this, AscDFH.historyitem_Axis_SetTickLabels, this.tickLabels, pr)); this.tickLabels = pr; }; CAxis.prototype.setNumFmt = function(pr) { - History.CanAddChanges() && History.Add(new CChangesDrawingsObject(this, AscDFH.historyitem_Axis_SetNumFmt, this.numFmt, pr)); + History.CanAddChanges() && History.Add(new CChangesDrawingsObjectNoId(this, AscDFH.historyitem_Axis_SetNumFmt, this.numFmt, pr)); this.numFmt = pr; }; CAxis.prototype.setSpPr = function(pr) { - History.CanAddChanges() && History.Add(new CChangesDrawingsObject(this, AscDFH.historyitem_Axis_SetSpPr, this.spPr, pr)); + History.CanAddChanges() && History.Add(new CChangesDrawingsObjectNoId(this, AscDFH.historyitem_Axis_SetSpPr, this.spPr, pr)); this.spPr = pr; }; CAxis.prototype.setTxPr = function(pr) { - History.CanAddChanges() && History.Add(new CChangesDrawingsObject(this, AscDFH.historyitem_Axis_SetTxPr, this.txPr, pr)); + History.CanAddChanges() && History.Add(new CChangesDrawingsObjectNoId(this, AscDFH.historyitem_Axis_SetTxPr, this.txPr, pr)); this.txPr = pr; }; CAxis.prototype.setExtLst = function(pr) { - History.CanAddChanges() && History.Add(new CChangesDrawingsObject(this, AscDFH.historyitem_Axis_SetExtLst, this.extLst, pr)); + History.CanAddChanges() && History.Add(new CChangesDrawingsObjectNoId(this, AscDFH.historyitem_Axis_SetExtLst, this.extLst, pr)); this.extLst = pr; }; CAxis.prototype.setId = function(pr) { - History.CanAddChanges() && History.Add(new CChangesDrawingsObject(this, AscDFH.historyitem_Axis_SetId, this.id, pr)); + History.CanAddChanges() && History.Add(new CChangesDrawingsLong(this, AscDFH.historyitem_Axis_SetId, this.id, pr)); this.id = pr; }; CAxis.prototype.setHidden = function(pr) { @@ -241,83 +241,157 @@ }; window['AscFormat'].CAxis = CAxis; - // AxisTitle - drawingsChangesMap[AscDFH.historyitem_AxisTitle_SetTx] = function(oClass, value) { + // Title + drawingsChangesMap[AscDFH.historyitem_Title_SetTx] = function(oClass, value) { oClass.tx = value; }; - drawingsChangesMap[AscDFH.historyitem_AxisTitle_SetSpPr] = function(oClass, value) { + drawingsChangesMap[AscDFH.historyitem_Title_SetSpPr] = function(oClass, value) { oClass.spPr = value; }; - drawingsChangesMap[AscDFH.historyitem_AxisTitle_SetTxPr] = function(oClass, value) { + drawingsChangesMap[AscDFH.historyitem_Title_SetTxPr] = function(oClass, value) { oClass.txPr = value; }; - drawingsChangesMap[AscDFH.historyitem_AxisTitle_SetExtLst] = function(oClass, value) { + drawingsChangesMap[AscDFH.historyitem_Title_SetExtLst] = function(oClass, value) { oClass.extLst = value; }; - AscDFH.changesFactory[AscDFH.historyitem_AxisTitle_SetTx] = window['AscDFH'].CChangesDrawingsObject; - AscDFH.changesFactory[AscDFH.historyitem_AxisTitle_SetSpPr] = window['AscDFH'].CChangesDrawingsObject; - AscDFH.changesFactory[AscDFH.historyitem_AxisTitle_SetTxPr] = window['AscDFH'].CChangesDrawingsObject; - AscDFH.changesFactory[AscDFH.historyitem_AxisTitle_SetExtLst] = window['AscDFH'].CChangesDrawingsObject; - function CAxisTitle() { + drawingsChangesMap[AscDFH.historyitem_Title_SetPos] = function(oClass, value) { + oClass.pos = value; + }; + drawingsChangesMap[AscDFH.historyitem_Title_SetAlign] = function(oClass, value) { + oClass.align = value; + }; + drawingsChangesMap[AscDFH.historyitem_Title_SetOverlay] = function(oClass, value) { + oClass.overlay = value; + }; + AscDFH.changesFactory[AscDFH.historyitem_Title_SetTx] = window['AscDFH'].CChangesDrawingsObjectNoId; + AscDFH.changesFactory[AscDFH.historyitem_Title_SetSpPr] = window['AscDFH'].CChangesDrawingsObjectNoId; + AscDFH.changesFactory[AscDFH.historyitem_Title_SetTxPr] = window['AscDFH'].CChangesDrawingsObjectNoId; + AscDFH.changesFactory[AscDFH.historyitem_Title_SetExtLst] = window['AscDFH'].CChangesDrawingsObjectNoId; + AscDFH.changesFactory[AscDFH.historyitem_Title_SetPos] = window['AscDFH'].CChangesDrawingsObjectNoId; + AscDFH.changesFactory[AscDFH.historyitem_Title_SetAlign] = window['AscDFH'].CChangesDrawingsObjectNoId; + AscDFH.changesFactory[AscDFH.historyitem_Title_SetOverlay] = window['AscDFH'].CChangesDrawingsBool; + function CTitle() { CBaseChartObject.call(this); this.tx = null; this.spPr = null; this.txPr = null; this.extLst = null; + + //for chart title only (but not axis title) + this.pos = null; + this.align = null; + this.overlay = null; } - InitClass(CAxisTitle, CBaseChartObject, AscDFH.historyitem_type_AxisTitle); + InitClass(CTitle, CBaseChartObject, AscDFH.historyitem_type_Title); - CAxisTitle.prototype.setTx = function(pr) { - History.CanAddChanges() && History.Add(new CChangesDrawingsObject(this, AscDFH.historyitem_AxisTitle_SetTx, this.tx, pr)); + CTitle.prototype.setTx = function(pr) { + History.CanAddChanges() && History.Add(new CChangesDrawingsObjectNoId(this, AscDFH.historyitem_Title_SetTx, this.tx, pr)); this.tx = pr; }; - CAxisTitle.prototype.setSpPr = function(pr) { - History.CanAddChanges() && History.Add(new CChangesDrawingsObject(this, AscDFH.historyitem_AxisTitle_SetSpPr, this.spPr, pr)); + CTitle.prototype.setSpPr = function(pr) { + History.CanAddChanges() && History.Add(new CChangesDrawingsObjectNoId(this, AscDFH.historyitem_Title_SetSpPr, this.spPr, pr)); this.spPr = pr; }; - CAxisTitle.prototype.setTxPr = function(pr) { - History.CanAddChanges() && History.Add(new CChangesDrawingsObject(this, AscDFH.historyitem_AxisTitle_SetTxPr, this.txPr, pr)); + CTitle.prototype.setTxPr = function(pr) { + History.CanAddChanges() && History.Add(new CChangesDrawingsObjectNoId(this, AscDFH.historyitem_Title_SetTxPr, this.txPr, pr)); this.txPr = pr; }; - CAxisTitle.prototype.setExtLst = function(pr) { - History.CanAddChanges() && History.Add(new CChangesDrawingsObject(this, AscDFH.historyitem_AxisTitle_SetExtLst, this.extLst, pr)); + CTitle.prototype.setExtLst = function(pr) { + History.CanAddChanges() && History.Add(new CChangesDrawingsObjectNoId(this, AscDFH.historyitem_Title_SetExtLst, this.extLst, pr)); this.extLst = pr; }; - window['AscFormat'].CAxisTitle = CAxisTitle; + CTitle.prototype.setPos = function(pr) { + History.CanAddChanges() && History.Add(new CChangesDrawingsObjectNoId(this, AscDFH.historyitem_Title_SetPos, this.pos, pr)); + this.pos = pr; + }; + CTitle.prototype.setAlign = function(pr) { + History.CanAddChanges() && History.Add(new CChangesDrawingsObjectNoId(this, AscDFH.historyitem_Title_SetAlign, this.align, pr)); + this.align = pr; + }; + CTitle.prototype.setOverlay = function(pr) { + History.CanAddChanges() && History.Add(new CChangesDrawingsBool(this, AscDFH.historyitem_Title_SetOverlay, this.overlay, pr)); + this.overlay = pr; + }; + window['AscFormat'].CTitle = CTitle; + + // // AxisTitle (CTitle instead of CAxisTitle) + // drawingsChangesMap[AscDFH.historyitem_AxisTitle_SetTx] = function(oClass, value) { + // oClass.tx = value; + // }; + // drawingsChangesMap[AscDFH.historyitem_AxisTitle_SetSpPr] = function(oClass, value) { + // oClass.spPr = value; + // }; + // drawingsChangesMap[AscDFH.historyitem_AxisTitle_SetTxPr] = function(oClass, value) { + // oClass.txPr = value; + // }; + // drawingsChangesMap[AscDFH.historyitem_AxisTitle_SetExtLst] = function(oClass, value) { + // oClass.extLst = value; + // }; + // AscDFH.changesFactory[AscDFH.historyitem_AxisTitle_SetTx] = window['AscDFH'].CChangesDrawingsString; + // AscDFH.changesFactory[AscDFH.historyitem_AxisTitle_SetSpPr] = window['AscDFH'].CChangesDrawingsString; + // AscDFH.changesFactory[AscDFH.historyitem_AxisTitle_SetTxPr] = window['AscDFH'].CChangesDrawingsString; + // AscDFH.changesFactory[AscDFH.historyitem_AxisTitle_SetExtLst] = window['AscDFH'].CChangesDrawingsString; + // function CAxisTitle() { + // CBaseChartObject.call(this); + // this.tx = null; + // this.spPr = null; + // this.txPr = null; + // this.extLst = null; + // } + + // InitClass(CAxisTitle, CBaseChartObject, AscDFH.historyitem_type_AxisTitle); + + // CAxisTitle.prototype.setTx = function(pr) { + // History.CanAddChanges() && History.Add(new CChangesDrawingsObjectNoId(this, AscDFH.historyitem_AxisTitle_SetTx, this.tx, pr)); + // this.tx = pr; + // }; + // CAxisTitle.prototype.setSpPr = function(pr) { + // History.CanAddChanges() && History.Add(new CChangesDrawingsObjectNoId(this, AscDFH.historyitem_AxisTitle_SetSpPr, this.spPr, pr)); + // this.spPr = pr; + // }; + // CAxisTitle.prototype.setTxPr = function(pr) { + // History.CanAddChanges() && History.Add(new CChangesDrawingsObjectNoId(this, AscDFH.historyitem_AxisTitle_SetTxPr, this.txPr, pr)); + // this.txPr = pr; + // }; + // CAxisTitle.prototype.setExtLst = function(pr) { + // History.CanAddChanges() && History.Add(new CChangesDrawingsObjectNoId(this, AscDFH.historyitem_AxisTitle_SetExtLst, this.extLst, pr)); + // this.extLst = pr; + // }; + // window['AscFormat'].CAxisTitle = CAxisTitle; // AxisUnits - drawingsChangesMap[AscDFH.historyitem_AxisUnit_SetUnitsLabel] = function(oClass, value) { + drawingsChangesMap[AscDFH.historyitem_AxisUnits_SetUnitsLabel] = function(oClass, value) { oClass.unitsLabel = value; }; - drawingsChangesMap[AscDFH.historyitem_AxisUnit_SetExtLst] = function(oClass, value) { + drawingsChangesMap[AscDFH.historyitem_AxisUnits_SetExtLst] = function(oClass, value) { oClass.extLst = value; }; - drawingsChangesMap[AscDFH.historyitem_AxisUnit_SetUnit] = function(oClass, value) { + drawingsChangesMap[AscDFH.historyitem_AxisUnits_SetUnit] = function(oClass, value) { oClass.unit = value; }; - AscDFH.changesFactory[AscDFH.historyitem_AxisUnit_SetUnitsLabel] = window['AscDFH'].CChangesDrawingsObject; - AscDFH.changesFactory[AscDFH.historyitem_AxisUnit_SetExtLst] = window['AscDFH'].CChangesDrawingsObject; - AscDFH.changesFactory[AscDFH.historyitem_AxisUnit_SetUnit] = window['AscDFH'].CChangesDrawingsString; - function CAxisUnits() { + AscDFH.changesFactory[AscDFH.historyitem_AxisUnits_SetUnitsLabel] = window['AscDFH'].CChangesDrawingsObjectNoId; + AscDFH.changesFactory[AscDFH.historyitem_AxisUnits_SetExtLst] = window['AscDFH'].CChangesDrawingsObjectNoId; + AscDFH.changesFactory[AscDFH.historyitem_AxisUnits_SetUnit] = window['AscDFH'].CChangesDrawingsObjectNoId; + function AxisUnits() { CBaseChartObject.call(this); this.unitsLabel = null; this.extLst = null; this.unit = null; } - InitClass(CAxisUnits, CBaseChartObject, AscDFH.historyitem_type_AxisUnits); + InitClass(AxisUnits, CBaseChartObject, AscDFH.historyitem_type_AxisUnits); CAxisUnits.prototype.setUnitsLabel = function(pr) { - History.CanAddChanges() && History.Add(new CChangesDrawingsObject(this, AscDFH.historyitem_AxisUnit_SetUnitsLabel, this.unitsLabel, pr)); + History.CanAddChanges() && History.Add(new CChangesDrawingsObjectNoId(this, AscDFH.historyitem_AxisUnits_SetUnitsLabel, this.unitsLabel, pr)); this.unitsLabel = pr; }; CAxisUnits.prototype.setExtLst = function(pr) { - History.CanAddChanges() && History.Add(new CChangesDrawingsObject(this, AscDFH.historyitem_AxisUnit_SetExtLst, this.extLst, pr)); + History.CanAddChanges() && History.Add(new CChangesDrawingsObjectNoId(this, AscDFH.historyitem_AxisUnits_SetExtLst, this.extLst, pr)); this.extLst = pr; }; CAxisUnits.prototype.setUnit = function(pr) { - History.CanAddChanges() && History.Add(new CChangesDrawingsString(this, AscDFH.historyitem_AxisUnit_SetUnit, this.unit, pr)); + History.CanAddChanges() && History.Add(new CChangesDrawingsObjectNoId(this, AscDFH.historyitem_AxisUnits_SetUnit, this.unit, pr)); this.unit = pr; }; window['AscFormat'].CAxisUnits = CAxisUnits; @@ -335,10 +409,10 @@ drawingsChangesMap[AscDFH.historyitem_AxisUnitsLabel_SetExtLst] = function(oClass, value) { oClass.extLst = value; }; - AscDFH.changesFactory[AscDFH.historyitem_AxisUnitsLabel_SetTx] = window['AscDFH'].CChangesDrawingsObject; - AscDFH.changesFactory[AscDFH.historyitem_AxisUnitsLabel_SetSpPr] = window['AscDFH'].CChangesDrawingsObject; - AscDFH.changesFactory[AscDFH.historyitem_AxisUnitsLabel_SetTxPr] = window['AscDFH'].CChangesDrawingsObject; - AscDFH.changesFactory[AscDFH.historyitem_AxisUnitsLabel_SetExtLst] = window['AscDFH'].CChangesDrawingsObject; + AscDFH.changesFactory[AscDFH.historyitem_AxisUnitsLabel_SetTx] = window['AscDFH'].CChangesDrawingsString; + AscDFH.changesFactory[AscDFH.historyitem_AxisUnitsLabel_SetSpPr] = window['AscDFH'].CChangesDrawingsString; + AscDFH.changesFactory[AscDFH.historyitem_AxisUnitsLabel_SetTxPr] = window['AscDFH'].CChangesDrawingsString; + AscDFH.changesFactory[AscDFH.historyitem_AxisUnitsLabel_SetExtLst] = window['AscDFH'].CChangesDrawingsString; function CAxisUnitsLabel() { CBaseChartObject.call(this); this.tx = null; @@ -350,19 +424,19 @@ InitClass(CAxisUnitsLabel, CBaseChartObject, AscDFH.historyitem_type_AxisUnitsLabel); CAxisUnitsLabel.prototype.setTx = function(pr) { - History.CanAddChanges() && History.Add(new CChangesDrawingsObject(this, AscDFH.historyitem_AxisUnitsLabel_SetTx, this.tx, pr)); + History.CanAddChanges() && History.Add(new CChangesDrawingsObjectNoId(this, AscDFH.historyitem_AxisUnitsLabel_SetTx, this.tx, pr)); this.tx = pr; }; CAxisUnitsLabel.prototype.setSpPr = function(pr) { - History.CanAddChanges() && History.Add(new CChangesDrawingsObject(this, AscDFH.historyitem_AxisUnitsLabel_SetSpPr, this.spPr, pr)); + History.CanAddChanges() && History.Add(new CChangesDrawingsObjectNoId(this, AscDFH.historyitem_AxisUnitsLabel_SetSpPr, this.spPr, pr)); this.spPr = pr; }; CAxisUnitsLabel.prototype.setTxPr = function(pr) { - History.CanAddChanges() && History.Add(new CChangesDrawingsObject(this, AscDFH.historyitem_AxisUnitsLabel_SetTxPr, this.txPr, pr)); + History.CanAddChanges() && History.Add(new CChangesDrawingsObjectNoId(this, AscDFH.historyitem_AxisUnitsLabel_SetTxPr, this.txPr, pr)); this.txPr = pr; }; CAxisUnitsLabel.prototype.setExtLst = function(pr) { - History.CanAddChanges() && History.Add(new CChangesDrawingsObject(this, AscDFH.historyitem_AxisUnitsLabel_SetExtLst, this.extLst, pr)); + History.CanAddChanges() && History.Add(new CChangesDrawingsObjectNoId(this, AscDFH.historyitem_AxisUnitsLabel_SetExtLst, this.extLst, pr)); this.extLst = pr; }; window['AscFormat'].CAxisUnitsLabel = CAxisUnitsLabel; @@ -601,77 +675,77 @@ }; window['AscFormat'].CChartSpace = CChartSpace; - // ChartTitle - drawingsChangesMap[AscDFH.historyitem_ChartTitle_SetTx] = function(oClass, value) { - oClass.tx = value; - }; - drawingsChangesMap[AscDFH.historyitem_ChartTitle_SetSpPr] = function(oClass, value) { - oClass.spPr = value; - }; - drawingsChangesMap[AscDFH.historyitem_ChartTitle_SetTxPr] = function(oClass, value) { - oClass.txPr = value; - }; - drawingsChangesMap[AscDFH.historyitem_ChartTitle_SetExtLst] = function(oClass, value) { - oClass.extLst = value; - }; - drawingsChangesMap[AscDFH.historyitem_ChartTitle_SetPos] = function(oClass, value) { - oClass.pos = value; - }; - drawingsChangesMap[AscDFH.historyitem_ChartTitle_SetAlign] = function(oClass, value) { - oClass.align = value; - }; - drawingsChangesMap[AscDFH.historyitem_ChartTitle_SetOverlay] = function(oClass, value) { - oClass.overlay = value; - }; - AscDFH.changesFactory[AscDFH.historyitem_ChartTitle_SetTx] = window['AscDFH'].CChangesDrawingsString; - AscDFH.changesFactory[AscDFH.historyitem_ChartTitle_SetSpPr] = window['AscDFH'].CChangesDrawingsString; - AscDFH.changesFactory[AscDFH.historyitem_ChartTitle_SetTxPr] = window['AscDFH'].CChangesDrawingsString; - AscDFH.changesFactory[AscDFH.historyitem_ChartTitle_SetExtLst] = window['AscDFH'].CChangesDrawingsString; - AscDFH.changesFactory[AscDFH.historyitem_ChartTitle_SetPos] = window['AscDFH'].CChangesDrawingsString; - AscDFH.changesFactory[AscDFH.historyitem_ChartTitle_SetAlign] = window['AscDFH'].CChangesDrawingsString; - AscDFH.changesFactory[AscDFH.historyitem_ChartTitle_SetOverlay] = window['AscDFH'].CChangesDrawingsString; - function CChartTitle() { - CBaseChartObject.call(this); - this.tx = null; - this.spPr = null; - this.txPr = null; - this.extLst = null; - this.pos = null; - this.align = null; - this.overlay = null; - } - - InitClass(CChartTitle, CBaseChartObject, AscDFH.historyitem_type_ChartTitle); - - CChartTitle.prototype.setTx = function(pr) { - History.CanAddChanges() && History.Add(new CChangesDrawingsString(this, AscDFH.historyitem_ChartTitle_SetTx, this.tx, pr)); - this.tx = pr; - }; - CChartTitle.prototype.setSpPr = function(pr) { - History.CanAddChanges() && History.Add(new CChangesDrawingsString(this, AscDFH.historyitem_ChartTitle_SetSpPr, this.spPr, pr)); - this.spPr = pr; - }; - CChartTitle.prototype.setTxPr = function(pr) { - History.CanAddChanges() && History.Add(new CChangesDrawingsString(this, AscDFH.historyitem_ChartTitle_SetTxPr, this.txPr, pr)); - this.txPr = pr; - }; - CChartTitle.prototype.setExtLst = function(pr) { - History.CanAddChanges() && History.Add(new CChangesDrawingsString(this, AscDFH.historyitem_ChartTitle_SetExtLst, this.extLst, pr)); - this.extLst = pr; - }; - CChartTitle.prototype.setPos = function(pr) { - History.CanAddChanges() && History.Add(new CChangesDrawingsString(this, AscDFH.historyitem_ChartTitle_SetPos, this.pos, pr)); - this.pos = pr; - }; - CChartTitle.prototype.setAlign = function(pr) { - History.CanAddChanges() && History.Add(new CChangesDrawingsString(this, AscDFH.historyitem_ChartTitle_SetAlign, this.align, pr)); - this.align = pr; - }; - CChartTitle.prototype.setOverlay = function(pr) { - History.CanAddChanges() && History.Add(new CChangesDrawingsString(this, AscDFH.historyitem_ChartTitle_SetOverlay, this.overlay, pr)); - this.overlay = pr; - }; - window['AscFormat'].CChartTitle = CChartTitle; + // // ChartTitle (CTitle instead of CChartTitle) + // drawingsChangesMap[AscDFH.historyitem_ChartTitle_SetTx] = function(oClass, value) { + // oClass.tx = value; + // }; + // drawingsChangesMap[AscDFH.historyitem_ChartTitle_SetSpPr] = function(oClass, value) { + // oClass.spPr = value; + // }; + // drawingsChangesMap[AscDFH.historyitem_ChartTitle_SetTxPr] = function(oClass, value) { + // oClass.txPr = value; + // }; + // drawingsChangesMap[AscDFH.historyitem_ChartTitle_SetExtLst] = function(oClass, value) { + // oClass.extLst = value; + // }; + // drawingsChangesMap[AscDFH.historyitem_ChartTitle_SetPos] = function(oClass, value) { + // oClass.pos = value; + // }; + // drawingsChangesMap[AscDFH.historyitem_ChartTitle_SetAlign] = function(oClass, value) { + // oClass.align = value; + // }; + // drawingsChangesMap[AscDFH.historyitem_ChartTitle_SetOverlay] = function(oClass, value) { + // oClass.overlay = value; + // }; + // AscDFH.changesFactory[AscDFH.historyitem_ChartTitle_SetTx] = window['AscDFH'].CChangesDrawingsString; + // AscDFH.changesFactory[AscDFH.historyitem_ChartTitle_SetSpPr] = window['AscDFH'].CChangesDrawingsString; + // AscDFH.changesFactory[AscDFH.historyitem_ChartTitle_SetTxPr] = window['AscDFH'].CChangesDrawingsString; + // AscDFH.changesFactory[AscDFH.historyitem_ChartTitle_SetExtLst] = window['AscDFH'].CChangesDrawingsString; + // AscDFH.changesFactory[AscDFH.historyitem_ChartTitle_SetPos] = window['AscDFH'].CChangesDrawingsString; + // AscDFH.changesFactory[AscDFH.historyitem_ChartTitle_SetAlign] = window['AscDFH'].CChangesDrawingsString; + // AscDFH.changesFactory[AscDFH.historyitem_ChartTitle_SetOverlay] = window['AscDFH'].CChangesDrawingsString; + // function CChartTitle() { + // CBaseChartObject.call(this); + // this.tx = null; + // this.spPr = null; + // this.txPr = null; + // this.extLst = null; + // this.pos = null; + // this.align = null; + // this.overlay = null; + // } + + // InitClass(CChartTitle, CBaseChartObject, AscDFH.historyitem_type_ChartTitle); + + // CChartTitle.prototype.setTx = function(pr) { + // History.CanAddChanges() && History.Add(new CChangesDrawingsString(this, AscDFH.historyitem_ChartTitle_SetTx, this.tx, pr)); + // this.tx = pr; + // }; + // CChartTitle.prototype.setSpPr = function(pr) { + // History.CanAddChanges() && History.Add(new CChangesDrawingsString(this, AscDFH.historyitem_ChartTitle_SetSpPr, this.spPr, pr)); + // this.spPr = pr; + // }; + // CChartTitle.prototype.setTxPr = function(pr) { + // History.CanAddChanges() && History.Add(new CChangesDrawingsString(this, AscDFH.historyitem_ChartTitle_SetTxPr, this.txPr, pr)); + // this.txPr = pr; + // }; + // CChartTitle.prototype.setExtLst = function(pr) { + // History.CanAddChanges() && History.Add(new CChangesDrawingsString(this, AscDFH.historyitem_ChartTitle_SetExtLst, this.extLst, pr)); + // this.extLst = pr; + // }; + // CChartTitle.prototype.setPos = function(pr) { + // History.CanAddChanges() && History.Add(new CChangesDrawingsString(this, AscDFH.historyitem_ChartTitle_SetPos, this.pos, pr)); + // this.pos = pr; + // }; + // CChartTitle.prototype.setAlign = function(pr) { + // History.CanAddChanges() && History.Add(new CChangesDrawingsString(this, AscDFH.historyitem_ChartTitle_SetAlign, this.align, pr)); + // this.align = pr; + // }; + // CChartTitle.prototype.setOverlay = function(pr) { + // History.CanAddChanges() && History.Add(new CChangesDrawingsString(this, AscDFH.historyitem_ChartTitle_SetOverlay, this.overlay, pr)); + // this.overlay = pr; + // }; + // window['AscFormat'].CChartTitle = CChartTitle; // Clear drawingsChangesMap[AscDFH.historyitem_Clear_SetGeoLocationQueryResults] = function(oClass, value) { @@ -1071,23 +1145,23 @@ }; window['AscFormat'].CExtension = CExtension; - // ExtensionList - drawingsChangesMap[AscDFH.historyitem_ExtensionList_SetExt] = function(oClass, value) { - oClass.ext = value; - }; - AscDFH.changesFactory[AscDFH.historyitem_ExtensionList_SetExt] = window['AscDFH'].CChangesDrawingsString; - function CExtensionList() { - CBaseChartObject.call(this); - this.ext = null; - } + // // ExtensionList (OOX::Drawing::COfficeArtExtensionList instead of CExtensionList) + // drawingsChangesMap[AscDFH.historyitem_ExtensionList_SetExt] = function(oClass, value) { + // oClass.ext = value; + // }; + // AscDFH.changesFactory[AscDFH.historyitem_ExtensionList_SetExt] = window['AscDFH'].CChangesDrawingsString; + // function CExtensionList() { + // CBaseChartObject.call(this); + // this.ext = null; + // } - InitClass(CExtensionList, CBaseChartObject, AscDFH.historyitem_type_ExtensionList); + // InitClass(CExtensionList, CBaseChartObject, AscDFH.historyitem_type_ExtensionList); - CExtensionList.prototype.setExt = function(pr) { - History.CanAddChanges() && History.Add(new CChangesDrawingsString(this, AscDFH.historyitem_ExtensionList_SetExt, this.ext, pr)); - this.ext = pr; - }; - window['AscFormat'].CExtensionList = CExtensionList; + // CExtensionList.prototype.setExt = function(pr) { + // History.CanAddChanges() && History.Add(new CChangesDrawingsString(this, AscDFH.historyitem_ExtensionList_SetExt, this.ext, pr)); + // this.ext = pr; + // }; + // window['AscFormat'].CExtensionList = CExtensionList; // ExternalData drawingsChangesMap[AscDFH.historyitem_ExternalData_SetR] = function(oClass, value) { @@ -2471,7 +2545,7 @@ this.plotAreaRegion = pr; }; CPlotArea.prototype.setAxis = function(pr) { - History.CanAddChanges() && History.Add(new CChangesDrawingsString(this, AscDFH.historyitem_PlotArea_SetAxis, this.axis, pr)); + History.CanAddChanges() && History.Add(new CChangesDrawingsObject(this, AscDFH.historyitem_PlotArea_SetAxis, this.axis, pr)); this.axis = pr; }; CPlotArea.prototype.setSpPr = function(pr) { @@ -3096,23 +3170,23 @@ }; window['AscFormat'].CTextData = CTextData; - // TickLabels - drawingsChangesMap[AscDFH.historyitem_TickLabels_SetExtLst] = function(oClass, value) { - oClass.extLst = value; - }; - AscDFH.changesFactory[AscDFH.historyitem_TickLabels_SetExtLst] = window['AscDFH'].CChangesDrawingsString; - function CTickLabels() { - CBaseChartObject.call(this); - this.extLst = null; - } + // // TickLabels (unused) + // drawingsChangesMap[AscDFH.historyitem_TickLabels_SetExtLst] = function(oClass, value) { + // oClass.extLst = value; + // }; + // AscDFH.changesFactory[AscDFH.historyitem_TickLabels_SetExtLst] = window['AscDFH'].CChangesDrawingsString; + // function CTickLabels() { + // CBaseChartObject.call(this); + // this.extLst = null; + // } - InitClass(CTickLabels, CBaseChartObject, AscDFH.historyitem_type_TickLabels); + // InitClass(CTickLabels, CBaseChartObject, AscDFH.historyitem_type_TickLabels); - CTickLabels.prototype.setExtLst = function(pr) { - History.CanAddChanges() && History.Add(new CChangesDrawingsString(this, AscDFH.historyitem_TickLabels_SetExtLst, this.extLst, pr)); - this.extLst = pr; - }; - window['AscFormat'].CTickLabels = CTickLabels; + // CTickLabels.prototype.setExtLst = function(pr) { + // History.CanAddChanges() && History.Add(new CChangesDrawingsString(this, AscDFH.historyitem_TickLabels_SetExtLst, this.extLst, pr)); + // this.extLst = pr; + // }; + // window['AscFormat'].CTickLabels = CTickLabels; // TickMarks drawingsChangesMap[AscDFH.historyitem_TickMarks_SetExtLst] = function(oClass, value) { @@ -3329,7 +3403,190 @@ this.maxColor = pr; }; window['AscFormat'].CValueColors = CValueColors; + + // Simple Types + + // SidePos + drawingsChangesMap[AscDFH.historyitem_SidePos_SetSidePos] = function(oClass, value) { + oClass.sidePos = value; + }; + AscDFH.changesFactory[AscDFH.historyitem_SidePos_SetSidePos] = window['AscDFH'].CChangesDrawingsLong; + function CSidePos() { + CBaseChartObject.call(this); + this.sidePos = null; + } + + InitClass(CSidePos, CBaseChartObject, AscDFH.historyitem_type_SidePos); + + CSidePos.prototype.setSidePos = function(pr) { + History.CanAddChanges() && History.Add(new CChangesDrawingsLong(this, AscDFH.historyitem_SidePos_SetSidePos, this.sidePos, pr)); + this.sidePos = pr; + }; + window['AscFormat'].CSidePos = CSidePos; + + // PosAlign + drawingsChangesMap[AscDFH.historyitem_PosAlign_SetPosAlign] = function(oClass, value) { + oClass.posAlign = value; + }; + AscDFH.changesFactory[AscDFH.historyitem_PosAlign_SetPosAlign] = window['AscDFH'].CChangesDrawingsLong; + function CPosAlign() { + CBaseChartObject.call(this); + this.posAlign = null; + } + + InitClass(CPosAlign, CBaseChartObject, AscDFH.historyitem_type_PosAlign); + + CPosAlign.prototype.setPosAlign = function(pr) { + History.CanAddChanges() && History.Add(new CChangesDrawingsLong(this, AscDFH.historyitem_PosAlign_SetPosAlign, this.posAlign, pr)); + this.posAlign = pr; + }; + window['AscFormat'].CPosAlign = CPosAlign; + + // AxisUnit + drawingsChangesMap[AscDFH.historyitem_AxisUnit_SetAxisUnit] = function(oClass, value) { + oClass.axisUnit = value; + }; + AscDFH.changesFactory[AscDFH.historyitem_AxisUnit_SetAxisUnit] = window['AscDFH'].CChangesDrawingsLong; + function CAxisUnit() { + CBaseChartObject.call(this); + this.axisUnit = null; + } + + InitClass(CAxisUnit, CBaseChartObject, AscDFH.historyitem_type_AxisUnit); + + CAxisUnit.prototype.setAxisUnit = function(pr) { + History.CanAddChanges() && History.Add(new CChangesDrawingsLong(this, AscDFH.historyitem_AxisUnit_SetAxisUnit, this.axisUnit, pr)); + this.axisUnit = pr; + }; + window['AscFormat'].CAxisUnit = CAxisUnit; + + // FormulaDirection + drawingsChangesMap[AscDFH.historyitem_FormulaDirection_SetFormulaDirection] = function(oClass, value) { + oClass.formulaDirection = value; + }; + AscDFH.changesFactory[AscDFH.historyitem_FormulaDirection_SetFormulaDirection] = window['AscDFH'].CChangesDrawingsLong; + function CFormulaDirection() { + CBaseChartObject.call(this); + this.formulaDirection = null; + } + + InitClass(CFormulaDirection, CBaseChartObject, AscDFH.historyitem_type_FormulaDirection); + + CFormulaDirection.prototype.setAxisUnit = function(pr) { + History.CanAddChanges() && History.Add(new CChangesDrawingsLong(this, AscDFH.historyitem_FormulaDirection_SetFormulaDirection, this.formulaDirection, pr)); + this.formulaDirection = pr; + }; + window['AscFormat'].CFormulaDirection = CFormulaDirection; + + // IntervalClosedSide + drawingsChangesMap[AscDFH.historyitem_IntervalClosedSide_SetIntervalClosedSide] = function(oClass, value) { + oClass.intervalClosedSide = value; + }; + AscDFH.changesFactory[AscDFH.historyitem_IntervalClosedSide_SetIntervalClosedSide] = window['AscDFH'].CChangesDrawingsLong; + function CIntervalClosedSide() { + CBaseChartObject.call(this); + this.intervalClosedSide = null; + } + + InitClass(CIntervalClosedSide, CBaseChartObject, AscDFH.historyitem_type_IntervalClosedSide); + + CIntervalClosedSide.prototype.setIntervalClosedSide = function(pr) { + History.CanAddChanges() && History.Add(new CChangesDrawingsLong(this, AscDFH.historyitem_IntervalClosedSide_SetIntervalClosedSide, this.side, pr)); + this.intervalClosedSide = pr; + }; + window['AscFormat'].CIntervalClosedSide = CIntervalClosedSide; + + // NumericDimensionType + drawingsChangesMap[AscDFH.historyitem_NumericDimensionType_SetNumericDimensionType] = function(oClass, value) { + oClass.numericDimensionType = value; + }; + AscDFH.changesFactory[AscDFH.historyitem_NumericDimensionType_SetNumericDimensionType] = window['AscDFH'].CChangesDrawingsLong; + function CNumericDimensionType() { + CBaseChartObject.call(this); + this.numericDimensionType = null; + } + + InitClass(CNumericDimensionType, CBaseChartObject, AscDFH.historyitem_type_NumericDimensionType); + + CNumericDimensionType.prototype.setNumericDimensionType = function(pr) { + History.CanAddChanges() && History.Add(new CChangesDrawingsLong(this, AscDFH.historyitem_NumericDimensionType_SetNumericDimensionType, this.numericDimensionType, pr)); + this.numericDimensionType = pr; + }; + window['AscFormat'].CNumericDimensionType = CNumericDimensionType; + + // QuartileMethod + drawingsChangesMap[AscDFH.historyitem_QuartileMethod_SetQuartileMethod] = function(oClass, value) { + oClass.quartileMethod = value; + }; + AscDFH.changesFactory[AscDFH.historyitem_QuartileMethod_SetQuartileMethod] = window['AscDFH'].CChangesDrawingsLong; + function CQuartileMethod() { + CBaseChartObject.call(this); + this.quartileMethod = null; + } + + InitClass(CQuartileMethod, CBaseChartObject, AscDFH.historyitem_type_QuartileMethod); + + CQuartileMethod.prototype.setQuartileMethod = function(pr) { + History.CanAddChanges() && History.Add(new CChangesDrawingsLong(this, AscDFH.historyitem_QuartileMethod_SetQuartileMethod, this.quartileMethod, pr)); + this.quartileMethod = pr; + }; + window['AscFormat'].CQuartileMethod = CQuartileMethod; + + // DataLabelPos + drawingsChangesMap[AscDFH.historyitem_DataLabelPos_SetDataLabelPos] = function(oClass, value) { + oClass.dataLabelPos = value; + }; + AscDFH.changesFactory[AscDFH.historyitem_DataLabelPos_SetDataLabelPos] = window['AscDFH'].CChangesDrawingsLong; + function CDataLabelPos() { + CBaseChartObject.call(this); + this.dataLabelPos = null; + } + + InitClass(CDataLabelPos, CBaseChartObject, AscDFH.historyitem_type_DataLabelPos); + + CDataLabelPos.prototype.setDataLabelPos = function(pr) { + History.CanAddChanges() && History.Add(new CChangesDrawingsLong(this, AscDFH.historyitem_DataLabelPos_SetDataLabelPos, this.dataLabelPos, pr)); + this.dataLabelPos = pr; + }; + window['AscFormat'].CDataLabelPos = CDataLabelPos; + + // SeriesLayout + drawingsChangesMap[AscDFH.historyitem_SeriesLayout_SetSeriesLayout] = function(oClass, value) { + oClass.seriesLayout = value; + }; + AscDFH.changesFactory[AscDFH.historyitem_SeriesLayout_SetSeriesLayout] = window['AscDFH'].CChangesDrawingsLong; + function CSeriesLayout() { + CBaseChartObject.call(this); + this.seriesLayout = null; + } + + InitClass(CSeriesLayout, CBaseChartObject, AscDFH.historyitem_type_SeriesLayout); + + CSeriesLayout.prototype.setSeriesLayout = function(pr) { + History.CanAddChanges() && History.Add(new CChangesDrawingsLong(this, AscDFH.historyitem_SeriesLayout_SetSeriesLayout, this.seriesLayout, pr)); + this.seriesLayout = pr; + }; + window['AscFormat'].CSeriesLayout = CSeriesLayout; + + // TickMarksType + drawingsChangesMap[AscDFH.historyitem_TickMarksType_SetTickMarksType] = function(oClass, value) { + oClass.tickMarksType = value; + }; + AscDFH.changesFactory[AscDFH.historyitem_TickMarksType_SetTickMarksType] = window['AscDFH'].CChangesDrawingsLong; + function CTickMarksType() { + CBaseChartObject.call(this); + this.tickMarksType = null; + } + + InitClass(CTickMarksType, CBaseChartObject, AscDFH.historyitem_type_TickMarksType); + + CTickMarksType.prototype.setTickMarksType = function(pr) { + History.CanAddChanges() && History.Add(new CChangesDrawingsLong(this, AscDFH.historyitem_TickMarksType_SetTickMarksType, this.tickMarksType, pr)); + this.tickMarksType = pr; + }; + window['AscFormat'].CTickMarksType = CTickMarksType; + // template drawingsChangesMap[AscDFH.historyitem_Address_SetTest] = function(oClass, value) { oClass.test = value; From 1d2144919a76f8fb78e96826b6e055e50e20bd42 Mon Sep 17 00:00:00 2001 From: Dmitriy Alexandrov Date: Thu, 3 Aug 2023 21:51:52 +0600 Subject: [PATCH 08/30] edit types in classes --- common/Drawings/Format/ChartEx.js | 817 ++++++++++++++++-------------- 1 file changed, 446 insertions(+), 371 deletions(-) diff --git a/common/Drawings/Format/ChartEx.js b/common/Drawings/Format/ChartEx.js index 14b69335fc..189b06fd3b 100644 --- a/common/Drawings/Format/ChartEx.js +++ b/common/Drawings/Format/ChartEx.js @@ -409,10 +409,10 @@ drawingsChangesMap[AscDFH.historyitem_AxisUnitsLabel_SetExtLst] = function(oClass, value) { oClass.extLst = value; }; - AscDFH.changesFactory[AscDFH.historyitem_AxisUnitsLabel_SetTx] = window['AscDFH'].CChangesDrawingsString; - AscDFH.changesFactory[AscDFH.historyitem_AxisUnitsLabel_SetSpPr] = window['AscDFH'].CChangesDrawingsString; - AscDFH.changesFactory[AscDFH.historyitem_AxisUnitsLabel_SetTxPr] = window['AscDFH'].CChangesDrawingsString; - AscDFH.changesFactory[AscDFH.historyitem_AxisUnitsLabel_SetExtLst] = window['AscDFH'].CChangesDrawingsString; + AscDFH.changesFactory[AscDFH.historyitem_AxisUnitsLabel_SetTx] = window['AscDFH'].CChangesDrawingsObjectNoId; + AscDFH.changesFactory[AscDFH.historyitem_AxisUnitsLabel_SetSpPr] = window['AscDFH'].CChangesDrawingsObjectNoId; + AscDFH.changesFactory[AscDFH.historyitem_AxisUnitsLabel_SetTxPr] = window['AscDFH'].CChangesDrawingsObjectNoId; + AscDFH.changesFactory[AscDFH.historyitem_AxisUnitsLabel_SetExtLst] = window['AscDFH'].CChangesDrawingsObjectNoId; function CAxisUnitsLabel() { CBaseChartObject.call(this); this.tx = null; @@ -457,11 +457,11 @@ drawingsChangesMap[AscDFH.historyitem_Binning_SetOverflow] = function(oClass, value) { oClass.overflow = value; }; - AscDFH.changesFactory[AscDFH.historyitem_Binning_SetBinSize] = window['AscDFH'].CChangesDrawingsString; - AscDFH.changesFactory[AscDFH.historyitem_Binning_SetBinCount] = window['AscDFH'].CChangesDrawingsString; - AscDFH.changesFactory[AscDFH.historyitem_Binning_SetIntervalClosed] = window['AscDFH'].CChangesDrawingsString; - AscDFH.changesFactory[AscDFH.historyitem_Binning_SetUnderflow] = window['AscDFH'].CChangesDrawingsString; - AscDFH.changesFactory[AscDFH.historyitem_Binning_SetOverflow] = window['AscDFH'].CChangesDrawingsString; + AscDFH.changesFactory[AscDFH.historyitem_Binning_SetBinSize] = window['AscDFH'].CChangesDrawingsDouble2; + AscDFH.changesFactory[AscDFH.historyitem_Binning_SetBinCount] = window['AscDFH'].CChangesDrawingsLong; + AscDFH.changesFactory[AscDFH.historyitem_Binning_SetIntervalClosed] = window['AscDFH'].CChangesDrawingsObjectNoId; + AscDFH.changesFactory[AscDFH.historyitem_Binning_SetUnderflow] = window['AscDFH'].CChangesDrawingsObjectNoId; + AscDFH.changesFactory[AscDFH.historyitem_Binning_SetOverflow] = window['AscDFH'].CChangesDrawingsObjectNoId; function CBinning() { CBaseChartObject.call(this); this.binSize = null; @@ -482,15 +482,15 @@ this.binCount = pr; }; CBinning.prototype.setIntervalClosed = function(pr) { - History.CanAddChanges() && History.Add(new CChangesDrawingsString(this, AscDFH.historyitem_Binning_SetIntervalClosed, this.intervalClosed, pr)); + History.CanAddChanges() && History.Add(new CChangesDrawingsObjectNoId(this, AscDFH.historyitem_Binning_SetIntervalClosed, this.intervalClosed, pr)); this.intervalClosed = pr; }; CBinning.prototype.setUnderflow = function(pr) { - History.CanAddChanges() && History.Add(new CChangesDrawingsString(this, AscDFH.historyitem_Binning_SetUnderflow, this.underflow, pr)); + History.CanAddChanges() && History.Add(new CChangesDrawingsObjectNoId(this, AscDFH.historyitem_Binning_SetUnderflow, this.underflow, pr)); this.underflow = pr; }; CBinning.prototype.setOverflow = function(pr) { - History.CanAddChanges() && History.Add(new CChangesDrawingsString(this, AscDFH.historyitem_Binning_SetOverflow, this.overflow, pr)); + History.CanAddChanges() && History.Add(new CChangesDrawingsObjectNoId(this, AscDFH.historyitem_Binning_SetOverflow, this.overflow, pr)); this.overflow = pr; }; window['AscFormat'].CBinning = CBinning; @@ -499,7 +499,7 @@ drawingsChangesMap[AscDFH.historyitem_CategoryAxisScaling_SetGapWidth] = function(oClass, value) { oClass.gapWidth = value; }; - AscDFH.changesFactory[AscDFH.historyitem_CategoryAxisScaling_SetGapWidth] = window['AscDFH'].CChangesDrawingsString; + AscDFH.changesFactory[AscDFH.historyitem_CategoryAxisScaling_SetGapWidth] = window['AscDFH'].CChangesDrawingsObjectNoId; function CCategoryAxisScaling() { CBaseChartObject.call(this); this.gapWidth = null; @@ -508,7 +508,7 @@ InitClass(CCategoryAxisScaling, CBaseChartObject, AscDFH.historyitem_type_CategoryAxisScaling); CCategoryAxisScaling.prototype.setGapWidth = function(pr) { - History.CanAddChanges() && History.Add(new CChangesDrawingsString(this, AscDFH.historyitem_CategoryAxisScaling_SetGapWidth, this.gapWidth, pr)); + History.CanAddChanges() && History.Add(new CChangesDrawingsObjectNoId(this, AscDFH.historyitem_CategoryAxisScaling_SetGapWidth, this.gapWidth, pr)); this.gapWidth = pr; }; window['AscFormat'].CCategoryAxisScaling = CCategoryAxisScaling; @@ -526,10 +526,10 @@ drawingsChangesMap[AscDFH.historyitem_Chart_SetExtLst] = function(oClass, value) { oClass.extLst = value; }; - AscDFH.changesFactory[AscDFH.historyitem_Chart_SetTitle] = window['AscDFH'].CChangesDrawingsString; - AscDFH.changesFactory[AscDFH.historyitem_Chart_SetPlotArea] = window['AscDFH'].CChangesDrawingsString; - AscDFH.changesFactory[AscDFH.historyitem_Chart_SetLegend] = window['AscDFH'].CChangesDrawingsString; - AscDFH.changesFactory[AscDFH.historyitem_Chart_SetExtLst] = window['AscDFH'].CChangesDrawingsString; + AscDFH.changesFactory[AscDFH.historyitem_Chart_SetTitle] = window['AscDFH'].CChangesDrawingsObjectNoId; + AscDFH.changesFactory[AscDFH.historyitem_Chart_SetPlotArea] = window['AscDFH'].CChangesDrawingsObjectNoId; + AscDFH.changesFactory[AscDFH.historyitem_Chart_SetLegend] = window['AscDFH'].CChangesDrawingsObjectNoId; + AscDFH.changesFactory[AscDFH.historyitem_Chart_SetExtLst] = window['AscDFH'].CChangesDrawingsObjectNoId; function CChart() { CBaseChartObject.call(this); this.title = null; @@ -541,19 +541,19 @@ InitClass(CChart, CBaseChartObject, AscDFH.historyitem_type_Chart); CChart.prototype.setTitle = function(pr) { - History.CanAddChanges() && History.Add(new CChangesDrawingsString(this, AscDFH.historyitem_Chart_SetTitle, this.title, pr)); + History.CanAddChanges() && History.Add(new CChangesDrawingsObjectNoId(this, AscDFH.historyitem_Chart_SetTitle, this.title, pr)); this.title = pr; }; CChart.prototype.setPlotArea = function(pr) { - History.CanAddChanges() && History.Add(new CChangesDrawingsString(this, AscDFH.historyitem_Chart_SetPlotArea, this.plotArea, pr)); + History.CanAddChanges() && History.Add(new CChangesDrawingsObjectNoId(this, AscDFH.historyitem_Chart_SetPlotArea, this.plotArea, pr)); this.plotArea = pr; }; CChart.prototype.setLegend = function(pr) { - History.CanAddChanges() && History.Add(new CChangesDrawingsString(this, AscDFH.historyitem_Chart_SetLegend, this.legend, pr)); + History.CanAddChanges() && History.Add(new CChangesDrawingsObjectNoId(this, AscDFH.historyitem_Chart_SetLegend, this.legend, pr)); this.legend = pr; }; CChart.prototype.setExtLst = function(pr) { - History.CanAddChanges() && History.Add(new CChangesDrawingsString(this, AscDFH.historyitem_Chart_SetExtLst, this.extLst, pr)); + History.CanAddChanges() && History.Add(new CChangesDrawingsObjectNoId(this, AscDFH.historyitem_Chart_SetExtLst, this.extLst, pr)); this.extLst = pr; }; window['AscFormat'].CChart = CChart; @@ -568,28 +568,28 @@ drawingsChangesMap[AscDFH.historyitem_ChartData_SetExtLst] = function(oClass, value) { oClass.extLst = value; }; - AscDFH.changesFactory[AscDFH.historyitem_ChartData_SetExternalData] = window['AscDFH'].CChangesDrawingsString; - AscDFH.changesFactory[AscDFH.historyitem_ChartData_SetData] = window['AscDFH'].CChangesDrawingsString; - AscDFH.changesFactory[AscDFH.historyitem_ChartData_SetExtLst] = window['AscDFH'].CChangesDrawingsString; + AscDFH.changesFactory[AscDFH.historyitem_ChartData_SetExternalData] = window['AscDFH'].CChangesDrawingsObjectNoId; + AscDFH.changesFactory[AscDFH.historyitem_ChartData_SetData] = window['AscDFH'].CChangesDrawingsObject; + AscDFH.changesFactory[AscDFH.historyitem_ChartData_SetExtLst] = window['AscDFH'].CChangesDrawingsObjectNoId; function CChartData() { CBaseChartObject.call(this); this.externalData = null; - this.data = null; + this.data = []; this.extLst = null; } InitClass(CChartData, CBaseChartObject, AscDFH.historyitem_type_ChartData); CChartData.prototype.setExternalData = function(pr) { - History.CanAddChanges() && History.Add(new CChangesDrawingsString(this, AscDFH.historyitem_ChartData_SetExternalData, this.externalData, pr)); + History.CanAddChanges() && History.Add(new CChangesDrawingsObjectNoId(this, AscDFH.historyitem_ChartData_SetExternalData, this.externalData, pr)); this.externalData = pr; }; CChartData.prototype.setData = function(pr) { - History.CanAddChanges() && History.Add(new CChangesDrawingsString(this, AscDFH.historyitem_ChartData_SetData, this.data, pr)); + History.CanAddChanges() && History.Add(new CChangesDrawingsObject(this, AscDFH.historyitem_ChartData_SetData, this.data, pr)); this.data = pr; }; CChartData.prototype.setExtLst = function(pr) { - History.CanAddChanges() && History.Add(new CChangesDrawingsString(this, AscDFH.historyitem_ChartData_SetExtLst, this.extLst, pr)); + History.CanAddChanges() && History.Add(new CChangesDrawingsObjectNoId(this, AscDFH.historyitem_ChartData_SetExtLst, this.extLst, pr)); this.extLst = pr; }; window['AscFormat'].CChartData = CChartData; @@ -610,23 +610,23 @@ drawingsChangesMap[AscDFH.historyitem_ChartSpace_SetClrMapOvr] = function(oClass, value) { oClass.clrMapOvr = value; }; - drawingsChangesMap[AscDFH.historyitem_ChartSpace_SetFmtOvrs] = function(oClass, value) { - oClass.fmtOvrs = value; - }; - drawingsChangesMap[AscDFH.historyitem_ChartSpace_SetPrintSettings] = function(oClass, value) { - oClass.printSettings = value; - }; drawingsChangesMap[AscDFH.historyitem_ChartSpace_SetExtLst] = function(oClass, value) { oClass.extLst = value; }; - AscDFH.changesFactory[AscDFH.historyitem_ChartSpace_SetChartData] = window['AscDFH'].CChangesDrawingsString; - AscDFH.changesFactory[AscDFH.historyitem_ChartSpace_SetChart] = window['AscDFH'].CChangesDrawingsString; - AscDFH.changesFactory[AscDFH.historyitem_ChartSpace_SetSpPr] = window['AscDFH'].CChangesDrawingsString; - AscDFH.changesFactory[AscDFH.historyitem_ChartSpace_SetTxPr] = window['AscDFH'].CChangesDrawingsString; - AscDFH.changesFactory[AscDFH.historyitem_ChartSpace_SetClrMapOvr] = window['AscDFH'].CChangesDrawingsString; - AscDFH.changesFactory[AscDFH.historyitem_ChartSpace_SetFmtOvrs] = window['AscDFH'].CChangesDrawingsString; - AscDFH.changesFactory[AscDFH.historyitem_ChartSpace_SetPrintSettings] = window['AscDFH'].CChangesDrawingsString; - AscDFH.changesFactory[AscDFH.historyitem_ChartSpace_SetExtLst] = window['AscDFH'].CChangesDrawingsString; + // drawingsChangesMap[AscDFH.historyitem_ChartSpace_SetFmtOvrs] = function(oClass, value) { + // oClass.fmtOvrs = value; + // }; + // drawingsChangesMap[AscDFH.historyitem_ChartSpace_SetPrintSettings] = function(oClass, value) { + // oClass.printSettings = value; + // }; + AscDFH.changesFactory[AscDFH.historyitem_ChartSpace_SetChartData] = window['AscDFH'].CChangesDrawingsObjectNoId; + AscDFH.changesFactory[AscDFH.historyitem_ChartSpace_SetChart] = window['AscDFH'].CChangesDrawingsObjectNoId; + AscDFH.changesFactory[AscDFH.historyitem_ChartSpace_SetSpPr] = window['AscDFH'].CChangesDrawingsObjectNoId; + AscDFH.changesFactory[AscDFH.historyitem_ChartSpace_SetTxPr] = window['AscDFH'].CChangesDrawingsObjectNoId; + AscDFH.changesFactory[AscDFH.historyitem_ChartSpace_SetClrMapOvr] = window['AscDFH'].CChangesDrawingsObjectNoId; + AscDFH.changesFactory[AscDFH.historyitem_ChartSpace_SetExtLst] = window['AscDFH'].CChangesDrawingsObjectNoId; + // AscDFH.changesFactory[AscDFH.historyitem_ChartSpace_SetFmtOvrs] = window['AscDFH'].CChangesDrawingsObjectNoId; + // AscDFH.changesFactory[AscDFH.historyitem_ChartSpace_SetPrintSettings] = window['AscDFH'].CChangesDrawingsObjectNoId; function CChartSpace() { CBaseChartObject.call(this); this.chartData = null; @@ -634,45 +634,47 @@ this.spPr = null; this.txPr = null; this.clrMapOvr = null; - this.fmtOvrs = null; - this.printSettings = null; this.extLst = null; + // unused in ChartSerializeEx.h + // this.fmtOvrs = null; + // this.printSettings = null; + } InitClass(CChartSpace, CBaseChartObject, AscDFH.historyitem_type_ChartSpace); CChartSpace.prototype.setChartData = function(pr) { - History.CanAddChanges() && History.Add(new CChangesDrawingsString(this, AscDFH.historyitem_ChartSpace_SetChartData, this.chartData, pr)); + History.CanAddChanges() && History.Add(new CChangesDrawingsObjectNoId(this, AscDFH.historyitem_ChartSpace_SetChartData, this.chartData, pr)); this.chartData = pr; }; CChartSpace.prototype.setChart = function(pr) { - History.CanAddChanges() && History.Add(new CChangesDrawingsString(this, AscDFH.historyitem_ChartSpace_SetChart, this.chart, pr)); + History.CanAddChanges() && History.Add(new CChangesDrawingsObjectNoId(this, AscDFH.historyitem_ChartSpace_SetChart, this.chart, pr)); this.chart = pr; }; CChartSpace.prototype.setSpPr = function(pr) { - History.CanAddChanges() && History.Add(new CChangesDrawingsString(this, AscDFH.historyitem_ChartSpace_SetSpPr, this.spPr, pr)); + History.CanAddChanges() && History.Add(new CChangesDrawingsObjectNoId(this, AscDFH.historyitem_ChartSpace_SetSpPr, this.spPr, pr)); this.spPr = pr; }; CChartSpace.prototype.setTxPr = function(pr) { - History.CanAddChanges() && History.Add(new CChangesDrawingsString(this, AscDFH.historyitem_ChartSpace_SetTxPr, this.txPr, pr)); + History.CanAddChanges() && History.Add(new CChangesDrawingsObjectNoId(this, AscDFH.historyitem_ChartSpace_SetTxPr, this.txPr, pr)); this.txPr = pr; }; CChartSpace.prototype.setClrMapOvr = function(pr) { - History.CanAddChanges() && History.Add(new CChangesDrawingsString(this, AscDFH.historyitem_ChartSpace_SetClrMapOvr, this.clrMapOvr, pr)); + History.CanAddChanges() && History.Add(new CChangesDrawingsObjectNoId(this, AscDFH.historyitem_ChartSpace_SetClrMapOvr, this.clrMapOvr, pr)); this.clrMapOvr = pr; }; - CChartSpace.prototype.setFmtOvrs = function(pr) { - History.CanAddChanges() && History.Add(new CChangesDrawingsString(this, AscDFH.historyitem_ChartSpace_SetFmtOvrs, this.fmtOvrs, pr)); - this.fmtOvrs = pr; - }; - CChartSpace.prototype.setPrintSettings = function(pr) { - History.CanAddChanges() && History.Add(new CChangesDrawingsString(this, AscDFH.historyitem_ChartSpace_SetPrintSettings, this.printSettings, pr)); - this.printSettings = pr; - }; CChartSpace.prototype.setExtLst = function(pr) { - History.CanAddChanges() && History.Add(new CChangesDrawingsString(this, AscDFH.historyitem_ChartSpace_SetExtLst, this.extLst, pr)); + History.CanAddChanges() && History.Add(new CChangesDrawingsObjectNoId(this, AscDFH.historyitem_ChartSpace_SetExtLst, this.extLst, pr)); this.extLst = pr; }; + // CChartSpace.prototype.setFmtOvrs = function(pr) { + // History.CanAddChanges() && History.Add(new CChangesDrawingsObjectNoId(this, AscDFH.historyitem_ChartSpace_SetFmtOvrs, this.fmtOvrs, pr)); + // this.fmtOvrs = pr; + // }; + // CChartSpace.prototype.setPrintSettings = function(pr) { + // History.CanAddChanges() && History.Add(new CChangesDrawingsObjectNoId(this, AscDFH.historyitem_ChartSpace_SetPrintSettings, this.printSettings, pr)); + // this.printSettings = pr; + // }; window['AscFormat'].CChartSpace = CChartSpace; // // ChartTitle (CTitle instead of CChartTitle) @@ -747,7 +749,7 @@ // }; // window['AscFormat'].CChartTitle = CChartTitle; - // Clear + // Clear (no in ChartSerializeEx.h) drawingsChangesMap[AscDFH.historyitem_Clear_SetGeoLocationQueryResults] = function(oClass, value) { oClass.geoLocationQueryResults = value; }; @@ -760,10 +762,10 @@ drawingsChangesMap[AscDFH.historyitem_Clear_SetGeoChildEntitiesQueryResults] = function(oClass, value) { oClass.geoChildEntitiesQueryResults = value; }; - AscDFH.changesFactory[AscDFH.historyitem_Clear_SetGeoLocationQueryResults] = window['AscDFH'].CChangesDrawingsString; - AscDFH.changesFactory[AscDFH.historyitem_Clear_SetGeoDataEntityQueryResults] = window['AscDFH'].CChangesDrawingsString; - AscDFH.changesFactory[AscDFH.historyitem_Clear_SetGeoDataPointToEntityQueryResults] = window['AscDFH'].CChangesDrawingsString; - AscDFH.changesFactory[AscDFH.historyitem_Clear_SetGeoChildEntitiesQueryResults] = window['AscDFH'].CChangesDrawingsString; + AscDFH.changesFactory[AscDFH.historyitem_Clear_SetGeoLocationQueryResults] = window['AscDFH'].CChangesDrawingsObjectNoId; + AscDFH.changesFactory[AscDFH.historyitem_Clear_SetGeoDataEntityQueryResults] = window['AscDFH'].CChangesDrawingsObjectNoId; + AscDFH.changesFactory[AscDFH.historyitem_Clear_SetGeoDataPointToEntityQueryResults] = window['AscDFH'].CChangesDrawingsObjectNoId; + AscDFH.changesFactory[AscDFH.historyitem_Clear_SetGeoChildEntitiesQueryResults] = window['AscDFH'].CChangesDrawingsObjectNoId; function CClear() { CBaseChartObject.call(this); this.geoLocationQueryResults = null; @@ -775,24 +777,24 @@ InitClass(CClear, CBaseChartObject, AscDFH.historyitem_type_Clear); CClear.prototype.setGeoLocationQueryResults = function(pr) { - History.CanAddChanges() && History.Add(new CChangesDrawingsString(this, AscDFH.historyitem_Clear_SetGeoLocationQueryResults, this.geoLocationQueryResults, pr)); + History.CanAddChanges() && History.Add(new CChangesDrawingsObjectNoId(this, AscDFH.historyitem_Clear_SetGeoLocationQueryResults, this.geoLocationQueryResults, pr)); this.geoLocationQueryResults = pr; }; CClear.prototype.setGeoDataEntityQueryResults = function(pr) { - History.CanAddChanges() && History.Add(new CChangesDrawingsString(this, AscDFH.historyitem_Clear_SetGeoDataEntityQueryResults, this.geoDataEntityQueryResults, pr)); + History.CanAddChanges() && History.Add(new CChangesDrawingsObjectNoId(this, AscDFH.historyitem_Clear_SetGeoDataEntityQueryResults, this.geoDataEntityQueryResults, pr)); this.geoDataEntityQueryResults = pr; }; CClear.prototype.setGeoDataPointToEntityQueryResults = function(pr) { - History.CanAddChanges() && History.Add(new CChangesDrawingsString(this, AscDFH.historyitem_Clear_SetGeoDataPointToEntityQueryResults, this.geoDataPointToEntityQueryResults, pr)); + History.CanAddChanges() && History.Add(new CChangesDrawingsObjectNoId(this, AscDFH.historyitem_Clear_SetGeoDataPointToEntityQueryResults, this.geoDataPointToEntityQueryResults, pr)); this.geoDataPointToEntityQueryResults = pr; }; CClear.prototype.setGeoChildEntitiesQueryResults = function(pr) { - History.CanAddChanges() && History.Add(new CChangesDrawingsString(this, AscDFH.historyitem_Clear_SetGeoChildEntitiesQueryResults, this.geoChildEntitiesQueryResults, pr)); + History.CanAddChanges() && History.Add(new CChangesDrawingsObjectNoId(this, AscDFH.historyitem_Clear_SetGeoChildEntitiesQueryResults, this.geoChildEntitiesQueryResults, pr)); this.geoChildEntitiesQueryResults = pr; }; window['AscFormat'].CClear = CClear; - // Copyrights + // Copyrights (no in ChartSerializeEx.h) drawingsChangesMap[AscDFH.historyitem_Copyrights_SetCopyright] = function(oClass, value) { oClass.copyright = value; }; @@ -811,11 +813,14 @@ window['AscFormat'].CCopyrights = CCopyrights; // Data - drawingsChangesMap[AscDFH.historyitem_Data_SetNumDim] = function(oClass, value) { - oClass.numDim = value; - }; - drawingsChangesMap[AscDFH.historyitem_Data_SetStrDim] = function(oClass, value) { - oClass.strDim = value; + // drawingsChangesMap[AscDFH.historyitem_Data_SetNumDim] = function(oClass, value) { + // oClass.numDim = value; + // }; + // drawingsChangesMap[AscDFH.historyitem_Data_SetStrDim] = function(oClass, value) { + // oClass.strDim = value; + // }; + drawingsChangesMap[AscDFH.historyitem_Data_SetDimension] = function(oClass, value) { + oClass.dimension = value; }; drawingsChangesMap[AscDFH.historyitem_Data_SetExtLst] = function(oClass, value) { oClass.extLst = value; @@ -823,55 +828,62 @@ drawingsChangesMap[AscDFH.historyitem_Data_SetId] = function(oClass, value) { oClass.id = value; }; - AscDFH.changesFactory[AscDFH.historyitem_Data_SetNumDim] = window['AscDFH'].CChangesDrawingsString; - AscDFH.changesFactory[AscDFH.historyitem_Data_SetStrDim] = window['AscDFH'].CChangesDrawingsString; - AscDFH.changesFactory[AscDFH.historyitem_Data_SetExtLst] = window['AscDFH'].CChangesDrawingsString; - AscDFH.changesFactory[AscDFH.historyitem_Data_SetId] = window['AscDFH'].CChangesDrawingsString; + // AscDFH.changesFactory[AscDFH.historyitem_Data_SetNumDim] = window['AscDFH'].CChangesDrawingsString; + // AscDFH.changesFactory[AscDFH.historyitem_Data_SetStrDim] = window['AscDFH'].CChangesDrawingsString; + AscDFH.changesFactory[AscDFH.historyitem_Data_SetDimension] = window['AscDFH'].CChangesDrawingsObjectNoId; + AscDFH.changesFactory[AscDFH.historyitem_Data_SetExtLst] = window['AscDFH'].CChangesDrawingsObjectNoId; + AscDFH.changesFactory[AscDFH.historyitem_Data_SetId] = window['AscDFH'].CChangesDrawingsLong; function CData() { CBaseChartObject.call(this); - this.numDim = null; - this.strDim = null; + // field dimension instead of numDim,strDim (ChartSerializeEx.h) + // this.numDim = null; + // this.strDim = null; + this.dimension = []; this.extLst = null; this.id = null; } InitClass(CData, CBaseChartObject, AscDFH.historyitem_type_Data); - CData.prototype.setNumDim = function(pr) { - History.CanAddChanges() && History.Add(new CChangesDrawingsString(this, AscDFH.historyitem_Data_SetNumDim, this.numDim, pr)); - this.numDim = pr; - }; - CData.prototype.setStrDim = function(pr) { - History.CanAddChanges() && History.Add(new CChangesDrawingsString(this, AscDFH.historyitem_Data_SetStrDim, this.strDim, pr)); - this.strDim = pr; + // CData.prototype.setNumDim = function(pr) { + // History.CanAddChanges() && History.Add(new CChangesDrawingsString(this, AscDFH.historyitem_Data_SetNumDim, this.numDim, pr)); + // this.numDim = pr; + // }; + // CData.prototype.setStrDim = function(pr) { + // History.CanAddChanges() && History.Add(new CChangesDrawingsString(this, AscDFH.historyitem_Data_SetStrDim, this.strDim, pr)); + // this.strDim = pr; + // }; + CData.prototype.setDimension = function(pr) { + History.CanAddChanges() && History.Add(new CChangesDrawingsObjectNoId(this, AscDFH.historyitem_Data_SetDimension, this.dimension, pr)); + this.dimension = pr; }; CData.prototype.setExtLst = function(pr) { - History.CanAddChanges() && History.Add(new CChangesDrawingsString(this, AscDFH.historyitem_Data_SetExtLst, this.extLst, pr)); + History.CanAddChanges() && History.Add(new CChangesDrawingsObjectNoId(this, AscDFH.historyitem_Data_SetExtLst, this.extLst, pr)); this.extLst = pr; }; CData.prototype.setId = function(pr) { - History.CanAddChanges() && History.Add(new CChangesDrawingsString(this, AscDFH.historyitem_Data_SetId, this.id, pr)); + History.CanAddChanges() && History.Add(new CChangesDrawingsLong(this, AscDFH.historyitem_Data_SetId, this.id, pr)); this.id = pr; }; window['AscFormat'].CData = CData; - // DataId - drawingsChangesMap[AscDFH.historyitem_DataId_SetVal] = function(oClass, value) { - oClass.val = value; - }; - AscDFH.changesFactory[AscDFH.historyitem_DataId_SetVal] = window['AscDFH'].CChangesDrawingsString; - function CDataId() { - CBaseChartObject.call(this); - this.val = null; - } + // // DataId (int field instead class in ChartSerializeEx.h) + // drawingsChangesMap[AscDFH.historyitem_DataId_SetVal] = function(oClass, value) { + // oClass.val = value; + // }; + // AscDFH.changesFactory[AscDFH.historyitem_DataId_SetVal] = window['AscDFH'].CChangesDrawingsString; + // function CDataId() { + // CBaseChartObject.call(this); + // this.val = null; + // } - InitClass(CDataId, CBaseChartObject, AscDFH.historyitem_type_DataId); + // InitClass(CDataId, CBaseChartObject, AscDFH.historyitem_type_DataId); - CDataId.prototype.setVal = function(pr) { - History.CanAddChanges() && History.Add(new CChangesDrawingsString(this, AscDFH.historyitem_DataId_SetVal, this.val, pr)); - this.val = pr; - }; - window['AscFormat'].CDataId = CDataId; + // CDataId.prototype.setVal = function(pr) { + // History.CanAddChanges() && History.Add(new CChangesDrawingsString(this, AscDFH.historyitem_DataId_SetVal, this.val, pr)); + // this.val = pr; + // }; + // window['AscFormat'].CDataId = CDataId; // DataLabel drawingsChangesMap[AscDFH.historyitem_DataLabel_SetNumFmt] = function(oClass, value) { @@ -898,7 +910,14 @@ drawingsChangesMap[AscDFH.historyitem_DataLabel_SetPos] = function(oClass, value) { oClass.pos = value; }; - AscDFH.changesFactory[AscDFH.historyitem_DataLabel_SetNumFmt] = window['AscDFH'].CChangesDrawingsString; + AscDFH.changesFactory[AscDFH.historyitem_DataLabel_SetNumFmt] = window['AscDFH'].CChangesDrawingsObjectNoId; + AscDFH.changesFactory[AscDFH.historyitem_DataLabel_SetSpPr] = window['AscDFH'].CChangesDrawingsObjectNoId; + AscDFH.changesFactory[AscDFH.historyitem_DataLabel_SetTxPr] = window['AscDFH'].CChangesDrawingsObjectNoId; + AscDFH.changesFactory[AscDFH.historyitem_DataLabel_SetVisibility] = window['AscDFH'].CChangesDrawingsObjectNoId; + AscDFH.changesFactory[AscDFH.historyitem_DataLabel_SetSeparator] = window['AscDFH'].CChangesDrawingsString; + AscDFH.changesFactory[AscDFH.historyitem_DataLabel_SetExtLst] = window['AscDFH'].CChangesDrawingsObjectNoId; + AscDFH.changesFactory[AscDFH.historyitem_DataLabel_SetIdx] = window['AscDFH'].CChangesDrawingsLong; + AscDFH.changesFactory[AscDFH.historyitem_DataLabel_SetPos] = window['AscDFH'].CChangesDrawingsObjectNoId; function CDataLabel() { CBaseChartObject.call(this); this.numFmt = null; @@ -914,19 +933,19 @@ InitClass(CDataLabel, CBaseChartObject, AscDFH.historyitem_type_DataLabel); CDataLabel.prototype.setNumFmt = function(pr) { - History.CanAddChanges() && History.Add(new CChangesDrawingsString(this, AscDFH.historyitem_DataLabel_SetNumFmt, this.numFmt, pr)); + History.CanAddChanges() && History.Add(new CChangesDrawingsObjectNoId(this, AscDFH.historyitem_DataLabel_SetNumFmt, this.numFmt, pr)); this.numFmt = pr; }; CDataLabel.prototype.setSpPr = function(pr) { - History.CanAddChanges() && History.Add(new CChangesDrawingsString(this, AscDFH.historyitem_DataLabel_SetSpPr, this.spPr, pr)); + History.CanAddChanges() && History.Add(new CChangesDrawingsObjectNoId(this, AscDFH.historyitem_DataLabel_SetSpPr, this.spPr, pr)); this.spPr = pr; }; CDataLabel.prototype.setTxPr = function(pr) { - History.CanAddChanges() && History.Add(new CChangesDrawingsString(this, AscDFH.historyitem_DataLabel_SetTxPr, this.txPr, pr)); + History.CanAddChanges() && History.Add(new CChangesDrawingsObjectNoId(this, AscDFH.historyitem_DataLabel_SetTxPr, this.txPr, pr)); this.txPr = pr; }; CDataLabel.prototype.setVisibility = function(pr) { - History.CanAddChanges() && History.Add(new CChangesDrawingsString(this, AscDFH.historyitem_DataLabel_SetVisibility, this.visibility, pr)); + History.CanAddChanges() && History.Add(new CChangesDrawingsObjectNoId(this, AscDFH.historyitem_DataLabel_SetVisibility, this.visibility, pr)); this.visibility = pr; }; CDataLabel.prototype.setSeparator = function(pr) { @@ -934,15 +953,15 @@ this.separator = pr; }; CDataLabel.prototype.setExtLst = function(pr) { - History.CanAddChanges() && History.Add(new CChangesDrawingsString(this, AscDFH.historyitem_DataLabel_SetExtLst, this.extLst, pr)); + History.CanAddChanges() && History.Add(new CChangesDrawingsObjectNoId(this, AscDFH.historyitem_DataLabel_SetExtLst, this.extLst, pr)); this.extLst = pr; }; CDataLabel.prototype.setIdx = function(pr) { - History.CanAddChanges() && History.Add(new CChangesDrawingsString(this, AscDFH.historyitem_DataLabel_SetIdx, this.idx, pr)); + History.CanAddChanges() && History.Add(new CChangesDrawingsLong(this, AscDFH.historyitem_DataLabel_SetIdx, this.idx, pr)); this.idx = pr; }; CDataLabel.prototype.setPos = function(pr) { - History.CanAddChanges() && History.Add(new CChangesDrawingsString(this, AscDFH.historyitem_DataLabel_SetPos, this.pos, pr)); + History.CanAddChanges() && History.Add(new CChangesDrawingsObjectNoId(this, AscDFH.historyitem_DataLabel_SetPos, this.pos, pr)); this.pos = pr; }; window['AscFormat'].CDataLabel = CDataLabel; @@ -951,7 +970,7 @@ drawingsChangesMap[AscDFH.historyitem_DataLabelHidden_SetIdx] = function(oClass, value) { oClass.idx = value; }; - AscDFH.changesFactory[AscDFH.historyitem_DataLabelHidden_SetIdx] = window['AscDFH'].CChangesDrawingsString; + AscDFH.changesFactory[AscDFH.historyitem_DataLabelHidden_SetIdx] = window['AscDFH'].CChangesDrawingsLong; function CDataLabelHidden() { CBaseChartObject.call(this); this.idx = null; @@ -960,7 +979,7 @@ InitClass(CDataLabelHidden, CBaseChartObject, AscDFH.historyitem_type_DataLabelHidden); CDataLabelHidden.prototype.setIdx = function(pr) { - History.CanAddChanges() && History.Add(new CChangesDrawingsString(this, AscDFH.historyitem_DataLabelHidden_SetIdx, this.idx, pr)); + History.CanAddChanges() && History.Add(new CChangesDrawingsLong(this, AscDFH.historyitem_DataLabelHidden_SetIdx, this.idx, pr)); this.idx = pr; }; window['AscFormat'].CDataLabelHidden = CDataLabelHidden; @@ -993,15 +1012,15 @@ drawingsChangesMap[AscDFH.historyitem_DataLabels_SetPos] = function(oClass, value) { oClass.pos = value; }; - AscDFH.changesFactory[AscDFH.historyitem_DataLabels_SetNumFmt] = window['AscDFH'].CChangesDrawingsString; - AscDFH.changesFactory[AscDFH.historyitem_DataLabels_SetSpPr] = window['AscDFH'].CChangesDrawingsString; - AscDFH.changesFactory[AscDFH.historyitem_DataLabels_SetTxPr] = window['AscDFH'].CChangesDrawingsString; - AscDFH.changesFactory[AscDFH.historyitem_DataLabels_SetVisibility] = window['AscDFH'].CChangesDrawingsString; + AscDFH.changesFactory[AscDFH.historyitem_DataLabels_SetNumFmt] = window['AscDFH'].CChangesDrawingsObjectNoId; + AscDFH.changesFactory[AscDFH.historyitem_DataLabels_SetSpPr] = window['AscDFH'].CChangesDrawingsObjectNoId; + AscDFH.changesFactory[AscDFH.historyitem_DataLabels_SetTxPr] = window['AscDFH'].CChangesDrawingsObjectNoId; + AscDFH.changesFactory[AscDFH.historyitem_DataLabels_SetVisibility] = window['AscDFH'].CChangesDrawingsObjectNoId; AscDFH.changesFactory[AscDFH.historyitem_DataLabels_SetSeparator] = window['AscDFH'].CChangesDrawingsString; - AscDFH.changesFactory[AscDFH.historyitem_DataLabels_SetDataLabel] = window['AscDFH'].CChangesDrawingsString; - AscDFH.changesFactory[AscDFH.historyitem_DataLabels_SetDataLabelHidden] = window['AscDFH'].CChangesDrawingsString; - AscDFH.changesFactory[AscDFH.historyitem_DataLabels_SetExtLst] = window['AscDFH'].CChangesDrawingsString; - AscDFH.changesFactory[AscDFH.historyitem_DataLabels_SetPos] = window['AscDFH'].CChangesDrawingsString; + AscDFH.changesFactory[AscDFH.historyitem_DataLabels_SetDataLabel] = window['AscDFH'].CChangesDrawingsObjectNoId; + AscDFH.changesFactory[AscDFH.historyitem_DataLabels_SetDataLabelHidden] = window['AscDFH'].CChangesDrawingsObjectNoId; + AscDFH.changesFactory[AscDFH.historyitem_DataLabels_SetExtLst] = window['AscDFH'].CChangesDrawingsObjectNoId; + AscDFH.changesFactory[AscDFH.historyitem_DataLabels_SetPos] = window['AscDFH'].CChangesDrawingsObjectNoId; function CDataLabels() { CBaseChartObject.call(this); this.numFmt = null; @@ -1009,8 +1028,8 @@ this.txPr = null; this.visibility = null; this.separator = null; - this.dataLabel = null; - this.dataLabelHidden = null; + this.dataLabel = []; + this.dataLabelHidden = []; this.extLst = null; this.pos = null; } @@ -1018,19 +1037,19 @@ InitClass(CDataLabels, CBaseChartObject, AscDFH.historyitem_type_DataLabels); CDataLabels.prototype.setNumFmt = function(pr) { - History.CanAddChanges() && History.Add(new CChangesDrawingsString(this, AscDFH.historyitem_DataLabels_SetNumFmt, this.numFmt, pr)); + History.CanAddChanges() && History.Add(new CChangesDrawingsObjectNoId(this, AscDFH.historyitem_DataLabels_SetNumFmt, this.numFmt, pr)); this.numFmt = pr; }; CDataLabels.prototype.setSpPr = function(pr) { - History.CanAddChanges() && History.Add(new CChangesDrawingsString(this, AscDFH.historyitem_DataLabels_SetSpPr, this.spPr, pr)); + History.CanAddChanges() && History.Add(new CChangesDrawingsObjectNoId(this, AscDFH.historyitem_DataLabels_SetSpPr, this.spPr, pr)); this.spPr = pr; }; CDataLabels.prototype.setTxPr = function(pr) { - History.CanAddChanges() && History.Add(new CChangesDrawingsString(this, AscDFH.historyitem_DataLabels_SetTxPr, this.txPr, pr)); + History.CanAddChanges() && History.Add(new CChangesDrawingsObjectNoId(this, AscDFH.historyitem_DataLabels_SetTxPr, this.txPr, pr)); this.txPr = pr; }; CDataLabels.prototype.setVisibility = function(pr) { - History.CanAddChanges() && History.Add(new CChangesDrawingsString(this, AscDFH.historyitem_DataLabels_SetVisibility, this.visibility, pr)); + History.CanAddChanges() && History.Add(new CChangesDrawingsObjectNoId(this, AscDFH.historyitem_DataLabels_SetVisibility, this.visibility, pr)); this.visibility = pr; }; CDataLabels.prototype.setSeparator = function(pr) { @@ -1038,19 +1057,19 @@ this.separator = pr; }; CDataLabels.prototype.setDataLabel = function(pr) { - History.CanAddChanges() && History.Add(new CChangesDrawingsString(this, AscDFH.historyitem_DataLabels_SetDataLabel, this.dataLabel, pr)); + History.CanAddChanges() && History.Add(new CChangesDrawingsObjectNoId(this, AscDFH.historyitem_DataLabels_SetDataLabel, this.dataLabel, pr)); this.dataLabel = pr; }; CDataLabels.prototype.setDataLabelHidden = function(pr) { - History.CanAddChanges() && History.Add(new CChangesDrawingsString(this, AscDFH.historyitem_DataLabels_SetDataLabelHidden, this.dataLabelHidden, pr)); + History.CanAddChanges() && History.Add(new CChangesDrawingsObjectNoId(this, AscDFH.historyitem_DataLabels_SetDataLabelHidden, this.dataLabelHidden, pr)); this.dataLabelHidden = pr; }; CDataLabels.prototype.setExtLst = function(pr) { - History.CanAddChanges() && History.Add(new CChangesDrawingsString(this, AscDFH.historyitem_DataLabels_SetExtLst, this.extLst, pr)); + History.CanAddChanges() && History.Add(new CChangesDrawingsObjectNoId(this, AscDFH.historyitem_DataLabels_SetExtLst, this.extLst, pr)); this.extLst = pr; }; CDataLabels.prototype.setPos = function(pr) { - History.CanAddChanges() && History.Add(new CChangesDrawingsString(this, AscDFH.historyitem_DataLabels_SetPos, this.pos, pr)); + History.CanAddChanges() && History.Add(new CChangesDrawingsObjectNoId(this, AscDFH.historyitem_DataLabels_SetPos, this.pos, pr)); this.pos = pr; }; window['AscFormat'].CDataLabels = CDataLabels; @@ -1065,9 +1084,9 @@ drawingsChangesMap[AscDFH.historyitem_DataLabelVisibilities_SetValue] = function(oClass, value) { oClass.value = value; }; - AscDFH.changesFactory[AscDFH.historyitem_DataLabelVisibilities_SetSeriesName] = window['AscDFH'].CChangesDrawingsString; - AscDFH.changesFactory[AscDFH.historyitem_DataLabelVisibilities_SetCategoryName] = window['AscDFH'].CChangesDrawingsString; - AscDFH.changesFactory[AscDFH.historyitem_DataLabelVisibilities_SetValue] = window['AscDFH'].CChangesDrawingsString; + AscDFH.changesFactory[AscDFH.historyitem_DataLabelVisibilities_SetSeriesName] = window['AscDFH'].CChangesDrawingsBool; + AscDFH.changesFactory[AscDFH.historyitem_DataLabelVisibilities_SetCategoryName] = window['AscDFH'].CChangesDrawingsBool; + AscDFH.changesFactory[AscDFH.historyitem_DataLabelVisibilities_SetValue] = window['AscDFH'].CChangesDrawingsBool; function CDataLabelVisibilities() { CBaseChartObject.call(this); this.seriesName = null; @@ -1078,15 +1097,15 @@ InitClass(CDataLabelVisibilities, CBaseChartObject, AscDFH.historyitem_type_DataLabelVisibilities); CDataLabelVisibilities.prototype.setSeriesName = function(pr) { - History.CanAddChanges() && History.Add(new CChangesDrawingsString(this, AscDFH.historyitem_DataLabelVisibilities_SetSeriesName, this.seriesName, pr)); + History.CanAddChanges() && History.Add(new CChangesDrawingsBool(this, AscDFH.historyitem_DataLabelVisibilities_SetSeriesName, this.seriesName, pr)); this.seriesName = pr; }; CDataLabelVisibilities.prototype.setCategoryName = function(pr) { - History.CanAddChanges() && History.Add(new CChangesDrawingsString(this, AscDFH.historyitem_DataLabelVisibilities_SetCategoryName, this.categoryName, pr)); + History.CanAddChanges() && History.Add(new CChangesDrawingsBool(this, AscDFH.historyitem_DataLabelVisibilities_SetCategoryName, this.categoryName, pr)); this.categoryName = pr; }; CDataLabelVisibilities.prototype.setValue = function(pr) { - History.CanAddChanges() && History.Add(new CChangesDrawingsString(this, AscDFH.historyitem_DataLabelVisibilities_SetValue, this.value, pr)); + History.CanAddChanges() && History.Add(new CChangesDrawingsBool(this, AscDFH.historyitem_DataLabelVisibilities_SetValue, this.value, pr)); this.value = pr; }; window['AscFormat'].CDataLabelVisibilities = CDataLabelVisibilities; @@ -1101,9 +1120,9 @@ drawingsChangesMap[AscDFH.historyitem_DataPoint_SetIdx] = function(oClass, value) { oClass.idx = value; }; - AscDFH.changesFactory[AscDFH.historyitem_DataPoint_SetSpPr] = window['AscDFH'].CChangesDrawingsString; - AscDFH.changesFactory[AscDFH.historyitem_DataPoint_SetExtLst] = window['AscDFH'].CChangesDrawingsString; - AscDFH.changesFactory[AscDFH.historyitem_DataPoint_SetIdx] = window['AscDFH'].CChangesDrawingsString; + AscDFH.changesFactory[AscDFH.historyitem_DataPoint_SetSpPr] = window['AscDFH'].CChangesDrawingsObjectNoId; + AscDFH.changesFactory[AscDFH.historyitem_DataPoint_SetExtLst] = window['AscDFH'].CChangesDrawingsObjectNoId; + AscDFH.changesFactory[AscDFH.historyitem_DataPoint_SetIdx] = window['AscDFH'].CChangesDrawingsLong; function CDataPoint() { CBaseChartObject.call(this); this.spPr = null; @@ -1114,36 +1133,36 @@ InitClass(CDataPoint, CBaseChartObject, AscDFH.historyitem_type_DataPoint); CDataPoint.prototype.setSpPr = function(pr) { - History.CanAddChanges() && History.Add(new CChangesDrawingsString(this, AscDFH.historyitem_DataPoint_SetSpPr, this.spPr, pr)); + History.CanAddChanges() && History.Add(new CChangesDrawingsObjectNoId(this, AscDFH.historyitem_DataPoint_SetSpPr, this.spPr, pr)); this.spPr = pr; }; CDataPoint.prototype.setExtLst = function(pr) { - History.CanAddChanges() && History.Add(new CChangesDrawingsString(this, AscDFH.historyitem_DataPoint_SetExtLst, this.extLst, pr)); + History.CanAddChanges() && History.Add(new CChangesDrawingsObjectNoId(this, AscDFH.historyitem_DataPoint_SetExtLst, this.extLst, pr)); this.extLst = pr; }; CDataPoint.prototype.setIdx = function(pr) { - History.CanAddChanges() && History.Add(new CChangesDrawingsString(this, AscDFH.historyitem_DataPoint_SetIdx, this.idx, pr)); + History.CanAddChanges() && History.Add(new CChangesDrawingsLong(this, AscDFH.historyitem_DataPoint_SetIdx, this.idx, pr)); this.idx = pr; }; window['AscFormat'].CDataPoint = CDataPoint; - // Extension - drawingsChangesMap[AscDFH.historyitem_Extension_SetUri] = function(oClass, value) { - oClass.uri = value; - }; - AscDFH.changesFactory[AscDFH.historyitem_Extension_SetUri] = window['AscDFH'].CChangesDrawingsString; - function CExtension() { - CBaseChartObject.call(this); - this.uri = null; - } + // // Extension (Extensionlist is unused in ChartSerializeEx.h) + // drawingsChangesMap[AscDFH.historyitem_Extension_SetUri] = function(oClass, value) { + // oClass.uri = value; + // }; + // AscDFH.changesFactory[AscDFH.historyitem_Extension_SetUri] = window['AscDFH'].CChangesDrawingsString; + // function CExtension() { + // CBaseChartObject.call(this); + // this.uri = null; + // } - InitClass(CExtension, CBaseChartObject, AscDFH.historyitem_type_Extension); + // InitClass(CExtension, CBaseChartObject, AscDFH.historyitem_type_Extension); - CExtension.prototype.setUri = function(pr) { - History.CanAddChanges() && History.Add(new CChangesDrawingsString(this, AscDFH.historyitem_Extension_SetUri, this.uri, pr)); - this.uri = pr; - }; - window['AscFormat'].CExtension = CExtension; + // CExtension.prototype.setUri = function(pr) { + // History.CanAddChanges() && History.Add(new CChangesDrawingsString(this, AscDFH.historyitem_Extension_SetUri, this.uri, pr)); + // this.uri = pr; + // }; + // window['AscFormat'].CExtension = CExtension; // // ExtensionList (OOX::Drawing::COfficeArtExtensionList instead of CExtensionList) // drawingsChangesMap[AscDFH.historyitem_ExtensionList_SetExt] = function(oClass, value) { @@ -1164,33 +1183,33 @@ // window['AscFormat'].CExtensionList = CExtensionList; // ExternalData - drawingsChangesMap[AscDFH.historyitem_ExternalData_SetR] = function(oClass, value) { - oClass.r = value; + drawingsChangesMap[AscDFH.historyitem_ExternalData_SetId] = function(oClass, value) { + oClass.id = value; }; drawingsChangesMap[AscDFH.historyitem_ExternalData_SetAutoUpdate] = function(oClass, value) { oClass.autoUpdate = value; }; - AscDFH.changesFactory[AscDFH.historyitem_ExternalData_SetR] = window['AscDFH'].CChangesDrawingsString; - AscDFH.changesFactory[AscDFH.historyitem_ExternalData_SetAutoUpdate] = window['AscDFH'].CChangesDrawingsString; + AscDFH.changesFactory[AscDFH.historyitem_ExternalData_SetId] = window['AscDFH'].CChangesDrawingsString; + AscDFH.changesFactory[AscDFH.historyitem_ExternalData_SetAutoUpdate] = window['AscDFH'].CChangesDrawingsBool; function CExternalData() { CBaseChartObject.call(this); - this.r = null; + this.id = null; this.autoUpdate = null; } InitClass(CExternalData, CBaseChartObject, AscDFH.historyitem_type_ExternalData); - CExternalData.prototype.setR = function(pr) { - History.CanAddChanges() && History.Add(new CChangesDrawingsString(this, AscDFH.historyitem_ExternalData_SetR, this.r, pr)); - this.r = pr; + CExternalData.prototype.setId = function(pr) { + History.CanAddChanges() && History.Add(new CChangesDrawingsString(this, AscDFH.historyitem_ExternalData_SetId, this.id, pr)); + this.id = pr; }; CExternalData.prototype.setAutoUpdate = function(pr) { - History.CanAddChanges() && History.Add(new CChangesDrawingsString(this, AscDFH.historyitem_ExternalData_SetAutoUpdate, this.autoUpdate, pr)); + History.CanAddChanges() && History.Add(new CChangesDrawingsBool(this, AscDFH.historyitem_ExternalData_SetAutoUpdate, this.autoUpdate, pr)); this.autoUpdate = pr; }; window['AscFormat'].CExternalData = CExternalData; - // FormatOverride + // FormatOverride (no in ChartSerializeEx.h) drawingsChangesMap[AscDFH.historyitem_FormatOverride_SetSpPr] = function(oClass, value) { oClass.spPr = value; }; @@ -1200,9 +1219,9 @@ drawingsChangesMap[AscDFH.historyitem_FormatOverride_SetIdx] = function(oClass, value) { oClass.idx = value; }; - AscDFH.changesFactory[AscDFH.historyitem_FormatOverride_SetSpPr] = window['AscDFH'].CChangesDrawingsString; - AscDFH.changesFactory[AscDFH.historyitem_FormatOverride_SetExtLst] = window['AscDFH'].CChangesDrawingsString; - AscDFH.changesFactory[AscDFH.historyitem_FormatOverride_SetIdx] = window['AscDFH'].CChangesDrawingsString; + AscDFH.changesFactory[AscDFH.historyitem_FormatOverride_SetSpPr] = window['AscDFH'].CChangesDrawingsObjectNoId; + AscDFH.changesFactory[AscDFH.historyitem_FormatOverride_SetExtLst] = window['AscDFH'].CChangesDrawingsObjectNoId; + AscDFH.changesFactory[AscDFH.historyitem_FormatOverride_SetIdx] = window['AscDFH'].CChangesDrawingsLong; function CFormatOverride() { CBaseChartObject.call(this); this.spPr = null; @@ -1213,24 +1232,24 @@ InitClass(CFormatOverride, CBaseChartObject, AscDFH.historyitem_type_FormatOverride); CFormatOverride.prototype.setSpPr = function(pr) { - History.CanAddChanges() && History.Add(new CChangesDrawingsString(this, AscDFH.historyitem_FormatOverride_SetSpPr, this.spPr, pr)); + History.CanAddChanges() && History.Add(new CChangesDrawingsObjectNoId(this, AscDFH.historyitem_FormatOverride_SetSpPr, this.spPr, pr)); this.spPr = pr; }; CFormatOverride.prototype.setExtLst = function(pr) { - History.CanAddChanges() && History.Add(new CChangesDrawingsString(this, AscDFH.historyitem_FormatOverride_SetExtLst, this.extLst, pr)); + History.CanAddChanges() && History.Add(new CChangesDrawingsObjectNoId(this, AscDFH.historyitem_FormatOverride_SetExtLst, this.extLst, pr)); this.extLst = pr; }; CFormatOverride.prototype.setIdx = function(pr) { - History.CanAddChanges() && History.Add(new CChangesDrawingsString(this, AscDFH.historyitem_FormatOverride_SetIdx, this.idx, pr)); + History.CanAddChanges() && History.Add(new CChangesDrawingsLong(this, AscDFH.historyitem_FormatOverride_SetIdx, this.idx, pr)); this.idx = pr; }; window['AscFormat'].CFormatOverride = CFormatOverride; - // FormatOverrides + // FormatOverrides (no in ChartSerializeEx.h) drawingsChangesMap[AscDFH.historyitem_FormatOverrides_SetFmtOvr] = function(oClass, value) { oClass.fmtOvr = value; }; - AscDFH.changesFactory[AscDFH.historyitem_FormatOverrides_SetFmtOvr] = window['AscDFH'].CChangesDrawingsString; + AscDFH.changesFactory[AscDFH.historyitem_FormatOverrides_SetFmtOvr] = window['AscDFH'].CChangesDrawingsObjectNoId; function CFormatOverrides() { CBaseChartObject.call(this); this.fmtOvr = null; @@ -1239,7 +1258,7 @@ InitClass(CFormatOverrides, CBaseChartObject, AscDFH.historyitem_type_FormatOverrides); CFormatOverrides.prototype.setFmtOvr = function(pr) { - History.CanAddChanges() && History.Add(new CChangesDrawingsString(this, AscDFH.historyitem_FormatOverrides_SetFmtOvr, this.fmtOvr, pr)); + History.CanAddChanges() && History.Add(new CChangesDrawingsObjectNoId(this, AscDFH.historyitem_FormatOverrides_SetFmtOvr, this.fmtOvr, pr)); this.fmtOvr = pr; }; window['AscFormat'].CFormatOverrides = CFormatOverrides; @@ -1248,7 +1267,7 @@ drawingsChangesMap[AscDFH.historyitem_Formula_SetDir] = function(oClass, value) { oClass.dir = value; }; - AscDFH.changesFactory[AscDFH.historyitem_Formula_SetDir] = window['AscDFH'].CChangesDrawingsString; + AscDFH.changesFactory[AscDFH.historyitem_Formula_SetDir] = window['AscDFH'].CChangesDrawingsObjectNoId; function CFormula() { CBaseChartObject.call(this); this.dir = null; @@ -1257,7 +1276,7 @@ InitClass(CFormula, CBaseChartObject, AscDFH.historyitem_type_Formula); CFormula.prototype.setDir = function(pr) { - History.CanAddChanges() && History.Add(new CChangesDrawingsString(this, AscDFH.historyitem_Formula_SetDir, this.dir, pr)); + History.CanAddChanges() && History.Add(new CChangesDrawingsObjectNoId(this, AscDFH.historyitem_Formula_SetDir, this.dir, pr)); this.dir = pr; }; window['AscFormat'].CFormula = CFormula; @@ -1998,24 +2017,33 @@ drawingsChangesMap[AscDFH.historyitem_Gridlines_SetExtLst] = function(oClass, value) { oClass.extLst = value; }; - AscDFH.changesFactory[AscDFH.historyitem_Gridlines_SetSpPr] = window['AscDFH'].CChangesDrawingsString; - AscDFH.changesFactory[AscDFH.historyitem_Gridlines_SetExtLst] = window['AscDFH'].CChangesDrawingsString; + drawingsChangesMap[AscDFH.historyitem_Gridlines_SetName] = function(oClass, value) { + oClass.name = value; + }; + AscDFH.changesFactory[AscDFH.historyitem_Gridlines_SetSpPr] = window['AscDFH'].CChangesDrawingsObjectNoId; + AscDFH.changesFactory[AscDFH.historyitem_Gridlines_SetExtLst] = window['AscDFH'].CChangesDrawingsObjectNoId; + AscDFH.changesFactory[AscDFH.historyitem_Gridlines_SetName] = window['AscDFH'].CChangesDrawingsString; function CGridlines() { CBaseChartObject.call(this); this.spPr = null; this.extLst = null; + this.name = null; } InitClass(CGridlines, CBaseChartObject, AscDFH.historyitem_type_Gridlines); CGridlines.prototype.setSpPr = function(pr) { - History.CanAddChanges() && History.Add(new CChangesDrawingsString(this, AscDFH.historyitem_Gridlines_SetSpPr, this.spPr, pr)); + History.CanAddChanges() && History.Add(new CChangesDrawingsObjectNoId(this, AscDFH.historyitem_Gridlines_SetSpPr, this.spPr, pr)); this.spPr = pr; }; CGridlines.prototype.setExtLst = function(pr) { - History.CanAddChanges() && History.Add(new CChangesDrawingsString(this, AscDFH.historyitem_Gridlines_SetExtLst, this.extLst, pr)); + History.CanAddChanges() && History.Add(new CChangesDrawingsObjectNoId(this, AscDFH.historyitem_Gridlines_SetExtLst, this.extLst, pr)); this.extLst = pr; }; + CGridlines.prototype.setName = function(pr) { + History.CanAddChanges() && History.Add(new CChangesDrawingsString(this, AscDFH.historyitem_Gridlines_SetName, this.name, pr)); + this.name = pr; + }; window['AscFormat'].CGridlines = CGridlines; // HeaderFooter @@ -2146,27 +2174,27 @@ InitClass(CLegend, CBaseChartObject, AscDFH.historyitem_type_Legend); CLegend.prototype.setSpPr = function(pr) { - History.CanAddChanges() && History.Add(new CChangesDrawingsString(this, AscDFH.historyitem_Legend_SetSpPr, this.spPr, pr)); + History.CanAddChanges() && History.Add(new CChangesDrawingsObjectNoId(this, AscDFH.historyitem_Legend_SetSpPr, this.spPr, pr)); this.spPr = pr; }; CLegend.prototype.setTxPr = function(pr) { - History.CanAddChanges() && History.Add(new CChangesDrawingsString(this, AscDFH.historyitem_Legend_SetTxPr, this.txPr, pr)); + History.CanAddChanges() && History.Add(new CChangesDrawingsObjectNoId(this, AscDFH.historyitem_Legend_SetTxPr, this.txPr, pr)); this.txPr = pr; }; CLegend.prototype.setExtLst = function(pr) { - History.CanAddChanges() && History.Add(new CChangesDrawingsString(this, AscDFH.historyitem_Legend_SetExtLst, this.extLst, pr)); + History.CanAddChanges() && History.Add(new CChangesDrawingsObjectNoId(this, AscDFH.historyitem_Legend_SetExtLst, this.extLst, pr)); this.extLst = pr; }; CLegend.prototype.setPos = function(pr) { - History.CanAddChanges() && History.Add(new CChangesDrawingsString(this, AscDFH.historyitem_Legend_SetPos, this.pos, pr)); + History.CanAddChanges() && History.Add(new CChangesDrawingsObjectNoId(this, AscDFH.historyitem_Legend_SetPos, this.pos, pr)); this.pos = pr; }; CLegend.prototype.setAlign = function(pr) { - History.CanAddChanges() && History.Add(new CChangesDrawingsString(this, AscDFH.historyitem_Legend_SetAlign, this.align, pr)); + History.CanAddChanges() && History.Add(new CChangesDrawingsObjectNoId(this, AscDFH.historyitem_Legend_SetAlign, this.align, pr)); this.align = pr; }; CLegend.prototype.setOverlay = function(pr) { - History.CanAddChanges() && History.Add(new CChangesDrawingsString(this, AscDFH.historyitem_Legend_SetOverlay, this.overlay, pr)); + History.CanAddChanges() && History.Add(new CChangesDrawingsBool(this, AscDFH.historyitem_Legend_SetOverlay, this.overlay, pr)); this.overlay = pr; }; window['AscFormat'].CLegend = CLegend; @@ -2197,7 +2225,7 @@ oClass.sourceLinked = value; }; AscDFH.changesFactory[AscDFH.historyitem_NumberFormat_SetFormatCode] = window['AscDFH'].CChangesDrawingsString; - AscDFH.changesFactory[AscDFH.historyitem_NumberFormat_SetSourceLinked] = window['AscDFH'].CChangesDrawingsString; + AscDFH.changesFactory[AscDFH.historyitem_NumberFormat_SetSourceLinked] = window['AscDFH'].CChangesDrawingsBool; function CNumberFormat() { CBaseChartObject.call(this); this.formatCode = null; @@ -2211,53 +2239,26 @@ this.formatCode = pr; }; CNumberFormat.prototype.setSourceLinked = function(pr) { - History.CanAddChanges() && History.Add(new CChangesDrawingsString(this, AscDFH.historyitem_NumberFormat_SetSourceLinked, this.sourceLinked, pr)); + History.CanAddChanges() && History.Add(new CChangesDrawingsBool(this, AscDFH.historyitem_NumberFormat_SetSourceLinked, this.sourceLinked, pr)); this.sourceLinked = pr; }; window['AscFormat'].CNumberFormat = CNumberFormat; // NumericDimension - drawingsChangesMap[AscDFH.historyitem_NumericDimension_SetF] = function(oClass, value) { - oClass.f = value; + drawingsChangesMap[AscDFH.historyitem_NumericDimension_SetLevelData] = function(oClass, value) { + oClass.levelData = value; }; - drawingsChangesMap[AscDFH.historyitem_NumericDimension_SetNf] = function(oClass, value) { - oClass.nf = value; - }; - drawingsChangesMap[AscDFH.historyitem_NumericDimension_SetLvl] = function(oClass, value) { - oClass.lvl = value; - }; - drawingsChangesMap[AscDFH.historyitem_NumericDimension_SetType] = function(oClass, value) { - oClass.type = value; - }; - AscDFH.changesFactory[AscDFH.historyitem_NumericDimension_SetF] = window['AscDFH'].CChangesDrawingsString; - AscDFH.changesFactory[AscDFH.historyitem_NumericDimension_SetNf] = window['AscDFH'].CChangesDrawingsString; - AscDFH.changesFactory[AscDFH.historyitem_NumericDimension_SetLvl] = window['AscDFH'].CChangesDrawingsString; - AscDFH.changesFactory[AscDFH.historyitem_NumericDimension_SetType] = window['AscDFH'].CChangesDrawingsString; + AscDFH.changesFactory[AscDFH.historyitem_NumericDimension_SetLevelData] = window['AscDFH'].CChangesDrawingsObjectNoId; function CNumericDimension() { CBaseChartObject.call(this); - this.f = null; - this.nf = null; - this.lvl = null; - this.type = null; + this.levelData = []; } - InitClass(CNumericDimension, CBaseChartObject, AscDFH.historyitem_type_NumericDimension); + InitClass(CNumericDimension, CDimension, AscDFH.historyitem_type_NumericDimension); - CNumericDimension.prototype.setF = function(pr) { - History.CanAddChanges() && History.Add(new CChangesDrawingsString(this, AscDFH.historyitem_NumericDimension_SetF, this.f, pr)); - this.f = pr; - }; - CNumericDimension.prototype.setNf = function(pr) { - History.CanAddChanges() && History.Add(new CChangesDrawingsString(this, AscDFH.historyitem_NumericDimension_SetNf, this.nf, pr)); - this.nf = pr; - }; - CNumericDimension.prototype.setLvl = function(pr) { - History.CanAddChanges() && History.Add(new CChangesDrawingsString(this, AscDFH.historyitem_NumericDimension_SetLvl, this.lvl, pr)); - this.lvl = pr; - }; - CNumericDimension.prototype.setType = function(pr) { - History.CanAddChanges() && History.Add(new CChangesDrawingsString(this, AscDFH.historyitem_NumericDimension_SetType, this.type, pr)); - this.type = pr; + CNumericDimension.prototype.setLevelData = function(pr) { + History.CanAddChanges() && History.Add(new CChangesDrawingsObjectNoId(this, AscDFH.historyitem_NumericDimension_SetLevelData, this.levelData, pr)); + this.levelData = pr; }; window['AscFormat'].CNumericDimension = CNumericDimension; @@ -2274,13 +2275,13 @@ drawingsChangesMap[AscDFH.historyitem_NumericLevel_SetName] = function(oClass, value) { oClass.name = value; }; - AscDFH.changesFactory[AscDFH.historyitem_NumericLevel_SetPt] = window['AscDFH'].CChangesDrawingsString; - AscDFH.changesFactory[AscDFH.historyitem_NumericLevel_SetPtCount] = window['AscDFH'].CChangesDrawingsString; + AscDFH.changesFactory[AscDFH.historyitem_NumericLevel_SetPt] = window['AscDFH'].CChangesDrawingsObjectNoId; + AscDFH.changesFactory[AscDFH.historyitem_NumericLevel_SetPtCount] = window['AscDFH'].CChangesDrawingsLong; AscDFH.changesFactory[AscDFH.historyitem_NumericLevel_SetFormatCode] = window['AscDFH'].CChangesDrawingsString; AscDFH.changesFactory[AscDFH.historyitem_NumericLevel_SetName] = window['AscDFH'].CChangesDrawingsString; function CNumericLevel() { CBaseChartObject.call(this); - this.pt = null; + this.pt = []; this.ptCount = null; this.formatCode = null; this.name = null; @@ -2289,11 +2290,11 @@ InitClass(CNumericLevel, CBaseChartObject, AscDFH.historyitem_type_NumericLevel); CNumericLevel.prototype.setPt = function(pr) { - History.CanAddChanges() && History.Add(new CChangesDrawingsString(this, AscDFH.historyitem_NumericLevel_SetPt, this.pt, pr)); + History.CanAddChanges() && History.Add(new CChangesDrawingsObjectNoId(this, AscDFH.historyitem_NumericLevel_SetPt, this.pt, pr)); this.pt = pr; }; CNumericLevel.prototype.setPtCount = function(pr) { - History.CanAddChanges() && History.Add(new CChangesDrawingsString(this, AscDFH.historyitem_NumericLevel_SetPtCount, this.ptCount, pr)); + History.CanAddChanges() && History.Add(new CChangesDrawingsLong(this, AscDFH.historyitem_NumericLevel_SetPtCount, this.ptCount, pr)); this.ptCount = pr; }; CNumericLevel.prototype.setFormatCode = function(pr) { @@ -2310,18 +2311,27 @@ drawingsChangesMap[AscDFH.historyitem_NumericValue_SetIdx] = function(oClass, value) { oClass.idx = value; }; - AscDFH.changesFactory[AscDFH.historyitem_NumericValue_SetIdx] = window['AscDFH'].CChangesDrawingsString; + drawingsChangesMap[AscDFH.historyitem_NumericValue_SetContent] = function(oClass, value) { + oClass.content = value; + }; + AscDFH.changesFactory[AscDFH.historyitem_NumericValue_SetIdx] = window['AscDFH'].CChangesDrawingsLong; + AscDFH.changesFactory[AscDFH.historyitem_NumericValue_SetContent] = window['AscDFH'].CChangesDrawingsDouble2; function CNumericValue() { CBaseChartObject.call(this); this.idx = null; + this.content = null; } InitClass(CNumericValue, CBaseChartObject, AscDFH.historyitem_type_NumericValue); CNumericValue.prototype.setIdx = function(pr) { - History.CanAddChanges() && History.Add(new CChangesDrawingsString(this, AscDFH.historyitem_NumericValue_SetIdx, this.idx, pr)); + History.CanAddChanges() && History.Add(new CChangesDrawingsLong(this, AscDFH.historyitem_NumericValue_SetIdx, this.idx, pr)); this.idx = pr; }; + CNumericValue.prototype.setContent = function(pr) { + History.CanAddChanges() && History.Add(new CChangesDrawingsDouble2(this, AscDFH.historyitem_NumericValue_SetContent, this.content, pr)); + this.content = pr; + }; window['AscFormat'].CNumericValue = CNumericValue; // PageMargins @@ -2526,14 +2536,14 @@ drawingsChangesMap[AscDFH.historyitem_PlotArea_SetExtLst] = function(oClass, value) { oClass.extLst = value; }; - AscDFH.changesFactory[AscDFH.historyitem_PlotArea_SetPlotAreaRegion] = window['AscDFH'].CChangesDrawingsString; - AscDFH.changesFactory[AscDFH.historyitem_PlotArea_SetAxis] = window['AscDFH'].CChangesDrawingsString; - AscDFH.changesFactory[AscDFH.historyitem_PlotArea_SetSpPr] = window['AscDFH'].CChangesDrawingsString; - AscDFH.changesFactory[AscDFH.historyitem_PlotArea_SetExtLst] = window['AscDFH'].CChangesDrawingsString; + AscDFH.changesFactory[AscDFH.historyitem_PlotArea_SetPlotAreaRegion] = window['AscDFH'].CChangesDrawingsObjectNoId; + AscDFH.changesFactory[AscDFH.historyitem_PlotArea_SetAxis] = window['AscDFH'].CChangesDrawingsObjectNoId; + AscDFH.changesFactory[AscDFH.historyitem_PlotArea_SetSpPr] = window['AscDFH'].CChangesDrawingsObjectNoId; + AscDFH.changesFactory[AscDFH.historyitem_PlotArea_SetExtLst] = window['AscDFH'].CChangesDrawingsObjectNoId; function CPlotArea() { CBaseChartObject.call(this); this.plotAreaRegion = null; - this.axis = null; + this.axis = []; this.spPr = null; this.extLst = null; } @@ -2541,19 +2551,19 @@ InitClass(CPlotArea, CBaseChartObject, AscDFH.historyitem_type_PlotArea); CPlotArea.prototype.setPlotAreaRegion = function(pr) { - History.CanAddChanges() && History.Add(new CChangesDrawingsString(this, AscDFH.historyitem_PlotArea_SetPlotAreaRegion, this.plotAreaRegion, pr)); + History.CanAddChanges() && History.Add(new CChangesDrawingsObjectNoId(this, AscDFH.historyitem_PlotArea_SetPlotAreaRegion, this.plotAreaRegion, pr)); this.plotAreaRegion = pr; }; CPlotArea.prototype.setAxis = function(pr) { - History.CanAddChanges() && History.Add(new CChangesDrawingsObject(this, AscDFH.historyitem_PlotArea_SetAxis, this.axis, pr)); + History.CanAddChanges() && History.Add(new CChangesDrawingsObjectNoId(this, AscDFH.historyitem_PlotArea_SetAxis, this.axis, pr)); this.axis = pr; }; CPlotArea.prototype.setSpPr = function(pr) { - History.CanAddChanges() && History.Add(new CChangesDrawingsString(this, AscDFH.historyitem_PlotArea_SetSpPr, this.spPr, pr)); + History.CanAddChanges() && History.Add(new CChangesDrawingsObjectNoId(this, AscDFH.historyitem_PlotArea_SetSpPr, this.spPr, pr)); this.spPr = pr; }; CPlotArea.prototype.setExtLst = function(pr) { - History.CanAddChanges() && History.Add(new CChangesDrawingsString(this, AscDFH.historyitem_PlotArea_SetExtLst, this.extLst, pr)); + History.CanAddChanges() && History.Add(new CChangesDrawingsObjectNoId(this, AscDFH.historyitem_PlotArea_SetExtLst, this.extLst, pr)); this.extLst = pr; }; window['AscFormat'].CPlotArea = CPlotArea; @@ -2568,28 +2578,28 @@ drawingsChangesMap[AscDFH.historyitem_PlotAreaRegion_SetExtLst] = function(oClass, value) { oClass.extLst = value; }; - AscDFH.changesFactory[AscDFH.historyitem_PlotAreaRegion_SetPlotSurface] = window['AscDFH'].CChangesDrawingsString; - AscDFH.changesFactory[AscDFH.historyitem_PlotAreaRegion_SetSeries] = window['AscDFH'].CChangesDrawingsString; - AscDFH.changesFactory[AscDFH.historyitem_PlotAreaRegion_SetExtLst] = window['AscDFH'].CChangesDrawingsString; + AscDFH.changesFactory[AscDFH.historyitem_PlotAreaRegion_SetPlotSurface] = window['AscDFH'].CChangesDrawingsObjectNoId; + AscDFH.changesFactory[AscDFH.historyitem_PlotAreaRegion_SetSeries] = window['AscDFH'].CChangesDrawingsObjectNoId; + AscDFH.changesFactory[AscDFH.historyitem_PlotAreaRegion_SetExtLst] = window['AscDFH'].CChangesDrawingsObjectNoId; function CPlotAreaRegion() { CBaseChartObject.call(this); this.plotSurface = null; - this.series = null; + this.series = []; this.extLst = null; } InitClass(CPlotAreaRegion, CBaseChartObject, AscDFH.historyitem_type_PlotAreaRegion); CPlotAreaRegion.prototype.setPlotSurface = function(pr) { - History.CanAddChanges() && History.Add(new CChangesDrawingsString(this, AscDFH.historyitem_PlotAreaRegion_SetPlotSurface, this.plotSurface, pr)); + History.CanAddChanges() && History.Add(new CChangesDrawingsObjectNoId(this, AscDFH.historyitem_PlotAreaRegion_SetPlotSurface, this.plotSurface, pr)); this.plotSurface = pr; }; CPlotAreaRegion.prototype.setSeries = function(pr) { - History.CanAddChanges() && History.Add(new CChangesDrawingsString(this, AscDFH.historyitem_PlotAreaRegion_SetSeries, this.series, pr)); + History.CanAddChanges() && History.Add(new CChangesDrawingsObjectNoId(this, AscDFH.historyitem_PlotAreaRegion_SetSeries, this.series, pr)); this.series = pr; }; CPlotAreaRegion.prototype.setExtLst = function(pr) { - History.CanAddChanges() && History.Add(new CChangesDrawingsString(this, AscDFH.historyitem_PlotAreaRegion_SetExtLst, this.extLst, pr)); + History.CanAddChanges() && History.Add(new CChangesDrawingsObjectNoId(this, AscDFH.historyitem_PlotAreaRegion_SetExtLst, this.extLst, pr)); this.extLst = pr; }; window['AscFormat'].CPlotAreaRegion = CPlotAreaRegion; @@ -2601,8 +2611,8 @@ drawingsChangesMap[AscDFH.historyitem_PlotSurface_SetExtLst] = function(oClass, value) { oClass.extLst = value; }; - AscDFH.changesFactory[AscDFH.historyitem_PlotSurface_SetSpPr] = window['AscDFH'].CChangesDrawingsString; - AscDFH.changesFactory[AscDFH.historyitem_PlotSurface_SetExtLst] = window['AscDFH'].CChangesDrawingsString; + AscDFH.changesFactory[AscDFH.historyitem_PlotSurface_SetSpPr] = window['AscDFH'].CChangesDrawingsObjectNoId; + AscDFH.changesFactory[AscDFH.historyitem_PlotSurface_SetExtLst] = window['AscDFH'].CChangesDrawingsObjectNoId; function CPlotSurface() { CBaseChartObject.call(this); this.spPr = null; @@ -2612,11 +2622,11 @@ InitClass(CPlotSurface, CBaseChartObject, AscDFH.historyitem_type_PlotSurface); CPlotSurface.prototype.setSpPr = function(pr) { - History.CanAddChanges() && History.Add(new CChangesDrawingsString(this, AscDFH.historyitem_PlotSurface_SetSpPr, this.spPr, pr)); + History.CanAddChanges() && History.Add(new CChangesDrawingsObjectNoId(this, AscDFH.historyitem_PlotSurface_SetSpPr, this.spPr, pr)); this.spPr = pr; }; CPlotSurface.prototype.setExtLst = function(pr) { - History.CanAddChanges() && History.Add(new CChangesDrawingsString(this, AscDFH.historyitem_PlotSurface_SetExtLst, this.extLst, pr)); + History.CanAddChanges() && History.Add(new CChangesDrawingsObjectNoId(this, AscDFH.historyitem_PlotSurface_SetExtLst, this.extLst, pr)); this.extLst = pr; }; window['AscFormat'].CPlotSurface = CPlotSurface; @@ -2700,12 +2710,12 @@ drawingsChangesMap[AscDFH.historyitem_Series_SetSpPr] = function(oClass, value) { oClass.spPr = value; }; - drawingsChangesMap[AscDFH.historyitem_Series_SetValueColors] = function(oClass, value) { - oClass.valueColors = value; - }; - drawingsChangesMap[AscDFH.historyitem_Series_SetValueColorPositions] = function(oClass, value) { - oClass.valueColorPositions = value; - }; + // drawingsChangesMap[AscDFH.historyitem_Series_SetValueColors] = function(oClass, value) { + // oClass.valueColors = value; + // }; + // drawingsChangesMap[AscDFH.historyitem_Series_SetValueColorPositions] = function(oClass, value) { + // oClass.valueColorPositions = value; + // }; drawingsChangesMap[AscDFH.historyitem_Series_SetDataPt] = function(oClass, value) { oClass.dataPt = value; }; @@ -2739,32 +2749,33 @@ drawingsChangesMap[AscDFH.historyitem_Series_SetFormatIdx] = function(oClass, value) { oClass.formatIdx = value; }; - AscDFH.changesFactory[AscDFH.historyitem_Series_SetTx] = window['AscDFH'].CChangesDrawingsString; - AscDFH.changesFactory[AscDFH.historyitem_Series_SetSpPr] = window['AscDFH'].CChangesDrawingsString; - AscDFH.changesFactory[AscDFH.historyitem_Series_SetValueColors] = window['AscDFH'].CChangesDrawingsString; - AscDFH.changesFactory[AscDFH.historyitem_Series_SetValueColorPositions] = window['AscDFH'].CChangesDrawingsString; - AscDFH.changesFactory[AscDFH.historyitem_Series_SetDataPt] = window['AscDFH'].CChangesDrawingsString; - AscDFH.changesFactory[AscDFH.historyitem_Series_SetDataLabels] = window['AscDFH'].CChangesDrawingsString; - AscDFH.changesFactory[AscDFH.historyitem_Series_SetDataId] = window['AscDFH'].CChangesDrawingsString; - AscDFH.changesFactory[AscDFH.historyitem_Series_SetLayoutPr] = window['AscDFH'].CChangesDrawingsString; - AscDFH.changesFactory[AscDFH.historyitem_Series_SetAxisId] = window['AscDFH'].CChangesDrawingsString; - AscDFH.changesFactory[AscDFH.historyitem_Series_SetExtLst] = window['AscDFH'].CChangesDrawingsString; - AscDFH.changesFactory[AscDFH.historyitem_Series_SetLayoutId] = window['AscDFH'].CChangesDrawingsString; - AscDFH.changesFactory[AscDFH.historyitem_Series_SetHidden] = window['AscDFH'].CChangesDrawingsString; - AscDFH.changesFactory[AscDFH.historyitem_Series_SetOwnerIdx] = window['AscDFH'].CChangesDrawingsString; + AscDFH.changesFactory[AscDFH.historyitem_Series_SetTx] = window['AscDFH'].CChangesDrawingsObjectNoId; + AscDFH.changesFactory[AscDFH.historyitem_Series_SetSpPr] = window['AscDFH'].CChangesDrawingsObjectNoId; + // AscDFH.changesFactory[AscDFH.historyitem_Series_SetValueColors] = window['AscDFH'].CChangesDrawingsObjectNoId; + // AscDFH.changesFactory[AscDFH.historyitem_Series_SetValueColorPositions] = window['AscDFH'].CChangesDrawingsObjectNoId; + AscDFH.changesFactory[AscDFH.historyitem_Series_SetDataPt] = window['AscDFH'].CChangesDrawingsObjectNoId; + AscDFH.changesFactory[AscDFH.historyitem_Series_SetDataLabels] = window['AscDFH'].CChangesDrawingsObjectNoId; + AscDFH.changesFactory[AscDFH.historyitem_Series_SetDataId] = window['AscDFH'].CChangesDrawingsObjectNoId; + AscDFH.changesFactory[AscDFH.historyitem_Series_SetLayoutPr] = window['AscDFH'].CChangesDrawingsObjectNoId; + AscDFH.changesFactory[AscDFH.historyitem_Series_SetAxisId] = window['AscDFH'].CChangesDrawingsObjectNoId; + AscDFH.changesFactory[AscDFH.historyitem_Series_SetExtLst] = window['AscDFH'].CChangesDrawingsObjectNoId; + AscDFH.changesFactory[AscDFH.historyitem_Series_SetLayoutId] = window['AscDFH'].CChangesDrawingsObjectNoId; + AscDFH.changesFactory[AscDFH.historyitem_Series_SetHidden] = window['AscDFH'].CChangesDrawingsBool; + AscDFH.changesFactory[AscDFH.historyitem_Series_SetOwnerIdx] = window['AscDFH'].CChangesDrawingsLong; AscDFH.changesFactory[AscDFH.historyitem_Series_SetUniqueId] = window['AscDFH'].CChangesDrawingsString; - AscDFH.changesFactory[AscDFH.historyitem_Series_SetFormatIdx] = window['AscDFH'].CChangesDrawingsString; + AscDFH.changesFactory[AscDFH.historyitem_Series_SetFormatIdx] = window['AscDFH'].CChangesDrawingsLong; function CSeries() { CBaseChartObject.call(this); this.tx = null; this.spPr = null; - this.valueColors = null; - this.valueColorPositions = null; - this.dataPt = null; + // in ChartSerializeEx.h + // this.valueColors = null; + // this.valueColorPositions = null; + this.dataPt = []; this.dataLabels = null; this.dataId = null; this.layoutPr = null; - this.axisId = null; + this.axisId = []; this.extLst = null; this.layoutId = null; this.hidden = null; @@ -2776,55 +2787,55 @@ InitClass(CSeries, CBaseChartObject, AscDFH.historyitem_type_Series); CSeries.prototype.setTx = function(pr) { - History.CanAddChanges() && History.Add(new CChangesDrawingsString(this, AscDFH.historyitem_Series_SetTx, this.tx, pr)); + History.CanAddChanges() && History.Add(new CChangesDrawingsObjectNoId(this, AscDFH.historyitem_Series_SetTx, this.tx, pr)); this.tx = pr; }; CSeries.prototype.setSpPr = function(pr) { - History.CanAddChanges() && History.Add(new CChangesDrawingsString(this, AscDFH.historyitem_Series_SetSpPr, this.spPr, pr)); + History.CanAddChanges() && History.Add(new CChangesDrawingsObjectNoId(this, AscDFH.historyitem_Series_SetSpPr, this.spPr, pr)); this.spPr = pr; }; - CSeries.prototype.setValueColors = function(pr) { - History.CanAddChanges() && History.Add(new CChangesDrawingsString(this, AscDFH.historyitem_Series_SetValueColors, this.valueColors, pr)); - this.valueColors = pr; - }; - CSeries.prototype.setValueColorPositions = function(pr) { - History.CanAddChanges() && History.Add(new CChangesDrawingsString(this, AscDFH.historyitem_Series_SetValueColorPositions, this.valueColorPositions, pr)); - this.valueColorPositions = pr; - }; + // CSeries.prototype.setValueColors = function(pr) { + // History.CanAddChanges() && History.Add(new CChangesDrawingsObjectNoId(this, AscDFH.historyitem_Series_SetValueColors, this.valueColors, pr)); + // this.valueColors = pr; + // }; + // CSeries.prototype.setValueColorPositions = function(pr) { + // History.CanAddChanges() && History.Add(new CChangesDrawingsObjectNoId(this, AscDFH.historyitem_Series_SetValueColorPositions, this.valueColorPositions, pr)); + // this.valueColorPositions = pr; + // }; CSeries.prototype.setDataPt = function(pr) { - History.CanAddChanges() && History.Add(new CChangesDrawingsString(this, AscDFH.historyitem_Series_SetDataPt, this.dataPt, pr)); + History.CanAddChanges() && History.Add(new CChangesDrawingsObjectNoId(this, AscDFH.historyitem_Series_SetDataPt, this.dataPt, pr)); this.dataPt = pr; }; CSeries.prototype.setDataLabels = function(pr) { - History.CanAddChanges() && History.Add(new CChangesDrawingsString(this, AscDFH.historyitem_Series_SetDataLabels, this.dataLabels, pr)); + History.CanAddChanges() && History.Add(new CChangesDrawingsObjectNoId(this, AscDFH.historyitem_Series_SetDataLabels, this.dataLabels, pr)); this.dataLabels = pr; }; CSeries.prototype.setDataId = function(pr) { - History.CanAddChanges() && History.Add(new CChangesDrawingsString(this, AscDFH.historyitem_Series_SetDataId, this.dataId, pr)); + History.CanAddChanges() && History.Add(new CChangesDrawingsObjectNoId(this, AscDFH.historyitem_Series_SetDataId, this.dataId, pr)); this.dataId = pr; }; CSeries.prototype.setLayoutPr = function(pr) { - History.CanAddChanges() && History.Add(new CChangesDrawingsString(this, AscDFH.historyitem_Series_SetLayoutPr, this.layoutPr, pr)); + History.CanAddChanges() && History.Add(new CChangesDrawingsObjectNoId(this, AscDFH.historyitem_Series_SetLayoutPr, this.layoutPr, pr)); this.layoutPr = pr; }; CSeries.prototype.setAxisId = function(pr) { - History.CanAddChanges() && History.Add(new CChangesDrawingsString(this, AscDFH.historyitem_Series_SetAxisId, this.axisId, pr)); + History.CanAddChanges() && History.Add(new CChangesDrawingsObjectNoId(this, AscDFH.historyitem_Series_SetAxisId, this.axisId, pr)); this.axisId = pr; }; CSeries.prototype.setExtLst = function(pr) { - History.CanAddChanges() && History.Add(new CChangesDrawingsString(this, AscDFH.historyitem_Series_SetExtLst, this.extLst, pr)); + History.CanAddChanges() && History.Add(new CChangesDrawingsObjectNoId(this, AscDFH.historyitem_Series_SetExtLst, this.extLst, pr)); this.extLst = pr; }; CSeries.prototype.setLayoutId = function(pr) { - History.CanAddChanges() && History.Add(new CChangesDrawingsString(this, AscDFH.historyitem_Series_SetLayoutId, this.layoutId, pr)); + History.CanAddChanges() && History.Add(new CChangesDrawingsObjectNoId(this, AscDFH.historyitem_Series_SetLayoutId, this.layoutId, pr)); this.layoutId = pr; }; CSeries.prototype.setHidden = function(pr) { - History.CanAddChanges() && History.Add(new CChangesDrawingsString(this, AscDFH.historyitem_Series_SetHidden, this.hidden, pr)); + History.CanAddChanges() && History.Add(new CChangesDrawingsBool(this, AscDFH.historyitem_Series_SetHidden, this.hidden, pr)); this.hidden = pr; }; CSeries.prototype.setOwnerIdx = function(pr) { - History.CanAddChanges() && History.Add(new CChangesDrawingsString(this, AscDFH.historyitem_Series_SetOwnerIdx, this.ownerIdx, pr)); + History.CanAddChanges() && History.Add(new CChangesDrawingsLong(this, AscDFH.historyitem_Series_SetOwnerIdx, this.ownerIdx, pr)); this.ownerIdx = pr; }; CSeries.prototype.setUniqueId = function(pr) { @@ -2832,7 +2843,7 @@ this.uniqueId = pr; }; CSeries.prototype.setFormatIdx = function(pr) { - History.CanAddChanges() && History.Add(new CChangesDrawingsString(this, AscDFH.historyitem_Series_SetFormatIdx, this.formatIdx, pr)); + History.CanAddChanges() && History.Add(new CChangesDrawingsLong(this, AscDFH.historyitem_Series_SetFormatIdx, this.formatIdx, pr)); this.formatIdx = pr; }; window['AscFormat'].CSeries = CSeries; @@ -2853,11 +2864,11 @@ drawingsChangesMap[AscDFH.historyitem_SeriesElementVisibilities_SetOutliers] = function(oClass, value) { oClass.outliers = value; }; - AscDFH.changesFactory[AscDFH.historyitem_SeriesElementVisibilities_SetConnectorLines] = window['AscDFH'].CChangesDrawingsString; - AscDFH.changesFactory[AscDFH.historyitem_SeriesElementVisibilities_SetMeanLine] = window['AscDFH'].CChangesDrawingsString; - AscDFH.changesFactory[AscDFH.historyitem_SeriesElementVisibilities_SetMeanMarker] = window['AscDFH'].CChangesDrawingsString; - AscDFH.changesFactory[AscDFH.historyitem_SeriesElementVisibilities_SetNonoutliers] = window['AscDFH'].CChangesDrawingsString; - AscDFH.changesFactory[AscDFH.historyitem_SeriesElementVisibilities_SetOutliers] = window['AscDFH'].CChangesDrawingsString; + AscDFH.changesFactory[AscDFH.historyitem_SeriesElementVisibilities_SetConnectorLines] = window['AscDFH'].CChangesDrawingsBool; + AscDFH.changesFactory[AscDFH.historyitem_SeriesElementVisibilities_SetMeanLine] = window['AscDFH'].CChangesDrawingsBool; + AscDFH.changesFactory[AscDFH.historyitem_SeriesElementVisibilities_SetMeanMarker] = window['AscDFH'].CChangesDrawingsBool; + AscDFH.changesFactory[AscDFH.historyitem_SeriesElementVisibilities_SetNonoutliers] = window['AscDFH'].CChangesDrawingsBool; + AscDFH.changesFactory[AscDFH.historyitem_SeriesElementVisibilities_SetOutliers] = window['AscDFH'].CChangesDrawingsBool; function CSeriesElementVisibilities() { CBaseChartObject.call(this); this.connectorLines = null; @@ -2870,23 +2881,23 @@ InitClass(CSeriesElementVisibilities, CBaseChartObject, AscDFH.historyitem_type_SeriesElementVisibilities); CSeriesElementVisibilities.prototype.setConnectorLines = function(pr) { - History.CanAddChanges() && History.Add(new CChangesDrawingsString(this, AscDFH.historyitem_SeriesElementVisibilities_SetConnectorLines, this.connectorLines, pr)); + History.CanAddChanges() && History.Add(new CChangesDrawingsBool(this, AscDFH.historyitem_SeriesElementVisibilities_SetConnectorLines, this.connectorLines, pr)); this.connectorLines = pr; }; CSeriesElementVisibilities.prototype.setMeanLine = function(pr) { - History.CanAddChanges() && History.Add(new CChangesDrawingsString(this, AscDFH.historyitem_SeriesElementVisibilities_SetMeanLine, this.meanLine, pr)); + History.CanAddChanges() && History.Add(new CChangesDrawingsBool(this, AscDFH.historyitem_SeriesElementVisibilities_SetMeanLine, this.meanLine, pr)); this.meanLine = pr; }; CSeriesElementVisibilities.prototype.setMeanMarker = function(pr) { - History.CanAddChanges() && History.Add(new CChangesDrawingsString(this, AscDFH.historyitem_SeriesElementVisibilities_SetMeanMarker, this.meanMarker, pr)); + History.CanAddChanges() && History.Add(new CChangesDrawingsBool(this, AscDFH.historyitem_SeriesElementVisibilities_SetMeanMarker, this.meanMarker, pr)); this.meanMarker = pr; }; CSeriesElementVisibilities.prototype.setNonoutliers = function(pr) { - History.CanAddChanges() && History.Add(new CChangesDrawingsString(this, AscDFH.historyitem_SeriesElementVisibilities_SetNonoutliers, this.nonoutliers, pr)); + History.CanAddChanges() && History.Add(new CChangesDrawingsBool(this, AscDFH.historyitem_SeriesElementVisibilities_SetNonoutliers, this.nonoutliers, pr)); this.nonoutliers = pr; }; CSeriesElementVisibilities.prototype.setOutliers = function(pr) { - History.CanAddChanges() && History.Add(new CChangesDrawingsString(this, AscDFH.historyitem_SeriesElementVisibilities_SetOutliers, this.outliers, pr)); + History.CanAddChanges() && History.Add(new CChangesDrawingsBool(this, AscDFH.historyitem_SeriesElementVisibilities_SetOutliers, this.outliers, pr)); this.outliers = pr; }; window['AscFormat'].CSeriesElementVisibilities = CSeriesElementVisibilities; @@ -2919,40 +2930,41 @@ drawingsChangesMap[AscDFH.historyitem_SeriesLayoutProperties_SetExtLst] = function(oClass, value) { oClass.extLst = value; }; - AscDFH.changesFactory[AscDFH.historyitem_SeriesLayoutProperties_SetParentLabelLayout] = window['AscDFH'].CChangesDrawingsString; - AscDFH.changesFactory[AscDFH.historyitem_SeriesLayoutProperties_SetRegionLabelLayout] = window['AscDFH'].CChangesDrawingsString; - AscDFH.changesFactory[AscDFH.historyitem_SeriesLayoutProperties_SetVisibility] = window['AscDFH'].CChangesDrawingsString; + AscDFH.changesFactory[AscDFH.historyitem_SeriesLayoutProperties_SetParentLabelLayout] = window['AscDFH'].CChangesDrawingsObjectNoId; + AscDFH.changesFactory[AscDFH.historyitem_SeriesLayoutProperties_SetRegionLabelLayout] = window['AscDFH'].CChangesDrawingsObjectNoId; + AscDFH.changesFactory[AscDFH.historyitem_SeriesLayoutProperties_SetVisibility] = window['AscDFH'].CChangesDrawingsObjectNoId; AscDFH.changesFactory[AscDFH.historyitem_SeriesLayoutProperties_SetAggregation] = window['AscDFH'].CChangesDrawingsBool; - AscDFH.changesFactory[AscDFH.historyitem_SeriesLayoutProperties_SetBinning] = window['AscDFH'].CChangesDrawingsString; - AscDFH.changesFactory[AscDFH.historyitem_SeriesLayoutProperties_SetGeography] = window['AscDFH'].CChangesDrawingsString; - AscDFH.changesFactory[AscDFH.historyitem_SeriesLayoutProperties_SetStatistics] = window['AscDFH'].CChangesDrawingsString; - AscDFH.changesFactory[AscDFH.historyitem_SeriesLayoutProperties_SetSubtotals] = window['AscDFH'].CChangesDrawingsString; - AscDFH.changesFactory[AscDFH.historyitem_SeriesLayoutProperties_SetExtLst] = window['AscDFH'].CChangesDrawingsString; + AscDFH.changesFactory[AscDFH.historyitem_SeriesLayoutProperties_SetBinning] = window['AscDFH'].CChangesDrawingsObjectNoId; + AscDFH.changesFactory[AscDFH.historyitem_SeriesLayoutProperties_SetGeography] = window['AscDFH'].CChangesDrawingsObjectNoId; + AscDFH.changesFactory[AscDFH.historyitem_SeriesLayoutProperties_SetStatistics] = window['AscDFH'].CChangesDrawingsObjectNoId; + AscDFH.changesFactory[AscDFH.historyitem_SeriesLayoutProperties_SetSubtotals] = window['AscDFH'].CChangesDrawingsObjectNoId; + AscDFH.changesFactory[AscDFH.historyitem_SeriesLayoutProperties_SetExtLst] = window['AscDFH'].CChangesDrawingsObjectNoId; function CSeriesLayoutProperties() { CBaseChartObject.call(this); this.parentLabelLayout = null; this.regionLabelLayout = null; this.visibility = null; this.aggregation = null; - this.binning = null; - this.geography = null; this.statistics = null; this.subtotals = null; this.extLst = null; + // todo in ChartSerializeEx.h + this.binning = null; + this.geography = null; } InitClass(CSeriesLayoutProperties, CBaseChartObject, AscDFH.historyitem_type_SeriesLayoutProperties); CSeriesLayoutProperties.prototype.setParentLabelLayout = function(pr) { - History.CanAddChanges() && History.Add(new CChangesDrawingsString(this, AscDFH.historyitem_SeriesLayoutProperties_SetParentLabelLayout, this.parentLabelLayout, pr)); + History.CanAddChanges() && History.Add(new CChangesDrawingsObjectNoId(this, AscDFH.historyitem_SeriesLayoutProperties_SetParentLabelLayout, this.parentLabelLayout, pr)); this.parentLabelLayout = pr; }; CSeriesLayoutProperties.prototype.setRegionLabelLayout = function(pr) { - History.CanAddChanges() && History.Add(new CChangesDrawingsString(this, AscDFH.historyitem_SeriesLayoutProperties_SetRegionLabelLayout, this.regionLabelLayout, pr)); + History.CanAddChanges() && History.Add(new CChangesDrawingsObjectNoId(this, AscDFH.historyitem_SeriesLayoutProperties_SetRegionLabelLayout, this.regionLabelLayout, pr)); this.regionLabelLayout = pr; }; CSeriesLayoutProperties.prototype.setVisibility = function(pr) { - History.CanAddChanges() && History.Add(new CChangesDrawingsString(this, AscDFH.historyitem_SeriesLayoutProperties_SetVisibility, this.visibility, pr)); + History.CanAddChanges() && History.Add(new CChangesDrawingsObjectNoId(this, AscDFH.historyitem_SeriesLayoutProperties_SetVisibility, this.visibility, pr)); this.visibility = pr; }; CSeriesLayoutProperties.prototype.setAggregation = function(pr) { @@ -2960,23 +2972,23 @@ this.aggregation = pr; }; CSeriesLayoutProperties.prototype.setBinning = function(pr) { - History.CanAddChanges() && History.Add(new CChangesDrawingsString(this, AscDFH.historyitem_SeriesLayoutProperties_SetBinning, this.binning, pr)); + History.CanAddChanges() && History.Add(new CChangesDrawingsObjectNoId(this, AscDFH.historyitem_SeriesLayoutProperties_SetBinning, this.binning, pr)); this.binning = pr; }; CSeriesLayoutProperties.prototype.setGeography = function(pr) { - History.CanAddChanges() && History.Add(new CChangesDrawingsString(this, AscDFH.historyitem_SeriesLayoutProperties_SetGeography, this.geography, pr)); + History.CanAddChanges() && History.Add(new CChangesDrawingsObjectNoId(this, AscDFH.historyitem_SeriesLayoutProperties_SetGeography, this.geography, pr)); this.geography = pr; }; CSeriesLayoutProperties.prototype.setStatistics = function(pr) { - History.CanAddChanges() && History.Add(new CChangesDrawingsString(this, AscDFH.historyitem_SeriesLayoutProperties_SetStatistics, this.statistics, pr)); + History.CanAddChanges() && History.Add(new CChangesDrawingsObjectNoId(this, AscDFH.historyitem_SeriesLayoutProperties_SetStatistics, this.statistics, pr)); this.statistics = pr; }; CSeriesLayoutProperties.prototype.setSubtotals = function(pr) { - History.CanAddChanges() && History.Add(new CChangesDrawingsString(this, AscDFH.historyitem_SeriesLayoutProperties_SetSubtotals, this.subtotals, pr)); + History.CanAddChanges() && History.Add(new CChangesDrawingsObjectNoId(this, AscDFH.historyitem_SeriesLayoutProperties_SetSubtotals, this.subtotals, pr)); this.subtotals = pr; }; CSeriesLayoutProperties.prototype.setExtLst = function(pr) { - History.CanAddChanges() && History.Add(new CChangesDrawingsString(this, AscDFH.historyitem_SeriesLayoutProperties_SetExtLst, this.extLst, pr)); + History.CanAddChanges() && History.Add(new CChangesDrawingsObjectNoId(this, AscDFH.historyitem_SeriesLayoutProperties_SetExtLst, this.extLst, pr)); this.extLst = pr; }; window['AscFormat'].CSeriesLayoutProperties = CSeriesLayoutProperties; @@ -2985,7 +2997,7 @@ drawingsChangesMap[AscDFH.historyitem_Statistics_SetQuartileMethod] = function(oClass, value) { oClass.quartileMethod = value; }; - AscDFH.changesFactory[AscDFH.historyitem_Statistics_SetQuartileMethod] = window['AscDFH'].CChangesDrawingsString; + AscDFH.changesFactory[AscDFH.historyitem_Statistics_SetQuartileMethod] = window['AscDFH'].CChangesDrawingsObjectNoId; function CStatistics() { CBaseChartObject.call(this); this.quartileMethod = null; @@ -2994,12 +3006,12 @@ InitClass(CStatistics, CBaseChartObject, AscDFH.historyitem_type_Statistics); CStatistics.prototype.setQuartileMethod = function(pr) { - History.CanAddChanges() && History.Add(new CChangesDrawingsString(this, AscDFH.historyitem_Statistics_SetQuartileMethod, this.quartileMethod, pr)); + History.CanAddChanges() && History.Add(new CChangesDrawingsObjectNoId(this, AscDFH.historyitem_Statistics_SetQuartileMethod, this.quartileMethod, pr)); this.quartileMethod = pr; }; window['AscFormat'].CStatistics = CStatistics; - // StringDimension + // Dimension drawingsChangesMap[AscDFH.historyitem_StringDimension_SetF] = function(oClass, value) { oClass.f = value; }; @@ -3012,11 +3024,11 @@ drawingsChangesMap[AscDFH.historyitem_StringDimension_SetType] = function(oClass, value) { oClass.type = value; }; - AscDFH.changesFactory[AscDFH.historyitem_StringDimension_SetF] = window['AscDFH'].CChangesDrawingsString; - AscDFH.changesFactory[AscDFH.historyitem_StringDimension_SetNf] = window['AscDFH'].CChangesDrawingsString; - AscDFH.changesFactory[AscDFH.historyitem_StringDimension_SetLvl] = window['AscDFH'].CChangesDrawingsString; - AscDFH.changesFactory[AscDFH.historyitem_StringDimension_SetType] = window['AscDFH'].CChangesDrawingsString; - function CStringDimension() { + AscDFH.changesFactory[AscDFH.historyitem_Dimension_SetF] = window['AscDFH'].CChangesDrawingsObjectNoId; + AscDFH.changesFactory[AscDFH.historyitem_Dimension_SetNf] = window['AscDFH'].CChangesDrawingsString; + AscDFH.changesFactory[AscDFH.historyitem_Dimension_SetLvl] = window['AscDFH'].CChangesDrawingsObjectNoId; + AscDFH.changesFactory[AscDFH.historyitem_Dimension_SetType] = window['AscDFH'].CChangesDrawingsObjectNoId; + function CDimension() { CBaseChartObject.call(this); this.f = null; this.nf = null; @@ -3024,24 +3036,42 @@ this.type = null; } - InitClass(CStringDimension, CBaseChartObject, AscDFH.historyitem_type_StringDimension); + InitClass(CDimension, CBaseChartObject, AscDFH.historyitem_type_Dimension); - CStringDimension.prototype.setF = function(pr) { - History.CanAddChanges() && History.Add(new CChangesDrawingsString(this, AscDFH.historyitem_StringDimension_SetF, this.f, pr)); + CDimension.prototype.setF = function(pr) { + History.CanAddChanges() && History.Add(new CChangesDrawingsObjectNoId(this, AscDFH.historyitem_Dimension_SetF, this.f, pr)); this.f = pr; }; - CStringDimension.prototype.setNf = function(pr) { - History.CanAddChanges() && History.Add(new CChangesDrawingsString(this, AscDFH.historyitem_StringDimension_SetNf, this.nf, pr)); + CDimension.prototype.setNf = function(pr) { + History.CanAddChanges() && History.Add(new CChangesDrawingsString(this, AscDFH.historyitem_Dimension_SetNf, this.nf, pr)); this.nf = pr; }; - CStringDimension.prototype.setLvl = function(pr) { - History.CanAddChanges() && History.Add(new CChangesDrawingsString(this, AscDFH.historyitem_StringDimension_SetLvl, this.lvl, pr)); + CDimension.prototype.setLvl = function(pr) { + History.CanAddChanges() && History.Add(new CChangesDrawingsObjectNoId(this, AscDFH.historyitem_Dimension_SetLvl, this.lvl, pr)); this.lvl = pr; }; - CStringDimension.prototype.setType = function(pr) { - History.CanAddChanges() && History.Add(new CChangesDrawingsString(this, AscDFH.historyitem_StringDimension_SetType, this.type, pr)); + CDimension.prototype.setType = function(pr) { + History.CanAddChanges() && History.Add(new CChangesDrawingsObjectNoId(this, AscDFH.historyitem_Dimension_SetType, this.type, pr)); this.type = pr; }; + window['AscFormat'].CDimension = CDimension; + + // StringDimension + drawingsChangesMap[AscDFH.historyitem_StringDimension_SetLevelData] = function(oClass, value) { + oClass.levelData = value; + }; + AscDFH.changesFactory[AscDFH.historyitem_StringDimension_SetF] = window['AscDFH'].CChangesDrawingsObjectNoId; + function CStringDimension() { + CBaseChartObject.call(this); + this.levelData = []; + } + + InitClass(CStringDimension, CDimension, AscDFH.historyitem_type_StringDimension); + + CStringDimension.prototype.setLevelData = function(pr) { + History.CanAddChanges() && History.Add(new CChangesDrawingsObjectNoId(this, AscDFH.historyitem_StringDimension_SetLevelData, this.levelData, pr)); + this.levelData = pr; + }; window['AscFormat'].CStringDimension = CStringDimension; // StringLevel @@ -3054,12 +3084,12 @@ drawingsChangesMap[AscDFH.historyitem_StringLevel_SetName] = function(oClass, value) { oClass.name = value; }; - AscDFH.changesFactory[AscDFH.historyitem_StringLevel_SetPt] = window['AscDFH'].CChangesDrawingsString; - AscDFH.changesFactory[AscDFH.historyitem_StringLevel_SetPtCount] = window['AscDFH'].CChangesDrawingsString; + AscDFH.changesFactory[AscDFH.historyitem_StringLevel_SetPt] = window['AscDFH'].CChangesDrawingsObjectNoId; + AscDFH.changesFactory[AscDFH.historyitem_StringLevel_SetPtCount] = window['AscDFH'].CChangesDrawingsLong; AscDFH.changesFactory[AscDFH.historyitem_StringLevel_SetName] = window['AscDFH'].CChangesDrawingsString; function CStringLevel() { CBaseChartObject.call(this); - this.pt = null; + this.pt = []; this.ptCount = null; this.name = null; } @@ -3067,11 +3097,11 @@ InitClass(CStringLevel, CBaseChartObject, AscDFH.historyitem_type_StringLevel); CStringLevel.prototype.setPt = function(pr) { - History.CanAddChanges() && History.Add(new CChangesDrawingsString(this, AscDFH.historyitem_StringLevel_SetPt, this.pt, pr)); + History.CanAddChanges() && History.Add(new CChangesDrawingsObjectNoId(this, AscDFH.historyitem_StringLevel_SetPt, this.pt, pr)); this.pt = pr; }; CStringLevel.prototype.setPtCount = function(pr) { - History.CanAddChanges() && History.Add(new CChangesDrawingsString(this, AscDFH.historyitem_StringLevel_SetPtCount, this.ptCount, pr)); + History.CanAddChanges() && History.Add(new CChangesDrawingsLong(this, AscDFH.historyitem_StringLevel_SetPtCount, this.ptCount, pr)); this.ptCount = pr; }; CStringLevel.prototype.setName = function(pr) { @@ -3084,34 +3114,43 @@ drawingsChangesMap[AscDFH.historyitem_StringValue_SetIdx] = function(oClass, value) { oClass.idx = value; }; - AscDFH.changesFactory[AscDFH.historyitem_StringValue_SetIdx] = window['AscDFH'].CChangesDrawingsString; + drawingsChangesMap[AscDFH.historyitem_StringValue_SetContent] = function(oClass, value) { + oClass.content = value; + }; + AscDFH.changesFactory[AscDFH.historyitem_StringValue_SetIdx] = window['AscDFH'].CChangesDrawingsLong; + AscDFH.changesFactory[AscDFH.historyitem_StringValue_SetContent] = window['AscDFH'].CChangesDrawingsString; function CStringValue() { CBaseChartObject.call(this); this.idx = null; + this.content = null; } InitClass(CStringValue, CBaseChartObject, AscDFH.historyitem_type_StringValue); CStringValue.prototype.setIdx = function(pr) { - History.CanAddChanges() && History.Add(new CChangesDrawingsString(this, AscDFH.historyitem_StringValue_SetIdx, this.idx, pr)); + History.CanAddChanges() && History.Add(new CChangesDrawingsLong(this, AscDFH.historyitem_StringValue_SetIdx, this.idx, pr)); this.idx = pr; }; + CStringValue.prototype.setContent = function(pr) { + History.CanAddChanges() && History.Add(new CChangesDrawingsString(this, AscDFH.historyitem_StringValue_SetContent, this.content, pr)); + this.content = pr; + }; window['AscFormat'].CStringValue = CStringValue; // Subtotals drawingsChangesMap[AscDFH.historyitem_Subtotals_SetIdx] = function(oClass, value) { oClass.idx = value; }; - AscDFH.changesFactory[AscDFH.historyitem_Subtotals_SetIdx] = window['AscDFH'].CChangesDrawingsString; + AscDFH.changesFactory[AscDFH.historyitem_Subtotals_SetIdx] = window['AscDFH'].CChangesDrawingsObjectNoId; function CSubtotals() { CBaseChartObject.call(this); - this.idx = null; + this.idx = []; } InitClass(CSubtotals, CBaseChartObject, AscDFH.historyitem_type_Subtotals); CSubtotals.prototype.setIdx = function(pr) { - History.CanAddChanges() && History.Add(new CChangesDrawingsString(this, AscDFH.historyitem_Subtotals_SetIdx, this.idx, pr)); + History.CanAddChanges() && History.Add(new CChangesDrawingsObjectNoId(this, AscDFH.historyitem_Subtotals_SetIdx, this.idx, pr)); this.idx = pr; }; window['AscFormat'].CSubtotals = CSubtotals; @@ -3123,8 +3162,8 @@ drawingsChangesMap[AscDFH.historyitem_Text_SetRich] = function(oClass, value) { oClass.rich = value; }; - AscDFH.changesFactory[AscDFH.historyitem_Text_SetTxData] = window['AscDFH'].CChangesDrawingsString; - AscDFH.changesFactory[AscDFH.historyitem_Text_SetRich] = window['AscDFH'].CChangesDrawingsString; + AscDFH.changesFactory[AscDFH.historyitem_Text_SetTxData] = window['AscDFH'].CChangesDrawingsObjectNoId; + AscDFH.changesFactory[AscDFH.historyitem_Text_SetRich] = window['AscDFH'].CChangesDrawingsObjectNoId; function CText() { CBaseChartObject.call(this); this.txData = null; @@ -3134,11 +3173,11 @@ InitClass(CText, CBaseChartObject, AscDFH.historyitem_type_Text); CText.prototype.setTxData = function(pr) { - History.CanAddChanges() && History.Add(new CChangesDrawingsString(this, AscDFH.historyitem_Text_SetTxData, this.txData, pr)); + History.CanAddChanges() && History.Add(new CChangesDrawingsObjectNoId(this, AscDFH.historyitem_Text_SetTxData, this.txData, pr)); this.txData = pr; }; CText.prototype.setRich = function(pr) { - History.CanAddChanges() && History.Add(new CChangesDrawingsString(this, AscDFH.historyitem_Text_SetRich, this.rich, pr)); + History.CanAddChanges() && History.Add(new CChangesDrawingsObjectNoId(this, AscDFH.historyitem_Text_SetRich, this.rich, pr)); this.rich = pr; }; window['AscFormat'].CText = CText; @@ -3150,7 +3189,7 @@ drawingsChangesMap[AscDFH.historyitem_TextData_SetV] = function(oClass, value) { oClass.v = value; }; - AscDFH.changesFactory[AscDFH.historyitem_TextData_SetF] = window['AscDFH'].CChangesDrawingsString; + AscDFH.changesFactory[AscDFH.historyitem_TextData_SetF] = window['AscDFH'].CChangesDrawingsObjectNoId; AscDFH.changesFactory[AscDFH.historyitem_TextData_SetV] = window['AscDFH'].CChangesDrawingsString; function CTextData() { CBaseChartObject.call(this); @@ -3161,7 +3200,7 @@ InitClass(CTextData, CBaseChartObject, AscDFH.historyitem_type_TextData); CTextData.prototype.setF = function(pr) { - History.CanAddChanges() && History.Add(new CChangesDrawingsString(this, AscDFH.historyitem_TextData_SetF, this.f, pr)); + History.CanAddChanges() && History.Add(new CChangesDrawingsObjectNoId(this, AscDFH.historyitem_TextData_SetF, this.f, pr)); this.f = pr; }; CTextData.prototype.setV = function(pr) { @@ -3195,24 +3234,33 @@ drawingsChangesMap[AscDFH.historyitem_TickMarks_SetType] = function(oClass, value) { oClass.type = value; }; - AscDFH.changesFactory[AscDFH.historyitem_TickMarks_SetExtLst] = window['AscDFH'].CChangesDrawingsString; - AscDFH.changesFactory[AscDFH.historyitem_TickMarks_SetType] = window['AscDFH'].CChangesDrawingsString; + drawingsChangesMap[AscDFH.historyitem_TickMarks_SetName] = function(oClass, value) { + oClass.name = value; + }; + AscDFH.changesFactory[AscDFH.historyitem_TickMarks_SetExtLst] = window['AscDFH'].CChangesDrawingsObjectNoId; + AscDFH.changesFactory[AscDFH.historyitem_TickMarks_SetType] = window['AscDFH'].CChangesDrawingsObjectNoId; + AscDFH.changesFactory[AscDFH.historyitem_TickMarks_SetName] = window['AscDFH'].CChangesDrawingsString; function CTickMarks() { CBaseChartObject.call(this); this.extLst = null; this.type = null; + this.name = null; } InitClass(CTickMarks, CBaseChartObject, AscDFH.historyitem_type_TickMarks); CTickMarks.prototype.setExtLst = function(pr) { - History.CanAddChanges() && History.Add(new CChangesDrawingsString(this, AscDFH.historyitem_TickMarks_SetExtLst, this.extLst, pr)); + History.CanAddChanges() && History.Add(new CChangesDrawingsObjectNoId(this, AscDFH.historyitem_TickMarks_SetExtLst, this.extLst, pr)); this.extLst = pr; }; CTickMarks.prototype.setType = function(pr) { - History.CanAddChanges() && History.Add(new CChangesDrawingsString(this, AscDFH.historyitem_TickMarks_SetType, this.type, pr)); + History.CanAddChanges() && History.Add(new CChangesDrawingsObjectNoId(this, AscDFH.historyitem_TickMarks_SetType, this.type, pr)); this.type = pr; }; + CTickMarks.prototype.setName = function(pr) { + History.CanAddChanges() && History.Add(new CChangesDrawingsString(this, AscDFH.historyitem_TickMarks_SetName, this.name, pr)); + this.name = pr; + }; window['AscFormat'].CTickMarks = CTickMarks; // ValueAxisScaling @@ -3228,10 +3276,10 @@ drawingsChangesMap[AscDFH.historyitem_ValueAxisScaling_SetMinorUnit] = function(oClass, value) { oClass.minorUnit = value; }; - AscDFH.changesFactory[AscDFH.historyitem_ValueAxisScaling_SetMax] = window['AscDFH'].CChangesDrawingsString; - AscDFH.changesFactory[AscDFH.historyitem_ValueAxisScaling_SetMin] = window['AscDFH'].CChangesDrawingsString; - AscDFH.changesFactory[AscDFH.historyitem_ValueAxisScaling_SetMajorUnit] = window['AscDFH'].CChangesDrawingsString; - AscDFH.changesFactory[AscDFH.historyitem_ValueAxisScaling_SetMinorUnit] = window['AscDFH'].CChangesDrawingsString; + AscDFH.changesFactory[AscDFH.historyitem_ValueAxisScaling_SetMax] = window['AscDFH'].CChangesDrawingsObjectNoId; + AscDFH.changesFactory[AscDFH.historyitem_ValueAxisScaling_SetMin] = window['AscDFH'].CChangesDrawingsObjectNoId; + AscDFH.changesFactory[AscDFH.historyitem_ValueAxisScaling_SetMajorUnit] = window['AscDFH'].CChangesDrawingsObjectNoId; + AscDFH.changesFactory[AscDFH.historyitem_ValueAxisScaling_SetMinorUnit] = window['AscDFH'].CChangesDrawingsObjectNoId; function CValueAxisScaling() { CBaseChartObject.call(this); this.max = null; @@ -3243,19 +3291,19 @@ InitClass(CValueAxisScaling, CBaseChartObject, AscDFH.historyitem_type_ValueAxisScaling); CValueAxisScaling.prototype.setMax = function(pr) { - History.CanAddChanges() && History.Add(new CChangesDrawingsString(this, AscDFH.historyitem_ValueAxisScaling_SetMax, this.max, pr)); + History.CanAddChanges() && History.Add(new CChangesDrawingsObjectNoId(this, AscDFH.historyitem_ValueAxisScaling_SetMax, this.max, pr)); this.max = pr; }; CValueAxisScaling.prototype.setMin = function(pr) { - History.CanAddChanges() && History.Add(new CChangesDrawingsString(this, AscDFH.historyitem_ValueAxisScaling_SetMin, this.min, pr)); + History.CanAddChanges() && History.Add(new CChangesDrawingsObjectNoId(this, AscDFH.historyitem_ValueAxisScaling_SetMin, this.min, pr)); this.min = pr; }; CValueAxisScaling.prototype.setMajorUnit = function(pr) { - History.CanAddChanges() && History.Add(new CChangesDrawingsString(this, AscDFH.historyitem_ValueAxisScaling_SetMajorUnit, this.majorUnit, pr)); + History.CanAddChanges() && History.Add(new CChangesDrawingsObjectNoId(this, AscDFH.historyitem_ValueAxisScaling_SetMajorUnit, this.majorUnit, pr)); this.majorUnit = pr; }; CValueAxisScaling.prototype.setMinorUnit = function(pr) { - History.CanAddChanges() && History.Add(new CChangesDrawingsString(this, AscDFH.historyitem_ValueAxisScaling_SetMinorUnit, this.minorUnit, pr)); + History.CanAddChanges() && History.Add(new CChangesDrawingsObjectNoId(this, AscDFH.historyitem_ValueAxisScaling_SetMinorUnit, this.minorUnit, pr)); this.minorUnit = pr; }; window['AscFormat'].CValueAxisScaling = CValueAxisScaling; @@ -3587,6 +3635,33 @@ }; window['AscFormat'].CTickMarksType = CTickMarksType; + // DoubleOrAutomatic + drawingsChangesMap[AscDFH.historyitem_DoubleOrAutomatic_SetDoubleValue] = function(oClass, value) { + oClass.doubleValue = value; + }; + drawingsChangesMap[AscDFH.historyitem_DoubleOrAutomatic_SetTypeValue] = function(oClass, value) { + oClass.typeValue = value; + }; + AscDFH.changesFactory[AscDFH.historyitem_DoubleOrAutomatic_SetDoubleValue] = window['AscDFH'].CChangesDrawingsLong; + AscDFH.changesFactory[AscDFH.historyitem_DoubleOrAutomatic_SetTypeValue] = window['AscDFH'].CChangesDrawingsLong; + function CDoubleOrAutomatic() { + CBaseChartObject.call(this); + this.doubleValue = 0; + this.typeValue = 1; + } + + InitClass(CDoubleOrAutomatic, CBaseChartObject, AscDFH.historyitem_type_DoubleOrAutomatic); + + CDoubleOrAutomatic.prototype.setDoubleValue = function(pr) { + History.CanAddChanges() && History.Add(new CChangesDrawingsLong(this, AscDFH.historyitem_DoubleOrAutomatic_SetDoubleValue, this.doubleValue, pr)); + this.doubleValue = pr; + }; + CDoubleOrAutomatic.prototype.setTypeValue = function(pr) { + History.CanAddChanges() && History.Add(new CChangesDrawingsLong(this, AscDFH.historyitem_DoubleOrAutomatic_SetTypeValue, this.typeValue, pr)); + this.typeValue = pr; + }; + window['AscFormat'].CDoubleOrAutomatic = CDoubleOrAutomatic; + // template drawingsChangesMap[AscDFH.historyitem_Address_SetTest] = function(oClass, value) { oClass.test = value; From 9c2bac4ab144bd986d9759ace99b5478d65798c9 Mon Sep 17 00:00:00 2001 From: Dmitriy Alexandrov Date: Mon, 7 Aug 2023 20:18:08 +0600 Subject: [PATCH 09/30] edit types in classes --- common/Drawings/Format/ChartEx.js | 620 +++++++++++++++----------- common/Drawings/Format/ChartFormat.js | 26 ++ 2 files changed, 390 insertions(+), 256 deletions(-) diff --git a/common/Drawings/Format/ChartEx.js b/common/Drawings/Format/ChartEx.js index 189b06fd3b..8e421c54a5 100644 --- a/common/Drawings/Format/ChartEx.js +++ b/common/Drawings/Format/ChartEx.js @@ -1292,7 +1292,7 @@ oClass.provider = value; }; AscDFH.changesFactory[AscDFH.historyitem_GeoCache_SetBinary] = window['AscDFH'].CChangesDrawingsString; - AscDFH.changesFactory[AscDFH.historyitem_GeoCache_SetClear] = window['AscDFH'].CChangesDrawingsString; + AscDFH.changesFactory[AscDFH.historyitem_GeoCache_SetClear] = window['AscDFH'].CChangesDrawingsObjectNoId; AscDFH.changesFactory[AscDFH.historyitem_GeoCache_SetProvider] = window['AscDFH'].CChangesDrawingsString; function CGeoCache() { CBaseChartObject.call(this); @@ -1303,12 +1303,12 @@ InitClass(CGeoCache, CBaseChartObject, AscDFH.historyitem_type_GeoCache); - CGeoCache.prototype.setBinary = function(pr) { + CGeoCache.prototype.setBinary = function(pr) { // todo base64binary type History.CanAddChanges() && History.Add(new CChangesDrawingsString(this, AscDFH.historyitem_GeoCache_SetBinary, this.binary, pr)); this.binary = pr; }; CGeoCache.prototype.setClear = function(pr) { - History.CanAddChanges() && History.Add(new CChangesDrawingsString(this, AscDFH.historyitem_GeoCache_SetClear, this.clear, pr)); + History.CanAddChanges() && History.Add(new CChangesDrawingsObjectNoId(this, AscDFH.historyitem_GeoCache_SetClear, this.clear, pr)); this.clear = pr; }; CGeoCache.prototype.setProvider = function(pr) { @@ -1321,7 +1321,7 @@ drawingsChangesMap[AscDFH.historyitem_GeoChildEntities_SetGeoHierarchyEntity] = function(oClass, value) { oClass.geoHierarchyEntity = value; }; - AscDFH.changesFactory[AscDFH.historyitem_GeoChildEntities_SetGeoHierarchyEntity] = window['AscDFH'].CChangesDrawingsString; + AscDFH.changesFactory[AscDFH.historyitem_GeoChildEntities_SetGeoHierarchyEntity] = window['AscDFH'].CChangesDrawingsObjectNoId; function CGeoChildEntities() { CBaseChartObject.call(this); this.geoHierarchyEntity = null; @@ -1330,7 +1330,7 @@ InitClass(CGeoChildEntities, CBaseChartObject, AscDFH.historyitem_type_GeoChildEntities); CGeoChildEntities.prototype.setGeoHierarchyEntity = function(pr) { - History.CanAddChanges() && History.Add(new CChangesDrawingsString(this, AscDFH.historyitem_GeoChildEntities_SetGeoHierarchyEntity, this.geoHierarchyEntity, pr)); + History.CanAddChanges() && History.Add(new CChangesDrawingsObjectNoId(this, AscDFH.historyitem_GeoChildEntities_SetGeoHierarchyEntity, this.geoHierarchyEntity, pr)); this.geoHierarchyEntity = pr; }; window['AscFormat'].CGeoChildEntities = CGeoChildEntities; @@ -1342,7 +1342,7 @@ drawingsChangesMap[AscDFH.historyitem_GeoChildEntitiesQuery_SetEntityId] = function(oClass, value) { oClass.entityId = value; }; - AscDFH.changesFactory[AscDFH.historyitem_GeoChildEntitiesQuery_SetGeoChildTypes] = window['AscDFH'].CChangesDrawingsString; + AscDFH.changesFactory[AscDFH.historyitem_GeoChildEntitiesQuery_SetGeoChildTypes] = window['AscDFH'].CChangesDrawingsObjectNoId; AscDFH.changesFactory[AscDFH.historyitem_GeoChildEntitiesQuery_SetEntityId] = window['AscDFH'].CChangesDrawingsString; function CGeoChildEntitiesQuery() { CBaseChartObject.call(this); @@ -1353,7 +1353,7 @@ InitClass(CGeoChildEntitiesQuery, CBaseChartObject, AscDFH.historyitem_type_GeoChildEntitiesQuery); CGeoChildEntitiesQuery.prototype.setGeoChildTypes = function(pr) { - History.CanAddChanges() && History.Add(new CChangesDrawingsString(this, AscDFH.historyitem_GeoChildEntitiesQuery_SetGeoChildTypes, this.geoChildTypes, pr)); + History.CanAddChanges() && History.Add(new CChangesDrawingsObjectNoId(this, AscDFH.historyitem_GeoChildEntitiesQuery_SetGeoChildTypes, this.geoChildTypes, pr)); this.geoChildTypes = pr; }; CGeoChildEntitiesQuery.prototype.setEntityId = function(pr) { @@ -1369,8 +1369,8 @@ drawingsChangesMap[AscDFH.historyitem_GeoChildEntitiesQueryResult_SetGeoChildEntities] = function(oClass, value) { oClass.geoChildEntities = value; }; - AscDFH.changesFactory[AscDFH.historyitem_GeoChildEntitiesQueryResult_SetGeoChildEntitiesQuery] = window['AscDFH'].CChangesDrawingsString; - AscDFH.changesFactory[AscDFH.historyitem_GeoChildEntitiesQueryResult_SetGeoChildEntities] = window['AscDFH'].CChangesDrawingsString; + AscDFH.changesFactory[AscDFH.historyitem_GeoChildEntitiesQueryResult_SetGeoChildEntitiesQuery] = window['AscDFH'].CChangesDrawingsObjectNoId; + AscDFH.changesFactory[AscDFH.historyitem_GeoChildEntitiesQueryResult_SetGeoChildEntities] = window['AscDFH'].CChangesDrawingsObjectNoId; function CGeoChildEntitiesQueryResult() { CBaseChartObject.call(this); this.geoChildEntitiesQuery = null; @@ -1380,11 +1380,11 @@ InitClass(CGeoChildEntitiesQueryResult, CBaseChartObject, AscDFH.historyitem_type_GeoChildEntitiesQueryResult); CGeoChildEntitiesQueryResult.prototype.setGeoChildEntitiesQuery = function(pr) { - History.CanAddChanges() && History.Add(new CChangesDrawingsString(this, AscDFH.historyitem_GeoChildEntitiesQueryResult_SetGeoChildEntitiesQuery, this.geoChildEntitiesQuery, pr)); + History.CanAddChanges() && History.Add(new CChangesDrawingsObjectNoId(this, AscDFH.historyitem_GeoChildEntitiesQueryResult_SetGeoChildEntitiesQuery, this.geoChildEntitiesQuery, pr)); this.geoChildEntitiesQuery = pr; }; CGeoChildEntitiesQueryResult.prototype.setGeoChildEntities = function(pr) { - History.CanAddChanges() && History.Add(new CChangesDrawingsString(this, AscDFH.historyitem_GeoChildEntitiesQueryResult_SetGeoChildEntities, this.geoChildEntities, pr)); + History.CanAddChanges() && History.Add(new CChangesDrawingsObjectNoId(this, AscDFH.historyitem_GeoChildEntitiesQueryResult_SetGeoChildEntities, this.geoChildEntities, pr)); this.geoChildEntities = pr; }; window['AscFormat'].CGeoChildEntitiesQueryResult = CGeoChildEntitiesQueryResult; @@ -1393,7 +1393,7 @@ drawingsChangesMap[AscDFH.historyitem_GeoChildEntitiesQueryResults_SetGeoChildEntitiesQueryResult] = function(oClass, value) { oClass.geoChildEntitiesQueryResult = value; }; - AscDFH.changesFactory[AscDFH.historyitem_GeoChildEntitiesQueryResults_SetGeoChildEntitiesQueryResult] = window['AscDFH'].CChangesDrawingsString; + AscDFH.changesFactory[AscDFH.historyitem_GeoChildEntitiesQueryResults_SetGeoChildEntitiesQueryResult] = window['AscDFH'].CChangesDrawingsObjectNoId; function CGeoChildEntitiesQueryResults() { CBaseChartObject.call(this); this.geoChildEntitiesQueryResult = null; @@ -1402,7 +1402,7 @@ InitClass(CGeoChildEntitiesQueryResults, CBaseChartObject, AscDFH.historyitem_type_GeoChildEntitiesQueryResults); CGeoChildEntitiesQueryResults.prototype.setGeoChildEntitiesQueryResult = function(pr) { - History.CanAddChanges() && History.Add(new CChangesDrawingsString(this, AscDFH.historyitem_GeoChildEntitiesQueryResults_SetGeoChildEntitiesQueryResult, this.geoChildEntitiesQueryResult, pr)); + History.CanAddChanges() && History.Add(new CChangesDrawingsObjectNoId(this, AscDFH.historyitem_GeoChildEntitiesQueryResults_SetGeoChildEntitiesQueryResult, this.geoChildEntitiesQueryResult, pr)); this.geoChildEntitiesQueryResult = pr; }; window['AscFormat'].CGeoChildEntitiesQueryResults = CGeoChildEntitiesQueryResults; @@ -1411,7 +1411,7 @@ drawingsChangesMap[AscDFH.historyitem_GeoChildTypes_SetEntityType] = function(oClass, value) { oClass.entityType = value; }; - AscDFH.changesFactory[AscDFH.historyitem_GeoChildTypes_SetEntityType] = window['AscDFH'].CChangesDrawingsString; + AscDFH.changesFactory[AscDFH.historyitem_GeoChildTypes_SetEntityType] = window['AscDFH'].CChangesDrawingsObjectNoId; function CGeoChildTypes() { CBaseChartObject.call(this); this.entityType = null; @@ -1420,7 +1420,7 @@ InitClass(CGeoChildTypes, CBaseChartObject, AscDFH.historyitem_type_GeoChildTypes); CGeoChildTypes.prototype.setEntityType = function(pr) { - History.CanAddChanges() && History.Add(new CChangesDrawingsString(this, AscDFH.historyitem_GeoChildTypes_SetEntityType, this.entityType, pr)); + History.CanAddChanges() && History.Add(new CChangesDrawingsObjectNoId(this, AscDFH.historyitem_GeoChildTypes_SetEntityType, this.entityType, pr)); this.entityType = pr; }; window['AscFormat'].CGeoChildTypes = CGeoChildTypes; @@ -1450,14 +1450,14 @@ drawingsChangesMap[AscDFH.historyitem_GeoData_SetSouth] = function(oClass, value) { oClass.south = value; }; + AscDFH.changesFactory[AscDFH.historyitem_GeoData_SetGeoPolygons] = window['AscDFH'].CChangesDrawingsObjectNoId; + AscDFH.changesFactory[AscDFH.historyitem_GeoData_SetGeoPolygons] = window['AscDFH'].CChangesDrawingsObjectNoId; AscDFH.changesFactory[AscDFH.historyitem_GeoData_SetGeoPolygons] = window['AscDFH'].CChangesDrawingsString; AscDFH.changesFactory[AscDFH.historyitem_GeoData_SetGeoPolygons] = window['AscDFH'].CChangesDrawingsString; - AscDFH.changesFactory[AscDFH.historyitem_GeoData_SetGeoPolygons] = window['AscDFH'].CChangesDrawingsString; - AscDFH.changesFactory[AscDFH.historyitem_GeoData_SetGeoPolygons] = window['AscDFH'].CChangesDrawingsString; - AscDFH.changesFactory[AscDFH.historyitem_GeoData_SetGeoPolygons] = window['AscDFH'].CChangesDrawingsString; - AscDFH.changesFactory[AscDFH.historyitem_GeoData_SetGeoPolygons] = window['AscDFH'].CChangesDrawingsString; - AscDFH.changesFactory[AscDFH.historyitem_GeoData_SetGeoPolygons] = window['AscDFH'].CChangesDrawingsString; - AscDFH.changesFactory[AscDFH.historyitem_GeoData_SetGeoPolygons] = window['AscDFH'].CChangesDrawingsString; + AscDFH.changesFactory[AscDFH.historyitem_GeoData_SetGeoPolygons] = window['AscDFH'].CChangesDrawingsDouble2; + AscDFH.changesFactory[AscDFH.historyitem_GeoData_SetGeoPolygons] = window['AscDFH'].CChangesDrawingsDouble2; + AscDFH.changesFactory[AscDFH.historyitem_GeoData_SetGeoPolygons] = window['AscDFH'].CChangesDrawingsDouble2; + AscDFH.changesFactory[AscDFH.historyitem_GeoData_SetGeoPolygons] = window['AscDFH'].CChangesDrawingsDouble2; function CGeoData() { CBaseChartObject.call(this); this.geoPolygons = null; @@ -1473,11 +1473,11 @@ InitClass(CGeoData, CBaseChartObject, AscDFH.historyitem_type_GeoData); CGeoData.prototype.setGeoPolygons = function(pr) { - History.CanAddChanges() && History.Add(new CChangesDrawingsString(this, AscDFH.historyitem_GeoData_SetGeoPolygons, this.geoPolygons, pr)); + History.CanAddChanges() && History.Add(new CChangesDrawingsObjectNoId(this, AscDFH.historyitem_GeoData_SetGeoPolygons, this.geoPolygons, pr)); this.geoPolygons = pr; }; CGeoData.prototype.setCopyrights = function(pr) { - History.CanAddChanges() && History.Add(new CChangesDrawingsString(this, AscDFH.historyitem_GeoData_SetCopyrights, this.copyrights, pr)); + History.CanAddChanges() && History.Add(new CChangesDrawingsObjectNoId(this, AscDFH.historyitem_GeoData_SetCopyrights, this.copyrights, pr)); this.copyrights = pr; }; CGeoData.prototype.setEntityName = function(pr) { @@ -1489,19 +1489,19 @@ this.entityId = pr; }; CGeoData.prototype.setEast = function(pr) { - History.CanAddChanges() && History.Add(new CChangesDrawingsString(this, AscDFH.historyitem_GeoData_SetEast, this.east, pr)); + History.CanAddChanges() && History.Add(new CChangesDrawingsDouble2(this, AscDFH.historyitem_GeoData_SetEast, this.east, pr)); this.east = pr; }; CGeoData.prototype.setWest = function(pr) { - History.CanAddChanges() && History.Add(new CChangesDrawingsString(this, AscDFH.historyitem_GeoData_SetWest, this.west, pr)); + History.CanAddChanges() && History.Add(new CChangesDrawingsDouble2(this, AscDFH.historyitem_GeoData_SetWest, this.west, pr)); this.west = pr; }; CGeoData.prototype.setNorth = function(pr) { - History.CanAddChanges() && History.Add(new CChangesDrawingsString(this, AscDFH.historyitem_GeoData_SetNorth, this.north, pr)); + History.CanAddChanges() && History.Add(new CChangesDrawingsDouble2(this, AscDFH.historyitem_GeoData_SetNorth, this.north, pr)); this.north = pr; }; CGeoData.prototype.setSouth = function(pr) { - History.CanAddChanges() && History.Add(new CChangesDrawingsString(this, AscDFH.historyitem_GeoData_SetSouth, this.south, pr)); + History.CanAddChanges() && History.Add(new CChangesDrawingsDouble2(this, AscDFH.historyitem_GeoData_SetSouth, this.south, pr)); this.south = pr; }; window['AscFormat'].CGeoData = CGeoData; @@ -1513,7 +1513,7 @@ drawingsChangesMap[AscDFH.historyitem_GeoDataEntityQuery_SetEntityId] = function(oClass, value) { oClass.entityId = value; }; - AscDFH.changesFactory[AscDFH.historyitem_GeoDataEntityQuery_SetEntityType] = window['AscDFH'].CChangesDrawingsString; + AscDFH.changesFactory[AscDFH.historyitem_GeoDataEntityQuery_SetEntityType] = window['AscDFH'].CChangesDrawingsObjectNoId; AscDFH.changesFactory[AscDFH.historyitem_GeoDataEntityQuery_SetEntityId] = window['AscDFH'].CChangesDrawingsString; function CGeoDataEntityQuery() { CBaseChartObject.call(this); @@ -1524,7 +1524,7 @@ InitClass(CGeoDataEntityQuery, CBaseChartObject, AscDFH.historyitem_type_GeoDataEntityQuery); CGeoDataEntityQuery.prototype.setEntityType = function(pr) { - History.CanAddChanges() && History.Add(new CChangesDrawingsString(this, AscDFH.historyitem_GeoDataEntityQuery_SetEntityType, this.entityType, pr)); + History.CanAddChanges() && History.Add(new CChangesDrawingsObjectNoId(this, AscDFH.historyitem_GeoDataEntityQuery_SetEntityType, this.entityType, pr)); this.entityType = pr; }; CGeoDataEntityQuery.prototype.setEntityId = function(pr) { @@ -1540,8 +1540,8 @@ drawingsChangesMap[AscDFH.historyitem_GeoDataEntityQueryResult_SetGeoData] = function(oClass, value) { oClass.geoData = value; }; - AscDFH.changesFactory[AscDFH.historyitem_GeoDataEntityQueryResult_SetGeoDataEntityQuery] = window['AscDFH'].CChangesDrawingsString; - AscDFH.changesFactory[AscDFH.historyitem_GeoDataEntityQueryResult_SetGeoData] = window['AscDFH'].CChangesDrawingsString; + AscDFH.changesFactory[AscDFH.historyitem_GeoDataEntityQueryResult_SetGeoDataEntityQuery] = window['AscDFH'].CChangesDrawingsObjectNoId; + AscDFH.changesFactory[AscDFH.historyitem_GeoDataEntityQueryResult_SetGeoData] = window['AscDFH'].CChangesDrawingsObjectNoId; function CGeoDataEntityQueryResult() { CBaseChartObject.call(this); this.geoDataEntityQuery = null; @@ -1551,11 +1551,11 @@ InitClass(CGeoDataEntityQueryResult, CBaseChartObject, AscDFH.historyitem_type_GeoDataEntityQueryResult); CGeoDataEntityQueryResult.prototype.setGeoDataEntityQuery = function(pr) { - History.CanAddChanges() && History.Add(new CChangesDrawingsString(this, AscDFH.historyitem_GeoDataEntityQueryResult_SetGeoDataEntityQuery, this.geoDataEntityQuery, pr)); + History.CanAddChanges() && History.Add(new CChangesDrawingsObjectNoId(this, AscDFH.historyitem_GeoDataEntityQueryResult_SetGeoDataEntityQuery, this.geoDataEntityQuery, pr)); this.geoDataEntityQuery = pr; }; CGeoDataEntityQueryResult.prototype.setGeoData = function(pr) { - History.CanAddChanges() && History.Add(new CChangesDrawingsString(this, AscDFH.historyitem_GeoDataEntityQueryResult_SetGeoData, this.geoData, pr)); + History.CanAddChanges() && History.Add(new CChangesDrawingsObjectNoId(this, AscDFH.historyitem_GeoDataEntityQueryResult_SetGeoData, this.geoData, pr)); this.geoData = pr; }; window['AscFormat'].CGeoDataEntityQueryResult = CGeoDataEntityQueryResult; @@ -1564,7 +1564,7 @@ drawingsChangesMap[AscDFH.historyitem_GeoDataEntityQueryResults_SetGeoDataEntityQueryResult] = function(oClass, value) { oClass.geoDataEntityQueryResult = value; }; - AscDFH.changesFactory[AscDFH.historyitem_GeoDataEntityQueryResults_SetGeoDataEntityQueryResult] = window['AscDFH'].CChangesDrawingsString; + AscDFH.changesFactory[AscDFH.historyitem_GeoDataEntityQueryResults_SetGeoDataEntityQueryResult] = window['AscDFH'].CChangesDrawingsObjectNoId; function CGeoDataEntityQueryResults() { CBaseChartObject.call(this); this.geoDataEntityQueryResult = null; @@ -1573,7 +1573,7 @@ InitClass(CGeoDataEntityQueryResults, CBaseChartObject, AscDFH.historyitem_type_GeoDataEntityQueryResults); CGeoDataEntityQueryResults.prototype.setGeoDataEntityQueryResult = function(pr) { - History.CanAddChanges() && History.Add(new CChangesDrawingsString(this, AscDFH.historyitem_GeoDataEntityQueryResults_SetGeoDataEntityQueryResult, this.geoDataEntityQueryResult, pr)); + History.CanAddChanges() && History.Add(new CChangesDrawingsObjectNoId(this, AscDFH.historyitem_GeoDataEntityQueryResults_SetGeoDataEntityQueryResult, this.geoDataEntityQueryResult, pr)); this.geoDataEntityQueryResult = pr; }; window['AscFormat'].CGeoDataEntityQueryResults = CGeoDataEntityQueryResults; @@ -1588,9 +1588,9 @@ drawingsChangesMap[AscDFH.historyitem_GeoDataPointQuery_SetLongitude] = function(oClass, value) { oClass.longitude = value; }; - AscDFH.changesFactory[AscDFH.historyitem_GeoDataPointQuery_SetEntityType] = window['AscDFH'].CChangesDrawingsString; - AscDFH.changesFactory[AscDFH.historyitem_GeoDataPointQuery_SetLatitude] = window['AscDFH'].CChangesDrawingsString; - AscDFH.changesFactory[AscDFH.historyitem_GeoDataPointQuery_SetLongitude] = window['AscDFH'].CChangesDrawingsString; + AscDFH.changesFactory[AscDFH.historyitem_GeoDataPointQuery_SetEntityType] = window['AscDFH'].CChangesDrawingsObjectNoId; + AscDFH.changesFactory[AscDFH.historyitem_GeoDataPointQuery_SetLatitude] = window['AscDFH'].CChangesDrawingsDouble2; + AscDFH.changesFactory[AscDFH.historyitem_GeoDataPointQuery_SetLongitude] = window['AscDFH'].CChangesDrawingsDouble2; function CGeoDataPointQuery() { CBaseChartObject.call(this); this.entityType = null; @@ -1601,15 +1601,15 @@ InitClass(CGeoDataPointQuery, CBaseChartObject, AscDFH.historyitem_type_GeoDataPointQuery); CGeoDataPointQuery.prototype.setEntityType = function(pr) { - History.CanAddChanges() && History.Add(new CChangesDrawingsString(this, AscDFH.historyitem_GeoDataPointQuery_SetEntityType, this.entityType, pr)); + History.CanAddChanges() && History.Add(new CChangesDrawingsObjectNoId(this, AscDFH.historyitem_GeoDataPointQuery_SetEntityType, this.entityType, pr)); this.entityType = pr; }; CGeoDataPointQuery.prototype.setLatitude = function(pr) { - History.CanAddChanges() && History.Add(new CChangesDrawingsString(this, AscDFH.historyitem_GeoDataPointQuery_SetLatitude, this.latitude, pr)); + History.CanAddChanges() && History.Add(new CChangesDrawingsDouble2(this, AscDFH.historyitem_GeoDataPointQuery_SetLatitude, this.latitude, pr)); this.latitude = pr; }; CGeoDataPointQuery.prototype.setLongitude = function(pr) { - History.CanAddChanges() && History.Add(new CChangesDrawingsString(this, AscDFH.historyitem_GeoDataPointQuery_SetLongitude, this.longitude, pr)); + History.CanAddChanges() && History.Add(new CChangesDrawingsDouble2(this, AscDFH.historyitem_GeoDataPointQuery_SetLongitude, this.longitude, pr)); this.longitude = pr; }; window['AscFormat'].CGeoDataPointQuery = CGeoDataPointQuery; @@ -1621,7 +1621,7 @@ drawingsChangesMap[AscDFH.historyitem_GeoDataPointToEntityQuery_SetEntityId] = function(oClass, value) { oClass.entityId = value; }; - AscDFH.changesFactory[AscDFH.historyitem_GeoDataPointToEntityQuery_SetEntityType] = window['AscDFH'].CChangesDrawingsString; + AscDFH.changesFactory[AscDFH.historyitem_GeoDataPointToEntityQuery_SetEntityType] = window['AscDFH'].CChangesDrawingsObjectNoId; AscDFH.changesFactory[AscDFH.historyitem_GeoDataPointToEntityQuery_SetEntityId] = window['AscDFH'].CChangesDrawingsString; function CGeoDataPointToEntityQuery() { CBaseChartObject.call(this); @@ -1632,7 +1632,7 @@ InitClass(CGeoDataPointToEntityQuery, CBaseChartObject, AscDFH.historyitem_type_GeoDataPointToEntityQuery); CGeoDataPointToEntityQuery.prototype.setEntityType = function(pr) { - History.CanAddChanges() && History.Add(new CChangesDrawingsString(this, AscDFH.historyitem_GeoDataPointToEntityQuery_SetEntityType, this.entityType, pr)); + History.CanAddChanges() && History.Add(new CChangesDrawingsObjectNoId(this, AscDFH.historyitem_GeoDataPointToEntityQuery_SetEntityType, this.entityType, pr)); this.entityType = pr; }; CGeoDataPointToEntityQuery.prototype.setEntityId = function(pr) { @@ -1648,8 +1648,8 @@ drawingsChangesMap[AscDFH.historyitem_GeoDataPointToEntityQueryResult_SetGeoDataPointToEntityQuery] = function(oClass, value) { oClass.geoDataPointToEntityQuery = value; }; - AscDFH.changesFactory[AscDFH.historyitem_GeoDataPointToEntityQueryResult_SetGeoDataPointQuery] = window['AscDFH'].CChangesDrawingsString; - AscDFH.changesFactory[AscDFH.historyitem_GeoDataPointToEntityQueryResult_SetGeoDataPointToEntityQuery] = window['AscDFH'].CChangesDrawingsString; + AscDFH.changesFactory[AscDFH.historyitem_GeoDataPointToEntityQueryResult_SetGeoDataPointQuery] = window['AscDFH'].CChangesDrawingsObjectNoId; + AscDFH.changesFactory[AscDFH.historyitem_GeoDataPointToEntityQueryResult_SetGeoDataPointToEntityQuery] = window['AscDFH'].CChangesDrawingsObjectNoId; function CGeoDataPointToEntityQueryResult() { CBaseChartObject.call(this); this.geoDataPointQuery = null; @@ -1659,11 +1659,11 @@ InitClass(CGeoDataPointToEntityQueryResult, CBaseChartObject, AscDFH.historyitem_type_GeoDataPointToEntityQueryResult); CGeoDataPointToEntityQueryResult.prototype.setGeoDataPointQuery = function(pr) { - History.CanAddChanges() && History.Add(new CChangesDrawingsString(this, AscDFH.historyitem_GeoDataPointToEntityQueryResult_SetGeoDataPointQuery, this.geoDataPointQuery, pr)); + History.CanAddChanges() && History.Add(new CChangesDrawingsObjectNoId(this, AscDFH.historyitem_GeoDataPointToEntityQueryResult_SetGeoDataPointQuery, this.geoDataPointQuery, pr)); this.geoDataPointQuery = pr; }; CGeoDataPointToEntityQueryResult.prototype.setGeoDataPointToEntityQuery = function(pr) { - History.CanAddChanges() && History.Add(new CChangesDrawingsString(this, AscDFH.historyitem_GeoDataPointToEntityQueryResult_SetGeoDataPointToEntityQuery, this.geoDataPointToEntityQuery, pr)); + History.CanAddChanges() && History.Add(new CChangesDrawingsObjectNoId(this, AscDFH.historyitem_GeoDataPointToEntityQueryResult_SetGeoDataPointToEntityQuery, this.geoDataPointToEntityQuery, pr)); this.geoDataPointToEntityQuery = pr; }; window['AscFormat'].CGeoDataPointToEntityQueryResult = CGeoDataPointToEntityQueryResult; @@ -1672,7 +1672,7 @@ drawingsChangesMap[AscDFH.historyitem_GeoDataPointToEntityQueryResults_SetGeoDataPointToEntityQueryResult] = function(oClass, value) { oClass.geoDataPointToEntityQueryResult = value; }; - AscDFH.changesFactory[AscDFH.historyitem_GeoDataPointToEntityQueryResults_SetGeoDataPointToEntityQueryResult] = window['AscDFH'].CChangesDrawingsString; + AscDFH.changesFactory[AscDFH.historyitem_GeoDataPointToEntityQueryResults_SetGeoDataPointToEntityQueryResult] = window['AscDFH'].CChangesDrawingsObjectNoId; function CGeoDataPointToEntityQueryResults() { CBaseChartObject.call(this); this.geoDataPointToEntityQueryResult = null; @@ -1681,7 +1681,7 @@ InitClass(CGeoDataPointToEntityQueryResults, CBaseChartObject, AscDFH.historyitem_type_GeoDataPointToEntityQueryResults); CGeoDataPointToEntityQueryResults.prototype.setGeoDataPointToEntityQueryResult = function(pr) { - History.CanAddChanges() && History.Add(new CChangesDrawingsString(this, AscDFH.historyitem_GeoDataPointToEntityQueryResults_SetGeoDataPointToEntityQueryResult, this.geoDataPointToEntityQueryResult, pr)); + History.CanAddChanges() && History.Add(new CChangesDrawingsObjectNoId(this, AscDFH.historyitem_GeoDataPointToEntityQueryResults_SetGeoDataPointToEntityQueryResult, this.geoDataPointToEntityQueryResult, pr)); this.geoDataPointToEntityQueryResult = pr; }; window['AscFormat'].CGeoDataPointToEntityQueryResults = CGeoDataPointToEntityQueryResults; @@ -1705,12 +1705,12 @@ drawingsChangesMap[AscDFH.historyitem_Geography_SetAttribution] = function(oClass, value) { oClass.attribution = value; }; - AscDFH.changesFactory[AscDFH.historyitem_Geography_SetGeoCache] = window['AscDFH'].CChangesDrawingsString; - AscDFH.changesFactory[AscDFH.historyitem_Geography_SetProjectionType] = window['AscDFH'].CChangesDrawingsString; - AscDFH.changesFactory[AscDFH.historyitem_Geography_SetViewedRegionType] = window['AscDFH'].CChangesDrawingsString; + AscDFH.changesFactory[AscDFH.historyitem_Geography_SetGeoCache] = window['AscDFH'].CChangesDrawingsObjectNoId; + AscDFH.changesFactory[AscDFH.historyitem_Geography_SetProjectionType] = window['AscDFH'].CChangesDrawingsObjectNoId; + AscDFH.changesFactory[AscDFH.historyitem_Geography_SetViewedRegionType] = window['AscDFH'].CChangesDrawingsObjectNoId; AscDFH.changesFactory[AscDFH.historyitem_Geography_SetCultureLanguage] = window['AscDFH'].CChangesDrawingsString; - AscDFH.changesFactory[AscDFH.historyitem_Geography_SetGeoCache] = window['AscDFH'].CChangesDrawingsString; - AscDFH.changesFactory[AscDFH.historyitem_Geography_SetGeoCache] = window['AscDFH'].CChangesDrawingsString; + AscDFH.changesFactory[AscDFH.historyitem_Geography_SetCultureRegion] = window['AscDFH'].CChangesDrawingsString; + AscDFH.changesFactory[AscDFH.historyitem_Geography_SetAttribution] = window['AscDFH'].CChangesDrawingsString; function CGeography() { CBaseChartObject.call(this); this.geoCache = null; @@ -1724,15 +1724,15 @@ InitClass(CGeography, CBaseChartObject, AscDFH.historyitem_type_Geography); CGeography.prototype.setGeoCache = function(pr) { - History.CanAddChanges() && History.Add(new CChangesDrawingsString(this, AscDFH.historyitem_Geography_SetGeoCache, this.geoCache, pr)); + History.CanAddChanges() && History.Add(new CChangesDrawingsObjectNoId(this, AscDFH.historyitem_Geography_SetGeoCache, this.geoCache, pr)); this.geoCache = pr; }; CGeography.prototype.setProjectionType = function(pr) { - History.CanAddChanges() && History.Add(new CChangesDrawingsString(this, AscDFH.historyitem_Geography_SetProjectionType, this.projectionType, pr)); + History.CanAddChanges() && History.Add(new CChangesDrawingsObjectNoId(this, AscDFH.historyitem_Geography_SetProjectionType, this.projectionType, pr)); this.projectionType = pr; }; CGeography.prototype.setViewedRegionType = function(pr) { - History.CanAddChanges() && History.Add(new CChangesDrawingsString(this, AscDFH.historyitem_Geography_SetViewedRegionType, this.viewedRegionType, pr)); + History.CanAddChanges() && History.Add(new CChangesDrawingsObjectNoId(this, AscDFH.historyitem_Geography_SetViewedRegionType, this.viewedRegionType, pr)); this.viewedRegionType = pr; }; CGeography.prototype.setCultureLanguage = function(pr) { @@ -1761,7 +1761,7 @@ }; AscDFH.changesFactory[AscDFH.historyitem_GeoHierarchyEntity_SetEntityName] = window['AscDFH'].CChangesDrawingsString; AscDFH.changesFactory[AscDFH.historyitem_GeoHierarchyEntity_SetEntityId] = window['AscDFH'].CChangesDrawingsString; - AscDFH.changesFactory[AscDFH.historyitem_GeoHierarchyEntity_SetEntityType] = window['AscDFH'].CChangesDrawingsString; + AscDFH.changesFactory[AscDFH.historyitem_GeoHierarchyEntity_SetEntityType] = window['AscDFH'].CChangesDrawingsObjectNoId; function CGeoHierarchyEntity() { CBaseChartObject.call(this); this.entityName = null; @@ -1780,7 +1780,7 @@ this.entityId = pr; }; CGeoHierarchyEntity.prototype.setEntityType = function(pr) { - History.CanAddChanges() && History.Add(new CChangesDrawingsString(this, AscDFH.historyitem_GeoHierarchyEntity_SetEntityType, this.entityType, pr)); + History.CanAddChanges() && History.Add(new CChangesDrawingsObjectNoId(this, AscDFH.historyitem_GeoHierarchyEntity_SetEntityType, this.entityType, pr)); this.entityType = pr; }; window['AscFormat'].CGeoHierarchyEntity = CGeoHierarchyEntity; @@ -1801,11 +1801,11 @@ drawingsChangesMap[AscDFH.historyitem_GeoLocation_SetEntityType] = function(oClass, value) { oClass.entityType = value; }; - AscDFH.changesFactory[AscDFH.historyitem_GeoLocation_SetAddress] = window['AscDFH'].CChangesDrawingsString; - AscDFH.changesFactory[AscDFH.historyitem_GeoLocation_SetLatitude] = window['AscDFH'].CChangesDrawingsString; - AscDFH.changesFactory[AscDFH.historyitem_GeoLocation_SetLongitude] = window['AscDFH'].CChangesDrawingsString; + AscDFH.changesFactory[AscDFH.historyitem_GeoLocation_SetAddress] = window['AscDFH'].CChangesDrawingsObjectNoId; + AscDFH.changesFactory[AscDFH.historyitem_GeoLocation_SetLatitude] = window['AscDFH'].CChangesDrawingsDouble2; + AscDFH.changesFactory[AscDFH.historyitem_GeoLocation_SetLongitude] = window['AscDFH'].CChangesDrawingsDouble2; AscDFH.changesFactory[AscDFH.historyitem_GeoLocation_SetEntityName] = window['AscDFH'].CChangesDrawingsString; - AscDFH.changesFactory[AscDFH.historyitem_GeoLocation_SetEntityType] = window['AscDFH'].CChangesDrawingsString; + AscDFH.changesFactory[AscDFH.historyitem_GeoLocation_SetEntityType] = window['AscDFH'].CChangesDrawingsObjectNoId; function CGeoLocation() { CBaseChartObject.call(this); this.address = null; @@ -1818,15 +1818,15 @@ InitClass(CGeoLocation, CBaseChartObject, AscDFH.historyitem_type_GeoLocation); CGeoLocation.prototype.setAddress = function(pr) { - History.CanAddChanges() && History.Add(new CChangesDrawingsString(this, AscDFH.historyitem_GeoLocation_SetAddress, this.address, pr)); + History.CanAddChanges() && History.Add(new CChangesDrawingsObjectNoId(this, AscDFH.historyitem_GeoLocation_SetAddress, this.address, pr)); this.address = pr; }; CGeoLocation.prototype.setLatitude = function(pr) { - History.CanAddChanges() && History.Add(new CChangesDrawingsString(this, AscDFH.historyitem_GeoLocation_SetLatitude, this.latitude, pr)); + History.CanAddChanges() && History.Add(new CChangesDrawingsDouble2(this, AscDFH.historyitem_GeoLocation_SetLatitude, this.latitude, pr)); this.latitude = pr; }; CGeoLocation.prototype.setLongitude = function(pr) { - History.CanAddChanges() && History.Add(new CChangesDrawingsString(this, AscDFH.historyitem_GeoLocation_SetLongitude, this.longitude, pr)); + History.CanAddChanges() && History.Add(new CChangesDrawingsDouble2(this, AscDFH.historyitem_GeoLocation_SetLongitude, this.longitude, pr)); this.longitude = pr; }; CGeoLocation.prototype.setEntityName = function(pr) { @@ -1834,7 +1834,7 @@ this.entityName = pr; }; CGeoLocation.prototype.setEntityType = function(pr) { - History.CanAddChanges() && History.Add(new CChangesDrawingsString(this, AscDFH.historyitem_GeoLocation_SetEntityType, this.entityType, pr)); + History.CanAddChanges() && History.Add(new CChangesDrawingsObjectNoId(this, AscDFH.historyitem_GeoLocation_SetEntityType, this.entityType, pr)); this.entityType = pr; }; window['AscFormat'].CGeoLocation = CGeoLocation; @@ -1859,7 +1859,7 @@ AscDFH.changesFactory[AscDFH.historyitem_GeoLocationQuery_SetAdminDistrict1] = window['AscDFH'].CChangesDrawingsString; AscDFH.changesFactory[AscDFH.historyitem_GeoLocationQuery_SetAdminDistrict2] = window['AscDFH'].CChangesDrawingsString; AscDFH.changesFactory[AscDFH.historyitem_GeoLocationQuery_SetPostalCode] = window['AscDFH'].CChangesDrawingsString; - AscDFH.changesFactory[AscDFH.historyitem_GeoLocationQuery_SetEntityType] = window['AscDFH'].CChangesDrawingsString; + AscDFH.changesFactory[AscDFH.historyitem_GeoLocationQuery_SetEntityType] = window['AscDFH'].CChangesDrawingsObjectNoId; function CGeoLocationQuery() { CBaseChartObject.call(this); this.countryRegion = null; @@ -1888,7 +1888,7 @@ this.postalCode = pr; }; CGeoLocationQuery.prototype.setEntityType = function(pr) { - History.CanAddChanges() && History.Add(new CChangesDrawingsString(this, AscDFH.historyitem_GeoLocationQuery_SetEntityType, this.entityType, pr)); + History.CanAddChanges() && History.Add(new CChangesDrawingsObjectNoId(this, AscDFH.historyitem_GeoLocationQuery_SetEntityType, this.entityType, pr)); this.entityType = pr; }; window['AscFormat'].CGeoLocationQuery = CGeoLocationQuery; @@ -1900,8 +1900,8 @@ drawingsChangesMap[AscDFH.historyitem_GeoLocationQueryResult_SetGeoLocations] = function(oClass, value) { oClass.geoLocations = value; }; - AscDFH.changesFactory[AscDFH.historyitem_GeoLocationQueryResult_SetGeoLocationQuery] = window['AscDFH'].CChangesDrawingsString; - AscDFH.changesFactory[AscDFH.historyitem_GeoLocationQueryResult_SetGeoLocations] = window['AscDFH'].CChangesDrawingsString; + AscDFH.changesFactory[AscDFH.historyitem_GeoLocationQueryResult_SetGeoLocationQuery] = window['AscDFH'].CChangesDrawingsObjectNoId; + AscDFH.changesFactory[AscDFH.historyitem_GeoLocationQueryResult_SetGeoLocations] = window['AscDFH'].CChangesDrawingsObjectNoId; function CGeoLocationQueryResult() { CBaseChartObject.call(this); this.geoLocationQuery = null; @@ -1911,11 +1911,11 @@ InitClass(CGeoLocationQueryResult, CBaseChartObject, AscDFH.historyitem_type_GeoLocationQueryResult); CGeoLocationQueryResult.prototype.setGeoLocationQuery = function(pr) { - History.CanAddChanges() && History.Add(new CChangesDrawingsString(this, AscDFH.historyitem_GeoLocationQueryResult_SetGeoLocationQuery, this.geoLocationQuery, pr)); + History.CanAddChanges() && History.Add(new CChangesDrawingsObjectNoId(this, AscDFH.historyitem_GeoLocationQueryResult_SetGeoLocationQuery, this.geoLocationQuery, pr)); this.geoLocationQuery = pr; }; CGeoLocationQueryResult.prototype.setGeoLocations = function(pr) { - History.CanAddChanges() && History.Add(new CChangesDrawingsString(this, AscDFH.historyitem_GeoLocationQueryResult_SetGeoLocations, this.geoLocations, pr)); + History.CanAddChanges() && History.Add(new CChangesDrawingsObjectNoId(this, AscDFH.historyitem_GeoLocationQueryResult_SetGeoLocations, this.geoLocations, pr)); this.geoLocations = pr; }; window['AscFormat'].CGeoLocationQueryResult = CGeoLocationQueryResult; @@ -1924,7 +1924,7 @@ drawingsChangesMap[AscDFH.historyitem_GeoLocationQueryResults_SetGeoLocationQueryResult] = function(oClass, value) { oClass.geoLocationQueryResult = value; }; - AscDFH.changesFactory[AscDFH.historyitem_GeoLocationQueryResults_SetGeoLocationQueryResult] = window['AscDFH'].CChangesDrawingsString; + AscDFH.changesFactory[AscDFH.historyitem_GeoLocationQueryResults_SetGeoLocationQueryResult] = window['AscDFH'].CChangesDrawingsObjectNoId; function CGeoLocationQueryResults() { CBaseChartObject.call(this); this.geoLocationQueryResult = null; @@ -1933,7 +1933,7 @@ InitClass(CGeoLocationQueryResults, CBaseChartObject, AscDFH.historyitem_type_GeoLocationQueryResults); CGeoLocationQueryResults.prototype.setGeoLocationQueryResult = function(pr) { - History.CanAddChanges() && History.Add(new CChangesDrawingsString(this, AscDFH.historyitem_GeoLocationQueryResults_SetGeoLocationQueryResult, this.geoLocationQueryResult, pr)); + History.CanAddChanges() && History.Add(new CChangesDrawingsObjectNoId(this, AscDFH.historyitem_GeoLocationQueryResults_SetGeoLocationQueryResult, this.geoLocationQueryResult, pr)); this.geoLocationQueryResult = pr; }; window['AscFormat'].CGeoLocationQueryResults = CGeoLocationQueryResults; @@ -1942,7 +1942,7 @@ drawingsChangesMap[AscDFH.historyitem_GeoLocations_SetGeoLocation] = function(oClass, value) { oClass.geoLocation = value; }; - AscDFH.changesFactory[AscDFH.historyitem_GeoLocations_SetGeoLocation] = window['AscDFH'].CChangesDrawingsString; + AscDFH.changesFactory[AscDFH.historyitem_GeoLocations_SetGeoLocation] = window['AscDFH'].CChangesDrawingsObjectNoId; function CGeoLocations() { CBaseChartObject.call(this); this.geoLocation = null; @@ -1951,7 +1951,7 @@ InitClass(CGeoLocations, CBaseChartObject, AscDFH.historyitem_type_GeoLocations); CGeoLocations.prototype.setGeoLocation = function(pr) { - History.CanAddChanges() && History.Add(new CChangesDrawingsString(this, AscDFH.historyitem_GeoLocations_SetGeoLocation, this.geoLocation, pr)); + History.CanAddChanges() && History.Add(new CChangesDrawingsObjectNoId(this, AscDFH.historyitem_GeoLocations_SetGeoLocation, this.geoLocation, pr)); this.geoLocation = pr; }; window['AscFormat'].CGeoLocations = CGeoLocations; @@ -1967,7 +1967,7 @@ oClass.pcaRings = value; }; AscDFH.changesFactory[AscDFH.historyitem_GeoPolygon_SetPolygonId] = window['AscDFH'].CChangesDrawingsString; - AscDFH.changesFactory[AscDFH.historyitem_GeoPolygon_SetNumPoints] = window['AscDFH'].CChangesDrawingsString; + AscDFH.changesFactory[AscDFH.historyitem_GeoPolygon_SetNumPoints] = window['AscDFH'].CChangesDrawingsLong; AscDFH.changesFactory[AscDFH.historyitem_GeoPolygon_SetPcaRings] = window['AscDFH'].CChangesDrawingsString; function CGeoPolygon() { CBaseChartObject.call(this); @@ -1983,7 +1983,7 @@ this.polygonId = pr; }; CGeoPolygon.prototype.setNumPoints = function(pr) { - History.CanAddChanges() && History.Add(new CChangesDrawingsString(this, AscDFH.historyitem_GeoPolygon_SetNumPoints, this.numPoints, pr)); + History.CanAddChanges() && History.Add(new CChangesDrawingsLong(this, AscDFH.historyitem_GeoPolygon_SetNumPoints, this.numPoints, pr)); this.numPoints = pr; }; CGeoPolygon.prototype.setPcaRings = function(pr) { @@ -1996,7 +1996,7 @@ drawingsChangesMap[AscDFH.historyitem_GeoPolygons_SetGeoPolygon] = function(oClass, value) { oClass.geoPolygon = value; }; - AscDFH.changesFactory[AscDFH.historyitem_GeoPolygons_SetGeoPolygon] = window['AscDFH'].CChangesDrawingsString; + AscDFH.changesFactory[AscDFH.historyitem_GeoPolygons_SetGeoPolygon] = window['AscDFH'].CChangesDrawingsObjectNoId; function CGeoPolygons() { CBaseChartObject.call(this); this.geoPolygon = null; @@ -2005,7 +2005,7 @@ InitClass(CGeoPolygons, CBaseChartObject, AscDFH.historyitem_type_GeoPolygons); CGeoPolygons.prototype.setGeoPolygon = function(pr) { - History.CanAddChanges() && History.Add(new CChangesDrawingsString(this, AscDFH.historyitem_GeoPolygons_SetGeoPolygon, this.geoPolygon, pr)); + History.CanAddChanges() && History.Add(new CChangesDrawingsObjectNoId(this, AscDFH.historyitem_GeoPolygons_SetGeoPolygon, this.geoPolygon, pr)); this.geoPolygon = pr; }; window['AscFormat'].CGeoPolygons = CGeoPolygons; @@ -2080,9 +2080,9 @@ AscDFH.changesFactory[AscDFH.historyitem_HeaderFooter_SetEvenFooter] = window['AscDFH'].CChangesDrawingsString; AscDFH.changesFactory[AscDFH.historyitem_HeaderFooter_SetFirstHeader] = window['AscDFH'].CChangesDrawingsString; AscDFH.changesFactory[AscDFH.historyitem_HeaderFooter_SetFirstFooter] = window['AscDFH'].CChangesDrawingsString; - AscDFH.changesFactory[AscDFH.historyitem_HeaderFooter_SetAlignWithMargins] = window['AscDFH'].CChangesDrawingsString; - AscDFH.changesFactory[AscDFH.historyitem_HeaderFooter_SetDifferentOddEven] = window['AscDFH'].CChangesDrawingsString; - AscDFH.changesFactory[AscDFH.historyitem_HeaderFooter_SetDifferentFirst] = window['AscDFH'].CChangesDrawingsString; + AscDFH.changesFactory[AscDFH.historyitem_HeaderFooter_SetAlignWithMargins] = window['AscDFH'].CChangesDrawingsBool; + AscDFH.changesFactory[AscDFH.historyitem_HeaderFooter_SetDifferentOddEven] = window['AscDFH'].CChangesDrawingsBool; + AscDFH.changesFactory[AscDFH.historyitem_HeaderFooter_SetDifferentFirst] = window['AscDFH'].CChangesDrawingsBool; function CHeaderFooter() { CBaseChartObject.call(this); this.oddHeader = null; @@ -2123,15 +2123,15 @@ this.firstFooter = pr; }; CHeaderFooter.prototype.setAlignWithMargins = function(pr) { - History.CanAddChanges() && History.Add(new CChangesDrawingsString(this, AscDFH.historyitem_HeaderFooter_SetAlignWithMargins, this.alignWithMargins, pr)); + History.CanAddChanges() && History.Add(new CChangesDrawingsBool(this, AscDFH.historyitem_HeaderFooter_SetAlignWithMargins, this.alignWithMargins, pr)); this.alignWithMargins = pr; }; CHeaderFooter.prototype.setDifferentOddEven = function(pr) { - History.CanAddChanges() && History.Add(new CChangesDrawingsString(this, AscDFH.historyitem_HeaderFooter_SetDifferentOddEven, this.differentOddEven, pr)); + History.CanAddChanges() && History.Add(new CChangesDrawingsBool(this, AscDFH.historyitem_HeaderFooter_SetDifferentOddEven, this.differentOddEven, pr)); this.differentOddEven = pr; }; CHeaderFooter.prototype.setDifferentFirst = function(pr) { - History.CanAddChanges() && History.Add(new CChangesDrawingsString(this, AscDFH.historyitem_HeaderFooter_SetDifferentFirst, this.differentFirst, pr)); + History.CanAddChanges() && History.Add(new CChangesDrawingsBool(this, AscDFH.historyitem_HeaderFooter_SetDifferentFirst, this.differentFirst, pr)); this.differentFirst = pr; }; window['AscFormat'].CHeaderFooter = CHeaderFooter; @@ -2155,12 +2155,12 @@ drawingsChangesMap[AscDFH.historyitem_Legend_SetOverlay] = function(oClass, value) { oClass.overlay = value; }; - AscDFH.changesFactory[AscDFH.historyitem_Legend_SetSpPr] = window['AscDFH'].CChangesDrawingsString; - AscDFH.changesFactory[AscDFH.historyitem_Legend_SetTxPr] = window['AscDFH'].CChangesDrawingsString; - AscDFH.changesFactory[AscDFH.historyitem_Legend_SetExtLst] = window['AscDFH'].CChangesDrawingsString; - AscDFH.changesFactory[AscDFH.historyitem_Legend_SetPos] = window['AscDFH'].CChangesDrawingsString; - AscDFH.changesFactory[AscDFH.historyitem_Legend_SetAlign] = window['AscDFH'].CChangesDrawingsString; - AscDFH.changesFactory[AscDFH.historyitem_Legend_SetOverlay] = window['AscDFH'].CChangesDrawingsString; + AscDFH.changesFactory[AscDFH.historyitem_Legend_SetSpPr] = window['AscDFH'].CChangesDrawingsObjectNoId; + AscDFH.changesFactory[AscDFH.historyitem_Legend_SetTxPr] = window['AscDFH'].CChangesDrawingsObjectNoId; + AscDFH.changesFactory[AscDFH.historyitem_Legend_SetExtLst] = window['AscDFH'].CChangesDrawingsObjectNoId; + AscDFH.changesFactory[AscDFH.historyitem_Legend_SetPos] = window['AscDFH'].CChangesDrawingsObjectNoId; + AscDFH.changesFactory[AscDFH.historyitem_Legend_SetAlign] = window['AscDFH'].CChangesDrawingsObjectNoId; + AscDFH.changesFactory[AscDFH.historyitem_Legend_SetOverlay] = window['AscDFH'].CChangesDrawingsBool; function CLegend() { CBaseChartObject.call(this); this.spPr = null; @@ -2203,7 +2203,7 @@ drawingsChangesMap[AscDFH.historyitem_NumberColorPosition_SetVal] = function(oClass, value) { oClass.val = value; }; - AscDFH.changesFactory[AscDFH.historyitem_NumberColorPosition_SetVal] = window['AscDFH'].CChangesDrawingsString; + AscDFH.changesFactory[AscDFH.historyitem_NumberColorPosition_SetVal] = window['AscDFH'].CChangesDrawingsDouble2; function CNumberColorPosition() { CBaseChartObject.call(this); this.val = null; @@ -2212,7 +2212,7 @@ InitClass(CNumberColorPosition, CBaseChartObject, AscDFH.historyitem_type_NumberColorPosition); CNumberColorPosition.prototype.setVal = function(pr) { - History.CanAddChanges() && History.Add(new CChangesDrawingsString(this, AscDFH.historyitem_NumberColorPosition_SetVal, this.val, pr)); + History.CanAddChanges() && History.Add(new CChangesDrawingsDouble2(this, AscDFH.historyitem_NumberColorPosition_SetVal, this.val, pr)); this.val = pr; }; window['AscFormat'].CNumberColorPosition = CNumberColorPosition; @@ -2353,12 +2353,12 @@ drawingsChangesMap[AscDFH.historyitem_PageMargins_SetFooter] = function(oClass, value) { oClass.footer = value; }; - AscDFH.changesFactory[AscDFH.historyitem_PageMargins_SetL] = window['AscDFH'].CChangesDrawingsString; - AscDFH.changesFactory[AscDFH.historyitem_PageMargins_SetR] = window['AscDFH'].CChangesDrawingsString; - AscDFH.changesFactory[AscDFH.historyitem_PageMargins_SetT] = window['AscDFH'].CChangesDrawingsString; - AscDFH.changesFactory[AscDFH.historyitem_PageMargins_SetB] = window['AscDFH'].CChangesDrawingsString; - AscDFH.changesFactory[AscDFH.historyitem_PageMargins_SetHeader] = window['AscDFH'].CChangesDrawingsString; - AscDFH.changesFactory[AscDFH.historyitem_PageMargins_SetFooter] = window['AscDFH'].CChangesDrawingsString; + AscDFH.changesFactory[AscDFH.historyitem_PageMargins_SetL] = window['AscDFH'].CChangesDrawingsDouble2; + AscDFH.changesFactory[AscDFH.historyitem_PageMargins_SetR] = window['AscDFH'].CChangesDrawingsDouble2; + AscDFH.changesFactory[AscDFH.historyitem_PageMargins_SetT] = window['AscDFH'].CChangesDrawingsDouble2; + AscDFH.changesFactory[AscDFH.historyitem_PageMargins_SetB] = window['AscDFH'].CChangesDrawingsDouble2; + AscDFH.changesFactory[AscDFH.historyitem_PageMargins_SetHeader] = window['AscDFH'].CChangesDrawingsDouble2; + AscDFH.changesFactory[AscDFH.historyitem_PageMargins_SetFooter] = window['AscDFH'].CChangesDrawingsDouble2; function CPageMargins() { CBaseChartObject.call(this); this.l = null; @@ -2372,27 +2372,27 @@ InitClass(CPageMargins, CBaseChartObject, AscDFH.historyitem_type_PageMargins); CPageMargins.prototype.setL = function(pr) { - History.CanAddChanges() && History.Add(new CChangesDrawingsString(this, AscDFH.historyitem_PageMargins_SetL, this.l, pr)); + History.CanAddChanges() && History.Add(new CChangesDrawingsDouble2(this, AscDFH.historyitem_PageMargins_SetL, this.l, pr)); this.l = pr; }; CPageMargins.prototype.setR = function(pr) { - History.CanAddChanges() && History.Add(new CChangesDrawingsString(this, AscDFH.historyitem_PageMargins_SetR, this.r, pr)); + History.CanAddChanges() && History.Add(new CChangesDrawingsDouble2(this, AscDFH.historyitem_PageMargins_SetR, this.r, pr)); this.r = pr; }; CPageMargins.prototype.setT = function(pr) { - History.CanAddChanges() && History.Add(new CChangesDrawingsString(this, AscDFH.historyitem_PageMargins_SetT, this.t, pr)); + History.CanAddChanges() && History.Add(new CChangesDrawingsDouble2(this, AscDFH.historyitem_PageMargins_SetT, this.t, pr)); this.t = pr; }; CPageMargins.prototype.setB = function(pr) { - History.CanAddChanges() && History.Add(new CChangesDrawingsString(this, AscDFH.historyitem_PageMargins_SetB, this.b, pr)); + History.CanAddChanges() && History.Add(new CChangesDrawingsDouble2(this, AscDFH.historyitem_PageMargins_SetB, this.b, pr)); this.b = pr; }; CPageMargins.prototype.setHeader = function(pr) { - History.CanAddChanges() && History.Add(new CChangesDrawingsString(this, AscDFH.historyitem_PageMargins_SetHeader, this.header, pr)); + History.CanAddChanges() && History.Add(new CChangesDrawingsDouble2(this, AscDFH.historyitem_PageMargins_SetHeader, this.header, pr)); this.header = pr; }; CPageMargins.prototype.setFooter = function(pr) { - History.CanAddChanges() && History.Add(new CChangesDrawingsString(this, AscDFH.historyitem_PageMargins_SetFooter, this.footer, pr)); + History.CanAddChanges() && History.Add(new CChangesDrawingsDouble2(this, AscDFH.historyitem_PageMargins_SetFooter, this.footer, pr)); this.footer = pr; }; window['AscFormat'].CPageMargins = CPageMargins; @@ -2425,15 +2425,15 @@ drawingsChangesMap[AscDFH.historyitem_PageSetup_SetCopies] = function(oClass, value) { oClass.copies = value; }; - AscDFH.changesFactory[AscDFH.historyitem_PageSetup_SetPaperSize] = window['AscDFH'].CChangesDrawingsString; - AscDFH.changesFactory[AscDFH.historyitem_PageSetup_SetFirstPageNumber] = window['AscDFH'].CChangesDrawingsString; - AscDFH.changesFactory[AscDFH.historyitem_PageSetup_SetOrientation] = window['AscDFH'].CChangesDrawingsString; - AscDFH.changesFactory[AscDFH.historyitem_PageSetup_SetBlackAndWhite] = window['AscDFH'].CChangesDrawingsString; - AscDFH.changesFactory[AscDFH.historyitem_PageSetup_SetDraft] = window['AscDFH'].CChangesDrawingsString; - AscDFH.changesFactory[AscDFH.historyitem_PageSetup_SetUseFirstPageNumber] = window['AscDFH'].CChangesDrawingsString; - AscDFH.changesFactory[AscDFH.historyitem_PageSetup_SetHorizontalDpi] = window['AscDFH'].CChangesDrawingsString; - AscDFH.changesFactory[AscDFH.historyitem_PageSetup_SetVerticalDpi] = window['AscDFH'].CChangesDrawingsString; - AscDFH.changesFactory[AscDFH.historyitem_PageSetup_SetCopies] = window['AscDFH'].CChangesDrawingsString; + AscDFH.changesFactory[AscDFH.historyitem_PageSetup_SetPaperSize] = window['AscDFH'].CChangesDrawingsLong; + AscDFH.changesFactory[AscDFH.historyitem_PageSetup_SetFirstPageNumber] = window['AscDFH'].CChangesDrawingsLong; + AscDFH.changesFactory[AscDFH.historyitem_PageSetup_SetOrientation] = window['AscDFH'].CChangesDrawingsObjectNoId; + AscDFH.changesFactory[AscDFH.historyitem_PageSetup_SetBlackAndWhite] = window['AscDFH'].CChangesDrawingsBool; + AscDFH.changesFactory[AscDFH.historyitem_PageSetup_SetDraft] = window['AscDFH'].CChangesDrawingsBool; + AscDFH.changesFactory[AscDFH.historyitem_PageSetup_SetUseFirstPageNumber] = window['AscDFH'].CChangesDrawingsBool; + AscDFH.changesFactory[AscDFH.historyitem_PageSetup_SetHorizontalDpi] = window['AscDFH'].CChangesDrawingsLong; + AscDFH.changesFactory[AscDFH.historyitem_PageSetup_SetVerticalDpi] = window['AscDFH'].CChangesDrawingsLong; + AscDFH.changesFactory[AscDFH.historyitem_PageSetup_SetCopies] = window['AscDFH'].CChangesDrawingsLong; function CPageSetup() { CBaseChartObject.call(this); this.paperSize = null; @@ -2450,39 +2450,39 @@ InitClass(CPageSetup, CBaseChartObject, AscDFH.historyitem_type_PageSetup); CPageSetup.prototype.setPaperSize = function(pr) { - History.CanAddChanges() && History.Add(new CChangesDrawingsString(this, AscDFH.historyitem_PageSetup_SetPaperSize, this.paperSize, pr)); + History.CanAddChanges() && History.Add(new CChangesDrawingsLong(this, AscDFH.historyitem_PageSetup_SetPaperSize, this.paperSize, pr)); this.paperSize = pr; }; CPageSetup.prototype.setFirstPageNumber = function(pr) { - History.CanAddChanges() && History.Add(new CChangesDrawingsString(this, AscDFH.historyitem_PageSetup_SetFirstPageNumber, this.firstPageNumber, pr)); + History.CanAddChanges() && History.Add(new CChangesDrawingsLong(this, AscDFH.historyitem_PageSetup_SetFirstPageNumber, this.firstPageNumber, pr)); this.firstPageNumber = pr; }; CPageSetup.prototype.setOrientation = function(pr) { - History.CanAddChanges() && History.Add(new CChangesDrawingsString(this, AscDFH.historyitem_PageSetup_SetOrientation, this.orientation, pr)); + History.CanAddChanges() && History.Add(new CChangesDrawingsObjectNoId(this, AscDFH.historyitem_PageSetup_SetOrientation, this.orientation, pr)); this.orientation = pr; }; CPageSetup.prototype.setBlackAndWhite = function(pr) { - History.CanAddChanges() && History.Add(new CChangesDrawingsString(this, AscDFH.historyitem_PageSetup_SetBlackAndWhite, this.blackAndWhite, pr)); + History.CanAddChanges() && History.Add(new CChangesDrawingsBool(this, AscDFH.historyitem_PageSetup_SetBlackAndWhite, this.blackAndWhite, pr)); this.blackAndWhite = pr; }; CPageSetup.prototype.setDraft = function(pr) { - History.CanAddChanges() && History.Add(new CChangesDrawingsString(this, AscDFH.historyitem_PageSetup_SetDraft, this.draft, pr)); + History.CanAddChanges() && History.Add(new CChangesDrawingsBool(this, AscDFH.historyitem_PageSetup_SetDraft, this.draft, pr)); this.draft = pr; }; CPageSetup.prototype.setUseFirstPageNumber = function(pr) { - History.CanAddChanges() && History.Add(new CChangesDrawingsString(this, AscDFH.historyitem_PageSetup_SetUseFirstPageNumber, this.useFirstPageNumber, pr)); + History.CanAddChanges() && History.Add(new CChangesDrawingsBool(this, AscDFH.historyitem_PageSetup_SetUseFirstPageNumber, this.useFirstPageNumber, pr)); this.useFirstPageNumber = pr; }; CPageSetup.prototype.setHorizontalDpi = function(pr) { - History.CanAddChanges() && History.Add(new CChangesDrawingsString(this, AscDFH.historyitem_PageSetup_SetHorizontalDpi, this.horizontalDpi, pr)); + History.CanAddChanges() && History.Add(new CChangesDrawingsLong(this, AscDFH.historyitem_PageSetup_SetHorizontalDpi, this.horizontalDpi, pr)); this.horizontalDpi = pr; }; CPageSetup.prototype.setVerticalDpi = function(pr) { - History.CanAddChanges() && History.Add(new CChangesDrawingsString(this, AscDFH.historyitem_PageSetup_SetVerticalDpi, this.verticalDpi, pr)); + History.CanAddChanges() && History.Add(new CChangesDrawingsLong(this, AscDFH.historyitem_PageSetup_SetVerticalDpi, this.verticalDpi, pr)); this.verticalDpi = pr; }; CPageSetup.prototype.setCopies = function(pr) { - History.CanAddChanges() && History.Add(new CChangesDrawingsString(this, AscDFH.historyitem_PageSetup_SetCopies, this.copies, pr)); + History.CanAddChanges() && History.Add(new CChangesDrawingsLong(this, AscDFH.historyitem_PageSetup_SetCopies, this.copies, pr)); this.copies = pr; }; window['AscFormat'].CPageSetup = CPageSetup; @@ -2491,7 +2491,7 @@ drawingsChangesMap[AscDFH.historyitem_ParentLabelLayout_SetVal] = function(oClass, value) { oClass.val = value; }; - AscDFH.changesFactory[AscDFH.historyitem_ParentLabelLayout_SetVal] = window['AscDFH'].CChangesDrawingsString; + AscDFH.changesFactory[AscDFH.historyitem_ParentLabelLayout_SetVal] = window['AscDFH'].CChangesDrawingsObjectNoId; function CParentLabelLayout() { CBaseChartObject.call(this); this.val = null; @@ -2500,7 +2500,7 @@ InitClass(CParentLabelLayout, CBaseChartObject, AscDFH.historyitem_type_ParentLabelLayout); CParentLabelLayout.prototype.setVal = function(pr) { - History.CanAddChanges() && History.Add(new CChangesDrawingsString(this, AscDFH.historyitem_ParentLabelLayout_SetVal, this.val, pr)); + History.CanAddChanges() && History.Add(new CChangesDrawingsObjectNoId(this, AscDFH.historyitem_ParentLabelLayout_SetVal, this.val, pr)); this.val = pr; }; window['AscFormat'].CParentLabelLayout = CParentLabelLayout; @@ -2509,7 +2509,7 @@ drawingsChangesMap[AscDFH.historyitem_PercentageColorPosition_SetVal] = function(oClass, value) { oClass.val = value; }; - AscDFH.changesFactory[AscDFH.historyitem_PercentageColorPosition_SetVal] = window['AscDFH'].CChangesDrawingsString; + AscDFH.changesFactory[AscDFH.historyitem_PercentageColorPosition_SetVal] = window['AscDFH'].CChangesDrawingsDouble2; function CPercentageColorPosition() { CBaseChartObject.call(this); this.val = null; @@ -2518,55 +2518,55 @@ InitClass(CPercentageColorPosition, CBaseChartObject, AscDFH.historyitem_type_PercentageColorPosition); CPercentageColorPosition.prototype.setVal = function(pr) { - History.CanAddChanges() && History.Add(new CChangesDrawingsString(this, AscDFH.historyitem_PercentageColorPosition_SetVal, this.val, pr)); + History.CanAddChanges() && History.Add(new CChangesDrawingsDouble2(this, AscDFH.historyitem_PercentageColorPosition_SetVal, this.val, pr)); this.val = pr; }; window['AscFormat'].CPercentageColorPosition = CPercentageColorPosition; - // PlotArea - drawingsChangesMap[AscDFH.historyitem_PlotArea_SetPlotAreaRegion] = function(oClass, value) { - oClass.plotAreaRegion = value; - }; - drawingsChangesMap[AscDFH.historyitem_PlotArea_SetAxis] = function(oClass, value) { - oClass.axis = value; - }; - drawingsChangesMap[AscDFH.historyitem_PlotArea_SetSpPr] = function(oClass, value) { - oClass.spPr = value; - }; - drawingsChangesMap[AscDFH.historyitem_PlotArea_SetExtLst] = function(oClass, value) { - oClass.extLst = value; - }; - AscDFH.changesFactory[AscDFH.historyitem_PlotArea_SetPlotAreaRegion] = window['AscDFH'].CChangesDrawingsObjectNoId; - AscDFH.changesFactory[AscDFH.historyitem_PlotArea_SetAxis] = window['AscDFH'].CChangesDrawingsObjectNoId; - AscDFH.changesFactory[AscDFH.historyitem_PlotArea_SetSpPr] = window['AscDFH'].CChangesDrawingsObjectNoId; - AscDFH.changesFactory[AscDFH.historyitem_PlotArea_SetExtLst] = window['AscDFH'].CChangesDrawingsObjectNoId; - function CPlotArea() { - CBaseChartObject.call(this); - this.plotAreaRegion = null; - this.axis = []; - this.spPr = null; - this.extLst = null; - } + // // PlotArea (contains in chartFormat.js) + // drawingsChangesMap[AscDFH.historyitem_PlotArea_SetPlotAreaRegion] = function(oClass, value) { + // oClass.plotAreaRegion = value; + // }; + // drawingsChangesMap[AscDFH.historyitem_PlotArea_SetAxis] = function(oClass, value) { + // oClass.axis = value; + // }; + // drawingsChangesMap[AscDFH.historyitem_PlotArea_SetSpPr] = function(oClass, value) { + // oClass.spPr = value; + // }; + // drawingsChangesMap[AscDFH.historyitem_PlotArea_SetExtLst] = function(oClass, value) { + // oClass.extLst = value; + // }; + // AscDFH.changesFactory[AscDFH.historyitem_PlotArea_SetPlotAreaRegion] = window['AscDFH'].CChangesDrawingsObjectNoId; + // AscDFH.changesFactory[AscDFH.historyitem_PlotArea_SetAxis] = window['AscDFH'].CChangesDrawingsObjectNoId; + // AscDFH.changesFactory[AscDFH.historyitem_PlotArea_SetSpPr] = window['AscDFH'].CChangesDrawingsObjectNoId; + // AscDFH.changesFactory[AscDFH.historyitem_PlotArea_SetExtLst] = window['AscDFH'].CChangesDrawingsObjectNoId; + // function CPlotArea() { + // CBaseChartObject.call(this); + // this.plotAreaRegion = null; + // this.axis = []; + // this.spPr = null; + // this.extLst = null; + // } - InitClass(CPlotArea, CBaseChartObject, AscDFH.historyitem_type_PlotArea); + // InitClass(CPlotArea, CBaseChartObject, AscDFH.historyitem_type_PlotArea); - CPlotArea.prototype.setPlotAreaRegion = function(pr) { - History.CanAddChanges() && History.Add(new CChangesDrawingsObjectNoId(this, AscDFH.historyitem_PlotArea_SetPlotAreaRegion, this.plotAreaRegion, pr)); - this.plotAreaRegion = pr; - }; - CPlotArea.prototype.setAxis = function(pr) { - History.CanAddChanges() && History.Add(new CChangesDrawingsObjectNoId(this, AscDFH.historyitem_PlotArea_SetAxis, this.axis, pr)); - this.axis = pr; - }; - CPlotArea.prototype.setSpPr = function(pr) { - History.CanAddChanges() && History.Add(new CChangesDrawingsObjectNoId(this, AscDFH.historyitem_PlotArea_SetSpPr, this.spPr, pr)); - this.spPr = pr; - }; - CPlotArea.prototype.setExtLst = function(pr) { - History.CanAddChanges() && History.Add(new CChangesDrawingsObjectNoId(this, AscDFH.historyitem_PlotArea_SetExtLst, this.extLst, pr)); - this.extLst = pr; - }; - window['AscFormat'].CPlotArea = CPlotArea; + // CPlotArea.prototype.setPlotAreaRegion = function(pr) { + // History.CanAddChanges() && History.Add(new CChangesDrawingsObjectNoId(this, AscDFH.historyitem_PlotArea_SetPlotAreaRegion, this.plotAreaRegion, pr)); + // this.plotAreaRegion = pr; + // }; + // CPlotArea.prototype.setAxis = function(pr) { + // History.CanAddChanges() && History.Add(new CChangesDrawingsObjectNoId(this, AscDFH.historyitem_PlotArea_SetAxis, this.axis, pr)); + // this.axis = pr; + // }; + // CPlotArea.prototype.setSpPr = function(pr) { + // History.CanAddChanges() && History.Add(new CChangesDrawingsObjectNoId(this, AscDFH.historyitem_PlotArea_SetSpPr, this.spPr, pr)); + // this.spPr = pr; + // }; + // CPlotArea.prototype.setExtLst = function(pr) { + // History.CanAddChanges() && History.Add(new CChangesDrawingsObjectNoId(this, AscDFH.historyitem_PlotArea_SetExtLst, this.extLst, pr)); + // this.extLst = pr; + // }; + // window['AscFormat'].CPlotArea = CPlotArea; // PlotAreaRegion drawingsChangesMap[AscDFH.historyitem_PlotAreaRegion_SetPlotSurface] = function(oClass, value) { @@ -2631,75 +2631,75 @@ }; window['AscFormat'].CPlotSurface = CPlotSurface; - // PrintSettings - drawingsChangesMap[AscDFH.historyitem_PrintSettings_SetHeaderFooter] = function(oClass, value) { - oClass.headerFooter = value; - }; - drawingsChangesMap[AscDFH.historyitem_PrintSettings_SetPageMargins] = function(oClass, value) { - oClass.pageMargins = value; - }; - drawingsChangesMap[AscDFH.historyitem_PrintSettings_SetPageSetup] = function(oClass, value) { - oClass.pageSetup = value; - }; - AscDFH.changesFactory[AscDFH.historyitem_PrintSettings_SetHeaderFooter] = window['AscDFH'].CChangesDrawingsString; - AscDFH.changesFactory[AscDFH.historyitem_PrintSettings_SetPageMargins] = window['AscDFH'].CChangesDrawingsString; - AscDFH.changesFactory[AscDFH.historyitem_PrintSettings_SetPageSetup] = window['AscDFH'].CChangesDrawingsString; - function CPrintSettings() { - CBaseChartObject.call(this); - this.headerFooter = null; - this.pageMargins = null; - this.pageSetup = null; - } + // // PrintSettings (contains in ChartFormat.js) + // drawingsChangesMap[AscDFH.historyitem_PrintSettings_SetHeaderFooter] = function(oClass, value) { + // oClass.headerFooter = value; + // }; + // drawingsChangesMap[AscDFH.historyitem_PrintSettings_SetPageMargins] = function(oClass, value) { + // oClass.pageMargins = value; + // }; + // drawingsChangesMap[AscDFH.historyitem_PrintSettings_SetPageSetup] = function(oClass, value) { + // oClass.pageSetup = value; + // }; + // AscDFH.changesFactory[AscDFH.historyitem_PrintSettings_SetHeaderFooter] = window['AscDFH'].CChangesDrawingsString; + // AscDFH.changesFactory[AscDFH.historyitem_PrintSettings_SetPageMargins] = window['AscDFH'].CChangesDrawingsString; + // AscDFH.changesFactory[AscDFH.historyitem_PrintSettings_SetPageSetup] = window['AscDFH'].CChangesDrawingsString; + // function CPrintSettings() { + // CBaseChartObject.call(this); + // this.headerFooter = null; + // this.pageMargins = null; + // this.pageSetup = null; + // } - InitClass(CPrintSettings, CBaseChartObject, AscDFH.historyitem_type_PrintSettings); + // InitClass(CPrintSettings, CBaseChartObject, AscDFH.historyitem_type_PrintSettings); - CPrintSettings.prototype.setHeaderFooter = function(pr) { - History.CanAddChanges() && History.Add(new CChangesDrawingsString(this, AscDFH.historyitem_PrintSettings_SetHeaderFooter, this.headerFooter, pr)); - this.headerFooter = pr; - }; - CPrintSettings.prototype.setPageMargins = function(pr) { - History.CanAddChanges() && History.Add(new CChangesDrawingsString(this, AscDFH.historyitem_PrintSettings_SetPageMargins, this.pageMargins, pr)); - this.pageMargins = pr; - }; - CPrintSettings.prototype.setPageSetup = function(pr) { - History.CanAddChanges() && History.Add(new CChangesDrawingsString(this, AscDFH.historyitem_PrintSettings_SetPageSetup, this.pageSetup, pr)); - this.pageSetup = pr; - }; - window['AscFormat'].CPrintSettings = CPrintSettings; + // CPrintSettings.prototype.setHeaderFooter = function(pr) { + // History.CanAddChanges() && History.Add(new CChangesDrawingsString(this, AscDFH.historyitem_PrintSettings_SetHeaderFooter, this.headerFooter, pr)); + // this.headerFooter = pr; + // }; + // CPrintSettings.prototype.setPageMargins = function(pr) { + // History.CanAddChanges() && History.Add(new CChangesDrawingsString(this, AscDFH.historyitem_PrintSettings_SetPageMargins, this.pageMargins, pr)); + // this.pageMargins = pr; + // }; + // CPrintSettings.prototype.setPageSetup = function(pr) { + // History.CanAddChanges() && History.Add(new CChangesDrawingsString(this, AscDFH.historyitem_PrintSettings_SetPageSetup, this.pageSetup, pr)); + // this.pageSetup = pr; + // }; + // window['AscFormat'].CPrintSettings = CPrintSettings; - // RegionLabelLayout - drawingsChangesMap[AscDFH.historyitem_RegionLabelLayout_SetVal] = function(oClass, value) { - oClass.val = value; - }; - AscDFH.changesFactory[AscDFH.historyitem_RegionLabelLayout_SetVal] = window['AscDFH'].CChangesDrawingsString; - function CRegionLabelLayout() { - CBaseChartObject.call(this); - this.val = null; - } + // // RegionLabelLayout (st is used instead of CT_RegionLabelLayout) + // drawingsChangesMap[AscDFH.historyitem_RegionLabelLayout_SetVal] = function(oClass, value) { + // oClass.val = value; + // }; + // AscDFH.changesFactory[AscDFH.historyitem_RegionLabelLayout_SetVal] = window['AscDFH'].CChangesDrawingsString; + // function CRegionLabelLayout() { + // CBaseChartObject.call(this); + // this.val = null; + // } - InitClass(CRegionLabelLayout, CBaseChartObject, AscDFH.historyitem_type_RegionLabelLayout); + // InitClass(CRegionLabelLayout, CBaseChartObject, AscDFH.historyitem_type_RegionLabelLayout); - CRegionLabelLayout.prototype.setVal = function(pr) { - History.CanAddChanges() && History.Add(new CChangesDrawingsString(this, AscDFH.historyitem_RegionLabelLayout_SetVal, this.val, pr)); - this.val = pr; - }; - window['AscFormat'].CRegionLabelLayout = CRegionLabelLayout; + // CRegionLabelLayout.prototype.setVal = function(pr) { + // History.CanAddChanges() && History.Add(new CChangesDrawingsString(this, AscDFH.historyitem_RegionLabelLayout_SetVal, this.val, pr)); + // this.val = pr; + // }; + // window['AscFormat'].CRegionLabelLayout = CRegionLabelLayout; // RelId - drawingsChangesMap[AscDFH.historyitem_RelId_SetR] = function(oClass, value) { - oClass.r = value; + drawingsChangesMap[AscDFH.historyitem_RelId_SetId] = function(oClass, value) { + oClass.id = value; }; - AscDFH.changesFactory[AscDFH.historyitem_RelId_SetR] = window['AscDFH'].CChangesDrawingsString; + AscDFH.changesFactory[AscDFH.historyitem_RelId_SetId] = window['AscDFH'].CChangesDrawingsObjectNoId; function CRelId() { CBaseChartObject.call(this); - this.r = null; + this.id = null; } InitClass(CRelId, CBaseChartObject, AscDFH.historyitem_type_RelId); - CRelId.prototype.setR = function(pr) { - History.CanAddChanges() && History.Add(new CChangesDrawingsString(this, AscDFH.historyitem_RelId_SetR, this.r, pr)); - this.r = pr; + CRelId.prototype.setId = function(pr) { + History.CanAddChanges() && History.Add(new CChangesDrawingsObjectNoId(this, AscDFH.historyitem_RelId_SetId, this.id, pr)); + this.id = pr; }; window['AscFormat'].CRelId = CRelId; @@ -3012,28 +3012,28 @@ window['AscFormat'].CStatistics = CStatistics; // Dimension - drawingsChangesMap[AscDFH.historyitem_StringDimension_SetF] = function(oClass, value) { + drawingsChangesMap[AscDFH.historyitem_Dimension_SetF] = function(oClass, value) { oClass.f = value; }; - drawingsChangesMap[AscDFH.historyitem_StringDimension_SetNf] = function(oClass, value) { + drawingsChangesMap[AscDFH.historyitem_Dimension_SetNf] = function(oClass, value) { oClass.nf = value; }; - drawingsChangesMap[AscDFH.historyitem_StringDimension_SetLvl] = function(oClass, value) { - oClass.lvl = value; - }; - drawingsChangesMap[AscDFH.historyitem_StringDimension_SetType] = function(oClass, value) { + drawingsChangesMap[AscDFH.historyitem_Dimension_SetType] = function(oClass, value) { oClass.type = value; }; + drawingsChangesMap[AscDFH.historyitem_Dimension_SetExtLst] = function(oClass, value) { + oClass.extLst = value; + }; AscDFH.changesFactory[AscDFH.historyitem_Dimension_SetF] = window['AscDFH'].CChangesDrawingsObjectNoId; AscDFH.changesFactory[AscDFH.historyitem_Dimension_SetNf] = window['AscDFH'].CChangesDrawingsString; - AscDFH.changesFactory[AscDFH.historyitem_Dimension_SetLvl] = window['AscDFH'].CChangesDrawingsObjectNoId; AscDFH.changesFactory[AscDFH.historyitem_Dimension_SetType] = window['AscDFH'].CChangesDrawingsObjectNoId; + AscDFH.changesFactory[AscDFH.historyitem_Dimension_SetExtLst] = window['AscDFH'].CChangesDrawingsObjectNoId; function CDimension() { CBaseChartObject.call(this); this.f = null; this.nf = null; - this.lvl = null; this.type = null; + this.extLst = null; } InitClass(CDimension, CBaseChartObject, AscDFH.historyitem_type_Dimension); @@ -3046,14 +3046,14 @@ History.CanAddChanges() && History.Add(new CChangesDrawingsString(this, AscDFH.historyitem_Dimension_SetNf, this.nf, pr)); this.nf = pr; }; - CDimension.prototype.setLvl = function(pr) { - History.CanAddChanges() && History.Add(new CChangesDrawingsObjectNoId(this, AscDFH.historyitem_Dimension_SetLvl, this.lvl, pr)); - this.lvl = pr; - }; CDimension.prototype.setType = function(pr) { History.CanAddChanges() && History.Add(new CChangesDrawingsObjectNoId(this, AscDFH.historyitem_Dimension_SetType, this.type, pr)); this.type = pr; }; + CDimension.prototype.setExtLst = function(pr) { + History.CanAddChanges() && History.Add(new CChangesDrawingsObjectNoId(this, AscDFH.historyitem_Dimension_SetExtLst, this.extLst, pr)); + this.extLst = pr; + }; window['AscFormat'].CDimension = CDimension; // StringDimension @@ -3351,8 +3351,8 @@ drawingsChangesMap[AscDFH.historyitem_ValueColorMiddlePosition_SetPercent] = function(oClass, value) { oClass.percent = value; }; - AscDFH.changesFactory[AscDFH.historyitem_ValueColorMiddlePosition_SetNumber] = window['AscDFH'].CChangesDrawingsString; - AscDFH.changesFactory[AscDFH.historyitem_ValueColorMiddlePosition_SetPercent] = window['AscDFH'].CChangesDrawingsString; + AscDFH.changesFactory[AscDFH.historyitem_ValueColorMiddlePosition_SetNumber] = window['AscDFH'].CChangesDrawingsObjectNoId; + AscDFH.changesFactory[AscDFH.historyitem_ValueColorMiddlePosition_SetPercent] = window['AscDFH'].CChangesDrawingsObjectNoId; function CValueColorMiddlePosition() { CBaseChartObject.call(this); this.number = null; @@ -3362,11 +3362,11 @@ InitClass(CValueColorMiddlePosition, CBaseChartObject, AscDFH.historyitem_type_ValueColorMiddlePosition); CValueColorMiddlePosition.prototype.setNumber = function(pr) { - History.CanAddChanges() && History.Add(new CChangesDrawingsString(this, AscDFH.historyitem_ValueColorMiddlePosition_SetNumber, this.number, pr)); + History.CanAddChanges() && History.Add(new CChangesDrawingsObjectNoId(this, AscDFH.historyitem_ValueColorMiddlePosition_SetNumber, this.number, pr)); this.number = pr; }; CValueColorMiddlePosition.prototype.setPercent = function(pr) { - History.CanAddChanges() && History.Add(new CChangesDrawingsString(this, AscDFH.historyitem_ValueColorMiddlePosition_SetPercent, this.percent, pr)); + History.CanAddChanges() && History.Add(new CChangesDrawingsObjectNoId(this, AscDFH.historyitem_ValueColorMiddlePosition_SetPercent, this.percent, pr)); this.percent = pr; }; window['AscFormat'].CValueColorMiddlePosition = CValueColorMiddlePosition; @@ -3384,10 +3384,10 @@ drawingsChangesMap[AscDFH.historyitem_ValueColorPositions_SetCount] = function(oClass, value) { oClass.count = value; }; - AscDFH.changesFactory[AscDFH.historyitem_ValueColorPositions_SetMin] = window['AscDFH'].CChangesDrawingsString; - AscDFH.changesFactory[AscDFH.historyitem_ValueColorPositions_SetMid] = window['AscDFH'].CChangesDrawingsString; - AscDFH.changesFactory[AscDFH.historyitem_ValueColorPositions_SetMax] = window['AscDFH'].CChangesDrawingsString; - AscDFH.changesFactory[AscDFH.historyitem_ValueColorPositions_SetCount] = window['AscDFH'].CChangesDrawingsString; + AscDFH.changesFactory[AscDFH.historyitem_ValueColorPositions_SetMin] = window['AscDFH'].CChangesDrawingsObjectNoId; + AscDFH.changesFactory[AscDFH.historyitem_ValueColorPositions_SetMid] = window['AscDFH'].CChangesDrawingsObjectNoId; + AscDFH.changesFactory[AscDFH.historyitem_ValueColorPositions_SetMax] = window['AscDFH'].CChangesDrawingsObjectNoId; + AscDFH.changesFactory[AscDFH.historyitem_ValueColorPositions_SetCount] = window['AscDFH'].CChangesDrawingsLong; function CValueColorPositions() { CBaseChartObject.call(this); this.min = null; @@ -3399,19 +3399,19 @@ InitClass(CValueColorPositions, CBaseChartObject, AscDFH.historyitem_type_ValueColorPositions); CValueColorPositions.prototype.setMin = function(pr) { - History.CanAddChanges() && History.Add(new CChangesDrawingsString(this, AscDFH.historyitem_ValueColorPositions_SetMin, this.min, pr)); + History.CanAddChanges() && History.Add(new CChangesDrawingsObjectNoId(this, AscDFH.historyitem_ValueColorPositions_SetMin, this.min, pr)); this.min = pr; }; CValueColorPositions.prototype.setMid = function(pr) { - History.CanAddChanges() && History.Add(new CChangesDrawingsString(this, AscDFH.historyitem_ValueColorPositions_SetMid, this.mid, pr)); + History.CanAddChanges() && History.Add(new CChangesDrawingsObjectNoId(this, AscDFH.historyitem_ValueColorPositions_SetMid, this.mid, pr)); this.mid = pr; }; CValueColorPositions.prototype.setMax = function(pr) { - History.CanAddChanges() && History.Add(new CChangesDrawingsString(this, AscDFH.historyitem_ValueColorPositions_SetMax, this.max, pr)); + History.CanAddChanges() && History.Add(new CChangesDrawingsObjectNoId(this, AscDFH.historyitem_ValueColorPositions_SetMax, this.max, pr)); this.max = pr; }; CValueColorPositions.prototype.setCount = function(pr) { - History.CanAddChanges() && History.Add(new CChangesDrawingsString(this, AscDFH.historyitem_ValueColorPositions_SetCount, this.count, pr)); + History.CanAddChanges() && History.Add(new CChangesDrawingsLong(this, AscDFH.historyitem_ValueColorPositions_SetCount, this.count, pr)); this.count = pr; }; window['AscFormat'].CValueColorPositions = CValueColorPositions; @@ -3426,9 +3426,9 @@ drawingsChangesMap[AscDFH.historyitem_ValueColors_SetMaxColor] = function(oClass, value) { oClass.maxColor = value; }; - AscDFH.changesFactory[AscDFH.historyitem_ValueColors_SetMinColor] = window['AscDFH'].CChangesDrawingsString; - AscDFH.changesFactory[AscDFH.historyitem_ValueColors_SetMidColor] = window['AscDFH'].CChangesDrawingsString; - AscDFH.changesFactory[AscDFH.historyitem_ValueColors_SetMaxColor] = window['AscDFH'].CChangesDrawingsString; + AscDFH.changesFactory[AscDFH.historyitem_ValueColors_SetMinColor] = window['AscDFH'].CChangesDrawingsObjectNoId; + AscDFH.changesFactory[AscDFH.historyitem_ValueColors_SetMidColor] = window['AscDFH'].CChangesDrawingsObjectNoId; + AscDFH.changesFactory[AscDFH.historyitem_ValueColors_SetMaxColor] = window['AscDFH'].CChangesDrawingsObjectNoId; function CValueColors() { CBaseChartObject.call(this); this.minColor = null; @@ -3439,15 +3439,15 @@ InitClass(CValueColors, CBaseChartObject, AscDFH.historyitem_type_ValueColors); CValueColors.prototype.setMinColor = function(pr) { - History.CanAddChanges() && History.Add(new CChangesDrawingsString(this, AscDFH.historyitem_ValueColors_SetMinColor, this.minColor, pr)); + History.CanAddChanges() && History.Add(new CChangesDrawingsObjectNoId(this, AscDFH.historyitem_ValueColors_SetMinColor, this.minColor, pr)); this.minColor = pr; }; CValueColors.prototype.setMidColor = function(pr) { - History.CanAddChanges() && History.Add(new CChangesDrawingsString(this, AscDFH.historyitem_ValueColors_SetMidColor, this.midColor, pr)); + History.CanAddChanges() && History.Add(new CChangesDrawingsObjectNoId(this, AscDFH.historyitem_ValueColors_SetMidColor, this.midColor, pr)); this.midColor = pr; }; CValueColors.prototype.setMaxColor = function(pr) { - History.CanAddChanges() && History.Add(new CChangesDrawingsString(this, AscDFH.historyitem_ValueColors_SetMaxColor, this.maxColor, pr)); + History.CanAddChanges() && History.Add(new CChangesDrawingsObjectNoId(this, AscDFH.historyitem_ValueColors_SetMaxColor, this.maxColor, pr)); this.maxColor = pr; }; window['AscFormat'].CValueColors = CValueColors; @@ -3635,6 +3635,114 @@ }; window['AscFormat'].CTickMarksType = CTickMarksType; + // EntityType + drawingsChangesMap[AscDFH.historyitem_EntityType_SetEntityType] = function(oClass, value) { + oClass.entityType = value; + }; + AscDFH.changesFactory[AscDFH.historyitem_EntityType_SetEntityType] = window['AscDFH'].CChangesDrawingsLong; + function CEntityType() { + CBaseChartObject.call(this); + this.entityType = null; + } + + InitClass(CEntityType, CBaseChartObject, AscDFH.historyitem_type_EntityType); + + CEntityType.prototype.setEntityType = function(pr) { + History.CanAddChanges() && History.Add(new CChangesDrawingsLong(this, AscDFH.historyitem_EntityType_SetEntityType, this.entityType, pr)); + this.entityType = pr; + }; + window['AscFormat'].CEntityType = CEntityType; + + // GeoProjectionType + drawingsChangesMap[AscDFH.historyitem_GeoProjectionType_SetGeoProjectionType] = function(oClass, value) { + oClass.geoProjectionType = value; + }; + AscDFH.changesFactory[AscDFH.historyitem_GeoProjectionType_SetGeoProjectionType] = window['AscDFH'].CChangesDrawingsLong; + function CGeoProjectionType() { + CBaseChartObject.call(this); + this.geoProjectionType = null; + } + + InitClass(CGeoProjectionType, CBaseChartObject, AscDFH.historyitem_type_GeoProjectionType); + + CGeoProjectionType.prototype.setGeoProjectionType = function(pr) { + History.CanAddChanges() && History.Add(new CChangesDrawingsLong(this, AscDFH.historyitem_GeoProjectionType_SetGeoProjectionType, this.geoProjectionType, pr)); + this.geoProjectionType = pr; + }; + window['AscFormat'].CGeoProjectionType = CGeoProjectionType; + + // GeoMappingLevel + drawingsChangesMap[AscDFH.historyitem_GeoMappingLevel_SetGeoMappingLevel] = function(oClass, value) { + oClass.geoMappingLevel = value; + }; + AscDFH.changesFactory[AscDFH.historyitem_GeoMappingLevel_SetGeoMappingLevel] = window['AscDFH'].CChangesDrawingsLong; + function CGeoMappingLevel() { + CBaseChartObject.call(this); + this.geoMappingLevel = null; + } + + InitClass(CGeoMappingLevel, CBaseChartObject, AscDFH.historyitem_type_GeoMappingLevel); + + CGeoMappingLevel.prototype.setGeoMappingLevel = function(pr) { + History.CanAddChanges() && History.Add(new CChangesDrawingsLong(this, AscDFH.historyitem_GeoMappingLevel_SetGeoMappingLevel, this.geoMappingLevel, pr)); + this.geoMappingLevel = pr; + }; + window['AscFormat'].CGeoMappingLevel = CGeoMappingLevel; + + // PageOrientation + drawingsChangesMap[AscDFH.historyitem_PageOrientation_SetGeoMappingLevel] = function(oClass, value) { + oClass.pageOrientation = value; + }; + AscDFH.changesFactory[AscDFH.historyitem_PageOrientation_SetGeoMappingLevel] = window['AscDFH'].CChangesDrawingsLong; + function CPageOrientation() { + CBaseChartObject.call(this); + this.pageOrientation = null; + } + + InitClass(CPageOrientation, CBaseChartObject, AscDFH.historyitem_type_PageOrientation); + + CPageOrientation.prototype.setPageOrientation = function(pr) { + History.CanAddChanges() && History.Add(new CChangesDrawingsLong(this, AscDFH.historyitem_PageOrientation_SetGeoMappingLevel, this.pageOrientation, pr)); + this.pageOrientation = pr; + }; + window['AscFormat'].CPageOrientation = CPageOrientation; + + // LabelLayout (ST_ParentLabelLayout) + drawingsChangesMap[AscDFH.historyitem_LabelLayout_SetLabelLayout] = function(oClass, value) { + oClass.labelLayout = value; + }; + AscDFH.changesFactory[AscDFH.historyitem_LabelLayout_SetLabelLayout] = window['AscDFH'].CChangesDrawingsLong; + function CLabelLayout() { + CBaseChartObject.call(this); + this.labelLayout = null; + } + + InitClass(CLabelLayout, CBaseChartObject, AscDFH.historyitem_type_LabelLayout); + + CLabelLayout.prototype.setPageOrientation = function(pr) { + History.CanAddChanges() && History.Add(new CChangesDrawingsLong(this, AscDFH.historyitem_LabelLayout_SetLabelLayout, this.labelLayout, pr)); + this.labelLayout = pr; + }; + window['AscFormat'].CLabelLayout = CLabelLayout; + + // RegionLabelLayout (ST) + drawingsChangesMap[AscDFH.historyitem_RegionLabelLayout_SetRegionLabelLayout] = function(oClass, value) { + oClass.regionLabelLayout = value; + }; + AscDFH.changesFactory[AscDFH.historyitem_RegionLabelLayout_SetRegionLabelLayout] = window['AscDFH'].CChangesDrawingsLong; + function CRegionLabelLayout() { + CBaseChartObject.call(this); + this.regionLabelLayout = null; + } + + InitClass(CRegionLabelLayout, CBaseChartObject, AscDFH.historyitem_type_RegionLabelLayout); + + CRegionLabelLayout.prototype.setPageOrientation = function(pr) { + History.CanAddChanges() && History.Add(new CChangesDrawingsLong(this, AscDFH.historyitem_RegionLabelLayout_SetRegionLabelLayout, this.regionLabelLayout, pr)); + this.regionLabelLayout = pr; + }; + window['AscFormat'].CRegionLabelLayout = CRegionLabelLayout; + // DoubleOrAutomatic drawingsChangesMap[AscDFH.historyitem_DoubleOrAutomatic_SetDoubleValue] = function(oClass, value) { oClass.doubleValue = value; diff --git a/common/Drawings/Format/ChartFormat.js b/common/Drawings/Format/ChartFormat.js index 071c49209d..b480a13ba4 100644 --- a/common/Drawings/Format/ChartFormat.js +++ b/common/Drawings/Format/ChartFormat.js @@ -101,6 +101,12 @@ drawingsChangesMap[AscDFH.historyitem_PlotArea_SetDateAx] = function(oClass, value) { oClass.dateAx = value; }; + drawingsChangesMap[AscDFH.historyitem_PlotArea_SetPlotAreaRegion] = function(oClass, value) { + oClass.plotAreaRegion = value; + }; + drawingsChangesMap[AscDFH.historyitem_PlotArea_SetExtLst] = function(oClass, value) { + oClass.extLst = value; + }; drawingsChangesMap[AscDFH.historyitem_PlotArea_SetDTable] = function(oClass, value) { oClass.dTable = value; }; @@ -1710,6 +1716,8 @@ AscDFH.changesFactory[AscDFH.historyitem_DLbl_SetTx] = window['AscDFH'].CChangesDrawingsObject; AscDFH.changesFactory[AscDFH.historyitem_DLbl_SetTxPr] = window['AscDFH'].CChangesDrawingsObject; AscDFH.changesFactory[AscDFH.historyitem_DLbl_SetParent] = window['AscDFH'].CChangesDrawingsObject; + AscDFH.changesFactory[AscDFH.historyitem_PlotArea_SetPlotAreaRegion] = window['AscDFH'].CChangesDrawingsObjectNoId; + AscDFH.changesFactory[AscDFH.historyitem_PlotArea_SetExtLst] = window['AscDFH'].CChangesDrawingsObjectNoId; AscDFH.changesFactory[AscDFH.historyitem_PlotArea_SetDTable] = window['AscDFH'].CChangesDrawingsObject; AscDFH.changesFactory[AscDFH.historyitem_PlotArea_SetLayout] = window['AscDFH'].CChangesDrawingsObject; AscDFH.changesFactory[AscDFH.historyitem_PlotArea_SetSpPr] = window['AscDFH'].CChangesDrawingsObject; @@ -4739,6 +4747,8 @@ function CPlotArea() { CBaseChartObject.call(this); + this.plotAreaRegion = null; + this.extLst = null; this.charts = []; this.dTable = null; this.layout = null; @@ -4769,6 +4779,14 @@ InitClass(CPlotArea, CBaseChartObject, AscDFH.historyitem_type_PlotArea); CPlotArea.prototype.Refresh_RecalcData = function(data) { switch(data.Type) { + case AscDFH.historyitem_PlotArea_SetPlotAreaRegion: + { + break; + } + case AscDFH.historyitem_PlotArea_SetExtLst: + { + break; + } case AscDFH.historyitem_CommonChartFormat_SetParent: { break; @@ -5072,6 +5090,14 @@ } } }; + CPlotArea.prototype.setPlotAreaRegion = function(pr) { + History.CanAddChanges() && History.Add(new CChangesDrawingsObjectNoId(this, AscDFH.historyitem_PlotArea_SetPlotAreaRegion, this.plotAreaRegion, pr)); + this.plotAreaRegion = pr; + }; + CPlotArea.prototype.setExtLst = function(pr) { + History.CanAddChanges() && History.Add(new CChangesDrawingsObjectNoId(this, AscDFH.historyitem_PlotArea_SetExtLst, this.extLst, pr)); + this.extLst = pr; + }; CPlotArea.prototype.setDTable = function(pr) { History.CanAddChanges() && History.Add(new CChangesDrawingsObject(this, AscDFH.historyitem_PlotArea_SetDTable, this.dTable, pr)); this.dTable = pr; From d1443d508be752e2bbf38fa8691e35fbdbe92801 Mon Sep 17 00:00:00 2001 From: Dmitriy Alexandrov Date: Wed, 9 Aug 2023 22:04:09 +0600 Subject: [PATCH 10/30] edit types in classes --- common/Drawings/Format/ChartEx.js | 206 ++++++++++++++++++++++++++++-- 1 file changed, 193 insertions(+), 13 deletions(-) diff --git a/common/Drawings/Format/ChartEx.js b/common/Drawings/Format/ChartEx.js index 8e421c54a5..2ccb2d8142 100644 --- a/common/Drawings/Format/ChartEx.js +++ b/common/Drawings/Format/ChartEx.js @@ -40,7 +40,7 @@ oClass.isoCountryCode = value; }; - // CAddress + // Address AscDFH.changesFactory[AscDFH.historyitem_Address_SetAddress1] = window['AscDFH'].CChangesDrawingsString; AscDFH.changesFactory[AscDFH.historyitem_Address_SetCountryRegion] = window['AscDFH'].CChangesDrawingsString; AscDFH.changesFactory[AscDFH.historyitem_Address_SetAdminDistrict1] = window['AscDFH'].CChangesDrawingsString; @@ -588,6 +588,21 @@ History.CanAddChanges() && History.Add(new CChangesDrawingsObject(this, AscDFH.historyitem_ChartData_SetData, this.data, pr)); this.data = pr; }; + CChartData.prototype.addData = function(pr, idx) { + var pos; + if(AscFormat.isRealNumber(idx)) + pos = idx; + else + pos = this.data.length; + History.CanAddChanges() && History.Add(new CChangesDrawingsContent(this, AscDFH.historyitem_ChartData_AddData, pos, [pr], true)); + this.data.splice(pos, 0, pr); + }; + CChartData.prototype.removeDataByPos = function(pos) { + if(this.data[pos]) { + var data = this.data.splice(pos, 1)[0]; + History.CanAddChanges() && History.Add(new CChangesDrawingsContent(this, AscDFH.historyitem_ChartData_RemoveData, pos, [data], false)); + } + }; CChartData.prototype.setExtLst = function(pr) { History.CanAddChanges() && History.Add(new CChangesDrawingsObjectNoId(this, AscDFH.historyitem_ChartData_SetExtLst, this.extLst, pr)); this.extLst = pr; @@ -857,6 +872,21 @@ History.CanAddChanges() && History.Add(new CChangesDrawingsObjectNoId(this, AscDFH.historyitem_Data_SetDimension, this.dimension, pr)); this.dimension = pr; }; + CData.prototype.addDimension = function(pr, idx) { + var pos; + if(AscFormat.isRealNumber(idx)) + pos = idx; + else + pos = this.dimension.length; + History.CanAddChanges() && History.Add(new CChangesDrawingsContent(this, AscDFH.historyitem_Data_AddDimension, pos, [pr], true)); + this.dimension.splice(pos, 0, pr); + }; + CData.prototype.removeDimensionByPos = function(pos) { + if(this.dimension[pos]) { + var dimension = this.dimension.splice(pos, 1)[0]; + History.CanAddChanges() && History.Add(new CChangesDrawingsContent(this, AscDFH.historyitem_Data_RemoveDimension, pos, [dimension], false)); + } + }; CData.prototype.setExtLst = function(pr) { History.CanAddChanges() && History.Add(new CChangesDrawingsObjectNoId(this, AscDFH.historyitem_Data_SetExtLst, this.extLst, pr)); this.extLst = pr; @@ -1060,10 +1090,40 @@ History.CanAddChanges() && History.Add(new CChangesDrawingsObjectNoId(this, AscDFH.historyitem_DataLabels_SetDataLabel, this.dataLabel, pr)); this.dataLabel = pr; }; + CDataLabels.prototype.addDataLabel = function(pr, idx) { + var pos; + if(AscFormat.isRealNumber(idx)) + pos = idx; + else + pos = this.dataLabel.length; + History.CanAddChanges() && History.Add(new CChangesDrawingsContent(this, AscDFH.historyitem_DataLabels_AddDataLabel, pos, [pr], true)); + this.dataLabel.splice(pos, 0, pr); + }; + CDataLabels.prototype.removeDataLabelByPos = function(pos) { + if(this.dataLabel[pos]) { + var dataLabel = this.dataLabel.splice(pos, 1)[0]; + History.CanAddChanges() && History.Add(new CChangesDrawingsContent(this, AscDFH.historyitem_DataLabels_RemoveDataLabel, pos, [dataLabel], false)); + } + }; CDataLabels.prototype.setDataLabelHidden = function(pr) { History.CanAddChanges() && History.Add(new CChangesDrawingsObjectNoId(this, AscDFH.historyitem_DataLabels_SetDataLabelHidden, this.dataLabelHidden, pr)); this.dataLabelHidden = pr; }; + CDataLabels.prototype.addDataLabelHidden = function(pr, idx) { + var pos; + if(AscFormat.isRealNumber(idx)) + pos = idx; + else + pos = this.dataLabelHidden.length; + History.CanAddChanges() && History.Add(new CChangesDrawingsContent(this, AscDFH.historyitem_DataLabels_AddDataLabelHidden, pos, [pr], true)); + this.dataLabelHidden.splice(pos, 0, pr); + }; + CDataLabels.prototype.removeDataLabelHiddenByPos = function(pos) { + if(this.dataLabelHidden[pos]) { + var dataLabelHidden = this.dataLabelHidden.splice(pos, 1)[0]; + History.CanAddChanges() && History.Add(new CChangesDrawingsContent(this, AscDFH.historyitem_DataLabels_RemoveDataLabelHidden, pos, [dataLabelHidden], false)); + } + }; CDataLabels.prototype.setExtLst = function(pr) { History.CanAddChanges() && History.Add(new CChangesDrawingsObjectNoId(this, AscDFH.historyitem_DataLabels_SetExtLst, this.extLst, pr)); this.extLst = pr; @@ -1451,13 +1511,13 @@ oClass.south = value; }; AscDFH.changesFactory[AscDFH.historyitem_GeoData_SetGeoPolygons] = window['AscDFH'].CChangesDrawingsObjectNoId; - AscDFH.changesFactory[AscDFH.historyitem_GeoData_SetGeoPolygons] = window['AscDFH'].CChangesDrawingsObjectNoId; - AscDFH.changesFactory[AscDFH.historyitem_GeoData_SetGeoPolygons] = window['AscDFH'].CChangesDrawingsString; - AscDFH.changesFactory[AscDFH.historyitem_GeoData_SetGeoPolygons] = window['AscDFH'].CChangesDrawingsString; - AscDFH.changesFactory[AscDFH.historyitem_GeoData_SetGeoPolygons] = window['AscDFH'].CChangesDrawingsDouble2; - AscDFH.changesFactory[AscDFH.historyitem_GeoData_SetGeoPolygons] = window['AscDFH'].CChangesDrawingsDouble2; - AscDFH.changesFactory[AscDFH.historyitem_GeoData_SetGeoPolygons] = window['AscDFH'].CChangesDrawingsDouble2; - AscDFH.changesFactory[AscDFH.historyitem_GeoData_SetGeoPolygons] = window['AscDFH'].CChangesDrawingsDouble2; + AscDFH.changesFactory[AscDFH.historyitem_GeoData_SetCopyrights] = window['AscDFH'].CChangesDrawingsObjectNoId; + AscDFH.changesFactory[AscDFH.historyitem_GeoData_SetEntityName] = window['AscDFH'].CChangesDrawingsString; + AscDFH.changesFactory[AscDFH.historyitem_GeoData_SetEntityId] = window['AscDFH'].CChangesDrawingsString; + AscDFH.changesFactory[AscDFH.historyitem_GeoData_SetEast] = window['AscDFH'].CChangesDrawingsDouble2; + AscDFH.changesFactory[AscDFH.historyitem_GeoData_SetWest] = window['AscDFH'].CChangesDrawingsDouble2; + AscDFH.changesFactory[AscDFH.historyitem_GeoData_SetNorth] = window['AscDFH'].CChangesDrawingsDouble2; + AscDFH.changesFactory[AscDFH.historyitem_GeoData_SetSouth] = window['AscDFH'].CChangesDrawingsDouble2; function CGeoData() { CBaseChartObject.call(this); this.geoPolygons = null; @@ -2260,6 +2320,21 @@ History.CanAddChanges() && History.Add(new CChangesDrawingsObjectNoId(this, AscDFH.historyitem_NumericDimension_SetLevelData, this.levelData, pr)); this.levelData = pr; }; + CNumericDimension.prototype.addLevelData = function(pr, idx) { + var pos; + if(AscFormat.isRealNumber(idx)) + pos = idx; + else + pos = this.levelData.length; + History.CanAddChanges() && History.Add(new CChangesDrawingsContent(this, AscDFH.historyitem_NumericDimension_AddLevelData, pos, [pr], true)); + this.levelData.splice(pos, 0, pr); + }; + CNumericDimension.prototype.removeLevelDataByPos = function(pos) { + if(this.levelData[pos]) { + var levelData = this.levelData.splice(pos, 1)[0]; + History.CanAddChanges() && History.Add(new CChangesDrawingsContent(this, AscDFH.historyitem_NumericDimension_RemoveLevelData, pos, [levelData], false)); + } + }; window['AscFormat'].CNumericDimension = CNumericDimension; // NumericLevel @@ -2293,6 +2368,21 @@ History.CanAddChanges() && History.Add(new CChangesDrawingsObjectNoId(this, AscDFH.historyitem_NumericLevel_SetPt, this.pt, pr)); this.pt = pr; }; + CNumericLevel.prototype.addPt = function(pr, idx) { + var pos; + if(AscFormat.isRealNumber(idx)) + pos = idx; + else + pos = this.pt.length; + History.CanAddChanges() && History.Add(new CChangesDrawingsContent(this, AscDFH.historyitem_NumericLevel_AddPt, pos, [pr], true)); + this.pt.splice(pos, 0, pr); + }; + CNumericLevel.prototype.removePtByPos = function(pos) { + if(this.pt[pos]) { + var pt = this.pt.splice(pos, 1)[0]; + History.CanAddChanges() && History.Add(new CChangesDrawingsContent(this, AscDFH.historyitem_NumericLevel_RemovePt, pos, [pt], false)); + } + }; CNumericLevel.prototype.setPtCount = function(pr) { History.CanAddChanges() && History.Add(new CChangesDrawingsLong(this, AscDFH.historyitem_NumericLevel_SetPtCount, this.ptCount, pr)); this.ptCount = pr; @@ -2598,6 +2688,21 @@ History.CanAddChanges() && History.Add(new CChangesDrawingsObjectNoId(this, AscDFH.historyitem_PlotAreaRegion_SetSeries, this.series, pr)); this.series = pr; }; + CPlotAreaRegion.prototype.addSeries = function(pr, idx) { + var pos; + if(AscFormat.isRealNumber(idx)) + pos = idx; + else + pos = this.series.length; + History.CanAddChanges() && History.Add(new CChangesDrawingsContent(this, AscDFH.historyitem_PlotAreaRegion_AddSeries, pos, [pr], true)); + this.series.splice(pos, 0, pr); + }; + CPlotAreaRegion.prototype.removeSeriesByPos = function(pos) { + if(this.series[pos]) { + var series = this.series.splice(pos, 1)[0]; + History.CanAddChanges() && History.Add(new CChangesDrawingsContent(this, AscDFH.historyitem_PlotAreaRegion_RemoveSeries, pos, [series], false)); + } + }; CPlotAreaRegion.prototype.setExtLst = function(pr) { History.CanAddChanges() && History.Add(new CChangesDrawingsObjectNoId(this, AscDFH.historyitem_PlotAreaRegion_SetExtLst, this.extLst, pr)); this.extLst = pr; @@ -2806,6 +2911,21 @@ History.CanAddChanges() && History.Add(new CChangesDrawingsObjectNoId(this, AscDFH.historyitem_Series_SetDataPt, this.dataPt, pr)); this.dataPt = pr; }; + CSeries.prototype.addDataPt = function(pr, idx) { + var pos; + if(AscFormat.isRealNumber(idx)) + pos = idx; + else + pos = this.dataPt.length; + History.CanAddChanges() && History.Add(new CChangesDrawingsContent(this, AscDFH.historyitem_Series_AddDataPt, pos, [pr], true)); + this.dataPt.splice(pos, 0, pr); + }; + CSeries.prototype.removeDataPtByPos = function(pos) { + if(this.dataPt[pos]) { + var dataPt = this.dataPt.splice(pos, 1)[0]; + History.CanAddChanges() && History.Add(new CChangesDrawingsContent(this, AscDFH.historyitem_Series_RemoveDataPt, pos, [dataPt], false)); + } + }; CSeries.prototype.setDataLabels = function(pr) { History.CanAddChanges() && History.Add(new CChangesDrawingsObjectNoId(this, AscDFH.historyitem_Series_SetDataLabels, this.dataLabels, pr)); this.dataLabels = pr; @@ -2822,6 +2942,21 @@ History.CanAddChanges() && History.Add(new CChangesDrawingsObjectNoId(this, AscDFH.historyitem_Series_SetAxisId, this.axisId, pr)); this.axisId = pr; }; + CSeries.prototype.addAxisId = function(pr, idx) { + var pos; + if(AscFormat.isRealNumber(idx)) + pos = idx; + else + pos = this.axisId.length; + History.CanAddChanges() && History.Add(new CChangesDrawingsContent(this, AscDFH.historyitem_Series_AddAxisId, pos, [pr], true)); + this.axisId.splice(pos, 0, pr); + }; + CSeries.prototype.removeAxisIdByPos = function(pos) { + if(this.axisId[pos]) { + var axisId = this.axisId.splice(pos, 1)[0]; + History.CanAddChanges() && History.Add(new CChangesDrawingsContent(this, AscDFH.historyitem_Series_RemoveAxisId, pos, [axisId], false)); + } + }; CSeries.prototype.setExtLst = function(pr) { History.CanAddChanges() && History.Add(new CChangesDrawingsObjectNoId(this, AscDFH.historyitem_Series_SetExtLst, this.extLst, pr)); this.extLst = pr; @@ -3060,7 +3195,7 @@ drawingsChangesMap[AscDFH.historyitem_StringDimension_SetLevelData] = function(oClass, value) { oClass.levelData = value; }; - AscDFH.changesFactory[AscDFH.historyitem_StringDimension_SetF] = window['AscDFH'].CChangesDrawingsObjectNoId; + AscDFH.changesFactory[AscDFH.historyitem_StringDimension_SetLevelData] = window['AscDFH'].CChangesDrawingsObjectNoId; function CStringDimension() { CBaseChartObject.call(this); this.levelData = []; @@ -3072,6 +3207,21 @@ History.CanAddChanges() && History.Add(new CChangesDrawingsObjectNoId(this, AscDFH.historyitem_StringDimension_SetLevelData, this.levelData, pr)); this.levelData = pr; }; + CStringDimension.prototype.addLevelData = function(pr, idx) { + var pos; + if(AscFormat.isRealNumber(idx)) + pos = idx; + else + pos = this.levelData.length; + History.CanAddChanges() && History.Add(new CChangesDrawingsContent(this, AscDFH.historyitem_StringDimension_AddLevelData, pos, [pr], true)); + this.levelData.splice(pos, 0, pr); + }; + CStringDimension.prototype.removeLevelDataByPos = function(pos) { + if(this.levelData[pos]) { + var levelData = this.levelData.splice(pos, 1)[0]; + History.CanAddChanges() && History.Add(new CChangesDrawingsContent(this, AscDFH.historyitem_StringDimension_RemoveLevelData, pos, [levelData], false)); + } + }; window['AscFormat'].CStringDimension = CStringDimension; // StringLevel @@ -3100,6 +3250,21 @@ History.CanAddChanges() && History.Add(new CChangesDrawingsObjectNoId(this, AscDFH.historyitem_StringLevel_SetPt, this.pt, pr)); this.pt = pr; }; + CStringLevel.prototype.addPt = function(pr, idx) { + var pos; + if(AscFormat.isRealNumber(idx)) + pos = idx; + else + pos = this.pt.length; + History.CanAddChanges() && History.Add(new CChangesDrawingsContent(this, AscDFH.historyitem_StringLevel_AddPt, pos, [pr], true)); + this.pt.splice(pos, 0, pr); + }; + CStringLevel.prototype.removePtByPos = function(pos) { + if(this.pt[pos]) { + var pt = this.pt.splice(pos, 1)[0]; + History.CanAddChanges() && History.Add(new CChangesDrawingsContent(this, AscDFH.historyitem_StringLevel_RemovePt, pos, [pt], false)); + } + }; CStringLevel.prototype.setPtCount = function(pr) { History.CanAddChanges() && History.Add(new CChangesDrawingsLong(this, AscDFH.historyitem_StringLevel_SetPtCount, this.ptCount, pr)); this.ptCount = pr; @@ -3153,6 +3318,21 @@ History.CanAddChanges() && History.Add(new CChangesDrawingsObjectNoId(this, AscDFH.historyitem_Subtotals_SetIdx, this.idx, pr)); this.idx = pr; }; + CSubtotals.prototype.addIdx = function(pr, idx) { + var pos; + if(AscFormat.isRealNumber(idx)) + pos = idx; + else + pos = this.idx.length; + History.CanAddChanges() && History.Add(new CChangesDrawingsContent(this, AscDFH.historyitem_Subtotals_AddIdx, pos, [pr], true)); + this.idx.splice(pos, 0, pr); + }; + CSubtotals.prototype.removeIdxByPos = function(pos) { + if(this.idx[pos]) { + var idx = this.idx.splice(pos, 1)[0]; + History.CanAddChanges() && History.Add(new CChangesDrawingsContent(this, AscDFH.historyitem_Subtotals_RemoveIdx, pos, [idx], false)); + } + }; window['AscFormat'].CSubtotals = CSubtotals; // Text @@ -3540,7 +3720,7 @@ InitClass(CIntervalClosedSide, CBaseChartObject, AscDFH.historyitem_type_IntervalClosedSide); CIntervalClosedSide.prototype.setIntervalClosedSide = function(pr) { - History.CanAddChanges() && History.Add(new CChangesDrawingsLong(this, AscDFH.historyitem_IntervalClosedSide_SetIntervalClosedSide, this.side, pr)); + History.CanAddChanges() && History.Add(new CChangesDrawingsLong(this, AscDFH.historyitem_IntervalClosedSide_SetIntervalClosedSide, this.intervalClosedSide, pr)); this.intervalClosedSide = pr; }; window['AscFormat'].CIntervalClosedSide = CIntervalClosedSide; @@ -3690,10 +3870,10 @@ window['AscFormat'].CGeoMappingLevel = CGeoMappingLevel; // PageOrientation - drawingsChangesMap[AscDFH.historyitem_PageOrientation_SetGeoMappingLevel] = function(oClass, value) { + drawingsChangesMap[AscDFH.historyitem_PageOrientation_SetPageOrientation] = function(oClass, value) { oClass.pageOrientation = value; }; - AscDFH.changesFactory[AscDFH.historyitem_PageOrientation_SetGeoMappingLevel] = window['AscDFH'].CChangesDrawingsLong; + AscDFH.changesFactory[AscDFH.historyitem_PageOrientation_SetPageOrientation] = window['AscDFH'].CChangesDrawingsLong; function CPageOrientation() { CBaseChartObject.call(this); this.pageOrientation = null; @@ -3702,7 +3882,7 @@ InitClass(CPageOrientation, CBaseChartObject, AscDFH.historyitem_type_PageOrientation); CPageOrientation.prototype.setPageOrientation = function(pr) { - History.CanAddChanges() && History.Add(new CChangesDrawingsLong(this, AscDFH.historyitem_PageOrientation_SetGeoMappingLevel, this.pageOrientation, pr)); + History.CanAddChanges() && History.Add(new CChangesDrawingsLong(this, AscDFH.historyitem_PageOrientation_SetPageOrientation, this.pageOrientation, pr)); this.pageOrientation = pr; }; window['AscFormat'].CPageOrientation = CPageOrientation; From a186a8d6f2fb37ad697745ccd40c3e2467122669 Mon Sep 17 00:00:00 2001 From: Dmitriy Alexandrov Date: Thu, 10 Aug 2023 22:29:52 +0600 Subject: [PATCH 11/30] edit types in classes --- common/Drawings/Format/ChartEx.js | 1243 +++++++++++++------------ common/Drawings/Format/ChartFormat.js | 38 + 2 files changed, 685 insertions(+), 596 deletions(-) diff --git a/common/Drawings/Format/ChartEx.js b/common/Drawings/Format/ChartEx.js index 2ccb2d8142..05a8ad70f1 100644 --- a/common/Drawings/Format/ChartEx.js +++ b/common/Drawings/Format/ChartEx.js @@ -17,7 +17,7 @@ var CChangesDrawingsObjectNoId = AscDFH.CChangesDrawingsObjectNoId; var CChangesDrawingsDouble2 = AscDFH.CChangesDrawingsDouble2; - // CAddress + // Address drawingsChangesMap[AscDFH.historyitem_Address_SetAddress1] = function(oClass, value) { oClass.address1 = value; }; @@ -40,7 +40,6 @@ oClass.isoCountryCode = value; }; - // Address AscDFH.changesFactory[AscDFH.historyitem_Address_SetAddress1] = window['AscDFH'].CChangesDrawingsString; AscDFH.changesFactory[AscDFH.historyitem_Address_SetCountryRegion] = window['AscDFH'].CChangesDrawingsString; AscDFH.changesFactory[AscDFH.historyitem_Address_SetAdminDistrict1] = window['AscDFH'].CChangesDrawingsString; @@ -241,79 +240,79 @@ }; window['AscFormat'].CAxis = CAxis; - // Title - drawingsChangesMap[AscDFH.historyitem_Title_SetTx] = function(oClass, value) { - oClass.tx = value; - }; - drawingsChangesMap[AscDFH.historyitem_Title_SetSpPr] = function(oClass, value) { - oClass.spPr = value; - }; - drawingsChangesMap[AscDFH.historyitem_Title_SetTxPr] = function(oClass, value) { - oClass.txPr = value; - }; - drawingsChangesMap[AscDFH.historyitem_Title_SetExtLst] = function(oClass, value) { - oClass.extLst = value; - }; - drawingsChangesMap[AscDFH.historyitem_Title_SetPos] = function(oClass, value) { - oClass.pos = value; - }; - drawingsChangesMap[AscDFH.historyitem_Title_SetAlign] = function(oClass, value) { - oClass.align = value; - }; - drawingsChangesMap[AscDFH.historyitem_Title_SetOverlay] = function(oClass, value) { - oClass.overlay = value; - }; - AscDFH.changesFactory[AscDFH.historyitem_Title_SetTx] = window['AscDFH'].CChangesDrawingsObjectNoId; - AscDFH.changesFactory[AscDFH.historyitem_Title_SetSpPr] = window['AscDFH'].CChangesDrawingsObjectNoId; - AscDFH.changesFactory[AscDFH.historyitem_Title_SetTxPr] = window['AscDFH'].CChangesDrawingsObjectNoId; - AscDFH.changesFactory[AscDFH.historyitem_Title_SetExtLst] = window['AscDFH'].CChangesDrawingsObjectNoId; - AscDFH.changesFactory[AscDFH.historyitem_Title_SetPos] = window['AscDFH'].CChangesDrawingsObjectNoId; - AscDFH.changesFactory[AscDFH.historyitem_Title_SetAlign] = window['AscDFH'].CChangesDrawingsObjectNoId; - AscDFH.changesFactory[AscDFH.historyitem_Title_SetOverlay] = window['AscDFH'].CChangesDrawingsBool; - function CTitle() { - CBaseChartObject.call(this); - this.tx = null; - this.spPr = null; - this.txPr = null; - this.extLst = null; + // // Title (contains in ChartFormat.js) + // drawingsChangesMap[AscDFH.historyitem_Title_SetTx] = function(oClass, value) { + // oClass.tx = value; + // }; + // drawingsChangesMap[AscDFH.historyitem_Title_SetSpPr] = function(oClass, value) { + // oClass.spPr = value; + // }; + // drawingsChangesMap[AscDFH.historyitem_Title_SetTxPr] = function(oClass, value) { + // oClass.txPr = value; + // }; + // drawingsChangesMap[AscDFH.historyitem_Title_SetExtLst] = function(oClass, value) { + // oClass.extLst = value; + // }; + // drawingsChangesMap[AscDFH.historyitem_Title_SetPos] = function(oClass, value) { + // oClass.pos = value; + // }; + // drawingsChangesMap[AscDFH.historyitem_Title_SetAlign] = function(oClass, value) { + // oClass.align = value; + // }; + // drawingsChangesMap[AscDFH.historyitem_Title_SetOverlay] = function(oClass, value) { + // oClass.overlay = value; + // }; + // AscDFH.changesFactory[AscDFH.historyitem_Title_SetTx] = window['AscDFH'].CChangesDrawingsObjectNoId; + // AscDFH.changesFactory[AscDFH.historyitem_Title_SetSpPr] = window['AscDFH'].CChangesDrawingsObjectNoId; + // AscDFH.changesFactory[AscDFH.historyitem_Title_SetTxPr] = window['AscDFH'].CChangesDrawingsObjectNoId; + // AscDFH.changesFactory[AscDFH.historyitem_Title_SetExtLst] = window['AscDFH'].CChangesDrawingsObjectNoId; + // AscDFH.changesFactory[AscDFH.historyitem_Title_SetPos] = window['AscDFH'].CChangesDrawingsObjectNoId; + // AscDFH.changesFactory[AscDFH.historyitem_Title_SetAlign] = window['AscDFH'].CChangesDrawingsObjectNoId; + // AscDFH.changesFactory[AscDFH.historyitem_Title_SetOverlay] = window['AscDFH'].CChangesDrawingsBool; + // function CTitle() { + // CBaseChartObject.call(this); + // this.tx = null; + // this.spPr = null; + // this.txPr = null; + // this.extLst = null; - //for chart title only (but not axis title) - this.pos = null; - this.align = null; - this.overlay = null; - } + // //for chart title only (but not axis title) + // this.pos = null; + // this.align = null; + // this.overlay = null; + // } - InitClass(CTitle, CBaseChartObject, AscDFH.historyitem_type_Title); + // InitClass(CTitle, CBaseChartObject, AscDFH.historyitem_type_Title); - CTitle.prototype.setTx = function(pr) { - History.CanAddChanges() && History.Add(new CChangesDrawingsObjectNoId(this, AscDFH.historyitem_Title_SetTx, this.tx, pr)); - this.tx = pr; - }; - CTitle.prototype.setSpPr = function(pr) { - History.CanAddChanges() && History.Add(new CChangesDrawingsObjectNoId(this, AscDFH.historyitem_Title_SetSpPr, this.spPr, pr)); - this.spPr = pr; - }; - CTitle.prototype.setTxPr = function(pr) { - History.CanAddChanges() && History.Add(new CChangesDrawingsObjectNoId(this, AscDFH.historyitem_Title_SetTxPr, this.txPr, pr)); - this.txPr = pr; - }; - CTitle.prototype.setExtLst = function(pr) { - History.CanAddChanges() && History.Add(new CChangesDrawingsObjectNoId(this, AscDFH.historyitem_Title_SetExtLst, this.extLst, pr)); - this.extLst = pr; - }; - CTitle.prototype.setPos = function(pr) { - History.CanAddChanges() && History.Add(new CChangesDrawingsObjectNoId(this, AscDFH.historyitem_Title_SetPos, this.pos, pr)); - this.pos = pr; - }; - CTitle.prototype.setAlign = function(pr) { - History.CanAddChanges() && History.Add(new CChangesDrawingsObjectNoId(this, AscDFH.historyitem_Title_SetAlign, this.align, pr)); - this.align = pr; - }; - CTitle.prototype.setOverlay = function(pr) { - History.CanAddChanges() && History.Add(new CChangesDrawingsBool(this, AscDFH.historyitem_Title_SetOverlay, this.overlay, pr)); - this.overlay = pr; - }; - window['AscFormat'].CTitle = CTitle; + // CTitle.prototype.setTx = function(pr) { + // History.CanAddChanges() && History.Add(new CChangesDrawingsObjectNoId(this, AscDFH.historyitem_Title_SetTx, this.tx, pr)); + // this.tx = pr; + // }; + // CTitle.prototype.setSpPr = function(pr) { + // History.CanAddChanges() && History.Add(new CChangesDrawingsObjectNoId(this, AscDFH.historyitem_Title_SetSpPr, this.spPr, pr)); + // this.spPr = pr; + // }; + // CTitle.prototype.setTxPr = function(pr) { + // History.CanAddChanges() && History.Add(new CChangesDrawingsObjectNoId(this, AscDFH.historyitem_Title_SetTxPr, this.txPr, pr)); + // this.txPr = pr; + // }; + // CTitle.prototype.setExtLst = function(pr) { + // History.CanAddChanges() && History.Add(new CChangesDrawingsObjectNoId(this, AscDFH.historyitem_Title_SetExtLst, this.extLst, pr)); + // this.extLst = pr; + // }; + // CTitle.prototype.setPos = function(pr) { + // History.CanAddChanges() && History.Add(new CChangesDrawingsObjectNoId(this, AscDFH.historyitem_Title_SetPos, this.pos, pr)); + // this.pos = pr; + // }; + // CTitle.prototype.setAlign = function(pr) { + // History.CanAddChanges() && History.Add(new CChangesDrawingsObjectNoId(this, AscDFH.historyitem_Title_SetAlign, this.align, pr)); + // this.align = pr; + // }; + // CTitle.prototype.setOverlay = function(pr) { + // History.CanAddChanges() && History.Add(new CChangesDrawingsBool(this, AscDFH.historyitem_Title_SetOverlay, this.overlay, pr)); + // this.overlay = pr; + // }; + // window['AscFormat'].CTitle = CTitle; // // AxisTitle (CTitle instead of CAxisTitle) // drawingsChangesMap[AscDFH.historyitem_AxisTitle_SetTx] = function(oClass, value) { @@ -513,50 +512,50 @@ }; window['AscFormat'].CCategoryAxisScaling = CCategoryAxisScaling; - // Chart - drawingsChangesMap[AscDFH.historyitem_Chart_SetTitle] = function(oClass, value) { - oClass.title = value; - }; - drawingsChangesMap[AscDFH.historyitem_Chart_SetPlotArea] = function(oClass, value) { - oClass.plotArea = value; - }; - drawingsChangesMap[AscDFH.historyitem_Chart_SetLegend] = function(oClass, value) { - oClass.legend = value; - }; - drawingsChangesMap[AscDFH.historyitem_Chart_SetExtLst] = function(oClass, value) { - oClass.extLst = value; - }; - AscDFH.changesFactory[AscDFH.historyitem_Chart_SetTitle] = window['AscDFH'].CChangesDrawingsObjectNoId; - AscDFH.changesFactory[AscDFH.historyitem_Chart_SetPlotArea] = window['AscDFH'].CChangesDrawingsObjectNoId; - AscDFH.changesFactory[AscDFH.historyitem_Chart_SetLegend] = window['AscDFH'].CChangesDrawingsObjectNoId; - AscDFH.changesFactory[AscDFH.historyitem_Chart_SetExtLst] = window['AscDFH'].CChangesDrawingsObjectNoId; - function CChart() { - CBaseChartObject.call(this); - this.title = null; - this.plotArea = null; - this.legend = null; - this.extLst = null; - } + // // Chart (contains in ChartFormat.js) + // drawingsChangesMap[AscDFH.historyitem_Chart_SetTitle] = function(oClass, value) { + // oClass.title = value; + // }; + // drawingsChangesMap[AscDFH.historyitem_Chart_SetPlotArea] = function(oClass, value) { + // oClass.plotArea = value; + // }; + // drawingsChangesMap[AscDFH.historyitem_Chart_SetLegend] = function(oClass, value) { + // oClass.legend = value; + // }; + // drawingsChangesMap[AscDFH.historyitem_Chart_SetExtLst] = function(oClass, value) { + // oClass.extLst = value; + // }; + // AscDFH.changesFactory[AscDFH.historyitem_Chart_SetTitle] = window['AscDFH'].CChangesDrawingsObjectNoId; + // AscDFH.changesFactory[AscDFH.historyitem_Chart_SetPlotArea] = window['AscDFH'].CChangesDrawingsObjectNoId; + // AscDFH.changesFactory[AscDFH.historyitem_Chart_SetLegend] = window['AscDFH'].CChangesDrawingsObjectNoId; + // AscDFH.changesFactory[AscDFH.historyitem_Chart_SetExtLst] = window['AscDFH'].CChangesDrawingsObjectNoId; + // function CChart() { + // CBaseChartObject.call(this); + // this.title = null; + // this.plotArea = null; + // this.legend = null; + // this.extLst = null; + // } - InitClass(CChart, CBaseChartObject, AscDFH.historyitem_type_Chart); + // InitClass(CChart, CBaseChartObject, AscDFH.historyitem_type_Chart); - CChart.prototype.setTitle = function(pr) { - History.CanAddChanges() && History.Add(new CChangesDrawingsObjectNoId(this, AscDFH.historyitem_Chart_SetTitle, this.title, pr)); - this.title = pr; - }; - CChart.prototype.setPlotArea = function(pr) { - History.CanAddChanges() && History.Add(new CChangesDrawingsObjectNoId(this, AscDFH.historyitem_Chart_SetPlotArea, this.plotArea, pr)); - this.plotArea = pr; - }; - CChart.prototype.setLegend = function(pr) { - History.CanAddChanges() && History.Add(new CChangesDrawingsObjectNoId(this, AscDFH.historyitem_Chart_SetLegend, this.legend, pr)); - this.legend = pr; - }; - CChart.prototype.setExtLst = function(pr) { - History.CanAddChanges() && History.Add(new CChangesDrawingsObjectNoId(this, AscDFH.historyitem_Chart_SetExtLst, this.extLst, pr)); - this.extLst = pr; - }; - window['AscFormat'].CChart = CChart; + // CChart.prototype.setTitle = function(pr) { + // History.CanAddChanges() && History.Add(new CChangesDrawingsObjectNoId(this, AscDFH.historyitem_Chart_SetTitle, this.title, pr)); + // this.title = pr; + // }; + // CChart.prototype.setPlotArea = function(pr) { + // History.CanAddChanges() && History.Add(new CChangesDrawingsObjectNoId(this, AscDFH.historyitem_Chart_SetPlotArea, this.plotArea, pr)); + // this.plotArea = pr; + // }; + // CChart.prototype.setLegend = function(pr) { + // History.CanAddChanges() && History.Add(new CChangesDrawingsObjectNoId(this, AscDFH.historyitem_Chart_SetLegend, this.legend, pr)); + // this.legend = pr; + // }; + // CChart.prototype.setExtLst = function(pr) { + // History.CanAddChanges() && History.Add(new CChangesDrawingsObjectNoId(this, AscDFH.historyitem_Chart_SetExtLst, this.extLst, pr)); + // this.extLst = pr; + // }; + // window['AscFormat'].CChart = CChart; // ChartData drawingsChangesMap[AscDFH.historyitem_ChartData_SetExternalData] = function(oClass, value) { @@ -568,9 +567,16 @@ drawingsChangesMap[AscDFH.historyitem_ChartData_SetExtLst] = function(oClass, value) { oClass.extLst = value; }; + + drawingContentChanges[AscDFH.historyitem_ChartData_AddData] = + drawingContentChanges[AscDFH.historyitem_ChartData_RemoveData] = function(oClass) { + return oClass.data; + }; AscDFH.changesFactory[AscDFH.historyitem_ChartData_SetExternalData] = window['AscDFH'].CChangesDrawingsObjectNoId; AscDFH.changesFactory[AscDFH.historyitem_ChartData_SetData] = window['AscDFH'].CChangesDrawingsObject; AscDFH.changesFactory[AscDFH.historyitem_ChartData_SetExtLst] = window['AscDFH'].CChangesDrawingsObjectNoId; + AscDFH.changesFactory[AscDFH.historyitem_ChartData_AddData] = window['AscDFH'].CChangesDrawingsContent; + AscDFH.changesFactory[AscDFH.historyitem_ChartData_RemoveData] = window['AscDFH'].CChangesDrawingsContent; function CChartData() { CBaseChartObject.call(this); this.externalData = null; @@ -843,11 +849,18 @@ drawingsChangesMap[AscDFH.historyitem_Data_SetId] = function(oClass, value) { oClass.id = value; }; + + drawingContentChanges[AscDFH.historyitem_Data_AddDimension] = + drawingContentChanges[AscDFH.historyitem_Data_RemoveDimension] = function(oClass) { + return oClass.dimension; + }; // AscDFH.changesFactory[AscDFH.historyitem_Data_SetNumDim] = window['AscDFH'].CChangesDrawingsString; // AscDFH.changesFactory[AscDFH.historyitem_Data_SetStrDim] = window['AscDFH'].CChangesDrawingsString; AscDFH.changesFactory[AscDFH.historyitem_Data_SetDimension] = window['AscDFH'].CChangesDrawingsObjectNoId; AscDFH.changesFactory[AscDFH.historyitem_Data_SetExtLst] = window['AscDFH'].CChangesDrawingsObjectNoId; AscDFH.changesFactory[AscDFH.historyitem_Data_SetId] = window['AscDFH'].CChangesDrawingsLong; + AscDFH.changesFactory[AscDFH.historyitem_Data_AddDimension] = window['AscDFH'].CChangesDrawingsContent; + AscDFH.changesFactory[AscDFH.historyitem_Data_RemoveDimension] = window['AscDFH'].CChangesDrawingsContent; function CData() { CBaseChartObject.call(this); // field dimension instead of numDim,strDim (ChartSerializeEx.h) @@ -1042,6 +1055,16 @@ drawingsChangesMap[AscDFH.historyitem_DataLabels_SetPos] = function(oClass, value) { oClass.pos = value; }; + + drawingContentChanges[AscDFH.historyitem_DataLabels_AddDataLabel] = + drawingContentChanges[AscDFH.historyitem_DataLabels_RemoveDataLabel] = function(oClass) { + return oClass.dataLabel; + }; + + drawingContentChanges[AscDFH.historyitem_DataLabels_AddDataLabelHidden] = + drawingContentChanges[AscDFH.historyitem_DataLabels_RemoveDataLabelHidden] = function(oClass) { + return oClass.dataLabelHidden; + }; AscDFH.changesFactory[AscDFH.historyitem_DataLabels_SetNumFmt] = window['AscDFH'].CChangesDrawingsObjectNoId; AscDFH.changesFactory[AscDFH.historyitem_DataLabels_SetSpPr] = window['AscDFH'].CChangesDrawingsObjectNoId; AscDFH.changesFactory[AscDFH.historyitem_DataLabels_SetTxPr] = window['AscDFH'].CChangesDrawingsObjectNoId; @@ -1051,6 +1074,10 @@ AscDFH.changesFactory[AscDFH.historyitem_DataLabels_SetDataLabelHidden] = window['AscDFH'].CChangesDrawingsObjectNoId; AscDFH.changesFactory[AscDFH.historyitem_DataLabels_SetExtLst] = window['AscDFH'].CChangesDrawingsObjectNoId; AscDFH.changesFactory[AscDFH.historyitem_DataLabels_SetPos] = window['AscDFH'].CChangesDrawingsObjectNoId; + AscDFH.changesFactory[AscDFH.historyitem_DataLabels_AddDataLabel] = window['AscDFH'].CChangesDrawingsContent; + AscDFH.changesFactory[AscDFH.historyitem_DataLabels_RemoveDataLabel] = window['AscDFH'].CChangesDrawingsContent; + AscDFH.changesFactory[AscDFH.historyitem_DataLabels_AddDataLabelHidden] = window['AscDFH'].CChangesDrawingsContent; + AscDFH.changesFactory[AscDFH.historyitem_DataLabels_RemoveDataLabelHidden] = window['AscDFH'].CChangesDrawingsContent; function CDataLabels() { CBaseChartObject.call(this); this.numFmt = null; @@ -1242,32 +1269,32 @@ // }; // window['AscFormat'].CExtensionList = CExtensionList; - // ExternalData - drawingsChangesMap[AscDFH.historyitem_ExternalData_SetId] = function(oClass, value) { - oClass.id = value; - }; - drawingsChangesMap[AscDFH.historyitem_ExternalData_SetAutoUpdate] = function(oClass, value) { - oClass.autoUpdate = value; - }; - AscDFH.changesFactory[AscDFH.historyitem_ExternalData_SetId] = window['AscDFH'].CChangesDrawingsString; - AscDFH.changesFactory[AscDFH.historyitem_ExternalData_SetAutoUpdate] = window['AscDFH'].CChangesDrawingsBool; - function CExternalData() { - CBaseChartObject.call(this); - this.id = null; - this.autoUpdate = null; - } + // // ExternalData (contains in ChartFormat.js) + // drawingsChangesMap[AscDFH.historyitem_ExternalData_SetId] = function(oClass, value) { + // oClass.id = value; + // }; + // drawingsChangesMap[AscDFH.historyitem_ExternalData_SetAutoUpdate] = function(oClass, value) { + // oClass.autoUpdate = value; + // }; + // AscDFH.changesFactory[AscDFH.historyitem_ExternalData_SetId] = window['AscDFH'].CChangesDrawingsString; + // AscDFH.changesFactory[AscDFH.historyitem_ExternalData_SetAutoUpdate] = window['AscDFH'].CChangesDrawingsBool; + // function CExternalData() { + // CBaseChartObject.call(this); + // this.id = null; + // this.autoUpdate = null; + // } - InitClass(CExternalData, CBaseChartObject, AscDFH.historyitem_type_ExternalData); + // InitClass(CExternalData, CBaseChartObject, AscDFH.historyitem_type_ExternalData); - CExternalData.prototype.setId = function(pr) { - History.CanAddChanges() && History.Add(new CChangesDrawingsString(this, AscDFH.historyitem_ExternalData_SetId, this.id, pr)); - this.id = pr; - }; - CExternalData.prototype.setAutoUpdate = function(pr) { - History.CanAddChanges() && History.Add(new CChangesDrawingsBool(this, AscDFH.historyitem_ExternalData_SetAutoUpdate, this.autoUpdate, pr)); - this.autoUpdate = pr; - }; - window['AscFormat'].CExternalData = CExternalData; + // CExternalData.prototype.setId = function(pr) { + // History.CanAddChanges() && History.Add(new CChangesDrawingsString(this, AscDFH.historyitem_ExternalData_SetId, this.id, pr)); + // this.id = pr; + // }; + // CExternalData.prototype.setAutoUpdate = function(pr) { + // History.CanAddChanges() && History.Add(new CChangesDrawingsBool(this, AscDFH.historyitem_ExternalData_SetAutoUpdate, this.autoUpdate, pr)); + // this.autoUpdate = pr; + // }; + // window['AscFormat'].CExternalData = CExternalData; // FormatOverride (no in ChartSerializeEx.h) drawingsChangesMap[AscDFH.historyitem_FormatOverride_SetSpPr] = function(oClass, value) { @@ -2106,209 +2133,217 @@ }; window['AscFormat'].CGridlines = CGridlines; - // HeaderFooter - drawingsChangesMap[AscDFH.historyitem_HeaderFooter_SetOddHeader] = function(oClass, value) { - oClass.oddHeader = value; - }; - drawingsChangesMap[AscDFH.historyitem_HeaderFooter_SetOddFooter] = function(oClass, value) { - oClass.oddFooter = value; - }; - drawingsChangesMap[AscDFH.historyitem_HeaderFooter_SetEvenHeader] = function(oClass, value) { - oClass.evenHeader = value; - }; - drawingsChangesMap[AscDFH.historyitem_HeaderFooter_SetEvenFooter] = function(oClass, value) { - oClass.evenFooter = value; - }; - drawingsChangesMap[AscDFH.historyitem_HeaderFooter_SetFirstHeader] = function(oClass, value) { - oClass.firstHeader = value; - }; - drawingsChangesMap[AscDFH.historyitem_HeaderFooter_SetFirstFooter] = function(oClass, value) { - oClass.firstFooter = value; - }; - drawingsChangesMap[AscDFH.historyitem_HeaderFooter_SetAlignWithMargins] = function(oClass, value) { - oClass.alignWithMargins = value; - }; - drawingsChangesMap[AscDFH.historyitem_HeaderFooter_SetDifferentOddEven] = function(oClass, value) { - oClass.differentOddEven = value; - }; - drawingsChangesMap[AscDFH.historyitem_HeaderFooter_SetDifferentFirst] = function(oClass, value) { - oClass.differentFirst = value; - }; - AscDFH.changesFactory[AscDFH.historyitem_HeaderFooter_SetOddHeader] = window['AscDFH'].CChangesDrawingsString; - AscDFH.changesFactory[AscDFH.historyitem_HeaderFooter_SetOddFooter] = window['AscDFH'].CChangesDrawingsString; - AscDFH.changesFactory[AscDFH.historyitem_HeaderFooter_SetEvenHeader] = window['AscDFH'].CChangesDrawingsString; - AscDFH.changesFactory[AscDFH.historyitem_HeaderFooter_SetEvenFooter] = window['AscDFH'].CChangesDrawingsString; - AscDFH.changesFactory[AscDFH.historyitem_HeaderFooter_SetFirstHeader] = window['AscDFH'].CChangesDrawingsString; - AscDFH.changesFactory[AscDFH.historyitem_HeaderFooter_SetFirstFooter] = window['AscDFH'].CChangesDrawingsString; - AscDFH.changesFactory[AscDFH.historyitem_HeaderFooter_SetAlignWithMargins] = window['AscDFH'].CChangesDrawingsBool; - AscDFH.changesFactory[AscDFH.historyitem_HeaderFooter_SetDifferentOddEven] = window['AscDFH'].CChangesDrawingsBool; - AscDFH.changesFactory[AscDFH.historyitem_HeaderFooter_SetDifferentFirst] = window['AscDFH'].CChangesDrawingsBool; - function CHeaderFooter() { - CBaseChartObject.call(this); - this.oddHeader = null; - this.oddFooter = null; - this.evenHeader = null; - this.evenFooter = null; - this.firstHeader = null; - this.firstFooter = null; - this.alignWithMargins = null; - this.differentOddEven = null; - this.differentFirst = null; - } + // // HeaderFooter (contains in ChartFormat.js) + // drawingsChangesMap[AscDFH.historyitem_HeaderFooter_SetOddHeader] = function(oClass, value) { + // oClass.oddHeader = value; + // }; + // drawingsChangesMap[AscDFH.historyitem_HeaderFooter_SetOddFooter] = function(oClass, value) { + // oClass.oddFooter = value; + // }; + // drawingsChangesMap[AscDFH.historyitem_HeaderFooter_SetEvenHeader] = function(oClass, value) { + // oClass.evenHeader = value; + // }; + // drawingsChangesMap[AscDFH.historyitem_HeaderFooter_SetEvenFooter] = function(oClass, value) { + // oClass.evenFooter = value; + // }; + // drawingsChangesMap[AscDFH.historyitem_HeaderFooter_SetFirstHeader] = function(oClass, value) { + // oClass.firstHeader = value; + // }; + // drawingsChangesMap[AscDFH.historyitem_HeaderFooter_SetFirstFooter] = function(oClass, value) { + // oClass.firstFooter = value; + // }; + // drawingsChangesMap[AscDFH.historyitem_HeaderFooter_SetAlignWithMargins] = function(oClass, value) { + // oClass.alignWithMargins = value; + // }; + // drawingsChangesMap[AscDFH.historyitem_HeaderFooter_SetDifferentOddEven] = function(oClass, value) { + // oClass.differentOddEven = value; + // }; + // drawingsChangesMap[AscDFH.historyitem_HeaderFooter_SetDifferentFirst] = function(oClass, value) { + // oClass.differentFirst = value; + // }; + // AscDFH.changesFactory[AscDFH.historyitem_HeaderFooter_SetOddHeader] = window['AscDFH'].CChangesDrawingsString; + // AscDFH.changesFactory[AscDFH.historyitem_HeaderFooter_SetOddFooter] = window['AscDFH'].CChangesDrawingsString; + // AscDFH.changesFactory[AscDFH.historyitem_HeaderFooter_SetEvenHeader] = window['AscDFH'].CChangesDrawingsString; + // AscDFH.changesFactory[AscDFH.historyitem_HeaderFooter_SetEvenFooter] = window['AscDFH'].CChangesDrawingsString; + // AscDFH.changesFactory[AscDFH.historyitem_HeaderFooter_SetFirstHeader] = window['AscDFH'].CChangesDrawingsString; + // AscDFH.changesFactory[AscDFH.historyitem_HeaderFooter_SetFirstFooter] = window['AscDFH'].CChangesDrawingsString; + // AscDFH.changesFactory[AscDFH.historyitem_HeaderFooter_SetAlignWithMargins] = window['AscDFH'].CChangesDrawingsBool; + // AscDFH.changesFactory[AscDFH.historyitem_HeaderFooter_SetDifferentOddEven] = window['AscDFH'].CChangesDrawingsBool; + // AscDFH.changesFactory[AscDFH.historyitem_HeaderFooter_SetDifferentFirst] = window['AscDFH'].CChangesDrawingsBool; + // function CHeaderFooter() { + // CBaseChartObject.call(this); + // this.oddHeader = null; + // this.oddFooter = null; + // this.evenHeader = null; + // this.evenFooter = null; + // this.firstHeader = null; + // this.firstFooter = null; + // this.alignWithMargins = null; + // this.differentOddEven = null; + // this.differentFirst = null; + // } - InitClass(CHeaderFooter, CBaseChartObject, AscDFH.historyitem_type_HeaderFooter); + // InitClass(CHeaderFooter, CBaseChartObject, AscDFH.historyitem_type_HeaderFooter); - CHeaderFooter.prototype.setOddHeader = function(pr) { - History.CanAddChanges() && History.Add(new CChangesDrawingsString(this, AscDFH.historyitem_HeaderFooter_SetOddHeader, this.oddHeader, pr)); - this.oddHeader = pr; - }; - CHeaderFooter.prototype.setOddFooter = function(pr) { - History.CanAddChanges() && History.Add(new CChangesDrawingsString(this, AscDFH.historyitem_HeaderFooter_SetOddFooter, this.oddFooter, pr)); - this.oddFooter = pr; - }; - CHeaderFooter.prototype.setEvenHeader = function(pr) { - History.CanAddChanges() && History.Add(new CChangesDrawingsString(this, AscDFH.historyitem_HeaderFooter_SetEvenHeader, this.evenHeader, pr)); - this.evenHeader = pr; - }; - CHeaderFooter.prototype.setEvenFooter = function(pr) { - History.CanAddChanges() && History.Add(new CChangesDrawingsString(this, AscDFH.historyitem_HeaderFooter_SetEvenFooter, this.evenFooter, pr)); - this.evenFooter = pr; - }; - CHeaderFooter.prototype.setFirstHeader = function(pr) { - History.CanAddChanges() && History.Add(new CChangesDrawingsString(this, AscDFH.historyitem_HeaderFooter_SetFirstHeader, this.firstHeader, pr)); - this.firstHeader = pr; - }; - CHeaderFooter.prototype.setFirstFooter = function(pr) { - History.CanAddChanges() && History.Add(new CChangesDrawingsString(this, AscDFH.historyitem_HeaderFooter_SetFirstFooter, this.firstFooter, pr)); - this.firstFooter = pr; - }; - CHeaderFooter.prototype.setAlignWithMargins = function(pr) { - History.CanAddChanges() && History.Add(new CChangesDrawingsBool(this, AscDFH.historyitem_HeaderFooter_SetAlignWithMargins, this.alignWithMargins, pr)); - this.alignWithMargins = pr; - }; - CHeaderFooter.prototype.setDifferentOddEven = function(pr) { - History.CanAddChanges() && History.Add(new CChangesDrawingsBool(this, AscDFH.historyitem_HeaderFooter_SetDifferentOddEven, this.differentOddEven, pr)); - this.differentOddEven = pr; - }; - CHeaderFooter.prototype.setDifferentFirst = function(pr) { - History.CanAddChanges() && History.Add(new CChangesDrawingsBool(this, AscDFH.historyitem_HeaderFooter_SetDifferentFirst, this.differentFirst, pr)); - this.differentFirst = pr; - }; - window['AscFormat'].CHeaderFooter = CHeaderFooter; + // CHeaderFooter.prototype.setOddHeader = function(pr) { + // History.CanAddChanges() && History.Add(new CChangesDrawingsString(this, AscDFH.historyitem_HeaderFooter_SetOddHeader, this.oddHeader, pr)); + // this.oddHeader = pr; + // }; + // CHeaderFooter.prototype.setOddFooter = function(pr) { + // History.CanAddChanges() && History.Add(new CChangesDrawingsString(this, AscDFH.historyitem_HeaderFooter_SetOddFooter, this.oddFooter, pr)); + // this.oddFooter = pr; + // }; + // CHeaderFooter.prototype.setEvenHeader = function(pr) { + // History.CanAddChanges() && History.Add(new CChangesDrawingsString(this, AscDFH.historyitem_HeaderFooter_SetEvenHeader, this.evenHeader, pr)); + // this.evenHeader = pr; + // }; + // CHeaderFooter.prototype.setEvenFooter = function(pr) { + // History.CanAddChanges() && History.Add(new CChangesDrawingsString(this, AscDFH.historyitem_HeaderFooter_SetEvenFooter, this.evenFooter, pr)); + // this.evenFooter = pr; + // }; + // CHeaderFooter.prototype.setFirstHeader = function(pr) { + // History.CanAddChanges() && History.Add(new CChangesDrawingsString(this, AscDFH.historyitem_HeaderFooter_SetFirstHeader, this.firstHeader, pr)); + // this.firstHeader = pr; + // }; + // CHeaderFooter.prototype.setFirstFooter = function(pr) { + // History.CanAddChanges() && History.Add(new CChangesDrawingsString(this, AscDFH.historyitem_HeaderFooter_SetFirstFooter, this.firstFooter, pr)); + // this.firstFooter = pr; + // }; + // CHeaderFooter.prototype.setAlignWithMargins = function(pr) { + // History.CanAddChanges() && History.Add(new CChangesDrawingsBool(this, AscDFH.historyitem_HeaderFooter_SetAlignWithMargins, this.alignWithMargins, pr)); + // this.alignWithMargins = pr; + // }; + // CHeaderFooter.prototype.setDifferentOddEven = function(pr) { + // History.CanAddChanges() && History.Add(new CChangesDrawingsBool(this, AscDFH.historyitem_HeaderFooter_SetDifferentOddEven, this.differentOddEven, pr)); + // this.differentOddEven = pr; + // }; + // CHeaderFooter.prototype.setDifferentFirst = function(pr) { + // History.CanAddChanges() && History.Add(new CChangesDrawingsBool(this, AscDFH.historyitem_HeaderFooter_SetDifferentFirst, this.differentFirst, pr)); + // this.differentFirst = pr; + // }; + // window['AscFormat'].CHeaderFooter = CHeaderFooter; - // Legend - drawingsChangesMap[AscDFH.historyitem_Legend_SetSpPr] = function(oClass, value) { - oClass.spPr = value; - }; - drawingsChangesMap[AscDFH.historyitem_Legend_SetTxPr] = function(oClass, value) { - oClass.txPr = value; - }; - drawingsChangesMap[AscDFH.historyitem_Legend_SetExtLst] = function(oClass, value) { - oClass.extLst = value; - }; - drawingsChangesMap[AscDFH.historyitem_Legend_SetPos] = function(oClass, value) { - oClass.pos = value; - }; - drawingsChangesMap[AscDFH.historyitem_Legend_SetAlign] = function(oClass, value) { - oClass.align = value; - }; - drawingsChangesMap[AscDFH.historyitem_Legend_SetOverlay] = function(oClass, value) { - oClass.overlay = value; - }; - AscDFH.changesFactory[AscDFH.historyitem_Legend_SetSpPr] = window['AscDFH'].CChangesDrawingsObjectNoId; - AscDFH.changesFactory[AscDFH.historyitem_Legend_SetTxPr] = window['AscDFH'].CChangesDrawingsObjectNoId; - AscDFH.changesFactory[AscDFH.historyitem_Legend_SetExtLst] = window['AscDFH'].CChangesDrawingsObjectNoId; - AscDFH.changesFactory[AscDFH.historyitem_Legend_SetPos] = window['AscDFH'].CChangesDrawingsObjectNoId; - AscDFH.changesFactory[AscDFH.historyitem_Legend_SetAlign] = window['AscDFH'].CChangesDrawingsObjectNoId; - AscDFH.changesFactory[AscDFH.historyitem_Legend_SetOverlay] = window['AscDFH'].CChangesDrawingsBool; - function CLegend() { - CBaseChartObject.call(this); - this.spPr = null; - this.txPr = null; - this.extLst = null; - this.pos = null; - this.align = null; - this.overlay = null; - } + // // Legend (contains in ChartFormat.js) + // drawingsChangesMap[AscDFH.historyitem_Legend_SetSpPr] = function(oClass, value) { + // oClass.spPr = value; + // }; + // drawingsChangesMap[AscDFH.historyitem_Legend_SetTxPr] = function(oClass, value) { + // oClass.txPr = value; + // }; + // drawingsChangesMap[AscDFH.historyitem_Legend_SetExtLst] = function(oClass, value) { + // oClass.extLst = value; + // }; + // drawingsChangesMap[AscDFH.historyitem_Legend_SetPos] = function(oClass, value) { + // oClass.pos = value; + // }; + // drawingsChangesMap[AscDFH.historyitem_Legend_SetAlign] = function(oClass, value) { + // oClass.align = value; + // }; + // drawingsChangesMap[AscDFH.historyitem_Legend_SetOverlay] = function(oClass, value) { + // oClass.overlay = value; + // }; + // AscDFH.changesFactory[AscDFH.historyitem_Legend_SetSpPr] = window['AscDFH'].CChangesDrawingsObjectNoId; + // AscDFH.changesFactory[AscDFH.historyitem_Legend_SetTxPr] = window['AscDFH'].CChangesDrawingsObjectNoId; + // AscDFH.changesFactory[AscDFH.historyitem_Legend_SetExtLst] = window['AscDFH'].CChangesDrawingsObjectNoId; + // AscDFH.changesFactory[AscDFH.historyitem_Legend_SetPos] = window['AscDFH'].CChangesDrawingsObjectNoId; + // AscDFH.changesFactory[AscDFH.historyitem_Legend_SetAlign] = window['AscDFH'].CChangesDrawingsObjectNoId; + // AscDFH.changesFactory[AscDFH.historyitem_Legend_SetOverlay] = window['AscDFH'].CChangesDrawingsBool; + // function CLegend() { + // CBaseChartObject.call(this); + // this.spPr = null; + // this.txPr = null; + // this.extLst = null; + // this.pos = null; + // this.align = null; + // this.overlay = null; + // } - InitClass(CLegend, CBaseChartObject, AscDFH.historyitem_type_Legend); + // InitClass(CLegend, CBaseChartObject, AscDFH.historyitem_type_Legend); - CLegend.prototype.setSpPr = function(pr) { - History.CanAddChanges() && History.Add(new CChangesDrawingsObjectNoId(this, AscDFH.historyitem_Legend_SetSpPr, this.spPr, pr)); - this.spPr = pr; - }; - CLegend.prototype.setTxPr = function(pr) { - History.CanAddChanges() && History.Add(new CChangesDrawingsObjectNoId(this, AscDFH.historyitem_Legend_SetTxPr, this.txPr, pr)); - this.txPr = pr; - }; - CLegend.prototype.setExtLst = function(pr) { - History.CanAddChanges() && History.Add(new CChangesDrawingsObjectNoId(this, AscDFH.historyitem_Legend_SetExtLst, this.extLst, pr)); - this.extLst = pr; - }; - CLegend.prototype.setPos = function(pr) { - History.CanAddChanges() && History.Add(new CChangesDrawingsObjectNoId(this, AscDFH.historyitem_Legend_SetPos, this.pos, pr)); - this.pos = pr; - }; - CLegend.prototype.setAlign = function(pr) { - History.CanAddChanges() && History.Add(new CChangesDrawingsObjectNoId(this, AscDFH.historyitem_Legend_SetAlign, this.align, pr)); - this.align = pr; - }; - CLegend.prototype.setOverlay = function(pr) { - History.CanAddChanges() && History.Add(new CChangesDrawingsBool(this, AscDFH.historyitem_Legend_SetOverlay, this.overlay, pr)); - this.overlay = pr; - }; - window['AscFormat'].CLegend = CLegend; + // CLegend.prototype.setSpPr = function(pr) { + // History.CanAddChanges() && History.Add(new CChangesDrawingsObjectNoId(this, AscDFH.historyitem_Legend_SetSpPr, this.spPr, pr)); + // this.spPr = pr; + // }; + // CLegend.prototype.setTxPr = function(pr) { + // History.CanAddChanges() && History.Add(new CChangesDrawingsObjectNoId(this, AscDFH.historyitem_Legend_SetTxPr, this.txPr, pr)); + // this.txPr = pr; + // }; + // CLegend.prototype.setExtLst = function(pr) { + // History.CanAddChanges() && History.Add(new CChangesDrawingsObjectNoId(this, AscDFH.historyitem_Legend_SetExtLst, this.extLst, pr)); + // this.extLst = pr; + // }; + // CLegend.prototype.setPos = function(pr) { + // History.CanAddChanges() && History.Add(new CChangesDrawingsObjectNoId(this, AscDFH.historyitem_Legend_SetPos, this.pos, pr)); + // this.pos = pr; + // }; + // CLegend.prototype.setAlign = function(pr) { + // History.CanAddChanges() && History.Add(new CChangesDrawingsObjectNoId(this, AscDFH.historyitem_Legend_SetAlign, this.align, pr)); + // this.align = pr; + // }; + // CLegend.prototype.setOverlay = function(pr) { + // History.CanAddChanges() && History.Add(new CChangesDrawingsBool(this, AscDFH.historyitem_Legend_SetOverlay, this.overlay, pr)); + // this.overlay = pr; + // }; + // window['AscFormat'].CLegend = CLegend; - // NumberColorPosition - drawingsChangesMap[AscDFH.historyitem_NumberColorPosition_SetVal] = function(oClass, value) { - oClass.val = value; - }; - AscDFH.changesFactory[AscDFH.historyitem_NumberColorPosition_SetVal] = window['AscDFH'].CChangesDrawingsDouble2; - function CNumberColorPosition() { - CBaseChartObject.call(this); - this.val = null; - } + // // NumberColorPosition (CNumericPoint replaces this class) + // drawingsChangesMap[AscDFH.historyitem_NumberColorPosition_SetVal] = function(oClass, value) { + // oClass.val = value; + // }; + // AscDFH.changesFactory[AscDFH.historyitem_NumberColorPosition_SetVal] = window['AscDFH'].CChangesDrawingsDouble2; + // function CNumberColorPosition() { + // CBaseChartObject.call(this); + // this.val = null; + // } - InitClass(CNumberColorPosition, CBaseChartObject, AscDFH.historyitem_type_NumberColorPosition); + // InitClass(CNumberColorPosition, CBaseChartObject, AscDFH.historyitem_type_NumberColorPosition); - CNumberColorPosition.prototype.setVal = function(pr) { - History.CanAddChanges() && History.Add(new CChangesDrawingsDouble2(this, AscDFH.historyitem_NumberColorPosition_SetVal, this.val, pr)); - this.val = pr; - }; - window['AscFormat'].CNumberColorPosition = CNumberColorPosition; + // CNumberColorPosition.prototype.setVal = function(pr) { + // History.CanAddChanges() && History.Add(new CChangesDrawingsDouble2(this, AscDFH.historyitem_NumberColorPosition_SetVal, this.val, pr)); + // this.val = pr; + // }; + // window['AscFormat'].CNumberColorPosition = CNumberColorPosition; - // NumberFormat - drawingsChangesMap[AscDFH.historyitem_NumberFormat_SetFormatCode] = function(oClass, value) { - oClass.formatCode = value; - }; - drawingsChangesMap[AscDFH.historyitem_NumberFormat_SetSourceLinked] = function(oClass, value) { - oClass.sourceLinked = value; - }; - AscDFH.changesFactory[AscDFH.historyitem_NumberFormat_SetFormatCode] = window['AscDFH'].CChangesDrawingsString; - AscDFH.changesFactory[AscDFH.historyitem_NumberFormat_SetSourceLinked] = window['AscDFH'].CChangesDrawingsBool; - function CNumberFormat() { - CBaseChartObject.call(this); - this.formatCode = null; - this.sourceLinked = null; - } + // // NumberFormat (contains in ChartFormat.js) + // drawingsChangesMap[AscDFH.historyitem_NumberFormat_SetFormatCode] = function(oClass, value) { + // oClass.formatCode = value; + // }; + // drawingsChangesMap[AscDFH.historyitem_NumberFormat_SetSourceLinked] = function(oClass, value) { + // oClass.sourceLinked = value; + // }; + // AscDFH.changesFactory[AscDFH.historyitem_NumberFormat_SetFormatCode] = window['AscDFH'].CChangesDrawingsString; + // AscDFH.changesFactory[AscDFH.historyitem_NumberFormat_SetSourceLinked] = window['AscDFH'].CChangesDrawingsBool; + // function CNumberFormat() { + // CBaseChartObject.call(this); + // this.formatCode = null; + // this.sourceLinked = null; + // } - InitClass(CNumberFormat, CBaseChartObject, AscDFH.historyitem_type_NumberFormat); + // InitClass(CNumberFormat, CBaseChartObject, AscDFH.historyitem_type_NumberFormat); - CNumberFormat.prototype.setFormatCode = function(pr) { - History.CanAddChanges() && History.Add(new CChangesDrawingsString(this, AscDFH.historyitem_NumberFormat_SetFormatCode, this.formatCode, pr)); - this.formatCode = pr; - }; - CNumberFormat.prototype.setSourceLinked = function(pr) { - History.CanAddChanges() && History.Add(new CChangesDrawingsBool(this, AscDFH.historyitem_NumberFormat_SetSourceLinked, this.sourceLinked, pr)); - this.sourceLinked = pr; - }; - window['AscFormat'].CNumberFormat = CNumberFormat; + // CNumberFormat.prototype.setFormatCode = function(pr) { + // History.CanAddChanges() && History.Add(new CChangesDrawingsString(this, AscDFH.historyitem_NumberFormat_SetFormatCode, this.formatCode, pr)); + // this.formatCode = pr; + // }; + // CNumberFormat.prototype.setSourceLinked = function(pr) { + // History.CanAddChanges() && History.Add(new CChangesDrawingsBool(this, AscDFH.historyitem_NumberFormat_SetSourceLinked, this.sourceLinked, pr)); + // this.sourceLinked = pr; + // }; + // window['AscFormat'].CNumberFormat = CNumberFormat; // NumericDimension drawingsChangesMap[AscDFH.historyitem_NumericDimension_SetLevelData] = function(oClass, value) { oClass.levelData = value; }; + + drawingContentChanges[AscDFH.historyitem_NumericDimension_AddLevelData] = + drawingContentChanges[AscDFH.historyitem_NumericDimension_RemoveLevelData] = function(oClass) { + return oClass.levelData; + }; + AscDFH.changesFactory[AscDFH.historyitem_NumericDimension_SetLevelData] = window['AscDFH'].CChangesDrawingsObjectNoId; + AscDFH.changesFactory[AscDFH.historyitem_NumericDimension_AddLevelData] = window['AscDFH'].CChangesDrawingsContent; + AscDFH.changesFactory[AscDFH.historyitem_NumericDimension_RemoveLevelData] = window['AscDFH'].CChangesDrawingsContent; function CNumericDimension() { CBaseChartObject.call(this); this.levelData = []; @@ -2337,65 +2372,65 @@ }; window['AscFormat'].CNumericDimension = CNumericDimension; - // NumericLevel - drawingsChangesMap[AscDFH.historyitem_NumericLevel_SetPt] = function(oClass, value) { - oClass.pt = value; - }; - drawingsChangesMap[AscDFH.historyitem_NumericLevel_SetPtCount] = function(oClass, value) { - oClass.ptCount = value; - }; - drawingsChangesMap[AscDFH.historyitem_NumericLevel_SetFormatCode] = function(oClass, value) { - oClass.formatCode = value; - }; - drawingsChangesMap[AscDFH.historyitem_NumericLevel_SetName] = function(oClass, value) { - oClass.name = value; - }; - AscDFH.changesFactory[AscDFH.historyitem_NumericLevel_SetPt] = window['AscDFH'].CChangesDrawingsObjectNoId; - AscDFH.changesFactory[AscDFH.historyitem_NumericLevel_SetPtCount] = window['AscDFH'].CChangesDrawingsLong; - AscDFH.changesFactory[AscDFH.historyitem_NumericLevel_SetFormatCode] = window['AscDFH'].CChangesDrawingsString; - AscDFH.changesFactory[AscDFH.historyitem_NumericLevel_SetName] = window['AscDFH'].CChangesDrawingsString; - function CNumericLevel() { - CBaseChartObject.call(this); - this.pt = []; - this.ptCount = null; - this.formatCode = null; - this.name = null; - } + // // NumericLevel (CNumLit contains in ChartFormat.js) + // drawingsChangesMap[AscDFH.historyitem_NumericLevel_SetPt] = function(oClass, value) { + // oClass.pt = value; + // }; + // drawingsChangesMap[AscDFH.historyitem_NumericLevel_SetPtCount] = function(oClass, value) { + // oClass.ptCount = value; + // }; + // drawingsChangesMap[AscDFH.historyitem_NumericLevel_SetFormatCode] = function(oClass, value) { + // oClass.formatCode = value; + // }; + // drawingsChangesMap[AscDFH.historyitem_NumericLevel_SetName] = function(oClass, value) { + // oClass.name = value; + // }; + // AscDFH.changesFactory[AscDFH.historyitem_NumericLevel_SetPt] = window['AscDFH'].CChangesDrawingsObjectNoId; + // AscDFH.changesFactory[AscDFH.historyitem_NumericLevel_SetPtCount] = window['AscDFH'].CChangesDrawingsLong; + // AscDFH.changesFactory[AscDFH.historyitem_NumericLevel_SetFormatCode] = window['AscDFH'].CChangesDrawingsString; + // AscDFH.changesFactory[AscDFH.historyitem_NumericLevel_SetName] = window['AscDFH'].CChangesDrawingsString; + // function CNumericLevel() { + // CBaseChartObject.call(this); + // this.pt = []; + // this.ptCount = null; + // this.formatCode = null; + // this.name = null; + // } - InitClass(CNumericLevel, CBaseChartObject, AscDFH.historyitem_type_NumericLevel); + // InitClass(CNumericLevel, CBaseChartObject, AscDFH.historyitem_type_NumericLevel); - CNumericLevel.prototype.setPt = function(pr) { - History.CanAddChanges() && History.Add(new CChangesDrawingsObjectNoId(this, AscDFH.historyitem_NumericLevel_SetPt, this.pt, pr)); - this.pt = pr; - }; - CNumericLevel.prototype.addPt = function(pr, idx) { - var pos; - if(AscFormat.isRealNumber(idx)) - pos = idx; - else - pos = this.pt.length; - History.CanAddChanges() && History.Add(new CChangesDrawingsContent(this, AscDFH.historyitem_NumericLevel_AddPt, pos, [pr], true)); - this.pt.splice(pos, 0, pr); - }; - CNumericLevel.prototype.removePtByPos = function(pos) { - if(this.pt[pos]) { - var pt = this.pt.splice(pos, 1)[0]; - History.CanAddChanges() && History.Add(new CChangesDrawingsContent(this, AscDFH.historyitem_NumericLevel_RemovePt, pos, [pt], false)); - } - }; - CNumericLevel.prototype.setPtCount = function(pr) { - History.CanAddChanges() && History.Add(new CChangesDrawingsLong(this, AscDFH.historyitem_NumericLevel_SetPtCount, this.ptCount, pr)); - this.ptCount = pr; - }; - CNumericLevel.prototype.setFormatCode = function(pr) { - History.CanAddChanges() && History.Add(new CChangesDrawingsString(this, AscDFH.historyitem_NumericLevel_SetFormatCode, this.formatCode, pr)); - this.formatCode = pr; - }; - CNumericLevel.prototype.setName = function(pr) { - History.CanAddChanges() && History.Add(new CChangesDrawingsString(this, AscDFH.historyitem_NumericLevel_SetName, this.name, pr)); - this.name = pr; - }; - window['AscFormat'].CNumericLevel = CNumericLevel; + // CNumericLevel.prototype.setPt = function(pr) { + // History.CanAddChanges() && History.Add(new CChangesDrawingsObjectNoId(this, AscDFH.historyitem_NumericLevel_SetPt, this.pt, pr)); + // this.pt = pr; + // }; + // CNumericLevel.prototype.addPt = function(pr, idx) { + // var pos; + // if(AscFormat.isRealNumber(idx)) + // pos = idx; + // else + // pos = this.pt.length; + // History.CanAddChanges() && History.Add(new CChangesDrawingsContent(this, AscDFH.historyitem_NumericLevel_AddPt, pos, [pr], true)); + // this.pt.splice(pos, 0, pr); + // }; + // CNumericLevel.prototype.removePtByPos = function(pos) { + // if(this.pt[pos]) { + // var pt = this.pt.splice(pos, 1)[0]; + // History.CanAddChanges() && History.Add(new CChangesDrawingsContent(this, AscDFH.historyitem_NumericLevel_RemovePt, pos, [pt], false)); + // } + // }; + // CNumericLevel.prototype.setPtCount = function(pr) { + // History.CanAddChanges() && History.Add(new CChangesDrawingsLong(this, AscDFH.historyitem_NumericLevel_SetPtCount, this.ptCount, pr)); + // this.ptCount = pr; + // }; + // CNumericLevel.prototype.setFormatCode = function(pr) { + // History.CanAddChanges() && History.Add(new CChangesDrawingsString(this, AscDFH.historyitem_NumericLevel_SetFormatCode, this.formatCode, pr)); + // this.formatCode = pr; + // }; + // CNumericLevel.prototype.setName = function(pr) { + // History.CanAddChanges() && History.Add(new CChangesDrawingsString(this, AscDFH.historyitem_NumericLevel_SetName, this.name, pr)); + // this.name = pr; + // }; + // window['AscFormat'].CNumericLevel = CNumericLevel; // NumericValue drawingsChangesMap[AscDFH.historyitem_NumericValue_SetIdx] = function(oClass, value) { @@ -2424,158 +2459,158 @@ }; window['AscFormat'].CNumericValue = CNumericValue; - // PageMargins - drawingsChangesMap[AscDFH.historyitem_PageMargins_SetL] = function(oClass, value) { - oClass.l = value; - }; - drawingsChangesMap[AscDFH.historyitem_PageMargins_SetR] = function(oClass, value) { - oClass.r = value; - }; - drawingsChangesMap[AscDFH.historyitem_PageMargins_SetT] = function(oClass, value) { - oClass.t = value; - }; - drawingsChangesMap[AscDFH.historyitem_PageMargins_SetB] = function(oClass, value) { - oClass.b = value; - }; - drawingsChangesMap[AscDFH.historyitem_PageMargins_SetHeader] = function(oClass, value) { - oClass.header = value; - }; - drawingsChangesMap[AscDFH.historyitem_PageMargins_SetFooter] = function(oClass, value) { - oClass.footer = value; - }; - AscDFH.changesFactory[AscDFH.historyitem_PageMargins_SetL] = window['AscDFH'].CChangesDrawingsDouble2; - AscDFH.changesFactory[AscDFH.historyitem_PageMargins_SetR] = window['AscDFH'].CChangesDrawingsDouble2; - AscDFH.changesFactory[AscDFH.historyitem_PageMargins_SetT] = window['AscDFH'].CChangesDrawingsDouble2; - AscDFH.changesFactory[AscDFH.historyitem_PageMargins_SetB] = window['AscDFH'].CChangesDrawingsDouble2; - AscDFH.changesFactory[AscDFH.historyitem_PageMargins_SetHeader] = window['AscDFH'].CChangesDrawingsDouble2; - AscDFH.changesFactory[AscDFH.historyitem_PageMargins_SetFooter] = window['AscDFH'].CChangesDrawingsDouble2; - function CPageMargins() { - CBaseChartObject.call(this); - this.l = null; - this.r = null; - this.t = null; - this.b = null; - this.header = null; - this.footer = null; - } + // // PageMargins (CPageMarginsChart contains in ChartFormat.js) + // drawingsChangesMap[AscDFH.historyitem_PageMargins_SetL] = function(oClass, value) { + // oClass.l = value; + // }; + // drawingsChangesMap[AscDFH.historyitem_PageMargins_SetR] = function(oClass, value) { + // oClass.r = value; + // }; + // drawingsChangesMap[AscDFH.historyitem_PageMargins_SetT] = function(oClass, value) { + // oClass.t = value; + // }; + // drawingsChangesMap[AscDFH.historyitem_PageMargins_SetB] = function(oClass, value) { + // oClass.b = value; + // }; + // drawingsChangesMap[AscDFH.historyitem_PageMargins_SetHeader] = function(oClass, value) { + // oClass.header = value; + // }; + // drawingsChangesMap[AscDFH.historyitem_PageMargins_SetFooter] = function(oClass, value) { + // oClass.footer = value; + // }; + // AscDFH.changesFactory[AscDFH.historyitem_PageMargins_SetL] = window['AscDFH'].CChangesDrawingsDouble2; + // AscDFH.changesFactory[AscDFH.historyitem_PageMargins_SetR] = window['AscDFH'].CChangesDrawingsDouble2; + // AscDFH.changesFactory[AscDFH.historyitem_PageMargins_SetT] = window['AscDFH'].CChangesDrawingsDouble2; + // AscDFH.changesFactory[AscDFH.historyitem_PageMargins_SetB] = window['AscDFH'].CChangesDrawingsDouble2; + // AscDFH.changesFactory[AscDFH.historyitem_PageMargins_SetHeader] = window['AscDFH'].CChangesDrawingsDouble2; + // AscDFH.changesFactory[AscDFH.historyitem_PageMargins_SetFooter] = window['AscDFH'].CChangesDrawingsDouble2; + // function CPageMargins() { + // CBaseChartObject.call(this); + // this.l = null; + // this.r = null; + // this.t = null; + // this.b = null; + // this.header = null; + // this.footer = null; + // } - InitClass(CPageMargins, CBaseChartObject, AscDFH.historyitem_type_PageMargins); + // InitClass(CPageMargins, CBaseChartObject, AscDFH.historyitem_type_PageMargins); - CPageMargins.prototype.setL = function(pr) { - History.CanAddChanges() && History.Add(new CChangesDrawingsDouble2(this, AscDFH.historyitem_PageMargins_SetL, this.l, pr)); - this.l = pr; - }; - CPageMargins.prototype.setR = function(pr) { - History.CanAddChanges() && History.Add(new CChangesDrawingsDouble2(this, AscDFH.historyitem_PageMargins_SetR, this.r, pr)); - this.r = pr; - }; - CPageMargins.prototype.setT = function(pr) { - History.CanAddChanges() && History.Add(new CChangesDrawingsDouble2(this, AscDFH.historyitem_PageMargins_SetT, this.t, pr)); - this.t = pr; - }; - CPageMargins.prototype.setB = function(pr) { - History.CanAddChanges() && History.Add(new CChangesDrawingsDouble2(this, AscDFH.historyitem_PageMargins_SetB, this.b, pr)); - this.b = pr; - }; - CPageMargins.prototype.setHeader = function(pr) { - History.CanAddChanges() && History.Add(new CChangesDrawingsDouble2(this, AscDFH.historyitem_PageMargins_SetHeader, this.header, pr)); - this.header = pr; - }; - CPageMargins.prototype.setFooter = function(pr) { - History.CanAddChanges() && History.Add(new CChangesDrawingsDouble2(this, AscDFH.historyitem_PageMargins_SetFooter, this.footer, pr)); - this.footer = pr; - }; - window['AscFormat'].CPageMargins = CPageMargins; + // CPageMargins.prototype.setL = function(pr) { + // History.CanAddChanges() && History.Add(new CChangesDrawingsDouble2(this, AscDFH.historyitem_PageMargins_SetL, this.l, pr)); + // this.l = pr; + // }; + // CPageMargins.prototype.setR = function(pr) { + // History.CanAddChanges() && History.Add(new CChangesDrawingsDouble2(this, AscDFH.historyitem_PageMargins_SetR, this.r, pr)); + // this.r = pr; + // }; + // CPageMargins.prototype.setT = function(pr) { + // History.CanAddChanges() && History.Add(new CChangesDrawingsDouble2(this, AscDFH.historyitem_PageMargins_SetT, this.t, pr)); + // this.t = pr; + // }; + // CPageMargins.prototype.setB = function(pr) { + // History.CanAddChanges() && History.Add(new CChangesDrawingsDouble2(this, AscDFH.historyitem_PageMargins_SetB, this.b, pr)); + // this.b = pr; + // }; + // CPageMargins.prototype.setHeader = function(pr) { + // History.CanAddChanges() && History.Add(new CChangesDrawingsDouble2(this, AscDFH.historyitem_PageMargins_SetHeader, this.header, pr)); + // this.header = pr; + // }; + // CPageMargins.prototype.setFooter = function(pr) { + // History.CanAddChanges() && History.Add(new CChangesDrawingsDouble2(this, AscDFH.historyitem_PageMargins_SetFooter, this.footer, pr)); + // this.footer = pr; + // }; + // window['AscFormat'].CPageMargins = CPageMargins; - // PageSetup - drawingsChangesMap[AscDFH.historyitem_PageSetup_SetPaperSize] = function(oClass, value) { - oClass.paperSize = value; - }; - drawingsChangesMap[AscDFH.historyitem_PageSetup_SetFirstPageNumber] = function(oClass, value) { - oClass.firstPageNumber = value; - }; - drawingsChangesMap[AscDFH.historyitem_PageSetup_SetOrientation] = function(oClass, value) { - oClass.orientation = value; - }; - drawingsChangesMap[AscDFH.historyitem_PageSetup_SetBlackAndWhite] = function(oClass, value) { - oClass.blackAndWhite = value; - }; - drawingsChangesMap[AscDFH.historyitem_PageSetup_SetDraft] = function(oClass, value) { - oClass.draft = value; - }; - drawingsChangesMap[AscDFH.historyitem_PageSetup_SetUseFirstPageNumber] = function(oClass, value) { - oClass.useFirstPageNumber = value; - }; - drawingsChangesMap[AscDFH.historyitem_PageSetup_SetHorizontalDpi] = function(oClass, value) { - oClass.horizontalDpi = value; - }; - drawingsChangesMap[AscDFH.historyitem_PageSetup_SetVerticalDpi] = function(oClass, value) { - oClass.verticalDpi = value; - }; - drawingsChangesMap[AscDFH.historyitem_PageSetup_SetCopies] = function(oClass, value) { - oClass.copies = value; - }; - AscDFH.changesFactory[AscDFH.historyitem_PageSetup_SetPaperSize] = window['AscDFH'].CChangesDrawingsLong; - AscDFH.changesFactory[AscDFH.historyitem_PageSetup_SetFirstPageNumber] = window['AscDFH'].CChangesDrawingsLong; - AscDFH.changesFactory[AscDFH.historyitem_PageSetup_SetOrientation] = window['AscDFH'].CChangesDrawingsObjectNoId; - AscDFH.changesFactory[AscDFH.historyitem_PageSetup_SetBlackAndWhite] = window['AscDFH'].CChangesDrawingsBool; - AscDFH.changesFactory[AscDFH.historyitem_PageSetup_SetDraft] = window['AscDFH'].CChangesDrawingsBool; - AscDFH.changesFactory[AscDFH.historyitem_PageSetup_SetUseFirstPageNumber] = window['AscDFH'].CChangesDrawingsBool; - AscDFH.changesFactory[AscDFH.historyitem_PageSetup_SetHorizontalDpi] = window['AscDFH'].CChangesDrawingsLong; - AscDFH.changesFactory[AscDFH.historyitem_PageSetup_SetVerticalDpi] = window['AscDFH'].CChangesDrawingsLong; - AscDFH.changesFactory[AscDFH.historyitem_PageSetup_SetCopies] = window['AscDFH'].CChangesDrawingsLong; - function CPageSetup() { - CBaseChartObject.call(this); - this.paperSize = null; - this.firstPageNumber = null; - this.orientation = null; - this.blackAndWhite = null; - this.draft = null; - this.useFirstPageNumber = null; - this.horizontalDpi = null; - this.verticalDpi = null; - this.copies = null; - } + // // PageSetup (contains in ChartFormat.js) + // drawingsChangesMap[AscDFH.historyitem_PageSetup_SetPaperSize] = function(oClass, value) { + // oClass.paperSize = value; + // }; + // drawingsChangesMap[AscDFH.historyitem_PageSetup_SetFirstPageNumber] = function(oClass, value) { + // oClass.firstPageNumber = value; + // }; + // drawingsChangesMap[AscDFH.historyitem_PageSetup_SetOrientation] = function(oClass, value) { + // oClass.orientation = value; + // }; + // drawingsChangesMap[AscDFH.historyitem_PageSetup_SetBlackAndWhite] = function(oClass, value) { + // oClass.blackAndWhite = value; + // }; + // drawingsChangesMap[AscDFH.historyitem_PageSetup_SetDraft] = function(oClass, value) { + // oClass.draft = value; + // }; + // drawingsChangesMap[AscDFH.historyitem_PageSetup_SetUseFirstPageNumber] = function(oClass, value) { + // oClass.useFirstPageNumber = value; + // }; + // drawingsChangesMap[AscDFH.historyitem_PageSetup_SetHorizontalDpi] = function(oClass, value) { + // oClass.horizontalDpi = value; + // }; + // drawingsChangesMap[AscDFH.historyitem_PageSetup_SetVerticalDpi] = function(oClass, value) { + // oClass.verticalDpi = value; + // }; + // drawingsChangesMap[AscDFH.historyitem_PageSetup_SetCopies] = function(oClass, value) { + // oClass.copies = value; + // }; + // AscDFH.changesFactory[AscDFH.historyitem_PageSetup_SetPaperSize] = window['AscDFH'].CChangesDrawingsLong; + // AscDFH.changesFactory[AscDFH.historyitem_PageSetup_SetFirstPageNumber] = window['AscDFH'].CChangesDrawingsLong; + // AscDFH.changesFactory[AscDFH.historyitem_PageSetup_SetOrientation] = window['AscDFH'].CChangesDrawingsObjectNoId; + // AscDFH.changesFactory[AscDFH.historyitem_PageSetup_SetBlackAndWhite] = window['AscDFH'].CChangesDrawingsBool; + // AscDFH.changesFactory[AscDFH.historyitem_PageSetup_SetDraft] = window['AscDFH'].CChangesDrawingsBool; + // AscDFH.changesFactory[AscDFH.historyitem_PageSetup_SetUseFirstPageNumber] = window['AscDFH'].CChangesDrawingsBool; + // AscDFH.changesFactory[AscDFH.historyitem_PageSetup_SetHorizontalDpi] = window['AscDFH'].CChangesDrawingsLong; + // AscDFH.changesFactory[AscDFH.historyitem_PageSetup_SetVerticalDpi] = window['AscDFH'].CChangesDrawingsLong; + // AscDFH.changesFactory[AscDFH.historyitem_PageSetup_SetCopies] = window['AscDFH'].CChangesDrawingsLong; + // function CPageSetup() { + // CBaseChartObject.call(this); + // this.paperSize = null; + // this.firstPageNumber = null; + // this.orientation = null; + // this.blackAndWhite = null; + // this.draft = null; + // this.useFirstPageNumber = null; + // this.horizontalDpi = null; + // this.verticalDpi = null; + // this.copies = null; + // } - InitClass(CPageSetup, CBaseChartObject, AscDFH.historyitem_type_PageSetup); + // InitClass(CPageSetup, CBaseChartObject, AscDFH.historyitem_type_PageSetup); - CPageSetup.prototype.setPaperSize = function(pr) { - History.CanAddChanges() && History.Add(new CChangesDrawingsLong(this, AscDFH.historyitem_PageSetup_SetPaperSize, this.paperSize, pr)); - this.paperSize = pr; - }; - CPageSetup.prototype.setFirstPageNumber = function(pr) { - History.CanAddChanges() && History.Add(new CChangesDrawingsLong(this, AscDFH.historyitem_PageSetup_SetFirstPageNumber, this.firstPageNumber, pr)); - this.firstPageNumber = pr; - }; - CPageSetup.prototype.setOrientation = function(pr) { - History.CanAddChanges() && History.Add(new CChangesDrawingsObjectNoId(this, AscDFH.historyitem_PageSetup_SetOrientation, this.orientation, pr)); - this.orientation = pr; - }; - CPageSetup.prototype.setBlackAndWhite = function(pr) { - History.CanAddChanges() && History.Add(new CChangesDrawingsBool(this, AscDFH.historyitem_PageSetup_SetBlackAndWhite, this.blackAndWhite, pr)); - this.blackAndWhite = pr; - }; - CPageSetup.prototype.setDraft = function(pr) { - History.CanAddChanges() && History.Add(new CChangesDrawingsBool(this, AscDFH.historyitem_PageSetup_SetDraft, this.draft, pr)); - this.draft = pr; - }; - CPageSetup.prototype.setUseFirstPageNumber = function(pr) { - History.CanAddChanges() && History.Add(new CChangesDrawingsBool(this, AscDFH.historyitem_PageSetup_SetUseFirstPageNumber, this.useFirstPageNumber, pr)); - this.useFirstPageNumber = pr; - }; - CPageSetup.prototype.setHorizontalDpi = function(pr) { - History.CanAddChanges() && History.Add(new CChangesDrawingsLong(this, AscDFH.historyitem_PageSetup_SetHorizontalDpi, this.horizontalDpi, pr)); - this.horizontalDpi = pr; - }; - CPageSetup.prototype.setVerticalDpi = function(pr) { - History.CanAddChanges() && History.Add(new CChangesDrawingsLong(this, AscDFH.historyitem_PageSetup_SetVerticalDpi, this.verticalDpi, pr)); - this.verticalDpi = pr; - }; - CPageSetup.prototype.setCopies = function(pr) { - History.CanAddChanges() && History.Add(new CChangesDrawingsLong(this, AscDFH.historyitem_PageSetup_SetCopies, this.copies, pr)); - this.copies = pr; - }; - window['AscFormat'].CPageSetup = CPageSetup; + // CPageSetup.prototype.setPaperSize = function(pr) { + // History.CanAddChanges() && History.Add(new CChangesDrawingsLong(this, AscDFH.historyitem_PageSetup_SetPaperSize, this.paperSize, pr)); + // this.paperSize = pr; + // }; + // CPageSetup.prototype.setFirstPageNumber = function(pr) { + // History.CanAddChanges() && History.Add(new CChangesDrawingsLong(this, AscDFH.historyitem_PageSetup_SetFirstPageNumber, this.firstPageNumber, pr)); + // this.firstPageNumber = pr; + // }; + // CPageSetup.prototype.setOrientation = function(pr) { + // History.CanAddChanges() && History.Add(new CChangesDrawingsObjectNoId(this, AscDFH.historyitem_PageSetup_SetOrientation, this.orientation, pr)); + // this.orientation = pr; + // }; + // CPageSetup.prototype.setBlackAndWhite = function(pr) { + // History.CanAddChanges() && History.Add(new CChangesDrawingsBool(this, AscDFH.historyitem_PageSetup_SetBlackAndWhite, this.blackAndWhite, pr)); + // this.blackAndWhite = pr; + // }; + // CPageSetup.prototype.setDraft = function(pr) { + // History.CanAddChanges() && History.Add(new CChangesDrawingsBool(this, AscDFH.historyitem_PageSetup_SetDraft, this.draft, pr)); + // this.draft = pr; + // }; + // CPageSetup.prototype.setUseFirstPageNumber = function(pr) { + // History.CanAddChanges() && History.Add(new CChangesDrawingsBool(this, AscDFH.historyitem_PageSetup_SetUseFirstPageNumber, this.useFirstPageNumber, pr)); + // this.useFirstPageNumber = pr; + // }; + // CPageSetup.prototype.setHorizontalDpi = function(pr) { + // History.CanAddChanges() && History.Add(new CChangesDrawingsLong(this, AscDFH.historyitem_PageSetup_SetHorizontalDpi, this.horizontalDpi, pr)); + // this.horizontalDpi = pr; + // }; + // CPageSetup.prototype.setVerticalDpi = function(pr) { + // History.CanAddChanges() && History.Add(new CChangesDrawingsLong(this, AscDFH.historyitem_PageSetup_SetVerticalDpi, this.verticalDpi, pr)); + // this.verticalDpi = pr; + // }; + // CPageSetup.prototype.setCopies = function(pr) { + // History.CanAddChanges() && History.Add(new CChangesDrawingsLong(this, AscDFH.historyitem_PageSetup_SetCopies, this.copies, pr)); + // this.copies = pr; + // }; + // window['AscFormat'].CPageSetup = CPageSetup; // ParentLabelLayout drawingsChangesMap[AscDFH.historyitem_ParentLabelLayout_SetVal] = function(oClass, value) { @@ -2668,9 +2703,16 @@ drawingsChangesMap[AscDFH.historyitem_PlotAreaRegion_SetExtLst] = function(oClass, value) { oClass.extLst = value; }; + + drawingContentChanges[AscDFH.historyitem_PlotAreaRegion_AddSeries] = + drawingContentChanges[AscDFH.historyitem_PlotAreaRegion_RemoveSeries] = function(oClass) { + return oClass.series; + }; AscDFH.changesFactory[AscDFH.historyitem_PlotAreaRegion_SetPlotSurface] = window['AscDFH'].CChangesDrawingsObjectNoId; AscDFH.changesFactory[AscDFH.historyitem_PlotAreaRegion_SetSeries] = window['AscDFH'].CChangesDrawingsObjectNoId; AscDFH.changesFactory[AscDFH.historyitem_PlotAreaRegion_SetExtLst] = window['AscDFH'].CChangesDrawingsObjectNoId; + AscDFH.changesFactory[AscDFH.historyitem_PlotAreaRegion_AddSeries] = window['AscDFH'].CChangesDrawingsContent; + AscDFH.changesFactory[AscDFH.historyitem_PlotAreaRegion_RemoveSeries] = window['AscDFH'].CChangesDrawingsContent; function CPlotAreaRegion() { CBaseChartObject.call(this); this.plotSurface = null; @@ -2854,6 +2896,16 @@ drawingsChangesMap[AscDFH.historyitem_Series_SetFormatIdx] = function(oClass, value) { oClass.formatIdx = value; }; + + drawingContentChanges[AscDFH.historyitem_Series_AddDataPt] = + drawingContentChanges[AscDFH.historyitem_Series_RemoveDataPt] = function(oClass) { + return oClass.dataPt; + }; + + drawingContentChanges[AscDFH.historyitem_Series_AddAxisId] = + drawingContentChanges[AscDFH.historyitem_Series_RemoveAxisId] = function(oClass) { + return oClass.axisId; + }; AscDFH.changesFactory[AscDFH.historyitem_Series_SetTx] = window['AscDFH'].CChangesDrawingsObjectNoId; AscDFH.changesFactory[AscDFH.historyitem_Series_SetSpPr] = window['AscDFH'].CChangesDrawingsObjectNoId; // AscDFH.changesFactory[AscDFH.historyitem_Series_SetValueColors] = window['AscDFH'].CChangesDrawingsObjectNoId; @@ -2869,11 +2921,15 @@ AscDFH.changesFactory[AscDFH.historyitem_Series_SetOwnerIdx] = window['AscDFH'].CChangesDrawingsLong; AscDFH.changesFactory[AscDFH.historyitem_Series_SetUniqueId] = window['AscDFH'].CChangesDrawingsString; AscDFH.changesFactory[AscDFH.historyitem_Series_SetFormatIdx] = window['AscDFH'].CChangesDrawingsLong; + AscDFH.changesFactory[AscDFH.historyitem_Series_AddDataPt] = window['AscDFH'].CChangesDrawingsContent; + AscDFH.changesFactory[AscDFH.historyitem_Series_RemoveDataPt] = window['AscDFH'].CChangesDrawingsContent; + AscDFH.changesFactory[AscDFH.historyitem_Series_AddAxisId] = window['AscDFH'].CChangesDrawingsContent; + AscDFH.changesFactory[AscDFH.historyitem_Series_RemoveAxisId] = window['AscDFH'].CChangesDrawingsContent; function CSeries() { CBaseChartObject.call(this); this.tx = null; this.spPr = null; - // in ChartSerializeEx.h + // commented in ChartSerializeEx.h // this.valueColors = null; // this.valueColorPositions = null; this.dataPt = []; @@ -3195,7 +3251,14 @@ drawingsChangesMap[AscDFH.historyitem_StringDimension_SetLevelData] = function(oClass, value) { oClass.levelData = value; }; + + drawingContentChanges[AscDFH.historyitem_StringDimension_AddLevelData] = + drawingContentChanges[AscDFH.historyitem_StringDimension_RemoveLevelData] = function(oClass) { + return oClass.levelData; + }; AscDFH.changesFactory[AscDFH.historyitem_StringDimension_SetLevelData] = window['AscDFH'].CChangesDrawingsObjectNoId; + AscDFH.changesFactory[AscDFH.historyitem_StringDimension_AddLevelData] = window['AscDFH'].CChangesDrawingsContent; + AscDFH.changesFactory[AscDFH.historyitem_StringDimension_RemoveLevelData] = window['AscDFH'].CChangesDrawingsContent; function CStringDimension() { CBaseChartObject.call(this); this.levelData = []; @@ -3224,56 +3287,56 @@ }; window['AscFormat'].CStringDimension = CStringDimension; - // StringLevel - drawingsChangesMap[AscDFH.historyitem_StringLevel_SetPt] = function(oClass, value) { - oClass.pt = value; - }; - drawingsChangesMap[AscDFH.historyitem_StringLevel_SetPtCount] = function(oClass, value) { - oClass.ptCount = value; - }; - drawingsChangesMap[AscDFH.historyitem_StringLevel_SetName] = function(oClass, value) { - oClass.name = value; - }; - AscDFH.changesFactory[AscDFH.historyitem_StringLevel_SetPt] = window['AscDFH'].CChangesDrawingsObjectNoId; - AscDFH.changesFactory[AscDFH.historyitem_StringLevel_SetPtCount] = window['AscDFH'].CChangesDrawingsLong; - AscDFH.changesFactory[AscDFH.historyitem_StringLevel_SetName] = window['AscDFH'].CChangesDrawingsString; - function CStringLevel() { - CBaseChartObject.call(this); - this.pt = []; - this.ptCount = null; - this.name = null; - } + // // StringLevel (CStrCache contains in ChartFormat.js) + // drawingsChangesMap[AscDFH.historyitem_StringLevel_SetPt] = function(oClass, value) { + // oClass.pt = value; + // }; + // drawingsChangesMap[AscDFH.historyitem_StringLevel_SetPtCount] = function(oClass, value) { + // oClass.ptCount = value; + // }; + // drawingsChangesMap[AscDFH.historyitem_StringLevel_SetName] = function(oClass, value) { + // oClass.name = value; + // }; + // AscDFH.changesFactory[AscDFH.historyitem_StringLevel_SetPt] = window['AscDFH'].CChangesDrawingsObjectNoId; + // AscDFH.changesFactory[AscDFH.historyitem_StringLevel_SetPtCount] = window['AscDFH'].CChangesDrawingsLong; + // AscDFH.changesFactory[AscDFH.historyitem_StringLevel_SetName] = window['AscDFH'].CChangesDrawingsString; + // function CStringLevel() { + // CBaseChartObject.call(this); + // this.pt = []; + // this.ptCount = null; + // this.name = null; + // } - InitClass(CStringLevel, CBaseChartObject, AscDFH.historyitem_type_StringLevel); + // InitClass(CStringLevel, CBaseChartObject, AscDFH.historyitem_type_StringLevel); - CStringLevel.prototype.setPt = function(pr) { - History.CanAddChanges() && History.Add(new CChangesDrawingsObjectNoId(this, AscDFH.historyitem_StringLevel_SetPt, this.pt, pr)); - this.pt = pr; - }; - CStringLevel.prototype.addPt = function(pr, idx) { - var pos; - if(AscFormat.isRealNumber(idx)) - pos = idx; - else - pos = this.pt.length; - History.CanAddChanges() && History.Add(new CChangesDrawingsContent(this, AscDFH.historyitem_StringLevel_AddPt, pos, [pr], true)); - this.pt.splice(pos, 0, pr); - }; - CStringLevel.prototype.removePtByPos = function(pos) { - if(this.pt[pos]) { - var pt = this.pt.splice(pos, 1)[0]; - History.CanAddChanges() && History.Add(new CChangesDrawingsContent(this, AscDFH.historyitem_StringLevel_RemovePt, pos, [pt], false)); - } - }; - CStringLevel.prototype.setPtCount = function(pr) { - History.CanAddChanges() && History.Add(new CChangesDrawingsLong(this, AscDFH.historyitem_StringLevel_SetPtCount, this.ptCount, pr)); - this.ptCount = pr; - }; - CStringLevel.prototype.setName = function(pr) { - History.CanAddChanges() && History.Add(new CChangesDrawingsString(this, AscDFH.historyitem_StringLevel_SetName, this.name, pr)); - this.name = pr; - }; - window['AscFormat'].CStringLevel = CStringLevel; + // CStringLevel.prototype.setPt = function(pr) { + // History.CanAddChanges() && History.Add(new CChangesDrawingsObjectNoId(this, AscDFH.historyitem_StringLevel_SetPt, this.pt, pr)); + // this.pt = pr; + // }; + // CStringLevel.prototype.addPt = function(pr, idx) { + // var pos; + // if(AscFormat.isRealNumber(idx)) + // pos = idx; + // else + // pos = this.pt.length; + // History.CanAddChanges() && History.Add(new CChangesDrawingsContent(this, AscDFH.historyitem_StringLevel_AddPt, pos, [pr], true)); + // this.pt.splice(pos, 0, pr); + // }; + // CStringLevel.prototype.removePtByPos = function(pos) { + // if(this.pt[pos]) { + // var pt = this.pt.splice(pos, 1)[0]; + // History.CanAddChanges() && History.Add(new CChangesDrawingsContent(this, AscDFH.historyitem_StringLevel_RemovePt, pos, [pt], false)); + // } + // }; + // CStringLevel.prototype.setPtCount = function(pr) { + // History.CanAddChanges() && History.Add(new CChangesDrawingsLong(this, AscDFH.historyitem_StringLevel_SetPtCount, this.ptCount, pr)); + // this.ptCount = pr; + // }; + // CStringLevel.prototype.setName = function(pr) { + // History.CanAddChanges() && History.Add(new CChangesDrawingsString(this, AscDFH.historyitem_StringLevel_SetName, this.name, pr)); + // this.name = pr; + // }; + // window['AscFormat'].CStringLevel = CStringLevel; // StringValue drawingsChangesMap[AscDFH.historyitem_StringValue_SetIdx] = function(oClass, value) { @@ -3306,7 +3369,14 @@ drawingsChangesMap[AscDFH.historyitem_Subtotals_SetIdx] = function(oClass, value) { oClass.idx = value; }; + + drawingContentChanges[AscDFH.historyitem_Subtotals_AddIdx] = + drawingContentChanges[AscDFH.historyitem_Subtotals_RemoveIdx] = function(oClass) { + return oClass.idx; + }; AscDFH.changesFactory[AscDFH.historyitem_Subtotals_SetIdx] = window['AscDFH'].CChangesDrawingsObjectNoId; + AscDFH.changesFactory[AscDFH.historyitem_Subtotals_AddIdx] = window['AscDFH'].CChangesDrawingsContent; + AscDFH.changesFactory[AscDFH.historyitem_Subtotals_RemoveIdx] = window['AscDFH'].CChangesDrawingsContent; function CSubtotals() { CBaseChartObject.call(this); this.idx = []; @@ -3949,25 +4019,6 @@ this.typeValue = pr; }; window['AscFormat'].CDoubleOrAutomatic = CDoubleOrAutomatic; - - // template - drawingsChangesMap[AscDFH.historyitem_Address_SetTest] = function(oClass, value) { - oClass.test = value; - }; - AscDFH.changesFactory[AscDFH.historyitem_Address_SetTest] = window['AscDFH'].CChangesDrawingsString; - function CTest() { - CBaseChartObject.call(this); - this.test = null; - } - - InitClass(CTest, CBaseChartObject, AscDFH.historyitem_type_Test); - - CTest.prototype.setTest = function(pr) { - History.CanAddChanges() && History.Add(new CChangesDrawingsString(this, AscDFH.historyitem_Address_SetTest, this.test, pr)); - this.test = pr; - }; - window['AscFormat'].CTest = CTest; - // end template //--------------------------------------------------------export---------------------------------------------------- window['AscFormat'] = window['AscFormat'] || {}; diff --git a/common/Drawings/Format/ChartFormat.js b/common/Drawings/Format/ChartFormat.js index b480a13ba4..7cc097a9ca 100644 --- a/common/Drawings/Format/ChartFormat.js +++ b/common/Drawings/Format/ChartFormat.js @@ -738,6 +738,12 @@ drawingsChangesMap[AscDFH.historyitem_Legend_SetSpPr] = function(oClass, value) { oClass.spPr = value; }; + drawingsChangesMap[AscDFH.historyitem_Legend_SetExtLst] = function(oClass, value) { + oClass.extLst = value; + }; + drawingsChangesMap[AscDFH.historyitem_Legend_SetAlign] = function(oClass, value) { + oClass.align = value; + }; drawingsChangesMap[AscDFH.historyitem_Legend_SetTxPr] = function(oClass, value) { oClass.txPr = value; }; @@ -1110,6 +1116,9 @@ drawingsChangesMap[AscDFH.historyitem_Title_SetTxPr] = function(oClass, value) { oClass.txPr = value; }; + drawingsChangesMap[AscDFH.historyitem_Title_SetAlign] = function(oClass, value) { + oClass.align = value; + }; drawingsChangesMap[AscDFH.historyitem_Trendline_SetBackward] = function(oClass, value) { oClass.backward = value; }; @@ -1195,6 +1204,9 @@ oClass.view3D = value; oClass.Refresh_RecalcData(); }; + drawingsChangesMap[AscDFH.historyitem_Chart_SetExtLst] = function(oClass, value) { + oClass.extLst = value; + }; drawingsChangesMap[AscDFH.historyitem_ChartWall_SetPictureOptions] = function(oClass, value) { oClass.pictureOptions = value; }; @@ -1560,6 +1572,7 @@ AscDFH.changesFactory[AscDFH.historyitem_Chart_SetAutoTitleDeleted] = window['AscDFH'].CChangesDrawingsBool; AscDFH.changesFactory[AscDFH.historyitem_Chart_SetPlotVisOnly] = window['AscDFH'].CChangesDrawingsBool; AscDFH.changesFactory[AscDFH.historyitem_Chart_SetShowDLblsOverMax] = window['AscDFH'].CChangesDrawingsBool; + AscDFH.changesFactory[AscDFH.historyitem_Chart_SetExtLst] = window['AscDFH'].CChangesDrawingsObjectNoId; AscDFH.changesFactory[AscDFH.historyitem_View3d_SetRAngAx] = window['AscDFH'].CChangesDrawingsBool; AscDFH.changesFactory[AscDFH.historyitem_ExternalData_SetAutoUpdate] = window['AscDFH'].CChangesDrawingsBool; @@ -1810,6 +1823,8 @@ AscDFH.changesFactory[AscDFH.historyitem_ErrBars_SetSpPr] = window['AscDFH'].CChangesDrawingsObject; AscDFH.changesFactory[AscDFH.historyitem_Legend_SetLayout] = window['AscDFH'].CChangesDrawingsObject; AscDFH.changesFactory[AscDFH.historyitem_Legend_SetSpPr] = window['AscDFH'].CChangesDrawingsObject; + AscDFH.changesFactory[AscDFH.historyitem_Legend_SetExtLst] = window['AscDFH'].CChangesDrawingsObjectNoId; + AscDFH.changesFactory[AscDFH.historyitem_Legend_SetAlign] = window['AscDFH'].CChangesDrawingsObjectNoId; AscDFH.changesFactory[AscDFH.historyitem_Legend_SetTxPr] = window['AscDFH'].CChangesDrawingsObject; AscDFH.changesFactory[AscDFH.historyitem_LegendEntry_SetTxPr] = window['AscDFH'].CChangesDrawingsObject; AscDFH.changesFactory[AscDFH.historyitem_LineChart_SetDLbls] = window['AscDFH'].CChangesDrawingsObject; @@ -1874,6 +1889,7 @@ AscDFH.changesFactory[AscDFH.historyitem_Title_SetSpPr] = window['AscDFH'].CChangesDrawingsObject; AscDFH.changesFactory[AscDFH.historyitem_Title_SetTx] = window['AscDFH'].CChangesDrawingsObject; AscDFH.changesFactory[AscDFH.historyitem_Title_SetTxPr] = window['AscDFH'].CChangesDrawingsObject; + AscDFH.changesFactory[AscDFH.historyitem_Title_SetAlign] = window['AscDFH'].CChangesDrawingsObjectNoId; AscDFH.changesFactory[AscDFH.historyitem_Trendline_SetSpPr] = window['AscDFH'].CChangesDrawingsObject; AscDFH.changesFactory[AscDFH.historyitem_Trendline_SetTrendlineLbl] = window['AscDFH'].CChangesDrawingsObject; AscDFH.changesFactory[AscDFH.historyitem_UpDownBars_SetDownBars] = window['AscDFH'].CChangesDrawingsObject; @@ -10103,6 +10119,8 @@ this.overlay = false; this.spPr = null; this.txPr = null; + this.extLst = null; + this.align = null; this.rot = 0; this.flipH = false; @@ -10381,6 +10399,14 @@ this.spPr = spPr; this.setParentToChild(spPr); }; + CLegend.prototype.setExtLst = function(pr) { + History.CanAddChanges() && History.Add(new CChangesDrawingsObjectNoId(this, AscDFH.historyitem_Legend_SetExtLst, this.extLst, pr)); + this.extLst = pr; + }; + CLegend.prototype.setAlign = function(pr) { + History.CanAddChanges() && History.Add(new CChangesDrawingsObjectNoId(this, AscDFH.historyitem_Legend_SetAlign, this.align, pr)); + this.align = pr; + }; CLegend.prototype.setTxPr = function(txPr) { History.CanAddChanges() && History.Add(new CChangesDrawingsObject(this, AscDFH.historyitem_Legend_SetTxPr, this.txPr, txPr)); this.txPr = txPr; @@ -13592,6 +13618,9 @@ this.localTransform = new CMatrix(); this.localTransformText = new CMatrix(); + //for chart title only (but not axis title) + this.align = null; + this.recalcInfo = { recalculateTxBody: true, @@ -13894,6 +13923,10 @@ this.invertTransformText = global_MatrixTransformer.Invert(this.transformText); }; + CTitle.prototype.setAlign = function(pr) { + History.CanAddChanges() && History.Add(new CChangesDrawingsObjectNoId(this, AscDFH.historyitem_Title_SetAlign, this.align, pr)); + this.align = pr; + }; CTitle.prototype.getParentObjects = function() { if(this.chart) { return this.chart.getParentObjects(); @@ -14718,6 +14751,7 @@ this.sideWall = null; this.title = null; this.view3D = null; + this.extLst = null; } InitClass(CChart, CBaseChartObject, AscDFH.historyitem_type_Chart); @@ -15054,6 +15088,10 @@ this.title.applyChartStyle(oChartStyle, oColors, oAdditionalData, bReset); } }; + CChart.prototype.setExtLst = function(pr) { + History.CanAddChanges() && History.Add(new CChangesDrawingsObjectNoId(this, AscDFH.historyitem_Chart_SetExtLst, this.extLst, pr)); + this.extLst = pr; + }; function CChartWall() { CBaseChartObject.call(this); From a5aff5554834f7eaf5bf42eaa2096831b18affaf Mon Sep 17 00:00:00 2001 From: Dmitriy Aleksandrov Date: Fri, 11 Aug 2023 22:03:21 +0600 Subject: [PATCH 12/30] For bug #62819 Add temp file for serialize ChartEx, add additional variables in SerializeChart --- common/Drawings/Format/ChartEx.js | 150 +++++++++++++------------- common/Drawings/Format/ChartFormat.js | 7 -- common/Drawings/Format/ChartSpace.js | 18 ++++ common/SerializeChart.js | 50 +++++++++ common/tempSerializeChart.js | 98 +++++++++++++++++ configs/cell.json | 1 + configs/slide.json | 1 + configs/word.json | 1 + 8 files changed, 244 insertions(+), 82 deletions(-) create mode 100644 common/tempSerializeChart.js diff --git a/common/Drawings/Format/ChartEx.js b/common/Drawings/Format/ChartEx.js index 05a8ad70f1..20dbf4b580 100644 --- a/common/Drawings/Format/ChartEx.js +++ b/common/Drawings/Format/ChartEx.js @@ -615,88 +615,88 @@ }; window['AscFormat'].CChartData = CChartData; - // ChartSpace - drawingsChangesMap[AscDFH.historyitem_ChartSpace_SetChartData] = function(oClass, value) { - oClass.chartData = value; - }; - drawingsChangesMap[AscDFH.historyitem_ChartSpace_SetChart] = function(oClass, value) { - oClass.chart = value; - }; - drawingsChangesMap[AscDFH.historyitem_ChartSpace_SetSpPr] = function(oClass, value) { - oClass.spPr = value; - }; - drawingsChangesMap[AscDFH.historyitem_ChartSpace_SetTxPr] = function(oClass, value) { - oClass.txPr = value; - }; - drawingsChangesMap[AscDFH.historyitem_ChartSpace_SetClrMapOvr] = function(oClass, value) { - oClass.clrMapOvr = value; - }; - drawingsChangesMap[AscDFH.historyitem_ChartSpace_SetExtLst] = function(oClass, value) { - oClass.extLst = value; - }; - // drawingsChangesMap[AscDFH.historyitem_ChartSpace_SetFmtOvrs] = function(oClass, value) { - // oClass.fmtOvrs = value; + // // ChartSpace (constains in ChartSpace.js) + // drawingsChangesMap[AscDFH.historyitem_ChartSpace_SetChartData] = function(oClass, value) { + // oClass.chartData = value; // }; - // drawingsChangesMap[AscDFH.historyitem_ChartSpace_SetPrintSettings] = function(oClass, value) { - // oClass.printSettings = value; + // drawingsChangesMap[AscDFH.historyitem_ChartSpace_SetChart] = function(oClass, value) { + // oClass.chart = value; // }; - AscDFH.changesFactory[AscDFH.historyitem_ChartSpace_SetChartData] = window['AscDFH'].CChangesDrawingsObjectNoId; - AscDFH.changesFactory[AscDFH.historyitem_ChartSpace_SetChart] = window['AscDFH'].CChangesDrawingsObjectNoId; - AscDFH.changesFactory[AscDFH.historyitem_ChartSpace_SetSpPr] = window['AscDFH'].CChangesDrawingsObjectNoId; - AscDFH.changesFactory[AscDFH.historyitem_ChartSpace_SetTxPr] = window['AscDFH'].CChangesDrawingsObjectNoId; - AscDFH.changesFactory[AscDFH.historyitem_ChartSpace_SetClrMapOvr] = window['AscDFH'].CChangesDrawingsObjectNoId; - AscDFH.changesFactory[AscDFH.historyitem_ChartSpace_SetExtLst] = window['AscDFH'].CChangesDrawingsObjectNoId; - // AscDFH.changesFactory[AscDFH.historyitem_ChartSpace_SetFmtOvrs] = window['AscDFH'].CChangesDrawingsObjectNoId; - // AscDFH.changesFactory[AscDFH.historyitem_ChartSpace_SetPrintSettings] = window['AscDFH'].CChangesDrawingsObjectNoId; - function CChartSpace() { - CBaseChartObject.call(this); - this.chartData = null; - this.chart = null; - this.spPr = null; - this.txPr = null; - this.clrMapOvr = null; - this.extLst = null; - // unused in ChartSerializeEx.h - // this.fmtOvrs = null; - // this.printSettings = null; + // drawingsChangesMap[AscDFH.historyitem_ChartSpace_SetSpPr] = function(oClass, value) { + // oClass.spPr = value; + // }; + // drawingsChangesMap[AscDFH.historyitem_ChartSpace_SetTxPr] = function(oClass, value) { + // oClass.txPr = value; + // }; + // drawingsChangesMap[AscDFH.historyitem_ChartSpace_SetClrMapOvr] = function(oClass, value) { + // oClass.clrMapOvr = value; + // }; + // drawingsChangesMap[AscDFH.historyitem_ChartSpace_SetExtLst] = function(oClass, value) { + // oClass.extLst = value; + // }; + // // drawingsChangesMap[AscDFH.historyitem_ChartSpace_SetFmtOvrs] = function(oClass, value) { + // // oClass.fmtOvrs = value; + // // }; + // // drawingsChangesMap[AscDFH.historyitem_ChartSpace_SetPrintSettings] = function(oClass, value) { + // // oClass.printSettings = value; + // // }; + // AscDFH.changesFactory[AscDFH.historyitem_ChartSpace_SetChartData] = window['AscDFH'].CChangesDrawingsObjectNoId; + // AscDFH.changesFactory[AscDFH.historyitem_ChartSpace_SetChart] = window['AscDFH'].CChangesDrawingsObjectNoId; + // AscDFH.changesFactory[AscDFH.historyitem_ChartSpace_SetSpPr] = window['AscDFH'].CChangesDrawingsObjectNoId; + // AscDFH.changesFactory[AscDFH.historyitem_ChartSpace_SetTxPr] = window['AscDFH'].CChangesDrawingsObjectNoId; + // AscDFH.changesFactory[AscDFH.historyitem_ChartSpace_SetClrMapOvr] = window['AscDFH'].CChangesDrawingsObjectNoId; + // AscDFH.changesFactory[AscDFH.historyitem_ChartSpace_SetExtLst] = window['AscDFH'].CChangesDrawingsObjectNoId; + // // AscDFH.changesFactory[AscDFH.historyitem_ChartSpace_SetFmtOvrs] = window['AscDFH'].CChangesDrawingsObjectNoId; + // // AscDFH.changesFactory[AscDFH.historyitem_ChartSpace_SetPrintSettings] = window['AscDFH'].CChangesDrawingsObjectNoId; + // function CChartSpace() { + // CBaseChartObject.call(this); + // this.chartData = null; + // this.chart = null; + // this.spPr = null; + // this.txPr = null; + // this.clrMapOvr = null; + // this.extLst = null; + // // unused in ChartSerializeEx.h + // // this.fmtOvrs = null; + // // this.printSettings = null; - } + // } - InitClass(CChartSpace, CBaseChartObject, AscDFH.historyitem_type_ChartSpace); + // InitClass(CChartSpace, CBaseChartObject, AscDFH.historyitem_type_ChartSpace); - CChartSpace.prototype.setChartData = function(pr) { - History.CanAddChanges() && History.Add(new CChangesDrawingsObjectNoId(this, AscDFH.historyitem_ChartSpace_SetChartData, this.chartData, pr)); - this.chartData = pr; - }; - CChartSpace.prototype.setChart = function(pr) { - History.CanAddChanges() && History.Add(new CChangesDrawingsObjectNoId(this, AscDFH.historyitem_ChartSpace_SetChart, this.chart, pr)); - this.chart = pr; - }; - CChartSpace.prototype.setSpPr = function(pr) { - History.CanAddChanges() && History.Add(new CChangesDrawingsObjectNoId(this, AscDFH.historyitem_ChartSpace_SetSpPr, this.spPr, pr)); - this.spPr = pr; - }; - CChartSpace.prototype.setTxPr = function(pr) { - History.CanAddChanges() && History.Add(new CChangesDrawingsObjectNoId(this, AscDFH.historyitem_ChartSpace_SetTxPr, this.txPr, pr)); - this.txPr = pr; - }; - CChartSpace.prototype.setClrMapOvr = function(pr) { - History.CanAddChanges() && History.Add(new CChangesDrawingsObjectNoId(this, AscDFH.historyitem_ChartSpace_SetClrMapOvr, this.clrMapOvr, pr)); - this.clrMapOvr = pr; - }; - CChartSpace.prototype.setExtLst = function(pr) { - History.CanAddChanges() && History.Add(new CChangesDrawingsObjectNoId(this, AscDFH.historyitem_ChartSpace_SetExtLst, this.extLst, pr)); - this.extLst = pr; - }; - // CChartSpace.prototype.setFmtOvrs = function(pr) { - // History.CanAddChanges() && History.Add(new CChangesDrawingsObjectNoId(this, AscDFH.historyitem_ChartSpace_SetFmtOvrs, this.fmtOvrs, pr)); - // this.fmtOvrs = pr; + // CChartSpace.prototype.setChartData = function(pr) { + // History.CanAddChanges() && History.Add(new CChangesDrawingsObjectNoId(this, AscDFH.historyitem_ChartSpace_SetChartData, this.chartData, pr)); + // this.chartData = pr; + // }; + // CChartSpace.prototype.setChart = function(pr) { + // History.CanAddChanges() && History.Add(new CChangesDrawingsObjectNoId(this, AscDFH.historyitem_ChartSpace_SetChart, this.chart, pr)); + // this.chart = pr; + // }; + // CChartSpace.prototype.setSpPr = function(pr) { + // History.CanAddChanges() && History.Add(new CChangesDrawingsObjectNoId(this, AscDFH.historyitem_ChartSpace_SetSpPr, this.spPr, pr)); + // this.spPr = pr; + // }; + // CChartSpace.prototype.setTxPr = function(pr) { + // History.CanAddChanges() && History.Add(new CChangesDrawingsObjectNoId(this, AscDFH.historyitem_ChartSpace_SetTxPr, this.txPr, pr)); + // this.txPr = pr; // }; - // CChartSpace.prototype.setPrintSettings = function(pr) { - // History.CanAddChanges() && History.Add(new CChangesDrawingsObjectNoId(this, AscDFH.historyitem_ChartSpace_SetPrintSettings, this.printSettings, pr)); - // this.printSettings = pr; + // CChartSpace.prototype.setClrMapOvr = function(pr) { + // History.CanAddChanges() && History.Add(new CChangesDrawingsObjectNoId(this, AscDFH.historyitem_ChartSpace_SetClrMapOvr, this.clrMapOvr, pr)); + // this.clrMapOvr = pr; + // }; + // CChartSpace.prototype.setExtLst = function(pr) { + // History.CanAddChanges() && History.Add(new CChangesDrawingsObjectNoId(this, AscDFH.historyitem_ChartSpace_SetExtLst, this.extLst, pr)); + // this.extLst = pr; // }; - window['AscFormat'].CChartSpace = CChartSpace; + // // CChartSpace.prototype.setFmtOvrs = function(pr) { + // // History.CanAddChanges() && History.Add(new CChangesDrawingsObjectNoId(this, AscDFH.historyitem_ChartSpace_SetFmtOvrs, this.fmtOvrs, pr)); + // // this.fmtOvrs = pr; + // // }; + // // CChartSpace.prototype.setPrintSettings = function(pr) { + // // History.CanAddChanges() && History.Add(new CChangesDrawingsObjectNoId(this, AscDFH.historyitem_ChartSpace_SetPrintSettings, this.printSettings, pr)); + // // this.printSettings = pr; + // // }; + // window['AscFormat'].CChartSpace = CChartSpace; // // ChartTitle (CTitle instead of CChartTitle) // drawingsChangesMap[AscDFH.historyitem_ChartTitle_SetTx] = function(oClass, value) { diff --git a/common/Drawings/Format/ChartFormat.js b/common/Drawings/Format/ChartFormat.js index 7cc097a9ca..d2404ca778 100644 --- a/common/Drawings/Format/ChartFormat.js +++ b/common/Drawings/Format/ChartFormat.js @@ -2029,13 +2029,6 @@ AscDFH.changesFactory[AscDFH.historyitem_MarkerLayoutSymbol] = window['AscDFH'].CChangesDrawingsLong; AscDFH.changesFactory[AscDFH.historyitem_MarkerLayoutSize] = window['AscDFH'].CChangesDrawingsLong; - AscDFH.drawingsConstructorsMap[AscDFH.historyitem_ChartStyleEntryLnRef] = AscFormat.StyleRef; - AscDFH.drawingsConstructorsMap[AscDFH.historyitem_ChartStyleEntryFillRef] = AscFormat.StyleRef; - AscDFH.drawingsConstructorsMap[AscDFH.historyitem_ChartStyleEntryEffectRef] = AscFormat.StyleRef; - AscDFH.drawingsConstructorsMap[AscDFH.historyitem_ChartStyleEntryFontRef] = AscFormat.FontRef; - AscDFH.drawingsConstructorsMap[AscDFH.historyitem_ChartStyleEntryBodyPr] = AscFormat.CBodyPr; - - drawingContentChanges[AscDFH.historyitem_PlotArea_AddAxis] = drawingContentChanges[AscDFH.historyitem_BarChart_AddAxId] = drawingContentChanges[AscDFH.historyitem_AreaChart_AddAxId] = diff --git a/common/Drawings/Format/ChartSpace.js b/common/Drawings/Format/ChartSpace.js index b50d73dede..a4723f6e73 100644 --- a/common/Drawings/Format/ChartSpace.js +++ b/common/Drawings/Format/ChartSpace.js @@ -373,6 +373,8 @@ function(window, undefined) { AscDFH.changesFactory[AscDFH.historyitem_ChartSpace_SetNvGrFrProps] = CChangesDrawingsObject; AscDFH.changesFactory[AscDFH.historyitem_ChartSpace_SetThemeOverride] = CChangesDrawingsObject; AscDFH.changesFactory[AscDFH.historyitem_ShapeSetBDeleted] = CChangesDrawingsBool; + AscDFH.changesFactory[AscDFH.historyitem_ChartSpace_SetChartData] = CChangesDrawingsObjectNoId; + AscDFH.changesFactory[AscDFH.historyitem_ChartSpace_SetExtLst] = CChangesDrawingsObjectNoId; AscDFH.changesFactory[AscDFH.historyitem_ChartSpace_SetParent] = CChangesDrawingsObject; AscDFH.changesFactory[AscDFH.historyitem_ChartSpace_SetChart] = CChangesDrawingsObject; AscDFH.changesFactory[AscDFH.historyitem_ChartSpace_SetClrMapOvr] = CChangesDrawingsObject; @@ -535,6 +537,12 @@ function(window, undefined) { drawingsChangesMap[AscDFH.historyitem_ShapeSetBDeleted] = function (oClass, value) { oClass.bDeleted = value; }; + drawingsChangesMap[AscDFH.historyitem_ChartSpace_SetChartData] = function(oClass, value) { + oClass.chartData = value; + }; + drawingsChangesMap[AscDFH.historyitem_ChartSpace_SetExtLst] = function(oClass, value) { + oClass.extLst = value; + }; drawingsChangesMap[AscDFH.historyitem_ChartSpace_SetParent] = function (oClass, value) { oClass.oldParent = oClass.parent; oClass.parent = value; @@ -1323,6 +1331,8 @@ function(window, undefined) { this.userShapes = [];//userShapes this.chartStyle = null; this.chartColors = null; + this.chartData = null; + this.extLst = null; this.dataRefs = null; this.pathMemory = new CPathMemory(); @@ -1363,6 +1373,14 @@ function(window, undefined) { } return this.dataRefs; }; + CChartSpace.prototype.setChartData = function(pr) { + History.CanAddChanges() && History.Add(new CChangesDrawingsObjectNoId(this, AscDFH.historyitem_ChartSpace_SetChartData, this.chartData, pr)); + this.chartData = pr; + }; + CChartData.prototype.setExtLst = function(pr) { + History.CanAddChanges() && History.Add(new CChangesDrawingsObjectNoId(this, AscDFH.historyitem_ChartData_SetExtLst, this.extLst, pr)); + this.extLst = pr; + }; CChartSpace.prototype.clearDataRefs = function () { if (this.dataRefs) { this.dataRefs = null; diff --git a/common/SerializeChart.js b/common/SerializeChart.js index 6463e25fc2..58fa1a1edd 100644 --- a/common/SerializeChart.js +++ b/common/SerializeChart.js @@ -218,6 +218,7 @@ var c_oserct_chartspaceTHEMEOVERRIDE = 15; var c_oserct_chartspaceXLSX = 16; var c_oserct_chartspaceSTYLES = 17; var c_oserct_chartspaceCOLORS = 18; +var c_oserct_chartspaceCHARTDATA = 19; var c_oserct_usershapes_COUNT = 0; @@ -285,6 +286,7 @@ var c_oserct_legendOVERLAY = 3; var c_oserct_legendSPPR = 4; var c_oserct_legendTXPR = 5; var c_oserct_legendEXTLST = 6; +var c_oserct_legendALIGN = 7; var c_oserct_layoutMANUALLAYOUT = 0; var c_oserct_layoutEXTLST = 1; @@ -354,6 +356,7 @@ var c_oserct_titleOVERLAY = 2; var c_oserct_titleSPPR = 3; var c_oserct_titleTXPR = 4; var c_oserct_titleEXTLST = 5; +var c_oserct_titleALIGN = 6; var c_oserct_txRICH = 0; var c_oserct_txSTRREF = 1; @@ -927,6 +930,7 @@ var c_oserct_plotareaVALAX = 22; var c_oserct_plotareaDTABLE = 23; var c_oserct_plotareaSPPR = 24; var c_oserct_plotareaEXTLST = 25; +var c_oserct_plotareaPLOTAREAREGION = 26; var c_oserct_thicknessVAL = 0; @@ -1393,6 +1397,11 @@ BinaryChartWriter.prototype.WriteCT_ChartSpace = function (oVal) { oThis.WriteCT_ChartColors(oVal.chartColors); }); } + if(null != oVal.chartData) { + this.bs.WriteItem(c_oserct_chartspaceCHARTDATA, function() { + oThis.WriteCT_ChartData(oVal.chartData); // todoo this class + }); + } }; BinaryChartWriter.prototype.WriteCT_FromTo = function(oVal){ this.memory.WriteByte(Asc.c_oSer_DrawingPosType.X); @@ -1908,6 +1917,11 @@ BinaryChartWriter.prototype.WriteCT_Legend = function (oVal) { oThis.WriteTxPr(oVal.txPr); }); } + if (null != oVal.align) { + this.bs.WriteItem(c_oserct_legendALIGN, function () { + oThis.WriteCT_PosAlign(oVal.align); // todoo this class + }); + } // var oCurVal = oVal.m_extLst; // if (null != oCurVal) { // this.bs.WriteItem(c_oserct_legendEXTLST, function () { @@ -2261,6 +2275,11 @@ BinaryChartWriter.prototype.WriteCT_Title = function (oVal) { oThis.WriteTxPr(oVal.txPr); }); } + if (null != oVal.align) { + this.bs.WriteItem(c_oserct_titleALIGN, function () { + oThis.WriteCT_PosAlign(oVal.align); // todoo this class + }); + } // var oCurVal = oVal.m_extLst; // if (null != oCurVal) { // this.bs.WriteItem(c_oserct_titleEXTLST, function () { @@ -5462,6 +5481,11 @@ BinaryChartWriter.prototype.WriteCT_PlotArea = function (oVal, oChart) { oThis.WriteSpPr(oVal.spPr); }); } + if (null != oVal.plotAreaRegion) { + this.bs.WriteItem(c_oserct_plotareaPLOTAREAREGION, function () { + oThis.WriteCT_PlotAreaRegion(oVal.plotAreaRegion); // todoo this class + }); + } // var oCurVal = oVal.m_extLst; // if (null != oCurVal) { // this.bs.WriteItem(c_oserct_plotareaEXTLST, function () { @@ -6203,6 +6227,12 @@ BinaryChartReader.prototype.ReadCT_ChartSpace = function (type, length, val, cur val.setChartColors(oNewVal); } } + else if(c_oserct_chartspaceCHARTDATA === type) { + oNewVal = {}; + res = this.bcr.Read1(length, function (t, l) { + return oThis.ReadCT_ChartData(t, l, oNewVal); // todoo this class + }); + } else { res = c_oSerConstants.ReadUnknown; } @@ -6844,6 +6874,13 @@ BinaryChartReader.prototype.ReadCT_Legend = function (type, length, val) { val.setTxPr(this.ReadTxPr(length)); val.txPr.setParent(val); } + else if (c_oserct_legendALIGN === type) { + var oNewVal; + oNewVal = {}; + res = this.bcr.Read1(length, function (t, l) { + return oThis.ReadCT_PosAlign(t, l, oNewVal); + }); + } else if (c_oserct_legendEXTLST === type) { var oNewVal; oNewVal = {}; @@ -7351,6 +7388,13 @@ BinaryChartReader.prototype.ReadCT_Title = function (type, length, val) { val.setTxPr(this.ReadTxPr(length)); val.txPr.setParent(val); } + else if (c_oserct_titleALIGN === type) { + var oNewVal; + oNewVal = {}; + res = this.bcr.Read1(length, function (t, l) { + return oThis.ReadCT_PosAlign(t, l, oNewVal); // todoo this class + }); + } else if (c_oserct_titleEXTLST === type) { var oNewVal; oNewVal = {}; @@ -11632,6 +11676,12 @@ BinaryChartReader.prototype.ReadCT_PlotArea = function (type, length, val, aChar }); // val.m_extLst = oNewVal; } + else if (c_oserct_plotareaPLOTAREAREGION === type) { + var oNewVal = {}; + res = this.bcr.Read1(length, function (t, l) { + return oThis.ReadCT_PlotAreaRegion(t, l, oNewVal); // todoo this class + }); + } else res = c_oSerConstants.ReadUnknown; return res; diff --git a/common/tempSerializeChart.js b/common/tempSerializeChart.js new file mode 100644 index 0000000000..2fe494629b --- /dev/null +++ b/common/tempSerializeChart.js @@ -0,0 +1,98 @@ + +// template +var c_oserct_testLongAttr = 0; +var c_oserct_testStringAttr = 1; +var c_oserct_testVARIATION = 2; +var c_oserct_testCOLOR = 3; +var c_oserct_testEFFECT = 4; + +BinaryChartWriter.prototype.WriteCT_Test = function (oVal) { + var oThis = this; + if(oVal.id !== null) { + this.bs.WriteItem(c_oserct_testLongAttr, function() { + oThis.memory.WriteLong(oVal.id); + }); + } + if(oVal.meth !== null) { + this.bs.WriteItem(c_oserct_testStringAttr, function() { + oThis.memory.WriteString3(oVal.meth); + }); + } + var aItems = oVal.items, nItem, oItem; + for(nItem = 0; nItem < aItems.length; ++nItem) { + oItem = aItems[nItem]; + if(oItem instanceof AscFormat.CUniColor) { + this.bs.WriteItem(c_oserct_testCOLOR, function() { + AscCommon.pptx_content_writer.WriteUniColor(oThis.memory, oItem) + }); + } + else { + this.bs.WriteItem(c_oserct_testVARIATION, function() { + oThis.WriteCT_TestVariation(oItem); + }); + } + } +}; +BinaryChartReader.prototype.ReadCT_Test = function (type, length, val) { + var res = c_oSerConstants.ReadOk; + var oThis = this; + var oNewVal; + if (c_oserct_testLongAttr === type) + { + val.setId(this.stream.GetULongLE()); + } + else if (c_oserct_testStringAttr === type) + { + val.setMeth(this.stream.GetString2LE(length)); + } + else if(c_oserct_testVARIATION === type) + { + oNewVal = new AscFormat.CColorModifiers(); + res = this.bcr.Read1(length, function (t, l) { + return oThis.ReadCT_TestVariation(t, l, oNewVal); + }); + val.addItem(oNewVal); + } + else if(c_oserct_testCOLOR === type) + { + oNewVal = AscCommon.pptx_content_loader.ReadUniColor(this, this.stream); + if(oNewVal) + { + val.addItem(oNewVal); + } + } + else + { + res = c_oSerConstants.ReadUnknown; + } + return res; +}; + + +BinaryChartWriter.prototype.WriteCT_TestVariation = function (oVal) { + var oThis = this; + var aMods = oVal.Mods, nMod, oMod; + for(nMod = 0; nMod < aMods.length; ++nMod) { + oMod = aMods[nMod]; + this.bs.WriteItem(c_oserct_testEFFECT, function() { + AscCommon.pptx_content_writer.WriteMod(oThis.memory, oMod) + }); + } +}; +BinaryChartReader.prototype.ReadCT_TestVariation = function (type, length, val) +{ + var res = c_oSerConstants.ReadOk; + if (c_oserct_testEFFECT === type) + { + var oMod = AscCommon.pptx_content_loader.ReadColorMod(this, this.stream); + if(oMod) + { + val.addMod(oMod); + } + } + else + { + res = c_oSerConstants.ReadUnknown; + } + return res; +}; \ No newline at end of file diff --git a/configs/cell.json b/configs/cell.json index 388e98e90d..b6367daf73 100644 --- a/configs/cell.json +++ b/configs/cell.json @@ -97,6 +97,7 @@ "common/Drawings/Format/Data.js", "common/Drawings/Format/ChartSpace.js", "common/Drawings/Format/ChartFormat.js", + "common/Drawings/Format/ChartEx.js", "common/Drawings/Format/TextBody.js", "common/Charts/charts.js", "common/Charts/DrawingArea.js", diff --git a/configs/slide.json b/configs/slide.json index 27b3ba8351..fa7e18b3d1 100644 --- a/configs/slide.json +++ b/configs/slide.json @@ -95,6 +95,7 @@ "common/Drawings/Format/Data.js", "common/Drawings/Format/ChartSpace.js", "common/Drawings/Format/ChartFormat.js", + "common/Drawings/Format/ChartEx.js", "common/Drawings/Format/TextBody.js", "slide/Editor/Format/TextBodyPrototype.js", "common/Drawings/Format/GraphicFrame.js", diff --git a/configs/word.json b/configs/word.json index d0be5162dd..c350eb3043 100644 --- a/configs/word.json +++ b/configs/word.json @@ -95,6 +95,7 @@ "common/Drawings/Format/Data.js", "common/Drawings/Format/ChartSpace.js", "common/Drawings/Format/ChartFormat.js", + "common/Drawings/Format/ChartEx.js", "common/Drawings/Format/TextBody.js", "common/Charts/charts.js", "common/Charts/DrawingObjects.js", From c5e978187cd08c6546e30e7a1b482019fbae8c5e Mon Sep 17 00:00:00 2001 From: Dmitriy Aleksandrov Date: Mon, 14 Aug 2023 22:02:47 +0600 Subject: [PATCH 13/30] For bug #62819 Add structures to tempSerializeChart.js, little fixes in ChartEx.js and ChartSpace.js --- common/Drawings/Format/ChartEx.js | 310 ++++++++++++++++++--------- common/Drawings/Format/ChartSpace.js | 4 +- common/tempSerializeChart.js | 255 ++++++++++++++++++++++ 3 files changed, 463 insertions(+), 106 deletions(-) diff --git a/common/Drawings/Format/ChartEx.js b/common/Drawings/Format/ChartEx.js index 20dbf4b580..2e017fbe40 100644 --- a/common/Drawings/Format/ChartEx.js +++ b/common/Drawings/Format/ChartEx.js @@ -238,7 +238,7 @@ History.CanAddChanges() && History.Add(new CChangesDrawingsBool(this, AscDFH.historyitem_Axis_SetHidden, this.hidden, pr)); this.hidden = pr; }; - window['AscFormat'].CAxis = CAxis; + // // Title (contains in ChartFormat.js) // drawingsChangesMap[AscDFH.historyitem_Title_SetTx] = function(oClass, value) { @@ -312,7 +312,7 @@ // History.CanAddChanges() && History.Add(new CChangesDrawingsBool(this, AscDFH.historyitem_Title_SetOverlay, this.overlay, pr)); // this.overlay = pr; // }; - // window['AscFormat'].CTitle = CTitle; + // // // AxisTitle (CTitle instead of CAxisTitle) // drawingsChangesMap[AscDFH.historyitem_AxisTitle_SetTx] = function(oClass, value) { @@ -357,7 +357,7 @@ // History.CanAddChanges() && History.Add(new CChangesDrawingsObjectNoId(this, AscDFH.historyitem_AxisTitle_SetExtLst, this.extLst, pr)); // this.extLst = pr; // }; - // window['AscFormat'].CAxisTitle = CAxisTitle; + // // AxisUnits drawingsChangesMap[AscDFH.historyitem_AxisUnits_SetUnitsLabel] = function(oClass, value) { @@ -372,14 +372,14 @@ AscDFH.changesFactory[AscDFH.historyitem_AxisUnits_SetUnitsLabel] = window['AscDFH'].CChangesDrawingsObjectNoId; AscDFH.changesFactory[AscDFH.historyitem_AxisUnits_SetExtLst] = window['AscDFH'].CChangesDrawingsObjectNoId; AscDFH.changesFactory[AscDFH.historyitem_AxisUnits_SetUnit] = window['AscDFH'].CChangesDrawingsObjectNoId; - function AxisUnits() { + function CAxisUnits() { CBaseChartObject.call(this); this.unitsLabel = null; this.extLst = null; this.unit = null; } - InitClass(AxisUnits, CBaseChartObject, AscDFH.historyitem_type_AxisUnits); + InitClass(CAxisUnits, CBaseChartObject, AscDFH.historyitem_type_AxisUnits); CAxisUnits.prototype.setUnitsLabel = function(pr) { History.CanAddChanges() && History.Add(new CChangesDrawingsObjectNoId(this, AscDFH.historyitem_AxisUnits_SetUnitsLabel, this.unitsLabel, pr)); @@ -393,7 +393,7 @@ History.CanAddChanges() && History.Add(new CChangesDrawingsObjectNoId(this, AscDFH.historyitem_AxisUnits_SetUnit, this.unit, pr)); this.unit = pr; }; - window['AscFormat'].CAxisUnits = CAxisUnits; + // AxisUnitsLabel drawingsChangesMap[AscDFH.historyitem_AxisUnitsLabel_SetTx] = function(oClass, value) { @@ -438,7 +438,7 @@ History.CanAddChanges() && History.Add(new CChangesDrawingsObjectNoId(this, AscDFH.historyitem_AxisUnitsLabel_SetExtLst, this.extLst, pr)); this.extLst = pr; }; - window['AscFormat'].CAxisUnitsLabel = CAxisUnitsLabel; + // Binning drawingsChangesMap[AscDFH.historyitem_Binning_SetBinSize] = function(oClass, value) { @@ -492,7 +492,7 @@ History.CanAddChanges() && History.Add(new CChangesDrawingsObjectNoId(this, AscDFH.historyitem_Binning_SetOverflow, this.overflow, pr)); this.overflow = pr; }; - window['AscFormat'].CBinning = CBinning; + // CategoryAxisScaling drawingsChangesMap[AscDFH.historyitem_CategoryAxisScaling_SetGapWidth] = function(oClass, value) { @@ -510,7 +510,7 @@ History.CanAddChanges() && History.Add(new CChangesDrawingsObjectNoId(this, AscDFH.historyitem_CategoryAxisScaling_SetGapWidth, this.gapWidth, pr)); this.gapWidth = pr; }; - window['AscFormat'].CCategoryAxisScaling = CCategoryAxisScaling; + // // Chart (contains in ChartFormat.js) // drawingsChangesMap[AscDFH.historyitem_Chart_SetTitle] = function(oClass, value) { @@ -555,7 +555,7 @@ // History.CanAddChanges() && History.Add(new CChangesDrawingsObjectNoId(this, AscDFH.historyitem_Chart_SetExtLst, this.extLst, pr)); // this.extLst = pr; // }; - // window['AscFormat'].CChart = CChart; + // // ChartData drawingsChangesMap[AscDFH.historyitem_ChartData_SetExternalData] = function(oClass, value) { @@ -613,7 +613,7 @@ History.CanAddChanges() && History.Add(new CChangesDrawingsObjectNoId(this, AscDFH.historyitem_ChartData_SetExtLst, this.extLst, pr)); this.extLst = pr; }; - window['AscFormat'].CChartData = CChartData; + // // ChartSpace (constains in ChartSpace.js) // drawingsChangesMap[AscDFH.historyitem_ChartSpace_SetChartData] = function(oClass, value) { @@ -696,7 +696,7 @@ // // History.CanAddChanges() && History.Add(new CChangesDrawingsObjectNoId(this, AscDFH.historyitem_ChartSpace_SetPrintSettings, this.printSettings, pr)); // // this.printSettings = pr; // // }; - // window['AscFormat'].CChartSpace = CChartSpace; + // // // ChartTitle (CTitle instead of CChartTitle) // drawingsChangesMap[AscDFH.historyitem_ChartTitle_SetTx] = function(oClass, value) { @@ -768,7 +768,7 @@ // History.CanAddChanges() && History.Add(new CChangesDrawingsString(this, AscDFH.historyitem_ChartTitle_SetOverlay, this.overlay, pr)); // this.overlay = pr; // }; - // window['AscFormat'].CChartTitle = CChartTitle; + // // Clear (no in ChartSerializeEx.h) drawingsChangesMap[AscDFH.historyitem_Clear_SetGeoLocationQueryResults] = function(oClass, value) { @@ -813,7 +813,7 @@ History.CanAddChanges() && History.Add(new CChangesDrawingsObjectNoId(this, AscDFH.historyitem_Clear_SetGeoChildEntitiesQueryResults, this.geoChildEntitiesQueryResults, pr)); this.geoChildEntitiesQueryResults = pr; }; - window['AscFormat'].CClear = CClear; + // Copyrights (no in ChartSerializeEx.h) drawingsChangesMap[AscDFH.historyitem_Copyrights_SetCopyright] = function(oClass, value) { @@ -831,7 +831,7 @@ History.CanAddChanges() && History.Add(new CChangesDrawingsString(this, AscDFH.historyitem_Copyrights_SetCopyright, this.copyright, pr)); this.copyright = pr; }; - window['AscFormat'].CCopyrights = CCopyrights; + // Data // drawingsChangesMap[AscDFH.historyitem_Data_SetNumDim] = function(oClass, value) { @@ -908,7 +908,7 @@ History.CanAddChanges() && History.Add(new CChangesDrawingsLong(this, AscDFH.historyitem_Data_SetId, this.id, pr)); this.id = pr; }; - window['AscFormat'].CData = CData; + // // DataId (int field instead class in ChartSerializeEx.h) // drawingsChangesMap[AscDFH.historyitem_DataId_SetVal] = function(oClass, value) { @@ -926,7 +926,7 @@ // History.CanAddChanges() && History.Add(new CChangesDrawingsString(this, AscDFH.historyitem_DataId_SetVal, this.val, pr)); // this.val = pr; // }; - // window['AscFormat'].CDataId = CDataId; + // // DataLabel drawingsChangesMap[AscDFH.historyitem_DataLabel_SetNumFmt] = function(oClass, value) { @@ -1007,7 +1007,7 @@ History.CanAddChanges() && History.Add(new CChangesDrawingsObjectNoId(this, AscDFH.historyitem_DataLabel_SetPos, this.pos, pr)); this.pos = pr; }; - window['AscFormat'].CDataLabel = CDataLabel; + // DataLabelHidden drawingsChangesMap[AscDFH.historyitem_DataLabelHidden_SetIdx] = function(oClass, value) { @@ -1025,7 +1025,7 @@ History.CanAddChanges() && History.Add(new CChangesDrawingsLong(this, AscDFH.historyitem_DataLabelHidden_SetIdx, this.idx, pr)); this.idx = pr; }; - window['AscFormat'].CDataLabelHidden = CDataLabelHidden; + // DataLabels drawingsChangesMap[AscDFH.historyitem_DataLabels_SetNumFmt] = function(oClass, value) { @@ -1159,7 +1159,7 @@ History.CanAddChanges() && History.Add(new CChangesDrawingsObjectNoId(this, AscDFH.historyitem_DataLabels_SetPos, this.pos, pr)); this.pos = pr; }; - window['AscFormat'].CDataLabels = CDataLabels; + // DataLabelVisibilities drawingsChangesMap[AscDFH.historyitem_DataLabelVisibilities_SetSeriesName] = function(oClass, value) { @@ -1195,7 +1195,7 @@ History.CanAddChanges() && History.Add(new CChangesDrawingsBool(this, AscDFH.historyitem_DataLabelVisibilities_SetValue, this.value, pr)); this.value = pr; }; - window['AscFormat'].CDataLabelVisibilities = CDataLabelVisibilities; + // DataPoint drawingsChangesMap[AscDFH.historyitem_DataPoint_SetSpPr] = function(oClass, value) { @@ -1231,7 +1231,7 @@ History.CanAddChanges() && History.Add(new CChangesDrawingsLong(this, AscDFH.historyitem_DataPoint_SetIdx, this.idx, pr)); this.idx = pr; }; - window['AscFormat'].CDataPoint = CDataPoint; + // // Extension (Extensionlist is unused in ChartSerializeEx.h) // drawingsChangesMap[AscDFH.historyitem_Extension_SetUri] = function(oClass, value) { @@ -1249,7 +1249,7 @@ // History.CanAddChanges() && History.Add(new CChangesDrawingsString(this, AscDFH.historyitem_Extension_SetUri, this.uri, pr)); // this.uri = pr; // }; - // window['AscFormat'].CExtension = CExtension; + // // // ExtensionList (OOX::Drawing::COfficeArtExtensionList instead of CExtensionList) // drawingsChangesMap[AscDFH.historyitem_ExtensionList_SetExt] = function(oClass, value) { @@ -1267,7 +1267,7 @@ // History.CanAddChanges() && History.Add(new CChangesDrawingsString(this, AscDFH.historyitem_ExtensionList_SetExt, this.ext, pr)); // this.ext = pr; // }; - // window['AscFormat'].CExtensionList = CExtensionList; + // // // ExternalData (contains in ChartFormat.js) // drawingsChangesMap[AscDFH.historyitem_ExternalData_SetId] = function(oClass, value) { @@ -1294,7 +1294,7 @@ // History.CanAddChanges() && History.Add(new CChangesDrawingsBool(this, AscDFH.historyitem_ExternalData_SetAutoUpdate, this.autoUpdate, pr)); // this.autoUpdate = pr; // }; - // window['AscFormat'].CExternalData = CExternalData; + // // FormatOverride (no in ChartSerializeEx.h) drawingsChangesMap[AscDFH.historyitem_FormatOverride_SetSpPr] = function(oClass, value) { @@ -1330,7 +1330,7 @@ History.CanAddChanges() && History.Add(new CChangesDrawingsLong(this, AscDFH.historyitem_FormatOverride_SetIdx, this.idx, pr)); this.idx = pr; }; - window['AscFormat'].CFormatOverride = CFormatOverride; + // FormatOverrides (no in ChartSerializeEx.h) drawingsChangesMap[AscDFH.historyitem_FormatOverrides_SetFmtOvr] = function(oClass, value) { @@ -1348,7 +1348,7 @@ History.CanAddChanges() && History.Add(new CChangesDrawingsObjectNoId(this, AscDFH.historyitem_FormatOverrides_SetFmtOvr, this.fmtOvr, pr)); this.fmtOvr = pr; }; - window['AscFormat'].CFormatOverrides = CFormatOverrides; + // Formula drawingsChangesMap[AscDFH.historyitem_Formula_SetDir] = function(oClass, value) { @@ -1366,7 +1366,7 @@ History.CanAddChanges() && History.Add(new CChangesDrawingsObjectNoId(this, AscDFH.historyitem_Formula_SetDir, this.dir, pr)); this.dir = pr; }; - window['AscFormat'].CFormula = CFormula; + // GeoCache drawingsChangesMap[AscDFH.historyitem_GeoCache_SetBinary] = function(oClass, value) { @@ -1402,7 +1402,7 @@ History.CanAddChanges() && History.Add(new CChangesDrawingsString(this, AscDFH.historyitem_GeoCache_SetProvider, this.provider, pr)); this.provider = pr; }; - window['AscFormat'].CGeoCache = CGeoCache; + // GeoChildEntities drawingsChangesMap[AscDFH.historyitem_GeoChildEntities_SetGeoHierarchyEntity] = function(oClass, value) { @@ -1420,7 +1420,7 @@ History.CanAddChanges() && History.Add(new CChangesDrawingsObjectNoId(this, AscDFH.historyitem_GeoChildEntities_SetGeoHierarchyEntity, this.geoHierarchyEntity, pr)); this.geoHierarchyEntity = pr; }; - window['AscFormat'].CGeoChildEntities = CGeoChildEntities; + // GeoChildEntitiesQuery drawingsChangesMap[AscDFH.historyitem_GeoChildEntitiesQuery_SetGeoChildTypes] = function(oClass, value) { @@ -1447,7 +1447,7 @@ History.CanAddChanges() && History.Add(new CChangesDrawingsString(this, AscDFH.historyitem_GeoChildEntitiesQuery_SetEntityId, this.entityId, pr)); this.entityId = pr; }; - window['AscFormat'].CGeoChildEntitiesQuery = CGeoChildEntitiesQuery; + // GeoChildEntitiesQueryResult drawingsChangesMap[AscDFH.historyitem_GeoChildEntitiesQueryResult_SetGeoChildEntitiesQuery] = function(oClass, value) { @@ -1474,7 +1474,7 @@ History.CanAddChanges() && History.Add(new CChangesDrawingsObjectNoId(this, AscDFH.historyitem_GeoChildEntitiesQueryResult_SetGeoChildEntities, this.geoChildEntities, pr)); this.geoChildEntities = pr; }; - window['AscFormat'].CGeoChildEntitiesQueryResult = CGeoChildEntitiesQueryResult; + // GeoChildEntitiesQueryResults drawingsChangesMap[AscDFH.historyitem_GeoChildEntitiesQueryResults_SetGeoChildEntitiesQueryResult] = function(oClass, value) { @@ -1492,7 +1492,7 @@ History.CanAddChanges() && History.Add(new CChangesDrawingsObjectNoId(this, AscDFH.historyitem_GeoChildEntitiesQueryResults_SetGeoChildEntitiesQueryResult, this.geoChildEntitiesQueryResult, pr)); this.geoChildEntitiesQueryResult = pr; }; - window['AscFormat'].CGeoChildEntitiesQueryResults = CGeoChildEntitiesQueryResults; + // GeoChildTypes drawingsChangesMap[AscDFH.historyitem_GeoChildTypes_SetEntityType] = function(oClass, value) { @@ -1510,7 +1510,7 @@ History.CanAddChanges() && History.Add(new CChangesDrawingsObjectNoId(this, AscDFH.historyitem_GeoChildTypes_SetEntityType, this.entityType, pr)); this.entityType = pr; }; - window['AscFormat'].CGeoChildTypes = CGeoChildTypes; + // GeoData drawingsChangesMap[AscDFH.historyitem_GeoData_SetGeoPolygons] = function(oClass, value) { @@ -1591,7 +1591,7 @@ History.CanAddChanges() && History.Add(new CChangesDrawingsDouble2(this, AscDFH.historyitem_GeoData_SetSouth, this.south, pr)); this.south = pr; }; - window['AscFormat'].CGeoData = CGeoData; + // GeoDataEntityQuery drawingsChangesMap[AscDFH.historyitem_GeoDataEntityQuery_SetEntityType] = function(oClass, value) { @@ -1618,7 +1618,7 @@ History.CanAddChanges() && History.Add(new CChangesDrawingsString(this, AscDFH.historyitem_GeoDataEntityQuery_SetEntityId, this.entityId, pr)); this.entityId = pr; }; - window['AscFormat'].CGeoDataEntityQuery = CGeoDataEntityQuery; + // GeoDataEntityQueryResult drawingsChangesMap[AscDFH.historyitem_GeoDataEntityQueryResult_SetGeoDataEntityQuery] = function(oClass, value) { @@ -1645,7 +1645,7 @@ History.CanAddChanges() && History.Add(new CChangesDrawingsObjectNoId(this, AscDFH.historyitem_GeoDataEntityQueryResult_SetGeoData, this.geoData, pr)); this.geoData = pr; }; - window['AscFormat'].CGeoDataEntityQueryResult = CGeoDataEntityQueryResult; + // GeoDataEntityQueryResults drawingsChangesMap[AscDFH.historyitem_GeoDataEntityQueryResults_SetGeoDataEntityQueryResult] = function(oClass, value) { @@ -1663,7 +1663,7 @@ History.CanAddChanges() && History.Add(new CChangesDrawingsObjectNoId(this, AscDFH.historyitem_GeoDataEntityQueryResults_SetGeoDataEntityQueryResult, this.geoDataEntityQueryResult, pr)); this.geoDataEntityQueryResult = pr; }; - window['AscFormat'].CGeoDataEntityQueryResults = CGeoDataEntityQueryResults; + // GeoDataPointQuery drawingsChangesMap[AscDFH.historyitem_GeoDataPointQuery_SetEntityType] = function(oClass, value) { @@ -1699,7 +1699,7 @@ History.CanAddChanges() && History.Add(new CChangesDrawingsDouble2(this, AscDFH.historyitem_GeoDataPointQuery_SetLongitude, this.longitude, pr)); this.longitude = pr; }; - window['AscFormat'].CGeoDataPointQuery = CGeoDataPointQuery; + // GeoDataPointToEntityQuery drawingsChangesMap[AscDFH.historyitem_GeoDataPointToEntityQuery_SetEntityType] = function(oClass, value) { @@ -1726,7 +1726,7 @@ History.CanAddChanges() && History.Add(new CChangesDrawingsString(this, AscDFH.historyitem_GeoDataPointToEntityQuery_SetEntityId, this.entityId, pr)); this.entityId = pr; }; - window['AscFormat'].CGeoDataPointToEntityQuery = CGeoDataPointToEntityQuery; + // GeoDataPointToEntityQueryResult drawingsChangesMap[AscDFH.historyitem_GeoDataPointToEntityQueryResult_SetGeoDataPointQuery] = function(oClass, value) { @@ -1753,7 +1753,7 @@ History.CanAddChanges() && History.Add(new CChangesDrawingsObjectNoId(this, AscDFH.historyitem_GeoDataPointToEntityQueryResult_SetGeoDataPointToEntityQuery, this.geoDataPointToEntityQuery, pr)); this.geoDataPointToEntityQuery = pr; }; - window['AscFormat'].CGeoDataPointToEntityQueryResult = CGeoDataPointToEntityQueryResult; + // GeoDataPointToEntityQueryResults drawingsChangesMap[AscDFH.historyitem_GeoDataPointToEntityQueryResults_SetGeoDataPointToEntityQueryResult] = function(oClass, value) { @@ -1771,7 +1771,7 @@ History.CanAddChanges() && History.Add(new CChangesDrawingsObjectNoId(this, AscDFH.historyitem_GeoDataPointToEntityQueryResults_SetGeoDataPointToEntityQueryResult, this.geoDataPointToEntityQueryResult, pr)); this.geoDataPointToEntityQueryResult = pr; }; - window['AscFormat'].CGeoDataPointToEntityQueryResults = CGeoDataPointToEntityQueryResults; + // Geography drawingsChangesMap[AscDFH.historyitem_Geography_SetGeoCache] = function(oClass, value) { @@ -1834,7 +1834,7 @@ History.CanAddChanges() && History.Add(new CChangesDrawingsString(this, AscDFH.historyitem_Geography_SetAttribution, this.attribution, pr)); this.attribution = pr; }; - window['AscFormat'].CGeography = CGeography; + // GeoHierarchyEntity drawingsChangesMap[AscDFH.historyitem_GeoHierarchyEntity_SetEntityName] = function(oClass, value) { @@ -1870,7 +1870,7 @@ History.CanAddChanges() && History.Add(new CChangesDrawingsObjectNoId(this, AscDFH.historyitem_GeoHierarchyEntity_SetEntityType, this.entityType, pr)); this.entityType = pr; }; - window['AscFormat'].CGeoHierarchyEntity = CGeoHierarchyEntity; + // GeoLocation drawingsChangesMap[AscDFH.historyitem_GeoLocation_SetAddress] = function(oClass, value) { @@ -1924,7 +1924,7 @@ History.CanAddChanges() && History.Add(new CChangesDrawingsObjectNoId(this, AscDFH.historyitem_GeoLocation_SetEntityType, this.entityType, pr)); this.entityType = pr; }; - window['AscFormat'].CGeoLocation = CGeoLocation; + // GeoLocationQuery drawingsChangesMap[AscDFH.historyitem_GeoLocationQuery_SetCountryRegion] = function(oClass, value) { @@ -1978,7 +1978,7 @@ History.CanAddChanges() && History.Add(new CChangesDrawingsObjectNoId(this, AscDFH.historyitem_GeoLocationQuery_SetEntityType, this.entityType, pr)); this.entityType = pr; }; - window['AscFormat'].CGeoLocationQuery = CGeoLocationQuery; + // GeoLocationQueryResult drawingsChangesMap[AscDFH.historyitem_GeoLocationQueryResult_SetGeoLocationQuery] = function(oClass, value) { @@ -2005,7 +2005,7 @@ History.CanAddChanges() && History.Add(new CChangesDrawingsObjectNoId(this, AscDFH.historyitem_GeoLocationQueryResult_SetGeoLocations, this.geoLocations, pr)); this.geoLocations = pr; }; - window['AscFormat'].CGeoLocationQueryResult = CGeoLocationQueryResult; + // GeoLocationQueryResults drawingsChangesMap[AscDFH.historyitem_GeoLocationQueryResults_SetGeoLocationQueryResult] = function(oClass, value) { @@ -2023,7 +2023,7 @@ History.CanAddChanges() && History.Add(new CChangesDrawingsObjectNoId(this, AscDFH.historyitem_GeoLocationQueryResults_SetGeoLocationQueryResult, this.geoLocationQueryResult, pr)); this.geoLocationQueryResult = pr; }; - window['AscFormat'].CGeoLocationQueryResults = CGeoLocationQueryResults; + // GeoLocations drawingsChangesMap[AscDFH.historyitem_GeoLocations_SetGeoLocation] = function(oClass, value) { @@ -2041,7 +2041,7 @@ History.CanAddChanges() && History.Add(new CChangesDrawingsObjectNoId(this, AscDFH.historyitem_GeoLocations_SetGeoLocation, this.geoLocation, pr)); this.geoLocation = pr; }; - window['AscFormat'].CGeoLocations = CGeoLocations; + // GeoPolygon drawingsChangesMap[AscDFH.historyitem_GeoPolygon_SetPolygonId] = function(oClass, value) { @@ -2077,7 +2077,7 @@ History.CanAddChanges() && History.Add(new CChangesDrawingsString(this, AscDFH.historyitem_GeoPolygon_SetPcaRings, this.pcaRings, pr)); this.pcaRings = pr; }; - window['AscFormat'].CGeoPolygon = CGeoPolygon; + // GeoPolygons drawingsChangesMap[AscDFH.historyitem_GeoPolygons_SetGeoPolygon] = function(oClass, value) { @@ -2095,7 +2095,7 @@ History.CanAddChanges() && History.Add(new CChangesDrawingsObjectNoId(this, AscDFH.historyitem_GeoPolygons_SetGeoPolygon, this.geoPolygon, pr)); this.geoPolygon = pr; }; - window['AscFormat'].CGeoPolygons = CGeoPolygons; + // Gridlines drawingsChangesMap[AscDFH.historyitem_Gridlines_SetSpPr] = function(oClass, value) { @@ -2131,7 +2131,7 @@ History.CanAddChanges() && History.Add(new CChangesDrawingsString(this, AscDFH.historyitem_Gridlines_SetName, this.name, pr)); this.name = pr; }; - window['AscFormat'].CGridlines = CGridlines; + // // HeaderFooter (contains in ChartFormat.js) // drawingsChangesMap[AscDFH.historyitem_HeaderFooter_SetOddHeader] = function(oClass, value) { @@ -2221,7 +2221,7 @@ // History.CanAddChanges() && History.Add(new CChangesDrawingsBool(this, AscDFH.historyitem_HeaderFooter_SetDifferentFirst, this.differentFirst, pr)); // this.differentFirst = pr; // }; - // window['AscFormat'].CHeaderFooter = CHeaderFooter; + // // // Legend (contains in ChartFormat.js) // drawingsChangesMap[AscDFH.historyitem_Legend_SetSpPr] = function(oClass, value) { @@ -2284,7 +2284,7 @@ // History.CanAddChanges() && History.Add(new CChangesDrawingsBool(this, AscDFH.historyitem_Legend_SetOverlay, this.overlay, pr)); // this.overlay = pr; // }; - // window['AscFormat'].CLegend = CLegend; + // // // NumberColorPosition (CNumericPoint replaces this class) // drawingsChangesMap[AscDFH.historyitem_NumberColorPosition_SetVal] = function(oClass, value) { @@ -2302,7 +2302,7 @@ // History.CanAddChanges() && History.Add(new CChangesDrawingsDouble2(this, AscDFH.historyitem_NumberColorPosition_SetVal, this.val, pr)); // this.val = pr; // }; - // window['AscFormat'].CNumberColorPosition = CNumberColorPosition; + // // // NumberFormat (contains in ChartFormat.js) // drawingsChangesMap[AscDFH.historyitem_NumberFormat_SetFormatCode] = function(oClass, value) { @@ -2329,7 +2329,7 @@ // History.CanAddChanges() && History.Add(new CChangesDrawingsBool(this, AscDFH.historyitem_NumberFormat_SetSourceLinked, this.sourceLinked, pr)); // this.sourceLinked = pr; // }; - // window['AscFormat'].CNumberFormat = CNumberFormat; + // // NumericDimension drawingsChangesMap[AscDFH.historyitem_NumericDimension_SetLevelData] = function(oClass, value) { @@ -2370,7 +2370,7 @@ History.CanAddChanges() && History.Add(new CChangesDrawingsContent(this, AscDFH.historyitem_NumericDimension_RemoveLevelData, pos, [levelData], false)); } }; - window['AscFormat'].CNumericDimension = CNumericDimension; + // // NumericLevel (CNumLit contains in ChartFormat.js) // drawingsChangesMap[AscDFH.historyitem_NumericLevel_SetPt] = function(oClass, value) { @@ -2430,7 +2430,7 @@ // History.CanAddChanges() && History.Add(new CChangesDrawingsString(this, AscDFH.historyitem_NumericLevel_SetName, this.name, pr)); // this.name = pr; // }; - // window['AscFormat'].CNumericLevel = CNumericLevel; + // // NumericValue drawingsChangesMap[AscDFH.historyitem_NumericValue_SetIdx] = function(oClass, value) { @@ -2457,7 +2457,7 @@ History.CanAddChanges() && History.Add(new CChangesDrawingsDouble2(this, AscDFH.historyitem_NumericValue_SetContent, this.content, pr)); this.content = pr; }; - window['AscFormat'].CNumericValue = CNumericValue; + // // PageMargins (CPageMarginsChart contains in ChartFormat.js) // drawingsChangesMap[AscDFH.historyitem_PageMargins_SetL] = function(oClass, value) { @@ -2520,7 +2520,7 @@ // History.CanAddChanges() && History.Add(new CChangesDrawingsDouble2(this, AscDFH.historyitem_PageMargins_SetFooter, this.footer, pr)); // this.footer = pr; // }; - // window['AscFormat'].CPageMargins = CPageMargins; + // // // PageSetup (contains in ChartFormat.js) // drawingsChangesMap[AscDFH.historyitem_PageSetup_SetPaperSize] = function(oClass, value) { @@ -2610,7 +2610,7 @@ // History.CanAddChanges() && History.Add(new CChangesDrawingsLong(this, AscDFH.historyitem_PageSetup_SetCopies, this.copies, pr)); // this.copies = pr; // }; - // window['AscFormat'].CPageSetup = CPageSetup; + // // ParentLabelLayout drawingsChangesMap[AscDFH.historyitem_ParentLabelLayout_SetVal] = function(oClass, value) { @@ -2628,7 +2628,7 @@ History.CanAddChanges() && History.Add(new CChangesDrawingsObjectNoId(this, AscDFH.historyitem_ParentLabelLayout_SetVal, this.val, pr)); this.val = pr; }; - window['AscFormat'].CParentLabelLayout = CParentLabelLayout; + // PercentageColorPosition drawingsChangesMap[AscDFH.historyitem_PercentageColorPosition_SetVal] = function(oClass, value) { @@ -2646,7 +2646,7 @@ History.CanAddChanges() && History.Add(new CChangesDrawingsDouble2(this, AscDFH.historyitem_PercentageColorPosition_SetVal, this.val, pr)); this.val = pr; }; - window['AscFormat'].CPercentageColorPosition = CPercentageColorPosition; + // // PlotArea (contains in chartFormat.js) // drawingsChangesMap[AscDFH.historyitem_PlotArea_SetPlotAreaRegion] = function(oClass, value) { @@ -2691,7 +2691,7 @@ // History.CanAddChanges() && History.Add(new CChangesDrawingsObjectNoId(this, AscDFH.historyitem_PlotArea_SetExtLst, this.extLst, pr)); // this.extLst = pr; // }; - // window['AscFormat'].CPlotArea = CPlotArea; + // // PlotAreaRegion drawingsChangesMap[AscDFH.historyitem_PlotAreaRegion_SetPlotSurface] = function(oClass, value) { @@ -2749,7 +2749,7 @@ History.CanAddChanges() && History.Add(new CChangesDrawingsObjectNoId(this, AscDFH.historyitem_PlotAreaRegion_SetExtLst, this.extLst, pr)); this.extLst = pr; }; - window['AscFormat'].CPlotAreaRegion = CPlotAreaRegion; + // PlotSurface drawingsChangesMap[AscDFH.historyitem_PlotSurface_SetSpPr] = function(oClass, value) { @@ -2776,7 +2776,7 @@ History.CanAddChanges() && History.Add(new CChangesDrawingsObjectNoId(this, AscDFH.historyitem_PlotSurface_SetExtLst, this.extLst, pr)); this.extLst = pr; }; - window['AscFormat'].CPlotSurface = CPlotSurface; + // // PrintSettings (contains in ChartFormat.js) // drawingsChangesMap[AscDFH.historyitem_PrintSettings_SetHeaderFooter] = function(oClass, value) { @@ -2812,7 +2812,7 @@ // History.CanAddChanges() && History.Add(new CChangesDrawingsString(this, AscDFH.historyitem_PrintSettings_SetPageSetup, this.pageSetup, pr)); // this.pageSetup = pr; // }; - // window['AscFormat'].CPrintSettings = CPrintSettings; + // // // RegionLabelLayout (st is used instead of CT_RegionLabelLayout) // drawingsChangesMap[AscDFH.historyitem_RegionLabelLayout_SetVal] = function(oClass, value) { @@ -2830,7 +2830,7 @@ // History.CanAddChanges() && History.Add(new CChangesDrawingsString(this, AscDFH.historyitem_RegionLabelLayout_SetVal, this.val, pr)); // this.val = pr; // }; - // window['AscFormat'].CRegionLabelLayout = CRegionLabelLayout; + // // RelId drawingsChangesMap[AscDFH.historyitem_RelId_SetId] = function(oClass, value) { @@ -2848,7 +2848,7 @@ History.CanAddChanges() && History.Add(new CChangesDrawingsObjectNoId(this, AscDFH.historyitem_RelId_SetId, this.id, pr)); this.id = pr; }; - window['AscFormat'].CRelId = CRelId; + // Series drawingsChangesMap[AscDFH.historyitem_Series_SetTx] = function(oClass, value) { @@ -3037,7 +3037,7 @@ History.CanAddChanges() && History.Add(new CChangesDrawingsLong(this, AscDFH.historyitem_Series_SetFormatIdx, this.formatIdx, pr)); this.formatIdx = pr; }; - window['AscFormat'].CSeries = CSeries; + // SeriesElementVisibilities drawingsChangesMap[AscDFH.historyitem_SeriesElementVisibilities_SetConnectorLines] = function(oClass, value) { @@ -3091,7 +3091,7 @@ History.CanAddChanges() && History.Add(new CChangesDrawingsBool(this, AscDFH.historyitem_SeriesElementVisibilities_SetOutliers, this.outliers, pr)); this.outliers = pr; }; - window['AscFormat'].CSeriesElementVisibilities = CSeriesElementVisibilities; + // SeriesLayoutProperties drawingsChangesMap[AscDFH.historyitem_SeriesLayoutProperties_SetParentLabelLayout] = function(oClass, value) { @@ -3182,7 +3182,7 @@ History.CanAddChanges() && History.Add(new CChangesDrawingsObjectNoId(this, AscDFH.historyitem_SeriesLayoutProperties_SetExtLst, this.extLst, pr)); this.extLst = pr; }; - window['AscFormat'].CSeriesLayoutProperties = CSeriesLayoutProperties; + // Statistics drawingsChangesMap[AscDFH.historyitem_Statistics_SetQuartileMethod] = function(oClass, value) { @@ -3200,7 +3200,7 @@ History.CanAddChanges() && History.Add(new CChangesDrawingsObjectNoId(this, AscDFH.historyitem_Statistics_SetQuartileMethod, this.quartileMethod, pr)); this.quartileMethod = pr; }; - window['AscFormat'].CStatistics = CStatistics; + // Dimension drawingsChangesMap[AscDFH.historyitem_Dimension_SetF] = function(oClass, value) { @@ -3245,7 +3245,7 @@ History.CanAddChanges() && History.Add(new CChangesDrawingsObjectNoId(this, AscDFH.historyitem_Dimension_SetExtLst, this.extLst, pr)); this.extLst = pr; }; - window['AscFormat'].CDimension = CDimension; + // StringDimension drawingsChangesMap[AscDFH.historyitem_StringDimension_SetLevelData] = function(oClass, value) { @@ -3285,7 +3285,7 @@ History.CanAddChanges() && History.Add(new CChangesDrawingsContent(this, AscDFH.historyitem_StringDimension_RemoveLevelData, pos, [levelData], false)); } }; - window['AscFormat'].CStringDimension = CStringDimension; + // // StringLevel (CStrCache contains in ChartFormat.js) // drawingsChangesMap[AscDFH.historyitem_StringLevel_SetPt] = function(oClass, value) { @@ -3336,7 +3336,7 @@ // History.CanAddChanges() && History.Add(new CChangesDrawingsString(this, AscDFH.historyitem_StringLevel_SetName, this.name, pr)); // this.name = pr; // }; - // window['AscFormat'].CStringLevel = CStringLevel; + // // StringValue drawingsChangesMap[AscDFH.historyitem_StringValue_SetIdx] = function(oClass, value) { @@ -3363,7 +3363,7 @@ History.CanAddChanges() && History.Add(new CChangesDrawingsString(this, AscDFH.historyitem_StringValue_SetContent, this.content, pr)); this.content = pr; }; - window['AscFormat'].CStringValue = CStringValue; + // Subtotals drawingsChangesMap[AscDFH.historyitem_Subtotals_SetIdx] = function(oClass, value) { @@ -3403,7 +3403,7 @@ History.CanAddChanges() && History.Add(new CChangesDrawingsContent(this, AscDFH.historyitem_Subtotals_RemoveIdx, pos, [idx], false)); } }; - window['AscFormat'].CSubtotals = CSubtotals; + // Text drawingsChangesMap[AscDFH.historyitem_Text_SetTxData] = function(oClass, value) { @@ -3430,7 +3430,7 @@ History.CanAddChanges() && History.Add(new CChangesDrawingsObjectNoId(this, AscDFH.historyitem_Text_SetRich, this.rich, pr)); this.rich = pr; }; - window['AscFormat'].CText = CText; + // TextData drawingsChangesMap[AscDFH.historyitem_TextData_SetF] = function(oClass, value) { @@ -3457,7 +3457,7 @@ History.CanAddChanges() && History.Add(new CChangesDrawingsString(this, AscDFH.historyitem_TextData_SetV, this.v, pr)); this.v = pr; }; - window['AscFormat'].CTextData = CTextData; + // // TickLabels (unused) // drawingsChangesMap[AscDFH.historyitem_TickLabels_SetExtLst] = function(oClass, value) { @@ -3475,7 +3475,7 @@ // History.CanAddChanges() && History.Add(new CChangesDrawingsString(this, AscDFH.historyitem_TickLabels_SetExtLst, this.extLst, pr)); // this.extLst = pr; // }; - // window['AscFormat'].CTickLabels = CTickLabels; + // // TickMarks drawingsChangesMap[AscDFH.historyitem_TickMarks_SetExtLst] = function(oClass, value) { @@ -3511,7 +3511,7 @@ History.CanAddChanges() && History.Add(new CChangesDrawingsString(this, AscDFH.historyitem_TickMarks_SetName, this.name, pr)); this.name = pr; }; - window['AscFormat'].CTickMarks = CTickMarks; + // ValueAxisScaling drawingsChangesMap[AscDFH.historyitem_ValueAxisScaling_SetMax] = function(oClass, value) { @@ -3556,7 +3556,7 @@ History.CanAddChanges() && History.Add(new CChangesDrawingsObjectNoId(this, AscDFH.historyitem_ValueAxisScaling_SetMinorUnit, this.minorUnit, pr)); this.minorUnit = pr; }; - window['AscFormat'].CValueAxisScaling = CValueAxisScaling; + // ValueColorEndPosition drawingsChangesMap[AscDFH.historyitem_ValueColorEndPosition_SetExtremeValue] = function(oClass, value) { @@ -3592,7 +3592,7 @@ History.CanAddChanges() && History.Add(new CChangesDrawingsString(this, AscDFH.historyitem_ValueColorEndPosition_SetPercent, this.percent, pr)); this.percent = pr; }; - window['AscFormat'].CValueColorEndPosition = CValueColorEndPosition; + // ValueColorMiddlePosition drawingsChangesMap[AscDFH.historyitem_ValueColorMiddlePosition_SetNumber] = function(oClass, value) { @@ -3619,7 +3619,7 @@ History.CanAddChanges() && History.Add(new CChangesDrawingsObjectNoId(this, AscDFH.historyitem_ValueColorMiddlePosition_SetPercent, this.percent, pr)); this.percent = pr; }; - window['AscFormat'].CValueColorMiddlePosition = CValueColorMiddlePosition; + // ValueColorPositions drawingsChangesMap[AscDFH.historyitem_ValueColorPositions_SetMin] = function(oClass, value) { @@ -3664,7 +3664,7 @@ History.CanAddChanges() && History.Add(new CChangesDrawingsLong(this, AscDFH.historyitem_ValueColorPositions_SetCount, this.count, pr)); this.count = pr; }; - window['AscFormat'].CValueColorPositions = CValueColorPositions; + // ValueColors drawingsChangesMap[AscDFH.historyitem_ValueColors_SetMinColor] = function(oClass, value) { @@ -3700,7 +3700,7 @@ History.CanAddChanges() && History.Add(new CChangesDrawingsObjectNoId(this, AscDFH.historyitem_ValueColors_SetMaxColor, this.maxColor, pr)); this.maxColor = pr; }; - window['AscFormat'].CValueColors = CValueColors; + // Simple Types @@ -3721,7 +3721,7 @@ History.CanAddChanges() && History.Add(new CChangesDrawingsLong(this, AscDFH.historyitem_SidePos_SetSidePos, this.sidePos, pr)); this.sidePos = pr; }; - window['AscFormat'].CSidePos = CSidePos; + // PosAlign drawingsChangesMap[AscDFH.historyitem_PosAlign_SetPosAlign] = function(oClass, value) { @@ -3739,7 +3739,7 @@ History.CanAddChanges() && History.Add(new CChangesDrawingsLong(this, AscDFH.historyitem_PosAlign_SetPosAlign, this.posAlign, pr)); this.posAlign = pr; }; - window['AscFormat'].CPosAlign = CPosAlign; + // AxisUnit drawingsChangesMap[AscDFH.historyitem_AxisUnit_SetAxisUnit] = function(oClass, value) { @@ -3757,7 +3757,7 @@ History.CanAddChanges() && History.Add(new CChangesDrawingsLong(this, AscDFH.historyitem_AxisUnit_SetAxisUnit, this.axisUnit, pr)); this.axisUnit = pr; }; - window['AscFormat'].CAxisUnit = CAxisUnit; + // FormulaDirection drawingsChangesMap[AscDFH.historyitem_FormulaDirection_SetFormulaDirection] = function(oClass, value) { @@ -3775,7 +3775,7 @@ History.CanAddChanges() && History.Add(new CChangesDrawingsLong(this, AscDFH.historyitem_FormulaDirection_SetFormulaDirection, this.formulaDirection, pr)); this.formulaDirection = pr; }; - window['AscFormat'].CFormulaDirection = CFormulaDirection; + // IntervalClosedSide drawingsChangesMap[AscDFH.historyitem_IntervalClosedSide_SetIntervalClosedSide] = function(oClass, value) { @@ -3793,7 +3793,7 @@ History.CanAddChanges() && History.Add(new CChangesDrawingsLong(this, AscDFH.historyitem_IntervalClosedSide_SetIntervalClosedSide, this.intervalClosedSide, pr)); this.intervalClosedSide = pr; }; - window['AscFormat'].CIntervalClosedSide = CIntervalClosedSide; + // NumericDimensionType drawingsChangesMap[AscDFH.historyitem_NumericDimensionType_SetNumericDimensionType] = function(oClass, value) { @@ -3811,7 +3811,7 @@ History.CanAddChanges() && History.Add(new CChangesDrawingsLong(this, AscDFH.historyitem_NumericDimensionType_SetNumericDimensionType, this.numericDimensionType, pr)); this.numericDimensionType = pr; }; - window['AscFormat'].CNumericDimensionType = CNumericDimensionType; + // QuartileMethod drawingsChangesMap[AscDFH.historyitem_QuartileMethod_SetQuartileMethod] = function(oClass, value) { @@ -3829,7 +3829,7 @@ History.CanAddChanges() && History.Add(new CChangesDrawingsLong(this, AscDFH.historyitem_QuartileMethod_SetQuartileMethod, this.quartileMethod, pr)); this.quartileMethod = pr; }; - window['AscFormat'].CQuartileMethod = CQuartileMethod; + // DataLabelPos drawingsChangesMap[AscDFH.historyitem_DataLabelPos_SetDataLabelPos] = function(oClass, value) { @@ -3847,7 +3847,7 @@ History.CanAddChanges() && History.Add(new CChangesDrawingsLong(this, AscDFH.historyitem_DataLabelPos_SetDataLabelPos, this.dataLabelPos, pr)); this.dataLabelPos = pr; }; - window['AscFormat'].CDataLabelPos = CDataLabelPos; + // SeriesLayout drawingsChangesMap[AscDFH.historyitem_SeriesLayout_SetSeriesLayout] = function(oClass, value) { @@ -3865,7 +3865,7 @@ History.CanAddChanges() && History.Add(new CChangesDrawingsLong(this, AscDFH.historyitem_SeriesLayout_SetSeriesLayout, this.seriesLayout, pr)); this.seriesLayout = pr; }; - window['AscFormat'].CSeriesLayout = CSeriesLayout; + // TickMarksType drawingsChangesMap[AscDFH.historyitem_TickMarksType_SetTickMarksType] = function(oClass, value) { @@ -3883,7 +3883,7 @@ History.CanAddChanges() && History.Add(new CChangesDrawingsLong(this, AscDFH.historyitem_TickMarksType_SetTickMarksType, this.tickMarksType, pr)); this.tickMarksType = pr; }; - window['AscFormat'].CTickMarksType = CTickMarksType; + // EntityType drawingsChangesMap[AscDFH.historyitem_EntityType_SetEntityType] = function(oClass, value) { @@ -3901,7 +3901,7 @@ History.CanAddChanges() && History.Add(new CChangesDrawingsLong(this, AscDFH.historyitem_EntityType_SetEntityType, this.entityType, pr)); this.entityType = pr; }; - window['AscFormat'].CEntityType = CEntityType; + // GeoProjectionType drawingsChangesMap[AscDFH.historyitem_GeoProjectionType_SetGeoProjectionType] = function(oClass, value) { @@ -3919,7 +3919,7 @@ History.CanAddChanges() && History.Add(new CChangesDrawingsLong(this, AscDFH.historyitem_GeoProjectionType_SetGeoProjectionType, this.geoProjectionType, pr)); this.geoProjectionType = pr; }; - window['AscFormat'].CGeoProjectionType = CGeoProjectionType; + // GeoMappingLevel drawingsChangesMap[AscDFH.historyitem_GeoMappingLevel_SetGeoMappingLevel] = function(oClass, value) { @@ -3937,7 +3937,7 @@ History.CanAddChanges() && History.Add(new CChangesDrawingsLong(this, AscDFH.historyitem_GeoMappingLevel_SetGeoMappingLevel, this.geoMappingLevel, pr)); this.geoMappingLevel = pr; }; - window['AscFormat'].CGeoMappingLevel = CGeoMappingLevel; + // PageOrientation drawingsChangesMap[AscDFH.historyitem_PageOrientation_SetPageOrientation] = function(oClass, value) { @@ -3955,7 +3955,7 @@ History.CanAddChanges() && History.Add(new CChangesDrawingsLong(this, AscDFH.historyitem_PageOrientation_SetPageOrientation, this.pageOrientation, pr)); this.pageOrientation = pr; }; - window['AscFormat'].CPageOrientation = CPageOrientation; + // LabelLayout (ST_ParentLabelLayout) drawingsChangesMap[AscDFH.historyitem_LabelLayout_SetLabelLayout] = function(oClass, value) { @@ -3973,7 +3973,7 @@ History.CanAddChanges() && History.Add(new CChangesDrawingsLong(this, AscDFH.historyitem_LabelLayout_SetLabelLayout, this.labelLayout, pr)); this.labelLayout = pr; }; - window['AscFormat'].CLabelLayout = CLabelLayout; + // RegionLabelLayout (ST) drawingsChangesMap[AscDFH.historyitem_RegionLabelLayout_SetRegionLabelLayout] = function(oClass, value) { @@ -3991,7 +3991,7 @@ History.CanAddChanges() && History.Add(new CChangesDrawingsLong(this, AscDFH.historyitem_RegionLabelLayout_SetRegionLabelLayout, this.regionLabelLayout, pr)); this.regionLabelLayout = pr; }; - window['AscFormat'].CRegionLabelLayout = CRegionLabelLayout; + // DoubleOrAutomatic drawingsChangesMap[AscDFH.historyitem_DoubleOrAutomatic_SetDoubleValue] = function(oClass, value) { @@ -4018,9 +4018,111 @@ History.CanAddChanges() && History.Add(new CChangesDrawingsLong(this, AscDFH.historyitem_DoubleOrAutomatic_SetTypeValue, this.typeValue, pr)); this.typeValue = pr; }; - window['AscFormat'].CDoubleOrAutomatic = CDoubleOrAutomatic; + //--------------------------------------------------------export---------------------------------------------------- window['AscFormat'] = window['AscFormat'] || {}; window['AscFormat'].CAddress = CAddress; + window['AscFormat'].CAxis = CAxis; + // window['AscFormat'].CTitle = CTitle; + // window['AscFormat'].CAxisTitle = CAxisTitle; + window['AscFormat'].CAxisUnits = CAxisUnits; + window['AscFormat'].CAxisUnitsLabel = CAxisUnitsLabel; + window['AscFormat'].CBinning = CBinning; + window['AscFormat'].CCategoryAxisScaling = CCategoryAxisScaling; + // window['AscFormat'].CChart = CChart; + window['AscFormat'].CChartData = CChartData; + // window['AscFormat'].CChartSpace = CChartSpace; + // window['AscFormat'].CChartTitle = CChartTitle; + window['AscFormat'].CClear = CClear; + window['AscFormat'].CCopyrights = CCopyrights; + window['AscFormat'].CData = CData; + // window['AscFormat'].CDataId = CDataId; + window['AscFormat'].CDataLabel = CDataLabel; + window['AscFormat'].CDataLabelHidden = CDataLabelHidden; + window['AscFormat'].CDataLabels = CDataLabels; + window['AscFormat'].CDataLabelVisibilities = CDataLabelVisibilities; + window['AscFormat'].CDataPoint = CDataPoint; + // window['AscFormat'].CExtension = CExtension; + // window['AscFormat'].CExtensionList = CExtensionList; + // window['AscFormat'].CExternalData = CExternalData; + window['AscFormat'].CFormatOverride = CFormatOverride; + window['AscFormat'].CFormatOverrides = CFormatOverrides; + window['AscFormat'].CFormula = CFormula; + window['AscFormat'].CGeoCache = CGeoCache; + window['AscFormat'].CGeoChildEntities = CGeoChildEntities; + window['AscFormat'].CGeoChildEntitiesQuery = CGeoChildEntitiesQuery; + window['AscFormat'].CGeoChildEntitiesQueryResult = CGeoChildEntitiesQueryResult; + window['AscFormat'].CGeoChildEntitiesQueryResults = CGeoChildEntitiesQueryResults; + window['AscFormat'].CGeoChildTypes = CGeoChildTypes; + window['AscFormat'].CGeoData = CGeoData; + window['AscFormat'].CGeoDataEntityQuery = CGeoDataEntityQuery; + window['AscFormat'].CGeoDataEntityQueryResult = CGeoDataEntityQueryResult; + window['AscFormat'].CGeoDataEntityQueryResults = CGeoDataEntityQueryResults; + window['AscFormat'].CGeoDataPointQuery = CGeoDataPointQuery; + window['AscFormat'].CGeoDataPointToEntityQuery = CGeoDataPointToEntityQuery; + window['AscFormat'].CGeoDataPointToEntityQueryResult = CGeoDataPointToEntityQueryResult; + window['AscFormat'].CGeoDataPointToEntityQueryResults = CGeoDataPointToEntityQueryResults; + window['AscFormat'].CGeography = CGeography; + window['AscFormat'].CGeoHierarchyEntity = CGeoHierarchyEntity; + window['AscFormat'].CGeoLocation = CGeoLocation; + window['AscFormat'].CGeoLocationQuery = CGeoLocationQuery; + window['AscFormat'].CGeoLocationQueryResult = CGeoLocationQueryResult; + window['AscFormat'].CGeoLocationQueryResults = CGeoLocationQueryResults; + window['AscFormat'].CGeoLocations = CGeoLocations; + window['AscFormat'].CGeoPolygon = CGeoPolygon; + window['AscFormat'].CGeoPolygons = CGeoPolygons; + window['AscFormat'].CGridlines = CGridlines; + // window['AscFormat'].CHeaderFooter = CHeaderFooter; + // window['AscFormat'].CLegend = CLegend; + // window['AscFormat'].CNumberColorPosition = CNumberColorPosition; + // window['AscFormat'].CNumberFormat = CNumberFormat; + window['AscFormat'].CNumericDimension = CNumericDimension; + // window['AscFormat'].CNumericLevel = CNumericLevel; + window['AscFormat'].CNumericValue = CNumericValue; + // window['AscFormat'].CPageMargins = CPageMargins; + // window['AscFormat'].CPageSetup = CPageSetup; + window['AscFormat'].CParentLabelLayout = CParentLabelLayout; + window['AscFormat'].CPercentageColorPosition = CPercentageColorPosition; + // window['AscFormat'].CPlotArea = CPlotArea; + window['AscFormat'].CPlotAreaRegion = CPlotAreaRegion; + window['AscFormat'].CPlotSurface = CPlotSurface; + // window['AscFormat'].CPrintSettings = CPrintSettings; + window['AscFormat'].CRegionLabelLayout = CRegionLabelLayout; + window['AscFormat'].CRelId = CRelId; + window['AscFormat'].CSeries = CSeries; + window['AscFormat'].CSeriesElementVisibilities = CSeriesElementVisibilities; + window['AscFormat'].CSeriesLayoutProperties = CSeriesLayoutProperties; + window['AscFormat'].CStatistics = CStatistics; + window['AscFormat'].CDimension = CDimension; + window['AscFormat'].CStringDimension = CStringDimension; + // window['AscFormat'].CStringLevel = CStringLevel; + window['AscFormat'].CStringValue = CStringValue; + window['AscFormat'].CSubtotals = CSubtotals; + window['AscFormat'].CText = CText; + window['AscFormat'].CTextData = CTextData; + // window['AscFormat'].CTickLabels = CTickLabels; + window['AscFormat'].CTickMarks = CTickMarks; + window['AscFormat'].CValueAxisScaling = CValueAxisScaling; + window['AscFormat'].CValueColorEndPosition = CValueColorEndPosition; + window['AscFormat'].CValueColorMiddlePosition = CValueColorMiddlePosition; + window['AscFormat'].CValueColorPositions = CValueColorPositions; + window['AscFormat'].CValueColors = CValueColors; + window['AscFormat'].CSidePos = CSidePos; + window['AscFormat'].CPosAlign = CPosAlign; + window['AscFormat'].CAxisUnit = CAxisUnit; + window['AscFormat'].CFormulaDirection = CFormulaDirection; + window['AscFormat'].CIntervalClosedSide = CIntervalClosedSide; + window['AscFormat'].CNumericDimensionType = CNumericDimensionType; + window['AscFormat'].CQuartileMethod = CQuartileMethod; + window['AscFormat'].CDataLabelPos = CDataLabelPos; + window['AscFormat'].CSeriesLayout = CSeriesLayout; + window['AscFormat'].CTickMarksType = CTickMarksType; + window['AscFormat'].CEntityType = CEntityType; + window['AscFormat'].CGeoProjectionType = CGeoProjectionType; + window['AscFormat'].CGeoMappingLevel = CGeoMappingLevel; + window['AscFormat'].CPageOrientation = CPageOrientation; + window['AscFormat'].CLabelLayout = CLabelLayout; + window['AscFormat'].CRegionLabelLayout = CRegionLabelLayout; + window['AscFormat'].CDoubleOrAutomatic = CDoubleOrAutomatic; })(window); \ No newline at end of file diff --git a/common/Drawings/Format/ChartSpace.js b/common/Drawings/Format/ChartSpace.js index a4723f6e73..4a3b0ccc16 100644 --- a/common/Drawings/Format/ChartSpace.js +++ b/common/Drawings/Format/ChartSpace.js @@ -1377,8 +1377,8 @@ function(window, undefined) { History.CanAddChanges() && History.Add(new CChangesDrawingsObjectNoId(this, AscDFH.historyitem_ChartSpace_SetChartData, this.chartData, pr)); this.chartData = pr; }; - CChartData.prototype.setExtLst = function(pr) { - History.CanAddChanges() && History.Add(new CChangesDrawingsObjectNoId(this, AscDFH.historyitem_ChartData_SetExtLst, this.extLst, pr)); + CChartSpace.prototype.setExtLst = function(pr) { + History.CanAddChanges() && History.Add(new CChangesDrawingsObjectNoId(this, AscDFH.historyitem_ChartSpace_SetExtLst, this.extLst, pr)); this.extLst = pr; }; CChartSpace.prototype.clearDataRefs = function () { diff --git a/common/tempSerializeChart.js b/common/tempSerializeChart.js index 2fe494629b..e13cff301e 100644 --- a/common/tempSerializeChart.js +++ b/common/tempSerializeChart.js @@ -1,4 +1,259 @@ +// CAddress +var c_oserct_addressADDRESS1 = 0; +var c_oserct_addressCOUTNRYREGION = 1; +var c_oserct_addressADMINDISTRICT1 = 2; +var c_oserct_addressADMINDISTRICT2 = 3; +var c_oserct_addressPOSTALCODE = 4; +var c_oserct_addressLOCALITY = 5; +var c_oserct_addressISOCOUTRYCODE = 6; + +BinaryChartWriter.prototype.WriteCT_Address = function (oVal) { + var oThis = this; + if(oVal.address1 !== null) { + this.bs.WriteItem(c_oserct_addressADDRESS1, function() { + oThis.memory.WriteString3(oVal.address1); + }); + } + if(oVal.countryRegion !== null) { + this.bs.WriteItem(c_oserct_addressCOUTNRYREGION, function() { + oThis.memory.WriteString3(oVal.countryRegion); + }); + } + if(oVal.adminDistrict1 !== null) { + this.bs.WriteItem(c_oserct_addressADMINDISTRICT1, function() { + oThis.memory.WriteString3(oVal.adminDistrict1); + }); + } + if(oVal.adminDistrict2 !== null) { + this.bs.WriteItem(c_oserct_addressADMINDISTRICT2, function() { + oThis.memory.WriteString3(oVal.adminDistrict2); + }); + } + if(oVal.postalCode !== null) { + this.bs.WriteItem(c_oserct_addressPOSTALCODE, function() { + oThis.memory.WriteString3(oVal.postalCode); + }); + } + if(oVal.locality !== null) { + this.bs.WriteItem(c_oserct_addressLOCALITY, function() { + oThis.memory.WriteString3(oVal.locality); + }); + } + if(oVal.isoCountryCode !== null) { + this.bs.WriteItem(c_oserct_addressISOCOUTRYCODE, function() { + oThis.memory.WriteString3(oVal.isoCountryCode); + }); + } +}; +BinaryChartReader.prototype.ReadCT_Address = function (type, length, val) { + var res = c_oSerConstants.ReadOk; + var oThis = this; + var oNewVal; + if (c_oserct_addressADDRESS1 === type) + { + val.setAddress1(this.stream.GetString2LE(length)); + } + else if (c_oserct_addressCOUTNRYREGION === type) + { + val.setCountryRegion(this.stream.GetString2LE(length)); + } + else if (c_oserct_addressADMINDISTRICT1 === type) + { + val.setAdminDistrict1(this.stream.GetString2LE(length)); + } + else if (c_oserct_addressADMINDISTRICT2 === type) + { + val.setAdminDistrict2(this.stream.GetString2LE(length)); + } + else if (c_oserct_addressPOSTALCODE === type) + { + val.setPostalCode(this.stream.GetString2LE(length)); + } + else if (c_oserct_addressLOCALITY === type) + { + val.setLocality(this.stream.GetString2LE(length)); + } + else if (c_oserct_addressISOCOUTRYCODE === type) + { + val.setISOCountryCode(this.stream.GetString2LE(length)); + } + else + { + res = c_oSerConstants.ReadUnknown; + } + return res; +}; + +// CAxis +var c_oserct_axisCATSCALING = 0; +var c_oserct_axisVALSCALING = 1; +var c_oserct_axisTITLE = 2; +var c_oserct_axisUNITS = 3; +var c_oserct_axisMAJORGRIDLINES = 4; +var c_oserct_axisMINORGRIDLINES = 5; +var c_oserct_axisMAJORTICKMARKS = 6; +var c_oserct_axisMINORTICKMARKS = 7; +var c_oserct_axisTICKLABELS = 8; +var c_oserct_axisNUMFMT = 9; +var c_oserct_axisSPPR = 10; +var c_oserct_axisTXPR = 11; +var c_oserct_axisEXTLST = 12; +var c_oserct_axisID = 13; +var c_oserct_axisHIDDEN = 14; + +BinaryChartWriter.prototype.WriteCT_Axis = function (oVal) { + var oThis = this; + if(oVal.catScaling !== null) { + this.bs.WriteItem(c_oserct_axisCATSCALING, function() { + oThis.WriteCT_CategoryAxisScaling(oVal.catScaling); + }); + } + if(oVal.valScaling !== null) { + this.bs.WriteItem(c_oserct_axisVALSCALING, function() { + oThis.WriteCT_ValueAxisScaling(oVal.valScaling); + }); + } + if(oVal.title !== null) { + this.bs.WriteItem(c_oserct_axisTITLE, function() { + oThis.WriteCT_Title(oVal.title); + }); + } + if(oVal.units !== null) { + this.bs.WriteItem(c_oserct_axisUNITS, function() { + oThis.WriteCT_AxisUnits(oVal.units); + }); + } + if(oVal.majorGridlines !== null) { + this.bs.WriteItem(c_oserct_axisMAJORGRIDLINES, function() { + oThis.WriteCT_Gridlines(oVal.majorGridlines); + }); + } + if(oVal.minorGridlines !== null) { + this.bs.WriteItem(c_oserct_axisMINORGRIDLINES, function() { + oThis.WriteCT_Gridlines(oVal.minorGridlines); + }); + } + if(oVal.majorTickMarks !== null) { + this.bs.WriteItem(c_oserct_axisMAJORTICKMARKS, function() { + oThis.WriteCT_TickMarks(oVal.majorTickMarks); + }); + } + if(oVal.minorTickMarks !== null) { + this.bs.WriteItem(c_oserct_axisMINORTICKMARKS, function() { + oThis.WriteCT_TickMarks(oVal.minorTickMarks); + }); + } + if(oVal.tickLabels !== null) { + this.bs.WriteItem(c_oserct_axisTICKLABELS, function() { + oThis.memory.WriteBool(oVal.tickLabels); + }); + } + if(oVal.numFmt !== null) { + this.bs.WriteItem(c_oserct_axisNUMFMT, function() { + oThis.WriteCT_NumFmt(oVal.numFmt); + }); + } + if(oVal.spPr !== null) { + this.bs.WriteItem(c_oserct_axisSPPR, function() { + oThis.WriteSpPr(oVal.spPr); + }); + } + if(oVal.txPr !== null) { + this.bs.WriteItem(c_oserct_axisTXPR, function() { + oThis.WriteTxPr(oVal.txPr); + }); + } + if(oVal.extLst !== null) { + this.bs.WriteItem(c_oserct_axisEXTLST, function() { + oThis.WriteCT_extLst(oVal.extLst); + }); + } + if(oVal.id !== null) { + this.bs.WriteItem(c_oserct_axisID, function() { + oThis.memory.WriteLong(oVal.id); + }); + } + if(oVal.hidden !== null) { + this.bs.WriteItem(c_oserct_axisHIDDEN, function() { + oThis.memory.WriteBool(oVal.hidden); + }); + } +}; +BinaryChartReader.prototype.ReadCT_Axis = function (type, length, val) { + var res = c_oSerConstants.ReadOk; + var oThis = this; + var oNewVal; + if (c_oserct_axisCATSCALING === type) + { + var oNewVal = new AscFormat.CCategoryAxisScaling(); + res = this.bcr.Read1(length, function (t, l) { + return oThis.ReadCT_CategoryAxisScaling(t, l, oNewVal); + }); + val.setCatScaling(oNewVal); + } + else if (c_oserct_axisVALSCALING === type) + { + val.setValScaling(this.stream.GetString2LE(length)); + } + else if (c_oserct_axisTITLE === type) + { + val.setTitle(this.stream.GetString2LE(length)); + } + else if (c_oserct_axisUNITS === type) + { + val.setUnits(this.stream.GetString2LE(length)); + } + else if (c_oserct_axisMAJORGRIDLINES === type) + { + val.setMajorGridlines(this.stream.GetString2LE(length)); + } + else if (c_oserct_axisMINORGRIDLINES === type) + { + val.setMinorGridlines(this.stream.GetString2LE(length)); + } + else if (c_oserct_axisMAJORTICKMARKS === type) + { + val.setMajorTickMarks(this.stream.GetString2LE(length)); + } + else if (c_oserct_axisMINORTICKMARKS === type) + { + val.setMinorTickMarks(this.stream.GetString2LE(length)); + } + else if (c_oserct_axisTICKLABELS === type) + { + val.setTickLabels(this.stream.GetBool(length)); + } + else if (c_oserct_axisNUMFMT === type) + { + val.setNumFmt(this.stream.GetString2LE(length)); + } + else if (c_oserct_axisSPPR === type) + { + val.setSpPr(this.stream.GetString2LE(length)); + } + else if (c_oserct_axisTXPR === type) + { + val.setTxPr(this.stream.GetString2LE(length)); + } + else if (c_oserct_axisEXTLST === type) + { + val.setExtLst(this.stream.GetString2LE(length)); + } + else if (c_oserct_axisID === type) + { + val.setId(this.stream.GetString2LE(length)); + } + else if (c_oserct_axisHIDDEN === type) + { + val.setHidden(this.stream.GetBool(length)); + } + else + { + res = c_oSerConstants.ReadUnknown; + } + return res; +}; // template var c_oserct_testLongAttr = 0; var c_oserct_testStringAttr = 1; From 67f0690cf73d0fdac8803371514da949866225ec Mon Sep 17 00:00:00 2001 From: Dmitriy Aleksandrov Date: Tue, 15 Aug 2023 22:45:51 +0600 Subject: [PATCH 14/30] For bug #62819 Remove extlst fields. Add structures in tempSerializeChart.js. --- common/Drawings/Format/ChartEx.js | 289 ++++---------------------- common/Drawings/Format/ChartFormat.js | 31 --- common/Drawings/Format/ChartSpace.js | 9 - common/Shapes/Serialize.js | 27 +++ common/tempSerializeChart.js | 190 ++++++++++------- 5 files changed, 179 insertions(+), 367 deletions(-) diff --git a/common/Drawings/Format/ChartEx.js b/common/Drawings/Format/ChartEx.js index 2e017fbe40..1fa0f410e7 100644 --- a/common/Drawings/Format/ChartEx.js +++ b/common/Drawings/Format/ChartEx.js @@ -132,9 +132,6 @@ drawingsChangesMap[AscDFH.historyitem_Axis_SetTxPr] = function(oClass, value) { oClass.txPr = value; }; - drawingsChangesMap[AscDFH.historyitem_Axis_SetExtLst] = function(oClass, value) { - oClass.extLst = value; - }; drawingsChangesMap[AscDFH.historyitem_Axis_SetId] = function(oClass, value) { oClass.id = value; }; @@ -153,7 +150,6 @@ AscDFH.changesFactory[AscDFH.historyitem_Axis_SetNumFmt] = window['AscDFH'].CChangesDrawingsObjectNoId; AscDFH.changesFactory[AscDFH.historyitem_Axis_SetSpPr] = window['AscDFH'].CChangesDrawingsObjectNoId; AscDFH.changesFactory[AscDFH.historyitem_Axis_SetTxPr] = window['AscDFH'].CChangesDrawingsObjectNoId; - AscDFH.changesFactory[AscDFH.historyitem_Axis_SetExtLst] = window['AscDFH'].CChangesDrawingsObjectNoId; AscDFH.changesFactory[AscDFH.historyitem_Axis_SetId] = window['AscDFH'].CChangesDrawingsLong; AscDFH.changesFactory[AscDFH.historyitem_Axis_SetHidden] = window['AscDFH'].CChangesDrawingsBool; @@ -171,7 +167,6 @@ this.numFmt = null; this.spPr = null; this.txPr = null; - this.extLst = null; this.id = null; this.hidden = null; } @@ -226,10 +221,6 @@ History.CanAddChanges() && History.Add(new CChangesDrawingsObjectNoId(this, AscDFH.historyitem_Axis_SetTxPr, this.txPr, pr)); this.txPr = pr; }; - CAxis.prototype.setExtLst = function(pr) { - History.CanAddChanges() && History.Add(new CChangesDrawingsObjectNoId(this, AscDFH.historyitem_Axis_SetExtLst, this.extLst, pr)); - this.extLst = pr; - }; CAxis.prototype.setId = function(pr) { History.CanAddChanges() && History.Add(new CChangesDrawingsLong(this, AscDFH.historyitem_Axis_SetId, this.id, pr)); this.id = pr; @@ -250,9 +241,6 @@ // drawingsChangesMap[AscDFH.historyitem_Title_SetTxPr] = function(oClass, value) { // oClass.txPr = value; // }; - // drawingsChangesMap[AscDFH.historyitem_Title_SetExtLst] = function(oClass, value) { - // oClass.extLst = value; - // }; // drawingsChangesMap[AscDFH.historyitem_Title_SetPos] = function(oClass, value) { // oClass.pos = value; // }; @@ -265,7 +253,6 @@ // AscDFH.changesFactory[AscDFH.historyitem_Title_SetTx] = window['AscDFH'].CChangesDrawingsObjectNoId; // AscDFH.changesFactory[AscDFH.historyitem_Title_SetSpPr] = window['AscDFH'].CChangesDrawingsObjectNoId; // AscDFH.changesFactory[AscDFH.historyitem_Title_SetTxPr] = window['AscDFH'].CChangesDrawingsObjectNoId; - // AscDFH.changesFactory[AscDFH.historyitem_Title_SetExtLst] = window['AscDFH'].CChangesDrawingsObjectNoId; // AscDFH.changesFactory[AscDFH.historyitem_Title_SetPos] = window['AscDFH'].CChangesDrawingsObjectNoId; // AscDFH.changesFactory[AscDFH.historyitem_Title_SetAlign] = window['AscDFH'].CChangesDrawingsObjectNoId; // AscDFH.changesFactory[AscDFH.historyitem_Title_SetOverlay] = window['AscDFH'].CChangesDrawingsBool; @@ -274,7 +261,6 @@ // this.tx = null; // this.spPr = null; // this.txPr = null; - // this.extLst = null; // //for chart title only (but not axis title) // this.pos = null; @@ -296,10 +282,6 @@ // History.CanAddChanges() && History.Add(new CChangesDrawingsObjectNoId(this, AscDFH.historyitem_Title_SetTxPr, this.txPr, pr)); // this.txPr = pr; // }; - // CTitle.prototype.setExtLst = function(pr) { - // History.CanAddChanges() && History.Add(new CChangesDrawingsObjectNoId(this, AscDFH.historyitem_Title_SetExtLst, this.extLst, pr)); - // this.extLst = pr; - // }; // CTitle.prototype.setPos = function(pr) { // History.CanAddChanges() && History.Add(new CChangesDrawingsObjectNoId(this, AscDFH.historyitem_Title_SetPos, this.pos, pr)); // this.pos = pr; @@ -324,19 +306,14 @@ // drawingsChangesMap[AscDFH.historyitem_AxisTitle_SetTxPr] = function(oClass, value) { // oClass.txPr = value; // }; - // drawingsChangesMap[AscDFH.historyitem_AxisTitle_SetExtLst] = function(oClass, value) { - // oClass.extLst = value; - // }; // AscDFH.changesFactory[AscDFH.historyitem_AxisTitle_SetTx] = window['AscDFH'].CChangesDrawingsString; // AscDFH.changesFactory[AscDFH.historyitem_AxisTitle_SetSpPr] = window['AscDFH'].CChangesDrawingsString; // AscDFH.changesFactory[AscDFH.historyitem_AxisTitle_SetTxPr] = window['AscDFH'].CChangesDrawingsString; - // AscDFH.changesFactory[AscDFH.historyitem_AxisTitle_SetExtLst] = window['AscDFH'].CChangesDrawingsString; // function CAxisTitle() { // CBaseChartObject.call(this); // this.tx = null; // this.spPr = null; // this.txPr = null; - // this.extLst = null; // } // InitClass(CAxisTitle, CBaseChartObject, AscDFH.historyitem_type_AxisTitle); @@ -353,29 +330,20 @@ // History.CanAddChanges() && History.Add(new CChangesDrawingsObjectNoId(this, AscDFH.historyitem_AxisTitle_SetTxPr, this.txPr, pr)); // this.txPr = pr; // }; - // CAxisTitle.prototype.setExtLst = function(pr) { - // History.CanAddChanges() && History.Add(new CChangesDrawingsObjectNoId(this, AscDFH.historyitem_AxisTitle_SetExtLst, this.extLst, pr)); - // this.extLst = pr; - // }; // // AxisUnits drawingsChangesMap[AscDFH.historyitem_AxisUnits_SetUnitsLabel] = function(oClass, value) { oClass.unitsLabel = value; }; - drawingsChangesMap[AscDFH.historyitem_AxisUnits_SetExtLst] = function(oClass, value) { - oClass.extLst = value; - }; drawingsChangesMap[AscDFH.historyitem_AxisUnits_SetUnit] = function(oClass, value) { oClass.unit = value; }; AscDFH.changesFactory[AscDFH.historyitem_AxisUnits_SetUnitsLabel] = window['AscDFH'].CChangesDrawingsObjectNoId; - AscDFH.changesFactory[AscDFH.historyitem_AxisUnits_SetExtLst] = window['AscDFH'].CChangesDrawingsObjectNoId; AscDFH.changesFactory[AscDFH.historyitem_AxisUnits_SetUnit] = window['AscDFH'].CChangesDrawingsObjectNoId; function CAxisUnits() { CBaseChartObject.call(this); this.unitsLabel = null; - this.extLst = null; this.unit = null; } @@ -385,10 +353,6 @@ History.CanAddChanges() && History.Add(new CChangesDrawingsObjectNoId(this, AscDFH.historyitem_AxisUnits_SetUnitsLabel, this.unitsLabel, pr)); this.unitsLabel = pr; }; - CAxisUnits.prototype.setExtLst = function(pr) { - History.CanAddChanges() && History.Add(new CChangesDrawingsObjectNoId(this, AscDFH.historyitem_AxisUnits_SetExtLst, this.extLst, pr)); - this.extLst = pr; - }; CAxisUnits.prototype.setUnit = function(pr) { History.CanAddChanges() && History.Add(new CChangesDrawingsObjectNoId(this, AscDFH.historyitem_AxisUnits_SetUnit, this.unit, pr)); this.unit = pr; @@ -405,19 +369,14 @@ drawingsChangesMap[AscDFH.historyitem_AxisUnitsLabel_SetTxPr] = function(oClass, value) { oClass.txPr = value; }; - drawingsChangesMap[AscDFH.historyitem_AxisUnitsLabel_SetExtLst] = function(oClass, value) { - oClass.extLst = value; - }; AscDFH.changesFactory[AscDFH.historyitem_AxisUnitsLabel_SetTx] = window['AscDFH'].CChangesDrawingsObjectNoId; AscDFH.changesFactory[AscDFH.historyitem_AxisUnitsLabel_SetSpPr] = window['AscDFH'].CChangesDrawingsObjectNoId; AscDFH.changesFactory[AscDFH.historyitem_AxisUnitsLabel_SetTxPr] = window['AscDFH'].CChangesDrawingsObjectNoId; - AscDFH.changesFactory[AscDFH.historyitem_AxisUnitsLabel_SetExtLst] = window['AscDFH'].CChangesDrawingsObjectNoId; function CAxisUnitsLabel() { CBaseChartObject.call(this); this.tx = null; this.spPr = null; this.txPr = null; - this.extLst = null; } InitClass(CAxisUnitsLabel, CBaseChartObject, AscDFH.historyitem_type_AxisUnitsLabel); @@ -434,10 +393,6 @@ History.CanAddChanges() && History.Add(new CChangesDrawingsObjectNoId(this, AscDFH.historyitem_AxisUnitsLabel_SetTxPr, this.txPr, pr)); this.txPr = pr; }; - CAxisUnitsLabel.prototype.setExtLst = function(pr) { - History.CanAddChanges() && History.Add(new CChangesDrawingsObjectNoId(this, AscDFH.historyitem_AxisUnitsLabel_SetExtLst, this.extLst, pr)); - this.extLst = pr; - }; // Binning @@ -512,50 +467,41 @@ }; - // // Chart (contains in ChartFormat.js) - // drawingsChangesMap[AscDFH.historyitem_Chart_SetTitle] = function(oClass, value) { - // oClass.title = value; - // }; - // drawingsChangesMap[AscDFH.historyitem_Chart_SetPlotArea] = function(oClass, value) { - // oClass.plotArea = value; - // }; - // drawingsChangesMap[AscDFH.historyitem_Chart_SetLegend] = function(oClass, value) { - // oClass.legend = value; - // }; - // drawingsChangesMap[AscDFH.historyitem_Chart_SetExtLst] = function(oClass, value) { - // oClass.extLst = value; - // }; - // AscDFH.changesFactory[AscDFH.historyitem_Chart_SetTitle] = window['AscDFH'].CChangesDrawingsObjectNoId; - // AscDFH.changesFactory[AscDFH.historyitem_Chart_SetPlotArea] = window['AscDFH'].CChangesDrawingsObjectNoId; - // AscDFH.changesFactory[AscDFH.historyitem_Chart_SetLegend] = window['AscDFH'].CChangesDrawingsObjectNoId; - // AscDFH.changesFactory[AscDFH.historyitem_Chart_SetExtLst] = window['AscDFH'].CChangesDrawingsObjectNoId; - // function CChart() { - // CBaseChartObject.call(this); - // this.title = null; - // this.plotArea = null; - // this.legend = null; - // this.extLst = null; - // } + // ChartEx + drawingsChangesMap[AscDFH.historyitem_Chart_SetTitle] = function(oClass, value) { + oClass.title = value; + }; + drawingsChangesMap[AscDFH.historyitem_Chart_SetPlotArea] = function(oClass, value) { + oClass.plotArea = value; + }; + drawingsChangesMap[AscDFH.historyitem_Chart_SetLegend] = function(oClass, value) { + oClass.legend = value; + }; + AscDFH.changesFactory[AscDFH.historyitem_Chart_SetTitle] = window['AscDFH'].CChangesDrawingsObjectNoId; + AscDFH.changesFactory[AscDFH.historyitem_Chart_SetPlotArea] = window['AscDFH'].CChangesDrawingsObjectNoId; + AscDFH.changesFactory[AscDFH.historyitem_Chart_SetLegend] = window['AscDFH'].CChangesDrawingsObjectNoId; + function CChartEx() { + CBaseChartObject.call(this); + this.title = null; + this.plotArea = null; + this.legend = null; + } - // InitClass(CChart, CBaseChartObject, AscDFH.historyitem_type_Chart); + InitClass(CChartEx, CBaseChartObject, AscDFH.historyitem_type_Chart); - // CChart.prototype.setTitle = function(pr) { - // History.CanAddChanges() && History.Add(new CChangesDrawingsObjectNoId(this, AscDFH.historyitem_Chart_SetTitle, this.title, pr)); - // this.title = pr; - // }; - // CChart.prototype.setPlotArea = function(pr) { - // History.CanAddChanges() && History.Add(new CChangesDrawingsObjectNoId(this, AscDFH.historyitem_Chart_SetPlotArea, this.plotArea, pr)); - // this.plotArea = pr; - // }; - // CChart.prototype.setLegend = function(pr) { - // History.CanAddChanges() && History.Add(new CChangesDrawingsObjectNoId(this, AscDFH.historyitem_Chart_SetLegend, this.legend, pr)); - // this.legend = pr; - // }; - // CChart.prototype.setExtLst = function(pr) { - // History.CanAddChanges() && History.Add(new CChangesDrawingsObjectNoId(this, AscDFH.historyitem_Chart_SetExtLst, this.extLst, pr)); - // this.extLst = pr; - // }; - // + CChartEx.prototype.setTitle = function(pr) { + History.CanAddChanges() && History.Add(new CChangesDrawingsObjectNoId(this, AscDFH.historyitem_Chart_SetTitle, this.title, pr)); + this.title = pr; + }; + CChartEx.prototype.setPlotArea = function(pr) { + History.CanAddChanges() && History.Add(new CChangesDrawingsObjectNoId(this, AscDFH.historyitem_Chart_SetPlotArea, this.plotArea, pr)); + this.plotArea = pr; + }; + CChartEx.prototype.setLegend = function(pr) { + History.CanAddChanges() && History.Add(new CChangesDrawingsObjectNoId(this, AscDFH.historyitem_Chart_SetLegend, this.legend, pr)); + this.legend = pr; + }; + // ChartData drawingsChangesMap[AscDFH.historyitem_ChartData_SetExternalData] = function(oClass, value) { @@ -564,9 +510,6 @@ drawingsChangesMap[AscDFH.historyitem_ChartData_SetData] = function(oClass, value) { oClass.data = value; }; - drawingsChangesMap[AscDFH.historyitem_ChartData_SetExtLst] = function(oClass, value) { - oClass.extLst = value; - }; drawingContentChanges[AscDFH.historyitem_ChartData_AddData] = drawingContentChanges[AscDFH.historyitem_ChartData_RemoveData] = function(oClass) { @@ -574,14 +517,12 @@ }; AscDFH.changesFactory[AscDFH.historyitem_ChartData_SetExternalData] = window['AscDFH'].CChangesDrawingsObjectNoId; AscDFH.changesFactory[AscDFH.historyitem_ChartData_SetData] = window['AscDFH'].CChangesDrawingsObject; - AscDFH.changesFactory[AscDFH.historyitem_ChartData_SetExtLst] = window['AscDFH'].CChangesDrawingsObjectNoId; AscDFH.changesFactory[AscDFH.historyitem_ChartData_AddData] = window['AscDFH'].CChangesDrawingsContent; AscDFH.changesFactory[AscDFH.historyitem_ChartData_RemoveData] = window['AscDFH'].CChangesDrawingsContent; function CChartData() { CBaseChartObject.call(this); this.externalData = null; this.data = []; - this.extLst = null; } InitClass(CChartData, CBaseChartObject, AscDFH.historyitem_type_ChartData); @@ -609,10 +550,6 @@ History.CanAddChanges() && History.Add(new CChangesDrawingsContent(this, AscDFH.historyitem_ChartData_RemoveData, pos, [data], false)); } }; - CChartData.prototype.setExtLst = function(pr) { - History.CanAddChanges() && History.Add(new CChangesDrawingsObjectNoId(this, AscDFH.historyitem_ChartData_SetExtLst, this.extLst, pr)); - this.extLst = pr; - }; // // ChartSpace (constains in ChartSpace.js) @@ -631,9 +568,6 @@ // drawingsChangesMap[AscDFH.historyitem_ChartSpace_SetClrMapOvr] = function(oClass, value) { // oClass.clrMapOvr = value; // }; - // drawingsChangesMap[AscDFH.historyitem_ChartSpace_SetExtLst] = function(oClass, value) { - // oClass.extLst = value; - // }; // // drawingsChangesMap[AscDFH.historyitem_ChartSpace_SetFmtOvrs] = function(oClass, value) { // // oClass.fmtOvrs = value; // // }; @@ -645,7 +579,6 @@ // AscDFH.changesFactory[AscDFH.historyitem_ChartSpace_SetSpPr] = window['AscDFH'].CChangesDrawingsObjectNoId; // AscDFH.changesFactory[AscDFH.historyitem_ChartSpace_SetTxPr] = window['AscDFH'].CChangesDrawingsObjectNoId; // AscDFH.changesFactory[AscDFH.historyitem_ChartSpace_SetClrMapOvr] = window['AscDFH'].CChangesDrawingsObjectNoId; - // AscDFH.changesFactory[AscDFH.historyitem_ChartSpace_SetExtLst] = window['AscDFH'].CChangesDrawingsObjectNoId; // // AscDFH.changesFactory[AscDFH.historyitem_ChartSpace_SetFmtOvrs] = window['AscDFH'].CChangesDrawingsObjectNoId; // // AscDFH.changesFactory[AscDFH.historyitem_ChartSpace_SetPrintSettings] = window['AscDFH'].CChangesDrawingsObjectNoId; // function CChartSpace() { @@ -655,7 +588,6 @@ // this.spPr = null; // this.txPr = null; // this.clrMapOvr = null; - // this.extLst = null; // // unused in ChartSerializeEx.h // // this.fmtOvrs = null; // // this.printSettings = null; @@ -684,10 +616,6 @@ // History.CanAddChanges() && History.Add(new CChangesDrawingsObjectNoId(this, AscDFH.historyitem_ChartSpace_SetClrMapOvr, this.clrMapOvr, pr)); // this.clrMapOvr = pr; // }; - // CChartSpace.prototype.setExtLst = function(pr) { - // History.CanAddChanges() && History.Add(new CChangesDrawingsObjectNoId(this, AscDFH.historyitem_ChartSpace_SetExtLst, this.extLst, pr)); - // this.extLst = pr; - // }; // // CChartSpace.prototype.setFmtOvrs = function(pr) { // // History.CanAddChanges() && History.Add(new CChangesDrawingsObjectNoId(this, AscDFH.historyitem_ChartSpace_SetFmtOvrs, this.fmtOvrs, pr)); // // this.fmtOvrs = pr; @@ -708,9 +636,6 @@ // drawingsChangesMap[AscDFH.historyitem_ChartTitle_SetTxPr] = function(oClass, value) { // oClass.txPr = value; // }; - // drawingsChangesMap[AscDFH.historyitem_ChartTitle_SetExtLst] = function(oClass, value) { - // oClass.extLst = value; - // }; // drawingsChangesMap[AscDFH.historyitem_ChartTitle_SetPos] = function(oClass, value) { // oClass.pos = value; // }; @@ -723,7 +648,6 @@ // AscDFH.changesFactory[AscDFH.historyitem_ChartTitle_SetTx] = window['AscDFH'].CChangesDrawingsString; // AscDFH.changesFactory[AscDFH.historyitem_ChartTitle_SetSpPr] = window['AscDFH'].CChangesDrawingsString; // AscDFH.changesFactory[AscDFH.historyitem_ChartTitle_SetTxPr] = window['AscDFH'].CChangesDrawingsString; - // AscDFH.changesFactory[AscDFH.historyitem_ChartTitle_SetExtLst] = window['AscDFH'].CChangesDrawingsString; // AscDFH.changesFactory[AscDFH.historyitem_ChartTitle_SetPos] = window['AscDFH'].CChangesDrawingsString; // AscDFH.changesFactory[AscDFH.historyitem_ChartTitle_SetAlign] = window['AscDFH'].CChangesDrawingsString; // AscDFH.changesFactory[AscDFH.historyitem_ChartTitle_SetOverlay] = window['AscDFH'].CChangesDrawingsString; @@ -732,7 +656,6 @@ // this.tx = null; // this.spPr = null; // this.txPr = null; - // this.extLst = null; // this.pos = null; // this.align = null; // this.overlay = null; @@ -752,10 +675,6 @@ // History.CanAddChanges() && History.Add(new CChangesDrawingsString(this, AscDFH.historyitem_ChartTitle_SetTxPr, this.txPr, pr)); // this.txPr = pr; // }; - // CChartTitle.prototype.setExtLst = function(pr) { - // History.CanAddChanges() && History.Add(new CChangesDrawingsString(this, AscDFH.historyitem_ChartTitle_SetExtLst, this.extLst, pr)); - // this.extLst = pr; - // }; // CChartTitle.prototype.setPos = function(pr) { // History.CanAddChanges() && History.Add(new CChangesDrawingsString(this, AscDFH.historyitem_ChartTitle_SetPos, this.pos, pr)); // this.pos = pr; @@ -843,9 +762,6 @@ drawingsChangesMap[AscDFH.historyitem_Data_SetDimension] = function(oClass, value) { oClass.dimension = value; }; - drawingsChangesMap[AscDFH.historyitem_Data_SetExtLst] = function(oClass, value) { - oClass.extLst = value; - }; drawingsChangesMap[AscDFH.historyitem_Data_SetId] = function(oClass, value) { oClass.id = value; }; @@ -857,7 +773,6 @@ // AscDFH.changesFactory[AscDFH.historyitem_Data_SetNumDim] = window['AscDFH'].CChangesDrawingsString; // AscDFH.changesFactory[AscDFH.historyitem_Data_SetStrDim] = window['AscDFH'].CChangesDrawingsString; AscDFH.changesFactory[AscDFH.historyitem_Data_SetDimension] = window['AscDFH'].CChangesDrawingsObjectNoId; - AscDFH.changesFactory[AscDFH.historyitem_Data_SetExtLst] = window['AscDFH'].CChangesDrawingsObjectNoId; AscDFH.changesFactory[AscDFH.historyitem_Data_SetId] = window['AscDFH'].CChangesDrawingsLong; AscDFH.changesFactory[AscDFH.historyitem_Data_AddDimension] = window['AscDFH'].CChangesDrawingsContent; AscDFH.changesFactory[AscDFH.historyitem_Data_RemoveDimension] = window['AscDFH'].CChangesDrawingsContent; @@ -867,7 +782,6 @@ // this.numDim = null; // this.strDim = null; this.dimension = []; - this.extLst = null; this.id = null; } @@ -900,10 +814,6 @@ History.CanAddChanges() && History.Add(new CChangesDrawingsContent(this, AscDFH.historyitem_Data_RemoveDimension, pos, [dimension], false)); } }; - CData.prototype.setExtLst = function(pr) { - History.CanAddChanges() && History.Add(new CChangesDrawingsObjectNoId(this, AscDFH.historyitem_Data_SetExtLst, this.extLst, pr)); - this.extLst = pr; - }; CData.prototype.setId = function(pr) { History.CanAddChanges() && History.Add(new CChangesDrawingsLong(this, AscDFH.historyitem_Data_SetId, this.id, pr)); this.id = pr; @@ -944,9 +854,6 @@ drawingsChangesMap[AscDFH.historyitem_DataLabel_SetSeparator] = function(oClass, value) { oClass.separator = value; }; - drawingsChangesMap[AscDFH.historyitem_DataLabel_SetExtLst] = function(oClass, value) { - oClass.extLst = value; - }; drawingsChangesMap[AscDFH.historyitem_DataLabel_SetIdx] = function(oClass, value) { oClass.idx = value; }; @@ -958,7 +865,6 @@ AscDFH.changesFactory[AscDFH.historyitem_DataLabel_SetTxPr] = window['AscDFH'].CChangesDrawingsObjectNoId; AscDFH.changesFactory[AscDFH.historyitem_DataLabel_SetVisibility] = window['AscDFH'].CChangesDrawingsObjectNoId; AscDFH.changesFactory[AscDFH.historyitem_DataLabel_SetSeparator] = window['AscDFH'].CChangesDrawingsString; - AscDFH.changesFactory[AscDFH.historyitem_DataLabel_SetExtLst] = window['AscDFH'].CChangesDrawingsObjectNoId; AscDFH.changesFactory[AscDFH.historyitem_DataLabel_SetIdx] = window['AscDFH'].CChangesDrawingsLong; AscDFH.changesFactory[AscDFH.historyitem_DataLabel_SetPos] = window['AscDFH'].CChangesDrawingsObjectNoId; function CDataLabel() { @@ -968,7 +874,6 @@ this.txPr = null; this.visibility = null; this.separator = null; - this.extLst = null; this.idx = null; this.pos = null; } @@ -995,10 +900,6 @@ History.CanAddChanges() && History.Add(new CChangesDrawingsString(this, AscDFH.historyitem_DataLabel_SetSeparator, this.separator, pr)); this.separator = pr; }; - CDataLabel.prototype.setExtLst = function(pr) { - History.CanAddChanges() && History.Add(new CChangesDrawingsObjectNoId(this, AscDFH.historyitem_DataLabel_SetExtLst, this.extLst, pr)); - this.extLst = pr; - }; CDataLabel.prototype.setIdx = function(pr) { History.CanAddChanges() && History.Add(new CChangesDrawingsLong(this, AscDFH.historyitem_DataLabel_SetIdx, this.idx, pr)); this.idx = pr; @@ -1049,9 +950,6 @@ drawingsChangesMap[AscDFH.historyitem_DataLabels_SetDataLabelHidden] = function(oClass, value) { oClass.dataLabelHidden = value; }; - drawingsChangesMap[AscDFH.historyitem_DataLabels_SetExtLst] = function(oClass, value) { - oClass.extLst = value; - }; drawingsChangesMap[AscDFH.historyitem_DataLabels_SetPos] = function(oClass, value) { oClass.pos = value; }; @@ -1072,7 +970,6 @@ AscDFH.changesFactory[AscDFH.historyitem_DataLabels_SetSeparator] = window['AscDFH'].CChangesDrawingsString; AscDFH.changesFactory[AscDFH.historyitem_DataLabels_SetDataLabel] = window['AscDFH'].CChangesDrawingsObjectNoId; AscDFH.changesFactory[AscDFH.historyitem_DataLabels_SetDataLabelHidden] = window['AscDFH'].CChangesDrawingsObjectNoId; - AscDFH.changesFactory[AscDFH.historyitem_DataLabels_SetExtLst] = window['AscDFH'].CChangesDrawingsObjectNoId; AscDFH.changesFactory[AscDFH.historyitem_DataLabels_SetPos] = window['AscDFH'].CChangesDrawingsObjectNoId; AscDFH.changesFactory[AscDFH.historyitem_DataLabels_AddDataLabel] = window['AscDFH'].CChangesDrawingsContent; AscDFH.changesFactory[AscDFH.historyitem_DataLabels_RemoveDataLabel] = window['AscDFH'].CChangesDrawingsContent; @@ -1087,7 +984,6 @@ this.separator = null; this.dataLabel = []; this.dataLabelHidden = []; - this.extLst = null; this.pos = null; } @@ -1151,10 +1047,6 @@ History.CanAddChanges() && History.Add(new CChangesDrawingsContent(this, AscDFH.historyitem_DataLabels_RemoveDataLabelHidden, pos, [dataLabelHidden], false)); } }; - CDataLabels.prototype.setExtLst = function(pr) { - History.CanAddChanges() && History.Add(new CChangesDrawingsObjectNoId(this, AscDFH.historyitem_DataLabels_SetExtLst, this.extLst, pr)); - this.extLst = pr; - }; CDataLabels.prototype.setPos = function(pr) { History.CanAddChanges() && History.Add(new CChangesDrawingsObjectNoId(this, AscDFH.historyitem_DataLabels_SetPos, this.pos, pr)); this.pos = pr; @@ -1201,19 +1093,14 @@ drawingsChangesMap[AscDFH.historyitem_DataPoint_SetSpPr] = function(oClass, value) { oClass.spPr = value; }; - drawingsChangesMap[AscDFH.historyitem_DataPoint_SetExtLst] = function(oClass, value) { - oClass.extLst = value; - }; drawingsChangesMap[AscDFH.historyitem_DataPoint_SetIdx] = function(oClass, value) { oClass.idx = value; }; AscDFH.changesFactory[AscDFH.historyitem_DataPoint_SetSpPr] = window['AscDFH'].CChangesDrawingsObjectNoId; - AscDFH.changesFactory[AscDFH.historyitem_DataPoint_SetExtLst] = window['AscDFH'].CChangesDrawingsObjectNoId; AscDFH.changesFactory[AscDFH.historyitem_DataPoint_SetIdx] = window['AscDFH'].CChangesDrawingsLong; function CDataPoint() { CBaseChartObject.call(this); this.spPr = null; - this.extLst = null; this.idx = null; } @@ -1223,10 +1110,6 @@ History.CanAddChanges() && History.Add(new CChangesDrawingsObjectNoId(this, AscDFH.historyitem_DataPoint_SetSpPr, this.spPr, pr)); this.spPr = pr; }; - CDataPoint.prototype.setExtLst = function(pr) { - History.CanAddChanges() && History.Add(new CChangesDrawingsObjectNoId(this, AscDFH.historyitem_DataPoint_SetExtLst, this.extLst, pr)); - this.extLst = pr; - }; CDataPoint.prototype.setIdx = function(pr) { History.CanAddChanges() && History.Add(new CChangesDrawingsLong(this, AscDFH.historyitem_DataPoint_SetIdx, this.idx, pr)); this.idx = pr; @@ -1300,19 +1183,14 @@ drawingsChangesMap[AscDFH.historyitem_FormatOverride_SetSpPr] = function(oClass, value) { oClass.spPr = value; }; - drawingsChangesMap[AscDFH.historyitem_FormatOverride_SetExtLst] = function(oClass, value) { - oClass.extLst = value; - }; drawingsChangesMap[AscDFH.historyitem_FormatOverride_SetIdx] = function(oClass, value) { oClass.idx = value; }; AscDFH.changesFactory[AscDFH.historyitem_FormatOverride_SetSpPr] = window['AscDFH'].CChangesDrawingsObjectNoId; - AscDFH.changesFactory[AscDFH.historyitem_FormatOverride_SetExtLst] = window['AscDFH'].CChangesDrawingsObjectNoId; AscDFH.changesFactory[AscDFH.historyitem_FormatOverride_SetIdx] = window['AscDFH'].CChangesDrawingsLong; function CFormatOverride() { CBaseChartObject.call(this); this.spPr = null; - this.extLst = null; this.idx = null; } @@ -1322,10 +1200,6 @@ History.CanAddChanges() && History.Add(new CChangesDrawingsObjectNoId(this, AscDFH.historyitem_FormatOverride_SetSpPr, this.spPr, pr)); this.spPr = pr; }; - CFormatOverride.prototype.setExtLst = function(pr) { - History.CanAddChanges() && History.Add(new CChangesDrawingsObjectNoId(this, AscDFH.historyitem_FormatOverride_SetExtLst, this.extLst, pr)); - this.extLst = pr; - }; CFormatOverride.prototype.setIdx = function(pr) { History.CanAddChanges() && History.Add(new CChangesDrawingsLong(this, AscDFH.historyitem_FormatOverride_SetIdx, this.idx, pr)); this.idx = pr; @@ -2101,19 +1975,14 @@ drawingsChangesMap[AscDFH.historyitem_Gridlines_SetSpPr] = function(oClass, value) { oClass.spPr = value; }; - drawingsChangesMap[AscDFH.historyitem_Gridlines_SetExtLst] = function(oClass, value) { - oClass.extLst = value; - }; drawingsChangesMap[AscDFH.historyitem_Gridlines_SetName] = function(oClass, value) { oClass.name = value; }; AscDFH.changesFactory[AscDFH.historyitem_Gridlines_SetSpPr] = window['AscDFH'].CChangesDrawingsObjectNoId; - AscDFH.changesFactory[AscDFH.historyitem_Gridlines_SetExtLst] = window['AscDFH'].CChangesDrawingsObjectNoId; AscDFH.changesFactory[AscDFH.historyitem_Gridlines_SetName] = window['AscDFH'].CChangesDrawingsString; function CGridlines() { CBaseChartObject.call(this); this.spPr = null; - this.extLst = null; this.name = null; } @@ -2123,10 +1992,6 @@ History.CanAddChanges() && History.Add(new CChangesDrawingsObjectNoId(this, AscDFH.historyitem_Gridlines_SetSpPr, this.spPr, pr)); this.spPr = pr; }; - CGridlines.prototype.setExtLst = function(pr) { - History.CanAddChanges() && History.Add(new CChangesDrawingsObjectNoId(this, AscDFH.historyitem_Gridlines_SetExtLst, this.extLst, pr)); - this.extLst = pr; - }; CGridlines.prototype.setName = function(pr) { History.CanAddChanges() && History.Add(new CChangesDrawingsString(this, AscDFH.historyitem_Gridlines_SetName, this.name, pr)); this.name = pr; @@ -2230,9 +2095,6 @@ // drawingsChangesMap[AscDFH.historyitem_Legend_SetTxPr] = function(oClass, value) { // oClass.txPr = value; // }; - // drawingsChangesMap[AscDFH.historyitem_Legend_SetExtLst] = function(oClass, value) { - // oClass.extLst = value; - // }; // drawingsChangesMap[AscDFH.historyitem_Legend_SetPos] = function(oClass, value) { // oClass.pos = value; // }; @@ -2244,7 +2106,6 @@ // }; // AscDFH.changesFactory[AscDFH.historyitem_Legend_SetSpPr] = window['AscDFH'].CChangesDrawingsObjectNoId; // AscDFH.changesFactory[AscDFH.historyitem_Legend_SetTxPr] = window['AscDFH'].CChangesDrawingsObjectNoId; - // AscDFH.changesFactory[AscDFH.historyitem_Legend_SetExtLst] = window['AscDFH'].CChangesDrawingsObjectNoId; // AscDFH.changesFactory[AscDFH.historyitem_Legend_SetPos] = window['AscDFH'].CChangesDrawingsObjectNoId; // AscDFH.changesFactory[AscDFH.historyitem_Legend_SetAlign] = window['AscDFH'].CChangesDrawingsObjectNoId; // AscDFH.changesFactory[AscDFH.historyitem_Legend_SetOverlay] = window['AscDFH'].CChangesDrawingsBool; @@ -2252,7 +2113,6 @@ // CBaseChartObject.call(this); // this.spPr = null; // this.txPr = null; - // this.extLst = null; // this.pos = null; // this.align = null; // this.overlay = null; @@ -2268,10 +2128,6 @@ // History.CanAddChanges() && History.Add(new CChangesDrawingsObjectNoId(this, AscDFH.historyitem_Legend_SetTxPr, this.txPr, pr)); // this.txPr = pr; // }; - // CLegend.prototype.setExtLst = function(pr) { - // History.CanAddChanges() && History.Add(new CChangesDrawingsObjectNoId(this, AscDFH.historyitem_Legend_SetExtLst, this.extLst, pr)); - // this.extLst = pr; - // }; // CLegend.prototype.setPos = function(pr) { // History.CanAddChanges() && History.Add(new CChangesDrawingsObjectNoId(this, AscDFH.historyitem_Legend_SetPos, this.pos, pr)); // this.pos = pr; @@ -2304,7 +2160,7 @@ // }; // - // // NumberFormat (contains in ChartFormat.js) + // // NumberFormat (CNumFmt contains in ChartFormat.js) // drawingsChangesMap[AscDFH.historyitem_NumberFormat_SetFormatCode] = function(oClass, value) { // oClass.formatCode = value; // }; @@ -2658,19 +2514,14 @@ // drawingsChangesMap[AscDFH.historyitem_PlotArea_SetSpPr] = function(oClass, value) { // oClass.spPr = value; // }; - // drawingsChangesMap[AscDFH.historyitem_PlotArea_SetExtLst] = function(oClass, value) { - // oClass.extLst = value; - // }; // AscDFH.changesFactory[AscDFH.historyitem_PlotArea_SetPlotAreaRegion] = window['AscDFH'].CChangesDrawingsObjectNoId; // AscDFH.changesFactory[AscDFH.historyitem_PlotArea_SetAxis] = window['AscDFH'].CChangesDrawingsObjectNoId; // AscDFH.changesFactory[AscDFH.historyitem_PlotArea_SetSpPr] = window['AscDFH'].CChangesDrawingsObjectNoId; - // AscDFH.changesFactory[AscDFH.historyitem_PlotArea_SetExtLst] = window['AscDFH'].CChangesDrawingsObjectNoId; // function CPlotArea() { // CBaseChartObject.call(this); // this.plotAreaRegion = null; // this.axis = []; // this.spPr = null; - // this.extLst = null; // } // InitClass(CPlotArea, CBaseChartObject, AscDFH.historyitem_type_PlotArea); @@ -2687,10 +2538,6 @@ // History.CanAddChanges() && History.Add(new CChangesDrawingsObjectNoId(this, AscDFH.historyitem_PlotArea_SetSpPr, this.spPr, pr)); // this.spPr = pr; // }; - // CPlotArea.prototype.setExtLst = function(pr) { - // History.CanAddChanges() && History.Add(new CChangesDrawingsObjectNoId(this, AscDFH.historyitem_PlotArea_SetExtLst, this.extLst, pr)); - // this.extLst = pr; - // }; // // PlotAreaRegion @@ -2700,9 +2547,6 @@ drawingsChangesMap[AscDFH.historyitem_PlotAreaRegion_SetSeries] = function(oClass, value) { oClass.series = value; }; - drawingsChangesMap[AscDFH.historyitem_PlotAreaRegion_SetExtLst] = function(oClass, value) { - oClass.extLst = value; - }; drawingContentChanges[AscDFH.historyitem_PlotAreaRegion_AddSeries] = drawingContentChanges[AscDFH.historyitem_PlotAreaRegion_RemoveSeries] = function(oClass) { @@ -2710,14 +2554,12 @@ }; AscDFH.changesFactory[AscDFH.historyitem_PlotAreaRegion_SetPlotSurface] = window['AscDFH'].CChangesDrawingsObjectNoId; AscDFH.changesFactory[AscDFH.historyitem_PlotAreaRegion_SetSeries] = window['AscDFH'].CChangesDrawingsObjectNoId; - AscDFH.changesFactory[AscDFH.historyitem_PlotAreaRegion_SetExtLst] = window['AscDFH'].CChangesDrawingsObjectNoId; AscDFH.changesFactory[AscDFH.historyitem_PlotAreaRegion_AddSeries] = window['AscDFH'].CChangesDrawingsContent; AscDFH.changesFactory[AscDFH.historyitem_PlotAreaRegion_RemoveSeries] = window['AscDFH'].CChangesDrawingsContent; function CPlotAreaRegion() { CBaseChartObject.call(this); this.plotSurface = null; this.series = []; - this.extLst = null; } InitClass(CPlotAreaRegion, CBaseChartObject, AscDFH.historyitem_type_PlotAreaRegion); @@ -2745,25 +2587,16 @@ History.CanAddChanges() && History.Add(new CChangesDrawingsContent(this, AscDFH.historyitem_PlotAreaRegion_RemoveSeries, pos, [series], false)); } }; - CPlotAreaRegion.prototype.setExtLst = function(pr) { - History.CanAddChanges() && History.Add(new CChangesDrawingsObjectNoId(this, AscDFH.historyitem_PlotAreaRegion_SetExtLst, this.extLst, pr)); - this.extLst = pr; - }; // PlotSurface drawingsChangesMap[AscDFH.historyitem_PlotSurface_SetSpPr] = function(oClass, value) { oClass.spPr = value; }; - drawingsChangesMap[AscDFH.historyitem_PlotSurface_SetExtLst] = function(oClass, value) { - oClass.extLst = value; - }; AscDFH.changesFactory[AscDFH.historyitem_PlotSurface_SetSpPr] = window['AscDFH'].CChangesDrawingsObjectNoId; - AscDFH.changesFactory[AscDFH.historyitem_PlotSurface_SetExtLst] = window['AscDFH'].CChangesDrawingsObjectNoId; function CPlotSurface() { CBaseChartObject.call(this); this.spPr = null; - this.extLst = null; } InitClass(CPlotSurface, CBaseChartObject, AscDFH.historyitem_type_PlotSurface); @@ -2772,10 +2605,6 @@ History.CanAddChanges() && History.Add(new CChangesDrawingsObjectNoId(this, AscDFH.historyitem_PlotSurface_SetSpPr, this.spPr, pr)); this.spPr = pr; }; - CPlotSurface.prototype.setExtLst = function(pr) { - History.CanAddChanges() && History.Add(new CChangesDrawingsObjectNoId(this, AscDFH.historyitem_PlotSurface_SetExtLst, this.extLst, pr)); - this.extLst = pr; - }; // // PrintSettings (contains in ChartFormat.js) @@ -2878,9 +2707,6 @@ drawingsChangesMap[AscDFH.historyitem_Series_SetAxisId] = function(oClass, value) { oClass.axisId = value; }; - drawingsChangesMap[AscDFH.historyitem_Series_SetExtLst] = function(oClass, value) { - oClass.extLst = value; - }; drawingsChangesMap[AscDFH.historyitem_Series_SetLayoutId] = function(oClass, value) { oClass.layoutId = value; }; @@ -2915,7 +2741,6 @@ AscDFH.changesFactory[AscDFH.historyitem_Series_SetDataId] = window['AscDFH'].CChangesDrawingsObjectNoId; AscDFH.changesFactory[AscDFH.historyitem_Series_SetLayoutPr] = window['AscDFH'].CChangesDrawingsObjectNoId; AscDFH.changesFactory[AscDFH.historyitem_Series_SetAxisId] = window['AscDFH'].CChangesDrawingsObjectNoId; - AscDFH.changesFactory[AscDFH.historyitem_Series_SetExtLst] = window['AscDFH'].CChangesDrawingsObjectNoId; AscDFH.changesFactory[AscDFH.historyitem_Series_SetLayoutId] = window['AscDFH'].CChangesDrawingsObjectNoId; AscDFH.changesFactory[AscDFH.historyitem_Series_SetHidden] = window['AscDFH'].CChangesDrawingsBool; AscDFH.changesFactory[AscDFH.historyitem_Series_SetOwnerIdx] = window['AscDFH'].CChangesDrawingsLong; @@ -2937,7 +2762,6 @@ this.dataId = null; this.layoutPr = null; this.axisId = []; - this.extLst = null; this.layoutId = null; this.hidden = null; this.ownerIdx = null; @@ -3013,10 +2837,6 @@ History.CanAddChanges() && History.Add(new CChangesDrawingsContent(this, AscDFH.historyitem_Series_RemoveAxisId, pos, [axisId], false)); } }; - CSeries.prototype.setExtLst = function(pr) { - History.CanAddChanges() && History.Add(new CChangesDrawingsObjectNoId(this, AscDFH.historyitem_Series_SetExtLst, this.extLst, pr)); - this.extLst = pr; - }; CSeries.prototype.setLayoutId = function(pr) { History.CanAddChanges() && History.Add(new CChangesDrawingsObjectNoId(this, AscDFH.historyitem_Series_SetLayoutId, this.layoutId, pr)); this.layoutId = pr; @@ -3118,9 +2938,6 @@ drawingsChangesMap[AscDFH.historyitem_SeriesLayoutProperties_SetSubtotals] = function(oClass, value) { oClass.subtotals = value; }; - drawingsChangesMap[AscDFH.historyitem_SeriesLayoutProperties_SetExtLst] = function(oClass, value) { - oClass.extLst = value; - }; AscDFH.changesFactory[AscDFH.historyitem_SeriesLayoutProperties_SetParentLabelLayout] = window['AscDFH'].CChangesDrawingsObjectNoId; AscDFH.changesFactory[AscDFH.historyitem_SeriesLayoutProperties_SetRegionLabelLayout] = window['AscDFH'].CChangesDrawingsObjectNoId; AscDFH.changesFactory[AscDFH.historyitem_SeriesLayoutProperties_SetVisibility] = window['AscDFH'].CChangesDrawingsObjectNoId; @@ -3129,7 +2946,6 @@ AscDFH.changesFactory[AscDFH.historyitem_SeriesLayoutProperties_SetGeography] = window['AscDFH'].CChangesDrawingsObjectNoId; AscDFH.changesFactory[AscDFH.historyitem_SeriesLayoutProperties_SetStatistics] = window['AscDFH'].CChangesDrawingsObjectNoId; AscDFH.changesFactory[AscDFH.historyitem_SeriesLayoutProperties_SetSubtotals] = window['AscDFH'].CChangesDrawingsObjectNoId; - AscDFH.changesFactory[AscDFH.historyitem_SeriesLayoutProperties_SetExtLst] = window['AscDFH'].CChangesDrawingsObjectNoId; function CSeriesLayoutProperties() { CBaseChartObject.call(this); this.parentLabelLayout = null; @@ -3138,7 +2954,6 @@ this.aggregation = null; this.statistics = null; this.subtotals = null; - this.extLst = null; // todo in ChartSerializeEx.h this.binning = null; this.geography = null; @@ -3178,10 +2993,6 @@ History.CanAddChanges() && History.Add(new CChangesDrawingsObjectNoId(this, AscDFH.historyitem_SeriesLayoutProperties_SetSubtotals, this.subtotals, pr)); this.subtotals = pr; }; - CSeriesLayoutProperties.prototype.setExtLst = function(pr) { - History.CanAddChanges() && History.Add(new CChangesDrawingsObjectNoId(this, AscDFH.historyitem_SeriesLayoutProperties_SetExtLst, this.extLst, pr)); - this.extLst = pr; - }; // Statistics @@ -3212,19 +3023,14 @@ drawingsChangesMap[AscDFH.historyitem_Dimension_SetType] = function(oClass, value) { oClass.type = value; }; - drawingsChangesMap[AscDFH.historyitem_Dimension_SetExtLst] = function(oClass, value) { - oClass.extLst = value; - }; AscDFH.changesFactory[AscDFH.historyitem_Dimension_SetF] = window['AscDFH'].CChangesDrawingsObjectNoId; AscDFH.changesFactory[AscDFH.historyitem_Dimension_SetNf] = window['AscDFH'].CChangesDrawingsString; AscDFH.changesFactory[AscDFH.historyitem_Dimension_SetType] = window['AscDFH'].CChangesDrawingsObjectNoId; - AscDFH.changesFactory[AscDFH.historyitem_Dimension_SetExtLst] = window['AscDFH'].CChangesDrawingsObjectNoId; function CDimension() { CBaseChartObject.call(this); this.f = null; this.nf = null; this.type = null; - this.extLst = null; } InitClass(CDimension, CBaseChartObject, AscDFH.historyitem_type_Dimension); @@ -3241,10 +3047,6 @@ History.CanAddChanges() && History.Add(new CChangesDrawingsObjectNoId(this, AscDFH.historyitem_Dimension_SetType, this.type, pr)); this.type = pr; }; - CDimension.prototype.setExtLst = function(pr) { - History.CanAddChanges() && History.Add(new CChangesDrawingsObjectNoId(this, AscDFH.historyitem_Dimension_SetExtLst, this.extLst, pr)); - this.extLst = pr; - }; // StringDimension @@ -3459,50 +3261,31 @@ }; - // // TickLabels (unused) - // drawingsChangesMap[AscDFH.historyitem_TickLabels_SetExtLst] = function(oClass, value) { - // oClass.extLst = value; - // }; - // AscDFH.changesFactory[AscDFH.historyitem_TickLabels_SetExtLst] = window['AscDFH'].CChangesDrawingsString; + // // TickLabels (unused, bool instead this class) // function CTickLabels() { // CBaseChartObject.call(this); - // this.extLst = null; // } // InitClass(CTickLabels, CBaseChartObject, AscDFH.historyitem_type_TickLabels); - - // CTickLabels.prototype.setExtLst = function(pr) { - // History.CanAddChanges() && History.Add(new CChangesDrawingsString(this, AscDFH.historyitem_TickLabels_SetExtLst, this.extLst, pr)); - // this.extLst = pr; - // }; // // TickMarks - drawingsChangesMap[AscDFH.historyitem_TickMarks_SetExtLst] = function(oClass, value) { - oClass.extLst = value; - }; drawingsChangesMap[AscDFH.historyitem_TickMarks_SetType] = function(oClass, value) { oClass.type = value; }; drawingsChangesMap[AscDFH.historyitem_TickMarks_SetName] = function(oClass, value) { oClass.name = value; }; - AscDFH.changesFactory[AscDFH.historyitem_TickMarks_SetExtLst] = window['AscDFH'].CChangesDrawingsObjectNoId; AscDFH.changesFactory[AscDFH.historyitem_TickMarks_SetType] = window['AscDFH'].CChangesDrawingsObjectNoId; AscDFH.changesFactory[AscDFH.historyitem_TickMarks_SetName] = window['AscDFH'].CChangesDrawingsString; function CTickMarks() { CBaseChartObject.call(this); - this.extLst = null; this.type = null; this.name = null; } InitClass(CTickMarks, CBaseChartObject, AscDFH.historyitem_type_TickMarks); - CTickMarks.prototype.setExtLst = function(pr) { - History.CanAddChanges() && History.Add(new CChangesDrawingsObjectNoId(this, AscDFH.historyitem_TickMarks_SetExtLst, this.extLst, pr)); - this.extLst = pr; - }; CTickMarks.prototype.setType = function(pr) { History.CanAddChanges() && History.Add(new CChangesDrawingsObjectNoId(this, AscDFH.historyitem_TickMarks_SetType, this.type, pr)); this.type = pr; @@ -4030,7 +3813,7 @@ window['AscFormat'].CAxisUnitsLabel = CAxisUnitsLabel; window['AscFormat'].CBinning = CBinning; window['AscFormat'].CCategoryAxisScaling = CCategoryAxisScaling; - // window['AscFormat'].CChart = CChart; + window['AscFormat'].CChartEx = CChartEx; window['AscFormat'].CChartData = CChartData; // window['AscFormat'].CChartSpace = CChartSpace; // window['AscFormat'].CChartTitle = CChartTitle; diff --git a/common/Drawings/Format/ChartFormat.js b/common/Drawings/Format/ChartFormat.js index d2404ca778..1cba857d42 100644 --- a/common/Drawings/Format/ChartFormat.js +++ b/common/Drawings/Format/ChartFormat.js @@ -104,9 +104,6 @@ drawingsChangesMap[AscDFH.historyitem_PlotArea_SetPlotAreaRegion] = function(oClass, value) { oClass.plotAreaRegion = value; }; - drawingsChangesMap[AscDFH.historyitem_PlotArea_SetExtLst] = function(oClass, value) { - oClass.extLst = value; - }; drawingsChangesMap[AscDFH.historyitem_PlotArea_SetDTable] = function(oClass, value) { oClass.dTable = value; }; @@ -738,9 +735,6 @@ drawingsChangesMap[AscDFH.historyitem_Legend_SetSpPr] = function(oClass, value) { oClass.spPr = value; }; - drawingsChangesMap[AscDFH.historyitem_Legend_SetExtLst] = function(oClass, value) { - oClass.extLst = value; - }; drawingsChangesMap[AscDFH.historyitem_Legend_SetAlign] = function(oClass, value) { oClass.align = value; }; @@ -1204,9 +1198,6 @@ oClass.view3D = value; oClass.Refresh_RecalcData(); }; - drawingsChangesMap[AscDFH.historyitem_Chart_SetExtLst] = function(oClass, value) { - oClass.extLst = value; - }; drawingsChangesMap[AscDFH.historyitem_ChartWall_SetPictureOptions] = function(oClass, value) { oClass.pictureOptions = value; }; @@ -1572,7 +1563,6 @@ AscDFH.changesFactory[AscDFH.historyitem_Chart_SetAutoTitleDeleted] = window['AscDFH'].CChangesDrawingsBool; AscDFH.changesFactory[AscDFH.historyitem_Chart_SetPlotVisOnly] = window['AscDFH'].CChangesDrawingsBool; AscDFH.changesFactory[AscDFH.historyitem_Chart_SetShowDLblsOverMax] = window['AscDFH'].CChangesDrawingsBool; - AscDFH.changesFactory[AscDFH.historyitem_Chart_SetExtLst] = window['AscDFH'].CChangesDrawingsObjectNoId; AscDFH.changesFactory[AscDFH.historyitem_View3d_SetRAngAx] = window['AscDFH'].CChangesDrawingsBool; AscDFH.changesFactory[AscDFH.historyitem_ExternalData_SetAutoUpdate] = window['AscDFH'].CChangesDrawingsBool; @@ -1730,7 +1720,6 @@ AscDFH.changesFactory[AscDFH.historyitem_DLbl_SetTxPr] = window['AscDFH'].CChangesDrawingsObject; AscDFH.changesFactory[AscDFH.historyitem_DLbl_SetParent] = window['AscDFH'].CChangesDrawingsObject; AscDFH.changesFactory[AscDFH.historyitem_PlotArea_SetPlotAreaRegion] = window['AscDFH'].CChangesDrawingsObjectNoId; - AscDFH.changesFactory[AscDFH.historyitem_PlotArea_SetExtLst] = window['AscDFH'].CChangesDrawingsObjectNoId; AscDFH.changesFactory[AscDFH.historyitem_PlotArea_SetDTable] = window['AscDFH'].CChangesDrawingsObject; AscDFH.changesFactory[AscDFH.historyitem_PlotArea_SetLayout] = window['AscDFH'].CChangesDrawingsObject; AscDFH.changesFactory[AscDFH.historyitem_PlotArea_SetSpPr] = window['AscDFH'].CChangesDrawingsObject; @@ -1823,7 +1812,6 @@ AscDFH.changesFactory[AscDFH.historyitem_ErrBars_SetSpPr] = window['AscDFH'].CChangesDrawingsObject; AscDFH.changesFactory[AscDFH.historyitem_Legend_SetLayout] = window['AscDFH'].CChangesDrawingsObject; AscDFH.changesFactory[AscDFH.historyitem_Legend_SetSpPr] = window['AscDFH'].CChangesDrawingsObject; - AscDFH.changesFactory[AscDFH.historyitem_Legend_SetExtLst] = window['AscDFH'].CChangesDrawingsObjectNoId; AscDFH.changesFactory[AscDFH.historyitem_Legend_SetAlign] = window['AscDFH'].CChangesDrawingsObjectNoId; AscDFH.changesFactory[AscDFH.historyitem_Legend_SetTxPr] = window['AscDFH'].CChangesDrawingsObject; AscDFH.changesFactory[AscDFH.historyitem_LegendEntry_SetTxPr] = window['AscDFH'].CChangesDrawingsObject; @@ -4757,7 +4745,6 @@ function CPlotArea() { CBaseChartObject.call(this); this.plotAreaRegion = null; - this.extLst = null; this.charts = []; this.dTable = null; this.layout = null; @@ -4792,10 +4779,6 @@ { break; } - case AscDFH.historyitem_PlotArea_SetExtLst: - { - break; - } case AscDFH.historyitem_CommonChartFormat_SetParent: { break; @@ -5103,10 +5086,6 @@ History.CanAddChanges() && History.Add(new CChangesDrawingsObjectNoId(this, AscDFH.historyitem_PlotArea_SetPlotAreaRegion, this.plotAreaRegion, pr)); this.plotAreaRegion = pr; }; - CPlotArea.prototype.setExtLst = function(pr) { - History.CanAddChanges() && History.Add(new CChangesDrawingsObjectNoId(this, AscDFH.historyitem_PlotArea_SetExtLst, this.extLst, pr)); - this.extLst = pr; - }; CPlotArea.prototype.setDTable = function(pr) { History.CanAddChanges() && History.Add(new CChangesDrawingsObject(this, AscDFH.historyitem_PlotArea_SetDTable, this.dTable, pr)); this.dTable = pr; @@ -10112,7 +10091,6 @@ this.overlay = false; this.spPr = null; this.txPr = null; - this.extLst = null; this.align = null; this.rot = 0; @@ -10392,10 +10370,6 @@ this.spPr = spPr; this.setParentToChild(spPr); }; - CLegend.prototype.setExtLst = function(pr) { - History.CanAddChanges() && History.Add(new CChangesDrawingsObjectNoId(this, AscDFH.historyitem_Legend_SetExtLst, this.extLst, pr)); - this.extLst = pr; - }; CLegend.prototype.setAlign = function(pr) { History.CanAddChanges() && History.Add(new CChangesDrawingsObjectNoId(this, AscDFH.historyitem_Legend_SetAlign, this.align, pr)); this.align = pr; @@ -14744,7 +14718,6 @@ this.sideWall = null; this.title = null; this.view3D = null; - this.extLst = null; } InitClass(CChart, CBaseChartObject, AscDFH.historyitem_type_Chart); @@ -15081,10 +15054,6 @@ this.title.applyChartStyle(oChartStyle, oColors, oAdditionalData, bReset); } }; - CChart.prototype.setExtLst = function(pr) { - History.CanAddChanges() && History.Add(new CChangesDrawingsObjectNoId(this, AscDFH.historyitem_Chart_SetExtLst, this.extLst, pr)); - this.extLst = pr; - }; function CChartWall() { CBaseChartObject.call(this); diff --git a/common/Drawings/Format/ChartSpace.js b/common/Drawings/Format/ChartSpace.js index 4a3b0ccc16..4f7f9c9164 100644 --- a/common/Drawings/Format/ChartSpace.js +++ b/common/Drawings/Format/ChartSpace.js @@ -374,7 +374,6 @@ function(window, undefined) { AscDFH.changesFactory[AscDFH.historyitem_ChartSpace_SetThemeOverride] = CChangesDrawingsObject; AscDFH.changesFactory[AscDFH.historyitem_ShapeSetBDeleted] = CChangesDrawingsBool; AscDFH.changesFactory[AscDFH.historyitem_ChartSpace_SetChartData] = CChangesDrawingsObjectNoId; - AscDFH.changesFactory[AscDFH.historyitem_ChartSpace_SetExtLst] = CChangesDrawingsObjectNoId; AscDFH.changesFactory[AscDFH.historyitem_ChartSpace_SetParent] = CChangesDrawingsObject; AscDFH.changesFactory[AscDFH.historyitem_ChartSpace_SetChart] = CChangesDrawingsObject; AscDFH.changesFactory[AscDFH.historyitem_ChartSpace_SetClrMapOvr] = CChangesDrawingsObject; @@ -539,9 +538,6 @@ function(window, undefined) { }; drawingsChangesMap[AscDFH.historyitem_ChartSpace_SetChartData] = function(oClass, value) { oClass.chartData = value; - }; - drawingsChangesMap[AscDFH.historyitem_ChartSpace_SetExtLst] = function(oClass, value) { - oClass.extLst = value; }; drawingsChangesMap[AscDFH.historyitem_ChartSpace_SetParent] = function (oClass, value) { oClass.oldParent = oClass.parent; @@ -1332,7 +1328,6 @@ function(window, undefined) { this.chartStyle = null; this.chartColors = null; this.chartData = null; - this.extLst = null; this.dataRefs = null; this.pathMemory = new CPathMemory(); @@ -1376,10 +1371,6 @@ function(window, undefined) { CChartSpace.prototype.setChartData = function(pr) { History.CanAddChanges() && History.Add(new CChangesDrawingsObjectNoId(this, AscDFH.historyitem_ChartSpace_SetChartData, this.chartData, pr)); this.chartData = pr; - }; - CChartSpace.prototype.setExtLst = function(pr) { - History.CanAddChanges() && History.Add(new CChangesDrawingsObjectNoId(this, AscDFH.historyitem_ChartSpace_SetExtLst, this.extLst, pr)); - this.extLst = pr; }; CChartSpace.prototype.clearDataRefs = function () { if (this.dataRefs) { diff --git a/common/Shapes/Serialize.js b/common/Shapes/Serialize.js index a34ef84f4e..99e43db454 100644 --- a/common/Shapes/Serialize.js +++ b/common/Shapes/Serialize.js @@ -7102,6 +7102,33 @@ function BinaryPPTYLoader() } break; } + case 7: // chartEx + { + var _length = s.GetLong(); + var _pos = s.cur; + + if(typeof AscFormat.CChartSpace !== "undefined" && _length) + { + var _stream = new AscCommon.FT_Stream2(); + _stream.data = s.data; + _stream.pos = s.pos; + _stream.cur = s.cur; + _stream.size = s.size; + _chart = new AscFormat.CChartSpace(); + _chart.setBDeleted(false); + AscCommon.pptx_content_loader.ImageMapChecker = this.ImageMapChecker; + AscCommon.pptx_content_loader.Reader.ImageMapChecker = this.ImageMapChecker; + var oBinaryChartReader = new AscCommon.BinaryChartReader(_stream); + oBinaryChartReader.ExternalReadCT_ChartSpace(_length, _chart, this.presentation); + if(!_chart.hasCharts()) + { + _chart = null; + } + } + + s.Seek2(_pos + _length); + break; + } case 8://smartArt { _smartArt = this.ReadSmartArt(); diff --git a/common/tempSerializeChart.js b/common/tempSerializeChart.js index e13cff301e..550f9e8aba 100644 --- a/common/tempSerializeChart.js +++ b/common/tempSerializeChart.js @@ -194,59 +194,98 @@ BinaryChartReader.prototype.ReadCT_Axis = function (type, length, val) { } else if (c_oserct_axisVALSCALING === type) { - val.setValScaling(this.stream.GetString2LE(length)); + var oNewVal = new AscFormat.CValueAxisScaling(); + res = this.bcr.Read1(length, function (t, l) { + return oThis.ReadCT_ValueAxisScaling(t, l, oNewVal); + }); + val.setValScaling(oNewVal); } else if (c_oserct_axisTITLE === type) { - val.setTitle(this.stream.GetString2LE(length)); + var oNewVal = new AscFormat.CTitle(); + res = this.bcr.Read1(length, function (t, l) { + return oThis.ReadCT_Title(t, l, oNewVal); + }); + val.setTitle(oNewVal); } else if (c_oserct_axisUNITS === type) { - val.setUnits(this.stream.GetString2LE(length)); + var oNewVal = new AscFormat.CAxisUnits(); + res = this.bcr.Read1(length, function (t, l) { + return oThis.ReadCT_AxisUnits(t, l, oNewVal); + }); + val.setUnits(oNewVal); } else if (c_oserct_axisMAJORGRIDLINES === type) { - val.setMajorGridlines(this.stream.GetString2LE(length)); + var oNewVal = new AscFormat.CGridlines(); + res = this.bcr.Read1(length, function (t, l) { + return oThis.ReadCT_Gridlines(t, l, oNewVal); + }); + val.setMajorGridlines(oNewVal); } else if (c_oserct_axisMINORGRIDLINES === type) { - val.setMinorGridlines(this.stream.GetString2LE(length)); + var oNewVal = new AscFormat.CGridlines(); + res = this.bcr.Read1(length, function (t, l) { + return oThis.ReadCT_Gridlines(t, l, oNewVal); + }); + val.setMinorGridlines(oNewVal); } else if (c_oserct_axisMAJORTICKMARKS === type) { - val.setMajorTickMarks(this.stream.GetString2LE(length)); + var oNewVal = new AscFormat.CTickMarks(); + res = this.bcr.Read1(length, function (t, l) { + return oThis.ReadCT_TickMarks(t, l, oNewVal); + }); + val.setMajorTickMarks(oNewVal); } else if (c_oserct_axisMINORTICKMARKS === type) { - val.setMinorTickMarks(this.stream.GetString2LE(length)); + var oNewVal = new AscFormat.CTickMarks(); + res = this.bcr.Read1(length, function (t, l) { + return oThis.ReadCT_TickMarks(t, l, oNewVal); + }); + val.setMinorTickMarks(oNewVal); } else if (c_oserct_axisTICKLABELS === type) { - val.setTickLabels(this.stream.GetBool(length)); + val.setTickLabels(this.stream.GetBool()); } else if (c_oserct_axisNUMFMT === type) { - val.setNumFmt(this.stream.GetString2LE(length)); + var oNewVal = new AscFormat.CNumFmt(); + res = this.bcr.Read1(length, function (t, l) { + return oThis.ReadCT_NumFmt(t, l, oNewVal); + }); + val.setNumFmt(oNewVal); } else if (c_oserct_axisSPPR === type) { - val.setSpPr(this.stream.GetString2LE(length)); + val.setSpPr(this.ReadSpPr(length)); + val.spPr.setParent(val); } else if (c_oserct_axisTXPR === type) { - val.setTxPr(this.stream.GetString2LE(length)); + val.setTxPr(this.ReadTxPr(length)); + val.txPr.setParent(val); } else if (c_oserct_axisEXTLST === type) { - val.setExtLst(this.stream.GetString2LE(length)); + var oNewVal; + oNewVal = {}; + res = this.bcr.Read1(length, function (t, l) { + return oThis.ReadCT_extLst(t, l, oNewVal); + }); + // val.setExtLst(oNewVal); } else if (c_oserct_axisID === type) { - val.setId(this.stream.GetString2LE(length)); + val.setId(this.stream.GetULongLE()); } else if (c_oserct_axisHIDDEN === type) { - val.setHidden(this.stream.GetBool(length)); + val.setHidden(this.stream.GetBool()); } else { @@ -254,67 +293,56 @@ BinaryChartReader.prototype.ReadCT_Axis = function (type, length, val) { } return res; }; -// template -var c_oserct_testLongAttr = 0; -var c_oserct_testStringAttr = 1; -var c_oserct_testVARIATION = 2; -var c_oserct_testCOLOR = 3; -var c_oserct_testEFFECT = 4; -BinaryChartWriter.prototype.WriteCT_Test = function (oVal) { +// CAxisUnits +var c_oserct_axisunitsUNITSLABEL = 0; +var c_oserct_axisunitsEXTLST = 1; +var c_oserct_axisunitsUNIT = 2; + +BinaryChartWriter.prototype.WriteCT_AxisUnits = function (oVal) { var oThis = this; - if(oVal.id !== null) { - this.bs.WriteItem(c_oserct_testLongAttr, function() { - oThis.memory.WriteLong(oVal.id); + if(oVal.unitsLabel !== null) { + this.bs.WriteItem(c_oserct_axisunitsUNITSLABEL, function() { + oThis.WriteCT_AxisUnitsLabel(oVal.unitsLabel); }); } - if(oVal.meth !== null) { - this.bs.WriteItem(c_oserct_testStringAttr, function() { - oThis.memory.WriteString3(oVal.meth); + if(oVal.extLst !== null) { + this.bs.WriteItem(c_oserct_axisunitsEXTLST, function() { + oThis.WriteCT_extLst(oVal.extLst); }); } - var aItems = oVal.items, nItem, oItem; - for(nItem = 0; nItem < aItems.length; ++nItem) { - oItem = aItems[nItem]; - if(oItem instanceof AscFormat.CUniColor) { - this.bs.WriteItem(c_oserct_testCOLOR, function() { - AscCommon.pptx_content_writer.WriteUniColor(oThis.memory, oItem) - }); - } - else { - this.bs.WriteItem(c_oserct_testVARIATION, function() { - oThis.WriteCT_TestVariation(oItem); - }); - } + if(oVal.unit !== null) { + this.bs.WriteItem(c_oserct_axisunitsUNIT, function() { + oThis.WriteCT_AxisUnit(oVal.unit); + }); } }; -BinaryChartReader.prototype.ReadCT_Test = function (type, length, val) { +BinaryChartReader.prototype.ReadCT_AxisUnits = function (type, length, val) { var res = c_oSerConstants.ReadOk; var oThis = this; var oNewVal; - if (c_oserct_testLongAttr === type) - { - val.setId(this.stream.GetULongLE()); - } - else if (c_oserct_testStringAttr === type) + if (c_oserct_axisunitsUNITSLABEL === type) { - val.setMeth(this.stream.GetString2LE(length)); - } - else if(c_oserct_testVARIATION === type) + var oNewVal = new AscFormat.CAxisUnitsLabel(); + res = this.bcr.Read1(length, function (t, l) { + return oThis.ReadCT_AxisUnitsLabel(t, l, oNewVal); + }); + val.setUnitsLabel(oNewVal); + } else if (c_oserct_axisunitsEXTLST === type) { - oNewVal = new AscFormat.CColorModifiers(); + var oNewVal; + oNewVal = {}; res = this.bcr.Read1(length, function (t, l) { - return oThis.ReadCT_TestVariation(t, l, oNewVal); + return oThis.ReadCT_extLst(t, l, oNewVal); }); - val.addItem(oNewVal); - } - else if(c_oserct_testCOLOR === type) + // val.setExtLst(oNewVal); + } else if (c_oserct_axisunitsUNIT === type) { - oNewVal = AscCommon.pptx_content_loader.ReadUniColor(this, this.stream); - if(oNewVal) - { - val.addItem(oNewVal); - } + var oNewVal = new AscFormat.CAxisUnit(); + res = this.bcr.Read2(length, function (t, l) { + return oThis.ReadCT_AxisUnit(t, l, oNewVal); + }); + val.setUnit(oNewVal); } else { @@ -323,31 +351,45 @@ BinaryChartReader.prototype.ReadCT_Test = function (type, length, val) { return res; }; +// template +var c_oserct_testATTR1 = 0; +var c_oserct_testATTR2 = 1; -BinaryChartWriter.prototype.WriteCT_TestVariation = function (oVal) { +BinaryChartWriter.prototype.WriteCT_Test = function (oVal) { var oThis = this; - var aMods = oVal.Mods, nMod, oMod; - for(nMod = 0; nMod < aMods.length; ++nMod) { - oMod = aMods[nMod]; - this.bs.WriteItem(c_oserct_testEFFECT, function() { - AscCommon.pptx_content_writer.WriteMod(oThis.memory, oMod) + if(oVal.attr1 !== null) { + this.bs.WriteItem(c_oserct_testATTR1, function() { + oThis.WriteCT_ATTR1(oVal.attr1); + }); + } + if(oVal.attr2 !== null) { + this.bs.WriteItem(c_oserct_testATTR1, function() { + oThis.WriteCT_Attr2(oVal.attr2); }); } }; -BinaryChartReader.prototype.ReadCT_TestVariation = function (type, length, val) -{ +BinaryChartReader.prototype.ReadCT_Test = function (type, length, val) { var res = c_oSerConstants.ReadOk; - if (c_oserct_testEFFECT === type) + var oThis = this; + var oNewVal; + if (c_oserct_testATTR1 === type) + { + var oNewVal = new AscFormat.CAttr1(); + res = this.bcr.Read1(length, function (t, l) { + return oThis.ReadCT_Attr1(t, l, oNewVal); + }); + val.setAttr1(oNewVal); + } else if (c_oserct_testATTR2 === type) { - var oMod = AscCommon.pptx_content_loader.ReadColorMod(this, this.stream); - if(oMod) - { - val.addMod(oMod); - } + var oNewVal = new AscFormat.CAttr2(); + res = this.bcr.Read2(length, function (t, l) { + return oThis.ReadCT_Attr2(t, l, oNewVal); + }); + val.setAttr2(oNewVal); } else { res = c_oSerConstants.ReadUnknown; } return res; -}; \ No newline at end of file +}; From 63eb6fafd924573f441740eacd8cb7efae84e91a Mon Sep 17 00:00:00 2001 From: Dmitriy Aleksandrov Date: Wed, 16 Aug 2023 15:55:37 +0600 Subject: [PATCH 15/30] For bug #62819 Add read/write chartExSpace. Fix serialize chartEx. --- common/SerializeChart.js | 116 +++++++++++++++++++++++++++++++++++++ common/Shapes/Serialize.js | 2 +- 2 files changed, 117 insertions(+), 1 deletion(-) diff --git a/common/SerializeChart.js b/common/SerializeChart.js index 58fa1a1edd..c3a7f870d4 100644 --- a/common/SerializeChart.js +++ b/common/SerializeChart.js @@ -1403,6 +1403,44 @@ BinaryChartWriter.prototype.WriteCT_ChartSpace = function (oVal) { }); } }; +BinaryChartWriter.prototype.WriteCT_ChartExSpace = function (oVal) { + var oThis = this; + if(oVal.chartData !== null) { + this.bs.WriteItem(c_oserct_chartExSpaceCHARTDATA, function() { + oThis.WriteCT_ChartData(oVal.chartData); // todoo this class + }); + } + if (oVal.chart !== null) { + this.bs.WriteItem(c_oserct_chartExSpaceCHART, function () { + oThis.WriteCT_ChartEx(oVal.chart); + }); + } + if (oVal.spPr !== null) { + this.bs.WriteItem(c_oserct_chartExSpaceSPPR, function () { + oThis.WriteSpPr(oVal.spPr); + }); + } + if (oVal.txPr !== null) { + this.bs.WriteItem(c_oserct_chartExSpaceTXPR, function () { + oThis.WriteTxPr(oVal.txPr); + }); + } + if (oVal.clrMapOvr !== null) { + this.bs.WriteItem(c_oserct_chartExSpaceCLRMAPOVR, function () { + oThis.WriteClrMapOverride(oCurVal); + }); + } + if(oVal.chartStyle !== null) { + this.bs.WriteItem(c_oserct_chartExSpaceSTYLES, function() { + oThis.WriteCT_ChartStyle(oVal.chartStyle); + }); + } + if(oVal.chartColors !== null) { + this.bs.WriteItem(c_oserct_chartExSpaceCOLORS, function() { + oThis.WriteCT_ChartColors(oVal.chartColors); + }); + } +}; BinaryChartWriter.prototype.WriteCT_FromTo = function(oVal){ this.memory.WriteByte(Asc.c_oSer_DrawingPosType.X); this.memory.WriteByte(AscCommon.c_oSerPropLenType.Double); @@ -6082,6 +6120,31 @@ BinaryChartReader.prototype.ExternalReadCT_ChartSpace = function (length, val, c }*/ return res; }; +BinaryChartReader.prototype.ExternalReadCT_ChartExSpace = function (length, val, curWorksheet) { + var res = c_oSerConstants.ReadOk; + this.curWorksheet = curWorksheet; + this.drawingDocument = null; + if(this.curWorksheet) { + if(this.curWorksheet.getDrawingDocument) { + this.drawingDocument = this.curWorksheet.getDrawingDocument(); + } + else { + if(this.curWorksheet.DrawingDocument) { + this.drawingDocument = this.curWorksheet.DrawingDocument; + } + } + } + + var oThis = this; + this.curChart = val; + res = this.bcr.Read1(length, function (t, l) { + return oThis.ReadCT_ChartExSpace(t, l, val); + }); + if(val){ + val.correctAxes(); + } + return res; +}; BinaryChartReader.prototype.ReadCT_ChartSpace = function (type, length, val, curWorksheet) { var res = c_oSerConstants.ReadOk; var oThis = this; @@ -6238,6 +6301,59 @@ BinaryChartReader.prototype.ReadCT_ChartSpace = function (type, length, val, cur } return res; }; +BinaryChartReader.prototype.ReadCT_ChartExSpace = function (type, length, val) { + var res = c_oSerConstants.ReadOk; + var oThis = this; + var oNewVal; + if(c_oserct_chartExSpaceCHARTDATA === type) + { + oNewVal = {}; + res = this.bcr.Read1(length, function (t, l) { + return oThis.ReadCT_ChartData(t, l, oNewVal); // todoo this class + }); + } else if (c_oserct_chartExSpaceCHART === type) { + oNewVal = new AscFormat.CChartEx(); + res = this.bcr.Read1(length, function (t, l) { + return oThis.ReadCT_ChartEx(t, l, oNewVal); + }); + val.setChart(oNewVal); + } else if (c_oserct_chartExSpaceSPPR === type) { + val.setSpPr(this.ReadSpPr(length)); + val.spPr.setParent(val); + } + else if (c_oserct_chartExSpaceTXPR === type) { + val.setTxPr(this.ReadTxPr(length)); + val.txPr.setParent(val); + } else if (c_oserct_chartExspaceCLRMAPOVR === type) { + val.setClrMapOvr(this.ReadClrOverride(length)); + } else if(c_oserct_chartExSpaceXLSX === type) { + //todo + res = c_oSerConstants.ReadUnknown; + } else if(c_oserct_chartExSpaceCOLORS === type) { + this.curChart.oChartColorsData = AscCommon.fSaveStream(this.bcr.stream, length); + oNewVal = new AscFormat.CChartColors(); + res = this.bcr.Read1(length, function (t, l) { + return oThis.ReadCT_ChartColors(t, l, oNewVal); + }); + if(oNewVal) { + val.setChartColors(oNewVal); + } + } else if(c_oserct_chartExSpaceSTYLES === type) { + this.curChart.oChartStyleData = AscCommon.fSaveStream(this.bcr.stream, length); + oNewVal = new AscFormat.CChartStyle(); + res = this.bcr.Read1(length, function (t, l) { + return oThis.ReadCT_ChartStyle(t, l, oNewVal); + }); + if(oNewVal) { + val.setChartStyle(oNewVal); + } + } + else + { + res = c_oSerConstants.ReadUnknown; + } + return res; +}; BinaryChartReader.prototype.ReadSpPr = function (length) { return AscCommon.pptx_content_loader.ReadShapeProperty(this.stream); }; diff --git a/common/Shapes/Serialize.js b/common/Shapes/Serialize.js index 99e43db454..370b6b7f0b 100644 --- a/common/Shapes/Serialize.js +++ b/common/Shapes/Serialize.js @@ -7119,7 +7119,7 @@ function BinaryPPTYLoader() AscCommon.pptx_content_loader.ImageMapChecker = this.ImageMapChecker; AscCommon.pptx_content_loader.Reader.ImageMapChecker = this.ImageMapChecker; var oBinaryChartReader = new AscCommon.BinaryChartReader(_stream); - oBinaryChartReader.ExternalReadCT_ChartSpace(_length, _chart, this.presentation); + oBinaryChartReader.ExternalReadCT_ChartExSpace(_length, _chart, this.presentation); if(!_chart.hasCharts()) { _chart = null; From 25904975c7feade7fa6d5d4c14a44c027a269860 Mon Sep 17 00:00:00 2001 From: Dmitriy Aleksandrov Date: Wed, 16 Aug 2023 22:30:07 +0600 Subject: [PATCH 16/30] For bug #62819 Edit constant types. Add structures. --- common/Drawings/Format/ChartEx.js | 68 ++-- common/tempSerializeChart.js | 523 +++++++++++++++++++----------- 2 files changed, 372 insertions(+), 219 deletions(-) diff --git a/common/Drawings/Format/ChartEx.js b/common/Drawings/Format/ChartEx.js index 1fa0f410e7..386c06d9dc 100644 --- a/common/Drawings/Format/ChartEx.js +++ b/common/Drawings/Format/ChartEx.js @@ -2504,41 +2504,41 @@ }; - // // PlotArea (contains in chartFormat.js) - // drawingsChangesMap[AscDFH.historyitem_PlotArea_SetPlotAreaRegion] = function(oClass, value) { - // oClass.plotAreaRegion = value; - // }; - // drawingsChangesMap[AscDFH.historyitem_PlotArea_SetAxis] = function(oClass, value) { - // oClass.axis = value; - // }; - // drawingsChangesMap[AscDFH.historyitem_PlotArea_SetSpPr] = function(oClass, value) { - // oClass.spPr = value; - // }; - // AscDFH.changesFactory[AscDFH.historyitem_PlotArea_SetPlotAreaRegion] = window['AscDFH'].CChangesDrawingsObjectNoId; - // AscDFH.changesFactory[AscDFH.historyitem_PlotArea_SetAxis] = window['AscDFH'].CChangesDrawingsObjectNoId; - // AscDFH.changesFactory[AscDFH.historyitem_PlotArea_SetSpPr] = window['AscDFH'].CChangesDrawingsObjectNoId; - // function CPlotArea() { - // CBaseChartObject.call(this); - // this.plotAreaRegion = null; - // this.axis = []; - // this.spPr = null; - // } + // PlotArea (contains in chartFormat.js but different fields) + drawingsChangesMap[AscDFH.historyitem_PlotArea_SetPlotAreaRegion] = function(oClass, value) { + oClass.plotAreaRegion = value; + }; + drawingsChangesMap[AscDFH.historyitem_PlotArea_SetAxis] = function(oClass, value) { + oClass.axis = value; + }; + drawingsChangesMap[AscDFH.historyitem_PlotArea_SetSpPr] = function(oClass, value) { + oClass.spPr = value; + }; + AscDFH.changesFactory[AscDFH.historyitem_PlotArea_SetPlotAreaRegion] = window['AscDFH'].CChangesDrawingsObjectNoId; + AscDFH.changesFactory[AscDFH.historyitem_PlotArea_SetAxis] = window['AscDFH'].CChangesDrawingsObjectNoId; + AscDFH.changesFactory[AscDFH.historyitem_PlotArea_SetSpPr] = window['AscDFH'].CChangesDrawingsObjectNoId; + function CChartExPlotArea() { + CBaseChartObject.call(this); + this.plotAreaRegion = null; + this.axis = []; + this.spPr = null; + } - // InitClass(CPlotArea, CBaseChartObject, AscDFH.historyitem_type_PlotArea); + InitClass(CChartExPlotArea, CBaseChartObject, AscDFH.historyitem_type_PlotArea); - // CPlotArea.prototype.setPlotAreaRegion = function(pr) { - // History.CanAddChanges() && History.Add(new CChangesDrawingsObjectNoId(this, AscDFH.historyitem_PlotArea_SetPlotAreaRegion, this.plotAreaRegion, pr)); - // this.plotAreaRegion = pr; - // }; - // CPlotArea.prototype.setAxis = function(pr) { - // History.CanAddChanges() && History.Add(new CChangesDrawingsObjectNoId(this, AscDFH.historyitem_PlotArea_SetAxis, this.axis, pr)); - // this.axis = pr; - // }; - // CPlotArea.prototype.setSpPr = function(pr) { - // History.CanAddChanges() && History.Add(new CChangesDrawingsObjectNoId(this, AscDFH.historyitem_PlotArea_SetSpPr, this.spPr, pr)); - // this.spPr = pr; - // }; - // + CChartExPlotArea.prototype.setPlotAreaRegion = function(pr) { + History.CanAddChanges() && History.Add(new CChangesDrawingsObjectNoId(this, AscDFH.historyitem_PlotArea_SetPlotAreaRegion, this.plotAreaRegion, pr)); + this.plotAreaRegion = pr; + }; + CChartExPlotArea.prototype.setAxis = function(pr) { + History.CanAddChanges() && History.Add(new CChangesDrawingsObjectNoId(this, AscDFH.historyitem_PlotArea_SetAxis, this.axis, pr)); + this.axis = pr; + }; + CChartExPlotArea.prototype.setSpPr = function(pr) { + History.CanAddChanges() && History.Add(new CChangesDrawingsObjectNoId(this, AscDFH.historyitem_PlotArea_SetSpPr, this.spPr, pr)); + this.spPr = pr; + }; + // PlotAreaRegion drawingsChangesMap[AscDFH.historyitem_PlotAreaRegion_SetPlotSurface] = function(oClass, value) { @@ -3867,7 +3867,7 @@ // window['AscFormat'].CPageSetup = CPageSetup; window['AscFormat'].CParentLabelLayout = CParentLabelLayout; window['AscFormat'].CPercentageColorPosition = CPercentageColorPosition; - // window['AscFormat'].CPlotArea = CPlotArea; + window['AscFormat'].CChartExPlotArea = CChartExPlotArea; window['AscFormat'].CPlotAreaRegion = CPlotAreaRegion; window['AscFormat'].CPlotSurface = CPlotSurface; // window['AscFormat'].CPrintSettings = CPrintSettings; diff --git a/common/tempSerializeChart.js b/common/tempSerializeChart.js index 550f9e8aba..fb71723870 100644 --- a/common/tempSerializeChart.js +++ b/common/tempSerializeChart.js @@ -1,121 +1,131 @@ -// CAddress -var c_oserct_addressADDRESS1 = 0; -var c_oserct_addressCOUTNRYREGION = 1; -var c_oserct_addressADMINDISTRICT1 = 2; -var c_oserct_addressADMINDISTRICT2 = 3; -var c_oserct_addressPOSTALCODE = 4; -var c_oserct_addressLOCALITY = 5; -var c_oserct_addressISOCOUTRYCODE = 6; +// // CAddress (unused) +// var c_oserct_addressADDRESS1 = 0; +// var c_oserct_addressCOUTNRYREGION = 1; +// var c_oserct_addressADMINDISTRICT1 = 2; +// var c_oserct_addressADMINDISTRICT2 = 3; +// var c_oserct_addressPOSTALCODE = 4; +// var c_oserct_addressLOCALITY = 5; +// var c_oserct_addressISOCOUTRYCODE = 6; -BinaryChartWriter.prototype.WriteCT_Address = function (oVal) { - var oThis = this; - if(oVal.address1 !== null) { - this.bs.WriteItem(c_oserct_addressADDRESS1, function() { - oThis.memory.WriteString3(oVal.address1); - }); - } - if(oVal.countryRegion !== null) { - this.bs.WriteItem(c_oserct_addressCOUTNRYREGION, function() { - oThis.memory.WriteString3(oVal.countryRegion); - }); - } - if(oVal.adminDistrict1 !== null) { - this.bs.WriteItem(c_oserct_addressADMINDISTRICT1, function() { - oThis.memory.WriteString3(oVal.adminDistrict1); - }); - } - if(oVal.adminDistrict2 !== null) { - this.bs.WriteItem(c_oserct_addressADMINDISTRICT2, function() { - oThis.memory.WriteString3(oVal.adminDistrict2); - }); - } - if(oVal.postalCode !== null) { - this.bs.WriteItem(c_oserct_addressPOSTALCODE, function() { - oThis.memory.WriteString3(oVal.postalCode); - }); - } - if(oVal.locality !== null) { - this.bs.WriteItem(c_oserct_addressLOCALITY, function() { - oThis.memory.WriteString3(oVal.locality); - }); - } - if(oVal.isoCountryCode !== null) { - this.bs.WriteItem(c_oserct_addressISOCOUTRYCODE, function() { - oThis.memory.WriteString3(oVal.isoCountryCode); - }); - } -}; -BinaryChartReader.prototype.ReadCT_Address = function (type, length, val) { - var res = c_oSerConstants.ReadOk; - var oThis = this; - var oNewVal; - if (c_oserct_addressADDRESS1 === type) - { - val.setAddress1(this.stream.GetString2LE(length)); - } - else if (c_oserct_addressCOUTNRYREGION === type) - { - val.setCountryRegion(this.stream.GetString2LE(length)); - } - else if (c_oserct_addressADMINDISTRICT1 === type) - { - val.setAdminDistrict1(this.stream.GetString2LE(length)); - } - else if (c_oserct_addressADMINDISTRICT2 === type) - { - val.setAdminDistrict2(this.stream.GetString2LE(length)); - } - else if (c_oserct_addressPOSTALCODE === type) - { - val.setPostalCode(this.stream.GetString2LE(length)); - } - else if (c_oserct_addressLOCALITY === type) - { - val.setLocality(this.stream.GetString2LE(length)); - } - else if (c_oserct_addressISOCOUTRYCODE === type) - { - val.setISOCountryCode(this.stream.GetString2LE(length)); - } - else - { - res = c_oSerConstants.ReadUnknown; - } - return res; -}; +// BinaryChartWriter.prototype.WriteCT_Address = function (oVal) { +// var oThis = this; +// if(oVal.address1 !== null) { +// this.bs.WriteItem(c_oserct_addressADDRESS1, function() { +// oThis.memory.WriteString3(oVal.address1); +// }); +// } +// if(oVal.countryRegion !== null) { +// this.bs.WriteItem(c_oserct_addressCOUTNRYREGION, function() { +// oThis.memory.WriteString3(oVal.countryRegion); +// }); +// } +// if(oVal.adminDistrict1 !== null) { +// this.bs.WriteItem(c_oserct_addressADMINDISTRICT1, function() { +// oThis.memory.WriteString3(oVal.adminDistrict1); +// }); +// } +// if(oVal.adminDistrict2 !== null) { +// this.bs.WriteItem(c_oserct_addressADMINDISTRICT2, function() { +// oThis.memory.WriteString3(oVal.adminDistrict2); +// }); +// } +// if(oVal.postalCode !== null) { +// this.bs.WriteItem(c_oserct_addressPOSTALCODE, function() { +// oThis.memory.WriteString3(oVal.postalCode); +// }); +// } +// if(oVal.locality !== null) { +// this.bs.WriteItem(c_oserct_addressLOCALITY, function() { +// oThis.memory.WriteString3(oVal.locality); +// }); +// } +// if(oVal.isoCountryCode !== null) { +// this.bs.WriteItem(c_oserct_addressISOCOUTRYCODE, function() { +// oThis.memory.WriteString3(oVal.isoCountryCode); +// }); +// } +// }; +// BinaryChartReader.prototype.ReadCT_Address = function (type, length, val) { +// var res = c_oSerConstants.ReadOk; +// var oThis = this; +// var oNewVal; +// if (c_oserct_addressADDRESS1 === type) +// { +// val.setAddress1(this.stream.GetString2LE(length)); +// } +// else if (c_oserct_addressCOUTNRYREGION === type) +// { +// val.setCountryRegion(this.stream.GetString2LE(length)); +// } +// else if (c_oserct_addressADMINDISTRICT1 === type) +// { +// val.setAdminDistrict1(this.stream.GetString2LE(length)); +// } +// else if (c_oserct_addressADMINDISTRICT2 === type) +// { +// val.setAdminDistrict2(this.stream.GetString2LE(length)); +// } +// else if (c_oserct_addressPOSTALCODE === type) +// { +// val.setPostalCode(this.stream.GetString2LE(length)); +// } +// else if (c_oserct_addressLOCALITY === type) +// { +// val.setLocality(this.stream.GetString2LE(length)); +// } +// else if (c_oserct_addressISOCOUTRYCODE === type) +// { +// val.setISOCountryCode(this.stream.GetString2LE(length)); +// } +// else +// { +// res = c_oSerConstants.ReadUnknown; +// } +// return res; +// }; // CAxis -var c_oserct_axisCATSCALING = 0; -var c_oserct_axisVALSCALING = 1; -var c_oserct_axisTITLE = 2; +var c_oserct_axisID = 13 +var c_oserct_chartExAxisHIDDEN = 14; +var c_oserct_chartExAxisCATSCALING = 0; +var c_oserct_chartExAxisVALSCALING = 1; +var c_oserct_chartExAxisTITLE = 2; var c_oserct_axisUNITS = 3; -var c_oserct_axisMAJORGRIDLINES = 4; -var c_oserct_axisMINORGRIDLINES = 5; +var c_oserct_axisNUMFMT = 9; var c_oserct_axisMAJORTICKMARKS = 6; var c_oserct_axisMINORTICKMARKS = 7; +var c_oserct_axisMAJORGRIDLINES = 4; +var c_oserct_axisMINORGRIDLINES = 5; var c_oserct_axisTICKLABELS = 8; -var c_oserct_axisNUMFMT = 9; -var c_oserct_axisSPPR = 10; var c_oserct_axisTXPR = 11; -var c_oserct_axisEXTLST = 12; -var c_oserct_axisID = 13; -var c_oserct_axisHIDDEN = 14; +var c_oserct_axisSPPR = 10; + BinaryChartWriter.prototype.WriteCT_Axis = function (oVal) { var oThis = this; + if(oVal.id !== null) { + this.bs.WriteItem(c_oserct_axisID, function() { + oThis.memory.WriteLong(oVal.id); + }); + } + if(oVal.hidden !== null) { + this.bs.WriteItem(c_oserct_chartExAxisHIDDEN, function() { + oThis.memory.WriteBool(oVal.hidden); + }); + } if(oVal.catScaling !== null) { - this.bs.WriteItem(c_oserct_axisCATSCALING, function() { + this.bs.WriteItem(c_oserct_chartExAxisCATSCALING, function() { oThis.WriteCT_CategoryAxisScaling(oVal.catScaling); }); } if(oVal.valScaling !== null) { - this.bs.WriteItem(c_oserct_axisVALSCALING, function() { + this.bs.WriteItem(c_oserct_chartExAxisVALSCALING, function() { oThis.WriteCT_ValueAxisScaling(oVal.valScaling); }); } if(oVal.title !== null) { - this.bs.WriteItem(c_oserct_axisTITLE, function() { + this.bs.WriteItem(c_oserct_chartExAxisTITLE, function() { oThis.WriteCT_Title(oVal.title); }); } @@ -124,14 +134,9 @@ BinaryChartWriter.prototype.WriteCT_Axis = function (oVal) { oThis.WriteCT_AxisUnits(oVal.units); }); } - if(oVal.majorGridlines !== null) { - this.bs.WriteItem(c_oserct_axisMAJORGRIDLINES, function() { - oThis.WriteCT_Gridlines(oVal.majorGridlines); - }); - } - if(oVal.minorGridlines !== null) { - this.bs.WriteItem(c_oserct_axisMINORGRIDLINES, function() { - oThis.WriteCT_Gridlines(oVal.minorGridlines); + if(oVal.numFmt !== null) { + this.bs.WriteItem(c_oserct_axisNUMFMT, function() { + oThis.WriteCT_NumFmt(oVal.numFmt); }); } if(oVal.majorTickMarks !== null) { @@ -144,19 +149,19 @@ BinaryChartWriter.prototype.WriteCT_Axis = function (oVal) { oThis.WriteCT_TickMarks(oVal.minorTickMarks); }); } - if(oVal.tickLabels !== null) { - this.bs.WriteItem(c_oserct_axisTICKLABELS, function() { - oThis.memory.WriteBool(oVal.tickLabels); + if(oVal.majorGridlines !== null) { + this.bs.WriteItem(c_oserct_axisMAJORGRIDLINES, function() { + oThis.WriteCT_Gridlines(oVal.majorGridlines); }); } - if(oVal.numFmt !== null) { - this.bs.WriteItem(c_oserct_axisNUMFMT, function() { - oThis.WriteCT_NumFmt(oVal.numFmt); + if(oVal.minorGridlines !== null) { + this.bs.WriteItem(c_oserct_axisMINORGRIDLINES, function() { + oThis.WriteCT_Gridlines(oVal.minorGridlines); }); } - if(oVal.spPr !== null) { - this.bs.WriteItem(c_oserct_axisSPPR, function() { - oThis.WriteSpPr(oVal.spPr); + if(oVal.tickLabels !== null) { + this.bs.WriteItem(c_oserct_axisTICKLABELS, function() { + oThis.memory.WriteBool(oVal.tickLabels); }); } if(oVal.txPr !== null) { @@ -164,19 +169,9 @@ BinaryChartWriter.prototype.WriteCT_Axis = function (oVal) { oThis.WriteTxPr(oVal.txPr); }); } - if(oVal.extLst !== null) { - this.bs.WriteItem(c_oserct_axisEXTLST, function() { - oThis.WriteCT_extLst(oVal.extLst); - }); - } - if(oVal.id !== null) { - this.bs.WriteItem(c_oserct_axisID, function() { - oThis.memory.WriteLong(oVal.id); - }); - } - if(oVal.hidden !== null) { - this.bs.WriteItem(c_oserct_axisHIDDEN, function() { - oThis.memory.WriteBool(oVal.hidden); + if(oVal.spPr !== null) { + this.bs.WriteItem(c_oserct_axisSPPR, function() { + oThis.WriteSpPr(oVal.spPr); }); } }; @@ -184,7 +179,15 @@ BinaryChartReader.prototype.ReadCT_Axis = function (type, length, val) { var res = c_oSerConstants.ReadOk; var oThis = this; var oNewVal; - if (c_oserct_axisCATSCALING === type) + if (c_oserct_axisID === type) + { + val.setId(this.stream.GetULongLE()); + } + else if (c_oserct_chartExAxisHIDDEN === type) + { + val.setHidden(this.stream.GetBool()); + } + else if (c_oserct_chartExAxisCATSCALING === type) { var oNewVal = new AscFormat.CCategoryAxisScaling(); res = this.bcr.Read1(length, function (t, l) { @@ -192,7 +195,7 @@ BinaryChartReader.prototype.ReadCT_Axis = function (type, length, val) { }); val.setCatScaling(oNewVal); } - else if (c_oserct_axisVALSCALING === type) + else if (c_oserct_chartExAxisVALSCALING === type) { var oNewVal = new AscFormat.CValueAxisScaling(); res = this.bcr.Read1(length, function (t, l) { @@ -200,7 +203,7 @@ BinaryChartReader.prototype.ReadCT_Axis = function (type, length, val) { }); val.setValScaling(oNewVal); } - else if (c_oserct_axisTITLE === type) + else if (c_oserct_chartExAxisTITLE === type) { var oNewVal = new AscFormat.CTitle(); res = this.bcr.Read1(length, function (t, l) { @@ -216,21 +219,13 @@ BinaryChartReader.prototype.ReadCT_Axis = function (type, length, val) { }); val.setUnits(oNewVal); } - else if (c_oserct_axisMAJORGRIDLINES === type) - { - var oNewVal = new AscFormat.CGridlines(); - res = this.bcr.Read1(length, function (t, l) { - return oThis.ReadCT_Gridlines(t, l, oNewVal); - }); - val.setMajorGridlines(oNewVal); - } - else if (c_oserct_axisMINORGRIDLINES === type) + else if (c_oserct_axisNUMFMT === type) { - var oNewVal = new AscFormat.CGridlines(); + var oNewVal = new AscFormat.CNumFmt(); res = this.bcr.Read1(length, function (t, l) { - return oThis.ReadCT_Gridlines(t, l, oNewVal); + return oThis.ReadCT_NumFmt(t, l, oNewVal); }); - val.setMinorGridlines(oNewVal); + val.setNumFmt(oNewVal); } else if (c_oserct_axisMAJORTICKMARKS === type) { @@ -248,44 +243,35 @@ BinaryChartReader.prototype.ReadCT_Axis = function (type, length, val) { }); val.setMinorTickMarks(oNewVal); } - else if (c_oserct_axisTICKLABELS === type) + else if (c_oserct_axisMAJORGRIDLINES === type) { - val.setTickLabels(this.stream.GetBool()); + var oNewVal = new AscFormat.CGridlines(); + res = this.bcr.Read1(length, function (t, l) { + return oThis.ReadCT_Gridlines(t, l, oNewVal); + }); + val.setMajorGridlines(oNewVal); } - else if (c_oserct_axisNUMFMT === type) + else if (c_oserct_axisMINORGRIDLINES === type) { - var oNewVal = new AscFormat.CNumFmt(); + var oNewVal = new AscFormat.CGridlines(); res = this.bcr.Read1(length, function (t, l) { - return oThis.ReadCT_NumFmt(t, l, oNewVal); + return oThis.ReadCT_Gridlines(t, l, oNewVal); }); - val.setNumFmt(oNewVal); + val.setMinorGridlines(oNewVal); } - else if (c_oserct_axisSPPR === type) + else if (c_oserct_axisTICKLABELS === type) { - val.setSpPr(this.ReadSpPr(length)); - val.spPr.setParent(val); + val.setTickLabels(this.stream.GetBool()); } else if (c_oserct_axisTXPR === type) { val.setTxPr(this.ReadTxPr(length)); val.txPr.setParent(val); } - else if (c_oserct_axisEXTLST === type) - { - var oNewVal; - oNewVal = {}; - res = this.bcr.Read1(length, function (t, l) { - return oThis.ReadCT_extLst(t, l, oNewVal); - }); - // val.setExtLst(oNewVal); - } - else if (c_oserct_axisID === type) - { - val.setId(this.stream.GetULongLE()); - } - else if (c_oserct_axisHIDDEN === type) + else if (c_oserct_axisSPPR === type) { - val.setHidden(this.stream.GetBool()); + val.setSpPr(this.ReadSpPr(length)); + val.spPr.setParent(val); } else { @@ -295,24 +281,18 @@ BinaryChartReader.prototype.ReadCT_Axis = function (type, length, val) { }; // CAxisUnits -var c_oserct_axisunitsUNITSLABEL = 0; -var c_oserct_axisunitsEXTLST = 1; -var c_oserct_axisunitsUNIT = 2; +var c_oserct_chartExAxisUnitTYPE = 0; +var c_oserct_chartExAxisUnitLABEL = 1; BinaryChartWriter.prototype.WriteCT_AxisUnits = function (oVal) { var oThis = this; if(oVal.unitsLabel !== null) { - this.bs.WriteItem(c_oserct_axisunitsUNITSLABEL, function() { + this.bs.WriteItem(c_oserct_chartExAxisUnitLABEL, function() { oThis.WriteCT_AxisUnitsLabel(oVal.unitsLabel); }); } - if(oVal.extLst !== null) { - this.bs.WriteItem(c_oserct_axisunitsEXTLST, function() { - oThis.WriteCT_extLst(oVal.extLst); - }); - } if(oVal.unit !== null) { - this.bs.WriteItem(c_oserct_axisunitsUNIT, function() { + this.bs.WriteItem(c_oserct_chartExAxisUnitTYPE, function() { oThis.WriteCT_AxisUnit(oVal.unit); }); } @@ -321,28 +301,200 @@ BinaryChartReader.prototype.ReadCT_AxisUnits = function (type, length, val) { var res = c_oSerConstants.ReadOk; var oThis = this; var oNewVal; - if (c_oserct_axisunitsUNITSLABEL === type) + if (c_oserct_chartExAxisUnitLABEL === type) { var oNewVal = new AscFormat.CAxisUnitsLabel(); res = this.bcr.Read1(length, function (t, l) { return oThis.ReadCT_AxisUnitsLabel(t, l, oNewVal); }); val.setUnitsLabel(oNewVal); - } else if (c_oserct_axisunitsEXTLST === type) + } + else if (c_oserct_chartExAxisUnitTYPE === type) { + var oNewVal = new AscFormat.CAxisUnit(); + res = this.bcr.Read2(length, function (t, l) { + return oThis.ReadCT_AxisUnit(t, l, oNewVal); + }); + val.setUnit(oNewVal); + } + else + { + res = c_oSerConstants.ReadUnknown; + } + return res; +}; + +// CChartData +var c_oserct_chartExDATA = 0; +var c_oserct_chartExEXTERNALDATA = 1; + +BinaryChartWriter.prototype.WriteCT_ChartData = function (oVal) { + var oThis = this; + if (oVal.data !== null) { + for (var i = 0, length = oVal.data.length; i < length; ++i) { + var oCurVal = oVal.data[i]; + if (null != oCurVal) { + this.bs.WriteItem(c_oserct_chartExDATA, function () { + oThis.WriteCT_Data(oCurVal); + }); + } + } + } + if(oVal.externalData !== null) { + this.bs.WriteItem(c_oserct_chartExEXTERNALDATA, function() { + oThis.WriteCT_ExternalData(oVal.externalData); + }); + } +}; +BinaryChartReader.prototype.ReadCT_ChartData = function (type, length, val) { + var res = c_oSerConstants.ReadOk; + var oThis = this; + var oNewVal; + if (c_oserct_chartExDATA === type) { + var oNewVal = new AscFormat.CData(); + res = this.bcr.Read1(length, function (t, l) { + return oThis.ReadCT_Data(t, l, oNewVal); + }); + val.addData(oNewVal); + } + else if (c_oserct_chartExEXTERNALDATA === type) + { + var oNewVal = new AscFormat.CExternalData(); + res = this.bcr.Read2(length, function (t, l) { + return oThis.ReadCT_ExternalData(t, l, oNewVal); + }); + val.setExternalData(oNewVal); + } + else + { + res = c_oSerConstants.ReadUnknown; + } + return res; +}; + +// CExternalData (contains in ChartFormat.js) +var c_oserct_chartExExternalAUTOUPDATE = 0; + +BinaryChartWriter.prototype.WriteCT_ChartExExternalData = function (oVal) { + var res = c_oSerConstants.ReadOk; + var oThis = this; + var oCurVal = oVal.m_autoUpdate; + if (null != oCurVal) { + this.bs.WriteItem(c_oserct_chartExExternalAUTOUPDATE, function () { + oThis.WriteCT_Boolean(oCurVal); + }); + } +}; +BinaryChartReader.prototype.ReadCT_ChartExExternalData = function (type, length, val) { + var res = c_oSerConstants.ReadOk; + var oThis = this; + if (c_oserct_externaldataAUTOUPDATE === type) { var oNewVal; oNewVal = {}; res = this.bcr.Read1(length, function (t, l) { - return oThis.ReadCT_extLst(t, l, oNewVal); + return oThis.ReadCT_Boolean(t, l, oNewVal); }); - // val.setExtLst(oNewVal); - } else if (c_oserct_axisunitsUNIT === type) + val.m_autoUpdate = oNewVal; + } + else + res = c_oSerConstants.ReadUnknown; + return res; +}; + +// CChartEx +var c_oserct_chartExChartPLOTAREA = 0; +var c_oserct_chartExChartTITLE = 1; +var c_oserct_chartExChartLEGEND = 2; + +BinaryChartWriter.prototype.WriteCT_ChartEx = function (oVal) { + var oThis = this; + if(oVal.plotArea !== null) { + this.bs.WriteItem(c_oserct_chartExChartPLOTAREA, function() { + oThis.WriteCT_PlotArea(oVal.plotArea); + }); + } + if(oVal.title !== null) { + this.bs.WriteItem(c_oserct_chartExChartTITLE, function() { + oThis.WriteCT_Title(oVal.title); + }); + } + if(oVal.legend !== null) { + this.bs.WriteItem(c_oserct_chartExChartLEGEND, function() { + oThis.WriteCT_Legend(oVal.legend); + }); + } +}; +BinaryChartReader.prototype.ReadCT_ChartEx = function (type, length, val) { + var res = c_oSerConstants.ReadOk; + var oThis = this; + var oNewVal; + if (c_oserct_chartExChartPLOTAREA === type) { - var oNewVal = new AscFormat.CAxisUnit(); + var oNewVal = new AscFormat.CPlotArea(); + res = this.bcr.Read1(length, function (t, l) { + return oThis.ReadCT_PlotArea(t, l, oNewVal); + }); + val.setPlotArea(oNewVal); + } + else if (c_oserct_chartExChartTITLE === type) + { + var oNewVal = new AscFormat.Ctitle(); res = this.bcr.Read2(length, function (t, l) { - return oThis.ReadCT_AxisUnit(t, l, oNewVal); + return oThis.ReadCT_Title(t, l, oNewVal); }); - val.setUnit(oNewVal); + val.setTitle(oNewVal); + } + else if (c_oserct_chartExChartLEGEND === type) + { + var oNewVal = new AscFormat.CLegend(); + res = this.bcr.Read2(length, function (t, l) { + return oThis.ReadCT_Legend(t, l, oNewVal); + }); + val.setLegend(oNewVal); + } + else + { + res = c_oSerConstants.ReadUnknown; + } + return res; +}; + +// template CChartExPlotArea +var c_oserct_chartExChartAREAREGION = 0; +var c_oserct_testATTR2 = 1; + +BinaryChartWriter.prototype.WriteCT_Test = function (oVal) { + var oThis = this; + if(oVal.attr1 !== null) { + this.bs.WriteItem(c_oserct_testATTR1, function() { + oThis.WriteCT_ATTR1(oVal.attr1); + }); + } + if(oVal.attr2 !== null) { + this.bs.WriteItem(c_oserct_testATTR1, function() { + oThis.WriteCT_Attr2(oVal.attr2); + }); + } +}; +BinaryChartReader.prototype.ReadCT_Test = function (type, length, val) { + var res = c_oSerConstants.ReadOk; + var oThis = this; + var oNewVal; + if (c_oserct_testATTR1 === type) + { + var oNewVal = new AscFormat.CAttr1(); + res = this.bcr.Read1(length, function (t, l) { + return oThis.ReadCT_Attr1(t, l, oNewVal); + }); + val.setAttr1(oNewVal); + } + else if (c_oserct_testATTR2 === type) + { + var oNewVal = new AscFormat.CAttr2(); + res = this.bcr.Read2(length, function (t, l) { + return oThis.ReadCT_Attr2(t, l, oNewVal); + }); + val.setAttr2(oNewVal); } else { @@ -379,7 +531,8 @@ BinaryChartReader.prototype.ReadCT_Test = function (type, length, val) { return oThis.ReadCT_Attr1(t, l, oNewVal); }); val.setAttr1(oNewVal); - } else if (c_oserct_testATTR2 === type) + } + else if (c_oserct_testATTR2 === type) { var oNewVal = new AscFormat.CAttr2(); res = this.bcr.Read2(length, function (t, l) { From d0a0b700297b182152d1f2da4ffe7533e839b0f4 Mon Sep 17 00:00:00 2001 From: Dmitriy Aleksandrov Date: Thu, 17 Aug 2023 22:43:34 +0600 Subject: [PATCH 17/30] For bug #62819 Add stuctures. --- common/Drawings/Format/ChartEx.js | 41 +- common/tempSerializeChart.js | 662 +++++++++++++++++++++++++++--- 2 files changed, 638 insertions(+), 65 deletions(-) diff --git a/common/Drawings/Format/ChartEx.js b/common/Drawings/Format/ChartEx.js index 386c06d9dc..6a8591ce8d 100644 --- a/common/Drawings/Format/ChartEx.js +++ b/common/Drawings/Format/ChartEx.js @@ -2505,18 +2505,24 @@ // PlotArea (contains in chartFormat.js but different fields) - drawingsChangesMap[AscDFH.historyitem_PlotArea_SetPlotAreaRegion] = function(oClass, value) { + drawingsChangesMap[AscDFH.historyitem_ChartExPlotArea_SetPlotAreaRegion] = function(oClass, value) { oClass.plotAreaRegion = value; }; - drawingsChangesMap[AscDFH.historyitem_PlotArea_SetAxis] = function(oClass, value) { + drawingsChangesMap[AscDFH.historyitem_ChartExPlotArea_SetAxis] = function(oClass, value) { oClass.axis = value; }; - drawingsChangesMap[AscDFH.historyitem_PlotArea_SetSpPr] = function(oClass, value) { + drawingsChangesMap[AscDFH.historyitem_ChartExPlotArea_SetSpPr] = function(oClass, value) { oClass.spPr = value; }; - AscDFH.changesFactory[AscDFH.historyitem_PlotArea_SetPlotAreaRegion] = window['AscDFH'].CChangesDrawingsObjectNoId; - AscDFH.changesFactory[AscDFH.historyitem_PlotArea_SetAxis] = window['AscDFH'].CChangesDrawingsObjectNoId; - AscDFH.changesFactory[AscDFH.historyitem_PlotArea_SetSpPr] = window['AscDFH'].CChangesDrawingsObjectNoId; + drawingContentChanges[AscDFH.historyitem_ChartExPlotArea_AddAxis] = + drawingContentChanges[AscDFH.historyitem_ChartExPlotArea_RemoveAxis] = function(oClass) { + return oClass.axis; + }; + AscDFH.changesFactory[AscDFH.historyitem_ChartExPlotArea_SetPlotAreaRegion] = window['AscDFH'].CChangesDrawingsObjectNoId; + AscDFH.changesFactory[AscDFH.historyitem_ChartExPlotArea_SetAxis] = window['AscDFH'].CChangesDrawingsObjectNoId; + AscDFH.changesFactory[AscDFH.historyitem_ChartExPlotArea_SetSpPr] = window['AscDFH'].CChangesDrawingsObjectNoId; + AscDFH.changesFactory[AscDFH.historyitem_ChartExPlotArea_AddAxis] = window['AscDFH'].CChangesDrawingsContent; + AscDFH.changesFactory[AscDFH.historyitem_ChartExPlotArea_RemoveAxis] = window['AscDFH'].CChangesDrawingsContent; function CChartExPlotArea() { CBaseChartObject.call(this); this.plotAreaRegion = null; @@ -2524,20 +2530,35 @@ this.spPr = null; } - InitClass(CChartExPlotArea, CBaseChartObject, AscDFH.historyitem_type_PlotArea); + InitClass(CChartExPlotArea, CBaseChartObject, AscDFH.historyitem_type_ChartExPlotArea); CChartExPlotArea.prototype.setPlotAreaRegion = function(pr) { - History.CanAddChanges() && History.Add(new CChangesDrawingsObjectNoId(this, AscDFH.historyitem_PlotArea_SetPlotAreaRegion, this.plotAreaRegion, pr)); + History.CanAddChanges() && History.Add(new CChangesDrawingsObjectNoId(this, AscDFH.historyitem_ChartExPlotArea_SetPlotAreaRegion, this.plotAreaRegion, pr)); this.plotAreaRegion = pr; }; CChartExPlotArea.prototype.setAxis = function(pr) { - History.CanAddChanges() && History.Add(new CChangesDrawingsObjectNoId(this, AscDFH.historyitem_PlotArea_SetAxis, this.axis, pr)); + History.CanAddChanges() && History.Add(new CChangesDrawingsObjectNoId(this, AscDFH.historyitem_ChartExPlotArea_SetAxis, this.axis, pr)); this.axis = pr; }; CChartExPlotArea.prototype.setSpPr = function(pr) { - History.CanAddChanges() && History.Add(new CChangesDrawingsObjectNoId(this, AscDFH.historyitem_PlotArea_SetSpPr, this.spPr, pr)); + History.CanAddChanges() && History.Add(new CChangesDrawingsObjectNoId(this, AscDFH.historyitem_ChartExPlotArea_SetSpPr, this.spPr, pr)); this.spPr = pr; }; + CChartExPlotArea.prototype.addAxis = function(pr, idx) { + var pos; + if(AscFormat.isRealNumber(idx)) + pos = idx; + else + pos = this.axis.length; + History.CanAddChanges() && History.Add(new CChangesDrawingsContent(this, AscDFH.historyitem_ChartExPlotArea_AddAxis, pos, [pr], true)); + this.axis.splice(pos, 0, pr); + }; + CChartExPlotArea.prototype.removeAxisByPos = function(pos) { + if(this.axis[pos]) { + var axis = this.axis.splice(pos, 1)[0]; + History.CanAddChanges() && History.Add(new CChangesDrawingsContent(this, AscDFH.historyitem_ChartExPlotArea_RemoveAxis, pos, [axis], false)); + } + }; // PlotAreaRegion diff --git a/common/tempSerializeChart.js b/common/tempSerializeChart.js index fb71723870..43735b33ef 100644 --- a/common/tempSerializeChart.js +++ b/common/tempSerializeChart.js @@ -86,26 +86,26 @@ // }; // CAxis -var c_oserct_axisID = 13 -var c_oserct_chartExAxisHIDDEN = 14; -var c_oserct_chartExAxisCATSCALING = 0; -var c_oserct_chartExAxisVALSCALING = 1; -var c_oserct_chartExAxisTITLE = 2; -var c_oserct_axisUNITS = 3; -var c_oserct_axisNUMFMT = 9; -var c_oserct_axisMAJORTICKMARKS = 6; -var c_oserct_axisMINORTICKMARKS = 7; -var c_oserct_axisMAJORGRIDLINES = 4; -var c_oserct_axisMINORGRIDLINES = 5; -var c_oserct_axisTICKLABELS = 8; -var c_oserct_axisTXPR = 11; -var c_oserct_axisSPPR = 10; +var c_oserct_chartExAxisID = 0 +var c_oserct_chartExAxisHIDDEN = 1; +var c_oserct_chartExAxisCATSCALING = 2; +var c_oserct_chartExAxisVALSCALING = 3; +var c_oserct_chartExAxisTITLE = 4; +var c_oserct_chartExAxisUNIT = 5; +var c_oserct_chartExAxisNUMFMT = 6; +var c_oserct_chartExAxisMAJORTICK = 7; +var c_oserct_chartExAxisMINORTICK = 8; +var c_oserct_chartExAxisMAJORGRID = 9; +var c_oserct_chartExAxisMINORGRID = 10; +var c_oserct_chartExAxisTICKLABELS = 11; +var c_oserct_chartExAxisTXPR = 12; +var c_oserct_chartExAxisSPPR = 13; BinaryChartWriter.prototype.WriteCT_Axis = function (oVal) { var oThis = this; if(oVal.id !== null) { - this.bs.WriteItem(c_oserct_axisID, function() { + this.bs.WriteItem(c_oserct_chartExAxisID, function() { oThis.memory.WriteLong(oVal.id); }); } @@ -130,47 +130,47 @@ BinaryChartWriter.prototype.WriteCT_Axis = function (oVal) { }); } if(oVal.units !== null) { - this.bs.WriteItem(c_oserct_axisUNITS, function() { + this.bs.WriteItem(c_oserct_chartExAxisUNIT, function() { oThis.WriteCT_AxisUnits(oVal.units); }); } if(oVal.numFmt !== null) { - this.bs.WriteItem(c_oserct_axisNUMFMT, function() { + this.bs.WriteItem(c_oserct_chartExAxisNUMFMT, function() { oThis.WriteCT_NumFmt(oVal.numFmt); }); } if(oVal.majorTickMarks !== null) { - this.bs.WriteItem(c_oserct_axisMAJORTICKMARKS, function() { + this.bs.WriteItem(c_oserct_chartExAxisMAJORTICK, function() { oThis.WriteCT_TickMarks(oVal.majorTickMarks); }); } if(oVal.minorTickMarks !== null) { - this.bs.WriteItem(c_oserct_axisMINORTICKMARKS, function() { + this.bs.WriteItem(c_oserct_chartExAxisMINORTICK, function() { oThis.WriteCT_TickMarks(oVal.minorTickMarks); }); } if(oVal.majorGridlines !== null) { - this.bs.WriteItem(c_oserct_axisMAJORGRIDLINES, function() { + this.bs.WriteItem(c_oserct_chartExAxisMAJORGRID, function() { oThis.WriteCT_Gridlines(oVal.majorGridlines); }); } if(oVal.minorGridlines !== null) { - this.bs.WriteItem(c_oserct_axisMINORGRIDLINES, function() { + this.bs.WriteItem(c_oserct_chartExAxisMINORGRID, function() { oThis.WriteCT_Gridlines(oVal.minorGridlines); }); } if(oVal.tickLabels !== null) { - this.bs.WriteItem(c_oserct_axisTICKLABELS, function() { + this.bs.WriteItem(c_oserct_chartExAxisTICKLABELS, function() { oThis.memory.WriteBool(oVal.tickLabels); }); } if(oVal.txPr !== null) { - this.bs.WriteItem(c_oserct_axisTXPR, function() { + this.bs.WriteItem(c_oserct_chartExAxisTXPR, function() { oThis.WriteTxPr(oVal.txPr); }); } if(oVal.spPr !== null) { - this.bs.WriteItem(c_oserct_axisSPPR, function() { + this.bs.WriteItem(c_oserct_chartExAxisSPPR, function() { oThis.WriteSpPr(oVal.spPr); }); } @@ -179,7 +179,7 @@ BinaryChartReader.prototype.ReadCT_Axis = function (type, length, val) { var res = c_oSerConstants.ReadOk; var oThis = this; var oNewVal; - if (c_oserct_axisID === type) + if (c_oserct_chartExAxisID === type) { val.setId(this.stream.GetULongLE()); } @@ -211,7 +211,7 @@ BinaryChartReader.prototype.ReadCT_Axis = function (type, length, val) { }); val.setTitle(oNewVal); } - else if (c_oserct_axisUNITS === type) + else if (c_oserct_chartExAxisUNIT === type) { var oNewVal = new AscFormat.CAxisUnits(); res = this.bcr.Read1(length, function (t, l) { @@ -219,7 +219,7 @@ BinaryChartReader.prototype.ReadCT_Axis = function (type, length, val) { }); val.setUnits(oNewVal); } - else if (c_oserct_axisNUMFMT === type) + else if (c_oserct_chartExAxisNUMFMT === type) { var oNewVal = new AscFormat.CNumFmt(); res = this.bcr.Read1(length, function (t, l) { @@ -227,7 +227,7 @@ BinaryChartReader.prototype.ReadCT_Axis = function (type, length, val) { }); val.setNumFmt(oNewVal); } - else if (c_oserct_axisMAJORTICKMARKS === type) + else if (c_oserct_chartExAxisMAJORTICK === type) { var oNewVal = new AscFormat.CTickMarks(); res = this.bcr.Read1(length, function (t, l) { @@ -235,7 +235,7 @@ BinaryChartReader.prototype.ReadCT_Axis = function (type, length, val) { }); val.setMajorTickMarks(oNewVal); } - else if (c_oserct_axisMINORTICKMARKS === type) + else if (c_oserct_chartExAxisMINORTICK === type) { var oNewVal = new AscFormat.CTickMarks(); res = this.bcr.Read1(length, function (t, l) { @@ -243,7 +243,7 @@ BinaryChartReader.prototype.ReadCT_Axis = function (type, length, val) { }); val.setMinorTickMarks(oNewVal); } - else if (c_oserct_axisMAJORGRIDLINES === type) + else if (c_oserct_chartExAxisMAJORGRID === type) { var oNewVal = new AscFormat.CGridlines(); res = this.bcr.Read1(length, function (t, l) { @@ -251,7 +251,7 @@ BinaryChartReader.prototype.ReadCT_Axis = function (type, length, val) { }); val.setMajorGridlines(oNewVal); } - else if (c_oserct_axisMINORGRIDLINES === type) + else if (c_oserct_chartExAxisMINORGRID === type) { var oNewVal = new AscFormat.CGridlines(); res = this.bcr.Read1(length, function (t, l) { @@ -259,16 +259,16 @@ BinaryChartReader.prototype.ReadCT_Axis = function (type, length, val) { }); val.setMinorGridlines(oNewVal); } - else if (c_oserct_axisTICKLABELS === type) + else if (c_oserct_chartExAxisTICKLABELS === type) { val.setTickLabels(this.stream.GetBool()); } - else if (c_oserct_axisTXPR === type) + else if (c_oserct_chartExAxisTXPR === type) { val.setTxPr(this.ReadTxPr(length)); val.txPr.setParent(val); } - else if (c_oserct_axisSPPR === type) + else if (c_oserct_chartExAxisSPPR === type) { val.setSpPr(this.ReadSpPr(length)); val.spPr.setParent(val); @@ -333,7 +333,7 @@ BinaryChartWriter.prototype.WriteCT_ChartData = function (oVal) { if (oVal.data !== null) { for (var i = 0, length = oVal.data.length; i < length; ++i) { var oCurVal = oVal.data[i]; - if (null != oCurVal) { + if (oCurVal !== null) { this.bs.WriteItem(c_oserct_chartExDATA, function () { oThis.WriteCT_Data(oCurVal); }); @@ -379,7 +379,7 @@ BinaryChartWriter.prototype.WriteCT_ChartExExternalData = function (oVal) { var res = c_oSerConstants.ReadOk; var oThis = this; var oCurVal = oVal.m_autoUpdate; - if (null != oCurVal) { + if (oCurVal !== null) { this.bs.WriteItem(c_oserct_chartExExternalAUTOUPDATE, function () { oThis.WriteCT_Boolean(oCurVal); }); @@ -459,42 +459,594 @@ BinaryChartReader.prototype.ReadCT_ChartEx = function (type, length, val) { return res; }; -// template CChartExPlotArea -var c_oserct_chartExChartAREAREGION = 0; -var c_oserct_testATTR2 = 1; +// CChartExPlotArea +var c_oserct_chartExChartAREAREGION = 0; +var c_oserct_chartExChartAXIS = 1; +var c_oserct_chartExChartSPPR = 2; -BinaryChartWriter.prototype.WriteCT_Test = function (oVal) { +BinaryChartWriter.prototype.WriteCT_ChartExPlotArea = function (oVal) { var oThis = this; - if(oVal.attr1 !== null) { - this.bs.WriteItem(c_oserct_testATTR1, function() { - oThis.WriteCT_ATTR1(oVal.attr1); + if(oVal.plotAreaRegion !== null) { + this.bs.WriteItem(c_oserct_chartExChartAREAREGION, function() { + oThis.WriteCT_PlotAreaRegion(oVal.plotAreaRegion); }); } - if(oVal.attr2 !== null) { - this.bs.WriteItem(c_oserct_testATTR1, function() { - oThis.WriteCT_Attr2(oVal.attr2); + if (oVal.axis !== null) { + for (var i = 0, length = oVal.axis.length; i < length; ++i) { + var oCurVal = oVal.axis[i]; + if (oCurVal !== null) { + this.bs.WriteItem(c_oserct_chartExChartAXIS, function () { + oThis.WriteCT_Axis(oCurVal); + }); + } + } + } + if(oVal.spPr !== null) { + this.bs.WriteItem(c_oserct_chartExChartSPPR, function() { + oThis.WriteSpPr(oVal.spPr); }); } }; -BinaryChartReader.prototype.ReadCT_Test = function (type, length, val) { +BinaryChartReader.prototype.ReadCT_ChartExPlotArea = function (type, length, val) { var res = c_oSerConstants.ReadOk; var oThis = this; var oNewVal; - if (c_oserct_testATTR1 === type) + if (c_oserct_chartExChartAREAREGION === type) { - var oNewVal = new AscFormat.CAttr1(); + var oNewVal = new AscFormat.CPlotAreaRegion(); res = this.bcr.Read1(length, function (t, l) { - return oThis.ReadCT_Attr1(t, l, oNewVal); + return oThis.ReadCT_ChartAreaRegion(t, l, oNewVal); }); - val.setAttr1(oNewVal); + val.setPlotAreaRegion(oNewVal); } - else if (c_oserct_testATTR2 === type) + else if (c_oserct_chartExChartAXIS === type) { + var oNewVal = new AscFormat.CAxis(); + res = this.bcr.Read1(length, function (t, l) { + return oThis.ReadCT_Axis(t, l, oNewVal); + }); + val.addAxis(oNewVal); + } + else if (c_oserct_chartExChartSPPR === type) { - var oNewVal = new AscFormat.CAttr2(); + val.setSpPr(this.ReadSpPr(length)); + val.spPr.setParent(val); + } + else + { + res = c_oSerConstants.ReadUnknown; + } + return res; +}; + +// CPlotAreaRegion +var c_oserct_chartExAreaPLOTSURFACE = 0; +var c_oserct_chartExAreaSERIES = 1; + +BinaryChartWriter.prototype.WriteCT_PlotAreaRegion = function (oVal) { + var oThis = this; + if(oVal.plotSurface !== null) { + this.bs.WriteItem(c_oserct_chartExAreaPLOTSURFACE, function() { + oThis.WriteCT_PlotSurface(oVal.plotSurface); + }); + } + if (oVal.series !== null) { + for (var i = 0, length = oVal.series.length; i < length; ++i) { + var oCurVal = oVal.series[i]; + if (null != oCurVal) { + this.bs.WriteItem(c_oserct_chartExAreaSERIES, function () { + oThis.WriteCT_Series(oCurVal); + }); + } + } + } +}; +BinaryChartReader.prototype.ReadCT_PlotAreaRegion = function (type, length, val) { + var res = c_oSerConstants.ReadOk; + var oThis = this; + var oNewVal; + if (c_oserct_chartExAreaPLOTSURFACE === type) + { + var oNewVal = new AscFormat.CPlotSurface(); + res = this.bcr.Read1(length, function (t, l) { + return oThis.ReadCT_PlotSurface(t, l, oNewVal); + }); + val.setPlotSurface(oNewVal); + } + else if (c_oserct_chartExAreaSERIES === type) { + var oNewVal = new AscFormat.CSeries(); + res = this.bcr.Read1(length, function (t, l) { + return oThis.ReadCT_Series(t, l, oNewVal); + }); + val.addSeries(oNewVal); + } + else + { + res = c_oSerConstants.ReadUnknown; + } + return res; +}; + +// CPlotSurface +var c_oserct_chartExPlotSurfaceSPPR = 0; + +BinaryChartWriter.prototype.WriteCT_PlotSurface = function (oVal) { + var oThis = this; + if(oVal.spPr !== null) { + this.bs.WriteItem(c_oserct_chartExPlotSurfaceSPPR, function() { + oThis.WriteSpPr(oVal.spPr); + }); + } +}; +BinaryChartReader.prototype.ReadCT_PlotSurface = function (type, length, val) { + var res = c_oSerConstants.ReadOk; + var oThis = this; + var oNewVal; + if (c_oserct_chartExPlotSurfaceSPPR === type) + { + val.setSpPr(this.ReadSpPr(length)); + val.spPr.setParent(val); + } + else + { + res = c_oSerConstants.ReadUnknown; + } + return res; +}; + +// CSeries +var c_oserct_chartExSeriesDATAPT = 0; +var c_oserct_chartExSeriesDATALABELS = 1; +var c_oserct_chartExSeriesLAYOUTPROPS = 2; +var c_oserct_chartExSeriesTEXT = 3; +var c_oserct_chartExSeriesAXIS = 4; +var c_oserct_chartExSeriesDATAID = 5; +var c_oserct_chartExSeriesSPPR = 6; +var c_oserct_chartExSeriesLAYOUTID = 7; +var c_oserct_chartExSeriesHIDDEN = 8; +var c_oserct_chartExSeriesOWNERIDX = 9; +var c_oserct_chartExSeriesFORMATIDX = 10; +var c_oserct_chartExSeriesUNIQUEID = 11; + +BinaryChartWriter.prototype.WriteCT_Series = function (oVal) { + var oThis = this; + if (oVal.dataPt !== null) { + for (var i = 0, length = oVal.dataPt.length; i < length; ++i) { + var oCurVal = oVal.dataPt[i]; + if (null != oCurVal) { + this.bs.WriteItem(c_oserct_chartExSeriesDATAPT, function () { + oThis.WriteCT_DataPoint(oCurVal); + }); + } + } + } + if(oVal.dataLabels !== null) { + this.bs.WriteItem(c_oserct_chartExSeriesDATALABELS, function() { + oThis.WriteCT_DataLabels(oVal.dataLabels); + }); + } + if(oVal.layoutPr !== null) { + this.bs.WriteItem(c_oserct_chartExSeriesLAYOUTPROPS, function() { + oThis.WriteCT_SeriesLayoutProperties(oVal.layoutPr); + }); + } + if(oVal.tx !== null) { + this.bs.WriteItem(c_oserct_chartExSeriesTEXT, function() { + oThis.WriteCT_Text(oVal.tx); + }); + } + if (oVal.axisId !== null) { + for (var i = 0, length = oVal.axisId.length; i < length; ++i) { + var oCurVal = oVal.axisId[i]; + if (null != oCurVal) { + this.bs.WriteItem(c_oserct_chartExSeriesAXIS, function () { + oThis.WriteCT_Axis(oCurVal); + }); + } + } + } + if(oVal.dataId !== null) { + this.bs.WriteItem(c_oserct_chartExSeriesDATAID, function() { + oThis.memory.WriteDouble2(oVal.dataId); + }); + } + if(oVal.spPr !== null) { + this.bs.WriteItem(c_oserct_chartExSeriesSPPR, function() { + oThis.WriteSpPr(oVal.spPr); + }); + } + if(oVal.layoutId !== null) { + this.bs.WriteItem(c_oserct_chartExSeriesLAYOUTID, function() { + oThis.WriteCT_SeriesLayout(oVal.layoutId); + }); + } + if(oVal.hidden !== null) { + this.bs.WriteItem(c_oserct_chartExSeriesHIDDEN, function() { + oThis.memory.WriteBool(oVal.hidden); + }); + } + if(oVal.ownerIdx !== null) { + this.bs.WriteItem(c_oserct_chartExSeriesOWNERIDX, function() { + oThis.memory.WriteLong(oVal.ownerIdx); + }); + } + if(oVal.formatIdx !== null) { + this.bs.WriteItem(c_oserct_chartExSeriesFORMATIDX, function() { + oThis.memory.WriteLong(oVal.formatIdx); + }); + } + if(oVal.uniqueId !== null) { + this.bs.WriteItem(c_oserct_chartExSeriesUNIQUEID, function() { + oThis.memory.WriteString3(oVal.uniqueId); + }); + } +}; +BinaryChartReader.prototype.ReadCT_Series = function (type, length, val) { + var res = c_oSerConstants.ReadOk; + var oThis = this; + var oNewVal; + if (c_oserct_chartExSeriesDATAPT === type) { + var oNewVal = new AscFormat.CDataPoint(); + res = this.bcr.Read1(length, function (t, l) { + return oThis.ReadCT_DataPoint(t, l, oNewVal); + }); + val.addDataPt(oNewVal); + } + else if (c_oserct_chartExSeriesDATALABELS === type) + { + var oNewVal = new AscFormat.CDataLabels(); res = this.bcr.Read2(length, function (t, l) { - return oThis.ReadCT_Attr2(t, l, oNewVal); + return oThis.ReadCT_DataLabels(t, l, oNewVal); }); - val.setAttr2(oNewVal); + val.setDataLabels(oNewVal); + } + else if (c_oserct_chartExSeriesLAYOUTPROPS === type) + { + var oNewVal = new AscFormat.CSeriesLayoutProperties(); + res = this.bcr.Read2(length, function (t, l) { + return oThis.ReadCT_SeriesLayoutProperties(t, l, oNewVal); + }); + val.setLayoutPr(oNewVal); + } + else if (c_oserct_chartExSeriesTEXT === type) + { + val.setTx(this.stream.GetDoubleLE()); + } + else if (c_oserct_chartExSeriesAXIS === type) { + var oNewVal = new AscFormat.CAxis(); + res = this.bcr.Read1(length, function (t, l) { + return oThis.ReadCT_Axis(t, l, oNewVal); + }); + val.addAxisId(oNewVal); + } + else if (c_oserct_chartExSeriesDATAID === type) + { + val.setTx(this.stream.GetDoubleLE()); + } + else if (c_oserct_chartExSeriesSPPR === type) + { + val.setSpPr(this.ReadSpPr(length)); + val.spPr.setParent(val); + } + else if (c_oserct_chartExSeriesLAYOUTID === type) + { + var oNewVal = new AscFormat.CSeriesLayout(); + res = this.bcr.Read2(length, function (t, l) { + return oThis.ReadCT_SeriesLayout(t, l, oNewVal); + }); + val.setLayoutId(oNewVal); + } + else if (c_oserct_chartExSeriesHIDDEN === type) + { + val.setHidden(this.stream.GetBool()); + } + else if (c_oserct_chartExSeriesOWNERIDX === type) + { + val.setOwnerIdx(this.stream.GetULongLE()); + } + else if (c_oserct_chartExSeriesFORMATIDX === type) + { + val.setFormatIdx(this.stream.GetULongLE()); + } + else if (c_oserct_chartExSeriesUNIQUEID === type) + { + val.setUniqueId(this.stream.GetString2LE(length)); + } + else + { + res = c_oSerConstants.ReadUnknown; + } + return res; +}; + +// CDataPoint +var c_oserct_chartExDataPointIDX = 0; +var c_oserct_chartExDataPointSPPR = 1; + +BinaryChartWriter.prototype.WriteCT_DataPoint = function (oVal) { + var oThis = this; + if(oVal.idx !== null) { + this.bs.WriteItem(c_oserct_chartExDataPointIDX, function() { + oThis.memory.WriteLong(oVal.idx); + }); + } + if(oVal.spPr !== null) { + this.bs.WriteItem(c_oserct_chartExDataPointSPPR, function() { + oThis.WriteSpPr(oVal.spPr); + }); + } +}; +BinaryChartReader.prototype.ReadCT_DataPoint = function (type, length, val) { + var res = c_oSerConstants.ReadOk; + var oThis = this; + var oNewVal; + if (c_oserct_chartExDataPointIDX === type) + { + val.setId(this.stream.GetULongLE()); + } + else if (c_oserct_chartExDataPointSPPR === type) + { + val.setSpPr(this.ReadSpPr(length)); + val.spPr.setParent(val); + } + else + { + res = c_oSerConstants.ReadUnknown; + } + return res; +}; + +// CDataLabels +var c_oserct_chartExDataLabelsPOS = 0; +var c_oserct_chartExDataLabelsNUMFMT = 1; +var c_oserct_chartExDataLabelsTXPR = 2; +var c_oserct_chartExDataLabelsSPPR = 3; +var c_oserct_chartExDataLabelsVISABILITIES = 4; +var c_oserct_chartExDataLabelsSEPARATOR = 5; +var c_oserct_chartExDataLabelsDATALABEL = 6; +var c_oserct_chartExDataLabelsDATALABELHIDDEN = 7; + +BinaryChartWriter.prototype.WriteCT_DataLabels = function (oVal) { + var oThis = this; + if(oVal.pos !== null) { + this.bs.WriteItem(c_oserct_chartExDataLabelsPOS, function() { + oThis.WriteCT_DataLabelPos(oVal.pos); + }); + } + if(oVal.numFmt !== null) { + this.bs.WriteItem(c_oserct_chartExDataLabelsNUMFMT, function() { + oThis.WriteCT_NumFmt(oVal.numFmt); + }); + } + if(oVal.txPr !== null) { + this.bs.WriteItem(c_oserct_chartExDataLabelsTXPR, function() { + oThis.WriteTxPr(oVal.txPr); + }); + } + if(oVal.spPr !== null) { + this.bs.WriteItem(c_oserct_chartExDataLabelsSPPR, function() { + oThis.WriteSpPr(oVal.spPr); + }); + } + if(oVal.visibility !== null) { + this.bs.WriteItem(c_oserct_chartExDataLabelsVISABILITIES, function() { + oThis.WriteCT_DataLabelVisibilities(oVal.visibility); + }); + } + if(oVal.separator !== null) { + this.bs.WriteItem(c_oserct_chartExDataLabelsSEPARATOR, function() { + oThis.memory.WriteString3(oVal.separator); + }); + } + if (oVal.dataLabel !== null) { + for (var i = 0, length = oVal.dataLabel.length; i < length; ++i) { + var oCurVal = oVal.dataLabel[i]; + if (null != oCurVal) { + this.bs.WriteItem(c_oserct_chartExDataLabelsDATALABEL, function () { + oThis.WriteCT_Datalabel(oCurVal); + }); + } + } + } + if (oVal.dataLabelHidden !== null) { + for (var i = 0, length = oVal.dataLabelHidden.length; i < length; ++i) { + var oCurVal = oVal.dataLabelHidden[i]; + if (null != oCurVal) { + this.bs.WriteItem(c_oserct_chartExDataLabelsDATALABELHIDDEN, function () { + oThis.WriteCT_DataLabelHidden(oCurVal); + }); + } + } + } +}; +BinaryChartReader.prototype.ReadCT_DataLabels = function (type, length, val) { + var res = c_oSerConstants.ReadOk; + var oThis = this; + var oNewVal; + if (c_oserct_chartExDataLabelsPOS === type) + { + var oNewVal = new AscFormat.CDataLabelPos(); + res = this.bcr.Read2(length, function (t, l) { + return oThis.ReadCT_DataLabelPos(t, l, oNewVal); + }); + val.setPos(oNewVal); + } + else if (c_oserct_chartExDataLabelsNUMFMT === type) + { + var oNewVal = new AscFormat.CNumFmt(); + res = this.bcr.Read2(length, function (t, l) { + return oThis.ReadCT_NumFmt(t, l, oNewVal); + }); + val.setNumFmt(oNewVal); + } + else if (c_oserct_chartExDataLabelsTXPR === type) + { + val.setTxPr(this.ReadTxPr(length)); + val.txPr.setParent(val); + } + else if (c_oserct_chartExDataLabelsSPPR === type) + { + val.setSpPr(this.ReadSpPr(length)); + val.spPr.setParent(val); + } + else if (c_oserct_chartExDataLabelsVISABILITIES === type) + { + var oNewVal = new AscFormat.CDataLabelVisibilities(); + res = this.bcr.Read2(length, function (t, l) { + return oThis.ReadCT_DataLabelVisibilities(t, l, oNewVal); + }); + val.setVisibility(oNewVal); + } + else if (c_oserct_chartExDataLabelsSEPARATOR === type) + { + val.setSeparator(this.stream.GetString2LE(length)); + } + else if (c_oserct_chartExDataLabelsDATALABEL === type) { + var oNewVal = new AscFormat.CDatalabel(); + res = this.bcr.Read1(length, function (t, l) { + return oThis.ReadCT_Datalabel(t, l, oNewVal); + }); + val.addDatalabel(oNewVal); + } + else if (c_oserct_chartExDataLabelsDATALABELHIDDEN === type) { + var oNewVal = new AscFormat.CDataLabelHidden(); + res = this.bcr.Read1(length, function (t, l) { + return oThis.ReadCT_DataLabelHidden(t, l, oNewVal); + }); + val.addDataLabelHidden(oNewVal); + } + else + { + res = c_oSerConstants.ReadUnknown; + } + return res; +}; + +// CNumFmt (ChartExNumFmt) +var c_oserct_chartExNumberFormatFORMATCODE = 0; +var c_oserct_chartExNumberFormatSOURCELINKED = 1; + +BinaryChartWriter.prototype.WriteCT_ChartExNumFmt = function (oVal) { + var oThis = this; + if (oVal.formatCode !== null) { + this.bs.WriteItem(c_oserct_chartExNumberFormatFORMATCODE, function () { + oThis.memory.WriteString3(oVal.formatCode); + }); + } + if (oVal.sourceLinked !== null) { + this.bs.WriteItem(c_oserct_chartExNumberFormatSOURCELINKED, function () { + oThis.memory.WriteBool(oVal.sourceLinked); + }); + } +}; +BinaryChartReader.prototype.ReadCT_ChartExNumFmt = function (type, length, val) { + var res = c_oSerConstants.ReadOk; + var oThis = this; + var oNewVal; + if (c_oserct_chartExNumberFormatFORMATCODE === type) { + val.setFormatCode(this.stream.GetString2LE(length)); + } + else if (c_oserct_chartExNumberFormatSOURCELINKED === type) { + val.setSourceLinked(this.stream.GetBool()); + } + else + { + res = c_oSerConstants.ReadUnknown; + } + return res; +}; + +// CDataLabel +var c_oserct_chartExDataLabelIDX = 0; +var c_oserct_chartExDataLabelPOS = 1; +var c_oserct_chartExDataLabelNUMFMT = 2; +var c_oserct_chartExDataLabelTXPR = 3; +var c_oserct_chartExDataLabelSPPR = 4; +var c_oserct_chartExDataLabelVISABILITIES = 5; +var c_oserct_chartExDataLabelSEPARATOR = 6; + +BinaryChartWriter.prototype.WriteCT_DataLabel = function (oVal) { + var oThis = this; + if(oVal.idx !== null) { + this.bs.WriteItem(c_oserct_chartExDataLabelIDX, function() { + oThis.memory.WriteLong(oVal.idx); + }); + } + if(oVal.pos !== null) { + this.bs.WriteItem(c_oserct_chartExDataLabelPOS, function() { + oThis.WriteCT_DataLabelPos(oVal.pos); + }); + } + if(oVal.numFmt !== null) { + this.bs.WriteItem(c_oserct_chartExDataLabelNUMFMT, function() { + oThis.WriteCT_NumFmt(oVal.numFmt); + }); + } + if(oVal.txPr !== null) { + this.bs.WriteItem(c_oserct_chartExDataLabelTXPR, function() { + oThis.WriteTxPr(oVal.txPr); + }); + } + if(oVal.spPr !== null) { + this.bs.WriteItem(c_oserct_chartExDataLabelSPPR, function() { + oThis.WriteSpPr(oVal.spPr); + }); + } + if(oVal.visibility !== null) { + this.bs.WriteItem(c_oserct_chartExDataLabelVISABILITIES, function() { + oThis.WriteCT_DataLabelVisibilities(oVal.visibility); + }); + } + if(oVal.separator !== null) { + this.bs.WriteItem(c_oserct_chartExDataLabelSEPARATOR, function() { + oThis.memory.WriteString3(oVal.separator); + }); + } +}; +BinaryChartReader.prototype.ReadCT_DataLabel = function (type, length, val) { + var res = c_oSerConstants.ReadOk; + var oThis = this; + var oNewVal; + if (c_oserct_chartExDataLabelIDX === type) + { + val.setIdx(this.stream.GetULongLE()); + } + else if (c_oserct_chartExDataLabelPOS === type) + { + var oNewVal = new AscFormat.CDataLabelPos(); + res = this.bcr.Read2(length, function (t, l) { + return oThis.ReadCT_DataLabelPos(t, l, oNewVal); + }); + val.setPos(oNewVal); + } + else if (c_oserct_chartExDataLabelNUMFMT === type) + { + var oNewVal = new AscFormat.CNumFmt(); + res = this.bcr.Read2(length, function (t, l) { + return oThis.ReadCT_NumFmt(t, l, oNewVal); + }); + val.setNumFmt(oNewVal); + } + else if (c_oserct_chartExDataLabelTXPR === type) + { + val.setTxPr(this.ReadTxPr(length)); + val.txPr.setParent(val); + } + else if (c_oserct_chartExDataLabelSPPR === type) + { + val.setSpPr(this.ReadSpPr(length)); + val.spPr.setParent(val); + } + else if (c_oserct_chartExDataLabelVISABILITIES === type) + { + var oNewVal = new AscFormat.CDataLabelVisibilities(); + res = this.bcr.Read2(length, function (t, l) { + return oThis.ReadCT_DataLabelVisibilities(t, l, oNewVal); + }); + val.setVisibility(oNewVal); + } + else if (c_oserct_chartExDataLabelSEPARATOR === type) + { + val.setSeparator(this.stream.GetString2LE(length)); } else { From 320560626cb3e504f61eff97e91e184f81f28626 Mon Sep 17 00:00:00 2001 From: Dmitriy Aleksandrov Date: Mon, 21 Aug 2023 01:39:13 +0600 Subject: [PATCH 18/30] For bug #62819 Add structures. --- common/Drawings/Format/ChartEx.js | 515 ++++++----- common/tempSerializeChart.js | 1430 ++++++++++++++++++++++++++++- 2 files changed, 1650 insertions(+), 295 deletions(-) diff --git a/common/Drawings/Format/ChartEx.js b/common/Drawings/Format/ChartEx.js index 6a8591ce8d..a54ede73af 100644 --- a/common/Drawings/Format/ChartEx.js +++ b/common/Drawings/Format/ChartEx.js @@ -231,70 +231,70 @@ }; - // // Title (contains in ChartFormat.js) - // drawingsChangesMap[AscDFH.historyitem_Title_SetTx] = function(oClass, value) { - // oClass.tx = value; - // }; - // drawingsChangesMap[AscDFH.historyitem_Title_SetSpPr] = function(oClass, value) { - // oClass.spPr = value; - // }; - // drawingsChangesMap[AscDFH.historyitem_Title_SetTxPr] = function(oClass, value) { - // oClass.txPr = value; - // }; - // drawingsChangesMap[AscDFH.historyitem_Title_SetPos] = function(oClass, value) { - // oClass.pos = value; - // }; - // drawingsChangesMap[AscDFH.historyitem_Title_SetAlign] = function(oClass, value) { - // oClass.align = value; - // }; - // drawingsChangesMap[AscDFH.historyitem_Title_SetOverlay] = function(oClass, value) { - // oClass.overlay = value; - // }; - // AscDFH.changesFactory[AscDFH.historyitem_Title_SetTx] = window['AscDFH'].CChangesDrawingsObjectNoId; - // AscDFH.changesFactory[AscDFH.historyitem_Title_SetSpPr] = window['AscDFH'].CChangesDrawingsObjectNoId; - // AscDFH.changesFactory[AscDFH.historyitem_Title_SetTxPr] = window['AscDFH'].CChangesDrawingsObjectNoId; - // AscDFH.changesFactory[AscDFH.historyitem_Title_SetPos] = window['AscDFH'].CChangesDrawingsObjectNoId; - // AscDFH.changesFactory[AscDFH.historyitem_Title_SetAlign] = window['AscDFH'].CChangesDrawingsObjectNoId; - // AscDFH.changesFactory[AscDFH.historyitem_Title_SetOverlay] = window['AscDFH'].CChangesDrawingsBool; - // function CTitle() { - // CBaseChartObject.call(this); - // this.tx = null; - // this.spPr = null; - // this.txPr = null; + // ChartExTitle (Title contains in ChartFormat.js but different fields) + drawingsChangesMap[AscDFH.historyitem_ChartExTitle_SetTx] = function(oClass, value) { + oClass.tx = value; + }; + drawingsChangesMap[AscDFH.historyitem_ChartExTitle_SetSpPr] = function(oClass, value) { + oClass.spPr = value; + }; + drawingsChangesMap[AscDFH.historyitem_ChartExTitle_SetTxPr] = function(oClass, value) { + oClass.txPr = value; + }; + drawingsChangesMap[AscDFH.historyitem_ChartExTitle_SetPos] = function(oClass, value) { + oClass.pos = value; + }; + drawingsChangesMap[AscDFH.historyitem_ChartExTitle_SetAlign] = function(oClass, value) { + oClass.align = value; + }; + drawingsChangesMap[AscDFH.historyitem_ChartExTitle_SetOverlay] = function(oClass, value) { + oClass.overlay = value; + }; + AscDFH.changesFactory[AscDFH.historyitem_ChartExTitle_SetTx] = window['AscDFH'].CChangesDrawingsObjectNoId; + AscDFH.changesFactory[AscDFH.historyitem_ChartExTitle_SetSpPr] = window['AscDFH'].CChangesDrawingsObjectNoId; + AscDFH.changesFactory[AscDFH.historyitem_ChartExTitle_SetTxPr] = window['AscDFH'].CChangesDrawingsObjectNoId; + AscDFH.changesFactory[AscDFH.historyitem_ChartExTitle_SetPos] = window['AscDFH'].CChangesDrawingsObjectNoId; + AscDFH.changesFactory[AscDFH.historyitem_ChartExTitle_SetAlign] = window['AscDFH'].CChangesDrawingsObjectNoId; + AscDFH.changesFactory[AscDFH.historyitem_ChartExTitle_SetOverlay] = window['AscDFH'].CChangesDrawingsBool; + function CChartExTitle() { + CBaseChartObject.call(this); + this.tx = null; + this.spPr = null; + this.txPr = null; - // //for chart title only (but not axis title) - // this.pos = null; - // this.align = null; - // this.overlay = null; - // } + //for chart title only (but not axis title) + this.pos = null; + this.align = null; + this.overlay = null; + } - // InitClass(CTitle, CBaseChartObject, AscDFH.historyitem_type_Title); + InitClass(CChartExTitle, CBaseChartObject, AscDFH.historyitem_type_ChartExTitle); - // CTitle.prototype.setTx = function(pr) { - // History.CanAddChanges() && History.Add(new CChangesDrawingsObjectNoId(this, AscDFH.historyitem_Title_SetTx, this.tx, pr)); - // this.tx = pr; - // }; - // CTitle.prototype.setSpPr = function(pr) { - // History.CanAddChanges() && History.Add(new CChangesDrawingsObjectNoId(this, AscDFH.historyitem_Title_SetSpPr, this.spPr, pr)); - // this.spPr = pr; - // }; - // CTitle.prototype.setTxPr = function(pr) { - // History.CanAddChanges() && History.Add(new CChangesDrawingsObjectNoId(this, AscDFH.historyitem_Title_SetTxPr, this.txPr, pr)); - // this.txPr = pr; - // }; - // CTitle.prototype.setPos = function(pr) { - // History.CanAddChanges() && History.Add(new CChangesDrawingsObjectNoId(this, AscDFH.historyitem_Title_SetPos, this.pos, pr)); - // this.pos = pr; - // }; - // CTitle.prototype.setAlign = function(pr) { - // History.CanAddChanges() && History.Add(new CChangesDrawingsObjectNoId(this, AscDFH.historyitem_Title_SetAlign, this.align, pr)); - // this.align = pr; - // }; - // CTitle.prototype.setOverlay = function(pr) { - // History.CanAddChanges() && History.Add(new CChangesDrawingsBool(this, AscDFH.historyitem_Title_SetOverlay, this.overlay, pr)); - // this.overlay = pr; - // }; - // + CChartExTitle.prototype.setTx = function(pr) { + History.CanAddChanges() && History.Add(new CChangesDrawingsObjectNoId(this, AscDFH.historyitem_ChartExTitle_SetTx, this.tx, pr)); + this.tx = pr; + }; + CChartExTitle.prototype.setSpPr = function(pr) { + History.CanAddChanges() && History.Add(new CChangesDrawingsObjectNoId(this, AscDFH.historyitem_ChartExTitle_SetSpPr, this.spPr, pr)); + this.spPr = pr; + }; + CChartExTitle.prototype.setTxPr = function(pr) { + History.CanAddChanges() && History.Add(new CChangesDrawingsObjectNoId(this, AscDFH.historyitem_ChartExTitle_SetTxPr, this.txPr, pr)); + this.txPr = pr; + }; + CChartExTitle.prototype.setPos = function(pr) { + History.CanAddChanges() && History.Add(new CChangesDrawingsObjectNoId(this, AscDFH.historyitem_ChartExTitle_SetPos, this.pos, pr)); + this.pos = pr; + }; + CChartExTitle.prototype.setAlign = function(pr) { + History.CanAddChanges() && History.Add(new CChangesDrawingsObjectNoId(this, AscDFH.historyitem_ChartExTitle_SetAlign, this.align, pr)); + this.align = pr; + }; + CChartExTitle.prototype.setOverlay = function(pr) { + History.CanAddChanges() && History.Add(new CChangesDrawingsBool(this, AscDFH.historyitem_ChartExTitle_SetOverlay, this.overlay, pr)); + this.overlay = pr; + }; + // // AxisTitle (CTitle instead of CAxisTitle) // drawingsChangesMap[AscDFH.historyitem_AxisTitle_SetTx] = function(oClass, value) { @@ -1228,10 +1228,15 @@ drawingsChangesMap[AscDFH.historyitem_Formula_SetDir] = function(oClass, value) { oClass.dir = value; }; + drawingsChangesMap[AscDFH.historyitem_Formula_SetContent] = function(oClass, value) { + oClass.content = value; + }; AscDFH.changesFactory[AscDFH.historyitem_Formula_SetDir] = window['AscDFH'].CChangesDrawingsObjectNoId; + AscDFH.changesFactory[AscDFH.historyitem_Formula_SetContent] = window['AscDFH'].CChangesDrawingsString; function CFormula() { CBaseChartObject.call(this); this.dir = null; + this.content = null; } InitClass(CFormula, CBaseChartObject, AscDFH.historyitem_type_Formula); @@ -1240,6 +1245,10 @@ History.CanAddChanges() && History.Add(new CChangesDrawingsObjectNoId(this, AscDFH.historyitem_Formula_SetDir, this.dir, pr)); this.dir = pr; }; + CFormula.prototype.setContent = function(pr) { + History.CanAddChanges() && History.Add(new CChangesDrawingsString(this, AscDFH.historyitem_Formula_SetContent, this.content, pr)); + this.content = pr; + }; // GeoCache @@ -2088,59 +2097,59 @@ // }; // - // // Legend (contains in ChartFormat.js) - // drawingsChangesMap[AscDFH.historyitem_Legend_SetSpPr] = function(oClass, value) { - // oClass.spPr = value; - // }; - // drawingsChangesMap[AscDFH.historyitem_Legend_SetTxPr] = function(oClass, value) { - // oClass.txPr = value; - // }; - // drawingsChangesMap[AscDFH.historyitem_Legend_SetPos] = function(oClass, value) { - // oClass.pos = value; - // }; - // drawingsChangesMap[AscDFH.historyitem_Legend_SetAlign] = function(oClass, value) { - // oClass.align = value; - // }; - // drawingsChangesMap[AscDFH.historyitem_Legend_SetOverlay] = function(oClass, value) { - // oClass.overlay = value; - // }; - // AscDFH.changesFactory[AscDFH.historyitem_Legend_SetSpPr] = window['AscDFH'].CChangesDrawingsObjectNoId; - // AscDFH.changesFactory[AscDFH.historyitem_Legend_SetTxPr] = window['AscDFH'].CChangesDrawingsObjectNoId; - // AscDFH.changesFactory[AscDFH.historyitem_Legend_SetPos] = window['AscDFH'].CChangesDrawingsObjectNoId; - // AscDFH.changesFactory[AscDFH.historyitem_Legend_SetAlign] = window['AscDFH'].CChangesDrawingsObjectNoId; - // AscDFH.changesFactory[AscDFH.historyitem_Legend_SetOverlay] = window['AscDFH'].CChangesDrawingsBool; - // function CLegend() { - // CBaseChartObject.call(this); - // this.spPr = null; - // this.txPr = null; - // this.pos = null; - // this.align = null; - // this.overlay = null; - // } + // ChartExLegend (Legend contains in ChartFormat.js) + drawingsChangesMap[AscDFH.historyitem_ChartExLegend_SetSpPr] = function(oClass, value) { + oClass.spPr = value; + }; + drawingsChangesMap[AscDFH.historyitem_ChartExLegend_SetTxPr] = function(oClass, value) { + oClass.txPr = value; + }; + drawingsChangesMap[AscDFH.historyitem_ChartExLegend_SetPos] = function(oClass, value) { + oClass.pos = value; + }; + drawingsChangesMap[AscDFH.historyitem_ChartExLegend_SetAlign] = function(oClass, value) { + oClass.align = value; + }; + drawingsChangesMap[AscDFH.historyitem_ChartExLegend_SetOverlay] = function(oClass, value) { + oClass.overlay = value; + }; + AscDFH.changesFactory[AscDFH.historyitem_ChartExLegend_SetSpPr] = window['AscDFH'].CChangesDrawingsObjectNoId; + AscDFH.changesFactory[AscDFH.historyitem_ChartExLegend_SetTxPr] = window['AscDFH'].CChangesDrawingsObjectNoId; + AscDFH.changesFactory[AscDFH.historyitem_ChartExLegend_SetPos] = window['AscDFH'].CChangesDrawingsObjectNoId; + AscDFH.changesFactory[AscDFH.historyitem_ChartExLegend_SetAlign] = window['AscDFH'].CChangesDrawingsObjectNoId; + AscDFH.changesFactory[AscDFH.historyitem_ChartExLegend_SetOverlay] = window['AscDFH'].CChangesDrawingsBool; + function CChartExLegend() { + CBaseChartObject.call(this); + this.spPr = null; + this.txPr = null; + this.pos = null; + this.align = null; + this.overlay = null; + } - // InitClass(CLegend, CBaseChartObject, AscDFH.historyitem_type_Legend); + InitClass(CChartExLegend, CBaseChartObject, AscDFH.historyitem_type_ChartExLegend); - // CLegend.prototype.setSpPr = function(pr) { - // History.CanAddChanges() && History.Add(new CChangesDrawingsObjectNoId(this, AscDFH.historyitem_Legend_SetSpPr, this.spPr, pr)); - // this.spPr = pr; - // }; - // CLegend.prototype.setTxPr = function(pr) { - // History.CanAddChanges() && History.Add(new CChangesDrawingsObjectNoId(this, AscDFH.historyitem_Legend_SetTxPr, this.txPr, pr)); - // this.txPr = pr; - // }; - // CLegend.prototype.setPos = function(pr) { - // History.CanAddChanges() && History.Add(new CChangesDrawingsObjectNoId(this, AscDFH.historyitem_Legend_SetPos, this.pos, pr)); - // this.pos = pr; - // }; - // CLegend.prototype.setAlign = function(pr) { - // History.CanAddChanges() && History.Add(new CChangesDrawingsObjectNoId(this, AscDFH.historyitem_Legend_SetAlign, this.align, pr)); - // this.align = pr; - // }; - // CLegend.prototype.setOverlay = function(pr) { - // History.CanAddChanges() && History.Add(new CChangesDrawingsBool(this, AscDFH.historyitem_Legend_SetOverlay, this.overlay, pr)); - // this.overlay = pr; - // }; - // + CChartExLegend.prototype.setSpPr = function(pr) { + History.CanAddChanges() && History.Add(new CChangesDrawingsObjectNoId(this, AscDFH.historyitem_ChartExLegend_SetSpPr, this.spPr, pr)); + this.spPr = pr; + }; + CChartExLegend.prototype.setTxPr = function(pr) { + History.CanAddChanges() && History.Add(new CChangesDrawingsObjectNoId(this, AscDFH.historyitem_ChartExLegend_SetTxPr, this.txPr, pr)); + this.txPr = pr; + }; + CChartExLegend.prototype.setPos = function(pr) { + History.CanAddChanges() && History.Add(new CChangesDrawingsObjectNoId(this, AscDFH.historyitem_ChartExLegend_SetPos, this.pos, pr)); + this.pos = pr; + }; + CChartExLegend.prototype.setAlign = function(pr) { + History.CanAddChanges() && History.Add(new CChangesDrawingsObjectNoId(this, AscDFH.historyitem_ChartExLegend_SetAlign, this.align, pr)); + this.align = pr; + }; + CChartExLegend.prototype.setOverlay = function(pr) { + History.CanAddChanges() && History.Add(new CChangesDrawingsBool(this, AscDFH.historyitem_ChartExLegend_SetOverlay, this.overlay, pr)); + this.overlay = pr; + }; + // // NumberColorPosition (CNumericPoint replaces this class) // drawingsChangesMap[AscDFH.historyitem_NumberColorPosition_SetVal] = function(oClass, value) { @@ -2228,65 +2237,65 @@ }; - // // NumericLevel (CNumLit contains in ChartFormat.js) - // drawingsChangesMap[AscDFH.historyitem_NumericLevel_SetPt] = function(oClass, value) { - // oClass.pt = value; - // }; - // drawingsChangesMap[AscDFH.historyitem_NumericLevel_SetPtCount] = function(oClass, value) { - // oClass.ptCount = value; - // }; - // drawingsChangesMap[AscDFH.historyitem_NumericLevel_SetFormatCode] = function(oClass, value) { - // oClass.formatCode = value; - // }; - // drawingsChangesMap[AscDFH.historyitem_NumericLevel_SetName] = function(oClass, value) { - // oClass.name = value; - // }; - // AscDFH.changesFactory[AscDFH.historyitem_NumericLevel_SetPt] = window['AscDFH'].CChangesDrawingsObjectNoId; - // AscDFH.changesFactory[AscDFH.historyitem_NumericLevel_SetPtCount] = window['AscDFH'].CChangesDrawingsLong; - // AscDFH.changesFactory[AscDFH.historyitem_NumericLevel_SetFormatCode] = window['AscDFH'].CChangesDrawingsString; - // AscDFH.changesFactory[AscDFH.historyitem_NumericLevel_SetName] = window['AscDFH'].CChangesDrawingsString; - // function CNumericLevel() { - // CBaseChartObject.call(this); - // this.pt = []; - // this.ptCount = null; - // this.formatCode = null; - // this.name = null; - // } + // NumericLevel (CNumLit contains in ChartFormat.js but different fields) + drawingsChangesMap[AscDFH.historyitem_NumericLevel_SetPt] = function(oClass, value) { + oClass.pt = value; + }; + drawingsChangesMap[AscDFH.historyitem_NumericLevel_SetPtCount] = function(oClass, value) { + oClass.ptCount = value; + }; + drawingsChangesMap[AscDFH.historyitem_NumericLevel_SetFormatCode] = function(oClass, value) { + oClass.formatCode = value; + }; + drawingsChangesMap[AscDFH.historyitem_NumericLevel_SetName] = function(oClass, value) { + oClass.name = value; + }; + AscDFH.changesFactory[AscDFH.historyitem_NumericLevel_SetPt] = window['AscDFH'].CChangesDrawingsObjectNoId; + AscDFH.changesFactory[AscDFH.historyitem_NumericLevel_SetPtCount] = window['AscDFH'].CChangesDrawingsLong; + AscDFH.changesFactory[AscDFH.historyitem_NumericLevel_SetFormatCode] = window['AscDFH'].CChangesDrawingsString; + AscDFH.changesFactory[AscDFH.historyitem_NumericLevel_SetName] = window['AscDFH'].CChangesDrawingsString; + function CNumericLevel() { + CBaseChartObject.call(this); + this.pt = []; + this.ptCount = null; + this.formatCode = null; + this.name = null; + } - // InitClass(CNumericLevel, CBaseChartObject, AscDFH.historyitem_type_NumericLevel); - - // CNumericLevel.prototype.setPt = function(pr) { - // History.CanAddChanges() && History.Add(new CChangesDrawingsObjectNoId(this, AscDFH.historyitem_NumericLevel_SetPt, this.pt, pr)); - // this.pt = pr; - // }; - // CNumericLevel.prototype.addPt = function(pr, idx) { - // var pos; - // if(AscFormat.isRealNumber(idx)) - // pos = idx; - // else - // pos = this.pt.length; - // History.CanAddChanges() && History.Add(new CChangesDrawingsContent(this, AscDFH.historyitem_NumericLevel_AddPt, pos, [pr], true)); - // this.pt.splice(pos, 0, pr); - // }; - // CNumericLevel.prototype.removePtByPos = function(pos) { - // if(this.pt[pos]) { - // var pt = this.pt.splice(pos, 1)[0]; - // History.CanAddChanges() && History.Add(new CChangesDrawingsContent(this, AscDFH.historyitem_NumericLevel_RemovePt, pos, [pt], false)); - // } - // }; - // CNumericLevel.prototype.setPtCount = function(pr) { - // History.CanAddChanges() && History.Add(new CChangesDrawingsLong(this, AscDFH.historyitem_NumericLevel_SetPtCount, this.ptCount, pr)); - // this.ptCount = pr; - // }; - // CNumericLevel.prototype.setFormatCode = function(pr) { - // History.CanAddChanges() && History.Add(new CChangesDrawingsString(this, AscDFH.historyitem_NumericLevel_SetFormatCode, this.formatCode, pr)); - // this.formatCode = pr; - // }; - // CNumericLevel.prototype.setName = function(pr) { - // History.CanAddChanges() && History.Add(new CChangesDrawingsString(this, AscDFH.historyitem_NumericLevel_SetName, this.name, pr)); - // this.name = pr; - // }; - // + InitClass(CNumericLevel, CBaseChartObject, AscDFH.historyitem_type_NumericLevel); + + CNumericLevel.prototype.setPt = function(pr) { + History.CanAddChanges() && History.Add(new CChangesDrawingsObjectNoId(this, AscDFH.historyitem_NumericLevel_SetPt, this.pt, pr)); + this.pt = pr; + }; + CNumericLevel.prototype.addPt = function(pr, idx) { + var pos; + if(AscFormat.isRealNumber(idx)) + pos = idx; + else + pos = this.pt.length; + History.CanAddChanges() && History.Add(new CChangesDrawingsContent(this, AscDFH.historyitem_NumericLevel_AddPt, pos, [pr], true)); + this.pt.splice(pos, 0, pr); + }; + CNumericLevel.prototype.removePtByPos = function(pos) { + if(this.pt[pos]) { + var pt = this.pt.splice(pos, 1)[0]; + History.CanAddChanges() && History.Add(new CChangesDrawingsContent(this, AscDFH.historyitem_NumericLevel_RemovePt, pos, [pt], false)); + } + }; + CNumericLevel.prototype.setPtCount = function(pr) { + History.CanAddChanges() && History.Add(new CChangesDrawingsLong(this, AscDFH.historyitem_NumericLevel_SetPtCount, this.ptCount, pr)); + this.ptCount = pr; + }; + CNumericLevel.prototype.setFormatCode = function(pr) { + History.CanAddChanges() && History.Add(new CChangesDrawingsString(this, AscDFH.historyitem_NumericLevel_SetFormatCode, this.formatCode, pr)); + this.formatCode = pr; + }; + CNumericLevel.prototype.setName = function(pr) { + History.CanAddChanges() && History.Add(new CChangesDrawingsString(this, AscDFH.historyitem_NumericLevel_SetName, this.name, pr)); + this.name = pr; + }; + // NumericValue drawingsChangesMap[AscDFH.historyitem_NumericValue_SetIdx] = function(oClass, value) { @@ -2975,8 +2984,8 @@ this.aggregation = null; this.statistics = null; this.subtotals = null; - // todo in ChartSerializeEx.h this.binning = null; + // todo in ChartSerializeEx.h this.geography = null; } @@ -3110,56 +3119,56 @@ }; - // // StringLevel (CStrCache contains in ChartFormat.js) - // drawingsChangesMap[AscDFH.historyitem_StringLevel_SetPt] = function(oClass, value) { - // oClass.pt = value; - // }; - // drawingsChangesMap[AscDFH.historyitem_StringLevel_SetPtCount] = function(oClass, value) { - // oClass.ptCount = value; - // }; - // drawingsChangesMap[AscDFH.historyitem_StringLevel_SetName] = function(oClass, value) { - // oClass.name = value; - // }; - // AscDFH.changesFactory[AscDFH.historyitem_StringLevel_SetPt] = window['AscDFH'].CChangesDrawingsObjectNoId; - // AscDFH.changesFactory[AscDFH.historyitem_StringLevel_SetPtCount] = window['AscDFH'].CChangesDrawingsLong; - // AscDFH.changesFactory[AscDFH.historyitem_StringLevel_SetName] = window['AscDFH'].CChangesDrawingsString; - // function CStringLevel() { - // CBaseChartObject.call(this); - // this.pt = []; - // this.ptCount = null; - // this.name = null; - // } + // StringLevel (CStrCache contains in ChartFormat.js) + drawingsChangesMap[AscDFH.historyitem_StringLevel_SetPt] = function(oClass, value) { + oClass.pt = value; + }; + drawingsChangesMap[AscDFH.historyitem_StringLevel_SetPtCount] = function(oClass, value) { + oClass.ptCount = value; + }; + drawingsChangesMap[AscDFH.historyitem_StringLevel_SetName] = function(oClass, value) { + oClass.name = value; + }; + AscDFH.changesFactory[AscDFH.historyitem_StringLevel_SetPt] = window['AscDFH'].CChangesDrawingsObjectNoId; + AscDFH.changesFactory[AscDFH.historyitem_StringLevel_SetPtCount] = window['AscDFH'].CChangesDrawingsLong; + AscDFH.changesFactory[AscDFH.historyitem_StringLevel_SetName] = window['AscDFH'].CChangesDrawingsString; + function CStringLevel() { + CBaseChartObject.call(this); + this.pt = []; + this.ptCount = null; + this.name = null; + } - // InitClass(CStringLevel, CBaseChartObject, AscDFH.historyitem_type_StringLevel); + InitClass(CStringLevel, CBaseChartObject, AscDFH.historyitem_type_StringLevel); - // CStringLevel.prototype.setPt = function(pr) { - // History.CanAddChanges() && History.Add(new CChangesDrawingsObjectNoId(this, AscDFH.historyitem_StringLevel_SetPt, this.pt, pr)); - // this.pt = pr; - // }; - // CStringLevel.prototype.addPt = function(pr, idx) { - // var pos; - // if(AscFormat.isRealNumber(idx)) - // pos = idx; - // else - // pos = this.pt.length; - // History.CanAddChanges() && History.Add(new CChangesDrawingsContent(this, AscDFH.historyitem_StringLevel_AddPt, pos, [pr], true)); - // this.pt.splice(pos, 0, pr); - // }; - // CStringLevel.prototype.removePtByPos = function(pos) { - // if(this.pt[pos]) { - // var pt = this.pt.splice(pos, 1)[0]; - // History.CanAddChanges() && History.Add(new CChangesDrawingsContent(this, AscDFH.historyitem_StringLevel_RemovePt, pos, [pt], false)); - // } - // }; - // CStringLevel.prototype.setPtCount = function(pr) { - // History.CanAddChanges() && History.Add(new CChangesDrawingsLong(this, AscDFH.historyitem_StringLevel_SetPtCount, this.ptCount, pr)); - // this.ptCount = pr; - // }; - // CStringLevel.prototype.setName = function(pr) { - // History.CanAddChanges() && History.Add(new CChangesDrawingsString(this, AscDFH.historyitem_StringLevel_SetName, this.name, pr)); - // this.name = pr; - // }; - // + CStringLevel.prototype.setPt = function(pr) { + History.CanAddChanges() && History.Add(new CChangesDrawingsObjectNoId(this, AscDFH.historyitem_StringLevel_SetPt, this.pt, pr)); + this.pt = pr; + }; + CStringLevel.prototype.addPt = function(pr, idx) { + var pos; + if(AscFormat.isRealNumber(idx)) + pos = idx; + else + pos = this.pt.length; + History.CanAddChanges() && History.Add(new CChangesDrawingsContent(this, AscDFH.historyitem_StringLevel_AddPt, pos, [pr], true)); + this.pt.splice(pos, 0, pr); + }; + CStringLevel.prototype.removePtByPos = function(pos) { + if(this.pt[pos]) { + var pt = this.pt.splice(pos, 1)[0]; + History.CanAddChanges() && History.Add(new CChangesDrawingsContent(this, AscDFH.historyitem_StringLevel_RemovePt, pos, [pt], false)); + } + }; + CStringLevel.prototype.setPtCount = function(pr) { + History.CanAddChanges() && History.Add(new CChangesDrawingsLong(this, AscDFH.historyitem_StringLevel_SetPtCount, this.ptCount, pr)); + this.ptCount = pr; + }; + CStringLevel.prototype.setName = function(pr) { + History.CanAddChanges() && History.Add(new CChangesDrawingsString(this, AscDFH.historyitem_StringLevel_SetName, this.name, pr)); + this.name = pr; + }; + // StringValue drawingsChangesMap[AscDFH.historyitem_StringValue_SetIdx] = function(oClass, value) { @@ -3575,7 +3584,7 @@ InitClass(CFormulaDirection, CBaseChartObject, AscDFH.historyitem_type_FormulaDirection); - CFormulaDirection.prototype.setAxisUnit = function(pr) { + CFormulaDirection.prototype.setFormulaDirection = function(pr) { History.CanAddChanges() && History.Add(new CChangesDrawingsLong(this, AscDFH.historyitem_FormulaDirection_SetFormulaDirection, this.formulaDirection, pr)); this.formulaDirection = pr; }; @@ -3599,21 +3608,21 @@ }; - // NumericDimensionType - drawingsChangesMap[AscDFH.historyitem_NumericDimensionType_SetNumericDimensionType] = function(oClass, value) { - oClass.numericDimensionType = value; + // DimensionType (NumericDimensionType) + drawingsChangesMap[AscDFH.historyitem_DimensionType_SetDimensionType] = function(oClass, value) { + oClass.dimensionType = value; }; - AscDFH.changesFactory[AscDFH.historyitem_NumericDimensionType_SetNumericDimensionType] = window['AscDFH'].CChangesDrawingsLong; - function CNumericDimensionType() { + AscDFH.changesFactory[AscDFH.historyitem_DimensionType_SetDimensionType] = window['AscDFH'].CChangesDrawingsLong; + function CDimensionType() { CBaseChartObject.call(this); - this.numericDimensionType = null; + this.dimensionType = null; } - InitClass(CNumericDimensionType, CBaseChartObject, AscDFH.historyitem_type_NumericDimensionType); + InitClass(CDimensionType, CBaseChartObject, AscDFH.historyitem_type_DimensionType); - CNumericDimensionType.prototype.setNumericDimensionType = function(pr) { - History.CanAddChanges() && History.Add(new CChangesDrawingsLong(this, AscDFH.historyitem_NumericDimensionType_SetNumericDimensionType, this.numericDimensionType, pr)); - this.numericDimensionType = pr; + CDimensionType.prototype.setDimensionType = function(pr) { + History.CanAddChanges() && History.Add(new CChangesDrawingsLong(this, AscDFH.historyitem_DimensionType_SetDimensionType, this.dimensionType, pr)); + this.dimensionType = pr; }; @@ -3798,37 +3807,41 @@ // DoubleOrAutomatic - drawingsChangesMap[AscDFH.historyitem_DoubleOrAutomatic_SetDoubleValue] = function(oClass, value) { - oClass.doubleValue = value; + drawingsChangesMap[AscDFH.historyitem_DoubleOrAutomatic_SetDValue] = function(oClass, value) { + oClass.dValue = value; }; - drawingsChangesMap[AscDFH.historyitem_DoubleOrAutomatic_SetTypeValue] = function(oClass, value) { - oClass.typeValue = value; + drawingsChangesMap[AscDFH.historyitem_DoubleOrAutomatic_SetEValue] = function(oClass, value) { + oClass.eValue = value; }; - AscDFH.changesFactory[AscDFH.historyitem_DoubleOrAutomatic_SetDoubleValue] = window['AscDFH'].CChangesDrawingsLong; - AscDFH.changesFactory[AscDFH.historyitem_DoubleOrAutomatic_SetTypeValue] = window['AscDFH'].CChangesDrawingsLong; + AscDFH.changesFactory[AscDFH.historyitem_DoubleOrAutomatic_SetDValue] = window['AscDFH'].CChangesDrawingsLong; + AscDFH.changesFactory[AscDFH.historyitem_DoubleOrAutomatic_SetEValue] = window['AscDFH'].CChangesDrawingsDouble2; + + const EDoubleOrAutomatic = { typeAuto: 0, typeDouble: 1}; function CDoubleOrAutomatic() { CBaseChartObject.call(this); - this.doubleValue = 0; - this.typeValue = 1; + this.dValue = 0; + this.eValue = EDoubleOrAutomatic.typeDouble; } InitClass(CDoubleOrAutomatic, CBaseChartObject, AscDFH.historyitem_type_DoubleOrAutomatic); - - CDoubleOrAutomatic.prototype.setDoubleValue = function(pr) { - History.CanAddChanges() && History.Add(new CChangesDrawingsLong(this, AscDFH.historyitem_DoubleOrAutomatic_SetDoubleValue, this.doubleValue, pr)); - this.doubleValue = pr; + CDoubleOrAutomatic.prototype.setDvalue = function(pr) { + History.CanAddChanges() && History.Add(new CChangesDrawingsLong(this, AscDFH.historyitem_DoubleOrAutomatic_SetDValue, this.dValue, pr)); + History.CanAddChanges() && History.Add(new CChangesDrawingsDouble2(this, AscDFH.historyitem_DoubleOrAutomatic_SetEValue, this.eValue, EDoubleOrAutomatic.typeDouble)); + this.dValue = pr; + this.eValue = EDoubleOrAutomatic.typeDouble; }; - CDoubleOrAutomatic.prototype.setTypeValue = function(pr) { - History.CanAddChanges() && History.Add(new CChangesDrawingsLong(this, AscDFH.historyitem_DoubleOrAutomatic_SetTypeValue, this.typeValue, pr)); - this.typeValue = pr; + CDoubleOrAutomatic.prototype.setEValue = function(pr) { + History.CanAddChanges() && History.Add(new CChangesDrawingsDouble2(this, AscDFH.historyitem_DoubleOrAutomatic_SetEValue, this.eValue, pr)); + History.CanAddChanges() && History.Add(new CChangesDrawingsLong(this, AscDFH.historyitem_DoubleOrAutomatic_SetDValue, this.dValue, 0)); + this.eValue = pr; + this.dValue = 0; }; - //--------------------------------------------------------export---------------------------------------------------- window['AscFormat'] = window['AscFormat'] || {}; window['AscFormat'].CAddress = CAddress; window['AscFormat'].CAxis = CAxis; - // window['AscFormat'].CTitle = CTitle; + window['AscFormat'].CChartExTitle = CChartExTitle; // window['AscFormat'].CAxisTitle = CAxisTitle; window['AscFormat'].CAxisUnits = CAxisUnits; window['AscFormat'].CAxisUnitsLabel = CAxisUnitsLabel; @@ -3878,11 +3891,11 @@ window['AscFormat'].CGeoPolygons = CGeoPolygons; window['AscFormat'].CGridlines = CGridlines; // window['AscFormat'].CHeaderFooter = CHeaderFooter; - // window['AscFormat'].CLegend = CLegend; + window['AscFormat'].CChartExLegend = CChartExLegend; // window['AscFormat'].CNumberColorPosition = CNumberColorPosition; // window['AscFormat'].CNumberFormat = CNumberFormat; window['AscFormat'].CNumericDimension = CNumericDimension; - // window['AscFormat'].CNumericLevel = CNumericLevel; + window['AscFormat'].CNumericLevel = CNumericLevel; window['AscFormat'].CNumericValue = CNumericValue; // window['AscFormat'].CPageMargins = CPageMargins; // window['AscFormat'].CPageSetup = CPageSetup; @@ -3900,7 +3913,7 @@ window['AscFormat'].CStatistics = CStatistics; window['AscFormat'].CDimension = CDimension; window['AscFormat'].CStringDimension = CStringDimension; - // window['AscFormat'].CStringLevel = CStringLevel; + window['AscFormat'].CStringLevel = CStringLevel; window['AscFormat'].CStringValue = CStringValue; window['AscFormat'].CSubtotals = CSubtotals; window['AscFormat'].CText = CText; @@ -3917,7 +3930,7 @@ window['AscFormat'].CAxisUnit = CAxisUnit; window['AscFormat'].CFormulaDirection = CFormulaDirection; window['AscFormat'].CIntervalClosedSide = CIntervalClosedSide; - window['AscFormat'].CNumericDimensionType = CNumericDimensionType; + window['AscFormat'].CDimensionType = CDimensionType; window['AscFormat'].CQuartileMethod = CQuartileMethod; window['AscFormat'].CDataLabelPos = CDataLabelPos; window['AscFormat'].CSeriesLayout = CSeriesLayout; diff --git a/common/tempSerializeChart.js b/common/tempSerializeChart.js index 43735b33ef..93a6611174 100644 --- a/common/tempSerializeChart.js +++ b/common/tempSerializeChart.js @@ -280,50 +280,6 @@ BinaryChartReader.prototype.ReadCT_Axis = function (type, length, val) { return res; }; -// CAxisUnits -var c_oserct_chartExAxisUnitTYPE = 0; -var c_oserct_chartExAxisUnitLABEL = 1; - -BinaryChartWriter.prototype.WriteCT_AxisUnits = function (oVal) { - var oThis = this; - if(oVal.unitsLabel !== null) { - this.bs.WriteItem(c_oserct_chartExAxisUnitLABEL, function() { - oThis.WriteCT_AxisUnitsLabel(oVal.unitsLabel); - }); - } - if(oVal.unit !== null) { - this.bs.WriteItem(c_oserct_chartExAxisUnitTYPE, function() { - oThis.WriteCT_AxisUnit(oVal.unit); - }); - } -}; -BinaryChartReader.prototype.ReadCT_AxisUnits = function (type, length, val) { - var res = c_oSerConstants.ReadOk; - var oThis = this; - var oNewVal; - if (c_oserct_chartExAxisUnitLABEL === type) - { - var oNewVal = new AscFormat.CAxisUnitsLabel(); - res = this.bcr.Read1(length, function (t, l) { - return oThis.ReadCT_AxisUnitsLabel(t, l, oNewVal); - }); - val.setUnitsLabel(oNewVal); - } - else if (c_oserct_chartExAxisUnitTYPE === type) - { - var oNewVal = new AscFormat.CAxisUnit(); - res = this.bcr.Read2(length, function (t, l) { - return oThis.ReadCT_AxisUnit(t, l, oNewVal); - }); - val.setUnit(oNewVal); - } - else - { - res = c_oSerConstants.ReadUnknown; - } - return res; -}; - // CChartData var c_oserct_chartExDATA = 0; var c_oserct_chartExEXTERNALDATA = 1; @@ -1055,6 +1011,1392 @@ BinaryChartReader.prototype.ReadCT_DataLabel = function (type, length, val) { return res; }; +// DataLabelHidden +var c_oserct_chartExDataLabelHiddenIDX = 0; + +BinaryChartWriter.prototype.WriteCT_DataLabelHidden = function (oVal) { + var oThis = this; + if(oVal.idx !== null) { + this.bs.WriteItem(c_oserct_chartExDataLabelHiddenIDX, function() { + oThis.memory.WriteLong(oVal.idx); + }); + } +}; +BinaryChartReader.prototype.ReadCT_DataLabelHidden = function (type, length, val) { + var res = c_oSerConstants.ReadOk; + var oThis = this; + var oNewVal; + if (c_oserct_chartExDataLabelHiddenIDX === type) + { + val.setIdx(this.stream.GetULongLE()); + } + else + { + res = c_oSerConstants.ReadUnknown; + } + return res; +}; + +// CSeriesLayoutProperties +var c_oserct_chartExSeriesLayoutPARENT = 0; +var c_oserct_chartExSeriesLayoutREGION = 1; +var c_oserct_chartExSeriesLayoutVISABILITIES = 2; +var c_oserct_chartExSeriesLayoutAGGREGATION = 3; +var c_oserct_chartExSeriesLayoutBINNING = 4; +var c_oserct_chartExSeriesLayoutSTATISTIC = 5; +var c_oserct_chartExSeriesLayoutSUBTOTALS = 6; + +BinaryChartWriter.prototype.WriteCT_SeriesLayoutProperties = function (oVal) { + var oThis = this; + if(oVal.parentLabelLayout !== null) { + this.bs.WriteItem(c_oserct_chartExSeriesLayoutPARENT, function() { + oThis.WriteCT_ParentLabelLayout(oVal.parentLabelLayout); + }); + } + if(oVal.regionLabelLayout !== null) { + this.bs.WriteItem(c_oserct_chartExSeriesLayoutREGION, function() { + oThis.WriteCT_RegionLabelLayout(oVal.regionLabelLayout); + }); + } + if(oVal.visibility !== null) { + this.bs.WriteItem(c_oserct_chartExSeriesLayoutVISABILITIES, function() { + oThis.WriteCT_SeriesElementVisibilities(oVal.visibility); + }); + } + if(oVal.aggregation !== null) { + this.bs.WriteItem(c_oserct_chartExSeriesLayoutAGGREGATION, function() { + oThis.memory.WriteBool(oVal.aggregation); + }); + } + if(oVal.binning !== null) { + this.bs.WriteItem(c_oserct_chartExSeriesLayoutBINNING, function() { + oThis.WriteCT_Binning(oVal.binning); + }); + } + if(oVal.statistics !== null) { + this.bs.WriteItem(c_oserct_chartExSeriesLayoutSTATISTIC, function() { + oThis.WriteCT_Statistics(oVal.statistics); + }); + } + if(oVal.subtotals !== null) { + this.bs.WriteItem(c_oserct_chartExSeriesLayoutSUBTOTALS, function() { + oThis.WriteCT_Subtotals(oVal.subtotals); + }); + } +}; +BinaryChartReader.prototype.ReadCT_SeriesLayoutProperties = function (type, length, val) { + var res = c_oSerConstants.ReadOk; + var oThis = this; + var oNewVal; + if (c_oserct_chartExSeriesLayoutPARENT === type) + { + var oNewVal = new AscFormat.CParentLabelLayout(); + res = this.bcr.Read1(length, function (t, l) { + return oThis.ReadCT_ParentLabelLayout(t, l, oNewVal); + }); + val.setParentLabelLayout(oNewVal); + } + else if (c_oserct_chartExSeriesLayoutREGION === type) + { + var oNewVal = new AscFormat.CRegionLabelLayout(); + res = this.bcr.Read2(length, function (t, l) { + return oThis.ReadCT_RegionLabelLayout(t, l, oNewVal); + }); + val.setRegionLabelLayout(oNewVal); + } + else if (c_oserct_chartExSeriesLayoutVISABILITIES === type) + { + var oNewVal = new AscFormat.CSeriesElementVisibilities(); + res = this.bcr.Read2(length, function (t, l) { + return oThis.ReadCT_SeriesElementVisibilities(t, l, oNewVal); + }); + val.setVisibility(oNewVal); + } + else if (c_oserct_chartExSeriesLayoutAGGREGATION === type) + { + val.setAggregation(this.stream.GetBool()); + } + else if (c_oserct_chartExSeriesLayoutBINNING === type) + { + var oNewVal = new AscFormat.CBinning(); + res = this.bcr.Read2(length, function (t, l) { + return oThis.ReadCT_Binning(t, l, oNewVal); + }); + val.setBinning(oNewVal); + } + else if (c_oserct_chartExSeriesLayoutSTATISTIC === type) + { + var oNewVal = new AscFormat.CStatistics(); + res = this.bcr.Read2(length, function (t, l) { + return oThis.ReadCT_Statistics(t, l, oNewVal); + }); + val.setStatistics(oNewVal); + } + else if (c_oserct_chartExSeriesLayoutSUBTOTALS === type) + { + var oNewVal = new AscFormat.CSubtotals(); + res = this.bcr.Read2(length, function (t, l) { + return oThis.ReadCT_Subtotals(t, l, oNewVal); + }); + val.setSubtotals(oNewVal); + } + else + { + res = c_oSerConstants.ReadUnknown; + } + return res; +}; + +// CDataLabelVisibilities +var c_oserct_chartExDataLabelVisibilitiesSERIES = 0; +var c_oserct_chartExDataLabelVisibilitiesCATEGORY = 1; +var c_oserct_chartExDataLabelVisibilitiesVALUE = 2; + +BinaryChartWriter.prototype.WriteCT_DataLabelVisibilities = function (oVal) { + var oThis = this; + if(oVal.seriesName !== null) { + this.bs.WriteItem(c_oserct_chartExDataLabelVisibilitiesSERIES, function() { + oThis.memory.WriteBool(oVal.seriesName); + }); + } + if(oVal.categoryName !== null) { + this.bs.WriteItem(c_oserct_chartExDataLabelVisibilitiesCATEGORY, function() { + oThis.memory.WriteBool(oVal.categoryName); + }); + } + if(oVal.value !== null) { + this.bs.WriteItem(c_oserct_chartExDataLabelVisibilitiesVALUE, function() { + oThis.memory.WriteBool(oVal.value); + }); + } +}; +BinaryChartReader.prototype.ReadCT_DataLabelVisibilities = function (type, length, val) { + var res = c_oSerConstants.ReadOk; + var oThis = this; + var oNewVal; + if (c_oserct_chartExDataLabelVisibilitiesSERIES === type) + { + val.setSeriesName(this.stream.GetBool()); + } + else if (c_oserct_chartExDataLabelVisibilitiesCATEGORY === type) + { + val.setCategoryName(this.stream.GetBool()); + } + else if (c_oserct_chartExDataLabelVisibilitiesVALUE === type) + { + val.setValue(this.stream.GetBool()); + } + else + { + res = c_oSerConstants.ReadUnknown; + } + return res; +}; + +// CBinning +var c_oserct_chartExBinningBINSIZE = 0; +var c_oserct_chartExBinningBINCOUNT = 1; +var c_oserct_chartExBinningINTERVAL = 2; +var c_oserct_chartExBinningUNDERVAL = 3; +var c_oserct_chartExBinningUNDERAUTO = 4; +var c_oserct_chartExBinningOVERVAL = 5; +var c_oserct_chartExBinningOVERAUTO = 6; + +BinaryChartWriter.prototype.WriteCT_Binning = function (oVal) { + var oThis = this; + if(oVal.binSize !== null) { + this.bs.WriteItem(c_oserct_chartExBinningBINSIZE, function() { + oThis.memory.WriteDouble2(oVal.binSize); + }); + } + if(oVal.binCount !== null) { + this.bs.WriteItem(c_oserct_chartExBinningBINCOUNT, function() { + oThis.memory.WriteLong(oVal.binCount); + }); + } + if(oVal.intervalClosed !== null) { + this.bs.WriteItem(c_oserct_chartExBinningINTERVAL, function() { + oThis.WriteCT_IntervalClosedSide(oVal.intervalClosed); + }); + } + if(oVal.underflow !== null) { + if (oVal.underflow.eValue === EDoubleOrAutomatic.typeDouble) { + this.bs.WriteItem(c_oserct_chartExBinningUNDERVAL, function() { + oThis.memory.WriteDouble2(oVal.underflow.dValue); + }); + } else { + this.bs.WriteItem(c_oserct_chartExBinningUNDERAUTO, function() { + oThis.memory.WriteByte(oVal.underflow.dValue); + }); + } + } + if(oVal.overflow !== null) { + if (oVal.overflow.eValue === EDoubleOrAutomatic.typeDouble) { + this.bs.WriteItem(c_oserct_chartExBinningOVERVAL, function() { + oThis.memory.WriteDouble2(oVal.overflow.dValue); + }); + } else { + this.bs.WriteItem(c_oserct_chartExBinningOVERAUTO, function() { + oThis.memory.WriteByte(oVal.overflow.dValue); + }); + } + } +}; +BinaryChartReader.prototype.ReadCT_Binning = function (type, length, val) { + var res = c_oSerConstants.ReadOk; + var oThis = this; + var oNewVal; + if (c_oserct_chartExBinningBINSIZE === type) + { + val.setBinSize(this.stream.GetDoubleLE()); + } + else if (c_oserct_chartExBinningBINCOUNT === type) + { + val.setBinCount(this.stream.GetULongLE()); + } + else if (c_oserct_chartExBinningINTERVAL === type) + { + var oNewVal = new AscFormat.CIntervalClosedSide(); + res = this.bcr.Read2(length, function (t, l) { + return oThis.ReadCT_IntervalClosedSide(t, l, oNewVal); + }); + val.setIntervalClosed(oNewVal); + } + else if (c_oserct_chartExBinningUNDERVAL === type) + { + var oNewVal = new AscFormat.CDoubleOrAutomatic(); + oNewVal.setDvalue(this.stream.GetDoubleLE()); + val.setUnderflow(oNewVal); + } + else if (c_oserct_chartExBinningUNDERAUTO === type) + { + var oNewVal = new AscFormat.CDoubleOrAutomatic(); + oNewVal.setEValue(this.stream.GetUChar()); + val.setUnderflow(oNewVal); + } + else if (c_oserct_chartExBinningOVERVAL === type) + { + var oNewVal = new AscFormat.CDoubleOrAutomatic(); + oNewVal.setDvalue(this.stream.GetDoubleLE()); + val.setOverflow(oNewVal); + } + else if (c_oserct_chartExBinningOVERAUTO === type) + { + var oNewVal = new AscFormat.CDoubleOrAutomatic(); + oNewVal.setEValue(this.stream.GetUChar()); + val.setOverflow(oNewVal); + } + else + { + res = c_oSerConstants.ReadUnknown; + } + return res; +}; + +// CChartExTitle +var c_oserct_chartExTitleTX = 0; +var c_oserct_chartExTitleTXPR = 1; +var c_oserct_chartExTitleSPPR = 2; +var c_oserct_chartExTitlePOS = 3; +var c_oserct_chartExTitleALIGN = 4; +var c_oserct_chartExTitleOVERLAY = 5; + +BinaryChartWriter.prototype.WriteCT_ChartExTitle = function (oVal) { + var oThis = this; + if(oVal.tx !== null) { + this.bs.WriteItem(c_oserct_chartExTitleTX, function() { + oThis.WriteCT_Text(oVal.tx); + }); + } + if(oVal.txPr !== null) { + this.bs.WriteItem(c_oserct_chartExTitleTXPR, function() { + oThis.WriteTxPr(oVal.txPr); + }); + } + if(oVal.spPr !== null) { + this.bs.WriteItem(c_oserct_chartExTitleSPPR, function() { + oThis.WriteSpPr(oVal.spPr); + }); + } + if(oVal.pos !== null) { + this.bs.WriteItem(c_oserct_chartExTitlePOS, function() { + oThis.WriteCT_SidePos(oVal.pos); + }); + } + if(oVal.align !== null) { + this.bs.WriteItem(c_oserct_chartExTitleALIGN, function() { + oThis.WriteCT_PosAlign(oVal.align); + }); + } + if(oVal.overlay !== null) { + this.bs.WriteItem(c_oserct_chartExTitleOVERLAY, function() { + oThis.memory.WriteBool(oVal.overlay); + }); + } +}; +BinaryChartReader.prototype.ReadCT_ChartExTitle = function (type, length, val) { + var res = c_oSerConstants.ReadOk; + var oThis = this; + var oNewVal; + if (c_oserct_chartExTitleTX === type) + { + var oNewVal = new AscFormat.CText(); + res = this.bcr.Read1(length, function (t, l) { + return oThis.ReadCT_Text(t, l, oNewVal); + }); + val.setTx(oNewVal); + } + else if (c_oserct_chartExTitleTXPR === type) + { + val.setTxPr(this.ReadTxPr(length)); + val.txPr.setParent(val); + } + else if (c_oserct_chartExTitleSPPR === type) + { + val.setSpPr(this.ReadSpPr(length)); + val.spPr.setParent(val); + } + else if (c_oserct_chartExTitlePOS === type) + { + var oNewVal = new AscFormat.CSidePos(); + res = this.bcr.Read2(length, function (t, l) { + return oThis.ReadCT_SidePos(t, l, oNewVal); + }); + val.setPos(oNewVal); + } + else if (c_oserct_chartExTitleALIGN === type) + { + var oNewVal = new AscFormat.CPosAlign(); + res = this.bcr.Read2(length, function (t, l) { + return oThis.ReadCT_PosAlign(t, l, oNewVal); + }); + val.setAlign(oNewVal); + } + else if (c_oserct_chartExTitleOVERLAY === type) + { + val.setOverlay(this.stream.GetBool()); + } + else + { + res = c_oSerConstants.ReadUnknown; + } + return res; +}; + +// CChartExLegend +var c_oserct_chartExLegendTXPR = 0; +var c_oserct_chartExLegendSPPR = 1; +var c_oserct_chartExLegendPOS = 2; +var c_oserct_chartExLegendALIGN = 3; +var c_oserct_chartExLegendOVERLAY = 4; + +BinaryChartWriter.prototype.WriteCT_ChartExLegend = function (oVal) { + var oThis = this; + if(oVal.txPr !== null) { + this.bs.WriteItem(c_oserct_axisTXPR, function() { + oThis.WriteTxPr(oVal.txPr); + }); + } + if(oVal.spPr !== null) { + this.bs.WriteItem(c_oserct_axisSPPR, function() { + oThis.WriteSpPr(oVal.spPr); + }); + } + if(oVal.pos !== null) { + this.bs.WriteItem(c_oserct_chartExLegendPOS, function() { + oThis.WriteCT_SidePos(oVal.pos); + }); + } + if(oVal.align !== null) { + this.bs.WriteItem(c_oserct_chartExLegendALIGN, function() { + oThis.WriteCT_PosAlign(oVal.align); + }); + } + if(oVal.overlay !== null) { + this.bs.WriteItem(c_oserct_chartExLegendOVERLAY, function() { + oThis.memory.WriteBool(oVal.overlay); + }); + } +}; +BinaryChartReader.prototype.ReadCT_ChartExLegend = function (type, length, val) { + var res = c_oSerConstants.ReadOk; + var oThis = this; + var oNewVal; + if (c_oserct_chartExLegendTXPR === type) + { + val.setTxPr(this.ReadTxPr(length)); + val.txPr.setParent(val); + } + else if (c_oserct_chartExLegendSPPR === type) + { + val.setSpPr(this.ReadSpPr(length)); + val.spPr.setParent(val); + } + else if (c_oserct_chartExLegendPOS === type) + { + var oNewVal = new AscFormat.CSidePos(); + res = this.bcr.Read2(length, function (t, l) { + return oThis.ReadCT_SidePos(t, l, oNewVal); + }); + val.setPos(oNewVal); + } + else if (c_oserct_chartExLegendALIGN === type) + { + var oNewVal = new AscFormat.CPosAlign(); + res = this.bcr.Read2(length, function (t, l) { + return oThis.ReadCT_PosAlign(t, l, oNewVal); + }); + val.setAlign(oNewVal); + } + else if (c_oserct_chartExLegendOVERLAY === type) + { + val.setOverlay(this.stream.GetBool()); + } + else + { + res = c_oSerConstants.ReadUnknown; + } + return res; +}; + +// CText +var c_oserct_chartExTextRICH = 0; +var c_oserct_chartExTextDATA = 1; + +BinaryChartWriter.prototype.WriteCT_Text = function (oVal) { + var oThis = this; + if(oVal.rich !== null) { + this.bs.WriteItem(c_oserct_chartExTextRICH, function() { + oThis.WriteCT_TextBody(oVal.rich); + }); + } + if(oVal.txData !== null) { + this.bs.WriteItem(c_oserct_chartExTextDATA, function() { + oThis.WriteCT_TextData(oVal.txData); + }); + } +}; +BinaryChartReader.prototype.ReadCT_Text = function (type, length, val) { + var res = c_oSerConstants.ReadOk; + var oThis = this; + var oNewVal; + if (c_oserct_chartExTextRICH === type) + { + var oNewVal = new AscFormat.CTextBody(); + res = this.bcr.Read1(length, function (t, l) { + return oThis.ReadCT_TextBody(t, l, oNewVal); + }); + val.setRich(oNewVal); + } + else if (c_oserct_chartExTextDATA === type) + { + var oNewVal = new AscFormat.CTextData(); + res = this.bcr.Read2(length, function (t, l) { + return oThis.ReadCT_TextData(t, l, oNewVal); + }); + val.setTxData(oNewVal); + } + else + { + res = c_oSerConstants.ReadUnknown; + } + return res; +}; + +// CTextData +var c_oserct_chartExTextDataFORMULA = 0; +var c_oserct_chartExTextDataVALUE = 1; + +BinaryChartWriter.prototype.WriteCT_TextData = function (oVal) { + var oThis = this; + if(oVal.f !== null) { + this.bs.WriteItem(c_oserct_chartExTextDataFORMULA, function() { + oThis.WriteCT_Formula(oVal.f); + }); + } + if(oVal.v !== null) { + this.bs.WriteItem(c_oserct_chartExTextDataVALUE, function() { + oThis.memory.WriteString3(oVal.v); + }); + } +}; +BinaryChartReader.prototype.ReadCT_TextData = function (type, length, val) { + var res = c_oSerConstants.ReadOk; + var oThis = this; + var oNewVal; + if (c_oserct_chartExTextDataFORMULA === type) + { + var oNewVal = new AscFormat.CFormula(); + res = this.bcr.Read1(length, function (t, l) { + return oThis.ReadCT_Formula(t, l, oNewVal); + }); + val.setF(oNewVal); + } + else if (c_oserct_chartExTextDataVALUE === type) + { + val.setV(this.stream.GetString2LE(length)); + } + else + { + res = c_oSerConstants.ReadUnknown; + } + return res; +}; + +// CData +var c_oserct_chartExDataID = 0; +var c_oserct_chartExDataSTRDIMENSION = 1; +var c_oserct_chartExDataNUMDIMENSION = 2; + +BinaryChartWriter.prototype.WriteCT_Data = function (oVal) { + var oThis = this; + if(oVal.id !== null) { + this.bs.WriteItem(c_oserct_chartExDataID, function() { + oThis.memory.WriteLong(oVal.id); + }); + } + if(oVal.dimension !== null) { + for (var i = 0, length = oVal.dimension.length; i < length; ++i) { + var oDimension = oVal.dimension[i]; + if (oDimension instanceof AscFormat.CNumericDimension) { + this.bs.WriteItem(c_oserct_chartExDataNUMDIMENSION, function() { + oThis.WriteCT_NumericDimension(oDimension); + }); + } else { + this.bs.WriteItem(c_oserct_chartExDataSTRDIMENSION, function() { + oThis.WriteCT_StringDimension(oDimension); + }); + } + } + } +}; +BinaryChartReader.prototype.ReadCT_Data = function (type, length, val) { + var res = c_oSerConstants.ReadOk; + var oThis = this; + var oNewVal; + if (c_oserct_chartExDataID === type) + { + val.setId(this.stream.GetULongLE()); + } + else if (c_oserct_chartExDataSTRDIMENSION === type) + { + var oNewVal = new AscFormat.CStringDimension(); + res = this.bcr.Read1(length, function (t, l) { + return oThis.ReadCT_StringDimension(t, l, oNewVal); + }); + val.addDimension(oNewVal); + } + else if (c_oserct_chartExDataNUMDIMENSION === type) + { + var oNewVal = new AscFormat.CNumericDimension(); + res = this.bcr.Read1(length, function (t, l) { + return oThis.ReadCT_NumericDimension(t, l, oNewVal); + }); + val.addDimension(oNewVal); + } + else + { + res = c_oSerConstants.ReadUnknown; + } + return res; +}; + +// CSubtotals +var c_oserct_chartExSubtotalsIDX = 0; + +BinaryChartWriter.prototype.WriteCT_Subtotals = function (oVal) { + var oThis = this; + if(oVal.idx !== null) { + for (var i = 0, length = oVal.idx.length; i < length; ++i) { + var oCurVal = oVal.idx[i]; + if (null != oCurVal) { + this.bs.WriteItem(c_oserct_chartExSubtotalsIDX, function () { + oThis.memory.WriteLong(oCurVal); + }); + } + } + } +}; +BinaryChartReader.prototype.ReadCT_Subtotals = function (type, length, val) { + var res = c_oSerConstants.ReadOk; + var oThis = this; + var oNewVal; + if (c_oserct_chartExSubtotalsIDX === type) + { + val.addIdx(this.stream.GetULongLE()); + } + else + { + res = c_oSerConstants.ReadUnknown; + } + return res; +}; + +// CSeriesElementVisibilities +var c_oserct_chartExSeriesVisibilitiesCONNECTOR = 0; +var c_oserct_chartExSeriesVisibilitiesMEANLINE = 1; +var c_oserct_chartExSeriesVisibilitiesMEANMARKER = 2; +var c_oserct_chartExSeriesVisibilitiesNONOUTLIERS = 3; +var c_oserct_chartExSeriesVisibilitiesOUTLIERS = 4; + +BinaryChartWriter.prototype.WriteCT_SeriesElementVisibilities = function (oVal) { + var oThis = this; + if(oVal.connectorLines !== null) { + this.bs.WriteItem(c_oserct_chartExSeriesVisibilitiesCONNECTOR, function() { + oThis.memory.WriteBool(oVal.connectorLines); + }); + } + if(oVal.meanLine !== null) { + this.bs.WriteItem(c_oserct_chartExSeriesVisibilitiesMEANLINE, function() { + oThis.memory.WriteBool(oVal.meanLine); + }); + } + if(oVal.meanMarker !== null) { + this.bs.WriteItem(c_oserct_chartExSeriesVisibilitiesMEANMARKER, function() { + oThis.memory.WriteBool(oVal.meanMarker); + }); + } + if(oVal.nonoutliers !== null) { + this.bs.WriteItem(c_oserct_chartExSeriesVisibilitiesNONOUTLIERS, function() { + oThis.memory.WriteBool(oVal.nonoutliers); + }); + } + if(oVal.outliers !== null) { + this.bs.WriteItem(c_oserct_chartExSeriesVisibilitiesOUTLIERS, function() { + oThis.memory.WriteBool(oVal.outliers); + }); + } +}; +BinaryChartReader.prototype.ReadCT_SeriesElementVisibilities = function (type, length, val) { + var res = c_oSerConstants.ReadOk; + var oThis = this; + var oNewVal; + if (c_oserct_chartExSeriesVisibilitiesCONNECTOR === type) + { + val.setConnectorLines(this.stream.GetBool()); + } + else if (c_oserct_chartExSeriesVisibilitiesMEANLINE === type) + { + val.setMeanLine(this.stream.GetBool()); + } + else if (c_oserct_chartExSeriesVisibilitiesMEANMARKER === type) + { + val.setMeanMarker(this.stream.GetBool()); + } + else if (c_oserct_chartExSeriesVisibilitiesNONOUTLIERS === type) + { + val.setNonoutliers(this.stream.GetBool()); + } + else if (c_oserct_chartExSeriesVisibilitiesOUTLIERS === type) + { + val.setOutliers(this.stream.GetBool()); + } + else + { + res = c_oSerConstants.ReadUnknown; + } + return res; +}; + +// CCategoryAxisScaling +var c_oserct_chartExCatScalingGAPAUTO = 0; +var c_oserct_chartExCatScalingGAPVAL = 1; + +BinaryChartWriter.prototype.WriteCT_CategoryAxisScaling = function (oVal) { + var oThis = this; + if(oVal.gapWidth !== null) { + if (oVal.gapWidth.eValue === EDoubleOrAutomatic.typeDouble) { + this.bs.WriteItem(c_oserct_chartExCatScalingGAPVAL, function() { + oThis.memory.WriteDouble2(oVal.gapWidth.dValue); + }); + } else { + this.bs.WriteItem(c_oserct_chartExCatScalingGAPAUTO, function() { + oThis.memory.WriteByte(oVal.gapWidth.dValue); + }); + } + } +}; +BinaryChartReader.prototype.ReadCT_CategoryAxisScaling = function (type, length, val) { + var res = c_oSerConstants.ReadOk; + var oThis = this; + var oNewVal; + if (c_oserct_chartExCatScalingGAPVAL === type) + { + var oNewVal = new AscFormat.CDoubleOrAutomatic(); + oNewVal.setDvalue(this.stream.GetDoubleLE()); + val.setGapWidth(oNewVal); + } + else if (c_oserct_chartExCatScalingGAPAUTO === type) + { + var oNewVal = new AscFormat.CDoubleOrAutomatic(); + oNewVal.setEValue(this.stream.GetUChar()); + val.setGapWidth(oNewVal); + } + else + { + res = c_oSerConstants.ReadUnknown; + } + return res; +}; + +// CValueAxisScaling +var c_oserct_chartExValScalingMAXAUTO = 0; +var c_oserct_chartExValScalingMAXVAL = 1; +var c_oserct_chartExValScalingMINAUTO = 2; +var c_oserct_chartExValScalingMINVAL = 3; +var c_oserct_chartExValScalingMAJUNITAUTO = 4; +var c_oserct_chartExValScalingMAJUNITVAL = 5; +var c_oserct_chartExValScalingMINUNITAUTO = 6; +var c_oserct_chartExValScalingMINUNITVAL = 7; + +BinaryChartWriter.prototype.WriteCT_ValueAxisScaling = function (oVal) { + var oThis = this; + if(oVal.max !== null) { + if (oVal.max.eValue === EDoubleOrAutomatic.typeDouble) { + this.bs.WriteItem(c_oserct_chartExValScalingMAXVAL, function() { + oThis.memory.WriteDouble2(oVal.max.dValue); + }); + } else { + this.bs.WriteItem(c_oserct_chartExValScalingMAXAUTO, function() { + oThis.memory.WriteByte(oVal.max.dValue); + }); + } + } + if(oVal.min !== null) { + if (oVal.min.eValue === EDoubleOrAutomatic.typeDouble) { + this.bs.WriteItem(c_oserct_chartExValScalingMINVAL, function() { + oThis.memory.WriteDouble2(oVal.min.dValue); + }); + } else { + this.bs.WriteItem(c_oserct_chartExValScalingMINAUTO, function() { + oThis.memory.WriteByte(oVal.min.dValue); + }); + } + } + if(oVal.majorUnit !== null) { + if (oVal.majorUnit.eValue === EDoubleOrAutomatic.typeDouble) { + this.bs.WriteItem(c_oserct_chartExValScalingMAJUNITVAL, function() { + oThis.memory.WriteDouble2(oVal.majorUnit.dValue); + }); + } else { + this.bs.WriteItem(c_oserct_chartExValScalingMAJUNITAUTO, function() { + oThis.memory.WriteByte(oVal.majorUnit.dValue); + }); + } + } + if(oVal.minorUnit !== null) { + if (oVal.minorUnit.eValue === EDoubleOrAutomatic.typeDouble) { + this.bs.WriteItem(c_oserct_chartExValScalingMINUNITVAL, function() { + oThis.memory.WriteDouble2(oVal.minorUnit.dValue); + }); + } else { + this.bs.WriteItem(c_oserct_chartExValScalingMINUNITAUTO, function() { + oThis.memory.WriteByte(oVal.minorUnit.dValue); + }); + } + } +}; +BinaryChartReader.prototype.ReadCT_ValueAxisScaling = function (type, length, val) { + var res = c_oSerConstants.ReadOk; + var oThis = this; + var oNewVal; + if (c_oserct_chartExValScalingMAXAUTO === type) + { + var oNewVal = new AscFormat.CDoubleOrAutomatic(); + oNewVal.setEValue(this.stream.GetUChar()); + val.setMax(oNewVal); + } + else if (c_oserct_chartExValScalingMAXVAL === type) + { + var oNewVal = new AscFormat.CDoubleOrAutomatic(); + oNewVal.setDvalue(this.stream.GetDoubleLE()); + val.setMax(oNewVal); + } + else if (c_oserct_chartExValScalingMINAUTO === type) + { + var oNewVal = new AscFormat.CDoubleOrAutomatic(); + oNewVal.setEValue(this.stream.GetUChar()); + val.setMin(oNewVal); + } + else if (c_oserct_chartExValScalingMINVAL === type) + { + var oNewVal = new AscFormat.CDoubleOrAutomatic(); + oNewVal.setDvalue(this.stream.GetDoubleLE()); + val.setMin(oNewVal); + } + else if (c_oserct_chartExValScalingMAJUNITAUTO === type) + { + var oNewVal = new AscFormat.CDoubleOrAutomatic(); + oNewVal.setEValue(this.stream.GetUChar()); + val.setMajorUnit(oNewVal); + } + else if (c_oserct_chartExValScalingMAJUNITVAL === type) + { + var oNewVal = new AscFormat.CDoubleOrAutomatic(); + oNewVal.setDvalue(this.stream.GetDoubleLE()); + val.setMajorUnit(oNewVal); + } + else if (c_oserct_chartExValScalingMINUNITAUTO === type) + { + var oNewVal = new AscFormat.CDoubleOrAutomatic(); + oNewVal.setEValue(this.stream.GetUChar()); + val.setMinorUnit(oNewVal); + } + else if (c_oserct_chartExValScalingMINUNITVAL === type) + { + var oNewVal = new AscFormat.CDoubleOrAutomatic(); + oNewVal.setDvalue(this.stream.GetDoubleLE()); + val.setMinorUnit(oNewVal); + } + else + { + res = c_oSerConstants.ReadUnknown; + } + return res; +}; + +// CAxisUnits +var c_oserct_chartExAxisUnitTYPE = 0; +var c_oserct_chartExAxisUnitLABEL = 1; + +BinaryChartWriter.prototype.WriteCT_AxisUnits = function (oVal) { + var oThis = this; + if(oVal.unitsLabel !== null) { + this.bs.WriteItem(c_oserct_chartExAxisUnitLABEL, function() { + oThis.WriteCT_AxisUnitsLabel(oVal.unitsLabel); + }); + } + if(oVal.unit !== null) { + this.bs.WriteItem(c_oserct_chartExAxisUnitTYPE, function() { + oThis.WriteCT_AxisUnit(oVal.unit); + }); + } +}; +BinaryChartReader.prototype.ReadCT_AxisUnits = function (type, length, val) { + var res = c_oSerConstants.ReadOk; + var oThis = this; + var oNewVal; + if (c_oserct_chartExAxisUnitLABEL === type) + { + var oNewVal = new AscFormat.CAxisUnitsLabel(); + res = this.bcr.Read1(length, function (t, l) { + return oThis.ReadCT_AxisUnitsLabel(t, l, oNewVal); + }); + val.setUnitsLabel(oNewVal); + } + else if (c_oserct_chartExAxisUnitTYPE === type) + { + var oNewVal = new AscFormat.CAxisUnit(); + res = this.bcr.Read2(length, function (t, l) { + return oThis.ReadCT_AxisUnit(t, l, oNewVal); + }); + val.setUnit(oNewVal); + } + else + { + res = c_oSerConstants.ReadUnknown; + } + return res; +}; + +// CAxisUnitsLabel +var c_oserct_chartExAxisUnitsLabelTEXT = 0; +var c_oserct_chartExAxisUnitsLabelSPPR = 1; +var c_oserct_chartExAxisUnitsLabelTXPR = 2; + +BinaryChartWriter.prototype.WriteCT_AxisUnitsLabel = function (oVal) { + var oThis = this; + if(oVal.tx !== null) { + this.bs.WriteItem(c_oserct_chartExAxisUnitsLabelTEXT, function() { + oThis.WriteCT_Text(oVal.tx); + }); + } + if(oVal.spPr !== null) { + this.bs.WriteItem(c_oserct_chartExAxisUnitsLabelSPPR, function() { + oThis.WriteSpPr(oVal.spPr); + }); + } + if(oVal.txPr !== null) { + this.bs.WriteItem(c_oserct_chartExAxisUnitsLabelTXPR, function() { + oThis.WriteTxPr(oVal.txPr); + }); + } +}; +BinaryChartReader.prototype.ReadCT_AxisUnitsLabel = function (type, length, val) { + var res = c_oSerConstants.ReadOk; + var oThis = this; + var oNewVal; + if (c_oserct_chartExAxisUnitsLabelTEXT === type) + { + var oNewVal = new AscFormat.CText(); + res = this.bcr.Read1(length, function (t, l) { + return oThis.ReadCT_Text(t, l, oNewVal); + }); + val.setTx(oNewVal); + } + else if (c_oserct_chartExAxisUnitsLabelSPPR === type) + { + val.setSpPr(this.ReadSpPr(length)); + val.spPr.setParent(val); + } + else if (c_oserct_chartExAxisUnitsLabelTXPR === type) + { + val.setTxPr(this.ReadTxPr(length)); + val.txPr.setParent(val); + } + else + { + res = c_oSerConstants.ReadUnknown; + } + return res; +}; + +// CTickMarks +var c_oserct_chartExTickMarksTYPE = 0; + +BinaryChartWriter.prototype.WriteCT_TickMarks = function (oVal) { + var oThis = this; + if(oVal.type !== null) { + this.bs.WriteItem(c_oserct_chartExTickMarksTYPE, function() { + oThis.WriteCT_TickMarksType(oVal.type); + }); + } +}; +BinaryChartReader.prototype.ReadCT_TickMarks = function (type, length, val) { + var res = c_oSerConstants.ReadOk; + var oThis = this; + var oNewVal; + if (c_oserct_chartExTickMarksTYPE === type) + { + var oNewVal = new AscFormat.CTickMarksType(); + res = this.bcr.Read1(length, function (t, l) { + return oThis.ReadCT_TickMarksType(t, l, oNewVal); + }); + val.setType(oNewVal); + } + else + { + res = c_oSerConstants.ReadUnknown; + } + return res; +}; + +// CGridlines +var c_oserct_chartExGridlinesSPPR = 0; + +BinaryChartWriter.prototype.WriteCT_Gridlines = function (oVal) { + var oThis = this; + if(oVal.spPr !== null) { + this.bs.WriteItem(c_oserct_chartExGridlinesSPPR, function() { + oThis.WriteSpPr(oVal.spPr); + }); + } +}; +BinaryChartReader.prototype.ReadCT_Gridlines = function (type, length, val) { + var res = c_oSerConstants.ReadOk; + var oThis = this; + var oNewVal; + if (c_oserct_chartExGridlinesSPPR === type) + { + val.setSpPr(this.ReadSpPr(length)); + val.spPr.setParent(val); + } + else + { + res = c_oSerConstants.ReadUnknown; + } + return res; +}; + +// CStatistics +var c_oserct_chartExStatisticsMETHOD = 0; + +BinaryChartWriter.prototype.WriteCT_Statistics = function (oVal) { + var oThis = this; + if(oVal.quartileMethod !== null) { + this.bs.WriteItem(c_oserct_chartExStatisticsMETHOD, function() { + oThis.memory.WriteByte(oVal.quartileMethod.quartileMethod); + }); + } +}; +BinaryChartReader.prototype.ReadCT_Statistics = function (type, length, val) { + var res = c_oSerConstants.ReadOk; + var oThis = this; + var oNewVal; + if (c_oserct_chartExStatisticsMETHOD === type) + { + var oNewVal = new AscFormat.CQuartileMethod(); + res = this.bcr.Read1(length, function (t, l) { + return oThis.ReadCT_QuartileMethod(t, l, oNewVal); + }); + oNewVal.setQuartileMethod(this.stream.GetUChar()); + val.setQuartileMethod(oNewVal); + } + else + { + res = c_oSerConstants.ReadUnknown; + } + return res; +}; + +// CStringDimension, CNumericDimension +var c_oserct_chartExDataDimensionTYPE = 0; +var c_oserct_chartExDataDimensionFORMULA = 1; +var c_oserct_chartExDataDimensionNF = 2; +var c_oserct_chartExDataDimensionSTRINGLEVEL = 3; +var c_oserct_chartExDataDimensionNUMERICLEVEL = 4; + +BinaryChartWriter.prototype.WriteCT_StringDimension = function (oVal) { + var oThis = this; + if(oVal.type !== null) { + this.bs.WriteItem(c_oserct_chartExDataDimensionTYPE, function() { + oThis.memory.WriteBool(oVal.type.dimensionType); + }); + } + if(oVal.f !== null) { + this.bs.WriteItem(c_oserct_chartExDataDimensionFORMULA, function() { + oThis.WriteCT_Formula(oVal.f); + }); + } + if(oVal.nf !== null) { + this.bs.WriteItem(c_oserct_chartExDataDimensionNF, function() { + oThis.memory.WriteString3(oVal.nf); + }); + } + if(oVal.levelData !== null) { + for (var i = 0, length = oVal.levelData.length; i < length; ++i) { + var oCurVal = oVal.levelData[i]; + if (null != oCurVal) { + this.bs.WriteItem(c_oserct_chartExDataDimensionSTRINGLEVEL, function () { + oThis.WriteCT_StringLevel(oCurVal); + }); + } + } + } +}; +BinaryChartReader.prototype.ReadCT_StringDimension = function (type, length, val) { + var res = c_oSerConstants.ReadOk; + var oThis = this; + var oNewVal; + if (c_oserct_chartExDataDimensionTYPE === type) + { + var oNewVal = new AscFormat.CDimensionType(); + oNewVal.setDimensionType(this.stream.GetUChar()); + val.addLevelData(oNewVal); + } + else if (c_oserct_chartExDataDimensionFORMULA === type) + { + var oNewVal = new AscFormat.CFormula(); + res = this.bcr.Read2(length, function (t, l) { + return oThis.ReadCT_Formula(t, l, oNewVal); + }); + val.setF(oNewVal); + } + else if (c_oserct_chartExDataDimensionNF === type) + { + val.setNf(this.stream.GetString2LE(length)); + } + else if (c_oserct_chartExDataDimensionSTRINGLEVEL === type) + { + var oNewVal = new AscFormat.CStringLevel(); + res = this.bcr.Read1(length, function (t, l) { + return oThis.ReadCT_StringLevel(t, l, oNewVal); + }); + val.addLevelData(oNewVal); + } + else + { + res = c_oSerConstants.ReadUnknown; + } + return res; +}; + +BinaryChartWriter.prototype.WriteCT_NumericDimension = function (oVal) { + var oThis = this; + if(oVal.type !== null) { + this.bs.WriteItem(c_oserct_chartExDataDimensionTYPE, function() { + oThis.memory.WriteBool(oVal.type.dimensionType); + }); + } + if(oVal.f !== null) { + this.bs.WriteItem(c_oserct_chartExDataDimensionFORMULA, function() { + oThis.WriteCT_Formula(oVal.f); + }); + } + if(oVal.nf !== null) { + this.bs.WriteItem(c_oserct_chartExDataDimensionNF, function() { + oThis.memory.WriteString3(oVal.nf); + }); + } + if(oVal.levelData !== null) { + for (var i = 0, length = oVal.levelData.length; i < length; ++i) { + var oCurVal = oVal.levelData[i]; + if (null != oCurVal) { + this.bs.WriteItem(c_oserct_chartExDataDimensionNUMERICLEVEL, function () { + oThis.WriteCT_NumericLevel(oCurVal); + }); + } + } + } +}; +BinaryChartReader.prototype.ReadCT_NumericDimension = function (type, length, val) { + var res = c_oSerConstants.ReadOk; + var oThis = this; + var oNewVal; + if (c_oserct_chartExDataDimensionTYPE === type) + { + var oNewVal = new AscFormat.CDimensionType(); + oNewVal.setDimensionType(this.stream.GetUChar()); + val.addLevelData(oNewVal); + } + else if (c_oserct_chartExDataDimensionFORMULA === type) + { + var oNewVal = new AscFormat.CFormula(); + res = this.bcr.Read2(length, function (t, l) { + return oThis.ReadCT_Formula(t, l, oNewVal); + }); + val.setF(oNewVal); + } + else if (c_oserct_chartExDataDimensionNF === type) + { + val.setNf(this.stream.GetString2LE(length)); + } + else if (c_oserct_chartExDataDimensionNUMERICLEVEL === type) + { + var oNewVal = new AscFormat.CNumericLevel(); + res = this.bcr.Read1(length, function (t, l) { + return oThis.ReadCT_NumericLevel(t, l, oNewVal); + }); + val.addLevelData(oNewVal); + } + else + { + res = c_oSerConstants.ReadUnknown; + } + return res; +}; + +// CFormula +var c_oserct_chartExFormulaCONTENT = 0; +var c_oserct_chartExFormulaDIRECTION = 1; + +BinaryChartWriter.prototype.WriteCT_Formula = function (oVal) { + var oThis = this; + if(oVal.content !== null) { + this.bs.WriteItem(c_oserct_chartExFormulaCONTENT, function() { + oThis.memory.WriteString3(oVal.content); + }); + } + if(oVal.dir !== null) { + this.bs.WriteItem(c_oserct_chartExFormulaDIRECTION, function() { + oThis.memory.WriteByte(oVal.dir.formulaDirection); + }); + } +}; +BinaryChartReader.prototype.ReadCT_Formula = function (type, length, val) { + var res = c_oSerConstants.ReadOk; + var oThis = this; + var oNewVal; + if (c_oserct_chartExFormulaCONTENT === type) + { + val.setContent(this.stream.GetString2LE(length)); + } + else if (c_oserct_chartExFormulaDIRECTION === type) + { + var oNewVal = new AscFormat.CFormulaDirection(); + oNewVal.setFormulaDirection(this.stream.GetUChar()); + val.setDir(oNewVal); + } + else + { + res = c_oSerConstants.ReadUnknown; + } + return res; +}; + +// CStringLevel, CNumericLevel +var c_oserct_chartExDataLevelNAME = 0; +var c_oserct_chartExDataLevelCOUNT = 1; +var c_oserct_chartExDataLevelPT = 2; +var c_oserct_chartExDataLevelFORMATCODE = 3; + +BinaryChartWriter.prototype.WriteCT_StringLevel = function (oVal) { + var oThis = this; + if(oVal.name !== null) { + this.bs.WriteItem(c_oserct_chartExDataLevelNAME, function() { + oThis.memory.WriteString3(oVal.name); + }); + } + if(oVal.ptCount !== null) { + this.bs.WriteItem(c_oserct_chartExDataLevelCOUNT, function() { + oThis.memory.WriteLong(oVal.ptCount); + }); + } + if(oVal.pt !== null) { + for (var i = 0, length = oVal.pt.length; i < length; ++i) { + var oCurVal = oVal.pt[i]; + if (null != oCurVal) { + this.bs.WriteItem(c_oserct_chartExDataLevelPT, function () { + oThis.WriteCT_StringValue(oCurVal); + }); + } + } + } +}; +BinaryChartReader.prototype.ReadCT_StringLevel = function (type, length, val) { + var res = c_oSerConstants.ReadOk; + var oThis = this; + var oNewVal; + if (c_oserct_chartExDataLevelNAME === type) + { + val.setName(this.stream.GetString2LE(length)); + } + else if (c_oserct_chartExDataLevelCOUNT === type) + { + val.setPtCount(this.stream.GetULongLE()); + } + else if (c_oserct_chartExDataLevelPT === type) + { + var oNewVal = new AscFormat.CStringValue(); + res = this.bcr.Read2(length, function (t, l) { + return oThis.ReadCT_StringValue(t, l, oNewVal); + }); + val.addPt(oNewVal); + } + else + { + res = c_oSerConstants.ReadUnknown; + } + return res; +}; + +BinaryChartWriter.prototype.WriteCT_NumericLevel = function (oVal) { + var oThis = this; + if(oVal.name !== null) { + this.bs.WriteItem(c_oserct_chartExDataLevelNAME, function() { + oThis.memory.WriteString3(oVal.name); + }); + } + if(oVal.ptCount !== null) { + this.bs.WriteItem(c_oserct_chartExDataLevelCOUNT, function() { + oThis.memory.WriteLong(oVal.ptCount); + }); + } + if(oVal.pt !== null) { + for (var i = 0, length = oVal.pt.length; i < length; ++i) { + var oCurVal = oVal.pt[i]; + if (null != oCurVal) { + this.bs.WriteItem(c_oserct_chartExDataLevelPT, function () { + oThis.WriteCT_NumericValue(oCurVal); + }); + } + } + } + if(oVal.formatCode !== null) { + this.bs.WriteItem(c_oserct_chartExDataLevelFORMATCODE, function() { + oThis.memory.WriteString3(oVal.formatCode); + }); + } +}; +BinaryChartReader.prototype.ReadCT_NumericLevel = function (type, length, val) { + var res = c_oSerConstants.ReadOk; + var oThis = this; + var oNewVal; + if (c_oserct_chartExDataLevelNAME === type) + { + val.setName(this.stream.GetString2LE(length)); + } + else if (c_oserct_chartExDataLevelCOUNT === type) + { + val.setPtCount(this.stream.GetULongLE()); + } + else if (c_oserct_chartExDataLevelPT === type) + { + var oNewVal = new AscFormat.CNumericValue(); + res = this.bcr.Read2(length, function (t, l) { + return oThis.ReadCT_NumericValue(t, l, oNewVal); + }); + val.addPt(oNewVal); + } + else if (c_oserct_chartExDataLevelFORMATCODE === type) + { + val.setFormatCode(this.stream.GetString2LE(length)); + } + else + { + res = c_oSerConstants.ReadUnknown; + } + return res; +}; + +// CStringValue, CNumericValue +var c_oserct_chartExDataValueIDX = 0; +var c_oserct_chartExDataValueCONTENT = 1; + +BinaryChartWriter.prototype.WriteCT_StringValue = function (oVal) { + var oThis = this; + if(oVal.idx !== null) { + this.bs.WriteItem(c_oserct_chartExDataValueIDX, function() { + oThis.memory.WriteLong(oVal.idx); + }); + } + if(oVal.content !== null) { + this.bs.WriteItem(c_oserct_chartExDataValueCONTENT, function() { + oThis.memory.WriteString3(oVal.content); + }); + } +}; +BinaryChartReader.prototype.ReadCT_StringValue = function (type, length, val) { + var res = c_oSerConstants.ReadOk; + var oThis = this; + var oNewVal; + if (c_oserct_chartExDataValueIDX === type) + { + val.setIdx(this.stream.GetULongLE()); + } + else if (c_oserct_chartExDataValueCONTENT === type) + { + val.setContent(this.stream.GetString2LE(length)); + } + else + { + res = c_oSerConstants.ReadUnknown; + } + return res; +}; + +BinaryChartWriter.prototype.WriteCT_NumericValue = function (oVal) { + var oThis = this; + if(oVal.idx !== null) { + this.bs.WriteItem(c_oserct_chartExDataValueIDX, function() { + oThis.memory.WriteLong(oVal.idx); + }); + } + if(oVal.content !== null) { + this.bs.WriteItem(c_oserct_chartExDataValueCONTENT, function() { + oThis.memory.WriteDouble2(oVal.content); + }); + } +}; +BinaryChartReader.prototype.ReadCT_NumericValue = function (type, length, val) { + var res = c_oSerConstants.ReadOk; + var oThis = this; + var oNewVal; + if (c_oserct_chartExDataValueIDX === type) + { + val.setIdx(this.stream.GetULongLE()); + } + else if (c_oserct_chartExDataValueCONTENT === type) + { + val.setContent(this.stream.GetDoubleLE()); + } + else + { + res = c_oSerConstants.ReadUnknown; + } + return res; +}; + // template var c_oserct_testATTR1 = 0; var c_oserct_testATTR2 = 1; From 679d813b773d3316ca42e4d46f952b45cdfa9f2a Mon Sep 17 00:00:00 2001 From: Dmitriy Aleksandrov Date: Tue, 22 Aug 2023 20:10:57 +0600 Subject: [PATCH 19/30] For bug #62819 Add structures. Edit ST write/read. --- common/Drawings/Format/ChartEx.js | 34 ++-- common/SerializeChart.js | 73 ++++---- common/tempSerializeChart.js | 281 +++++++++++++----------------- 3 files changed, 177 insertions(+), 211 deletions(-) diff --git a/common/Drawings/Format/ChartEx.js b/common/Drawings/Format/ChartEx.js index a54ede73af..ecc2005cc4 100644 --- a/common/Drawings/Format/ChartEx.js +++ b/common/Drawings/Format/ChartEx.js @@ -3807,34 +3807,30 @@ // DoubleOrAutomatic - drawingsChangesMap[AscDFH.historyitem_DoubleOrAutomatic_SetDValue] = function(oClass, value) { - oClass.dValue = value; + drawingsChangesMap[AscDFH.historyitem_DoubleOrAutomatic_SetValue] = function(oClass, value) { + oClass.value = value; }; - drawingsChangesMap[AscDFH.historyitem_DoubleOrAutomatic_SetEValue] = function(oClass, value) { - oClass.eValue = value; + drawingsChangesMap[AscDFH.historyitem_DoubleOrAutomatic_SetType] = function(oClass, value) { + oClass.type = value; }; - AscDFH.changesFactory[AscDFH.historyitem_DoubleOrAutomatic_SetDValue] = window['AscDFH'].CChangesDrawingsLong; - AscDFH.changesFactory[AscDFH.historyitem_DoubleOrAutomatic_SetEValue] = window['AscDFH'].CChangesDrawingsDouble2; + AscDFH.changesFactory[AscDFH.historyitem_DoubleOrAutomatic_SetValue] = window['AscDFH'].CChangesDrawingsLong; + AscDFH.changesFactory[AscDFH.historyitem_DoubleOrAutomatic_SetType] = window['AscDFH'].CChangesDrawingsDouble2; const EDoubleOrAutomatic = { typeAuto: 0, typeDouble: 1}; function CDoubleOrAutomatic() { CBaseChartObject.call(this); - this.dValue = 0; - this.eValue = EDoubleOrAutomatic.typeDouble; + this.value = 0; + this.type = EDoubleOrAutomatic.typeAuto; } InitClass(CDoubleOrAutomatic, CBaseChartObject, AscDFH.historyitem_type_DoubleOrAutomatic); - CDoubleOrAutomatic.prototype.setDvalue = function(pr) { - History.CanAddChanges() && History.Add(new CChangesDrawingsLong(this, AscDFH.historyitem_DoubleOrAutomatic_SetDValue, this.dValue, pr)); - History.CanAddChanges() && History.Add(new CChangesDrawingsDouble2(this, AscDFH.historyitem_DoubleOrAutomatic_SetEValue, this.eValue, EDoubleOrAutomatic.typeDouble)); - this.dValue = pr; - this.eValue = EDoubleOrAutomatic.typeDouble; - }; - CDoubleOrAutomatic.prototype.setEValue = function(pr) { - History.CanAddChanges() && History.Add(new CChangesDrawingsDouble2(this, AscDFH.historyitem_DoubleOrAutomatic_SetEValue, this.eValue, pr)); - History.CanAddChanges() && History.Add(new CChangesDrawingsLong(this, AscDFH.historyitem_DoubleOrAutomatic_SetDValue, this.dValue, 0)); - this.eValue = pr; - this.dValue = 0; + CDoubleOrAutomatic.prototype.setValue = function(pr) { + History.CanAddChanges() && History.Add(new CChangesDrawingsLong(this, AscDFH.historyitem_DoubleOrAutomatic_SetValue, this.value, pr)); + this.value = pr; + }; + CDoubleOrAutomatic.prototype.setType = function(pr) { + History.CanAddChanges() && History.Add(new CChangesDrawingsDouble2(this, AscDFH.historyitem_DoubleOrAutomatic_SetType, this.type, pr)); + this.type = pr; }; //--------------------------------------------------------export---------------------------------------------------- diff --git a/common/SerializeChart.js b/common/SerializeChart.js index c3a7f870d4..473694b357 100644 --- a/common/SerializeChart.js +++ b/common/SerializeChart.js @@ -1036,6 +1036,7 @@ var c_oserct_chartExSpaceCLRMAPOVR = 4; var c_oserct_chartExSpaceXLSX = c_oserct_chartspaceXLSX;/* = 16*/ var c_oserct_chartExSpaceSTYLES = c_oserct_chartspaceSTYLES;/* = 17*/ var c_oserct_chartExSpaceCOLORS = c_oserct_chartspaceCOLORS;/* = 18*/ +var c_oserct_chartExSpaceXLSXEXTERNAL = c_oserct_chartspaceXLSXEXTERNAL;/* = 19*/ var c_oserct_chartExDATA = 0; var c_oserct_chartExEXTERNALDATA = 1; @@ -1430,16 +1431,16 @@ BinaryChartWriter.prototype.WriteCT_ChartExSpace = function (oVal) { oThis.WriteClrMapOverride(oCurVal); }); } - if(oVal.chartStyle !== null) { - this.bs.WriteItem(c_oserct_chartExSpaceSTYLES, function() { - oThis.WriteCT_ChartStyle(oVal.chartStyle); - }); - } - if(oVal.chartColors !== null) { - this.bs.WriteItem(c_oserct_chartExSpaceCOLORS, function() { - oThis.WriteCT_ChartColors(oVal.chartColors); - }); - } + // if(oVal.chartStyle !== null) { + // this.bs.WriteItem(c_oserct_chartExSpaceSTYLES, function() { + // oThis.WriteCT_ChartStyle(oVal.chartStyle); + // }); + // } + // if(oVal.chartColors !== null) { + // this.bs.WriteItem(c_oserct_chartExSpaceCOLORS, function() { + // oThis.WriteCT_ChartColors(oVal.chartColors); + // }); + // } }; BinaryChartWriter.prototype.WriteCT_FromTo = function(oVal){ this.memory.WriteByte(Asc.c_oSer_DrawingPosType.X); @@ -6311,43 +6312,45 @@ BinaryChartReader.prototype.ReadCT_ChartExSpace = function (type, length, val) { res = this.bcr.Read1(length, function (t, l) { return oThis.ReadCT_ChartData(t, l, oNewVal); // todoo this class }); - } else if (c_oserct_chartExSpaceCHART === type) { + } + else if (c_oserct_chartExSpaceCHART === type) { oNewVal = new AscFormat.CChartEx(); res = this.bcr.Read1(length, function (t, l) { return oThis.ReadCT_ChartEx(t, l, oNewVal); }); val.setChart(oNewVal); - } else if (c_oserct_chartExSpaceSPPR === type) { + } + else if (c_oserct_chartExSpaceSPPR === type) { val.setSpPr(this.ReadSpPr(length)); val.spPr.setParent(val); } else if (c_oserct_chartExSpaceTXPR === type) { val.setTxPr(this.ReadTxPr(length)); val.txPr.setParent(val); - } else if (c_oserct_chartExspaceCLRMAPOVR === type) { + } + else if (c_oserct_chartExspaceCLRMAPOVR === type) { val.setClrMapOvr(this.ReadClrOverride(length)); - } else if(c_oserct_chartExSpaceXLSX === type) { - //todo - res = c_oSerConstants.ReadUnknown; - } else if(c_oserct_chartExSpaceCOLORS === type) { - this.curChart.oChartColorsData = AscCommon.fSaveStream(this.bcr.stream, length); - oNewVal = new AscFormat.CChartColors(); - res = this.bcr.Read1(length, function (t, l) { - return oThis.ReadCT_ChartColors(t, l, oNewVal); - }); - if(oNewVal) { - val.setChartColors(oNewVal); - } - } else if(c_oserct_chartExSpaceSTYLES === type) { - this.curChart.oChartStyleData = AscCommon.fSaveStream(this.bcr.stream, length); - oNewVal = new AscFormat.CChartStyle(); - res = this.bcr.Read1(length, function (t, l) { - return oThis.ReadCT_ChartStyle(t, l, oNewVal); - }); - if(oNewVal) { - val.setChartStyle(oNewVal); - } - } + } + // else if(c_oserct_chartExSpaceXLSX === type) { + // //todo + // res = c_oSerConstants.ReadUnknown; + // } + // else if(c_oserct_chartExSpaceCOLORS === type) { + // this.curChart.oChartColorsData = AscCommon.fSaveStream(this.bcr.stream, length); + // oNewVal = new AscFormat.CChartColors(); + // res = this.bcr.Read1(length, function (t, l) { + // return oThis.ReadCT_ChartColors(t, l, oNewVal); + // }); + // val.setChartColors(oNewVal); + // } + // else if(c_oserct_chartExSpaceSTYLES === type) { + // this.curChart.oChartStyleData = AscCommon.fSaveStream(this.bcr.stream, length); + // oNewVal = new AscFormat.CChartStyle(); + // res = this.bcr.Read1(length, function (t, l) { + // return oThis.ReadCT_ChartStyle(t, l, oNewVal); + // }); + // val.setChartStyle(oNewVal); + // } else { res = c_oSerConstants.ReadUnknown; diff --git a/common/tempSerializeChart.js b/common/tempSerializeChart.js index 93a6611174..7ffb1e5f41 100644 --- a/common/tempSerializeChart.js +++ b/common/tempSerializeChart.js @@ -126,7 +126,7 @@ BinaryChartWriter.prototype.WriteCT_Axis = function (oVal) { } if(oVal.title !== null) { this.bs.WriteItem(c_oserct_chartExAxisTITLE, function() { - oThis.WriteCT_Title(oVal.title); + oThis.WriteCT_ChartExTitle(oVal.title); }); } if(oVal.units !== null) { @@ -136,7 +136,7 @@ BinaryChartWriter.prototype.WriteCT_Axis = function (oVal) { } if(oVal.numFmt !== null) { this.bs.WriteItem(c_oserct_chartExAxisNUMFMT, function() { - oThis.WriteCT_NumFmt(oVal.numFmt); + oThis.WriteCT_ChartExNumFmt(oVal.numFmt); }); } if(oVal.majorTickMarks !== null) { @@ -205,9 +205,9 @@ BinaryChartReader.prototype.ReadCT_Axis = function (type, length, val) { } else if (c_oserct_chartExAxisTITLE === type) { - var oNewVal = new AscFormat.CTitle(); + var oNewVal = new AscFormat.CChartExTitle(); res = this.bcr.Read1(length, function (t, l) { - return oThis.ReadCT_Title(t, l, oNewVal); + return oThis.ReadCT_ChartExTitle(t, l, oNewVal); }); val.setTitle(oNewVal); } @@ -223,7 +223,7 @@ BinaryChartReader.prototype.ReadCT_Axis = function (type, length, val) { { var oNewVal = new AscFormat.CNumFmt(); res = this.bcr.Read1(length, function (t, l) { - return oThis.ReadCT_NumFmt(t, l, oNewVal); + return oThis.ReadCT_ChartExNumFmt(t, l, oNewVal); }); val.setNumFmt(oNewVal); } @@ -298,7 +298,7 @@ BinaryChartWriter.prototype.WriteCT_ChartData = function (oVal) { } if(oVal.externalData !== null) { this.bs.WriteItem(c_oserct_chartExEXTERNALDATA, function() { - oThis.WriteCT_ExternalData(oVal.externalData); + oThis.WriteCT_ChartExExternalData(oVal.externalData); }); } }; @@ -317,7 +317,7 @@ BinaryChartReader.prototype.ReadCT_ChartData = function (type, length, val) { { var oNewVal = new AscFormat.CExternalData(); res = this.bcr.Read2(length, function (t, l) { - return oThis.ReadCT_ExternalData(t, l, oNewVal); + return oThis.ReadCT_ChartExExternalData(t, l, oNewVal); }); val.setExternalData(oNewVal); } @@ -328,7 +328,7 @@ BinaryChartReader.prototype.ReadCT_ChartData = function (type, length, val) { return res; }; -// CExternalData (contains in ChartFormat.js) +// CExternalData (ChartExExternalData)(contains in ChartFormat.js) var c_oserct_chartExExternalAUTOUPDATE = 0; BinaryChartWriter.prototype.WriteCT_ChartExExternalData = function (oVal) { @@ -344,7 +344,7 @@ BinaryChartWriter.prototype.WriteCT_ChartExExternalData = function (oVal) { BinaryChartReader.prototype.ReadCT_ChartExExternalData = function (type, length, val) { var res = c_oSerConstants.ReadOk; var oThis = this; - if (c_oserct_externaldataAUTOUPDATE === type) { + if (c_oserct_chartExExternalAUTOUPDATE === type) { var oNewVal; oNewVal = {}; res = this.bcr.Read1(length, function (t, l) { @@ -366,17 +366,17 @@ BinaryChartWriter.prototype.WriteCT_ChartEx = function (oVal) { var oThis = this; if(oVal.plotArea !== null) { this.bs.WriteItem(c_oserct_chartExChartPLOTAREA, function() { - oThis.WriteCT_PlotArea(oVal.plotArea); + oThis.WriteCT_ChartExPlotArea(oVal.plotArea); }); } if(oVal.title !== null) { this.bs.WriteItem(c_oserct_chartExChartTITLE, function() { - oThis.WriteCT_Title(oVal.title); + oThis.WriteCT_ChartExTitle(oVal.title); }); } if(oVal.legend !== null) { this.bs.WriteItem(c_oserct_chartExChartLEGEND, function() { - oThis.WriteCT_Legend(oVal.legend); + oThis.WriteCT_ChartExLegend(oVal.legend); }); } }; @@ -386,25 +386,25 @@ BinaryChartReader.prototype.ReadCT_ChartEx = function (type, length, val) { var oNewVal; if (c_oserct_chartExChartPLOTAREA === type) { - var oNewVal = new AscFormat.CPlotArea(); + var oNewVal = new AscFormat.CChartExPlotArea(); res = this.bcr.Read1(length, function (t, l) { - return oThis.ReadCT_PlotArea(t, l, oNewVal); + return oThis.ReadCT_ChartExPlotArea(t, l, oNewVal); }); val.setPlotArea(oNewVal); } else if (c_oserct_chartExChartTITLE === type) { - var oNewVal = new AscFormat.Ctitle(); + var oNewVal = new AscFormat.CChartExTitle(); res = this.bcr.Read2(length, function (t, l) { - return oThis.ReadCT_Title(t, l, oNewVal); + return oThis.ReadCT_ChartExTitle(t, l, oNewVal); }); val.setTitle(oNewVal); } else if (c_oserct_chartExChartLEGEND === type) { - var oNewVal = new AscFormat.CLegend(); + var oNewVal = new AscFormat.CChartExLegend(); res = this.bcr.Read2(length, function (t, l) { - return oThis.ReadCT_Legend(t, l, oNewVal); + return oThis.ReadCT_ChartExLegend(t, l, oNewVal); }); val.setLegend(oNewVal); } @@ -557,7 +557,7 @@ var c_oserct_chartExSeriesTEXT = 3; var c_oserct_chartExSeriesAXIS = 4; var c_oserct_chartExSeriesDATAID = 5; var c_oserct_chartExSeriesSPPR = 6; -var c_oserct_chartExSeriesLAYOUTID = 7; +var c_oserct_chartExSeriesLAYOUTID = 7; // ST SeriesLayout var c_oserct_chartExSeriesHIDDEN = 8; var c_oserct_chartExSeriesOWNERIDX = 9; var c_oserct_chartExSeriesFORMATIDX = 10; @@ -612,7 +612,7 @@ BinaryChartWriter.prototype.WriteCT_Series = function (oVal) { } if(oVal.layoutId !== null) { this.bs.WriteItem(c_oserct_chartExSeriesLAYOUTID, function() { - oThis.WriteCT_SeriesLayout(oVal.layoutId); + oThis.memory.WriteByte(oVal.layoutId); }); } if(oVal.hidden !== null) { @@ -685,11 +685,7 @@ BinaryChartReader.prototype.ReadCT_Series = function (type, length, val) { } else if (c_oserct_chartExSeriesLAYOUTID === type) { - var oNewVal = new AscFormat.CSeriesLayout(); - res = this.bcr.Read2(length, function (t, l) { - return oThis.ReadCT_SeriesLayout(t, l, oNewVal); - }); - val.setLayoutId(oNewVal); + val.setLayoutId(this.stream.GetUChar()); } else if (c_oserct_chartExSeriesHIDDEN === type) { @@ -752,7 +748,7 @@ BinaryChartReader.prototype.ReadCT_DataPoint = function (type, length, val) { }; // CDataLabels -var c_oserct_chartExDataLabelsPOS = 0; +var c_oserct_chartExDataLabelsPOS = 0; // ST DataLabelPos var c_oserct_chartExDataLabelsNUMFMT = 1; var c_oserct_chartExDataLabelsTXPR = 2; var c_oserct_chartExDataLabelsSPPR = 3; @@ -765,12 +761,12 @@ BinaryChartWriter.prototype.WriteCT_DataLabels = function (oVal) { var oThis = this; if(oVal.pos !== null) { this.bs.WriteItem(c_oserct_chartExDataLabelsPOS, function() { - oThis.WriteCT_DataLabelPos(oVal.pos); + oThis.memory.WriteByte(oVal.pos); }); } if(oVal.numFmt !== null) { this.bs.WriteItem(c_oserct_chartExDataLabelsNUMFMT, function() { - oThis.WriteCT_NumFmt(oVal.numFmt); + oThis.WriteCT_ChartExNumFmt(oVal.numFmt); }); } if(oVal.txPr !== null) { @@ -820,17 +816,13 @@ BinaryChartReader.prototype.ReadCT_DataLabels = function (type, length, val) { var oNewVal; if (c_oserct_chartExDataLabelsPOS === type) { - var oNewVal = new AscFormat.CDataLabelPos(); - res = this.bcr.Read2(length, function (t, l) { - return oThis.ReadCT_DataLabelPos(t, l, oNewVal); - }); - val.setPos(oNewVal); + val.setPos(this.stream.GetUChar()); } else if (c_oserct_chartExDataLabelsNUMFMT === type) { var oNewVal = new AscFormat.CNumFmt(); res = this.bcr.Read2(length, function (t, l) { - return oThis.ReadCT_NumFmt(t, l, oNewVal); + return oThis.ReadCT_ChartExNumFmt(t, l, oNewVal); }); val.setNumFmt(oNewVal); } @@ -913,7 +905,7 @@ BinaryChartReader.prototype.ReadCT_ChartExNumFmt = function (type, length, val) // CDataLabel var c_oserct_chartExDataLabelIDX = 0; -var c_oserct_chartExDataLabelPOS = 1; +var c_oserct_chartExDataLabelPOS = 1; // ST DataLabelPos var c_oserct_chartExDataLabelNUMFMT = 2; var c_oserct_chartExDataLabelTXPR = 3; var c_oserct_chartExDataLabelSPPR = 4; @@ -929,12 +921,12 @@ BinaryChartWriter.prototype.WriteCT_DataLabel = function (oVal) { } if(oVal.pos !== null) { this.bs.WriteItem(c_oserct_chartExDataLabelPOS, function() { - oThis.WriteCT_DataLabelPos(oVal.pos); + oThis.memory.WriteByte(oVal.pos); }); } if(oVal.numFmt !== null) { this.bs.WriteItem(c_oserct_chartExDataLabelNUMFMT, function() { - oThis.WriteCT_NumFmt(oVal.numFmt); + oThis.WriteCT_ChartExNumFmt(oVal.numFmt); }); } if(oVal.txPr !== null) { @@ -968,17 +960,13 @@ BinaryChartReader.prototype.ReadCT_DataLabel = function (type, length, val) { } else if (c_oserct_chartExDataLabelPOS === type) { - var oNewVal = new AscFormat.CDataLabelPos(); - res = this.bcr.Read2(length, function (t, l) { - return oThis.ReadCT_DataLabelPos(t, l, oNewVal); - }); - val.setPos(oNewVal); + val.setPos(this.stream.GetUChar()); } else if (c_oserct_chartExDataLabelNUMFMT === type) { var oNewVal = new AscFormat.CNumFmt(); res = this.bcr.Read2(length, function (t, l) { - return oThis.ReadCT_NumFmt(t, l, oNewVal); + return oThis.ReadCT_ChartExNumFmt(t, l, oNewVal); }); val.setNumFmt(oNewVal); } @@ -1011,7 +999,7 @@ BinaryChartReader.prototype.ReadCT_DataLabel = function (type, length, val) { return res; }; -// DataLabelHidden +// CDataLabelHidden var c_oserct_chartExDataLabelHiddenIDX = 0; BinaryChartWriter.prototype.WriteCT_DataLabelHidden = function (oVal) { @@ -1196,11 +1184,11 @@ BinaryChartReader.prototype.ReadCT_DataLabelVisibilities = function (type, lengt // CBinning var c_oserct_chartExBinningBINSIZE = 0; var c_oserct_chartExBinningBINCOUNT = 1; -var c_oserct_chartExBinningINTERVAL = 2; -var c_oserct_chartExBinningUNDERVAL = 3; -var c_oserct_chartExBinningUNDERAUTO = 4; -var c_oserct_chartExBinningOVERVAL = 5; -var c_oserct_chartExBinningOVERAUTO = 6; +var c_oserct_chartExBinningINTERVAL = 2; // ST CIntervalClosedSide +var c_oserct_chartExBinningUNDERVAL = 3; // ST DoubleOrAutomatic +var c_oserct_chartExBinningUNDERAUTO = 4; // ST DoubleOrAutomatic +var c_oserct_chartExBinningOVERVAL = 5; // ST DoubleOrAutomatic +var c_oserct_chartExBinningOVERAUTO = 6; // ST DoubleOrAutomatic BinaryChartWriter.prototype.WriteCT_Binning = function (oVal) { var oThis = this; @@ -1216,28 +1204,28 @@ BinaryChartWriter.prototype.WriteCT_Binning = function (oVal) { } if(oVal.intervalClosed !== null) { this.bs.WriteItem(c_oserct_chartExBinningINTERVAL, function() { - oThis.WriteCT_IntervalClosedSide(oVal.intervalClosed); + oThis.memory.WriteByte(oVal.intervalClosed); }); } if(oVal.underflow !== null) { - if (oVal.underflow.eValue === EDoubleOrAutomatic.typeDouble) { + if (oVal.underflow.type === EDoubleOrAutomatic.typeDouble) { this.bs.WriteItem(c_oserct_chartExBinningUNDERVAL, function() { - oThis.memory.WriteDouble2(oVal.underflow.dValue); + oThis.memory.WriteDouble2(oVal.underflow.value); }); } else { this.bs.WriteItem(c_oserct_chartExBinningUNDERAUTO, function() { - oThis.memory.WriteByte(oVal.underflow.dValue); + oThis.memory.WriteByte(oVal.underflow.value); }); } } if(oVal.overflow !== null) { - if (oVal.overflow.eValue === EDoubleOrAutomatic.typeDouble) { + if (oVal.overflow.type === EDoubleOrAutomatic.typeDouble) { this.bs.WriteItem(c_oserct_chartExBinningOVERVAL, function() { - oThis.memory.WriteDouble2(oVal.overflow.dValue); + oThis.memory.WriteDouble2(oVal.overflow.value); }); } else { this.bs.WriteItem(c_oserct_chartExBinningOVERAUTO, function() { - oThis.memory.WriteByte(oVal.overflow.dValue); + oThis.memory.WriteByte(oVal.overflow.value); }); } } @@ -1256,34 +1244,34 @@ BinaryChartReader.prototype.ReadCT_Binning = function (type, length, val) { } else if (c_oserct_chartExBinningINTERVAL === type) { - var oNewVal = new AscFormat.CIntervalClosedSide(); - res = this.bcr.Read2(length, function (t, l) { - return oThis.ReadCT_IntervalClosedSide(t, l, oNewVal); - }); - val.setIntervalClosed(oNewVal); + val.setIntervalClosed(this.stream.GetUChar()); } else if (c_oserct_chartExBinningUNDERVAL === type) { var oNewVal = new AscFormat.CDoubleOrAutomatic(); - oNewVal.setDvalue(this.stream.GetDoubleLE()); + oNewVal.setValue(this.stream.GetDoubleLE()); + oNewVal.setType(EDoubleOrAutomatic.typeDouble); val.setUnderflow(oNewVal); } else if (c_oserct_chartExBinningUNDERAUTO === type) { var oNewVal = new AscFormat.CDoubleOrAutomatic(); - oNewVal.setEValue(this.stream.GetUChar()); + oNewVal.setValue(this.stream.GetUChar()); + oNewVal.setType(EDoubleOrAutomatic.typeAuto); val.setUnderflow(oNewVal); } else if (c_oserct_chartExBinningOVERVAL === type) { var oNewVal = new AscFormat.CDoubleOrAutomatic(); - oNewVal.setDvalue(this.stream.GetDoubleLE()); + oNewVal.setValue(this.stream.GetDoubleLE()); + oNewVal.setType(EDoubleOrAutomatic.typeDouble); val.setOverflow(oNewVal); } else if (c_oserct_chartExBinningOVERAUTO === type) { var oNewVal = new AscFormat.CDoubleOrAutomatic(); - oNewVal.setEValue(this.stream.GetUChar()); + oNewVal.setValue(this.stream.GetUChar()); + oNewVal.setType(EDoubleOrAutomatic.typeAuto); val.setOverflow(oNewVal); } else @@ -1297,8 +1285,8 @@ BinaryChartReader.prototype.ReadCT_Binning = function (type, length, val) { var c_oserct_chartExTitleTX = 0; var c_oserct_chartExTitleTXPR = 1; var c_oserct_chartExTitleSPPR = 2; -var c_oserct_chartExTitlePOS = 3; -var c_oserct_chartExTitleALIGN = 4; +var c_oserct_chartExTitlePOS = 3; // ST SidePos +var c_oserct_chartExTitleALIGN = 4; // ST PosAlign var c_oserct_chartExTitleOVERLAY = 5; BinaryChartWriter.prototype.WriteCT_ChartExTitle = function (oVal) { @@ -1320,12 +1308,12 @@ BinaryChartWriter.prototype.WriteCT_ChartExTitle = function (oVal) { } if(oVal.pos !== null) { this.bs.WriteItem(c_oserct_chartExTitlePOS, function() { - oThis.WriteCT_SidePos(oVal.pos); + oThis.memory.WriteByte(oVal.pos); }); } if(oVal.align !== null) { this.bs.WriteItem(c_oserct_chartExTitleALIGN, function() { - oThis.WriteCT_PosAlign(oVal.align); + oThis.memory.WriteByte(oVal.align); }); } if(oVal.overlay !== null) { @@ -1358,19 +1346,11 @@ BinaryChartReader.prototype.ReadCT_ChartExTitle = function (type, length, val) { } else if (c_oserct_chartExTitlePOS === type) { - var oNewVal = new AscFormat.CSidePos(); - res = this.bcr.Read2(length, function (t, l) { - return oThis.ReadCT_SidePos(t, l, oNewVal); - }); - val.setPos(oNewVal); + val.setPos(this.stream.GetUChar()); } else if (c_oserct_chartExTitleALIGN === type) { - var oNewVal = new AscFormat.CPosAlign(); - res = this.bcr.Read2(length, function (t, l) { - return oThis.ReadCT_PosAlign(t, l, oNewVal); - }); - val.setAlign(oNewVal); + val.setAlign(this.stream.GetUChar()); } else if (c_oserct_chartExTitleOVERLAY === type) { @@ -1386,30 +1366,30 @@ BinaryChartReader.prototype.ReadCT_ChartExTitle = function (type, length, val) { // CChartExLegend var c_oserct_chartExLegendTXPR = 0; var c_oserct_chartExLegendSPPR = 1; -var c_oserct_chartExLegendPOS = 2; -var c_oserct_chartExLegendALIGN = 3; +var c_oserct_chartExLegendPOS = 2; // ST SidePos +var c_oserct_chartExLegendALIGN = 3; // ST PosAlign var c_oserct_chartExLegendOVERLAY = 4; BinaryChartWriter.prototype.WriteCT_ChartExLegend = function (oVal) { var oThis = this; if(oVal.txPr !== null) { - this.bs.WriteItem(c_oserct_axisTXPR, function() { + this.bs.WriteItem(c_oserct_chartExLegendTXPR, function() { oThis.WriteTxPr(oVal.txPr); }); } if(oVal.spPr !== null) { - this.bs.WriteItem(c_oserct_axisSPPR, function() { + this.bs.WriteItem(c_oserct_chartExLegendSPPR, function() { oThis.WriteSpPr(oVal.spPr); }); } if(oVal.pos !== null) { this.bs.WriteItem(c_oserct_chartExLegendPOS, function() { - oThis.WriteCT_SidePos(oVal.pos); + oThis.memory.WriteByte(oVal.pos); }); } if(oVal.align !== null) { this.bs.WriteItem(c_oserct_chartExLegendALIGN, function() { - oThis.WriteCT_PosAlign(oVal.align); + oThis.memory.WriteByte(oVal.align); }); } if(oVal.overlay !== null) { @@ -1434,19 +1414,11 @@ BinaryChartReader.prototype.ReadCT_ChartExLegend = function (type, length, val) } else if (c_oserct_chartExLegendPOS === type) { - var oNewVal = new AscFormat.CSidePos(); - res = this.bcr.Read2(length, function (t, l) { - return oThis.ReadCT_SidePos(t, l, oNewVal); - }); - val.setPos(oNewVal); + val.setPos(this.stream.GetUChar()); } else if (c_oserct_chartExLegendALIGN === type) { - var oNewVal = new AscFormat.CPosAlign(); - res = this.bcr.Read2(length, function (t, l) { - return oThis.ReadCT_PosAlign(t, l, oNewVal); - }); - val.setAlign(oNewVal); + val.setAlign(this.stream.GetUChar()); } else if (c_oserct_chartExLegendOVERLAY === type) { @@ -1699,19 +1671,19 @@ BinaryChartReader.prototype.ReadCT_SeriesElementVisibilities = function (type, l }; // CCategoryAxisScaling -var c_oserct_chartExCatScalingGAPAUTO = 0; -var c_oserct_chartExCatScalingGAPVAL = 1; +var c_oserct_chartExCatScalingGAPAUTO = 0; // ST DoubleOrAutomatic +var c_oserct_chartExCatScalingGAPVAL = 1; // ST DoubleOrAutomatic BinaryChartWriter.prototype.WriteCT_CategoryAxisScaling = function (oVal) { var oThis = this; if(oVal.gapWidth !== null) { - if (oVal.gapWidth.eValue === EDoubleOrAutomatic.typeDouble) { + if (oVal.gapWidth.type === EDoubleOrAutomatic.typeDouble) { this.bs.WriteItem(c_oserct_chartExCatScalingGAPVAL, function() { - oThis.memory.WriteDouble2(oVal.gapWidth.dValue); + oThis.memory.WriteDouble2(oVal.gapWidth.value); }); } else { this.bs.WriteItem(c_oserct_chartExCatScalingGAPAUTO, function() { - oThis.memory.WriteByte(oVal.gapWidth.dValue); + oThis.memory.WriteByte(oVal.gapWidth.value); }); } } @@ -1723,13 +1695,15 @@ BinaryChartReader.prototype.ReadCT_CategoryAxisScaling = function (type, length, if (c_oserct_chartExCatScalingGAPVAL === type) { var oNewVal = new AscFormat.CDoubleOrAutomatic(); - oNewVal.setDvalue(this.stream.GetDoubleLE()); + oNewVal.setValue(this.stream.GetDoubleLE()); + oNewVal.setType(EDoubleOrAutomatic.typeDouble); val.setGapWidth(oNewVal); } else if (c_oserct_chartExCatScalingGAPAUTO === type) { var oNewVal = new AscFormat.CDoubleOrAutomatic(); - oNewVal.setEValue(this.stream.GetUChar()); + oNewVal.setValue(this.stream.GetUChar()); + oNewVal.setType(EDoubleOrAutomatic.typeAuto); val.setGapWidth(oNewVal); } else @@ -1740,58 +1714,58 @@ BinaryChartReader.prototype.ReadCT_CategoryAxisScaling = function (type, length, }; // CValueAxisScaling -var c_oserct_chartExValScalingMAXAUTO = 0; -var c_oserct_chartExValScalingMAXVAL = 1; -var c_oserct_chartExValScalingMINAUTO = 2; -var c_oserct_chartExValScalingMINVAL = 3; -var c_oserct_chartExValScalingMAJUNITAUTO = 4; -var c_oserct_chartExValScalingMAJUNITVAL = 5; -var c_oserct_chartExValScalingMINUNITAUTO = 6; -var c_oserct_chartExValScalingMINUNITVAL = 7; +var c_oserct_chartExValScalingMAXAUTO = 0; // ST DoubleOrAutomatic +var c_oserct_chartExValScalingMAXVAL = 1; // ST DoubleOrAutomatic +var c_oserct_chartExValScalingMINAUTO = 2; // ST DoubleOrAutomatic +var c_oserct_chartExValScalingMINVAL = 3; // ST DoubleOrAutomatic +var c_oserct_chartExValScalingMAJUNITAUTO = 4; // ST DoubleOrAutomatic +var c_oserct_chartExValScalingMAJUNITVAL = 5; // ST DoubleOrAutomatic +var c_oserct_chartExValScalingMINUNITAUTO = 6; // ST DoubleOrAutomatic +var c_oserct_chartExValScalingMINUNITVAL = 7; // ST DoubleOrAutomatic BinaryChartWriter.prototype.WriteCT_ValueAxisScaling = function (oVal) { var oThis = this; if(oVal.max !== null) { - if (oVal.max.eValue === EDoubleOrAutomatic.typeDouble) { + if (oVal.max.type === EDoubleOrAutomatic.typeDouble) { this.bs.WriteItem(c_oserct_chartExValScalingMAXVAL, function() { - oThis.memory.WriteDouble2(oVal.max.dValue); + oThis.memory.WriteDouble2(oVal.max.value); }); } else { this.bs.WriteItem(c_oserct_chartExValScalingMAXAUTO, function() { - oThis.memory.WriteByte(oVal.max.dValue); + oThis.memory.WriteByte(oVal.max.value); }); } } if(oVal.min !== null) { - if (oVal.min.eValue === EDoubleOrAutomatic.typeDouble) { + if (oVal.min.type === EDoubleOrAutomatic.typeDouble) { this.bs.WriteItem(c_oserct_chartExValScalingMINVAL, function() { - oThis.memory.WriteDouble2(oVal.min.dValue); + oThis.memory.WriteDouble2(oVal.min.value); }); } else { this.bs.WriteItem(c_oserct_chartExValScalingMINAUTO, function() { - oThis.memory.WriteByte(oVal.min.dValue); + oThis.memory.WriteByte(oVal.min.value); }); } } if(oVal.majorUnit !== null) { - if (oVal.majorUnit.eValue === EDoubleOrAutomatic.typeDouble) { + if (oVal.majorUnit.type === EDoubleOrAutomatic.typeDouble) { this.bs.WriteItem(c_oserct_chartExValScalingMAJUNITVAL, function() { - oThis.memory.WriteDouble2(oVal.majorUnit.dValue); + oThis.memory.WriteDouble2(oVal.majorUnit.value); }); } else { this.bs.WriteItem(c_oserct_chartExValScalingMAJUNITAUTO, function() { - oThis.memory.WriteByte(oVal.majorUnit.dValue); + oThis.memory.WriteByte(oVal.majorUnit.value); }); } } if(oVal.minorUnit !== null) { - if (oVal.minorUnit.eValue === EDoubleOrAutomatic.typeDouble) { + if (oVal.minorUnit.type === EDoubleOrAutomatic.typeDouble) { this.bs.WriteItem(c_oserct_chartExValScalingMINUNITVAL, function() { - oThis.memory.WriteDouble2(oVal.minorUnit.dValue); + oThis.memory.WriteDouble2(oVal.minorUnit.value); }); } else { this.bs.WriteItem(c_oserct_chartExValScalingMINUNITAUTO, function() { - oThis.memory.WriteByte(oVal.minorUnit.dValue); + oThis.memory.WriteByte(oVal.minorUnit.value); }); } } @@ -1803,49 +1777,57 @@ BinaryChartReader.prototype.ReadCT_ValueAxisScaling = function (type, length, va if (c_oserct_chartExValScalingMAXAUTO === type) { var oNewVal = new AscFormat.CDoubleOrAutomatic(); - oNewVal.setEValue(this.stream.GetUChar()); + oNewVal.setValue(this.stream.GetUChar()); + oNewVal.setType(EDoubleOrAutomatic.typeAuto); val.setMax(oNewVal); } else if (c_oserct_chartExValScalingMAXVAL === type) { var oNewVal = new AscFormat.CDoubleOrAutomatic(); - oNewVal.setDvalue(this.stream.GetDoubleLE()); + oNewVal.setValue(this.stream.GetDoubleLE()); + oNewVal.setType(EDoubleOrAutomatic.typeDouble); val.setMax(oNewVal); } else if (c_oserct_chartExValScalingMINAUTO === type) { var oNewVal = new AscFormat.CDoubleOrAutomatic(); - oNewVal.setEValue(this.stream.GetUChar()); + oNewVal.setValue(this.stream.GetUChar()); + oNewVal.setType(EDoubleOrAutomatic.typeAuto); val.setMin(oNewVal); } else if (c_oserct_chartExValScalingMINVAL === type) { var oNewVal = new AscFormat.CDoubleOrAutomatic(); - oNewVal.setDvalue(this.stream.GetDoubleLE()); + oNewVal.setValue(this.stream.GetDoubleLE()); + oNewVal.setType(EDoubleOrAutomatic.typeDouble); val.setMin(oNewVal); } else if (c_oserct_chartExValScalingMAJUNITAUTO === type) { var oNewVal = new AscFormat.CDoubleOrAutomatic(); - oNewVal.setEValue(this.stream.GetUChar()); + oNewVal.setValue(this.stream.GetUChar()); + oNewVal.setType(EDoubleOrAutomatic.typeAuto); val.setMajorUnit(oNewVal); } else if (c_oserct_chartExValScalingMAJUNITVAL === type) { var oNewVal = new AscFormat.CDoubleOrAutomatic(); - oNewVal.setDvalue(this.stream.GetDoubleLE()); + oNewVal.setValue(this.stream.GetDoubleLE()); + oNewVal.setType(EDoubleOrAutomatic.typeDouble); val.setMajorUnit(oNewVal); } else if (c_oserct_chartExValScalingMINUNITAUTO === type) { var oNewVal = new AscFormat.CDoubleOrAutomatic(); - oNewVal.setEValue(this.stream.GetUChar()); + oNewVal.setValue(this.stream.GetUChar()); + oNewVal.setType(EDoubleOrAutomatic.typeAuto); val.setMinorUnit(oNewVal); } else if (c_oserct_chartExValScalingMINUNITVAL === type) { var oNewVal = new AscFormat.CDoubleOrAutomatic(); - oNewVal.setDvalue(this.stream.GetDoubleLE()); + oNewVal.setValue(this.stream.GetDoubleLE()); + oNewVal.setType(EDoubleOrAutomatic.typeDouble); val.setMinorUnit(oNewVal); } else @@ -1856,7 +1838,7 @@ BinaryChartReader.prototype.ReadCT_ValueAxisScaling = function (type, length, va }; // CAxisUnits -var c_oserct_chartExAxisUnitTYPE = 0; +var c_oserct_chartExAxisUnitTYPE = 0; // ST AxisUnit var c_oserct_chartExAxisUnitLABEL = 1; BinaryChartWriter.prototype.WriteCT_AxisUnits = function (oVal) { @@ -1868,7 +1850,7 @@ BinaryChartWriter.prototype.WriteCT_AxisUnits = function (oVal) { } if(oVal.unit !== null) { this.bs.WriteItem(c_oserct_chartExAxisUnitTYPE, function() { - oThis.WriteCT_AxisUnit(oVal.unit); + oThis.memory.WriteByte(oVal.unit); }); } }; @@ -1886,11 +1868,7 @@ BinaryChartReader.prototype.ReadCT_AxisUnits = function (type, length, val) { } else if (c_oserct_chartExAxisUnitTYPE === type) { - var oNewVal = new AscFormat.CAxisUnit(); - res = this.bcr.Read2(length, function (t, l) { - return oThis.ReadCT_AxisUnit(t, l, oNewVal); - }); - val.setUnit(oNewVal); + val.setUnit(this.stream.GetUChar()); } else { @@ -1952,13 +1930,13 @@ BinaryChartReader.prototype.ReadCT_AxisUnitsLabel = function (type, length, val) }; // CTickMarks -var c_oserct_chartExTickMarksTYPE = 0; +var c_oserct_chartExTickMarksTYPE = 0; // ST TickMarksType BinaryChartWriter.prototype.WriteCT_TickMarks = function (oVal) { var oThis = this; if(oVal.type !== null) { this.bs.WriteItem(c_oserct_chartExTickMarksTYPE, function() { - oThis.WriteCT_TickMarksType(oVal.type); + oThis.memory.WriteByte(oVal.type); }); } }; @@ -1968,11 +1946,7 @@ BinaryChartReader.prototype.ReadCT_TickMarks = function (type, length, val) { var oNewVal; if (c_oserct_chartExTickMarksTYPE === type) { - var oNewVal = new AscFormat.CTickMarksType(); - res = this.bcr.Read1(length, function (t, l) { - return oThis.ReadCT_TickMarksType(t, l, oNewVal); - }); - val.setType(oNewVal); + val.setType(this.stream.GetUChar()); } else { @@ -2009,13 +1983,13 @@ BinaryChartReader.prototype.ReadCT_Gridlines = function (type, length, val) { }; // CStatistics -var c_oserct_chartExStatisticsMETHOD = 0; +var c_oserct_chartExStatisticsMETHOD = 0; // ST QuartileMethod BinaryChartWriter.prototype.WriteCT_Statistics = function (oVal) { var oThis = this; if(oVal.quartileMethod !== null) { this.bs.WriteItem(c_oserct_chartExStatisticsMETHOD, function() { - oThis.memory.WriteByte(oVal.quartileMethod.quartileMethod); + oThis.memory.WriteByte(oVal.quartileMethod); }); } }; @@ -2025,12 +1999,7 @@ BinaryChartReader.prototype.ReadCT_Statistics = function (type, length, val) { var oNewVal; if (c_oserct_chartExStatisticsMETHOD === type) { - var oNewVal = new AscFormat.CQuartileMethod(); - res = this.bcr.Read1(length, function (t, l) { - return oThis.ReadCT_QuartileMethod(t, l, oNewVal); - }); - oNewVal.setQuartileMethod(this.stream.GetUChar()); - val.setQuartileMethod(oNewVal); + val.setQuartileMethod(this.stream.GetUChar()); } else { @@ -2178,7 +2147,7 @@ BinaryChartReader.prototype.ReadCT_NumericDimension = function (type, length, va // CFormula var c_oserct_chartExFormulaCONTENT = 0; -var c_oserct_chartExFormulaDIRECTION = 1; +var c_oserct_chartExFormulaDIRECTION = 1; // ST DimensionType BinaryChartWriter.prototype.WriteCT_Formula = function (oVal) { var oThis = this; @@ -2189,7 +2158,7 @@ BinaryChartWriter.prototype.WriteCT_Formula = function (oVal) { } if(oVal.dir !== null) { this.bs.WriteItem(c_oserct_chartExFormulaDIRECTION, function() { - oThis.memory.WriteByte(oVal.dir.formulaDirection); + oThis.memory.WriteByte(oVal.dir); }); } }; @@ -2203,9 +2172,7 @@ BinaryChartReader.prototype.ReadCT_Formula = function (type, length, val) { } else if (c_oserct_chartExFormulaDIRECTION === type) { - var oNewVal = new AscFormat.CFormulaDirection(); - oNewVal.setFormulaDirection(this.stream.GetUChar()); - val.setDir(oNewVal); + val.setDir(this.stream.GetUChar()); } else { From 6ef8eb14022a881217085eaf7bb840003c02f4e5 Mon Sep 17 00:00:00 2001 From: Dmitriy Aleksandrov Date: Wed, 23 Aug 2023 17:11:13 +0600 Subject: [PATCH 20/30] For bug #62819 Edit ST doubleorautomatic. Transfer structures to main file. Delete temp file. --- common/Drawings/Format/ChartEx.js | 4 +- common/SerializeChart.js | 10193 +++++++++++++++++----------- common/tempSerializeChart.js | 2409 ------- 3 files changed, 6099 insertions(+), 6507 deletions(-) delete mode 100644 common/tempSerializeChart.js diff --git a/common/Drawings/Format/ChartEx.js b/common/Drawings/Format/ChartEx.js index ecc2005cc4..e747d8a214 100644 --- a/common/Drawings/Format/ChartEx.js +++ b/common/Drawings/Format/ChartEx.js @@ -2210,7 +2210,7 @@ AscDFH.changesFactory[AscDFH.historyitem_NumericDimension_AddLevelData] = window['AscDFH'].CChangesDrawingsContent; AscDFH.changesFactory[AscDFH.historyitem_NumericDimension_RemoveLevelData] = window['AscDFH'].CChangesDrawingsContent; function CNumericDimension() { - CBaseChartObject.call(this); + CDimension.call(this); this.levelData = []; } @@ -3092,7 +3092,7 @@ AscDFH.changesFactory[AscDFH.historyitem_StringDimension_AddLevelData] = window['AscDFH'].CChangesDrawingsContent; AscDFH.changesFactory[AscDFH.historyitem_StringDimension_RemoveLevelData] = window['AscDFH'].CChangesDrawingsContent; function CStringDimension() { - CBaseChartObject.call(this); + CDimension.call(this); this.levelData = []; } diff --git a/common/SerializeChart.js b/common/SerializeChart.js index 473694b357..3a065131a7 100644 --- a/common/SerializeChart.js +++ b/common/SerializeChart.js @@ -1036,7 +1036,7 @@ var c_oserct_chartExSpaceCLRMAPOVR = 4; var c_oserct_chartExSpaceXLSX = c_oserct_chartspaceXLSX;/* = 16*/ var c_oserct_chartExSpaceSTYLES = c_oserct_chartspaceSTYLES;/* = 17*/ var c_oserct_chartExSpaceCOLORS = c_oserct_chartspaceCOLORS;/* = 18*/ -var c_oserct_chartExSpaceXLSXEXTERNAL = c_oserct_chartspaceXLSXEXTERNAL;/* = 19*/ +// var c_oserct_chartExSpaceXLSXEXTERNAL = c_oserct_chartspaceXLSXEXTERNAL;/* = 19*/ var c_oserct_chartExDATA = 0; var c_oserct_chartExEXTERNALDATA = 1; @@ -5835,293 +5835,946 @@ BinaryChartWriter.prototype.WriteCT_TextLanguageID = function (oVal) { }); } }; -BinaryChartWriter.prototype.WriteAlternateContent = function (oVal) { +BinaryChartWriter.prototype.WriteCT_Axis = function (oVal) { var oThis = this; - if (null != oVal.m_Choice) { - for (var i = 0, length = oVal.m_Choice.length; i < length; ++i) { - var oCurVal = oVal.m_Choice[i]; - if (null != oCurVal) { - this.bs.WriteItem(c_oseralternatecontentCHOICE, function () { - oThis.WriteAlternateContentChoice(oCurVal); + if(oVal.id !== null) { + this.bs.WriteItem(c_oserct_chartExAxisID, function() { + oThis.memory.WriteLong(oVal.id); + }); + } + if(oVal.hidden !== null) { + this.bs.WriteItem(c_oserct_chartExAxisHIDDEN, function() { + oThis.memory.WriteBool(oVal.hidden); + }); + } + if(oVal.catScaling !== null) { + this.bs.WriteItem(c_oserct_chartExAxisCATSCALING, function() { + oThis.WriteCT_CategoryAxisScaling(oVal.catScaling); + }); + } + if(oVal.valScaling !== null) { + this.bs.WriteItem(c_oserct_chartExAxisVALSCALING, function() { + oThis.WriteCT_ValueAxisScaling(oVal.valScaling); + }); + } + if(oVal.title !== null) { + this.bs.WriteItem(c_oserct_chartExAxisTITLE, function() { + oThis.WriteCT_ChartExTitle(oVal.title); + }); + } + if(oVal.units !== null) { + this.bs.WriteItem(c_oserct_chartExAxisUNIT, function() { + oThis.WriteCT_AxisUnits(oVal.units); + }); + } + if(oVal.numFmt !== null) { + this.bs.WriteItem(c_oserct_chartExAxisNUMFMT, function() { + oThis.WriteCT_ChartExNumFmt(oVal.numFmt); + }); + } + if(oVal.majorTickMarks !== null) { + this.bs.WriteItem(c_oserct_chartExAxisMAJORTICK, function() { + oThis.WriteCT_TickMarks(oVal.majorTickMarks); + }); + } + if(oVal.minorTickMarks !== null) { + this.bs.WriteItem(c_oserct_chartExAxisMINORTICK, function() { + oThis.WriteCT_TickMarks(oVal.minorTickMarks); + }); + } + if(oVal.majorGridlines !== null) { + this.bs.WriteItem(c_oserct_chartExAxisMAJORGRID, function() { + oThis.WriteCT_Gridlines(oVal.majorGridlines); + }); + } + if(oVal.minorGridlines !== null) { + this.bs.WriteItem(c_oserct_chartExAxisMINORGRID, function() { + oThis.WriteCT_Gridlines(oVal.minorGridlines); + }); + } + if(oVal.tickLabels !== null) { + this.bs.WriteItem(c_oserct_chartExAxisTICKLABELS, function() { + oThis.memory.WriteBool(oVal.tickLabels); + }); + } + if(oVal.txPr !== null) { + this.bs.WriteItem(c_oserct_chartExAxisTXPR, function() { + oThis.WriteTxPr(oVal.txPr); + }); + } + if(oVal.spPr !== null) { + this.bs.WriteItem(c_oserct_chartExAxisSPPR, function() { + oThis.WriteSpPr(oVal.spPr); + }); + } +}; +BinaryChartWriter.prototype.WriteCT_ChartData = function (oVal) { + var oThis = this; + if (oVal.data !== null) { + for (var i = 0, length = oVal.data.length; i < length; ++i) { + var oCurVal = oVal.data[i]; + if (oCurVal !== null) { + this.bs.WriteItem(c_oserct_chartExDATA, function () { + oThis.WriteCT_Data(oCurVal); }); } } } - var oCurVal = oVal.m_Fallback; - if (null != oCurVal) { - this.bs.WriteItem(c_oseralternatecontentFALLBACK, function () { - oThis.WriteAlternateContentFallback(oCurVal); + if(oVal.externalData !== null) { + this.bs.WriteItem(c_oserct_chartExEXTERNALDATA, function() { + oThis.WriteCT_ChartExExternalData(oVal.externalData); }); } }; -BinaryChartWriter.prototype.WriteAlternateContentChoice = function (oVal) { +BinaryChartWriter.prototype.WriteCT_ChartExExternalData = function (oVal) { + var res = c_oSerConstants.ReadOk; var oThis = this; - var oCurVal = oVal.m_style; - if (null != oCurVal) { - this.bs.WriteItem(c_oseralternatecontentchoiceSTYLE, function () { - oThis.WriteCT_Style(oCurVal); - }); - } - var oCurVal = oVal.m_Requires; - if (null != oCurVal) { - this.bs.WriteItem(c_oseralternatecontentchoiceREQUIRES, function () { - oThis.memory.WriteString3(oCurVal); + var oCurVal = oVal.m_autoUpdate; + if (oCurVal !== null) { + this.bs.WriteItem(c_oserct_chartExExternalAUTOUPDATE, function () { + oThis.WriteCT_Boolean(oCurVal); }); } }; -BinaryChartWriter.prototype.WriteAlternateContentFallback = function (oVal) { +BinaryChartWriter.prototype.WriteCT_ChartEx = function (oVal) { var oThis = this; - var oCurVal = oVal.m_style; - if (null != oCurVal) { - this.bs.WriteItem(c_oseralternatecontentfallbackSTYLE, function () { - oThis.WriteCT_Style1(oCurVal); + if(oVal.plotArea !== null) { + this.bs.WriteItem(c_oserct_chartExChartPLOTAREA, function() { + oThis.WriteCT_ChartExPlotArea(oVal.plotArea); + }); + } + if(oVal.title !== null) { + this.bs.WriteItem(c_oserct_chartExChartTITLE, function() { + oThis.WriteCT_ChartExTitle(oVal.title); + }); + } + if(oVal.legend !== null) { + this.bs.WriteItem(c_oserct_chartExChartLEGEND, function() { + oThis.WriteCT_ChartExLegend(oVal.legend); }); } }; -function BinaryChartReader(stream) { - this.stream = stream; - this.bcr = new AscCommon.Binary_CommonReader(this.stream); - this.drawingDocument = null; -} -BinaryChartReader.prototype.ReadCT_extLst = function (type, length, val) { - var res = c_oSerConstants.ReadOk; +BinaryChartWriter.prototype.WriteCT_ChartExPlotArea = function (oVal) { var oThis = this; - if (c_oserct_extlstEXT === type) { - var oNewVal; - oNewVal = {}; - res = this.bcr.Read1(length, function (t, l) { - return oThis.ReadCT_Extension(t, l, oNewVal); + if(oVal.plotAreaRegion !== null) { + this.bs.WriteItem(c_oserct_chartExChartAREAREGION, function() { + oThis.WriteCT_PlotAreaRegion(oVal.plotAreaRegion); }); - if (null == val.m_ext) - val.m_ext = []; - val.m_ext.push(oNewVal); } - else - res = c_oSerConstants.ReadUnknown; - return res; -}; -BinaryChartReader.prototype.ExternalReadCT_ChartSpace = function (length, val, curWorksheet) { - var res = c_oSerConstants.ReadOk; - this.curWorksheet = curWorksheet; - this.drawingDocument = null; - if(this.curWorksheet) { - if(this.curWorksheet.getDrawingDocument) { - this.drawingDocument = this.curWorksheet.getDrawingDocument(); - } - else { - if(this.curWorksheet.DrawingDocument) { - this.drawingDocument = this.curWorksheet.DrawingDocument; + if (oVal.axis !== null) { + for (var i = 0, length = oVal.axis.length; i < length; ++i) { + var oCurVal = oVal.axis[i]; + if (oCurVal !== null) { + this.bs.WriteItem(c_oserct_chartExChartAXIS, function () { + oThis.WriteCT_Axis(oCurVal); + }); } } } - + if(oVal.spPr !== null) { + this.bs.WriteItem(c_oserct_chartExChartSPPR, function() { + oThis.WriteSpPr(oVal.spPr); + }); + } +}; +BinaryChartWriter.prototype.WriteCT_PlotAreaRegion = function (oVal) { var oThis = this; - this.curChart = val; - res = this.bcr.Read1(length, function (t, l) { - return oThis.ReadCT_ChartSpace(t, l, val); - }); - if(val){ - val.correctAxes(); - } - /*if(this.curWorksheet) { - var aStyles = null; - var sName = this.curWorksheet.sName; - if(sName === "Bar") { - - if(!Array.isArray(AscCommon.g_oChartStyles["Asc.c_oAscChartTypeSettings.barNormal"])) { - AscCommon.g_oChartStyles["Asc.c_oAscChartTypeSettings.barNormal"] = []; - } - aStyles = AscCommon.g_oChartStyles["Asc.c_oAscChartTypeSettings.barNormal"]; - } - else if(sName === "BarStacked") { - if(!Array.isArray(AscCommon.g_oChartStyles["Asc.c_oAscChartTypeSettings.barStacked"])) { - AscCommon.g_oChartStyles["Asc.c_oAscChartTypeSettings.barStacked"] = []; - } - aStyles = AscCommon.g_oChartStyles["Asc.c_oAscChartTypeSettings.barStacked"]; - } - else if(sName === "BarStackedPer") { - if(!Array.isArray(AscCommon.g_oChartStyles["Asc.c_oAscChartTypeSettings.barStackedPer"])) { - AscCommon.g_oChartStyles["Asc.c_oAscChartTypeSettings.barStackedPer"] = []; - } - aStyles = AscCommon.g_oChartStyles["Asc.c_oAscChartTypeSettings.barStackedPer"]; - } - else if(sName === "3DClusteredColumn") { - if(!Array.isArray(AscCommon.g_oChartStyles["Asc.c_oAscChartTypeSettings.barNormal3d"])) { - AscCommon.g_oChartStyles["Asc.c_oAscChartTypeSettings.barNormal3d"] = []; - } - aStyles = AscCommon.g_oChartStyles["Asc.c_oAscChartTypeSettings.barNormal3d"]; - } - else if(sName === "3DStackedColumn") { - if(!Array.isArray(AscCommon.g_oChartStyles["Asc.c_oAscChartTypeSettings.barStacked3d"])) { - AscCommon.g_oChartStyles["Asc.c_oAscChartTypeSettings.barStacked3d"] = []; - } - aStyles = AscCommon.g_oChartStyles["Asc.c_oAscChartTypeSettings.barStacked3d"]; - } - else if(sName === "3DStackedColumnPer") { - if(!Array.isArray(AscCommon.g_oChartStyles["Asc.c_oAscChartTypeSettings.barStackedPer3d"])) { - AscCommon.g_oChartStyles["Asc.c_oAscChartTypeSettings.barStackedPer3d"] = []; - } - aStyles = AscCommon.g_oChartStyles["Asc.c_oAscChartTypeSettings.barStackedPer3d"]; - } - else if(sName === "3DColumn") { - if(!Array.isArray(AscCommon.g_oChartStyles["Asc.c_oAscChartTypeSettings.barNormal3dPerspective"])) { - AscCommon.g_oChartStyles["Asc.c_oAscChartTypeSettings.barNormal3dPerspective"] = []; - } - aStyles = AscCommon.g_oChartStyles["Asc.c_oAscChartTypeSettings.barNormal3dPerspective"]; - } - else if(sName === "2DBar") { - if(!Array.isArray(AscCommon.g_oChartStyles["Asc.c_oAscChartTypeSettings.hBarNormal"])) { - AscCommon.g_oChartStyles["Asc.c_oAscChartTypeSettings.hBarNormal"] = []; + if(oVal.plotSurface !== null) { + this.bs.WriteItem(c_oserct_chartExAreaPLOTSURFACE, function() { + oThis.WriteCT_PlotSurface(oVal.plotSurface); + }); + } + if (oVal.series !== null) { + for (var i = 0, length = oVal.series.length; i < length; ++i) { + var oCurVal = oVal.series[i]; + if (null != oCurVal) { + this.bs.WriteItem(c_oserct_chartExAreaSERIES, function () { + oThis.WriteCT_Series(oCurVal); + }); } - aStyles = AscCommon.g_oChartStyles["Asc.c_oAscChartTypeSettings.hBarNormal"]; } - else if(sName === "StackedBar") { - if(!Array.isArray(AscCommon.g_oChartStyles["Asc.c_oAscChartTypeSettings.hBarStacked"])) { - AscCommon.g_oChartStyles["Asc.c_oAscChartTypeSettings.hBarStacked"] = []; + } +}; +BinaryChartWriter.prototype.WriteCT_PlotSurface = function (oVal) { + var oThis = this; + if(oVal.spPr !== null) { + this.bs.WriteItem(c_oserct_chartExPlotSurfaceSPPR, function() { + oThis.WriteSpPr(oVal.spPr); + }); + } +}; +BinaryChartWriter.prototype.WriteCT_Series = function (oVal) { + var oThis = this; + if (oVal.dataPt !== null) { + for (var i = 0, length = oVal.dataPt.length; i < length; ++i) { + var oCurVal = oVal.dataPt[i]; + if (null != oCurVal) { + this.bs.WriteItem(c_oserct_chartExSeriesDATAPT, function () { + oThis.WriteCT_DataPoint(oCurVal); + }); } - aStyles = AscCommon.g_oChartStyles["Asc.c_oAscChartTypeSettings.hBarStacked"]; } - else if(sName === "StackedBarPer") { - if(!Array.isArray(AscCommon.g_oChartStyles["Asc.c_oAscChartTypeSettings.hBarStackedPer"])) { - AscCommon.g_oChartStyles["Asc.c_oAscChartTypeSettings.hBarStackedPer"] = []; + } + if(oVal.dataLabels !== null) { + this.bs.WriteItem(c_oserct_chartExSeriesDATALABELS, function() { + oThis.WriteCT_DataLabels(oVal.dataLabels); + }); + } + if(oVal.layoutPr !== null) { + this.bs.WriteItem(c_oserct_chartExSeriesLAYOUTPROPS, function() { + oThis.WriteCT_SeriesLayoutProperties(oVal.layoutPr); + }); + } + if(oVal.tx !== null) { + this.bs.WriteItem(c_oserct_chartExSeriesTEXT, function() { + oThis.WriteCT_Text(oVal.tx); + }); + } + if (oVal.axisId !== null) { + for (var i = 0, length = oVal.axisId.length; i < length; ++i) { + var oCurVal = oVal.axisId[i]; + if (null != oCurVal) { + this.bs.WriteItem(c_oserct_chartExSeriesAXIS, function () { + oThis.WriteCT_Axis(oCurVal); + }); } - aStyles = AscCommon.g_oChartStyles["Asc.c_oAscChartTypeSettings.hBarStackedPer"]; } - else if(sName === "3DClusteredBar") { - if(!Array.isArray(AscCommon.g_oChartStyles["Asc.c_oAscChartTypeSettings.hBarNormal3d"])) { - AscCommon.g_oChartStyles["Asc.c_oAscChartTypeSettings.hBarNormal3d"] = []; + } + if(oVal.dataId !== null) { + this.bs.WriteItem(c_oserct_chartExSeriesDATAID, function() { + oThis.memory.WriteDouble2(oVal.dataId); + }); + } + if(oVal.spPr !== null) { + this.bs.WriteItem(c_oserct_chartExSeriesSPPR, function() { + oThis.WriteSpPr(oVal.spPr); + }); + } + if(oVal.layoutId !== null) { + this.bs.WriteItem(c_oserct_chartExSeriesLAYOUTID, function() { + oThis.memory.WriteByte(oVal.layoutId); + }); + } + if(oVal.hidden !== null) { + this.bs.WriteItem(c_oserct_chartExSeriesHIDDEN, function() { + oThis.memory.WriteBool(oVal.hidden); + }); + } + if(oVal.ownerIdx !== null) { + this.bs.WriteItem(c_oserct_chartExSeriesOWNERIDX, function() { + oThis.memory.WriteLong(oVal.ownerIdx); + }); + } + if(oVal.formatIdx !== null) { + this.bs.WriteItem(c_oserct_chartExSeriesFORMATIDX, function() { + oThis.memory.WriteLong(oVal.formatIdx); + }); + } + if(oVal.uniqueId !== null) { + this.bs.WriteItem(c_oserct_chartExSeriesUNIQUEID, function() { + oThis.memory.WriteString3(oVal.uniqueId); + }); + } +}; +BinaryChartWriter.prototype.WriteCT_DataPoint = function (oVal) { + var oThis = this; + if(oVal.idx !== null) { + this.bs.WriteItem(c_oserct_chartExDataPointIDX, function() { + oThis.memory.WriteLong(oVal.idx); + }); + } + if(oVal.spPr !== null) { + this.bs.WriteItem(c_oserct_chartExDataPointSPPR, function() { + oThis.WriteSpPr(oVal.spPr); + }); + } +}; +BinaryChartWriter.prototype.WriteCT_DataLabels = function (oVal) { + var oThis = this; + if(oVal.pos !== null) { + this.bs.WriteItem(c_oserct_chartExDataLabelsPOS, function() { + oThis.memory.WriteByte(oVal.pos); + }); + } + if(oVal.numFmt !== null) { + this.bs.WriteItem(c_oserct_chartExDataLabelsNUMFMT, function() { + oThis.WriteCT_ChartExNumFmt(oVal.numFmt); + }); + } + if(oVal.txPr !== null) { + this.bs.WriteItem(c_oserct_chartExDataLabelsTXPR, function() { + oThis.WriteTxPr(oVal.txPr); + }); + } + if(oVal.spPr !== null) { + this.bs.WriteItem(c_oserct_chartExDataLabelsSPPR, function() { + oThis.WriteSpPr(oVal.spPr); + }); + } + if(oVal.visibility !== null) { + this.bs.WriteItem(c_oserct_chartExDataLabelsVISABILITIES, function() { + oThis.WriteCT_DataLabelVisibilities(oVal.visibility); + }); + } + if(oVal.separator !== null) { + this.bs.WriteItem(c_oserct_chartExDataLabelsSEPARATOR, function() { + oThis.memory.WriteString3(oVal.separator); + }); + } + if (oVal.dataLabel !== null) { + for (var i = 0, length = oVal.dataLabel.length; i < length; ++i) { + var oCurVal = oVal.dataLabel[i]; + if (null != oCurVal) { + this.bs.WriteItem(c_oserct_chartExDataLabelsDATALABEL, function () { + oThis.WriteCT_Datalabel(oCurVal); + }); } - aStyles = AscCommon.g_oChartStyles["Asc.c_oAscChartTypeSettings.hBarNormal3d"]; } - else if(sName === "3DStackedBar") { - if(!Array.isArray(AscCommon.g_oChartStyles["Asc.c_oAscChartTypeSettings.hBarStacked3d"])) { - AscCommon.g_oChartStyles["Asc.c_oAscChartTypeSettings.hBarStacked3d"] = []; + } + if (oVal.dataLabelHidden !== null) { + for (var i = 0, length = oVal.dataLabelHidden.length; i < length; ++i) { + var oCurVal = oVal.dataLabelHidden[i]; + if (null != oCurVal) { + this.bs.WriteItem(c_oserct_chartExDataLabelsDATALABELHIDDEN, function () { + oThis.WriteCT_DataLabelHidden(oCurVal); + }); } - aStyles = AscCommon.g_oChartStyles["Asc.c_oAscChartTypeSettings.hBarStacked3d"]; } - else if(sName === "Line") { - if(!Array.isArray(AscCommon.g_oChartStyles["Asc.c_oAscChartTypeSettings.lineNormal"])) { - AscCommon.g_oChartStyles["Asc.c_oAscChartTypeSettings.lineNormalMarker"] = - AscCommon.g_oChartStyles["Asc.c_oAscChartTypeSettings.lineStackedMarker"] = - AscCommon.g_oChartStyles["Asc.c_oAscChartTypeSettings.lineStackedPerMarker"] = - AscCommon.g_oChartStyles["Asc.c_oAscChartTypeSettings.lineNormal"] = - AscCommon.g_oChartStyles["Asc.c_oAscChartTypeSettings.lineStacked"] = - AscCommon.g_oChartStyles["Asc.c_oAscChartTypeSettings.lineStackedPer"] = []; - } - aStyles = AscCommon.g_oChartStyles["Asc.c_oAscChartTypeSettings.lineNormal"]; + } +}; +BinaryChartWriter.prototype.WriteCT_ChartExNumFmt = function (oVal) { + var oThis = this; + if (oVal.formatCode !== null) { + this.bs.WriteItem(c_oserct_chartExNumberFormatFORMATCODE, function () { + oThis.memory.WriteString3(oVal.formatCode); + }); + } + if (oVal.sourceLinked !== null) { + this.bs.WriteItem(c_oserct_chartExNumberFormatSOURCELINKED, function () { + oThis.memory.WriteBool(oVal.sourceLinked); + }); + } +}; +BinaryChartWriter.prototype.WriteCT_DataLabel = function (oVal) { + var oThis = this; + if(oVal.idx !== null) { + this.bs.WriteItem(c_oserct_chartExDataLabelIDX, function() { + oThis.memory.WriteLong(oVal.idx); + }); + } + if(oVal.pos !== null) { + this.bs.WriteItem(c_oserct_chartExDataLabelPOS, function() { + oThis.memory.WriteByte(oVal.pos); + }); + } + if(oVal.numFmt !== null) { + this.bs.WriteItem(c_oserct_chartExDataLabelNUMFMT, function() { + oThis.WriteCT_ChartExNumFmt(oVal.numFmt); + }); + } + if(oVal.txPr !== null) { + this.bs.WriteItem(c_oserct_chartExDataLabelTXPR, function() { + oThis.WriteTxPr(oVal.txPr); + }); + } + if(oVal.spPr !== null) { + this.bs.WriteItem(c_oserct_chartExDataLabelSPPR, function() { + oThis.WriteSpPr(oVal.spPr); + }); + } + if(oVal.visibility !== null) { + this.bs.WriteItem(c_oserct_chartExDataLabelVISABILITIES, function() { + oThis.WriteCT_DataLabelVisibilities(oVal.visibility); + }); + } + if(oVal.separator !== null) { + this.bs.WriteItem(c_oserct_chartExDataLabelSEPARATOR, function() { + oThis.memory.WriteString3(oVal.separator); + }); + } +}; +BinaryChartWriter.prototype.WriteCT_DataLabelHidden = function (oVal) { + var oThis = this; + if(oVal.idx !== null) { + this.bs.WriteItem(c_oserct_chartExDataLabelHiddenIDX, function() { + oThis.memory.WriteLong(oVal.idx); + }); + } +}; +BinaryChartWriter.prototype.WriteCT_SeriesLayoutProperties = function (oVal) { + var oThis = this; + if(oVal.parentLabelLayout !== null) { + this.bs.WriteItem(c_oserct_chartExSeriesLayoutPARENT, function() { + oThis.WriteCT_ParentLabelLayout(oVal.parentLabelLayout); + }); + } + if(oVal.regionLabelLayout !== null) { + this.bs.WriteItem(c_oserct_chartExSeriesLayoutREGION, function() { + oThis.WriteCT_RegionLabelLayout(oVal.regionLabelLayout); + }); + } + if(oVal.visibility !== null) { + this.bs.WriteItem(c_oserct_chartExSeriesLayoutVISABILITIES, function() { + oThis.WriteCT_SeriesElementVisibilities(oVal.visibility); + }); + } + if(oVal.aggregation !== null) { + this.bs.WriteItem(c_oserct_chartExSeriesLayoutAGGREGATION, function() { + oThis.memory.WriteBool(oVal.aggregation); + }); + } + if(oVal.binning !== null) { + this.bs.WriteItem(c_oserct_chartExSeriesLayoutBINNING, function() { + oThis.WriteCT_Binning(oVal.binning); + }); + } + if(oVal.statistics !== null) { + this.bs.WriteItem(c_oserct_chartExSeriesLayoutSTATISTIC, function() { + oThis.WriteCT_Statistics(oVal.statistics); + }); + } + if(oVal.subtotals !== null) { + this.bs.WriteItem(c_oserct_chartExSeriesLayoutSUBTOTALS, function() { + oThis.WriteCT_Subtotals(oVal.subtotals); + }); + } +}; +BinaryChartWriter.prototype.WriteCT_DataLabelVisibilities = function (oVal) { + var oThis = this; + if(oVal.seriesName !== null) { + this.bs.WriteItem(c_oserct_chartExDataLabelVisibilitiesSERIES, function() { + oThis.memory.WriteBool(oVal.seriesName); + }); + } + if(oVal.categoryName !== null) { + this.bs.WriteItem(c_oserct_chartExDataLabelVisibilitiesCATEGORY, function() { + oThis.memory.WriteBool(oVal.categoryName); + }); + } + if(oVal.value !== null) { + this.bs.WriteItem(c_oserct_chartExDataLabelVisibilitiesVALUE, function() { + oThis.memory.WriteBool(oVal.value); + }); + } +}; +BinaryChartWriter.prototype.WriteCT_Binning = function (oVal) { + var oThis = this; + if(oVal.binSize !== null) { + this.bs.WriteItem(c_oserct_chartExBinningBINSIZE, function() { + oThis.memory.WriteDouble2(oVal.binSize); + }); + } + if(oVal.binCount !== null) { + this.bs.WriteItem(c_oserct_chartExBinningBINCOUNT, function() { + oThis.memory.WriteLong(oVal.binCount); + }); + } + if(oVal.intervalClosed !== null) { + this.bs.WriteItem(c_oserct_chartExBinningINTERVAL, function() { + oThis.memory.WriteByte(oVal.intervalClosed); + }); + } + if(oVal.underflow !== null) { + if (typeof oVal.underflow === "undefined") { + this.bs.WriteItem(c_oserct_chartExBinningUNDERAUTO, function() { + oThis.memory.WriteByte(oVal.underflow); + }); + } else { + this.bs.WriteItem(c_oserct_chartExBinningUNDERVAL, function() { + oThis.memory.WriteDouble2(oVal.underflow); + }); } - else if(sName === "Line3D") { - if(!Array.isArray(AscCommon.g_oChartStyles["Asc.c_oAscChartTypeSettings.line3d"])) { - AscCommon.g_oChartStyles["Asc.c_oAscChartTypeSettings.line3d"] = []; - } - aStyles = AscCommon.g_oChartStyles["Asc.c_oAscChartTypeSettings.line3d"]; + } + if(oVal.overflow !== null) { + if (typeof oVal.underflow === "undefined") { + this.bs.WriteItem(c_oserct_chartExBinningOVERAUTO, function() { + oThis.memory.WriteByte(oVal.overflow); + }); + } else { + this.bs.WriteItem(c_oserct_chartExBinningOVERVAL, function() { + oThis.memory.WriteDouble2(oVal.overflow); + }); } - else if(sName === "Pie") { - if(!Array.isArray(AscCommon.g_oChartStyles["Asc.c_oAscChartTypeSettings.pie"])) { - AscCommon.g_oChartStyles["Asc.c_oAscChartTypeSettings.pie"] = []; + } +}; +BinaryChartWriter.prototype.WriteCT_ChartExTitle = function (oVal) { + var oThis = this; + if(oVal.tx !== null) { + this.bs.WriteItem(c_oserct_chartExTitleTX, function() { + oThis.WriteCT_Text(oVal.tx); + }); + } + if(oVal.txPr !== null) { + this.bs.WriteItem(c_oserct_chartExTitleTXPR, function() { + oThis.WriteTxPr(oVal.txPr); + }); + } + if(oVal.spPr !== null) { + this.bs.WriteItem(c_oserct_chartExTitleSPPR, function() { + oThis.WriteSpPr(oVal.spPr); + }); + } + if(oVal.pos !== null) { + this.bs.WriteItem(c_oserct_chartExTitlePOS, function() { + oThis.memory.WriteByte(oVal.pos); + }); + } + if(oVal.align !== null) { + this.bs.WriteItem(c_oserct_chartExTitleALIGN, function() { + oThis.memory.WriteByte(oVal.align); + }); + } + if(oVal.overlay !== null) { + this.bs.WriteItem(c_oserct_chartExTitleOVERLAY, function() { + oThis.memory.WriteBool(oVal.overlay); + }); + } +}; +BinaryChartWriter.prototype.WriteCT_ChartExLegend = function (oVal) { + var oThis = this; + if(oVal.txPr !== null) { + this.bs.WriteItem(c_oserct_chartExLegendTXPR, function() { + oThis.WriteTxPr(oVal.txPr); + }); + } + if(oVal.spPr !== null) { + this.bs.WriteItem(c_oserct_chartExLegendSPPR, function() { + oThis.WriteSpPr(oVal.spPr); + }); + } + if(oVal.pos !== null) { + this.bs.WriteItem(c_oserct_chartExLegendPOS, function() { + oThis.memory.WriteByte(oVal.pos); + }); + } + if(oVal.align !== null) { + this.bs.WriteItem(c_oserct_chartExLegendALIGN, function() { + oThis.memory.WriteByte(oVal.align); + }); + } + if(oVal.overlay !== null) { + this.bs.WriteItem(c_oserct_chartExLegendOVERLAY, function() { + oThis.memory.WriteBool(oVal.overlay); + }); + } +}; +BinaryChartWriter.prototype.WriteCT_Text = function (oVal) { + var oThis = this; + if(oVal.rich !== null) { + this.bs.WriteItem(c_oserct_chartExTextRICH, function() { + oThis.WriteCT_TextBody(oVal.rich); + }); + } + if(oVal.txData !== null) { + this.bs.WriteItem(c_oserct_chartExTextDATA, function() { + oThis.WriteCT_TextData(oVal.txData); + }); + } +}; +BinaryChartWriter.prototype.WriteCT_TextData = function (oVal) { + var oThis = this; + if(oVal.f !== null) { + this.bs.WriteItem(c_oserct_chartExTextDataFORMULA, function() { + oThis.WriteCT_Formula(oVal.f); + }); + } + if(oVal.v !== null) { + this.bs.WriteItem(c_oserct_chartExTextDataVALUE, function() { + oThis.memory.WriteString3(oVal.v); + }); + } +}; +BinaryChartWriter.prototype.WriteCT_Data = function (oVal) { + var oThis = this; + if(oVal.id !== null) { + this.bs.WriteItem(c_oserct_chartExDataID, function() { + oThis.memory.WriteLong(oVal.id); + }); + } + if(oVal.dimension !== null) { + for (var i = 0, length = oVal.dimension.length; i < length; ++i) { + var oDimension = oVal.dimension[i]; + if (oDimension instanceof AscFormat.CNumericDimension) { + this.bs.WriteItem(c_oserct_chartExDataNUMDIMENSION, function() { + oThis.WriteCT_NumericDimension(oDimension); + }); + } else { + this.bs.WriteItem(c_oserct_chartExDataSTRDIMENSION, function() { + oThis.WriteCT_StringDimension(oDimension); + }); } - aStyles = AscCommon.g_oChartStyles["Asc.c_oAscChartTypeSettings.pie"]; } - else if(sName === "Pie3D") { - if(!Array.isArray(AscCommon.g_oChartStyles["Asc.c_oAscChartTypeSettings.pie3d"])) { - AscCommon.g_oChartStyles["Asc.c_oAscChartTypeSettings.pie3d"] = []; + } +}; +BinaryChartWriter.prototype.WriteCT_Subtotals = function (oVal) { + var oThis = this; + if(oVal.idx !== null) { + for (var i = 0, length = oVal.idx.length; i < length; ++i) { + var oCurVal = oVal.idx[i]; + if (null != oCurVal) { + this.bs.WriteItem(c_oserct_chartExSubtotalsIDX, function () { + oThis.memory.WriteLong(oCurVal); + }); } - aStyles = AscCommon.g_oChartStyles["Asc.c_oAscChartTypeSettings.pie3d"]; } - else if(sName === "Doughnut") { - if(!Array.isArray(AscCommon.g_oChartStyles["Asc.c_oAscChartTypeSettings.doughnut"])) { - AscCommon.g_oChartStyles["Asc.c_oAscChartTypeSettings.doughnut"] = []; - } - aStyles = AscCommon.g_oChartStyles["Asc.c_oAscChartTypeSettings.doughnut"]; + } +}; +BinaryChartWriter.prototype.WriteCT_SeriesElementVisibilities = function (oVal) { + var oThis = this; + if(oVal.connectorLines !== null) { + this.bs.WriteItem(c_oserct_chartExSeriesVisibilitiesCONNECTOR, function() { + oThis.memory.WriteBool(oVal.connectorLines); + }); + } + if(oVal.meanLine !== null) { + this.bs.WriteItem(c_oserct_chartExSeriesVisibilitiesMEANLINE, function() { + oThis.memory.WriteBool(oVal.meanLine); + }); + } + if(oVal.meanMarker !== null) { + this.bs.WriteItem(c_oserct_chartExSeriesVisibilitiesMEANMARKER, function() { + oThis.memory.WriteBool(oVal.meanMarker); + }); + } + if(oVal.nonoutliers !== null) { + this.bs.WriteItem(c_oserct_chartExSeriesVisibilitiesNONOUTLIERS, function() { + oThis.memory.WriteBool(oVal.nonoutliers); + }); + } + if(oVal.outliers !== null) { + this.bs.WriteItem(c_oserct_chartExSeriesVisibilitiesOUTLIERS, function() { + oThis.memory.WriteBool(oVal.outliers); + }); + } +}; +BinaryChartWriter.prototype.WriteCT_CategoryAxisScaling = function (oVal) { + var oThis = this; + if(oVal.gapWidth !== null) { + if (typeof oVal.gapWidth === "undefined") { + this.bs.WriteItem(c_oserct_chartExCatScalingGAPAUTO, function() { + oThis.memory.WriteByte(oVal.gapWidth); + }); + } else { + this.bs.WriteItem(c_oserct_chartExCatScalingGAPVAL, function() { + oThis.memory.WriteDouble2(oVal.gapWidth); + }); } - else if(sName === "Area") { - if(!Array.isArray(AscCommon.g_oChartStyles["Asc.c_oAscChartTypeSettings.areaNormal"])) { - AscCommon.g_oChartStyles["Asc.c_oAscChartTypeSettings.areaNormal"] = - AscCommon.g_oChartStyles["Asc.c_oAscChartTypeSettings.areaStacked"] = - AscCommon.g_oChartStyles["Asc.c_oAscChartTypeSettings.areaStackedPer"] = []; - } - aStyles = AscCommon.g_oChartStyles["Asc.c_oAscChartTypeSettings.areaNormal"]; + } +}; +BinaryChartWriter.prototype.WriteCT_ValueAxisScaling = function (oVal) { + var oThis = this; + if(oVal.max !== null) { + if (typeof oVal.max === "undefined") { + this.bs.WriteItem(c_oserct_chartExValScalingMAXAUTO, function() { + oThis.memory.WriteByte(oVal.max); + }); + } else { + this.bs.WriteItem(c_oserct_chartExValScalingMAXVAL, function() { + oThis.memory.WriteDouble2(oVal.max); + }); } - else if(sName === "Stock") { - if(!Array.isArray(AscCommon.g_oChartStyles["Asc.c_oAscChartTypeSettings.stock"])) { - AscCommon.g_oChartStyles["Asc.c_oAscChartTypeSettings.stock"] = []; - } - aStyles = AscCommon.g_oChartStyles["Asc.c_oAscChartTypeSettings.stock"]; + } + if(oVal.min !== null) { + if (typeof oVal.min === "undefined") { + this.bs.WriteItem(c_oserct_chartExValScalingMINAUTO, function() { + oThis.memory.WriteByte(oVal.min); + }); + } else { + this.bs.WriteItem(c_oserct_chartExValScalingMINVAL, function() { + oThis.memory.WriteDouble2(oVal.min); + }); } - if(sName === "ScatterLine") { - if(!Array.isArray(AscCommon.g_oChartStyles["Asc.c_oAscChartTypeSettings.scatter"])) { - AscCommon.g_oChartStyles["Asc.c_oAscChartTypeSettings.scatter"] = - AscCommon.g_oChartStyles["Asc.c_oAscChartTypeSettings.scatterLine"] = - AscCommon.g_oChartStyles["Asc.c_oAscChartTypeSettings.scatterLineMarker"] = - AscCommon.g_oChartStyles["Asc.c_oAscChartTypeSettings.scatterMarker"] = - AscCommon.g_oChartStyles["Asc.c_oAscChartTypeSettings.scatterNone"] = - AscCommon.g_oChartStyles["Asc.c_oAscChartTypeSettings.scatterSmooth"] = - AscCommon.g_oChartStyles["Asc.c_oAscChartTypeSettings.scatterSmoothMarker"] = []; - } - aStyles = AscCommon.g_oChartStyles["Asc.c_oAscChartTypeSettings.scatter"]; + } + if(oVal.majorUnit !== null) { + if (typeof oVal.majorUnit === "undefined") { + this.bs.WriteItem(c_oserct_chartExValScalingMAJUNITAUTO, function() { + oThis.memory.WriteByte(oVal.majorUnit); + }); + } else { + this.bs.WriteItem(c_oserct_chartExValScalingMAJUNITVAL, function() { + oThis.memory.WriteDouble2(oVal.majorUnit); + }); } - else if(sName === "Combo") { - if(!Array.isArray(AscCommon.g_oChartStyles["Asc.c_oAscChartTypeSettings.comboCustom"])) { - AscCommon.g_oChartStyles["Asc.c_oAscChartTypeSettings.comboCustom"] = - AscCommon.g_oChartStyles["Asc.c_oAscChartTypeSettings.comboBarLine"] = - AscCommon.g_oChartStyles["Asc.c_oAscChartTypeSettings.comboBarLineSecondary"] = - AscCommon.g_oChartStyles["Asc.c_oAscChartTypeSettings.comboAreaBar"] = []; - } - aStyles = AscCommon.g_oChartStyles["Asc.c_oAscChartTypeSettings.comboCustom"]; + } + if(oVal.minorUnit !== null) { + if (typeof oVal.minorUnit === "undefined") { + this.bs.WriteItem(c_oserct_chartExValScalingMINUNITAUTO, function() { + oThis.memory.WriteByte(oVal.minorUnit); + }); + } else { + this.bs.WriteItem(c_oserct_chartExValScalingMINUNITVAL, function() { + oThis.memory.WriteDouble2(oVal.minorUnit); + }); } - if(Array.isArray(aStyles)) { - if(this.curChart.oDataLablesData) { - AscCommon.g_oDataLabelsBinaries[this.curChart.oDataLablesData.crc32] = this.curChart.oDataLablesData.data; - } - if(this.curChart.oCatAxData) { - AscCommon.g_oCatBinaries[this.curChart.oCatAxData.crc32] = this.curChart.oCatAxData.data; - } - if(this.curChart.oValAxData) { - AscCommon.g_oValBinaries[this.curChart.oValAxData.crc32] = this.curChart.oValAxData.data; - } - if(this.curChart.oView3DData) { - AscCommon.g_oView3dBinaries[this.curChart.oView3DData.crc32] = this.curChart.oView3DData.data; - } - if(this.curChart.oLegendData) { - AscCommon.g_oLegendBinaries[this.curChart.oLegendData.crc32] = this.curChart.oLegendData.data; - } - if(this.curChart.oChartStyleData) { - AscCommon.g_oStylesBinaries[this.curChart.oChartStyleData.crc32] = this.curChart.oChartStyleData.data; - AscCommon.g_oChartStylesIdMap[this.curChart.chartStyle.id] = this.curChart.oChartStyleData.crc32; - } - if(this.curChart.oChartColorsData) { - AscCommon.g_oColorsBinaries[this.curChart.oChartColorsData.crc32] = this.curChart.oChartColorsData.data; - } - var oBarChart; - var aCharts = val.chart.plotArea.charts; - if(aCharts.length === 1 && aCharts[0].getObjectType() === AscDFH.historyitem_type_BarChart) { - oBarChart = aCharts[0]; - } - var crc32BarParams = null; - if(oBarChart) { - var aBarParams = []; - aBarParams.push(oBarChart.gapWidth); - aBarParams.push(oBarChart.overlap); - aBarParams.push(oBarChart.gapDepth); - var sJSON = JSON.stringify(aBarParams); - crc32BarParams = AscCommon.g_oCRC32.Calculate_ByString(sJSON, sJSON.length); - AscCommon.g_oBarParams[crc32BarParams] = aBarParams; - } - aStyles.push([ - val.oChartStyleData && val.oChartStyleData.crc32 || null, - val.oChartColorsData && val.oChartColorsData.crc32 || null, - val.oDataLablesData && val.oDataLablesData.crc32 || null, - val.oCatAxData && val.oCatAxData.crc32 || null, - val.oValAxData && val.oValAxData.crc32 || null, - val.oView3DData && val.oView3DData.crc32 || null, - val.oLegendData && val.oLegendData.crc32 || null, - crc32BarParams - ]); + } +}; +BinaryChartWriter.prototype.WriteCT_AxisUnits = function (oVal) { + var oThis = this; + if(oVal.unitsLabel !== null) { + this.bs.WriteItem(c_oserct_chartExAxisUnitLABEL, function() { + oThis.WriteCT_AxisUnitsLabel(oVal.unitsLabel); + }); + } + if(oVal.unit !== null) { + this.bs.WriteItem(c_oserct_chartExAxisUnitTYPE, function() { + oThis.memory.WriteByte(oVal.unit); + }); + } +}; +BinaryChartWriter.prototype.WriteCT_AxisUnitsLabel = function (oVal) { + var oThis = this; + if(oVal.tx !== null) { + this.bs.WriteItem(c_oserct_chartExAxisUnitsLabelTEXT, function() { + oThis.WriteCT_Text(oVal.tx); + }); + } + if(oVal.spPr !== null) { + this.bs.WriteItem(c_oserct_chartExAxisUnitsLabelSPPR, function() { + oThis.WriteSpPr(oVal.spPr); + }); + } + if(oVal.txPr !== null) { + this.bs.WriteItem(c_oserct_chartExAxisUnitsLabelTXPR, function() { + oThis.WriteTxPr(oVal.txPr); + }); + } +}; +BinaryChartWriter.prototype.WriteCT_TickMarks = function (oVal) { + var oThis = this; + if(oVal.type !== null) { + this.bs.WriteItem(c_oserct_chartExTickMarksTYPE, function() { + oThis.memory.WriteByte(oVal.type); + }); + } +}; +BinaryChartWriter.prototype.WriteCT_Gridlines = function (oVal) { + var oThis = this; + if(oVal.spPr !== null) { + this.bs.WriteItem(c_oserct_chartExGridlinesSPPR, function() { + oThis.WriteSpPr(oVal.spPr); + }); + } +}; +BinaryChartWriter.prototype.WriteCT_Statistics = function (oVal) { + var oThis = this; + if(oVal.quartileMethod !== null) { + this.bs.WriteItem(c_oserct_chartExStatisticsMETHOD, function() { + oThis.memory.WriteByte(oVal.quartileMethod); + }); + } +}; +BinaryChartWriter.prototype.WriteCT_StringDimension = function (oVal) { + var oThis = this; + if(oVal.type !== null) { + this.bs.WriteItem(c_oserct_chartExDataDimensionTYPE, function() { + oThis.memory.WriteBool(oVal.type.dimensionType); + }); + } + if(oVal.f !== null) { + this.bs.WriteItem(c_oserct_chartExDataDimensionFORMULA, function() { + oThis.WriteCT_Formula(oVal.f); + }); + } + if(oVal.nf !== null) { + this.bs.WriteItem(c_oserct_chartExDataDimensionNF, function() { + oThis.memory.WriteString3(oVal.nf); + }); + } + if(oVal.levelData !== null) { + for (var i = 0, length = oVal.levelData.length; i < length; ++i) { + var oCurVal = oVal.levelData[i]; + if (null != oCurVal) { + this.bs.WriteItem(c_oserct_chartExDataDimensionSTRINGLEVEL, function () { + oThis.WriteCT_StringLevel(oCurVal); + }); + } } - }*/ + } +}; +BinaryChartWriter.prototype.WriteCT_NumericDimension = function (oVal) { + var oThis = this; + if(oVal.type !== null) { + this.bs.WriteItem(c_oserct_chartExDataDimensionTYPE, function() { + oThis.memory.WriteBool(oVal.type.dimensionType); + }); + } + if(oVal.f !== null) { + this.bs.WriteItem(c_oserct_chartExDataDimensionFORMULA, function() { + oThis.WriteCT_Formula(oVal.f); + }); + } + if(oVal.nf !== null) { + this.bs.WriteItem(c_oserct_chartExDataDimensionNF, function() { + oThis.memory.WriteString3(oVal.nf); + }); + } + if(oVal.levelData !== null) { + for (var i = 0, length = oVal.levelData.length; i < length; ++i) { + var oCurVal = oVal.levelData[i]; + if (null != oCurVal) { + this.bs.WriteItem(c_oserct_chartExDataDimensionNUMERICLEVEL, function () { + oThis.WriteCT_NumericLevel(oCurVal); + }); + } + } + } +}; +BinaryChartWriter.prototype.WriteCT_Formula = function (oVal) { + var oThis = this; + if(oVal.content !== null) { + this.bs.WriteItem(c_oserct_chartExFormulaCONTENT, function() { + oThis.memory.WriteString3(oVal.content); + }); + } + if(oVal.dir !== null) { + this.bs.WriteItem(c_oserct_chartExFormulaDIRECTION, function() { + oThis.memory.WriteByte(oVal.dir); + }); + } +}; +BinaryChartWriter.prototype.WriteCT_StringLevel = function (oVal) { + var oThis = this; + if(oVal.name !== null) { + this.bs.WriteItem(c_oserct_chartExDataLevelNAME, function() { + oThis.memory.WriteString3(oVal.name); + }); + } + if(oVal.ptCount !== null) { + this.bs.WriteItem(c_oserct_chartExDataLevelCOUNT, function() { + oThis.memory.WriteLong(oVal.ptCount); + }); + } + if(oVal.pt !== null) { + for (var i = 0, length = oVal.pt.length; i < length; ++i) { + var oCurVal = oVal.pt[i]; + if (null != oCurVal) { + this.bs.WriteItem(c_oserct_chartExDataLevelPT, function () { + oThis.WriteCT_StringValue(oCurVal); + }); + } + } + } +}; +BinaryChartWriter.prototype.WriteCT_NumericLevel = function (oVal) { + var oThis = this; + if(oVal.name !== null) { + this.bs.WriteItem(c_oserct_chartExDataLevelNAME, function() { + oThis.memory.WriteString3(oVal.name); + }); + } + if(oVal.ptCount !== null) { + this.bs.WriteItem(c_oserct_chartExDataLevelCOUNT, function() { + oThis.memory.WriteLong(oVal.ptCount); + }); + } + if(oVal.pt !== null) { + for (var i = 0, length = oVal.pt.length; i < length; ++i) { + var oCurVal = oVal.pt[i]; + if (null != oCurVal) { + this.bs.WriteItem(c_oserct_chartExDataLevelPT, function () { + oThis.WriteCT_NumericValue(oCurVal); + }); + } + } + } + if(oVal.formatCode !== null) { + this.bs.WriteItem(c_oserct_chartExDataLevelFORMATCODE, function() { + oThis.memory.WriteString3(oVal.formatCode); + }); + } +}; +BinaryChartWriter.prototype.WriteCT_StringValue = function (oVal) { + var oThis = this; + if(oVal.idx !== null) { + this.bs.WriteItem(c_oserct_chartExDataValueIDX, function() { + oThis.memory.WriteLong(oVal.idx); + }); + } + if(oVal.content !== null) { + this.bs.WriteItem(c_oserct_chartExDataValueCONTENT, function() { + oThis.memory.WriteString3(oVal.content); + }); + } +}; +BinaryChartWriter.prototype.WriteCT_NumericValue = function (oVal) { + var oThis = this; + if(oVal.idx !== null) { + this.bs.WriteItem(c_oserct_chartExDataValueIDX, function() { + oThis.memory.WriteLong(oVal.idx); + }); + } + if(oVal.content !== null) { + this.bs.WriteItem(c_oserct_chartExDataValueCONTENT, function() { + oThis.memory.WriteDouble2(oVal.content); + }); + } +}; +BinaryChartWriter.prototype.WriteAlternateContent = function (oVal) { + var oThis = this; + if (null != oVal.m_Choice) { + for (var i = 0, length = oVal.m_Choice.length; i < length; ++i) { + var oCurVal = oVal.m_Choice[i]; + if (null != oCurVal) { + this.bs.WriteItem(c_oseralternatecontentCHOICE, function () { + oThis.WriteAlternateContentChoice(oCurVal); + }); + } + } + } + var oCurVal = oVal.m_Fallback; + if (null != oCurVal) { + this.bs.WriteItem(c_oseralternatecontentFALLBACK, function () { + oThis.WriteAlternateContentFallback(oCurVal); + }); + } +}; +BinaryChartWriter.prototype.WriteAlternateContentChoice = function (oVal) { + var oThis = this; + var oCurVal = oVal.m_style; + if (null != oCurVal) { + this.bs.WriteItem(c_oseralternatecontentchoiceSTYLE, function () { + oThis.WriteCT_Style(oCurVal); + }); + } + var oCurVal = oVal.m_Requires; + if (null != oCurVal) { + this.bs.WriteItem(c_oseralternatecontentchoiceREQUIRES, function () { + oThis.memory.WriteString3(oCurVal); + }); + } +}; +BinaryChartWriter.prototype.WriteAlternateContentFallback = function (oVal) { + var oThis = this; + var oCurVal = oVal.m_style; + if (null != oCurVal) { + this.bs.WriteItem(c_oseralternatecontentfallbackSTYLE, function () { + oThis.WriteCT_Style1(oCurVal); + }); + } +}; +function BinaryChartReader(stream) { + this.stream = stream; + this.bcr = new AscCommon.Binary_CommonReader(this.stream); + this.drawingDocument = null; +} +BinaryChartReader.prototype.ReadCT_extLst = function (type, length, val) { + var res = c_oSerConstants.ReadOk; + var oThis = this; + if (c_oserct_extlstEXT === type) { + var oNewVal; + oNewVal = {}; + res = this.bcr.Read1(length, function (t, l) { + return oThis.ReadCT_Extension(t, l, oNewVal); + }); + if (null == val.m_ext) + val.m_ext = []; + val.m_ext.push(oNewVal); + } + else + res = c_oSerConstants.ReadUnknown; return res; }; -BinaryChartReader.prototype.ExternalReadCT_ChartExSpace = function (length, val, curWorksheet) { +BinaryChartReader.prototype.ExternalReadCT_ChartSpace = function (length, val, curWorksheet) { var res = c_oSerConstants.ReadOk; this.curWorksheet = curWorksheet; this.drawingDocument = null; @@ -6135,770 +6788,2497 @@ BinaryChartReader.prototype.ExternalReadCT_ChartExSpace = function (length, val, } } } - + + var oThis = this; + this.curChart = val; + res = this.bcr.Read1(length, function (t, l) { + return oThis.ReadCT_ChartSpace(t, l, val); + }); + if(val){ + val.correctAxes(); + } + /*if(this.curWorksheet) { + var aStyles = null; + var sName = this.curWorksheet.sName; + if(sName === "Bar") { + + if(!Array.isArray(AscCommon.g_oChartStyles["Asc.c_oAscChartTypeSettings.barNormal"])) { + AscCommon.g_oChartStyles["Asc.c_oAscChartTypeSettings.barNormal"] = []; + } + aStyles = AscCommon.g_oChartStyles["Asc.c_oAscChartTypeSettings.barNormal"]; + } + else if(sName === "BarStacked") { + if(!Array.isArray(AscCommon.g_oChartStyles["Asc.c_oAscChartTypeSettings.barStacked"])) { + AscCommon.g_oChartStyles["Asc.c_oAscChartTypeSettings.barStacked"] = []; + } + aStyles = AscCommon.g_oChartStyles["Asc.c_oAscChartTypeSettings.barStacked"]; + } + else if(sName === "BarStackedPer") { + if(!Array.isArray(AscCommon.g_oChartStyles["Asc.c_oAscChartTypeSettings.barStackedPer"])) { + AscCommon.g_oChartStyles["Asc.c_oAscChartTypeSettings.barStackedPer"] = []; + } + aStyles = AscCommon.g_oChartStyles["Asc.c_oAscChartTypeSettings.barStackedPer"]; + } + else if(sName === "3DClusteredColumn") { + if(!Array.isArray(AscCommon.g_oChartStyles["Asc.c_oAscChartTypeSettings.barNormal3d"])) { + AscCommon.g_oChartStyles["Asc.c_oAscChartTypeSettings.barNormal3d"] = []; + } + aStyles = AscCommon.g_oChartStyles["Asc.c_oAscChartTypeSettings.barNormal3d"]; + } + else if(sName === "3DStackedColumn") { + if(!Array.isArray(AscCommon.g_oChartStyles["Asc.c_oAscChartTypeSettings.barStacked3d"])) { + AscCommon.g_oChartStyles["Asc.c_oAscChartTypeSettings.barStacked3d"] = []; + } + aStyles = AscCommon.g_oChartStyles["Asc.c_oAscChartTypeSettings.barStacked3d"]; + } + else if(sName === "3DStackedColumnPer") { + if(!Array.isArray(AscCommon.g_oChartStyles["Asc.c_oAscChartTypeSettings.barStackedPer3d"])) { + AscCommon.g_oChartStyles["Asc.c_oAscChartTypeSettings.barStackedPer3d"] = []; + } + aStyles = AscCommon.g_oChartStyles["Asc.c_oAscChartTypeSettings.barStackedPer3d"]; + } + else if(sName === "3DColumn") { + if(!Array.isArray(AscCommon.g_oChartStyles["Asc.c_oAscChartTypeSettings.barNormal3dPerspective"])) { + AscCommon.g_oChartStyles["Asc.c_oAscChartTypeSettings.barNormal3dPerspective"] = []; + } + aStyles = AscCommon.g_oChartStyles["Asc.c_oAscChartTypeSettings.barNormal3dPerspective"]; + } + else if(sName === "2DBar") { + if(!Array.isArray(AscCommon.g_oChartStyles["Asc.c_oAscChartTypeSettings.hBarNormal"])) { + AscCommon.g_oChartStyles["Asc.c_oAscChartTypeSettings.hBarNormal"] = []; + } + aStyles = AscCommon.g_oChartStyles["Asc.c_oAscChartTypeSettings.hBarNormal"]; + } + else if(sName === "StackedBar") { + if(!Array.isArray(AscCommon.g_oChartStyles["Asc.c_oAscChartTypeSettings.hBarStacked"])) { + AscCommon.g_oChartStyles["Asc.c_oAscChartTypeSettings.hBarStacked"] = []; + } + aStyles = AscCommon.g_oChartStyles["Asc.c_oAscChartTypeSettings.hBarStacked"]; + } + else if(sName === "StackedBarPer") { + if(!Array.isArray(AscCommon.g_oChartStyles["Asc.c_oAscChartTypeSettings.hBarStackedPer"])) { + AscCommon.g_oChartStyles["Asc.c_oAscChartTypeSettings.hBarStackedPer"] = []; + } + aStyles = AscCommon.g_oChartStyles["Asc.c_oAscChartTypeSettings.hBarStackedPer"]; + } + else if(sName === "3DClusteredBar") { + if(!Array.isArray(AscCommon.g_oChartStyles["Asc.c_oAscChartTypeSettings.hBarNormal3d"])) { + AscCommon.g_oChartStyles["Asc.c_oAscChartTypeSettings.hBarNormal3d"] = []; + } + aStyles = AscCommon.g_oChartStyles["Asc.c_oAscChartTypeSettings.hBarNormal3d"]; + } + else if(sName === "3DStackedBar") { + if(!Array.isArray(AscCommon.g_oChartStyles["Asc.c_oAscChartTypeSettings.hBarStacked3d"])) { + AscCommon.g_oChartStyles["Asc.c_oAscChartTypeSettings.hBarStacked3d"] = []; + } + aStyles = AscCommon.g_oChartStyles["Asc.c_oAscChartTypeSettings.hBarStacked3d"]; + } + else if(sName === "Line") { + if(!Array.isArray(AscCommon.g_oChartStyles["Asc.c_oAscChartTypeSettings.lineNormal"])) { + AscCommon.g_oChartStyles["Asc.c_oAscChartTypeSettings.lineNormalMarker"] = + AscCommon.g_oChartStyles["Asc.c_oAscChartTypeSettings.lineStackedMarker"] = + AscCommon.g_oChartStyles["Asc.c_oAscChartTypeSettings.lineStackedPerMarker"] = + AscCommon.g_oChartStyles["Asc.c_oAscChartTypeSettings.lineNormal"] = + AscCommon.g_oChartStyles["Asc.c_oAscChartTypeSettings.lineStacked"] = + AscCommon.g_oChartStyles["Asc.c_oAscChartTypeSettings.lineStackedPer"] = []; + } + aStyles = AscCommon.g_oChartStyles["Asc.c_oAscChartTypeSettings.lineNormal"]; + } + else if(sName === "Line3D") { + if(!Array.isArray(AscCommon.g_oChartStyles["Asc.c_oAscChartTypeSettings.line3d"])) { + AscCommon.g_oChartStyles["Asc.c_oAscChartTypeSettings.line3d"] = []; + } + aStyles = AscCommon.g_oChartStyles["Asc.c_oAscChartTypeSettings.line3d"]; + } + else if(sName === "Pie") { + if(!Array.isArray(AscCommon.g_oChartStyles["Asc.c_oAscChartTypeSettings.pie"])) { + AscCommon.g_oChartStyles["Asc.c_oAscChartTypeSettings.pie"] = []; + } + aStyles = AscCommon.g_oChartStyles["Asc.c_oAscChartTypeSettings.pie"]; + } + else if(sName === "Pie3D") { + if(!Array.isArray(AscCommon.g_oChartStyles["Asc.c_oAscChartTypeSettings.pie3d"])) { + AscCommon.g_oChartStyles["Asc.c_oAscChartTypeSettings.pie3d"] = []; + } + aStyles = AscCommon.g_oChartStyles["Asc.c_oAscChartTypeSettings.pie3d"]; + } + else if(sName === "Doughnut") { + if(!Array.isArray(AscCommon.g_oChartStyles["Asc.c_oAscChartTypeSettings.doughnut"])) { + AscCommon.g_oChartStyles["Asc.c_oAscChartTypeSettings.doughnut"] = []; + } + aStyles = AscCommon.g_oChartStyles["Asc.c_oAscChartTypeSettings.doughnut"]; + } + else if(sName === "Area") { + if(!Array.isArray(AscCommon.g_oChartStyles["Asc.c_oAscChartTypeSettings.areaNormal"])) { + AscCommon.g_oChartStyles["Asc.c_oAscChartTypeSettings.areaNormal"] = + AscCommon.g_oChartStyles["Asc.c_oAscChartTypeSettings.areaStacked"] = + AscCommon.g_oChartStyles["Asc.c_oAscChartTypeSettings.areaStackedPer"] = []; + } + aStyles = AscCommon.g_oChartStyles["Asc.c_oAscChartTypeSettings.areaNormal"]; + } + else if(sName === "Stock") { + if(!Array.isArray(AscCommon.g_oChartStyles["Asc.c_oAscChartTypeSettings.stock"])) { + AscCommon.g_oChartStyles["Asc.c_oAscChartTypeSettings.stock"] = []; + } + aStyles = AscCommon.g_oChartStyles["Asc.c_oAscChartTypeSettings.stock"]; + } + if(sName === "ScatterLine") { + if(!Array.isArray(AscCommon.g_oChartStyles["Asc.c_oAscChartTypeSettings.scatter"])) { + AscCommon.g_oChartStyles["Asc.c_oAscChartTypeSettings.scatter"] = + AscCommon.g_oChartStyles["Asc.c_oAscChartTypeSettings.scatterLine"] = + AscCommon.g_oChartStyles["Asc.c_oAscChartTypeSettings.scatterLineMarker"] = + AscCommon.g_oChartStyles["Asc.c_oAscChartTypeSettings.scatterMarker"] = + AscCommon.g_oChartStyles["Asc.c_oAscChartTypeSettings.scatterNone"] = + AscCommon.g_oChartStyles["Asc.c_oAscChartTypeSettings.scatterSmooth"] = + AscCommon.g_oChartStyles["Asc.c_oAscChartTypeSettings.scatterSmoothMarker"] = []; + } + aStyles = AscCommon.g_oChartStyles["Asc.c_oAscChartTypeSettings.scatter"]; + } + else if(sName === "Combo") { + if(!Array.isArray(AscCommon.g_oChartStyles["Asc.c_oAscChartTypeSettings.comboCustom"])) { + AscCommon.g_oChartStyles["Asc.c_oAscChartTypeSettings.comboCustom"] = + AscCommon.g_oChartStyles["Asc.c_oAscChartTypeSettings.comboBarLine"] = + AscCommon.g_oChartStyles["Asc.c_oAscChartTypeSettings.comboBarLineSecondary"] = + AscCommon.g_oChartStyles["Asc.c_oAscChartTypeSettings.comboAreaBar"] = []; + } + aStyles = AscCommon.g_oChartStyles["Asc.c_oAscChartTypeSettings.comboCustom"]; + } + if(Array.isArray(aStyles)) { + if(this.curChart.oDataLablesData) { + AscCommon.g_oDataLabelsBinaries[this.curChart.oDataLablesData.crc32] = this.curChart.oDataLablesData.data; + } + if(this.curChart.oCatAxData) { + AscCommon.g_oCatBinaries[this.curChart.oCatAxData.crc32] = this.curChart.oCatAxData.data; + } + if(this.curChart.oValAxData) { + AscCommon.g_oValBinaries[this.curChart.oValAxData.crc32] = this.curChart.oValAxData.data; + } + if(this.curChart.oView3DData) { + AscCommon.g_oView3dBinaries[this.curChart.oView3DData.crc32] = this.curChart.oView3DData.data; + } + if(this.curChart.oLegendData) { + AscCommon.g_oLegendBinaries[this.curChart.oLegendData.crc32] = this.curChart.oLegendData.data; + } + if(this.curChart.oChartStyleData) { + AscCommon.g_oStylesBinaries[this.curChart.oChartStyleData.crc32] = this.curChart.oChartStyleData.data; + AscCommon.g_oChartStylesIdMap[this.curChart.chartStyle.id] = this.curChart.oChartStyleData.crc32; + } + if(this.curChart.oChartColorsData) { + AscCommon.g_oColorsBinaries[this.curChart.oChartColorsData.crc32] = this.curChart.oChartColorsData.data; + } + var oBarChart; + var aCharts = val.chart.plotArea.charts; + if(aCharts.length === 1 && aCharts[0].getObjectType() === AscDFH.historyitem_type_BarChart) { + oBarChart = aCharts[0]; + } + var crc32BarParams = null; + if(oBarChart) { + var aBarParams = []; + aBarParams.push(oBarChart.gapWidth); + aBarParams.push(oBarChart.overlap); + aBarParams.push(oBarChart.gapDepth); + var sJSON = JSON.stringify(aBarParams); + crc32BarParams = AscCommon.g_oCRC32.Calculate_ByString(sJSON, sJSON.length); + AscCommon.g_oBarParams[crc32BarParams] = aBarParams; + } + aStyles.push([ + val.oChartStyleData && val.oChartStyleData.crc32 || null, + val.oChartColorsData && val.oChartColorsData.crc32 || null, + val.oDataLablesData && val.oDataLablesData.crc32 || null, + val.oCatAxData && val.oCatAxData.crc32 || null, + val.oValAxData && val.oValAxData.crc32 || null, + val.oView3DData && val.oView3DData.crc32 || null, + val.oLegendData && val.oLegendData.crc32 || null, + crc32BarParams + ]); + } + }*/ + return res; +}; +BinaryChartReader.prototype.ExternalReadCT_ChartExSpace = function (length, val, curWorksheet) { + var res = c_oSerConstants.ReadOk; + this.curWorksheet = curWorksheet; + this.drawingDocument = null; + if(this.curWorksheet) { + if(this.curWorksheet.getDrawingDocument) { + this.drawingDocument = this.curWorksheet.getDrawingDocument(); + } + else { + if(this.curWorksheet.DrawingDocument) { + this.drawingDocument = this.curWorksheet.DrawingDocument; + } + } + } + + var oThis = this; + this.curChart = val; + res = this.bcr.Read1(length, function (t, l) { + return oThis.ReadCT_ChartExSpace(t, l, val); + }); + if(val){ + val.correctAxes(); + } + return res; +}; +BinaryChartReader.prototype.ReadCT_ChartSpace = function (type, length, val, curWorksheet) { + var res = c_oSerConstants.ReadOk; + var oThis = this; + var oNewVal; + if (c_oserct_chartspaceDATE1904 === type) { + oNewVal = { m_val: null }; + res = this.bcr.Read1(length, function (t, l) { + return oThis.ReadCT_Boolean(t, l, oNewVal); + }); + if (null != oNewVal.m_val) + val.setDate1904(oNewVal.m_val); + else + val.setDate1904(true); + } + else if (c_oserct_chartspaceLANG === type) { + oNewVal = { m_val: null }; + res = this.bcr.Read1(length, function (t, l) { + return oThis.ReadCT_TextLanguageID(t, l, oNewVal); + }); + if (null != oNewVal.m_val) + val.setLang(oNewVal.m_val); + } + else if (c_oserct_chartspaceROUNDEDCORNERS === type) { + oNewVal = { m_val: null }; + res = this.bcr.Read1(length, function (t, l) { + return oThis.ReadCT_Boolean(t, l, oNewVal); + }); + if (null != oNewVal.m_val) + val.setRoundedCorners(oNewVal.m_val); + } + else if (c_oserct_chartspaceALTERNATECONTENT === type) { + oNewVal = {}; + res = this.bcr.Read1(length, function (t, l) { + return oThis.ReadAlternateContent(t, l, oNewVal); + }); + var nNewStyle = null; + if (null != oNewVal.m_Choice && oNewVal.m_Choice.length > 0) { + var choice = oNewVal.m_Choice[0]; + if (null != choice.m_style && null != choice.m_style.m_val) + nNewStyle = choice.m_style.m_val - 100; + } + if (null == nNewStyle && null != oNewVal.m_Fallback && null != oNewVal.m_Fallback.m_style && null != oNewVal.m_Fallback.m_style.m_val) + nNewStyle = oNewVal.m_Fallback.m_style.m_val; + if (null != nNewStyle) + val.setStyle(nNewStyle); + } + else if (c_oserct_chartspaceSTYLE === type) { + oNewVal = { m_val: null }; + res = this.bcr.Read1(length, function (t, l) { + return oThis.ReadCT_Style1(t, l, oNewVal); + }); + if (null != oNewVal.m_val) + val.setStyle(oNewVal.m_val); + } + else if (c_oserct_chartspaceCLRMAPOVR === type) { + val.setClrMapOvr(this.ReadClrOverride(length)); + } + else if (c_oserct_chartspacePIVOTSOURCE === type) { + oNewVal = new AscFormat.CPivotSource(); + res = this.bcr.Read1(length, function (t, l) { + return oThis.ReadCT_PivotSource(t, l, oNewVal); + }); + val.setPivotSource(oNewVal); + } + else if (c_oserct_chartspacePROTECTION === type) { + oNewVal = new AscFormat.CProtection(); + res = this.bcr.Read1(length, function (t, l) { + return oThis.ReadCT_Protection(t, l, oNewVal); + }); + val.setProtection(oNewVal); + } + else if (c_oserct_chartspaceCHART === type) { + oNewVal = new AscFormat.CChart(); + res = this.bcr.Read1(length, function (t, l) { + return oThis.ReadCT_Chart(t, l, oNewVal); + }); + val.setChart(oNewVal); + // if(null === oNewVal.autoTitleDeleted){ + // oNewVal.setAutoTitleDeleted(false); + // } + } + else if (c_oserct_chartspaceSPPR === type) { + val.setSpPr(this.ReadSpPr(length)); + val.spPr.setParent(val); + } + else if (c_oserct_chartspaceTXPR === type) { + val.setTxPr(this.ReadTxPr(length)); + val.txPr.setParent(val); + } + //else if (c_oserct_chartspaceEXTERNALDATA === type) { + // oNewVal; + // oNewVal = {}; + // res = this.bcr.Read1(length, function (t, l) { + // return oThis.ReadCT_ExternalData(t, l, oNewVal); + // }); + // val.m_externalData = oNewVal; + //} + else if (c_oserct_chartspacePRINTSETTINGS === type) { + oNewVal = new AscFormat.CPrintSettings(); + res = this.bcr.Read1(length, function (t, l) { + return oThis.ReadCT_PrintSettings(t, l, oNewVal); + }); + val.setPrintSettings(oNewVal); + } + else if (c_oserct_chartspaceUSERSHAPES === type) { + res = this.bcr.Read1(length, function (t, l) { + return oThis.ReadCT_UserShapes(t, l, val); + }); + } + else if (c_oserct_chartspaceEXTLST === type) { + oNewVal = {}; + res = this.bcr.Read1(length, function (t, l) { + return oThis.ReadCT_extLst(t, l, oNewVal); + }); + // val.m_extLst = oNewVal; + } + else if (c_oserct_chartspaceTHEMEOVERRIDE === type) { + var theme = AscCommon.pptx_content_loader.ReadTheme(this, this.stream); + if (null != theme) + val.setThemeOverride(theme); + } + else if(c_oserct_chartspaceXLSX === type) { + //todo + res = c_oSerConstants.ReadUnknown; + } + else if(c_oserct_chartspaceSTYLES === type) { + this.curChart.oChartStyleData = AscCommon.fSaveStream(this.bcr.stream, length); + oNewVal = new AscFormat.CChartStyle(); + res = this.bcr.Read1(length, function (t, l) { + return oThis.ReadCT_ChartStyle(t, l, oNewVal); + }); + if(oNewVal) { + val.setChartStyle(oNewVal); + } + } + else if(c_oserct_chartspaceCOLORS === type) { + this.curChart.oChartColorsData = AscCommon.fSaveStream(this.bcr.stream, length); + oNewVal = new AscFormat.CChartColors(); + res = this.bcr.Read1(length, function (t, l) { + return oThis.ReadCT_ChartColors(t, l, oNewVal); + }); + if(oNewVal) { + val.setChartColors(oNewVal); + } + } + else if(c_oserct_chartspaceCHARTDATA === type) { + oNewVal = {}; + res = this.bcr.Read1(length, function (t, l) { + return oThis.ReadCT_ChartData(t, l, oNewVal); // todoo this class + }); + } + else { + res = c_oSerConstants.ReadUnknown; + } + return res; +}; +BinaryChartReader.prototype.ReadCT_ChartExSpace = function (type, length, val) { + var res = c_oSerConstants.ReadOk; + var oThis = this; + var oNewVal; + if(c_oserct_chartExSpaceCHARTDATA === type) + { + oNewVal = {}; + res = this.bcr.Read1(length, function (t, l) { + return oThis.ReadCT_ChartData(t, l, oNewVal); // todoo this class + }); + } + else if (c_oserct_chartExSpaceCHART === type) { + oNewVal = new AscFormat.CChartEx(); + res = this.bcr.Read1(length, function (t, l) { + return oThis.ReadCT_ChartEx(t, l, oNewVal); + }); + val.setChart(oNewVal); + } + else if (c_oserct_chartExSpaceSPPR === type) { + val.setSpPr(this.ReadSpPr(length)); + val.spPr.setParent(val); + } + else if (c_oserct_chartExSpaceTXPR === type) { + val.setTxPr(this.ReadTxPr(length)); + val.txPr.setParent(val); + } + else if (c_oserct_chartExspaceCLRMAPOVR === type) { + val.setClrMapOvr(this.ReadClrOverride(length)); + } + // else if(c_oserct_chartExSpaceXLSX === type) { + // //todo + // res = c_oSerConstants.ReadUnknown; + // } + // else if(c_oserct_chartExSpaceCOLORS === type) { + // this.curChart.oChartColorsData = AscCommon.fSaveStream(this.bcr.stream, length); + // oNewVal = new AscFormat.CChartColors(); + // res = this.bcr.Read1(length, function (t, l) { + // return oThis.ReadCT_ChartColors(t, l, oNewVal); + // }); + // val.setChartColors(oNewVal); + // } + // else if(c_oserct_chartExSpaceSTYLES === type) { + // this.curChart.oChartStyleData = AscCommon.fSaveStream(this.bcr.stream, length); + // oNewVal = new AscFormat.CChartStyle(); + // res = this.bcr.Read1(length, function (t, l) { + // return oThis.ReadCT_ChartStyle(t, l, oNewVal); + // }); + // val.setChartStyle(oNewVal); + // } + else + { + res = c_oSerConstants.ReadUnknown; + } + return res; +}; +BinaryChartReader.prototype.ReadSpPr = function (length) { + return AscCommon.pptx_content_loader.ReadShapeProperty(this.stream); +}; + +BinaryChartReader.prototype.ReadClrOverride = function(lenght) +{ + var loader = new AscCommon.BinaryPPTYLoader(); + + loader.stream = new AscCommon.FileStream(); + loader.stream.obj = this.stream.obj; + loader.stream.data = this.stream.data; + loader.stream.size = this.stream.size; + + loader.stream.pos = this.stream.pos; + loader.stream.cur = this.stream.cur; + var s = loader.stream; + var _main_type = s.GetUChar(); // 0!!! + + var clr_map = new AscFormat.ClrMap(); + loader.ReadClrMap(clr_map); + + this.stream.pos = s.pos; + this.stream.cur = s.cur; + return clr_map; + +}; + +BinaryChartReader.prototype.ReadTxPr = function (length) { + var cur = this.stream.cur; + var ret = AscCommon.pptx_content_loader.ReadTextBody(null, this.stream, null, this.curWorksheet, this.drawingDocument); + this.stream.cur = cur + length; + return ret; +}; +BinaryChartReader.prototype.ParsePersent = function (val) { + var nVal = parseFloat(val); + if (!isNaN(nVal)) + return nVal; + else + return null; +}; +BinaryChartReader.prototype.ParseMetric = function (val) { + var nVal = parseFloat(val); + var nRes = null; + if (!isNaN(nVal)) { + if (-1 != val.indexOf("mm")) + nRes = nVal; + else if (-1 != val.indexOf("cm")) + nRes = nVal * 10; + else if (-1 != val.indexOf("in")) + nRes = nVal * 2.54 * 10; + else if (-1 != val.indexOf("pt")) + nRes = nVal * 2.54 * 10 / 72; + else if (-1 != val.indexOf("pc") || -1 != val.indexOf("pi")) + nRes = nVal * 12 * 2.54 * 10 / 72; + } + return nRes; +}; +BinaryChartReader.prototype.CorrectChartWithAxis = function (chartOld, chartNew, aChartWithAxis) { + for (var i = 0, length = aChartWithAxis.length; i < length; ++i) { + var item = aChartWithAxis[i]; + if (item.chart == chartOld) + item.chart = chartNew; + } +}; +BinaryChartReader.prototype.ReadCT_Boolean = function (type, length, val) { + var res = c_oSerConstants.ReadOk; + var oThis = this; + if (c_oserct_booleanVAL === type) { + var oNewVal; + oNewVal = this.stream.GetBool(); + val.m_val = oNewVal; + } + else + res = c_oSerConstants.ReadUnknown; + return res; +}; +BinaryChartReader.prototype.ExternalReadCT_RelId = function (length, val) { + var res = c_oSerConstants.ReadOk; + var oThis = this; + res = this.bcr.Read1(length, function (t, l) { + return oThis.ReadCT_RelId(t, l, val); + }); + return res; +}; +BinaryChartReader.prototype.ReadCT_RelId = function (type, length, val) { + var res = c_oSerConstants.ReadOk; + var oThis = this; + if (c_oserct_relidID === type) { + //todo + var oNewVal; + oNewVal = this.stream.GetString2LE(length); + val.m_id = oNewVal; + } + else + res = c_oSerConstants.ReadUnknown; + return res; +}; +BinaryChartReader.prototype.ReadCT_UserShapes = function (type, length, val) { + var res = c_oSerConstants.ReadOk; + var oThis = this; + var nCount; + if (c_oserct_usershapes_COUNT === type) { + nCount = this.stream.GetULongLE(); + } + else if(c_oserct_usershapes_SHAPE_REL){ + var oNewVal = new AscFormat.CRelSizeAnchor(); + res = this.bcr.Read1(length, function (t, l) { + return oThis.ReadCT_userShape(t, l, oNewVal); + }); + val.addUserShape(undefined, oNewVal); + } + else if(c_oserct_usershapes_SHAPE_ABS){ + var oNewVal = new AscFormat.CAbsSizeAnchor(); + res = this.bcr.Read1(length, function (t, l) { + return oThis.ReadCT_userShape(t, l, oNewVal); + }); + val.addUserShape(undefined, oNewVal); + } + else + res = c_oSerConstants.ReadUnknown; + return res; +}; + +BinaryChartReader.prototype.ReadCT_ChartStyle = function (type, length, val) { + var res = c_oSerConstants.ReadOk; + var oThis = this; + var oNewVal; + if(c_oserct_chartstyleID === type) { + val.setId(this.stream.GetULongLE()); + } + else if (c_oserct_chartstyleENTRY === type) { + oNewVal = new AscFormat.CStyleEntry(); + res = this.bcr.Read1(length, function (t, l) { + return oThis.ReadCT_StyleEntry(t, l, oNewVal); + }); + if(res === c_oSerConstants.ReadOk) { + val.addEntry(oNewVal); + } + } + else if (c_oserct_chartstyleMARKERLAYOUT === type) { + oNewVal = new AscFormat.CMarkerLayout(); + res = this.bcr.Read1(length, function (t, l) { + return oThis.ReadCT_MarkerLayout(t, l, oNewVal); + }); + if(res === c_oSerConstants.ReadOk) { + val.setMarkerLayout(oNewVal); + } + } + else { + res = c_oSerConstants.ReadUnknown; + } + return res; +}; +BinaryChartReader.prototype.ReadCT_StyleEntry = function (type, length, val) { + var res = c_oSerConstants.ReadOk; + var oNewVal; + if (c_oserct_chartstyleENTRYTYPE == type) + { + val.setType(this.stream.GetUChar()); + } + else if (c_oserct_chartstyleLNREF == type) + { + oNewVal = AscCommon.pptx_content_loader.ReadStyleRef(this, this.stream); + if(oNewVal) + { + val.setLnRef(oNewVal); + } + } + else if (c_oserct_chartstyleFILLREF == type) + { + oNewVal = AscCommon.pptx_content_loader.ReadStyleRef(this, this.stream); + if(oNewVal) + { + val.setFillRef(oNewVal); + } + } + else if (c_oserct_chartstyleEFFECTREF == type) + { + oNewVal = AscCommon.pptx_content_loader.ReadStyleRef(this, this.stream); + if(oNewVal) + { + val.setEffectRef(oNewVal); + } + } + else if (c_oserct_chartstyleFONTREF == type) + { + oNewVal = AscCommon.pptx_content_loader.ReadFontRef(this, this.stream); + if(oNewVal) + { + val.setFontRef(oNewVal); + } + } + else if (c_oserct_chartstyleDEFPR == type) + { + oNewVal = AscCommon.pptx_content_loader.ReadRunProperties(this.stream, 0); + if(oNewVal) + { + val.setDefRPr(oNewVal); + } + } + else if (c_oserct_chartstyleBODYPR == type) + { + oNewVal = AscCommon.pptx_content_loader.ReadBodyPr(this, this.stream); + if(oNewVal) + { + val.setBodyPr(oNewVal); + } + } + else if (c_oserct_chartstyleSPPR == type) + { + val.setSpPr(this.ReadSpPr(length)); + } + else if (c_oserct_chartstyleLINEWIDTH == type) + { + val.setLineWidthScale(this.stream.GetDoubleLE()); + } + else + { + res = c_oSerConstants.ReadUnknown; + } + return res; +}; +BinaryChartReader.prototype.ReadCT_MarkerLayout = function (type, length, val) { + var res = c_oSerConstants.ReadOk; + var oThis = this; + if (c_oserct_chartstyleMARKERSYMBOL == type) + { + val.setSymbol(this.MarkerStyleToFormat(this.stream.GetUChar())); + } + else if (c_oserct_chartstyleMARKERSIZE == type) + { + val.setSize(this.stream.GetULongLE()); + } + else + { + res = c_oSerConstants.ReadUnknown; + } + return res; +}; +BinaryChartReader.prototype.ReadCT_ChartColors = function (type, length, val) { + var res = c_oSerConstants.ReadOk; + var oThis = this; + var oNewVal; + if (c_oserct_chartcolorsID === type) + { + val.setId(this.stream.GetULongLE()); + } + else if (c_oserct_chartcolorsMETH === type) + { + val.setMeth(this.stream.GetString2LE(length)); + } + else if(c_oserct_chartcolorsVARIATION === type) + { + oNewVal = new AscFormat.CColorModifiers(); + res = this.bcr.Read1(length, function (t, l) { + return oThis.ReadCT_ColorsVariation(t, l, oNewVal); + }); + val.addItem(oNewVal); + } + else if(c_oserct_chartcolorsCOLOR === type) + { + oNewVal = AscCommon.pptx_content_loader.ReadUniColor(this, this.stream); + if(oNewVal) + { + val.addItem(oNewVal); + } + } + else + { + res = c_oSerConstants.ReadUnknown; + } + return res; +}; +BinaryChartReader.prototype.ReadCT_ColorsVariation = function (type, length, val) +{ + var res = c_oSerConstants.ReadOk; + if (c_oserct_chartcolorsEFFECT === type) + { + var oMod = AscCommon.pptx_content_loader.ReadColorMod(this, this.stream); + if(oMod) + { + val.addMod(oMod); + } + } + else + { + res = c_oSerConstants.ReadUnknown; + } + return res; +}; + +BinaryChartReader.prototype.ReadCT_FromTo = function(type, length, poResult) +{ + var res = c_oSerConstants.ReadOk; + if(Asc.c_oSer_DrawingPosType.X == type) + { + poResult.x = this.stream.GetDoubleLE(); + } + else if(Asc.c_oSer_DrawingPosType.Y == type) + { + poResult.y = this.stream.GetDoubleLE(); + } + else + res = c_oSerConstants.ReadUnknown; + return res; +}; +BinaryChartReader.prototype.ReadCT_userShape = function(type, length, poResult) +{ + var oThis = this; + + var res = c_oSerConstants.ReadOk; + if(Asc.c_oSer_DrawingType.From == type) + { + var oNewVal = {}; + res = this.bcr.Read2Spreadsheet(length, function (t, l) { + return oThis.ReadCT_FromTo(t, l, oNewVal); + }); + poResult.setFromTo(oNewVal.x, oNewVal.y, poResult.toX, poResult.toY); + } + else if(Asc.c_oSer_DrawingType.To == type) + { + var oNewVal = {}; + res = this.bcr.Read2Spreadsheet(length, function (t, l) { + return oThis.ReadCT_FromTo(t, l, oNewVal); + }); + poResult.setFromTo( poResult.fromX, poResult.fromY, oNewVal.x, oNewVal.y); + } + else if(Asc.c_oSer_DrawingType.Ext == type) + { + var oNewVal = {}; + res = this.bcr.Read2Spreadsheet(length, function (t, l) { + return oThis.ReadCT_FromTo(t, l, oNewVal); + }); + poResult.setFromTo( poResult.fromX, poResult.fromY, oNewVal.x, oNewVal.y); + } + else if(Asc.c_oSer_DrawingType.pptxDrawing == type) + { + var oGraphicObject = AscCommon.pptx_content_loader.ReadGraphicObject(this.stream, this.curWorksheet, this.drawingDocument); + poResult.setObject(oGraphicObject); + // oGraphicObject.createTextBody(); + // oGraphicObject.txBody.content.AddText("Test user Shapes"); + } + else + res = c_oSerConstants.ReadUnknown; + return res; +}; +BinaryChartReader.prototype.ReadCT_PageSetup = function (type, length, val) { + var res = c_oSerConstants.ReadOk; + var oThis = this; + if (c_oserct_pagesetupPAPERSIZE === type) { + val.setPaperSize(this.stream.GetULongLE()); + } + else if (c_oserct_pagesetupPAPERHEIGHT === type) { + var mm = this.ParseMetric(this.stream.GetString2LE(length)); + if (null != mm) + val.setPaperHeight(mm); + } + else if (c_oserct_pagesetupPAPERWIDTH === type) { + var mm = this.ParseMetric(this.stream.GetString2LE(length)); + if (null != mm) + val.setPaperWidth(mm); + } + else if (c_oserct_pagesetupFIRSTPAGENUMBER === type) { + val.setFirstPageNumber(this.stream.GetULongLE()); + } + else if (c_oserct_pagesetupORIENTATION === type) { + switch (this.stream.GetUChar()) { + case st_pagesetuporientationDEFAULT: val.setOrientation(AscFormat.PAGE_SETUP_ORIENTATION_DEFAULT); break; + case st_pagesetuporientationPORTRAIT: val.setOrientation(AscFormat.PAGE_SETUP_ORIENTATION_PORTRAIT); break; + case st_pagesetuporientationLANDSCAPE: val.setOrientation(AscFormat.PAGE_SETUP_ORIENTATION_LANDSCAPE); break; + } + } + else if (c_oserct_pagesetupBLACKANDWHITE === type) { + val.setBlackAndWhite(this.stream.GetBool()); + } + else if (c_oserct_pagesetupDRAFT === type) { + val.setBlackAndWhite(this.stream.GetBool()); + } + else if (c_oserct_pagesetupUSEFIRSTPAGENUMBER === type) { + val.setUseFirstPageNumb(this.stream.GetBool()); + } + else if (c_oserct_pagesetupHORIZONTALDPI === type) { + val.setHorizontalDpi(this.stream.GetULongLE()); + } + else if (c_oserct_pagesetupVERTICALDPI === type) { + val.setVerticalDpi(this.stream.GetULongLE()); + } + else if (c_oserct_pagesetupCOPIES === type) { + val.setCopies(this.stream.GetULongLE()); + } + else + res = c_oSerConstants.ReadUnknown; + return res; +}; +BinaryChartReader.prototype.ReadCT_PageMargins = function (type, length, val) { + var res = c_oSerConstants.ReadOk; + var oThis = this; + if (c_oserct_pagemarginsL === type) { + val.setL(this.stream.GetDoubleLE()); + } + else if (c_oserct_pagemarginsR === type) { + val.setR(this.stream.GetDoubleLE()); + } + else if (c_oserct_pagemarginsT === type) { + val.setT(this.stream.GetDoubleLE()); + } + else if (c_oserct_pagemarginsB === type) { + val.setB(this.stream.GetDoubleLE()); + } + else if (c_oserct_pagemarginsHEADER === type) { + val.setHeader(this.stream.GetDoubleLE()); + } + else if (c_oserct_pagemarginsFOOTER === type) { + val.setFooter(this.stream.GetDoubleLE()); + } + else + res = c_oSerConstants.ReadUnknown; + return res; +}; +BinaryChartReader.prototype.ReadCT_HeaderFooter = function (type, length, val) { + var res = c_oSerConstants.ReadOk; + var oThis = this; + if (c_oserct_headerfooterODDHEADER === type) { + val.setOddHeader(this.stream.GetString2LE(length)); + } + else if (c_oserct_headerfooterODDFOOTER === type) { + val.setOddFooter(this.stream.GetString2LE(length)); + } + else if (c_oserct_headerfooterEVENHEADER === type) { + val.setEvenHeader(this.stream.GetString2LE(length)); + } + else if (c_oserct_headerfooterEVENFOOTER === type) { + val.setEvenFooter(this.stream.GetString2LE(length)); + } + else if (c_oserct_headerfooterFIRSTHEADER === type) { + val.setFirstHeader(this.stream.GetString2LE(length)); + } + else if (c_oserct_headerfooterFIRSTFOOTER === type) { + val.setFirstFooter(this.stream.GetString2LE(length)); + } + else if (c_oserct_headerfooterALIGNWITHMARGINS === type) { + val.setAlignWithMargins(this.stream.GetBool()); + } + else if (c_oserct_headerfooterDIFFERENTODDEVEN === type) { + val.setDifferentOddEven(this.stream.GetBool()); + } + else if (c_oserct_headerfooterDIFFERENTFIRST === type) { + val.setDifferentFirst(this.stream.GetBool()); + } + else + res = c_oSerConstants.ReadUnknown; + return res; +}; +BinaryChartReader.prototype.ReadCT_PrintSettings = function (type, length, val) { + var res = c_oSerConstants.ReadOk; + var oThis = this; + if (c_oserct_printsettingsHEADERFOOTER === type) { + var oNewVal = new AscFormat.CHeaderFooterChart(); + res = this.bcr.Read1(length, function (t, l) { + return oThis.ReadCT_HeaderFooter(t, l, oNewVal); + }); + val.setHeaderFooter(oNewVal); + } + else if (c_oserct_printsettingsPAGEMARGINS === type) { + var oNewVal = new AscFormat.CPageMarginsChart(); + res = this.bcr.Read1(length, function (t, l) { + return oThis.ReadCT_PageMargins(t, l, oNewVal); + }); + val.setPageMargins(oNewVal); + } + else if (c_oserct_printsettingsPAGESETUP === type) { + var oNewVal = new AscFormat.CPageSetup(); + res = this.bcr.Read1(length, function (t, l) { + return oThis.ReadCT_PageSetup(t, l, oNewVal); + }); + val.setPageSetup(oNewVal); + } + else + res = c_oSerConstants.ReadUnknown; + return res; +}; +BinaryChartReader.prototype.ReadCT_ExternalData = function (type, length, val) { + var res = c_oSerConstants.ReadOk; + var oThis = this; + if (c_oserct_externaldataAUTOUPDATE === type) { + var oNewVal; + oNewVal = {}; + res = this.bcr.Read1(length, function (t, l) { + return oThis.ReadCT_Boolean(t, l, oNewVal); + }); + val.m_autoUpdate = oNewVal; + } + else if (c_oserct_externaldataID === type) { + //todo + var oNewVal; + oNewVal = this.stream.GetString2LE(length); + val.m_id = oNewVal; + } + else + res = c_oSerConstants.ReadUnknown; + return res; +}; +BinaryChartReader.prototype.ReadCT_DispBlanksAs = function (type, length, val) { + var res = c_oSerConstants.ReadOk; + var oThis = this; + if (c_oserct_dispblanksasVAL === type) { + switch (this.stream.GetUChar()) { + case st_dispblanksasSPAN: val.m_val = AscFormat.DISP_BLANKS_AS_SPAN; break; + case st_dispblanksasGAP: val.m_val = AscFormat.DISP_BLANKS_AS_GAP; break; + case st_dispblanksasZERO: val.m_val = AscFormat.DISP_BLANKS_AS_ZERO; break; + } + } + else + res = c_oSerConstants.ReadUnknown; + return res; +}; +BinaryChartReader.prototype.ReadCT_LegendEntry = function (type, length, val) { + var res = c_oSerConstants.ReadOk; + var oThis = this; + if (c_oserct_legendentryIDX === type) { + var oNewVal = { m_val: null }; + res = this.bcr.Read1(length, function (t, l) { + return oThis.ReadCT_UnsignedInt(t, l, oNewVal); + }); + if (null != oNewVal.m_val) + val.setIdx(oNewVal.m_val); + } + else if (c_oserct_legendentryDELETE === type) { + var oNewVal = { m_val: null }; + res = this.bcr.Read1(length, function (t, l) { + return oThis.ReadCT_Boolean(t, l, oNewVal); + }); + if (null != oNewVal.m_val) + val.setDelete(oNewVal.m_val); + else + val.setDelete(true); + } + else if (c_oserct_legendentryTXPR === type) { + val.setTxPr(this.ReadTxPr(length)); + val.txPr.setParent(val); + } + else if (c_oserct_legendentryEXTLST === type) { + var oNewVal; + oNewVal = {}; + res = this.bcr.Read1(length, function (t, l) { + return oThis.ReadCT_extLst(t, l, oNewVal); + }); + // val.m_extLst = oNewVal; + } + else + res = c_oSerConstants.ReadUnknown; + return res; +}; +BinaryChartReader.prototype.ReadCT_UnsignedInt = function (type, length, val) { + var res = c_oSerConstants.ReadOk; + var oThis = this; + if (c_oserct_unsignedintVAL === type) { + var oNewVal; + oNewVal = this.stream.GetULongLE(); + val.m_val = oNewVal; + } + else + res = c_oSerConstants.ReadUnknown; + return res; +}; +BinaryChartReader.prototype.ReadCT_Extension = function (type, length, val) { + var res = c_oSerConstants.ReadOk; + var oThis = this; + if (c_oserct_extensionANY === type) { + var oNewVal; + oNewVal = this.stream.GetString2LE(length); + val.m_Any = oNewVal; + } + else if (c_oserct_extensionURI === type) { + var oNewVal; + oNewVal = this.stream.GetString2LE(length); + val.m_uri = oNewVal; + } + else + res = c_oSerConstants.ReadUnknown; + return res; +}; +BinaryChartReader.prototype.ReadCT_LegendPos = function (type, length, val) { + var res = c_oSerConstants.ReadOk; + var oThis = this; + if (c_oserct_legendposVAL === type) { + switch (this.stream.GetUChar()) { + case st_legendposB: val.m_val = c_oAscChartLegendShowSettings.bottom; break; + case st_legendposTR: val.m_val = c_oAscChartLegendShowSettings.topRight; break; + case st_legendposL: val.m_val = c_oAscChartLegendShowSettings.left; break; + case st_legendposR: val.m_val = c_oAscChartLegendShowSettings.right; break; + case st_legendposT: val.m_val = c_oAscChartLegendShowSettings.top; break; + } + } + else + res = c_oSerConstants.ReadUnknown; + return res; +}; +BinaryChartReader.prototype.ReadCT_Legend = function (type, length, val) { + var res = c_oSerConstants.ReadOk; + var oThis = this; + if (c_oserct_legendLEGENDPOS === type) { + var oNewVal = { m_val: null }; + res = this.bcr.Read1(length, function (t, l) { + return oThis.ReadCT_LegendPos(t, l, oNewVal); + }); + if (null != oNewVal.m_val) + val.setLegendPos(oNewVal.m_val); + } + else if (c_oserct_legendLEGENDENTRY === type) { + var oNewVal = new AscFormat.CLegendEntry(); + res = this.bcr.Read1(length, function (t, l) { + return oThis.ReadCT_LegendEntry(t, l, oNewVal); + }); + val.addLegendEntry(oNewVal); + } + else if (c_oserct_legendLAYOUT === type) { + res = this.bcr.Read1(length, function (t, l) { + return oThis.ReadCT_Layout(t, l, val); + }); + } + else if (c_oserct_legendOVERLAY === type) { + var oNewVal = { m_val: null }; + res = this.bcr.Read1(length, function (t, l) { + return oThis.ReadCT_Boolean(t, l, oNewVal); + }); + if (null != oNewVal.m_val) + val.setOverlay(oNewVal.m_val); + } + else if (c_oserct_legendSPPR === type) { + val.setSpPr(this.ReadSpPr(length)); + } + else if (c_oserct_legendTXPR === type) { + val.setTxPr(this.ReadTxPr(length)); + val.txPr.setParent(val); + } + else if (c_oserct_legendALIGN === type) { + var oNewVal; + oNewVal = {}; + res = this.bcr.Read1(length, function (t, l) { + return oThis.ReadCT_PosAlign(t, l, oNewVal); + }); + } + else if (c_oserct_legendEXTLST === type) { + var oNewVal; + oNewVal = {}; + res = this.bcr.Read1(length, function (t, l) { + return oThis.ReadCT_extLst(t, l, oNewVal); + }); + // val.m_extLst = oNewVal; + } + else + res = c_oSerConstants.ReadUnknown; + return res; +}; +BinaryChartReader.prototype.ReadCT_Layout = function (type, length, val) { + var res = c_oSerConstants.ReadOk; + var oThis = this; + if (c_oserct_layoutMANUALLAYOUT === type) { + var oNewVal = new AscFormat.CLayout(); + res = this.bcr.Read1(length, function (t, l) { + return oThis.ReadCT_ManualLayout(t, l, oNewVal); + }); + val.setLayout(oNewVal); + } + else if (c_oserct_layoutEXTLST === type) { + var oNewVal; + oNewVal = {}; + res = this.bcr.Read1(length, function (t, l) { + return oThis.ReadCT_extLst(t, l, oNewVal); + }); + // val.m_extLst = oNewVal; + } + else + res = c_oSerConstants.ReadUnknown; + return res; +}; +BinaryChartReader.prototype.ReadCT_ManualLayout = function (type, length, val) { + var res = c_oSerConstants.ReadOk; + var oThis = this; + if (c_oserct_manuallayoutLAYOUTTARGET === type) { + var oNewVal = { m_val: null }; + res = this.bcr.Read1(length, function (t, l) { + return oThis.ReadCT_LayoutTarget(t, l, oNewVal); + }); + if (null != oNewVal.m_val) + val.setLayoutTarget(oNewVal.m_val); + } + else if (c_oserct_manuallayoutXMODE === type) { + var oNewVal = { m_val: null }; + res = this.bcr.Read1(length, function (t, l) { + return oThis.ReadCT_LayoutMode(t, l, oNewVal); + }); + if (null != oNewVal.m_val) + val.setXMode(oNewVal.m_val); + } + else if (c_oserct_manuallayoutYMODE === type) { + var oNewVal = { m_val: null }; + res = this.bcr.Read1(length, function (t, l) { + return oThis.ReadCT_LayoutMode(t, l, oNewVal); + }); + if (null != oNewVal.m_val) + val.setYMode(oNewVal.m_val); + } + else if (c_oserct_manuallayoutWMODE === type) { + var oNewVal = { m_val: null }; + res = this.bcr.Read1(length, function (t, l) { + return oThis.ReadCT_LayoutMode(t, l, oNewVal); + }); + if (null != oNewVal.m_val) + val.setWMode(oNewVal.m_val); + } + else if (c_oserct_manuallayoutHMODE === type) { + var oNewVal = { m_val: null }; + res = this.bcr.Read1(length, function (t, l) { + return oThis.ReadCT_LayoutMode(t, l, oNewVal); + }); + if (null != oNewVal.m_val) + val.setHMode(oNewVal.m_val); + } + else if (c_oserct_manuallayoutX === type) { + var oNewVal = { m_val: null }; + res = this.bcr.Read1(length, function (t, l) { + return oThis.ReadCT_Double(t, l, oNewVal); + }); + if (null != oNewVal.m_val) + val.setX(oNewVal.m_val); + } + else if (c_oserct_manuallayoutY === type) { + var oNewVal = { m_val: null }; + res = this.bcr.Read1(length, function (t, l) { + return oThis.ReadCT_Double(t, l, oNewVal); + }); + if (null != oNewVal.m_val) + val.setY(oNewVal.m_val); + } + else if (c_oserct_manuallayoutW === type) { + var oNewVal = { m_val: null }; + res = this.bcr.Read1(length, function (t, l) { + return oThis.ReadCT_Double(t, l, oNewVal); + }); + if (null != oNewVal.m_val) + val.setW(oNewVal.m_val); + } + else if (c_oserct_manuallayoutH === type) { + var oNewVal = { m_val: null }; + res = this.bcr.Read1(length, function (t, l) { + return oThis.ReadCT_Double(t, l, oNewVal); + }); + if (null != oNewVal.m_val) + val.setH(oNewVal.m_val); + } + else if (c_oserct_manuallayoutEXTLST === type) { + var oNewVal; + oNewVal = {}; + res = this.bcr.Read1(length, function (t, l) { + return oThis.ReadCT_extLst(t, l, oNewVal); + }); + // val.m_extLst = oNewVal; + } + else + res = c_oSerConstants.ReadUnknown; + return res; +}; +BinaryChartReader.prototype.ReadCT_LayoutTarget = function (type, length, val) { + var res = c_oSerConstants.ReadOk; + var oThis = this; + if (c_oserct_layouttargetVAL === type) { + switch (this.stream.GetUChar()) { + case st_layouttargetINNER: val.m_val = LAYOUT_TARGET_INNER; break; + case st_layouttargetOUTER: val.m_val = LAYOUT_TARGET_OUTER; break; + } + } + else + res = c_oSerConstants.ReadUnknown; + return res; +}; +BinaryChartReader.prototype.ReadCT_LayoutMode = function (type, length, val) { + var res = c_oSerConstants.ReadOk; + var oThis = this; + if (c_oserct_layoutmodeVAL === type) { + switch (this.stream.GetUChar()) { + case st_layoutmodeEDGE: val.m_val = LAYOUT_MODE_EDGE; break; + case st_layoutmodeFACTOR: val.m_val = LAYOUT_MODE_FACTOR; break; + } + } + else + res = c_oSerConstants.ReadUnknown; + return res; +}; +BinaryChartReader.prototype.ReadCT_Double = function (type, length, val) { + var res = c_oSerConstants.ReadOk; + var oThis = this; + if (c_oserct_doubleVAL === type) { + var oNewVal; + oNewVal = this.stream.GetDoubleLE(); + val.m_val = oNewVal; + } + else + res = c_oSerConstants.ReadUnknown; + return res; +}; +BinaryChartReader.prototype.ReadCT_DTable = function (type, length, val) { + var res = c_oSerConstants.ReadOk; + var oThis = this; + if (c_oserct_dtableSHOWHORZBORDER === type) { + var oNewVal = { m_val: null }; + res = this.bcr.Read1(length, function (t, l) { + return oThis.ReadCT_Boolean(t, l, oNewVal); + }); + if (null != oNewVal.m_val) + val.setShowHorzBorder(oNewVal.m_val); + } + else if (c_oserct_dtableSHOWVERTBORDER === type) { + var oNewVal = { m_val: null }; + res = this.bcr.Read1(length, function (t, l) { + return oThis.ReadCT_Boolean(t, l, oNewVal); + }); + if (null != oNewVal.m_val) + val.setShowVertBorder(oNewVal.m_val); + } + else if (c_oserct_dtableSHOWOUTLINE === type) { + var oNewVal = { m_val: null }; + res = this.bcr.Read1(length, function (t, l) { + return oThis.ReadCT_Boolean(t, l, oNewVal); + }); + if (null != oNewVal.m_val) + val.setShowOutline(oNewVal.m_val); + } + else if (c_oserct_dtableSHOWKEYS === type) { + var oNewVal = { m_val: null }; + res = this.bcr.Read1(length, function (t, l) { + return oThis.ReadCT_Boolean(t, l, oNewVal); + }); + if (null != oNewVal.m_val) + val.setShowKeys(oNewVal.m_val); + } + else if (c_oserct_dtableSPPR === type) { + val.setSpPr(this.ReadSpPr(length)) + } + else if (c_oserct_dtableTXPR === type) { + val.setTxPr(this.ReadTxPr(length)); + val.txPr.setParent(val); + } + else if (c_oserct_dtableEXTLST === type) { + var oNewVal; + oNewVal = {}; + res = this.bcr.Read1(length, function (t, l) { + return oThis.ReadCT_extLst(t, l, oNewVal); + }); + // val.m_extLst = oNewVal; + } + else + res = c_oSerConstants.ReadUnknown; + return res; +}; +BinaryChartReader.prototype.ReadCT_SerAx = function (type, length, val) { + var res = c_oSerConstants.ReadOk; + var oThis = this; + if (c_oserct_seraxAXID === type) { + var oNewVal = { m_val: null }; + res = this.bcr.Read1(length, function (t, l) { + return oThis.ReadCT_UnsignedInt(t, l, oNewVal); + }); + if (null != oNewVal.m_val) + val.setAxId(oNewVal.m_val); + } + else if (c_oserct_seraxSCALING === type) { + var oNewVal = new AscFormat.CScaling(); + res = this.bcr.Read1(length, function (t, l) { + return oThis.ReadCT_Scaling(t, l, oNewVal); + }); + val.setScaling(oNewVal); + } + else if (c_oserct_seraxDELETE === type) { + var oNewVal = { m_val: null }; + res = this.bcr.Read1(length, function (t, l) { + return oThis.ReadCT_Boolean(t, l, oNewVal); + }); + if (null != oNewVal.m_val) + val.setDelete(oNewVal.m_val); + else + val.setDelete(true); + } + else if (c_oserct_seraxAXPOS === type) { + var oNewVal = { m_val: null }; + res = this.bcr.Read1(length, function (t, l) { + return oThis.ReadCT_AxPos(t, l, oNewVal); + }); + if (null != oNewVal.m_val) + val.setAxPos(oNewVal.m_val); + } + else if (c_oserct_seraxMAJORGRIDLINES === type) { + var oNewVal = { spPr: null }; + res = this.bcr.Read1(length, function (t, l) { + return oThis.ReadCT_ChartLines(t, l, oNewVal); + }); + if (null != oNewVal.spPr) + val.setMajorGridlines(oNewVal.spPr); + else + val.setMajorGridlines(new AscFormat.CSpPr()); + } + else if (c_oserct_seraxMINORGRIDLINES === type) { + var oNewVal = { spPr: null }; + res = this.bcr.Read1(length, function (t, l) { + return oThis.ReadCT_ChartLines(t, l, oNewVal); + }); + if (null != oNewVal.spPr) + val.setMinorGridlines(oNewVal.spPr); + else + val.setMinorGridlines(new AscFormat.CSpPr()); + } + else if (c_oserct_seraxTITLE === type) { + var oNewVal = new AscFormat.CTitle(); + res = this.bcr.Read1(length, function (t, l) { + return oThis.ReadCT_Title(t, l, oNewVal); + }); + if(!AscFormat.isRealBool(oNewVal.overlay)) + { + oNewVal.setOverlay(false); + } + val.setTitle(oNewVal); + } + else if (c_oserct_seraxNUMFMT === type) { + var oNewVal = new AscFormat.CNumFmt(); + res = this.bcr.Read1(length, function (t, l) { + return oThis.ReadCT_NumFmt(t, l, oNewVal); + }); + val.setNumFmt(oNewVal); + } + else if (c_oserct_seraxMAJORTICKMARK === type) { + var oNewVal = { m_val: null }; + res = this.bcr.Read1(length, function (t, l) { + return oThis.ReadCT_TickMark(t, l, oNewVal); + }); + if (null != oNewVal.m_val) + val.setMajorTickMark(oNewVal.m_val); + else{ + val.setMajorTickMark(c_oAscTickMark.TICK_MARK_CROSS); + } + } + else if (c_oserct_seraxMINORTICKMARK === type) { + var oNewVal = { m_val: null }; + res = this.bcr.Read1(length, function (t, l) { + return oThis.ReadCT_TickMark(t, l, oNewVal); + }); + if (null != oNewVal.m_val) + val.setMinorTickMark(oNewVal.m_val); + else{ + val.setMajorTickMark(c_oAscTickMark.TICK_MARK_CROSS); + } + } + else if (c_oserct_seraxTICKLBLPOS === type) { + var oNewVal = { m_val: null }; + res = this.bcr.Read1(length, function (t, l) { + return oThis.ReadCT_TickLblPos(t, l, oNewVal); + }); + if (null != oNewVal.m_val) + val.setTickLblPos(oNewVal.m_val); + } + else if (c_oserct_seraxSPPR === type) { + val.setSpPr(this.ReadSpPr(length)); + } + else if (c_oserct_seraxTXPR === type) { + val.setTxPr(this.ReadTxPr(length)); + val.txPr.setParent(val); + } + else if (c_oserct_seraxCROSSAX === type) { + var oNewVal = { m_val: null }; + res = this.bcr.Read1(length, function (t, l) { + return oThis.ReadCT_UnsignedInt(t, l, oNewVal); + }); + + if (null != oNewVal.m_val) + { + val.crossAxId = oNewVal.m_val; + } + } + else if (c_oserct_seraxCROSSES === type) { + var oNewVal = { m_val: null }; + res = this.bcr.Read1(length, function (t, l) { + return oThis.ReadCT_Crosses(t, l, oNewVal); + }); + if (null != oNewVal.m_val) + val.setCrosses(oNewVal.m_val); + } + else if (c_oserct_seraxCROSSESAT === type) { + var oNewVal = { m_val: null }; + res = this.bcr.Read1(length, function (t, l) { + return oThis.ReadCT_Double(t, l, oNewVal); + }); + if (null != oNewVal.m_val) + val.setCrossesAt(oNewVal.m_val); + } + else if (c_oserct_seraxTICKLBLSKIP === type) { + var oNewVal = { m_val: null }; + res = this.bcr.Read1(length, function (t, l) { + return oThis.ReadCT_Skip(t, l, oNewVal); + }); + if (null != oNewVal.m_val) + val.setTickLblSkip(oNewVal.m_val); + } + else if (c_oserct_seraxTICKMARKSKIP === type) { + var oNewVal = { m_val: null }; + res = this.bcr.Read1(length, function (t, l) { + return oThis.ReadCT_Skip(t, l, oNewVal); + }); + if (null != oNewVal.m_val) + val.setTickMarkSkip(oNewVal.m_val); + } + else if (c_oserct_seraxEXTLST === type) { + var oNewVal; + oNewVal = {}; + res = this.bcr.Read1(length, function (t, l) { + return oThis.ReadCT_extLst(t, l, oNewVal); + }); + // val.m_extLst = oNewVal; + } + else + res = c_oSerConstants.ReadUnknown; + return res; +}; +BinaryChartReader.prototype.ReadCT_Scaling = function (type, length, val) { + var res = c_oSerConstants.ReadOk; + var oThis = this; + if (c_oserct_scalingLOGBASE === type) { + var oNewVal = { m_val: null }; + res = this.bcr.Read1(length, function (t, l) { + return oThis.ReadCT_LogBase(t, l, oNewVal); + }); + if (null != oNewVal.m_val) + val.setLogBase(oNewVal.m_val); + } + else if (c_oserct_scalingORIENTATION === type) { + var oNewVal = { m_val: null }; + res = this.bcr.Read1(length, function (t, l) { + return oThis.ReadCT_Orientation(t, l, oNewVal); + }); + if (null != oNewVal.m_val) + val.setOrientation(oNewVal.m_val); + } + else if (c_oserct_scalingMAX === type) { + var oNewVal = { m_val: null }; + res = this.bcr.Read1(length, function (t, l) { + return oThis.ReadCT_Double(t, l, oNewVal); + }); + if (null != oNewVal.m_val) + val.setMax(oNewVal.m_val); + } + else if (c_oserct_scalingMIN === type) { + var oNewVal = { m_val: null }; + res = this.bcr.Read1(length, function (t, l) { + return oThis.ReadCT_Double(t, l, oNewVal); + }); + if (null != oNewVal.m_val) + val.setMin(oNewVal.m_val); + } + else if (c_oserct_scalingEXTLST === type) { + var oNewVal; + oNewVal = {}; + res = this.bcr.Read1(length, function (t, l) { + return oThis.ReadCT_extLst(t, l, oNewVal); + }); + // val.m_extLst = oNewVal; + } + else + res = c_oSerConstants.ReadUnknown; + return res; +}; +BinaryChartReader.prototype.ReadCT_LogBase = function (type, length, val) { + var res = c_oSerConstants.ReadOk; + var oThis = this; + if (c_oserct_logbaseVAL === type) { + var oNewVal; + oNewVal = this.stream.GetDoubleLE(); + val.m_val = oNewVal; + } + else + res = c_oSerConstants.ReadUnknown; + return res; +}; +BinaryChartReader.prototype.ReadCT_Orientation = function (type, length, val) { + var res = c_oSerConstants.ReadOk; + var oThis = this; + if (c_oserct_orientationVAL === type) { + switch (this.stream.GetUChar()) { + case st_orientationMAXMIN: val.m_val = AscFormat.ORIENTATION_MAX_MIN; break; + case st_orientationMINMAX: val.m_val = AscFormat.ORIENTATION_MIN_MAX; break; + } + } + else + res = c_oSerConstants.ReadUnknown; + return res; +}; +BinaryChartReader.prototype.ReadCT_AxPos = function (type, length, val) { + var res = c_oSerConstants.ReadOk; + var oThis = this; + if (c_oserct_axposVAL === type) { + switch (this.stream.GetUChar()) { + case st_axposB: val.m_val = AscFormat.AX_POS_B; break; + case st_axposL: val.m_val = AscFormat.AX_POS_L; break; + case st_axposR: val.m_val = AscFormat.AX_POS_R; break; + case st_axposT: val.m_val = AscFormat.AX_POS_T; break; + } + } + else + res = c_oSerConstants.ReadUnknown; + return res; +}; +BinaryChartReader.prototype.ReadCT_ChartLines = function (type, length, val) { + var res = c_oSerConstants.ReadOk; + var oThis = this; + if (c_oserct_chartlinesSPPR === type) { + val.spPr = this.ReadSpPr(length); + } + else + res = c_oSerConstants.ReadUnknown; + return res; +}; +BinaryChartReader.prototype.ReadCT_Title = function (type, length, val) { + var res = c_oSerConstants.ReadOk; + var oThis = this; + if (c_oserct_titleTX === type) { + var oNewVal = new AscFormat.CChartText(); + res = this.bcr.Read1(length, function (t, l) { + return oThis.ReadCT_Tx(t, l, oNewVal); + }); + oNewVal.setChart(this.curChart); + val.setTx(oNewVal); + } + else if (c_oserct_titleLAYOUT === type) { + res = this.bcr.Read1(length, function (t, l) { + return oThis.ReadCT_Layout(t, l, val); + }); + } + else if (c_oserct_titleOVERLAY === type) { + var oNewVal = { m_val: null }; + res = this.bcr.Read1(length, function (t, l) { + return oThis.ReadCT_Boolean(t, l, oNewVal); + }); + if (null != oNewVal.m_val) + val.setOverlay(oNewVal.m_val); + } + else if (c_oserct_titleSPPR === type) { + val.setSpPr(this.ReadSpPr(length)); + } + else if (c_oserct_titleTXPR === type) { + val.setTxPr(this.ReadTxPr(length)); + val.txPr.setParent(val); + } + else if (c_oserct_titleALIGN === type) { + var oNewVal; + oNewVal = {}; + res = this.bcr.Read1(length, function (t, l) { + return oThis.ReadCT_PosAlign(t, l, oNewVal); // todoo this class + }); + } + else if (c_oserct_titleEXTLST === type) { + var oNewVal; + oNewVal = {}; + res = this.bcr.Read1(length, function (t, l) { + return oThis.ReadCT_extLst(t, l, oNewVal); + }); + // val.m_extLst = oNewVal; + } + else + res = c_oSerConstants.ReadUnknown; + return res; +}; +BinaryChartReader.prototype.ReadCT_Tx = function (type, length, val) { + var res = c_oSerConstants.ReadOk; + var oThis = this; + if (c_oserct_txRICH === type) { + val.setRich(this.ReadTxPr(length)); + val.rich.setParent(val); + } + else if (c_oserct_txSTRREF === type) { + var oNewVal = new AscFormat.CStrRef(); + res = this.bcr.Read1(length, function (t, l) { + return oThis.ReadCT_StrRef(t, l, oNewVal); + }); + val.setStrRef(oNewVal); + } + else + res = c_oSerConstants.ReadUnknown; + return res; +}; +BinaryChartReader.prototype.ReadCT_StrRef = function (type, length, val) { + var res = c_oSerConstants.ReadOk; + var oThis = this; + if (c_oserct_strrefF === type) { + val.setF(this.stream.GetString2LE(length)); + } + else if (c_oserct_strrefSTRCACHE === type) { + var oNewVal = new AscFormat.CStrCache(); + res = this.bcr.Read1(length, function (t, l) { + return oThis.ReadCT_StrData(t, l, oNewVal); + }); + val.setStrCache(oNewVal); + } + else if (c_oserct_strrefEXTLST === type) { + var oNewVal; + oNewVal = {}; + res = this.bcr.Read1(length, function (t, l) { + return oThis.ReadCT_extLst(t, l, oNewVal); + }); + // val.m_extLst = oNewVal; + } + else + res = c_oSerConstants.ReadUnknown; + return res; +}; +BinaryChartReader.prototype.ReadCT_StrData = function (type, length, val) { + var res = c_oSerConstants.ReadOk; + var oThis = this; + if (c_oserct_strdataPTCOUNT === type) { + var oNewVal = { m_val: null }; + res = this.bcr.Read1(length, function (t, l) { + return oThis.ReadCT_UnsignedInt(t, l, oNewVal); + }); + if (null != oNewVal.m_val) + val.setPtCount(oNewVal.m_val); + } + else if (c_oserct_strdataPT === type) { + var oNewVal = new AscFormat.CStringPoint(); + res = this.bcr.Read1(length, function (t, l) { + return oThis.ReadCT_StrVal(t, l, oNewVal); + }); + val.addPt(oNewVal); + } + else if (c_oserct_strdataEXTLST === type) { + var oNewVal; + oNewVal = {}; + res = this.bcr.Read1(length, function (t, l) { + return oThis.ReadCT_extLst(t, l, oNewVal); + }); + // val.m_extLst = oNewVal; + } + else + res = c_oSerConstants.ReadUnknown; + return res; +}; +BinaryChartReader.prototype.ReadCT_StrVal = function (type, length, val) { + var res = c_oSerConstants.ReadOk; + var oThis = this; + if (c_oserct_strvalV === type) { + val.setVal(this.stream.GetString2LE(length)); + } + else if (c_oserct_strvalIDX === type) { + val.setIdx(this.stream.GetULongLE()); + } + else + res = c_oSerConstants.ReadUnknown; + return res; +}; +BinaryChartReader.prototype.ReadCT_NumFmt = function (type, length, val) { + var res = c_oSerConstants.ReadOk; + var oThis = this; + if (c_oserct_numfmtFORMATCODE === type) { + val.setFormatCode(this.stream.GetString2LE(length)); + } + else if (c_oserct_numfmtSOURCELINKED === type) { + val.setSourceLinked(this.stream.GetBool()); + } + else + res = c_oSerConstants.ReadUnknown; + return res; +}; +BinaryChartReader.prototype.ReadCT_TickMark = function (type, length, val) { + var res = c_oSerConstants.ReadOk; + var oThis = this; + if (c_oserct_tickmarkVAL === type) { + switch (this.stream.GetUChar()) { + case st_tickmarkCROSS: val.m_val = c_oAscTickMark.TICK_MARK_CROSS; break; + case st_tickmarkIN: val.m_val = c_oAscTickMark.TICK_MARK_IN; break; + case st_tickmarkNONE: val.m_val = c_oAscTickMark.TICK_MARK_NONE; break; + case st_tickmarkOUT: val.m_val = c_oAscTickMark.TICK_MARK_OUT; break; + } + } + else + res = c_oSerConstants.ReadUnknown; + return res; +}; +BinaryChartReader.prototype.ReadCT_TickLblPos = function (type, length, val) { + var res = c_oSerConstants.ReadOk; + var oThis = this; + if (c_oserct_ticklblposVAL === type) { + switch (this.stream.GetUChar()) { + case st_ticklblposHIGH: val.m_val = c_oAscTickLabelsPos.TICK_LABEL_POSITION_HIGH; break; + case st_ticklblposLOW: val.m_val = c_oAscTickLabelsPos.TICK_LABEL_POSITION_LOW; break; + case st_ticklblposNEXTTO: val.m_val = c_oAscTickLabelsPos.TICK_LABEL_POSITION_NEXT_TO; break; + case st_ticklblposNONE: val.m_val = c_oAscTickLabelsPos.TICK_LABEL_POSITION_NONE; break; + } + } + else + res = c_oSerConstants.ReadUnknown; + return res; +}; +BinaryChartReader.prototype.ReadCT_Crosses = function (type, length, val) { + var res = c_oSerConstants.ReadOk; + var oThis = this; + if (c_oserct_crossesVAL === type) { + switch (this.stream.GetUChar()) { + case st_crossesAUTOZERO: val.m_val = AscFormat.CROSSES_AUTO_ZERO; break; + case st_crossesMAX: val.m_val = AscFormat.CROSSES_MAX; break; + case st_crossesMIN: val.m_val = AscFormat.CROSSES_MIN; break; + } + } + else + res = c_oSerConstants.ReadUnknown; + return res; +}; +BinaryChartReader.prototype.ReadCT_Skip = function (type, length, val) { + var res = c_oSerConstants.ReadOk; + var oThis = this; + if (c_oserct_skipVAL === type) { + var oNewVal; + oNewVal = this.stream.GetULongLE(); + val.m_val = oNewVal; + } + else + res = c_oSerConstants.ReadUnknown; + return res; +}; +BinaryChartReader.prototype.ReadCT_TimeUnit = function (type, length, val) { + var res = c_oSerConstants.ReadOk; var oThis = this; - this.curChart = val; - res = this.bcr.Read1(length, function (t, l) { - return oThis.ReadCT_ChartExSpace(t, l, val); - }); - if(val){ - val.correctAxes(); + if (c_oserct_timeunitVAL === type) { + switch (this.stream.GetUChar()) { + case st_timeunitDAYS: val.m_val = AscFormat.TIME_UNIT_DAYS; break; + case st_timeunitMONTHS: val.m_val = AscFormat.TIME_UNIT_MONTHS; break; + case st_timeunitYEARS: val.m_val = AscFormat.TIME_UNIT_YEARS; break; } + } + else + res = c_oSerConstants.ReadUnknown; return res; }; -BinaryChartReader.prototype.ReadCT_ChartSpace = function (type, length, val, curWorksheet) { +BinaryChartReader.prototype.ReadCT_DateAx = function (type, length, val) { var res = c_oSerConstants.ReadOk; var oThis = this; - var oNewVal; - if (c_oserct_chartspaceDATE1904 === type) { - oNewVal = { m_val: null }; + if (c_oserct_dateaxAXID === type) { + var oNewVal = { m_val: null }; res = this.bcr.Read1(length, function (t, l) { - return oThis.ReadCT_Boolean(t, l, oNewVal); + return oThis.ReadCT_UnsignedInt(t, l, oNewVal); }); if (null != oNewVal.m_val) - val.setDate1904(oNewVal.m_val); - else - val.setDate1904(true); + val.setAxId(oNewVal.m_val); } - else if (c_oserct_chartspaceLANG === type) { - oNewVal = { m_val: null }; + else if (c_oserct_dateaxSCALING === type) { + var oNewVal = new AscFormat.CScaling(); res = this.bcr.Read1(length, function (t, l) { - return oThis.ReadCT_TextLanguageID(t, l, oNewVal); + return oThis.ReadCT_Scaling(t, l, oNewVal); }); - if (null != oNewVal.m_val) - val.setLang(oNewVal.m_val); + val.setScaling(oNewVal); } - else if (c_oserct_chartspaceROUNDEDCORNERS === type) { - oNewVal = { m_val: null }; + else if (c_oserct_dateaxDELETE === type) { + var oNewVal = { m_val: null }; res = this.bcr.Read1(length, function (t, l) { return oThis.ReadCT_Boolean(t, l, oNewVal); }); if (null != oNewVal.m_val) - val.setRoundedCorners(oNewVal.m_val); + val.setDelete(oNewVal.m_val); + else + val.setDelete(true); } - else if (c_oserct_chartspaceALTERNATECONTENT === type) { - oNewVal = {}; + else if (c_oserct_dateaxAXPOS === type) { + var oNewVal = { m_val: null }; res = this.bcr.Read1(length, function (t, l) { - return oThis.ReadAlternateContent(t, l, oNewVal); + return oThis.ReadCT_AxPos(t, l, oNewVal); }); - var nNewStyle = null; - if (null != oNewVal.m_Choice && oNewVal.m_Choice.length > 0) { - var choice = oNewVal.m_Choice[0]; - if (null != choice.m_style && null != choice.m_style.m_val) - nNewStyle = choice.m_style.m_val - 100; - } - if (null == nNewStyle && null != oNewVal.m_Fallback && null != oNewVal.m_Fallback.m_style && null != oNewVal.m_Fallback.m_style.m_val) - nNewStyle = oNewVal.m_Fallback.m_style.m_val; - if (null != nNewStyle) - val.setStyle(nNewStyle); + if (null != oNewVal.m_val) + val.setAxPos(oNewVal.m_val); } - else if (c_oserct_chartspaceSTYLE === type) { - oNewVal = { m_val: null }; + else if (c_oserct_dateaxMAJORGRIDLINES === type) { + var oNewVal = { spPr: null }; res = this.bcr.Read1(length, function (t, l) { - return oThis.ReadCT_Style1(t, l, oNewVal); + return oThis.ReadCT_ChartLines(t, l, oNewVal); }); - if (null != oNewVal.m_val) - val.setStyle(oNewVal.m_val); + if (null != oNewVal.spPr) + val.setMajorGridlines(oNewVal.spPr); + else + val.setMajorGridlines(new AscFormat.CSpPr()); } - else if (c_oserct_chartspaceCLRMAPOVR === type) { - val.setClrMapOvr(this.ReadClrOverride(length)); + else if (c_oserct_dateaxMINORGRIDLINES === type) { + var oNewVal = { spPr: null }; + res = this.bcr.Read1(length, function (t, l) { + return oThis.ReadCT_ChartLines(t, l, oNewVal); + }); + if (null != oNewVal.spPr) + val.setMinorGridlines(oNewVal.spPr); + else + val.setMinorGridlines(new AscFormat.CSpPr()); } - else if (c_oserct_chartspacePIVOTSOURCE === type) { - oNewVal = new AscFormat.CPivotSource(); + else if (c_oserct_dateaxTITLE === type) { + var oNewVal = new AscFormat.CTitle(); res = this.bcr.Read1(length, function (t, l) { - return oThis.ReadCT_PivotSource(t, l, oNewVal); + return oThis.ReadCT_Title(t, l, oNewVal); }); - val.setPivotSource(oNewVal); + if(!AscFormat.isRealBool(oNewVal.overlay)) + { + oNewVal.setOverlay(false); + } + val.setTitle(oNewVal); } - else if (c_oserct_chartspacePROTECTION === type) { - oNewVal = new AscFormat.CProtection(); + else if (c_oserct_dateaxNUMFMT === type) { + var oNewVal = new AscFormat.CNumFmt(); res = this.bcr.Read1(length, function (t, l) { - return oThis.ReadCT_Protection(t, l, oNewVal); + return oThis.ReadCT_NumFmt(t, l, oNewVal); }); - val.setProtection(oNewVal); + val.setNumFmt(oNewVal); } - else if (c_oserct_chartspaceCHART === type) { - oNewVal = new AscFormat.CChart(); + else if (c_oserct_dateaxMAJORTICKMARK === type) { + var oNewVal = { m_val: null }; res = this.bcr.Read1(length, function (t, l) { - return oThis.ReadCT_Chart(t, l, oNewVal); + return oThis.ReadCT_TickMark(t, l, oNewVal); }); - val.setChart(oNewVal); - // if(null === oNewVal.autoTitleDeleted){ - // oNewVal.setAutoTitleDeleted(false); - // } + if (null != oNewVal.m_val) + val.setMajorTickMark(oNewVal.m_val); + else{ + val.setMajorTickMark(c_oAscTickMark.TICK_MARK_CROSS); } - else if (c_oserct_chartspaceSPPR === type) { + } + else if (c_oserct_dateaxMINORTICKMARK === type) { + var oNewVal = { m_val: null }; + res = this.bcr.Read1(length, function (t, l) { + return oThis.ReadCT_TickMark(t, l, oNewVal); + }); + if (null != oNewVal.m_val) + val.setMinorTickMark(oNewVal.m_val); + else{ + val.setMajorTickMark(c_oAscTickMark.TICK_MARK_CROSS); + } + } + else if (c_oserct_dateaxTICKLBLPOS === type) { + var oNewVal = { m_val: null }; + res = this.bcr.Read1(length, function (t, l) { + return oThis.ReadCT_TickLblPos(t, l, oNewVal); + }); + if (null != oNewVal.m_val) + val.setTickLblPos(oNewVal.m_val); + } + else if (c_oserct_dateaxSPPR === type) { val.setSpPr(this.ReadSpPr(length)); - val.spPr.setParent(val); } - else if (c_oserct_chartspaceTXPR === type) { + else if (c_oserct_dateaxTXPR === type) { val.setTxPr(this.ReadTxPr(length)); val.txPr.setParent(val); } - //else if (c_oserct_chartspaceEXTERNALDATA === type) { - // oNewVal; - // oNewVal = {}; - // res = this.bcr.Read1(length, function (t, l) { - // return oThis.ReadCT_ExternalData(t, l, oNewVal); - // }); - // val.m_externalData = oNewVal; - //} - else if (c_oserct_chartspacePRINTSETTINGS === type) { - oNewVal = new AscFormat.CPrintSettings(); + else if (c_oserct_dateaxCROSSAX === type) { + var oNewVal = { m_val: null }; res = this.bcr.Read1(length, function (t, l) { - return oThis.ReadCT_PrintSettings(t, l, oNewVal); + return oThis.ReadCT_UnsignedInt(t, l, oNewVal); }); - val.setPrintSettings(oNewVal); + + if (null != oNewVal.m_val) + { + val.crossAxId = oNewVal.m_val; + } } - else if (c_oserct_chartspaceUSERSHAPES === type) { - res = this.bcr.Read1(length, function (t, l) { - return oThis.ReadCT_UserShapes(t, l, val); - }); + else if (c_oserct_dateaxCROSSES === type) { + var oNewVal = { m_val: null }; + res = this.bcr.Read1(length, function (t, l) { + return oThis.ReadCT_Crosses(t, l, oNewVal); + }); + if (null != oNewVal.m_val) + val.setCrosses(oNewVal.m_val); } - else if (c_oserct_chartspaceEXTLST === type) { - oNewVal = {}; + else if (c_oserct_dateaxCROSSESAT === type) { + var oNewVal = { m_val: null }; res = this.bcr.Read1(length, function (t, l) { - return oThis.ReadCT_extLst(t, l, oNewVal); + return oThis.ReadCT_Double(t, l, oNewVal); }); - // val.m_extLst = oNewVal; + if (null != oNewVal.m_val) + val.setCrossesAt(oNewVal.m_val); } - else if (c_oserct_chartspaceTHEMEOVERRIDE === type) { - var theme = AscCommon.pptx_content_loader.ReadTheme(this, this.stream); - if (null != theme) - val.setThemeOverride(theme); + else if (c_oserct_dateaxAUTO === type) { + var oNewVal = { m_val: null }; + res = this.bcr.Read1(length, function (t, l) { + return oThis.ReadCT_Boolean(t, l, oNewVal); + }); + if (null != oNewVal.m_val) + val.setAuto(oNewVal.m_val); } - else if(c_oserct_chartspaceXLSX === type) { - //todo - res = c_oSerConstants.ReadUnknown; + else if (c_oserct_dateaxLBLOFFSET === type) { + var oNewVal = { m_val: null }; + res = this.bcr.Read1(length, function (t, l) { + return oThis.ReadCT_LblOffset(t, l, oNewVal); + }); + if (null != oNewVal.m_val) + val.setLblOffset(oNewVal.m_val); } - else if(c_oserct_chartspaceSTYLES === type) { - this.curChart.oChartStyleData = AscCommon.fSaveStream(this.bcr.stream, length); - oNewVal = new AscFormat.CChartStyle(); + else if (c_oserct_dateaxBASETIMEUNIT === type) { + var oNewVal = { m_val: null }; res = this.bcr.Read1(length, function (t, l) { - return oThis.ReadCT_ChartStyle(t, l, oNewVal); + return oThis.ReadCT_TimeUnit(t, l, oNewVal); }); - if(oNewVal) { - val.setChartStyle(oNewVal); - } + // if (null != oNewVal.m_val) { + // val.setMinorTimeUnit(oNewVal.m_val); } - else if(c_oserct_chartspaceCOLORS === type) { - this.curChart.oChartColorsData = AscCommon.fSaveStream(this.bcr.stream, length); - oNewVal = new AscFormat.CChartColors(); + else if (c_oserct_dateaxMAJORUNIT === type) { + var oNewVal = { m_val: null }; res = this.bcr.Read1(length, function (t, l) { - return oThis.ReadCT_ChartColors(t, l, oNewVal); + return oThis.ReadCT_AxisUnit(t, l, oNewVal); + }); + // if (null != oNewVal.m_val) + // val.setMajorUnit(oNewVal.m_val); + } + else if (c_oserct_dateaxMAJORTIMEUNIT === type) { + var oNewVal = { m_val: null }; + res = this.bcr.Read1(length, function (t, l) { + return oThis.ReadCT_TimeUnit(t, l, oNewVal); + }); + // if (null != oNewVal.m_val) { + // val.setMinorTimeUnit(oNewVal.m_val); + } + else if (c_oserct_dateaxMINORUNIT === type) { + var oNewVal = { m_val: null }; + res = this.bcr.Read1(length, function (t, l) { + return oThis.ReadCT_AxisUnit(t, l, oNewVal); + }); + // if (null != oNewVal.m_val) + // val.setMinorUnit(oNewVal.m_val); + } + else if (c_oserct_dateaxMINORTIMEUNIT === type) { + var oNewVal = { m_val: null }; + res = this.bcr.Read1(length, function (t, l) { + return oThis.ReadCT_TimeUnit(t, l, oNewVal); }); - if(oNewVal) { - val.setChartColors(oNewVal); - } + // if (null != oNewVal.m_val) + // val.setMinorTimeUnit(oNewVal.m_val); } - else if(c_oserct_chartspaceCHARTDATA === type) { + else if (c_oserct_dateaxEXTLST === type) { + var oNewVal; oNewVal = {}; res = this.bcr.Read1(length, function (t, l) { - return oThis.ReadCT_ChartData(t, l, oNewVal); // todoo this class + return oThis.ReadCT_extLst(t, l, oNewVal); }); + // val.m_extLst = oNewVal; } - else { + else res = c_oSerConstants.ReadUnknown; - } return res; }; -BinaryChartReader.prototype.ReadCT_ChartExSpace = function (type, length, val) { +BinaryChartReader.prototype.ReadCT_LblOffset = function (type, length, val) { var res = c_oSerConstants.ReadOk; var oThis = this; - var oNewVal; - if(c_oserct_chartExSpaceCHARTDATA === type) - { - oNewVal = {}; - res = this.bcr.Read1(length, function (t, l) { - return oThis.ReadCT_ChartData(t, l, oNewVal); // todoo this class - }); - } - else if (c_oserct_chartExSpaceCHART === type) { - oNewVal = new AscFormat.CChartEx(); - res = this.bcr.Read1(length, function (t, l) { - return oThis.ReadCT_ChartEx(t, l, oNewVal); - }); - val.setChart(oNewVal); - } - else if (c_oserct_chartExSpaceSPPR === type) { - val.setSpPr(this.ReadSpPr(length)); - val.spPr.setParent(val); + if (c_oserct_lbloffsetVAL === type) { + val.m_val = this.ParsePersent(this.stream.GetString2LE(length)); } - else if (c_oserct_chartExSpaceTXPR === type) { - val.setTxPr(this.ReadTxPr(length)); - val.txPr.setParent(val); - } - else if (c_oserct_chartExspaceCLRMAPOVR === type) { - val.setClrMapOvr(this.ReadClrOverride(length)); - } - // else if(c_oserct_chartExSpaceXLSX === type) { - // //todo - // res = c_oSerConstants.ReadUnknown; - // } - // else if(c_oserct_chartExSpaceCOLORS === type) { - // this.curChart.oChartColorsData = AscCommon.fSaveStream(this.bcr.stream, length); - // oNewVal = new AscFormat.CChartColors(); - // res = this.bcr.Read1(length, function (t, l) { - // return oThis.ReadCT_ChartColors(t, l, oNewVal); - // }); - // val.setChartColors(oNewVal); - // } - // else if(c_oserct_chartExSpaceSTYLES === type) { - // this.curChart.oChartStyleData = AscCommon.fSaveStream(this.bcr.stream, length); - // oNewVal = new AscFormat.CChartStyle(); - // res = this.bcr.Read1(length, function (t, l) { - // return oThis.ReadCT_ChartStyle(t, l, oNewVal); - // }); - // val.setChartStyle(oNewVal); - // } else - { res = c_oSerConstants.ReadUnknown; - } return res; }; -BinaryChartReader.prototype.ReadSpPr = function (length) { - return AscCommon.pptx_content_loader.ReadShapeProperty(this.stream); -}; - -BinaryChartReader.prototype.ReadClrOverride = function(lenght) -{ - var loader = new AscCommon.BinaryPPTYLoader(); - - loader.stream = new AscCommon.FileStream(); - loader.stream.obj = this.stream.obj; - loader.stream.data = this.stream.data; - loader.stream.size = this.stream.size; - - loader.stream.pos = this.stream.pos; - loader.stream.cur = this.stream.cur; - var s = loader.stream; - var _main_type = s.GetUChar(); // 0!!! - - var clr_map = new AscFormat.ClrMap(); - loader.ReadClrMap(clr_map); - - this.stream.pos = s.pos; - this.stream.cur = s.cur; - return clr_map; - -}; - -BinaryChartReader.prototype.ReadTxPr = function (length) { - var cur = this.stream.cur; - var ret = AscCommon.pptx_content_loader.ReadTextBody(null, this.stream, null, this.curWorksheet, this.drawingDocument); - this.stream.cur = cur + length; - return ret; -}; -BinaryChartReader.prototype.ParsePersent = function (val) { - var nVal = parseFloat(val); - if (!isNaN(nVal)) - return nVal; - else - return null; -}; -BinaryChartReader.prototype.ParseMetric = function (val) { - var nVal = parseFloat(val); - var nRes = null; - if (!isNaN(nVal)) { - if (-1 != val.indexOf("mm")) - nRes = nVal; - else if (-1 != val.indexOf("cm")) - nRes = nVal * 10; - else if (-1 != val.indexOf("in")) - nRes = nVal * 2.54 * 10; - else if (-1 != val.indexOf("pt")) - nRes = nVal * 2.54 * 10 / 72; - else if (-1 != val.indexOf("pc") || -1 != val.indexOf("pi")) - nRes = nVal * 12 * 2.54 * 10 / 72; - } - return nRes; -}; -BinaryChartReader.prototype.CorrectChartWithAxis = function (chartOld, chartNew, aChartWithAxis) { - for (var i = 0, length = aChartWithAxis.length; i < length; ++i) { - var item = aChartWithAxis[i]; - if (item.chart == chartOld) - item.chart = chartNew; - } -}; -BinaryChartReader.prototype.ReadCT_Boolean = function (type, length, val) { +BinaryChartReader.prototype.ReadCT_AxisUnit = function (type, length, val) { var res = c_oSerConstants.ReadOk; var oThis = this; - if (c_oserct_booleanVAL === type) { + if (c_oserct_axisunitVAL === type) { var oNewVal; - oNewVal = this.stream.GetBool(); + oNewVal = this.stream.GetDoubleLE(); val.m_val = oNewVal; } else res = c_oSerConstants.ReadUnknown; return res; }; -BinaryChartReader.prototype.ExternalReadCT_RelId = function (length, val) { - var res = c_oSerConstants.ReadOk; - var oThis = this; - res = this.bcr.Read1(length, function (t, l) { - return oThis.ReadCT_RelId(t, l, val); - }); - return res; -}; -BinaryChartReader.prototype.ReadCT_RelId = function (type, length, val) { +BinaryChartReader.prototype.ReadCT_LblAlgn = function (type, length, val) { var res = c_oSerConstants.ReadOk; var oThis = this; - if (c_oserct_relidID === type) { - //todo - var oNewVal; - oNewVal = this.stream.GetString2LE(length); - val.m_id = oNewVal; + if (c_oserct_lblalgnVAL === type) { + switch (this.stream.GetUChar()) { + case st_lblalgnCTR: val.m_val = AscFormat.LBL_ALG_CTR; break; + case st_lblalgnL: val.m_val = AscFormat.LBL_ALG_L; break; + case st_lblalgnR: val.m_val = AscFormat.LBL_ALG_R; break; + } } else res = c_oSerConstants.ReadUnknown; return res; }; -BinaryChartReader.prototype.ReadCT_UserShapes = function (type, length, val) { +BinaryChartReader.prototype.ReadCT_CatAx = function (type, length, val) { var res = c_oSerConstants.ReadOk; var oThis = this; - var nCount; - if (c_oserct_usershapes_COUNT === type) { - nCount = this.stream.GetULongLE(); - } - else if(c_oserct_usershapes_SHAPE_REL){ - var oNewVal = new AscFormat.CRelSizeAnchor(); + if (c_oserct_cataxAXID === type) { + var oNewVal = { m_val: null }; res = this.bcr.Read1(length, function (t, l) { - return oThis.ReadCT_userShape(t, l, oNewVal); + return oThis.ReadCT_UnsignedInt(t, l, oNewVal); }); - val.addUserShape(undefined, oNewVal); + if (null != oNewVal.m_val) + val.setAxId(oNewVal.m_val); } - else if(c_oserct_usershapes_SHAPE_ABS){ - var oNewVal = new AscFormat.CAbsSizeAnchor(); + else if (c_oserct_cataxSCALING === type) { + var oNewVal = new AscFormat.CScaling(); res = this.bcr.Read1(length, function (t, l) { - return oThis.ReadCT_userShape(t, l, oNewVal); + return oThis.ReadCT_Scaling(t, l, oNewVal); }); - val.addUserShape(undefined, oNewVal); - } - else - res = c_oSerConstants.ReadUnknown; - return res; -}; - -BinaryChartReader.prototype.ReadCT_ChartStyle = function (type, length, val) { - var res = c_oSerConstants.ReadOk; - var oThis = this; - var oNewVal; - if(c_oserct_chartstyleID === type) { - val.setId(this.stream.GetULongLE()); + val.setScaling(oNewVal); } - else if (c_oserct_chartstyleENTRY === type) { - oNewVal = new AscFormat.CStyleEntry(); + else if (c_oserct_cataxDELETE === type) { + var oNewVal = { m_val: null }; res = this.bcr.Read1(length, function (t, l) { - return oThis.ReadCT_StyleEntry(t, l, oNewVal); + return oThis.ReadCT_Boolean(t, l, oNewVal); }); - if(res === c_oSerConstants.ReadOk) { - val.addEntry(oNewVal); - } + if (null != oNewVal.m_val) + val.setDelete(oNewVal.m_val); + else + val.setDelete(true); } - else if (c_oserct_chartstyleMARKERLAYOUT === type) { - oNewVal = new AscFormat.CMarkerLayout(); + else if (c_oserct_cataxAXPOS === type) { + var oNewVal = { m_val: null }; res = this.bcr.Read1(length, function (t, l) { - return oThis.ReadCT_MarkerLayout(t, l, oNewVal); + return oThis.ReadCT_AxPos(t, l, oNewVal); }); - if(res === c_oSerConstants.ReadOk) { - val.setMarkerLayout(oNewVal); - } - } - else { - res = c_oSerConstants.ReadUnknown; - } - return res; -}; -BinaryChartReader.prototype.ReadCT_StyleEntry = function (type, length, val) { - var res = c_oSerConstants.ReadOk; - var oNewVal; - if (c_oserct_chartstyleENTRYTYPE == type) - { - val.setType(this.stream.GetUChar()); + if (null != oNewVal.m_val) + val.setAxPos(oNewVal.m_val); } - else if (c_oserct_chartstyleLNREF == type) - { - oNewVal = AscCommon.pptx_content_loader.ReadStyleRef(this, this.stream); - if(oNewVal) - { - val.setLnRef(oNewVal); - } + else if (c_oserct_cataxMAJORGRIDLINES === type) { + var oNewVal = { spPr: null }; + res = this.bcr.Read1(length, function (t, l) { + return oThis.ReadCT_ChartLines(t, l, oNewVal); + }); + if (null != oNewVal.spPr) + val.setMajorGridlines(oNewVal.spPr); + else + val.setMajorGridlines(new AscFormat.CSpPr()); } - else if (c_oserct_chartstyleFILLREF == type) - { - oNewVal = AscCommon.pptx_content_loader.ReadStyleRef(this, this.stream); - if(oNewVal) - { - val.setFillRef(oNewVal); - } + else if (c_oserct_cataxMINORGRIDLINES === type) { + var oNewVal = { spPr: null }; + res = this.bcr.Read1(length, function (t, l) { + return oThis.ReadCT_ChartLines(t, l, oNewVal); + }); + if (null != oNewVal.spPr) + val.setMinorGridlines(oNewVal.spPr); + else + val.setMinorGridlines(new AscFormat.CSpPr()); } - else if (c_oserct_chartstyleEFFECTREF == type) - { - oNewVal = AscCommon.pptx_content_loader.ReadStyleRef(this, this.stream); - if(oNewVal) + else if (c_oserct_cataxTITLE === type) { + var oNewVal = new AscFormat.CTitle(); + res = this.bcr.Read1(length, function (t, l) { + return oThis.ReadCT_Title(t, l, oNewVal); + }); + if(!AscFormat.isRealBool(oNewVal.overlay)) { - val.setEffectRef(oNewVal); + oNewVal.setOverlay(true); } + val.setTitle(oNewVal); } - else if (c_oserct_chartstyleFONTREF == type) - { - oNewVal = AscCommon.pptx_content_loader.ReadFontRef(this, this.stream); - if(oNewVal) - { - val.setFontRef(oNewVal); - } + else if (c_oserct_cataxNUMFMT === type) { + var oNewVal = new AscFormat.CNumFmt(); + res = this.bcr.Read1(length, function (t, l) { + return oThis.ReadCT_NumFmt(t, l, oNewVal); + }); + val.setNumFmt(oNewVal); } - else if (c_oserct_chartstyleDEFPR == type) - { - oNewVal = AscCommon.pptx_content_loader.ReadRunProperties(this.stream, 0); - if(oNewVal) - { - val.setDefRPr(oNewVal); + else if (c_oserct_cataxMAJORTICKMARK === type) { + var oNewVal = { m_val: null }; + res = this.bcr.Read1(length, function (t, l) { + return oThis.ReadCT_TickMark(t, l, oNewVal); + }); + if (null != oNewVal.m_val) + val.setMajorTickMark(oNewVal.m_val); + else{ + val.setMajorTickMark(c_oAscTickMark.TICK_MARK_CROSS); } } - else if (c_oserct_chartstyleBODYPR == type) - { - oNewVal = AscCommon.pptx_content_loader.ReadBodyPr(this, this.stream); - if(oNewVal) - { - val.setBodyPr(oNewVal); + else if (c_oserct_cataxMINORTICKMARK === type) { + var oNewVal = { m_val: null }; + res = this.bcr.Read1(length, function (t, l) { + return oThis.ReadCT_TickMark(t, l, oNewVal); + }); + if (null != oNewVal.m_val) + val.setMinorTickMark(oNewVal.m_val); + else{ + val.setMajorTickMark(c_oAscTickMark.TICK_MARK_CROSS); } } - else if (c_oserct_chartstyleSPPR == type) - { + else if (c_oserct_cataxTICKLBLPOS === type) { + var oNewVal = { m_val: null }; + res = this.bcr.Read1(length, function (t, l) { + return oThis.ReadCT_TickLblPos(t, l, oNewVal); + }); + if (null != oNewVal.m_val) + val.setTickLblPos(oNewVal.m_val); + } + else if (c_oserct_cataxSPPR === type) { val.setSpPr(this.ReadSpPr(length)); } - else if (c_oserct_chartstyleLINEWIDTH == type) - { - val.setLineWidthScale(this.stream.GetDoubleLE()); + else if (c_oserct_cataxTXPR === type) { + val.setTxPr(this.ReadTxPr(length)); + val.txPr.setParent(val); } - else - { - res = c_oSerConstants.ReadUnknown; + else if (c_oserct_cataxCROSSAX === type) { + var oNewVal = { m_val: null }; + res = this.bcr.Read1(length, function (t, l) { + return oThis.ReadCT_UnsignedInt(t, l, oNewVal); + }); + if (null != oNewVal.m_val) + { + val.crossAxId = oNewVal.m_val; + } } - return res; -}; -BinaryChartReader.prototype.ReadCT_MarkerLayout = function (type, length, val) { - var res = c_oSerConstants.ReadOk; - var oThis = this; - if (c_oserct_chartstyleMARKERSYMBOL == type) - { - val.setSymbol(this.MarkerStyleToFormat(this.stream.GetUChar())); + else if (c_oserct_cataxCROSSES === type) { + var oNewVal = { m_val: null }; + res = this.bcr.Read1(length, function (t, l) { + return oThis.ReadCT_Crosses(t, l, oNewVal); + }); + if (null != oNewVal.m_val) + val.setCrosses(oNewVal.m_val); + } - else if (c_oserct_chartstyleMARKERSIZE == type) - { - val.setSize(this.stream.GetULongLE()); + else if (c_oserct_cataxCROSSESAT === type) { + var oNewVal = { m_val: null }; + res = this.bcr.Read1(length, function (t, l) { + return oThis.ReadCT_Double(t, l, oNewVal); + }); + if (null != oNewVal.m_val) + val.setCrossesAt(oNewVal.m_val); } - else - { - res = c_oSerConstants.ReadUnknown; + else if (c_oserct_cataxAUTO === type) { + var oNewVal = { m_val: null }; + res = this.bcr.Read1(length, function (t, l) { + return oThis.ReadCT_Boolean(t, l, oNewVal); + }); + if (null != oNewVal.m_val) + val.setAuto(oNewVal.m_val); } - return res; -}; -BinaryChartReader.prototype.ReadCT_ChartColors = function (type, length, val) { - var res = c_oSerConstants.ReadOk; - var oThis = this; - var oNewVal; - if (c_oserct_chartcolorsID === type) - { - val.setId(this.stream.GetULongLE()); + else if (c_oserct_cataxLBLALGN === type) { + var oNewVal = { m_val: null }; + res = this.bcr.Read1(length, function (t, l) { + return oThis.ReadCT_LblAlgn(t, l, oNewVal); + }); + if (null != oNewVal.m_val) + val.setLblAlgn(oNewVal.m_val); } - else if (c_oserct_chartcolorsMETH === type) - { - val.setMeth(this.stream.GetString2LE(length)); + else if (c_oserct_cataxLBLOFFSET === type) { + var oNewVal = { m_val: null }; + res = this.bcr.Read1(length, function (t, l) { + return oThis.ReadCT_LblOffset(t, l, oNewVal); + }); + if (null != oNewVal.m_val) + val.setLblOffset(oNewVal.m_val); } - else if(c_oserct_chartcolorsVARIATION === type) - { - oNewVal = new AscFormat.CColorModifiers(); + else if (c_oserct_cataxTICKLBLSKIP === type) { + var oNewVal = { m_val: null }; res = this.bcr.Read1(length, function (t, l) { - return oThis.ReadCT_ColorsVariation(t, l, oNewVal); + return oThis.ReadCT_Skip(t, l, oNewVal); }); - val.addItem(oNewVal); + if (null != oNewVal.m_val) + val.setTickLblSkip(oNewVal.m_val); } - else if(c_oserct_chartcolorsCOLOR === type) - { - oNewVal = AscCommon.pptx_content_loader.ReadUniColor(this, this.stream); - if(oNewVal) - { - val.addItem(oNewVal); - } + else if (c_oserct_cataxTICKMARKSKIP === type) { + var oNewVal = { m_val: null }; + res = this.bcr.Read1(length, function (t, l) { + return oThis.ReadCT_Skip(t, l, oNewVal); + }); + if (null != oNewVal.m_val) + val.setTickMarkSkip(oNewVal.m_val); } - else - { - res = c_oSerConstants.ReadUnknown; + else if (c_oserct_cataxNOMULTILVLLBL === type) { + var oNewVal = { m_val: null }; + res = this.bcr.Read1(length, function (t, l) { + return oThis.ReadCT_Boolean(t, l, oNewVal); + }); + if (null != oNewVal.m_val) + val.setNoMultiLvlLbl(oNewVal.m_val); } - return res; -}; -BinaryChartReader.prototype.ReadCT_ColorsVariation = function (type, length, val) -{ - var res = c_oSerConstants.ReadOk; - if (c_oserct_chartcolorsEFFECT === type) - { - var oMod = AscCommon.pptx_content_loader.ReadColorMod(this, this.stream); - if(oMod) - { - val.addMod(oMod); - } + else if (c_oserct_cataxEXTLST === type) { + var oNewVal; + oNewVal = {}; + res = this.bcr.Read1(length, function (t, l) { + return oThis.ReadCT_extLst(t, l, oNewVal); + }); + // val.m_extLst = oNewVal; } else - { res = c_oSerConstants.ReadUnknown; - } return res; }; - -BinaryChartReader.prototype.ReadCT_FromTo = function(type, length, poResult) -{ +BinaryChartReader.prototype.ReadCT_DispUnitsLbl = function (type, length, val) { var res = c_oSerConstants.ReadOk; - if(Asc.c_oSer_DrawingPosType.X == type) - { - poResult.x = this.stream.GetDoubleLE(); - } - else if(Asc.c_oSer_DrawingPosType.Y == type) - { - poResult.y = this.stream.GetDoubleLE(); - } - else - res = c_oSerConstants.ReadUnknown; - return res; -}; -BinaryChartReader.prototype.ReadCT_userShape = function(type, length, poResult) -{ var oThis = this; - - var res = c_oSerConstants.ReadOk; - if(Asc.c_oSer_DrawingType.From == type) - { - var oNewVal = {}; - res = this.bcr.Read2Spreadsheet(length, function (t, l) { - return oThis.ReadCT_FromTo(t, l, oNewVal); + if (c_oserct_dispunitslblLAYOUT === type) { + res = this.bcr.Read1(length, function (t, l) { + return oThis.ReadCT_Layout(t, l, val); }); - poResult.setFromTo(oNewVal.x, oNewVal.y, poResult.toX, poResult.toY); } - else if(Asc.c_oSer_DrawingType.To == type) - { - var oNewVal = {}; - res = this.bcr.Read2Spreadsheet(length, function (t, l) { - return oThis.ReadCT_FromTo(t, l, oNewVal); + else if (c_oserct_dispunitslblTX === type) { + var oNewVal = new AscFormat.CChartText(); + res = this.bcr.Read1(length, function (t, l) { + return oThis.ReadCT_Tx(t, l, oNewVal); }); - poResult.setFromTo( poResult.fromX, poResult.fromY, oNewVal.x, oNewVal.y); + oNewVal.setChart(this.curChart); + val.setTx(oNewVal); } - else if(Asc.c_oSer_DrawingType.Ext == type) - { - var oNewVal = {}; - res = this.bcr.Read2Spreadsheet(length, function (t, l) { - return oThis.ReadCT_FromTo(t, l, oNewVal); - }); - poResult.setFromTo( poResult.fromX, poResult.fromY, oNewVal.x, oNewVal.y); + else if (c_oserct_dispunitslblSPPR === type) { + val.setSpPr(this.ReadSpPr(length)); } - else if(Asc.c_oSer_DrawingType.pptxDrawing == type) - { - var oGraphicObject = AscCommon.pptx_content_loader.ReadGraphicObject(this.stream, this.curWorksheet, this.drawingDocument); - poResult.setObject(oGraphicObject); - // oGraphicObject.createTextBody(); - // oGraphicObject.txBody.content.AddText("Test user Shapes"); + else if (c_oserct_dispunitslblTXPR === type) { + val.setTxPr(this.ReadTxPr(length)); + val.txPr.setParent(val); } else res = c_oSerConstants.ReadUnknown; return res; }; -BinaryChartReader.prototype.ReadCT_PageSetup = function (type, length, val) { +BinaryChartReader.prototype.ReadCT_BuiltInUnit = function (type, length, val) { var res = c_oSerConstants.ReadOk; var oThis = this; - if (c_oserct_pagesetupPAPERSIZE === type) { - val.setPaperSize(this.stream.GetULongLE()); - } - else if (c_oserct_pagesetupPAPERHEIGHT === type) { - var mm = this.ParseMetric(this.stream.GetString2LE(length)); - if (null != mm) - val.setPaperHeight(mm); - } - else if (c_oserct_pagesetupPAPERWIDTH === type) { - var mm = this.ParseMetric(this.stream.GetString2LE(length)); - if (null != mm) - val.setPaperWidth(mm); - } - else if (c_oserct_pagesetupFIRSTPAGENUMBER === type) { - val.setFirstPageNumber(this.stream.GetULongLE()); - } - else if (c_oserct_pagesetupORIENTATION === type) { + if (c_oserct_builtinunitVAL === type) { switch (this.stream.GetUChar()) { - case st_pagesetuporientationDEFAULT: val.setOrientation(AscFormat.PAGE_SETUP_ORIENTATION_DEFAULT); break; - case st_pagesetuporientationPORTRAIT: val.setOrientation(AscFormat.PAGE_SETUP_ORIENTATION_PORTRAIT); break; - case st_pagesetuporientationLANDSCAPE: val.setOrientation(AscFormat.PAGE_SETUP_ORIENTATION_LANDSCAPE); break; + case st_builtinunitHUNDREDS: val.m_val = c_oAscValAxUnits.HUNDREDS; break; + case st_builtinunitTHOUSANDS: val.m_val = c_oAscValAxUnits.THOUSANDS; break; + case st_builtinunitTENTHOUSANDS: val.m_val = c_oAscValAxUnits.TEN_THOUSANDS; break; + case st_builtinunitHUNDREDTHOUSANDS: val.m_val = c_oAscValAxUnits.HUNDRED_THOUSANDS; break; + case st_builtinunitMILLIONS: val.m_val = c_oAscValAxUnits.MILLIONS; break; + case st_builtinunitTENMILLIONS: val.m_val = c_oAscValAxUnits.TEN_MILLIONS; break; + case st_builtinunitHUNDREDMILLIONS: val.m_val = c_oAscValAxUnits.HUNDRED_MILLIONS; break; + case st_builtinunitBILLIONS: val.m_val = c_oAscValAxUnits.BILLIONS; break; + case st_builtinunitTRILLIONS: val.m_val = c_oAscValAxUnits.TRILLIONS; break; } } - else if (c_oserct_pagesetupBLACKANDWHITE === type) { - val.setBlackAndWhite(this.stream.GetBool()); - } - else if (c_oserct_pagesetupDRAFT === type) { - val.setBlackAndWhite(this.stream.GetBool()); - } - else if (c_oserct_pagesetupUSEFIRSTPAGENUMBER === type) { - val.setUseFirstPageNumb(this.stream.GetBool()); - } - else if (c_oserct_pagesetupHORIZONTALDPI === type) { - val.setHorizontalDpi(this.stream.GetULongLE()); - } - else if (c_oserct_pagesetupVERTICALDPI === type) { - val.setVerticalDpi(this.stream.GetULongLE()); - } - else if (c_oserct_pagesetupCOPIES === type) { - val.setCopies(this.stream.GetULongLE()); - } else res = c_oSerConstants.ReadUnknown; return res; }; -BinaryChartReader.prototype.ReadCT_PageMargins = function (type, length, val) { +BinaryChartReader.prototype.ReadCT_DispUnits = function (type, length, val) { var res = c_oSerConstants.ReadOk; var oThis = this; - if (c_oserct_pagemarginsL === type) { - val.setL(this.stream.GetDoubleLE()); - } - else if (c_oserct_pagemarginsR === type) { - val.setR(this.stream.GetDoubleLE()); + if (c_oserct_dispunitsBUILTINUNIT === type) { + var oNewVal = { m_val: null }; + res = this.bcr.Read1(length, function (t, l) { + return oThis.ReadCT_BuiltInUnit(t, l, oNewVal); + }); + if (null != oNewVal.m_val) + val.setBuiltInUnit(oNewVal.m_val); } - else if (c_oserct_pagemarginsT === type) { - val.setT(this.stream.GetDoubleLE()); + else if (c_oserct_dispunitsCUSTUNIT === type) { + var oNewVal = { m_val: null }; + res = this.bcr.Read1(length, function (t, l) { + return oThis.ReadCT_Double(t, l, oNewVal); + }); + if (null != oNewVal.m_val) + val.setCustUnit(oNewVal.m_val); } - else if (c_oserct_pagemarginsB === type) { - val.setB(this.stream.GetDoubleLE()); + else if (c_oserct_dispunitsDISPUNITSLBL === type) { + var oNewVal = new AscFormat.CDLbl(); + res = this.bcr.Read1(length, function (t, l) { + return oThis.ReadCT_DispUnitsLbl(t, l, oNewVal); + }); + oNewVal.correctValues(); + val.setDispUnitsLbl(oNewVal); } - else if (c_oserct_pagemarginsHEADER === type) { - val.setHeader(this.stream.GetDoubleLE()); + else if (c_oserct_dispunitsEXTLST === type) { + var oNewVal; + oNewVal = {}; + res = this.bcr.Read1(length, function (t, l) { + return oThis.ReadCT_extLst(t, l, oNewVal); + }); + // val.m_extLst = oNewVal; } - else if (c_oserct_pagemarginsFOOTER === type) { - val.setFooter(this.stream.GetDoubleLE()); + else + res = c_oSerConstants.ReadUnknown; + return res; +}; +BinaryChartReader.prototype.ReadCT_CrossBetween = function (type, length, val) { + var res = c_oSerConstants.ReadOk; + var oThis = this; + if (c_oserct_crossbetweenVAL === type) { + switch (this.stream.GetUChar()) { + case st_crossbetweenBETWEEN: val.m_val = AscFormat.CROSS_BETWEEN_BETWEEN; break; + case st_crossbetweenMIDCAT: val.m_val = AscFormat.CROSS_BETWEEN_MID_CAT; break; + } } else res = c_oSerConstants.ReadUnknown; return res; }; -BinaryChartReader.prototype.ReadCT_HeaderFooter = function (type, length, val) { +BinaryChartReader.prototype.ReadCT_ValAx = function (type, length, val) { var res = c_oSerConstants.ReadOk; var oThis = this; - if (c_oserct_headerfooterODDHEADER === type) { - val.setOddHeader(this.stream.GetString2LE(length)); + if (c_oserct_valaxAXID === type) { + var oNewVal = { m_val: null }; + res = this.bcr.Read1(length, function (t, l) { + return oThis.ReadCT_UnsignedInt(t, l, oNewVal); + }); + if (null != oNewVal.m_val) + val.setAxId(oNewVal.m_val); } - else if (c_oserct_headerfooterODDFOOTER === type) { - val.setOddFooter(this.stream.GetString2LE(length)); + else if (c_oserct_valaxSCALING === type) { + var oNewVal = new AscFormat.CScaling(); + res = this.bcr.Read1(length, function (t, l) { + return oThis.ReadCT_Scaling(t, l, oNewVal); + }); + val.setScaling(oNewVal); } - else if (c_oserct_headerfooterEVENHEADER === type) { - val.setEvenHeader(this.stream.GetString2LE(length)); + else if (c_oserct_valaxDELETE === type) { + var oNewVal = { m_val: null }; + res = this.bcr.Read1(length, function (t, l) { + return oThis.ReadCT_Boolean(t, l, oNewVal); + }); + if (null != oNewVal.m_val) + val.setDelete(oNewVal.m_val); + else + val.setDelete(true); } - else if (c_oserct_headerfooterEVENFOOTER === type) { - val.setEvenFooter(this.stream.GetString2LE(length)); + else if (c_oserct_valaxAXPOS === type) { + var oNewVal = { m_val: null }; + res = this.bcr.Read1(length, function (t, l) { + return oThis.ReadCT_AxPos(t, l, oNewVal); + }); + if (null != oNewVal.m_val) + val.setAxPos(oNewVal.m_val); } - else if (c_oserct_headerfooterFIRSTHEADER === type) { - val.setFirstHeader(this.stream.GetString2LE(length)); + else if (c_oserct_valaxMAJORGRIDLINES === type) { + var oNewVal = { spPr: null }; + res = this.bcr.Read1(length, function (t, l) { + return oThis.ReadCT_ChartLines(t, l, oNewVal); + }); + if (null != oNewVal.spPr) + val.setMajorGridlines(oNewVal.spPr); + else + val.setMajorGridlines(new AscFormat.CSpPr()); } - else if (c_oserct_headerfooterFIRSTFOOTER === type) { - val.setFirstFooter(this.stream.GetString2LE(length)); + else if (c_oserct_valaxMINORGRIDLINES === type) { + var oNewVal = { spPr: null }; + res = this.bcr.Read1(length, function (t, l) { + return oThis.ReadCT_ChartLines(t, l, oNewVal); + }); + if (null != oNewVal.spPr) + val.setMinorGridlines(oNewVal.spPr); + else + val.setMinorGridlines(new AscFormat.CSpPr()); } - else if (c_oserct_headerfooterALIGNWITHMARGINS === type) { - val.setAlignWithMargins(this.stream.GetBool()); + else if (c_oserct_valaxTITLE === type) { + var oNewVal = new AscFormat.CTitle(); + res = this.bcr.Read1(length, function (t, l) { + return oThis.ReadCT_Title(t, l, oNewVal); + }); + if(!AscFormat.isRealBool(oNewVal.overlay)) + { + oNewVal.setOverlay(true); + } + val.setTitle(oNewVal); } - else if (c_oserct_headerfooterDIFFERENTODDEVEN === type) { - val.setDifferentOddEven(this.stream.GetBool()); + else if (c_oserct_valaxNUMFMT === type) { + var oNewVal = new AscFormat.CNumFmt(); + res = this.bcr.Read1(length, function (t, l) { + return oThis.ReadCT_NumFmt(t, l, oNewVal); + }); + val.setNumFmt(oNewVal); } - else if (c_oserct_headerfooterDIFFERENTFIRST === type) { - val.setDifferentFirst(this.stream.GetBool()); + else if (c_oserct_valaxMAJORTICKMARK === type) { + var oNewVal = { m_val: null }; + res = this.bcr.Read1(length, function (t, l) { + return oThis.ReadCT_TickMark(t, l, oNewVal); + }); + if (null != oNewVal.m_val) + val.setMajorTickMark(oNewVal.m_val); + else{ + val.setMajorTickMark(c_oAscTickMark.TICK_MARK_CROSS); + } } - else - res = c_oSerConstants.ReadUnknown; - return res; -}; -BinaryChartReader.prototype.ReadCT_PrintSettings = function (type, length, val) { - var res = c_oSerConstants.ReadOk; - var oThis = this; - if (c_oserct_printsettingsHEADERFOOTER === type) { - var oNewVal = new AscFormat.CHeaderFooterChart(); + else if (c_oserct_valaxMINORTICKMARK === type) { + var oNewVal = { m_val: null }; res = this.bcr.Read1(length, function (t, l) { - return oThis.ReadCT_HeaderFooter(t, l, oNewVal); + return oThis.ReadCT_TickMark(t, l, oNewVal); }); - val.setHeaderFooter(oNewVal); + if (null != oNewVal.m_val) + val.setMinorTickMark(oNewVal.m_val); + else{ + val.setMajorTickMark(c_oAscTickMark.TICK_MARK_CROSS); + } } - else if (c_oserct_printsettingsPAGEMARGINS === type) { - var oNewVal = new AscFormat.CPageMarginsChart(); + else if (c_oserct_valaxTICKLBLPOS === type) { + var oNewVal = { m_val: null }; res = this.bcr.Read1(length, function (t, l) { - return oThis.ReadCT_PageMargins(t, l, oNewVal); + return oThis.ReadCT_TickLblPos(t, l, oNewVal); }); - val.setPageMargins(oNewVal); + if (null != oNewVal.m_val) + val.setTickLblPos(oNewVal.m_val); } - else if (c_oserct_printsettingsPAGESETUP === type) { - var oNewVal = new AscFormat.CPageSetup(); + else if (c_oserct_valaxSPPR === type) { + val.setSpPr(this.ReadSpPr(length)); + } + else if (c_oserct_valaxTXPR === type) { + val.setTxPr(this.ReadTxPr(length)); + val.txPr.setParent(val); + } + else if (c_oserct_valaxCROSSAX === type) { + var oNewVal = { m_val: null }; + res = this.bcr.Read1(length, function (t, l) { + return oThis.ReadCT_UnsignedInt(t, l, oNewVal); + }); + if (null != oNewVal.m_val) + { + val.crossAxId = oNewVal.m_val; + } + } + else if (c_oserct_valaxCROSSES === type) { + var oNewVal = { m_val: null }; res = this.bcr.Read1(length, function (t, l) { - return oThis.ReadCT_PageSetup(t, l, oNewVal); + return oThis.ReadCT_Crosses(t, l, oNewVal); }); - val.setPageSetup(oNewVal); + if (null != oNewVal.m_val) + val.setCrosses(oNewVal.m_val); + else + val.setCrosses(AscFormat.CROSSES_AUTO_ZERO); } - else - res = c_oSerConstants.ReadUnknown; - return res; -}; -BinaryChartReader.prototype.ReadCT_ExternalData = function (type, length, val) { - var res = c_oSerConstants.ReadOk; - var oThis = this; - if (c_oserct_externaldataAUTOUPDATE === type) { - var oNewVal; - oNewVal = {}; + else if (c_oserct_valaxCROSSESAT === type) { + var oNewVal = { m_val: null }; res = this.bcr.Read1(length, function (t, l) { - return oThis.ReadCT_Boolean(t, l, oNewVal); + return oThis.ReadCT_Double(t, l, oNewVal); }); - val.m_autoUpdate = oNewVal; - } - else if (c_oserct_externaldataID === type) { - //todo - var oNewVal; - oNewVal = this.stream.GetString2LE(length); - val.m_id = oNewVal; + if (null != oNewVal.m_val) + val.setCrossesAt(oNewVal.m_val); } - else - res = c_oSerConstants.ReadUnknown; - return res; -}; -BinaryChartReader.prototype.ReadCT_DispBlanksAs = function (type, length, val) { - var res = c_oSerConstants.ReadOk; - var oThis = this; - if (c_oserct_dispblanksasVAL === type) { - switch (this.stream.GetUChar()) { - case st_dispblanksasSPAN: val.m_val = AscFormat.DISP_BLANKS_AS_SPAN; break; - case st_dispblanksasGAP: val.m_val = AscFormat.DISP_BLANKS_AS_GAP; break; - case st_dispblanksasZERO: val.m_val = AscFormat.DISP_BLANKS_AS_ZERO; break; - } + else if (c_oserct_valaxCROSSBETWEEN === type) { + var oNewVal = { m_val: null }; + res = this.bcr.Read1(length, function (t, l) { + return oThis.ReadCT_CrossBetween(t, l, oNewVal); + }); + if (null != oNewVal.m_val) + val.setCrossBetween(oNewVal.m_val); } - else - res = c_oSerConstants.ReadUnknown; - return res; -}; -BinaryChartReader.prototype.ReadCT_LegendEntry = function (type, length, val) { - var res = c_oSerConstants.ReadOk; - var oThis = this; - if (c_oserct_legendentryIDX === type) { + else if (c_oserct_valaxMAJORUNIT === type) { var oNewVal = { m_val: null }; res = this.bcr.Read1(length, function (t, l) { - return oThis.ReadCT_UnsignedInt(t, l, oNewVal); + return oThis.ReadCT_AxisUnit(t, l, oNewVal); }); if (null != oNewVal.m_val) - val.setIdx(oNewVal.m_val); + val.setMajorUnit(oNewVal.m_val); } - else if (c_oserct_legendentryDELETE === type) { + else if (c_oserct_valaxMINORUNIT === type) { var oNewVal = { m_val: null }; res = this.bcr.Read1(length, function (t, l) { - return oThis.ReadCT_Boolean(t, l, oNewVal); + return oThis.ReadCT_AxisUnit(t, l, oNewVal); }); if (null != oNewVal.m_val) - val.setDelete(oNewVal.m_val); - else - val.setDelete(true); + val.setMinorUnit(oNewVal.m_val); } - else if (c_oserct_legendentryTXPR === type) { - val.setTxPr(this.ReadTxPr(length)); - val.txPr.setParent(val); + else if (c_oserct_valaxDISPUNITS === type) { + var oNewVal = new AscFormat.CDispUnits(); + res = this.bcr.Read1(length, function (t, l) { + return oThis.ReadCT_DispUnits(t, l, oNewVal); + }); + val.setDispUnits(oNewVal); } - else if (c_oserct_legendentryEXTLST === type) { + else if (c_oserct_valaxEXTLST === type) { var oNewVal; oNewVal = {}; res = this.bcr.Read1(length, function (t, l) { @@ -6910,206 +9290,247 @@ BinaryChartReader.prototype.ReadCT_LegendEntry = function (type, length, val) { res = c_oSerConstants.ReadUnknown; return res; }; -BinaryChartReader.prototype.ReadCT_UnsignedInt = function (type, length, val) { - var res = c_oSerConstants.ReadOk; - var oThis = this; - if (c_oserct_unsignedintVAL === type) { - var oNewVal; - oNewVal = this.stream.GetULongLE(); - val.m_val = oNewVal; - } - else - res = c_oSerConstants.ReadUnknown; - return res; -}; -BinaryChartReader.prototype.ReadCT_Extension = function (type, length, val) { +BinaryChartReader.prototype.ReadCT_SizeRepresents = function (type, length, val) { var res = c_oSerConstants.ReadOk; var oThis = this; - if (c_oserct_extensionANY === type) { - var oNewVal; - oNewVal = this.stream.GetString2LE(length); - val.m_Any = oNewVal; - } - else if (c_oserct_extensionURI === type) { - var oNewVal; - oNewVal = this.stream.GetString2LE(length); - val.m_uri = oNewVal; + if (c_oserct_sizerepresentsVAL === type) { + switch (this.stream.GetUChar()) { + case st_sizerepresentsAREA: val.m_val = SIZE_REPRESENTS_AREA; break; + case st_sizerepresentsW: val.m_val = SIZE_REPRESENTS_W; break; + } } else res = c_oSerConstants.ReadUnknown; return res; }; -BinaryChartReader.prototype.ReadCT_LegendPos = function (type, length, val) { +BinaryChartReader.prototype.ReadCT_BubbleScale = function (type, length, val) { var res = c_oSerConstants.ReadOk; var oThis = this; - if (c_oserct_legendposVAL === type) { - switch (this.stream.GetUChar()) { - case st_legendposB: val.m_val = c_oAscChartLegendShowSettings.bottom; break; - case st_legendposTR: val.m_val = c_oAscChartLegendShowSettings.topRight; break; - case st_legendposL: val.m_val = c_oAscChartLegendShowSettings.left; break; - case st_legendposR: val.m_val = c_oAscChartLegendShowSettings.right; break; - case st_legendposT: val.m_val = c_oAscChartLegendShowSettings.top; break; - } + if (c_oserct_bubblescaleVAL === type) { + val.m_val = this.ParsePersent(this.stream.GetString2LE(length)); } else res = c_oSerConstants.ReadUnknown; return res; }; -BinaryChartReader.prototype.ReadCT_Legend = function (type, length, val) { +BinaryChartReader.prototype.ReadCT_BubbleSer = function (type, length, val) { var res = c_oSerConstants.ReadOk; var oThis = this; - if (c_oserct_legendLEGENDPOS === type) { + if (c_oserct_bubbleserIDX === type) { var oNewVal = { m_val: null }; res = this.bcr.Read1(length, function (t, l) { - return oThis.ReadCT_LegendPos(t, l, oNewVal); + return oThis.ReadCT_UnsignedInt(t, l, oNewVal); }); if (null != oNewVal.m_val) - val.setLegendPos(oNewVal.m_val); + val.setIdx(oNewVal.m_val); } - else if (c_oserct_legendLEGENDENTRY === type) { - var oNewVal = new AscFormat.CLegendEntry(); + else if (c_oserct_bubbleserORDER === type) { + var oNewVal = { m_val: null }; res = this.bcr.Read1(length, function (t, l) { - return oThis.ReadCT_LegendEntry(t, l, oNewVal); + return oThis.ReadCT_UnsignedInt(t, l, oNewVal); }); - val.addLegendEntry(oNewVal); + if (null != oNewVal.m_val) + val.setOrder(oNewVal.m_val); } - else if (c_oserct_legendLAYOUT === type) { + else if (c_oserct_bubbleserTX === type) { + var oNewVal = new AscFormat.CTx(); res = this.bcr.Read1(length, function (t, l) { - return oThis.ReadCT_Layout(t, l, val); + return oThis.ReadCT_SerTx(t, l, oNewVal); }); + val.setTx(oNewVal); } - else if (c_oserct_legendOVERLAY === type) { + else if (c_oserct_bubbleserSPPR === type) { + val.setSpPr(this.ReadSpPr(length)); + } + else if (c_oserct_bubbleserINVERTIFNEGATIVE === type) { var oNewVal = { m_val: null }; res = this.bcr.Read1(length, function (t, l) { return oThis.ReadCT_Boolean(t, l, oNewVal); }); if (null != oNewVal.m_val) - val.setOverlay(oNewVal.m_val); + val.setInvertIfNegative(oNewVal.m_val); } - else if (c_oserct_legendSPPR === type) { - val.setSpPr(this.ReadSpPr(length)); + else if (c_oserct_bubbleserDPT === type) { + var oNewVal = new AscFormat.CDPt(); + res = this.bcr.Read1(length, function (t, l) { + return oThis.ReadCT_DPt(t, l, oNewVal); + }); + val.addDPt(oNewVal); } - else if (c_oserct_legendTXPR === type) { - val.setTxPr(this.ReadTxPr(length)); - val.txPr.setParent(val); + else if (c_oserct_bubbleserDLBLS === type) { + var oNewVal = new AscFormat.CDLbls(); + res = this.bcr.Read1(length, function (t, l) { + return oThis.ReadCT_DLbls(t, l, oNewVal); + }); + oNewVal.correctValues(); + val.setDLbls(oNewVal); } - else if (c_oserct_legendALIGN === type) { - var oNewVal; - oNewVal = {}; + else if (c_oserct_bubbleserTRENDLINE === type) { + //todo array + var oNewVal = new AscFormat.CTrendLine(); res = this.bcr.Read1(length, function (t, l) { - return oThis.ReadCT_PosAlign(t, l, oNewVal); + return oThis.ReadCT_Trendline(t, l, oNewVal); }); + val.setTrendline(oNewVal); } - else if (c_oserct_legendEXTLST === type) { + else if (c_oserct_bubbleserERRBARS === type) { + //todo array + var oNewVal = new AscFormat.CErrBars(); + res = this.bcr.Read1(length, function (t, l) { + return oThis.ReadCT_ErrBars(t, l, oNewVal); + }); + val.setErrBars(oNewVal); + } + else if (c_oserct_bubbleserXVAL === type) { + var oNewVal = new AscFormat.CCat(); + res = this.bcr.Read1(length, function (t, l) { + return oThis.ReadCT_AxDataSource(t, l, oNewVal); + }); + val.setXVal(oNewVal); + } + else if (c_oserct_bubbleserYVAL === type) { + var oNewVal = new AscFormat.CYVal(); + res = this.bcr.Read1(length, function (t, l) { + return oThis.ReadCT_NumDataSource(t, l, oNewVal); + }); + val.setYVal(oNewVal); + } + else if (c_oserct_bubbleserBUBBLESIZE === type) { + var oNewVal = new AscFormat.CYVal(); + res = this.bcr.Read1(length, function (t, l) { + return oThis.ReadCT_NumDataSource(t, l, oNewVal); + }); + val.setBubbleSize(oNewVal); + } + else if (c_oserct_bubbleserBUBBLE3D === type) { + var oNewVal = { m_val: null }; + res = this.bcr.Read1(length, function (t, l) { + return oThis.ReadCT_Boolean(t, l, oNewVal); + }); + if (null != oNewVal.m_val) + val.setBubble3D(oNewVal.m_val); + } + else if (c_oserct_bubbleserEXTLST === type) { var oNewVal; oNewVal = {}; res = this.bcr.Read1(length, function (t, l) { return oThis.ReadCT_extLst(t, l, oNewVal); }); // val.m_extLst = oNewVal; + } + else if(c_oserct_chartFiltering === type) { + res = this.bcr.Read1(length, function (t, l) { + return oThis.ReadCT_ChartFiltering(t, l, val); + }); } else res = c_oSerConstants.ReadUnknown; return res; }; -BinaryChartReader.prototype.ReadCT_Layout = function (type, length, val) { +BinaryChartReader.prototype.ReadCT_SerTx = function (type, length, val) { var res = c_oSerConstants.ReadOk; var oThis = this; - if (c_oserct_layoutMANUALLAYOUT === type) { - var oNewVal = new AscFormat.CLayout(); + if (c_oserct_sertxSTRREF === type) { + var oNewVal = new AscFormat.CStrRef(); res = this.bcr.Read1(length, function (t, l) { - return oThis.ReadCT_ManualLayout(t, l, oNewVal); + return oThis.ReadCT_StrRef(t, l, oNewVal); }); - val.setLayout(oNewVal); + val.setStrRef(oNewVal); } - else if (c_oserct_layoutEXTLST === type) { - var oNewVal; - oNewVal = {}; - res = this.bcr.Read1(length, function (t, l) { - return oThis.ReadCT_extLst(t, l, oNewVal); - }); - // val.m_extLst = oNewVal; + else if (c_oserct_sertxV === type) { + val.setVal(this.stream.GetString2LE(length)); } else res = c_oSerConstants.ReadUnknown; return res; }; -BinaryChartReader.prototype.ReadCT_ManualLayout = function (type, length, val) { +BinaryChartReader.prototype.ReadCT_DPt = function (type, length, val) { var res = c_oSerConstants.ReadOk; var oThis = this; - if (c_oserct_manuallayoutLAYOUTTARGET === type) { + if (c_oserct_dptIDX === type) { var oNewVal = { m_val: null }; res = this.bcr.Read1(length, function (t, l) { - return oThis.ReadCT_LayoutTarget(t, l, oNewVal); + return oThis.ReadCT_UnsignedInt(t, l, oNewVal); }); if (null != oNewVal.m_val) - val.setLayoutTarget(oNewVal.m_val); + val.setIdx(oNewVal.m_val); } - else if (c_oserct_manuallayoutXMODE === type) { + else if (c_oserct_dptINVERTIFNEGATIVE === type) { var oNewVal = { m_val: null }; res = this.bcr.Read1(length, function (t, l) { - return oThis.ReadCT_LayoutMode(t, l, oNewVal); + return oThis.ReadCT_Boolean(t, l, oNewVal); }); if (null != oNewVal.m_val) - val.setXMode(oNewVal.m_val); + val.setInvertIfNegative(oNewVal.m_val); } - else if (c_oserct_manuallayoutYMODE === type) { - var oNewVal = { m_val: null }; + else if (c_oserct_dptMARKER === type) { + var oNewVal = new AscFormat.CMarker(); res = this.bcr.Read1(length, function (t, l) { - return oThis.ReadCT_LayoutMode(t, l, oNewVal); + return oThis.ReadCT_Marker(t, l, oNewVal); }); - if (null != oNewVal.m_val) - val.setYMode(oNewVal.m_val); + val.setMarker(oNewVal); } - else if (c_oserct_manuallayoutWMODE === type) { + else if (c_oserct_dptBUBBLE3D === type) { var oNewVal = { m_val: null }; res = this.bcr.Read1(length, function (t, l) { - return oThis.ReadCT_LayoutMode(t, l, oNewVal); + return oThis.ReadCT_Boolean(t, l, oNewVal); }); if (null != oNewVal.m_val) - val.setWMode(oNewVal.m_val); + val.setBubble3D(oNewVal.m_val); } - else if (c_oserct_manuallayoutHMODE === type) { + else if (c_oserct_dptEXPLOSION === type) { var oNewVal = { m_val: null }; res = this.bcr.Read1(length, function (t, l) { - return oThis.ReadCT_LayoutMode(t, l, oNewVal); + return oThis.ReadCT_UnsignedInt(t, l, oNewVal); }); if (null != oNewVal.m_val) - val.setHMode(oNewVal.m_val); + val.setExplosion(oNewVal.m_val); } - else if (c_oserct_manuallayoutX === type) { - var oNewVal = { m_val: null }; + else if (c_oserct_dptSPPR === type) { + val.setSpPr(this.ReadSpPr(length)); + } + else if (c_oserct_dptPICTUREOPTIONS === type) { + var oNewVal = new AscFormat.CPictureOptions(); res = this.bcr.Read1(length, function (t, l) { - return oThis.ReadCT_Double(t, l, oNewVal); + return oThis.ReadCT_PictureOptions(t, l, oNewVal); }); - if (null != oNewVal.m_val) - val.setX(oNewVal.m_val); + val.setPictureOptions(oNewVal); } - else if (c_oserct_manuallayoutY === type) { - var oNewVal = { m_val: null }; + else if (c_oserct_dptEXTLST === type) { + var oNewVal; + oNewVal = {}; res = this.bcr.Read1(length, function (t, l) { - return oThis.ReadCT_Double(t, l, oNewVal); + return oThis.ReadCT_extLst(t, l, oNewVal); }); - if (null != oNewVal.m_val) - val.setY(oNewVal.m_val); + // val.m_extLst = oNewVal; } - else if (c_oserct_manuallayoutW === type) { + else + res = c_oSerConstants.ReadUnknown; + return res; +}; +BinaryChartReader.prototype.ReadCT_Marker = function (type, length, val) { + var res = c_oSerConstants.ReadOk; + var oThis = this; + if (c_oserct_markerSYMBOL === type) { var oNewVal = { m_val: null }; res = this.bcr.Read1(length, function (t, l) { - return oThis.ReadCT_Double(t, l, oNewVal); + return oThis.ReadCT_MarkerStyle(t, l, oNewVal); }); if (null != oNewVal.m_val) - val.setW(oNewVal.m_val); + val.setSymbol(oNewVal.m_val); } - else if (c_oserct_manuallayoutH === type) { + else if (c_oserct_markerSIZE === type) { var oNewVal = { m_val: null }; res = this.bcr.Read1(length, function (t, l) { - return oThis.ReadCT_Double(t, l, oNewVal); + return oThis.ReadCT_MarkerSize(t, l, oNewVal); }); if (null != oNewVal.m_val) - val.setH(oNewVal.m_val); + val.setSize(oNewVal.m_val); } - else if (c_oserct_manuallayoutEXTLST === type) { + else if (c_oserct_markerSPPR === type) { + val.setSpPr(this.ReadSpPr(length)); + } + else if (c_oserct_markerEXTLST === type) { var oNewVal; oNewVal = {}; res = this.bcr.Read1(length, function (t, l) { @@ -7121,117 +9542,139 @@ BinaryChartReader.prototype.ReadCT_ManualLayout = function (type, length, val) { res = c_oSerConstants.ReadUnknown; return res; }; -BinaryChartReader.prototype.ReadCT_LayoutTarget = function (type, length, val) { - var res = c_oSerConstants.ReadOk; - var oThis = this; - if (c_oserct_layouttargetVAL === type) { - switch (this.stream.GetUChar()) { - case st_layouttargetINNER: val.m_val = LAYOUT_TARGET_INNER; break; - case st_layouttargetOUTER: val.m_val = LAYOUT_TARGET_OUTER; break; - } +BinaryChartReader.prototype.MarkerStyleToFormat = function(markerStyle) { + + var val = null; + switch (markerStyle) { + case st_markerstyleCIRCLE: val = AscFormat.SYMBOL_CIRCLE; break; + case st_markerstyleDASH: val = AscFormat.SYMBOL_DASH; break; + case st_markerstyleDIAMOND: val = AscFormat.SYMBOL_DIAMOND; break; + case st_markerstyleDOT: val = AscFormat.SYMBOL_DOT; break; + case st_markerstyleNONE: val = AscFormat.SYMBOL_NONE; break; + case st_markerstylePICTURE: val = AscFormat.SYMBOL_PICTURE; break; + case st_markerstylePLUS: val = AscFormat.SYMBOL_PLUS; break; + case st_markerstyleSQUARE: val = AscFormat.SYMBOL_SQUARE; break; + case st_markerstyleSTAR: val = AscFormat.SYMBOL_STAR; break; + case st_markerstyleTRIANGLE: val = AscFormat.SYMBOL_TRIANGLE; break; + case st_markerstyleX: val = AscFormat.SYMBOL_X; break; + case st_markerstyleAUTO: break; } - else - res = c_oSerConstants.ReadUnknown; - return res; + return val; }; -BinaryChartReader.prototype.ReadCT_LayoutMode = function (type, length, val) { +BinaryChartReader.prototype.ReadCT_MarkerStyle = function (type, length, val) { var res = c_oSerConstants.ReadOk; - var oThis = this; - if (c_oserct_layoutmodeVAL === type) { - switch (this.stream.GetUChar()) { - case st_layoutmodeEDGE: val.m_val = LAYOUT_MODE_EDGE; break; - case st_layoutmodeFACTOR: val.m_val = LAYOUT_MODE_FACTOR; break; - } + if (c_oserct_markerstyleVAL === type) { + val.m_val = this.MarkerStyleToFormat(this.stream.GetUChar()); } else res = c_oSerConstants.ReadUnknown; return res; }; -BinaryChartReader.prototype.ReadCT_Double = function (type, length, val) { +BinaryChartReader.prototype.ReadCT_MarkerSize = function (type, length, val) { var res = c_oSerConstants.ReadOk; var oThis = this; - if (c_oserct_doubleVAL === type) { + if (c_oserct_markersizeVAL === type) { var oNewVal; - oNewVal = this.stream.GetDoubleLE(); + oNewVal = this.stream.GetUChar(); val.m_val = oNewVal; } else res = c_oSerConstants.ReadUnknown; return res; }; -BinaryChartReader.prototype.ReadCT_DTable = function (type, length, val) { +BinaryChartReader.prototype.ReadCT_PictureOptions = function (type, length, val) { var res = c_oSerConstants.ReadOk; var oThis = this; - if (c_oserct_dtableSHOWHORZBORDER === type) { + if (c_oserct_pictureoptionsAPPLYTOFRONT === type) { var oNewVal = { m_val: null }; res = this.bcr.Read1(length, function (t, l) { return oThis.ReadCT_Boolean(t, l, oNewVal); }); if (null != oNewVal.m_val) - val.setShowHorzBorder(oNewVal.m_val); + val.setApplyToFront(oNewVal.m_val); } - else if (c_oserct_dtableSHOWVERTBORDER === type) { + else if (c_oserct_pictureoptionsAPPLYTOSIDES === type) { var oNewVal = { m_val: null }; res = this.bcr.Read1(length, function (t, l) { return oThis.ReadCT_Boolean(t, l, oNewVal); }); if (null != oNewVal.m_val) - val.setShowVertBorder(oNewVal.m_val); + val.setApplyToSides(oNewVal.m_val); } - else if (c_oserct_dtableSHOWOUTLINE === type) { + else if (c_oserct_pictureoptionsAPPLYTOEND === type) { var oNewVal = { m_val: null }; res = this.bcr.Read1(length, function (t, l) { return oThis.ReadCT_Boolean(t, l, oNewVal); }); if (null != oNewVal.m_val) - val.setShowOutline(oNewVal.m_val); + val.setApplyToEnd(oNewVal.m_val); } - else if (c_oserct_dtableSHOWKEYS === type) { + else if (c_oserct_pictureoptionsPICTUREFORMAT === type) { var oNewVal = { m_val: null }; res = this.bcr.Read1(length, function (t, l) { - return oThis.ReadCT_Boolean(t, l, oNewVal); + return oThis.ReadCT_PictureFormat(t, l, oNewVal); }); if (null != oNewVal.m_val) - val.setShowKeys(oNewVal.m_val); + val.setPictureFormat(oNewVal.m_val); } - else if (c_oserct_dtableSPPR === type) { - val.setSpPr(this.ReadSpPr(length)) + else if (c_oserct_pictureoptionsPICTURESTACKUNIT === type) { + var oNewVal = { m_val: null }; + res = this.bcr.Read1(length, function (t, l) { + return oThis.ReadCT_PictureStackUnit(t, l, oNewVal); + }); + if (null != oNewVal.m_val) + val.setPictureStackUnit(oNewVal.m_val); } - else if (c_oserct_dtableTXPR === type) { - val.setTxPr(this.ReadTxPr(length)); - val.txPr.setParent(val); + else + res = c_oSerConstants.ReadUnknown; + return res; +}; +BinaryChartReader.prototype.ReadCT_PictureFormat = function (type, length, val) { + var res = c_oSerConstants.ReadOk; + var oThis = this; + if (c_oserct_pictureformatVAL === type) { + switch (this.stream.GetUChar()) { + case st_pictureformatSTRETCH: val.m_val = PICTURE_FORMAT_STACK_STRETCH; break; + case st_pictureformatSTACK: val.m_val = PICTURE_FORMAT_STACK; break; + case st_pictureformatSTACKSCALE: val.m_val = PICTURE_FORMAT_STACK_SCALE; break; + } } - else if (c_oserct_dtableEXTLST === type) { + else + res = c_oSerConstants.ReadUnknown; + return res; +}; +BinaryChartReader.prototype.ReadCT_PictureStackUnit = function (type, length, val) { + var res = c_oSerConstants.ReadOk; + var oThis = this; + if (c_oserct_picturestackunitVAL === type) { var oNewVal; - oNewVal = {}; - res = this.bcr.Read1(length, function (t, l) { - return oThis.ReadCT_extLst(t, l, oNewVal); - }); - // val.m_extLst = oNewVal; + oNewVal = this.stream.GetDoubleLE(); + val.m_val = oNewVal; } else res = c_oSerConstants.ReadUnknown; return res; }; -BinaryChartReader.prototype.ReadCT_SerAx = function (type, length, val) { +BinaryChartReader.prototype.ReadCT_DLbls = function (type, length, val) { var res = c_oSerConstants.ReadOk; var oThis = this; - if (c_oserct_seraxAXID === type) { - var oNewVal = { m_val: null }; + if (c_oserct_dlblsDLBL === type) { + var oNewVal = new AscFormat.CDLbl(); res = this.bcr.Read1(length, function (t, l) { - return oThis.ReadCT_UnsignedInt(t, l, oNewVal); + return oThis.ReadCT_DLbl(t, l, oNewVal); }); - if (null != oNewVal.m_val) - val.setAxId(oNewVal.m_val); + oNewVal.correctValues(); + val.addDLbl(oNewVal); } - else if (c_oserct_seraxSCALING === type) { - var oNewVal = new AscFormat.CScaling(); + else if (c_oserct_dlblsDLBLPOS === type) { + var oNewVal = { m_val: null }; res = this.bcr.Read1(length, function (t, l) { - return oThis.ReadCT_Scaling(t, l, oNewVal); + return oThis.ReadCT_DLblPos(t, l, oNewVal); }); - val.setScaling(oNewVal); + if (null != oNewVal.m_val) + val.setDLblPos(oNewVal.m_val); } - else if (c_oserct_seraxDELETE === type) { + else if (c_oserct_dlblsDELETE === type) { var oNewVal = { m_val: null }; res = this.bcr.Read1(length, function (t, l) { return oThis.ReadCT_Boolean(t, l, oNewVal); @@ -7241,180 +9684,235 @@ BinaryChartReader.prototype.ReadCT_SerAx = function (type, length, val) { else val.setDelete(true); } - else if (c_oserct_seraxAXPOS === type) { - var oNewVal = { m_val: null }; - res = this.bcr.Read1(length, function (t, l) { - return oThis.ReadCT_AxPos(t, l, oNewVal); - }); - if (null != oNewVal.m_val) - val.setAxPos(oNewVal.m_val); - } - else if (c_oserct_seraxMAJORGRIDLINES === type) { + else if (c_oserct_dlblsLEADERLINES === type) { var oNewVal = { spPr: null }; res = this.bcr.Read1(length, function (t, l) { return oThis.ReadCT_ChartLines(t, l, oNewVal); }); if (null != oNewVal.spPr) - val.setMajorGridlines(oNewVal.spPr); + val.setLeaderLines(oNewVal.spPr); else - val.setMajorGridlines(new AscFormat.CSpPr()); + val.setLeaderLines(new AscFormat.CSpPr()); } - else if (c_oserct_seraxMINORGRIDLINES === type) { - var oNewVal = { spPr: null }; + else if (c_oserct_dlblsNUMFMT === type) { + var oNewVal = new AscFormat.CNumFmt(); res = this.bcr.Read1(length, function (t, l) { - return oThis.ReadCT_ChartLines(t, l, oNewVal); + return oThis.ReadCT_NumFmt(t, l, oNewVal); }); - if (null != oNewVal.spPr) - val.setMinorGridlines(oNewVal.spPr); + val.setNumFmt(oNewVal); + } + else if (c_oserct_dlblsSEPARATOR === type) { + val.setSeparator(this.stream.GetString2LE(length)); + } + else if (c_oserct_dlblsSHOWBUBBLESIZE === type) { + var oNewVal = { m_val: null }; + res = this.bcr.Read1(length, function (t, l) { + return oThis.ReadCT_Boolean(t, l, oNewVal); + }); + if (null != oNewVal.m_val) + val.setShowBubbleSize(oNewVal.m_val); else - val.setMinorGridlines(new AscFormat.CSpPr()); + val.setShowBubbleSize(true); } - else if (c_oserct_seraxTITLE === type) { - var oNewVal = new AscFormat.CTitle(); + else if (c_oserct_dlblsSHOWCATNAME === type) { + var oNewVal = { m_val: null }; res = this.bcr.Read1(length, function (t, l) { - return oThis.ReadCT_Title(t, l, oNewVal); + return oThis.ReadCT_Boolean(t, l, oNewVal); }); - if(!AscFormat.isRealBool(oNewVal.overlay)) - { - oNewVal.setOverlay(false); - } - val.setTitle(oNewVal); + if (null != oNewVal.m_val) + val.setShowCatName(oNewVal.m_val); + else + val.setShowCatName(true); + } + else if (c_oserct_dlblsSHOWLEADERLINES === type) { + var oNewVal = { m_val: null }; + res = this.bcr.Read1(length, function (t, l) { + return oThis.ReadCT_Boolean(t, l, oNewVal); + }); + if (null != oNewVal.m_val) + val.setShowLeaderLines(oNewVal.m_val); + else + val.setShowLeaderLines(true); } - else if (c_oserct_seraxNUMFMT === type) { - var oNewVal = new AscFormat.CNumFmt(); + else if (c_oserct_dlblsSHOWLEGENDKEY === type) { + var oNewVal = { m_val: null }; res = this.bcr.Read1(length, function (t, l) { - return oThis.ReadCT_NumFmt(t, l, oNewVal); + return oThis.ReadCT_Boolean(t, l, oNewVal); }); - val.setNumFmt(oNewVal); + if (null != oNewVal.m_val) + val.setShowLegendKey(oNewVal.m_val); + else + val.setShowLegendKey(true); } - else if (c_oserct_seraxMAJORTICKMARK === type) { + else if (c_oserct_dlblsSHOWPERCENT === type) { var oNewVal = { m_val: null }; res = this.bcr.Read1(length, function (t, l) { - return oThis.ReadCT_TickMark(t, l, oNewVal); + return oThis.ReadCT_Boolean(t, l, oNewVal); }); if (null != oNewVal.m_val) - val.setMajorTickMark(oNewVal.m_val); - else{ - val.setMajorTickMark(c_oAscTickMark.TICK_MARK_CROSS); - } + val.setShowPercent(oNewVal.m_val); + else + val.setShowPercent(true); } - else if (c_oserct_seraxMINORTICKMARK === type) { + else if (c_oserct_dlblsSHOWSERNAME === type) { var oNewVal = { m_val: null }; res = this.bcr.Read1(length, function (t, l) { - return oThis.ReadCT_TickMark(t, l, oNewVal); + return oThis.ReadCT_Boolean(t, l, oNewVal); }); if (null != oNewVal.m_val) - val.setMinorTickMark(oNewVal.m_val); - else{ - val.setMajorTickMark(c_oAscTickMark.TICK_MARK_CROSS); - } + val.setShowSerName(oNewVal.m_val); + else + val.setShowSerName(true); } - else if (c_oserct_seraxTICKLBLPOS === type) { + else if (c_oserct_dlblsSHOWVAL === type) { var oNewVal = { m_val: null }; res = this.bcr.Read1(length, function (t, l) { - return oThis.ReadCT_TickLblPos(t, l, oNewVal); + return oThis.ReadCT_Boolean(t, l, oNewVal); }); if (null != oNewVal.m_val) - val.setTickLblPos(oNewVal.m_val); + val.setShowVal(oNewVal.m_val); + else + val.setShowVal(true); } - else if (c_oserct_seraxSPPR === type) { + else if (c_oserct_dlblsSPPR === type) { val.setSpPr(this.ReadSpPr(length)); } - else if (c_oserct_seraxTXPR === type) { + else if (c_oserct_dlblsTXPR === type) { val.setTxPr(this.ReadTxPr(length)); val.txPr.setParent(val); } - else if (c_oserct_seraxCROSSAX === type) { + else if (c_oserct_dlblsEXTLST === type) { + var oNewVal; + oNewVal = {}; + res = this.bcr.Read1(length, function (t, l) { + return oThis.ReadCT_extLst(t, l, oNewVal); + }); + // val.m_extLst = oNewVal; + } + else + res = c_oSerConstants.ReadUnknown; + return res; +}; +BinaryChartReader.prototype.ReadCT_DLbl = function (type, length, val) { + var res = c_oSerConstants.ReadOk; + var oThis = this; + if (c_oserct_dlblIDX === type) { var oNewVal = { m_val: null }; res = this.bcr.Read1(length, function (t, l) { return oThis.ReadCT_UnsignedInt(t, l, oNewVal); }); - if (null != oNewVal.m_val) - { - val.crossAxId = oNewVal.m_val; - } + val.setIdx(oNewVal.m_val); } - else if (c_oserct_seraxCROSSES === type) { + else if (c_oserct_dlblDLBLPOS === type) { var oNewVal = { m_val: null }; res = this.bcr.Read1(length, function (t, l) { - return oThis.ReadCT_Crosses(t, l, oNewVal); + return oThis.ReadCT_DLblPos(t, l, oNewVal); }); if (null != oNewVal.m_val) - val.setCrosses(oNewVal.m_val); + val.setDLblPos(oNewVal.m_val); } - else if (c_oserct_seraxCROSSESAT === type) { + else if (c_oserct_dlblDELETE === type) { var oNewVal = { m_val: null }; res = this.bcr.Read1(length, function (t, l) { - return oThis.ReadCT_Double(t, l, oNewVal); + return oThis.ReadCT_Boolean(t, l, oNewVal); }); if (null != oNewVal.m_val) - val.setCrossesAt(oNewVal.m_val); + val.setDelete(oNewVal.m_val); + else + val.setDelete(true); } - else if (c_oserct_seraxTICKLBLSKIP === type) { - var oNewVal = { m_val: null }; + else if (c_oserct_dlblLAYOUT === type) { res = this.bcr.Read1(length, function (t, l) { - return oThis.ReadCT_Skip(t, l, oNewVal); + return oThis.ReadCT_Layout(t, l, val); }); - if (null != oNewVal.m_val) - val.setTickLblSkip(oNewVal.m_val); } - else if (c_oserct_seraxTICKMARKSKIP === type) { + else if (c_oserct_dlblNUMFMT === type) { + var oNewVal = new AscFormat.CNumFmt(); + res = this.bcr.Read1(length, function (t, l) { + return oThis.ReadCT_NumFmt(t, l, oNewVal); + }); + val.setNumFmt(oNewVal); + } + else if (c_oserct_dlblSEPARATOR === type) { + val.setSeparator(this.stream.GetString2LE(length)); + } + else if (c_oserct_dlblSHOWBUBBLESIZE === type) { var oNewVal = { m_val: null }; res = this.bcr.Read1(length, function (t, l) { - return oThis.ReadCT_Skip(t, l, oNewVal); + return oThis.ReadCT_Boolean(t, l, oNewVal); }); if (null != oNewVal.m_val) - val.setTickMarkSkip(oNewVal.m_val); + val.setShowBubbleSize(oNewVal.m_val); + else + val.setShowBubbleSize(true); } - else if (c_oserct_seraxEXTLST === type) { - var oNewVal; - oNewVal = {}; + else if (c_oserct_dlblSHOWCATNAME === type) { + var oNewVal = { m_val: null }; res = this.bcr.Read1(length, function (t, l) { - return oThis.ReadCT_extLst(t, l, oNewVal); + return oThis.ReadCT_Boolean(t, l, oNewVal); }); - // val.m_extLst = oNewVal; + if (null != oNewVal.m_val) + val.setShowCatName(oNewVal.m_val); + else + val.setShowCatName(true); } - else - res = c_oSerConstants.ReadUnknown; - return res; -}; -BinaryChartReader.prototype.ReadCT_Scaling = function (type, length, val) { - var res = c_oSerConstants.ReadOk; - var oThis = this; - if (c_oserct_scalingLOGBASE === type) { + else if (c_oserct_dlblSHOWLEGENDKEY === type) { var oNewVal = { m_val: null }; res = this.bcr.Read1(length, function (t, l) { - return oThis.ReadCT_LogBase(t, l, oNewVal); + return oThis.ReadCT_Boolean(t, l, oNewVal); }); if (null != oNewVal.m_val) - val.setLogBase(oNewVal.m_val); + val.setShowLegendKey(oNewVal.m_val); + else + val.setShowLegendKey(true); } - else if (c_oserct_scalingORIENTATION === type) { + else if (c_oserct_dlblSHOWPERCENT === type) { var oNewVal = { m_val: null }; res = this.bcr.Read1(length, function (t, l) { - return oThis.ReadCT_Orientation(t, l, oNewVal); + return oThis.ReadCT_Boolean(t, l, oNewVal); }); if (null != oNewVal.m_val) - val.setOrientation(oNewVal.m_val); + val.setShowPercent(oNewVal.m_val); + else + val.setShowPercent(true); } - else if (c_oserct_scalingMAX === type) { + else if (c_oserct_dlblSHOWSERNAME === type) { var oNewVal = { m_val: null }; res = this.bcr.Read1(length, function (t, l) { - return oThis.ReadCT_Double(t, l, oNewVal); + return oThis.ReadCT_Boolean(t, l, oNewVal); }); if (null != oNewVal.m_val) - val.setMax(oNewVal.m_val); + val.setShowSerName(oNewVal.m_val); + else + val.setShowSerName(true); } - else if (c_oserct_scalingMIN === type) { + else if (c_oserct_dlblSHOWVAL === type) { var oNewVal = { m_val: null }; res = this.bcr.Read1(length, function (t, l) { - return oThis.ReadCT_Double(t, l, oNewVal); + return oThis.ReadCT_Boolean(t, l, oNewVal); }); if (null != oNewVal.m_val) - val.setMin(oNewVal.m_val); + val.setShowVal(oNewVal.m_val); + else + val.setShowVal(true); } - else if (c_oserct_scalingEXTLST === type) { + else if (c_oserct_dlblSPPR === type) { + val.setSpPr(this.ReadSpPr(length)); + } + else if (c_oserct_dlblTX === type) { + var oNewVal = new AscFormat.CChartText(); + res = this.bcr.Read1(length, function (t, l) { + return oThis.ReadCT_Tx(t, l, oNewVal); + }); + oNewVal.setChart(this.curChart); + val.setTx(oNewVal); + } + else if (c_oserct_dlblTXPR === type) { + val.setTxPr(this.ReadTxPr(length)); + val.txPr.setParent(val); + } + else if (c_oserct_dlblEXTLST === type) { var oNewVal; oNewVal = {}; res = this.bcr.Read1(length, function (t, l) { @@ -7422,172 +9920,134 @@ BinaryChartReader.prototype.ReadCT_Scaling = function (type, length, val) { }); // val.m_extLst = oNewVal; } - else - res = c_oSerConstants.ReadUnknown; - return res; -}; -BinaryChartReader.prototype.ReadCT_LogBase = function (type, length, val) { - var res = c_oSerConstants.ReadOk; - var oThis = this; - if (c_oserct_logbaseVAL === type) { - var oNewVal; - oNewVal = this.stream.GetDoubleLE(); - val.m_val = oNewVal; + else if (c_oserct_dataLabel === type) { + res = this.bcr.Read1(length, function (t, l) { + return oThis.ReadCT_DLblExt(t, l, val); + }); + // val.m_extLst = oNewVal; } else res = c_oSerConstants.ReadUnknown; return res; }; -BinaryChartReader.prototype.ReadCT_Orientation = function (type, length, val) { - var res = c_oSerConstants.ReadOk; - var oThis = this; - if (c_oserct_orientationVAL === type) { - switch (this.stream.GetUChar()) { - case st_orientationMAXMIN: val.m_val = AscFormat.ORIENTATION_MAX_MIN; break; - case st_orientationMINMAX: val.m_val = AscFormat.ORIENTATION_MIN_MAX; break; - } - } - else - res = c_oSerConstants.ReadUnknown; - return res; +BinaryChartReader.prototype.ReadCT_DLblExt = function(type, length, val) { + + let res = c_oSerConstants.ReadOk; + let oThis = this; + if (c_oserct_showDataLabelsRange === type) { + let oNewVal = { m_val: null }; + res = this.bcr.Read1(length, function (t, l) { + return oThis.ReadCT_Boolean(t, l, oNewVal); + }); + if (null != oNewVal.m_val) + val.setShowDlblsRange(oNewVal.m_val); + } + else + res = c_oSerConstants.ReadUnknown; + return res; }; -BinaryChartReader.prototype.ReadCT_AxPos = function (type, length, val) { +BinaryChartReader.prototype.ReadCT_DLblPos = function (type, length, val) { var res = c_oSerConstants.ReadOk; var oThis = this; - if (c_oserct_axposVAL === type) { + if (c_oserct_dlblposVAL === type) { switch (this.stream.GetUChar()) { - case st_axposB: val.m_val = AscFormat.AX_POS_B; break; - case st_axposL: val.m_val = AscFormat.AX_POS_L; break; - case st_axposR: val.m_val = AscFormat.AX_POS_R; break; - case st_axposT: val.m_val = AscFormat.AX_POS_T; break; + case st_dlblposBESTFIT: val.m_val = c_oAscChartDataLabelsPos.bestFit; break; + case st_dlblposB: val.m_val = c_oAscChartDataLabelsPos.b; break; + case st_dlblposCTR: val.m_val = c_oAscChartDataLabelsPos.ctr; break; + case st_dlblposINBASE: val.m_val = c_oAscChartDataLabelsPos.inBase; break; + case st_dlblposINEND: val.m_val = c_oAscChartDataLabelsPos.inEnd; break; + case st_dlblposL: val.m_val = c_oAscChartDataLabelsPos.l; break; + case st_dlblposOUTEND: val.m_val = c_oAscChartDataLabelsPos.outEnd; break; + case st_dlblposR: val.m_val = c_oAscChartDataLabelsPos.r; break; + case st_dlblposT: val.m_val = c_oAscChartDataLabelsPos.t; break; } } else res = c_oSerConstants.ReadUnknown; - return res; -}; -BinaryChartReader.prototype.ReadCT_ChartLines = function (type, length, val) { - var res = c_oSerConstants.ReadOk; - var oThis = this; - if (c_oserct_chartlinesSPPR === type) { - val.spPr = this.ReadSpPr(length); - } - else - res = c_oSerConstants.ReadUnknown; - return res; -}; -BinaryChartReader.prototype.ReadCT_Title = function (type, length, val) { - var res = c_oSerConstants.ReadOk; - var oThis = this; - if (c_oserct_titleTX === type) { - var oNewVal = new AscFormat.CChartText(); - res = this.bcr.Read1(length, function (t, l) { - return oThis.ReadCT_Tx(t, l, oNewVal); - }); - oNewVal.setChart(this.curChart); - val.setTx(oNewVal); + return res; +}; +BinaryChartReader.prototype.ReadCT_Trendline = function (type, length, val) { + var res = c_oSerConstants.ReadOk; + var oThis = this; + if (c_oserct_trendlineNAME === type) { + val.setName(this.stream.GetString2LE(length)); } - else if (c_oserct_titleLAYOUT === type) { + else if (c_oserct_trendlineSPPR === type) { + val.setSpPr(this.ReadSpPr(length)); + } + else if (c_oserct_trendlineTRENDLINETYPE === type) { + var oNewVal = { m_val: null }; res = this.bcr.Read1(length, function (t, l) { - return oThis.ReadCT_Layout(t, l, val); + return oThis.ReadCT_TrendlineType(t, l, oNewVal); }); + if (null != oNewVal.m_val) + val.setTrendlineType(oNewVal.m_val); } - else if (c_oserct_titleOVERLAY === type) { + else if (c_oserct_trendlineORDER === type) { var oNewVal = { m_val: null }; res = this.bcr.Read1(length, function (t, l) { - return oThis.ReadCT_Boolean(t, l, oNewVal); + return oThis.ReadCT_Order(t, l, oNewVal); }); if (null != oNewVal.m_val) - val.setOverlay(oNewVal.m_val); - } - else if (c_oserct_titleSPPR === type) { - val.setSpPr(this.ReadSpPr(length)); - } - else if (c_oserct_titleTXPR === type) { - val.setTxPr(this.ReadTxPr(length)); - val.txPr.setParent(val); + val.setOrder(oNewVal.m_val); } - else if (c_oserct_titleALIGN === type) { - var oNewVal; - oNewVal = {}; + else if (c_oserct_trendlinePERIOD === type) { + var oNewVal = { m_val: null }; res = this.bcr.Read1(length, function (t, l) { - return oThis.ReadCT_PosAlign(t, l, oNewVal); // todoo this class + return oThis.ReadCT_Period(t, l, oNewVal); }); + if (null != oNewVal.m_val) + val.setPeriod(oNewVal.m_val); } - else if (c_oserct_titleEXTLST === type) { - var oNewVal; - oNewVal = {}; + else if (c_oserct_trendlineFORWARD === type) { + var oNewVal = { m_val: null }; res = this.bcr.Read1(length, function (t, l) { - return oThis.ReadCT_extLst(t, l, oNewVal); + return oThis.ReadCT_Double(t, l, oNewVal); }); - // val.m_extLst = oNewVal; - } - else - res = c_oSerConstants.ReadUnknown; - return res; -}; -BinaryChartReader.prototype.ReadCT_Tx = function (type, length, val) { - var res = c_oSerConstants.ReadOk; - var oThis = this; - if (c_oserct_txRICH === type) { - val.setRich(this.ReadTxPr(length)); - val.rich.setParent(val); + if (null != oNewVal.m_val) + val.setForward(oNewVal.m_val); } - else if (c_oserct_txSTRREF === type) { - var oNewVal = new AscFormat.CStrRef(); + else if (c_oserct_trendlineBACKWARD === type) { + var oNewVal = { m_val: null }; res = this.bcr.Read1(length, function (t, l) { - return oThis.ReadCT_StrRef(t, l, oNewVal); + return oThis.ReadCT_Double(t, l, oNewVal); }); - val.setStrRef(oNewVal); - } - else - res = c_oSerConstants.ReadUnknown; - return res; -}; -BinaryChartReader.prototype.ReadCT_StrRef = function (type, length, val) { - var res = c_oSerConstants.ReadOk; - var oThis = this; - if (c_oserct_strrefF === type) { - val.setF(this.stream.GetString2LE(length)); + if (null != oNewVal.m_val) + val.setBackward(oNewVal.m_val); } - else if (c_oserct_strrefSTRCACHE === type) { - var oNewVal = new AscFormat.CStrCache(); + else if (c_oserct_trendlineINTERCEPT === type) { + var oNewVal = { m_val: null }; res = this.bcr.Read1(length, function (t, l) { - return oThis.ReadCT_StrData(t, l, oNewVal); + return oThis.ReadCT_Double(t, l, oNewVal); }); - val.setStrCache(oNewVal); + if (null != oNewVal.m_val) + val.setIntercept(oNewVal.m_val); } - else if (c_oserct_strrefEXTLST === type) { - var oNewVal; - oNewVal = {}; + else if (c_oserct_trendlineDISPRSQR === type) { + var oNewVal = { m_val: null }; res = this.bcr.Read1(length, function (t, l) { - return oThis.ReadCT_extLst(t, l, oNewVal); + return oThis.ReadCT_Boolean(t, l, oNewVal); }); - // val.m_extLst = oNewVal; + if (null != oNewVal.m_val) + val.setDispRSqr(oNewVal.m_val); } - else - res = c_oSerConstants.ReadUnknown; - return res; -}; -BinaryChartReader.prototype.ReadCT_StrData = function (type, length, val) { - var res = c_oSerConstants.ReadOk; - var oThis = this; - if (c_oserct_strdataPTCOUNT === type) { + else if (c_oserct_trendlineDISPEQ === type) { var oNewVal = { m_val: null }; res = this.bcr.Read1(length, function (t, l) { - return oThis.ReadCT_UnsignedInt(t, l, oNewVal); + return oThis.ReadCT_Boolean(t, l, oNewVal); }); if (null != oNewVal.m_val) - val.setPtCount(oNewVal.m_val); + val.setDispEq(oNewVal.m_val); } - else if (c_oserct_strdataPT === type) { - var oNewVal = new AscFormat.CStringPoint(); + else if (c_oserct_trendlineTRENDLINELBL === type) { + var oNewVal = new AscFormat.CDLbl(); res = this.bcr.Read1(length, function (t, l) { - return oThis.ReadCT_StrVal(t, l, oNewVal); + return oThis.ReadCT_TrendlineLbl(t, l, oNewVal); }); - val.addPt(oNewVal); + oNewVal.correctValues(); + val.setTrendlineLbl(oNewVal); } - else if (c_oserct_strdataEXTLST === type) { + else if (c_oserct_trendlineEXTLST === type) { var oNewVal; oNewVal = {}; res = this.bcr.Read1(length, function (t, l) { @@ -7599,80 +10059,39 @@ BinaryChartReader.prototype.ReadCT_StrData = function (type, length, val) { res = c_oSerConstants.ReadUnknown; return res; }; -BinaryChartReader.prototype.ReadCT_StrVal = function (type, length, val) { - var res = c_oSerConstants.ReadOk; - var oThis = this; - if (c_oserct_strvalV === type) { - val.setVal(this.stream.GetString2LE(length)); - } - else if (c_oserct_strvalIDX === type) { - val.setIdx(this.stream.GetULongLE()); - } - else - res = c_oSerConstants.ReadUnknown; - return res; -}; -BinaryChartReader.prototype.ReadCT_NumFmt = function (type, length, val) { - var res = c_oSerConstants.ReadOk; - var oThis = this; - if (c_oserct_numfmtFORMATCODE === type) { - val.setFormatCode(this.stream.GetString2LE(length)); - } - else if (c_oserct_numfmtSOURCELINKED === type) { - val.setSourceLinked(this.stream.GetBool()); - } - else - res = c_oSerConstants.ReadUnknown; - return res; -}; -BinaryChartReader.prototype.ReadCT_TickMark = function (type, length, val) { - var res = c_oSerConstants.ReadOk; - var oThis = this; - if (c_oserct_tickmarkVAL === type) { - switch (this.stream.GetUChar()) { - case st_tickmarkCROSS: val.m_val = c_oAscTickMark.TICK_MARK_CROSS; break; - case st_tickmarkIN: val.m_val = c_oAscTickMark.TICK_MARK_IN; break; - case st_tickmarkNONE: val.m_val = c_oAscTickMark.TICK_MARK_NONE; break; - case st_tickmarkOUT: val.m_val = c_oAscTickMark.TICK_MARK_OUT; break; - } - } - else - res = c_oSerConstants.ReadUnknown; - return res; -}; -BinaryChartReader.prototype.ReadCT_TickLblPos = function (type, length, val) { +BinaryChartReader.prototype.ReadCT_TrendlineType = function (type, length, val) { var res = c_oSerConstants.ReadOk; var oThis = this; - if (c_oserct_ticklblposVAL === type) { + if (c_oserct_trendlinetypeVAL === type) { switch (this.stream.GetUChar()) { - case st_ticklblposHIGH: val.m_val = c_oAscTickLabelsPos.TICK_LABEL_POSITION_HIGH; break; - case st_ticklblposLOW: val.m_val = c_oAscTickLabelsPos.TICK_LABEL_POSITION_LOW; break; - case st_ticklblposNEXTTO: val.m_val = c_oAscTickLabelsPos.TICK_LABEL_POSITION_NEXT_TO; break; - case st_ticklblposNONE: val.m_val = c_oAscTickLabelsPos.TICK_LABEL_POSITION_NONE; break; + case st_trendlinetypeEXP: val.m_val = TRENDLINE_TYPE_EXP; break; + case st_trendlinetypeLINEAR: val.m_val = TRENDLINE_TYPE_LINEAR; break; + case st_trendlinetypeLOG: val.m_val = TRENDLINE_TYPE_LOG; break; + case st_trendlinetypeMOVINGAVG: val.m_val = TRENDLINE_TYPE_MOVING_AVG; break; + case st_trendlinetypePOLY: val.m_val = TRENDLINE_TYPE_POLY; break; + case st_trendlinetypePOWER: val.m_val = TRENDLINE_TYPE_POWER; break; } } else res = c_oSerConstants.ReadUnknown; return res; }; -BinaryChartReader.prototype.ReadCT_Crosses = function (type, length, val) { +BinaryChartReader.prototype.ReadCT_Order = function (type, length, val) { var res = c_oSerConstants.ReadOk; var oThis = this; - if (c_oserct_crossesVAL === type) { - switch (this.stream.GetUChar()) { - case st_crossesAUTOZERO: val.m_val = AscFormat.CROSSES_AUTO_ZERO; break; - case st_crossesMAX: val.m_val = AscFormat.CROSSES_MAX; break; - case st_crossesMIN: val.m_val = AscFormat.CROSSES_MIN; break; - } + if (c_oserct_orderVAL === type) { + var oNewVal; + oNewVal = this.stream.GetUChar(); + val.m_val = oNewVal; } else res = c_oSerConstants.ReadUnknown; return res; }; -BinaryChartReader.prototype.ReadCT_Skip = function (type, length, val) { +BinaryChartReader.prototype.ReadCT_Period = function (type, length, val) { var res = c_oSerConstants.ReadOk; var oThis = this; - if (c_oserct_skipVAL === type) { + if (c_oserct_periodVAL === type) { var oNewVal; oNewVal = this.stream.GetULongLE(); val.m_val = oNewVal; @@ -7681,215 +10100,109 @@ BinaryChartReader.prototype.ReadCT_Skip = function (type, length, val) { res = c_oSerConstants.ReadUnknown; return res; }; -BinaryChartReader.prototype.ReadCT_TimeUnit = function (type, length, val) { - var res = c_oSerConstants.ReadOk; - var oThis = this; - if (c_oserct_timeunitVAL === type) { - switch (this.stream.GetUChar()) { - case st_timeunitDAYS: val.m_val = AscFormat.TIME_UNIT_DAYS; break; - case st_timeunitMONTHS: val.m_val = AscFormat.TIME_UNIT_MONTHS; break; - case st_timeunitYEARS: val.m_val = AscFormat.TIME_UNIT_YEARS; break; - } - } - else - res = c_oSerConstants.ReadUnknown; - return res; -}; -BinaryChartReader.prototype.ReadCT_DateAx = function (type, length, val) { +BinaryChartReader.prototype.ReadCT_TrendlineLbl = function (type, length, val) { var res = c_oSerConstants.ReadOk; var oThis = this; - if (c_oserct_dateaxAXID === type) { - var oNewVal = { m_val: null }; - res = this.bcr.Read1(length, function (t, l) { - return oThis.ReadCT_UnsignedInt(t, l, oNewVal); - }); - if (null != oNewVal.m_val) - val.setAxId(oNewVal.m_val); - } - else if (c_oserct_dateaxSCALING === type) { - var oNewVal = new AscFormat.CScaling(); - res = this.bcr.Read1(length, function (t, l) { - return oThis.ReadCT_Scaling(t, l, oNewVal); - }); - val.setScaling(oNewVal); - } - else if (c_oserct_dateaxDELETE === type) { - var oNewVal = { m_val: null }; - res = this.bcr.Read1(length, function (t, l) { - return oThis.ReadCT_Boolean(t, l, oNewVal); - }); - if (null != oNewVal.m_val) - val.setDelete(oNewVal.m_val); - else - val.setDelete(true); - } - else if (c_oserct_dateaxAXPOS === type) { - var oNewVal = { m_val: null }; - res = this.bcr.Read1(length, function (t, l) { - return oThis.ReadCT_AxPos(t, l, oNewVal); - }); - if (null != oNewVal.m_val) - val.setAxPos(oNewVal.m_val); - } - else if (c_oserct_dateaxMAJORGRIDLINES === type) { - var oNewVal = { spPr: null }; - res = this.bcr.Read1(length, function (t, l) { - return oThis.ReadCT_ChartLines(t, l, oNewVal); - }); - if (null != oNewVal.spPr) - val.setMajorGridlines(oNewVal.spPr); - else - val.setMajorGridlines(new AscFormat.CSpPr()); - } - else if (c_oserct_dateaxMINORGRIDLINES === type) { - var oNewVal = { spPr: null }; + if (c_oserct_trendlinelblLAYOUT === type) { res = this.bcr.Read1(length, function (t, l) { - return oThis.ReadCT_ChartLines(t, l, oNewVal); + return oThis.ReadCT_Layout(t, l, val); }); - if (null != oNewVal.spPr) - val.setMinorGridlines(oNewVal.spPr); - else - val.setMinorGridlines(new AscFormat.CSpPr()); } - else if (c_oserct_dateaxTITLE === type) { - var oNewVal = new AscFormat.CTitle(); + else if (c_oserct_trendlinelblTX === type) { + var oNewVal = new AscFormat.CChartText(); res = this.bcr.Read1(length, function (t, l) { - return oThis.ReadCT_Title(t, l, oNewVal); + return oThis.ReadCT_Tx(t, l, oNewVal); }); - if(!AscFormat.isRealBool(oNewVal.overlay)) - { - oNewVal.setOverlay(false); - } - val.setTitle(oNewVal); + oNewVal.setChart(this.curChart); + val.setTx(oNewVal); } - else if (c_oserct_dateaxNUMFMT === type) { + else if (c_oserct_trendlinelblNUMFMT === type) { var oNewVal = new AscFormat.CNumFmt(); res = this.bcr.Read1(length, function (t, l) { return oThis.ReadCT_NumFmt(t, l, oNewVal); }); val.setNumFmt(oNewVal); } - else if (c_oserct_dateaxMAJORTICKMARK === type) { - var oNewVal = { m_val: null }; - res = this.bcr.Read1(length, function (t, l) { - return oThis.ReadCT_TickMark(t, l, oNewVal); - }); - if (null != oNewVal.m_val) - val.setMajorTickMark(oNewVal.m_val); - else{ - val.setMajorTickMark(c_oAscTickMark.TICK_MARK_CROSS); - } - } - else if (c_oserct_dateaxMINORTICKMARK === type) { - var oNewVal = { m_val: null }; - res = this.bcr.Read1(length, function (t, l) { - return oThis.ReadCT_TickMark(t, l, oNewVal); - }); - if (null != oNewVal.m_val) - val.setMinorTickMark(oNewVal.m_val); - else{ - val.setMajorTickMark(c_oAscTickMark.TICK_MARK_CROSS); - } - } - else if (c_oserct_dateaxTICKLBLPOS === type) { - var oNewVal = { m_val: null }; - res = this.bcr.Read1(length, function (t, l) { - return oThis.ReadCT_TickLblPos(t, l, oNewVal); - }); - if (null != oNewVal.m_val) - val.setTickLblPos(oNewVal.m_val); - } - else if (c_oserct_dateaxSPPR === type) { + else if (c_oserct_trendlinelblSPPR === type) { val.setSpPr(this.ReadSpPr(length)); } - else if (c_oserct_dateaxTXPR === type) { + else if (c_oserct_trendlinelblTXPR === type) { val.setTxPr(this.ReadTxPr(length)); val.txPr.setParent(val); } - else if (c_oserct_dateaxCROSSAX === type) { - var oNewVal = { m_val: null }; + else if (c_oserct_trendlinelblEXTLST === type) { + var oNewVal; + oNewVal = {}; res = this.bcr.Read1(length, function (t, l) { - return oThis.ReadCT_UnsignedInt(t, l, oNewVal); + return oThis.ReadCT_extLst(t, l, oNewVal); }); - - if (null != oNewVal.m_val) - { - val.crossAxId = oNewVal.m_val; - } + // val.m_extLst = oNewVal; } - else if (c_oserct_dateaxCROSSES === type) { + else + res = c_oSerConstants.ReadUnknown; + return res; +}; +BinaryChartReader.prototype.ReadCT_ErrBars = function (type, length, val) { + var res = c_oSerConstants.ReadOk; + var oThis = this; + if (c_oserct_errbarsERRDIR === type) { var oNewVal = { m_val: null }; res = this.bcr.Read1(length, function (t, l) { - return oThis.ReadCT_Crosses(t, l, oNewVal); + return oThis.ReadCT_ErrDir(t, l, oNewVal); }); if (null != oNewVal.m_val) - val.setCrosses(oNewVal.m_val); + val.setErrDir(oNewVal.m_val); } - else if (c_oserct_dateaxCROSSESAT === type) { + else if (c_oserct_errbarsERRBARTYPE === type) { var oNewVal = { m_val: null }; res = this.bcr.Read1(length, function (t, l) { - return oThis.ReadCT_Double(t, l, oNewVal); + return oThis.ReadCT_ErrBarType(t, l, oNewVal); }); if (null != oNewVal.m_val) - val.setCrossesAt(oNewVal.m_val); + val.setErrBarType(oNewVal.m_val); } - else if (c_oserct_dateaxAUTO === type) { + else if (c_oserct_errbarsERRVALTYPE === type) { var oNewVal = { m_val: null }; res = this.bcr.Read1(length, function (t, l) { - return oThis.ReadCT_Boolean(t, l, oNewVal); + return oThis.ReadCT_ErrValType(t, l, oNewVal); }); if (null != oNewVal.m_val) - val.setAuto(oNewVal.m_val); + val.setErrValType(oNewVal.m_val); } - else if (c_oserct_dateaxLBLOFFSET === type) { + else if (c_oserct_errbarsNOENDCAP === type) { var oNewVal = { m_val: null }; res = this.bcr.Read1(length, function (t, l) { - return oThis.ReadCT_LblOffset(t, l, oNewVal); + return oThis.ReadCT_Boolean(t, l, oNewVal); }); if (null != oNewVal.m_val) - val.setLblOffset(oNewVal.m_val); - } - else if (c_oserct_dateaxBASETIMEUNIT === type) { - var oNewVal = { m_val: null }; - res = this.bcr.Read1(length, function (t, l) { - return oThis.ReadCT_TimeUnit(t, l, oNewVal); - }); - // if (null != oNewVal.m_val) { - // val.setMinorTimeUnit(oNewVal.m_val); + val.setNoEndCap(oNewVal.m_val); } - else if (c_oserct_dateaxMAJORUNIT === type) { - var oNewVal = { m_val: null }; + else if (c_oserct_errbarsPLUS === type) { + var oNewVal = new AscFormat.CMinusPlus(); res = this.bcr.Read1(length, function (t, l) { - return oThis.ReadCT_AxisUnit(t, l, oNewVal); + return oThis.ReadCT_NumDataSource(t, l, oNewVal); }); - // if (null != oNewVal.m_val) - // val.setMajorUnit(oNewVal.m_val); + val.setPlus(oNewVal); } - else if (c_oserct_dateaxMAJORTIMEUNIT === type) { - var oNewVal = { m_val: null }; + else if (c_oserct_errbarsMINUS === type) { + var oNewVal = new AscFormat.CMinusPlus(); res = this.bcr.Read1(length, function (t, l) { - return oThis.ReadCT_TimeUnit(t, l, oNewVal); + return oThis.ReadCT_NumDataSource(t, l, oNewVal); }); - // if (null != oNewVal.m_val) { - // val.setMinorTimeUnit(oNewVal.m_val); + val.setMinus(oNewVal); } - else if (c_oserct_dateaxMINORUNIT === type) { + else if (c_oserct_errbarsVAL === type) { var oNewVal = { m_val: null }; res = this.bcr.Read1(length, function (t, l) { - return oThis.ReadCT_AxisUnit(t, l, oNewVal); + return oThis.ReadCT_Double(t, l, oNewVal); }); - // if (null != oNewVal.m_val) - // val.setMinorUnit(oNewVal.m_val); + if (null != oNewVal.m_val) + val.setVal(oNewVal.m_val); } - else if (c_oserct_dateaxMINORTIMEUNIT === type) { - var oNewVal = { m_val: null }; - res = this.bcr.Read1(length, function (t, l) { - return oThis.ReadCT_TimeUnit(t, l, oNewVal); - }); - // if (null != oNewVal.m_val) - // val.setMinorTimeUnit(oNewVal.m_val); + else if (c_oserct_errbarsSPPR === type) { + val.setSpPr(this.ReadSpPr(length)); } - else if (c_oserct_dateaxEXTLST === type) { + else if (c_oserct_errbarsEXTLST === type) { var oNewVal; oNewVal = {}; res = this.bcr.Read1(length, function (t, l) { @@ -7901,229 +10214,202 @@ BinaryChartReader.prototype.ReadCT_DateAx = function (type, length, val) { res = c_oSerConstants.ReadUnknown; return res; }; -BinaryChartReader.prototype.ReadCT_LblOffset = function (type, length, val) { +BinaryChartReader.prototype.ReadCT_ErrDir = function (type, length, val) { var res = c_oSerConstants.ReadOk; var oThis = this; - if (c_oserct_lbloffsetVAL === type) { - val.m_val = this.ParsePersent(this.stream.GetString2LE(length)); + if (c_oserct_errdirVAL === type) { + switch (this.stream.GetUChar()) { + case st_errdirX: val.m_val = ERR_DIR_X; break; + case st_errdirY: val.m_val = ERR_DIR_Y; break; + } } else res = c_oSerConstants.ReadUnknown; return res; }; -BinaryChartReader.prototype.ReadCT_AxisUnit = function (type, length, val) { +BinaryChartReader.prototype.ReadCT_ErrBarType = function (type, length, val) { var res = c_oSerConstants.ReadOk; var oThis = this; - if (c_oserct_axisunitVAL === type) { - var oNewVal; - oNewVal = this.stream.GetDoubleLE(); - val.m_val = oNewVal; + if (c_oserct_errbartypeVAL === type) { + switch (this.stream.GetUChar()) { + case st_errbartypeBOTH: val.m_val = ERR_BAR_TYPE_BOTH; break; + case st_errbartypeMINUS: val.m_val = ERR_BAR_TYPE_MINUS; break; + case st_errbartypePLUS: val.m_val = ERR_BAR_TYPE_PLUS; break; + } } else res = c_oSerConstants.ReadUnknown; return res; }; -BinaryChartReader.prototype.ReadCT_LblAlgn = function (type, length, val) { +BinaryChartReader.prototype.ReadCT_ErrValType = function (type, length, val) { var res = c_oSerConstants.ReadOk; var oThis = this; - if (c_oserct_lblalgnVAL === type) { + if (c_oserct_errvaltypeVAL === type) { switch (this.stream.GetUChar()) { - case st_lblalgnCTR: val.m_val = AscFormat.LBL_ALG_CTR; break; - case st_lblalgnL: val.m_val = AscFormat.LBL_ALG_L; break; - case st_lblalgnR: val.m_val = AscFormat.LBL_ALG_R; break; + case st_errvaltypeCUST: val.m_val = ERR_VAL_TYPE_CUST; break; + case st_errvaltypeFIXEDVAL: val.m_val = ERR_VAL_TYPE_FIXED_VAL; break; + case st_errvaltypePERCENTAGE: val.m_val = ERR_VAL_TYPE_PERCENTAGE; break; + case st_errvaltypeSTDDEV: val.m_val = ERR_VAL_TYPE_STD_DEV; break; + case st_errvaltypeSTDERR: val.m_val = ERR_VAL_TYPE_STD_ERR; break; } } else res = c_oSerConstants.ReadUnknown; return res; }; -BinaryChartReader.prototype.ReadCT_CatAx = function (type, length, val) { +BinaryChartReader.prototype.ReadCT_NumDataSource = function (type, length, val) { var res = c_oSerConstants.ReadOk; var oThis = this; - if (c_oserct_cataxAXID === type) { - var oNewVal = { m_val: null }; - res = this.bcr.Read1(length, function (t, l) { - return oThis.ReadCT_UnsignedInt(t, l, oNewVal); - }); - if (null != oNewVal.m_val) - val.setAxId(oNewVal.m_val); - } - else if (c_oserct_cataxSCALING === type) { - var oNewVal = new AscFormat.CScaling(); - res = this.bcr.Read1(length, function (t, l) { - return oThis.ReadCT_Scaling(t, l, oNewVal); - }); - val.setScaling(oNewVal); - } - else if (c_oserct_cataxDELETE === type) { - var oNewVal = { m_val: null }; - res = this.bcr.Read1(length, function (t, l) { - return oThis.ReadCT_Boolean(t, l, oNewVal); - }); - if (null != oNewVal.m_val) - val.setDelete(oNewVal.m_val); - else - val.setDelete(true); - } - else if (c_oserct_cataxAXPOS === type) { - var oNewVal = { m_val: null }; - res = this.bcr.Read1(length, function (t, l) { - return oThis.ReadCT_AxPos(t, l, oNewVal); - }); - if (null != oNewVal.m_val) - val.setAxPos(oNewVal.m_val); - } - else if (c_oserct_cataxMAJORGRIDLINES === type) { - var oNewVal = { spPr: null }; - res = this.bcr.Read1(length, function (t, l) { - return oThis.ReadCT_ChartLines(t, l, oNewVal); - }); - if (null != oNewVal.spPr) - val.setMajorGridlines(oNewVal.spPr); - else - val.setMajorGridlines(new AscFormat.CSpPr()); - } - else if (c_oserct_cataxMINORGRIDLINES === type) { - var oNewVal = { spPr: null }; + if (c_oserct_numdatasourceNUMLIT === type) { + var oNewVal = new AscFormat.CNumLit(); res = this.bcr.Read1(length, function (t, l) { - return oThis.ReadCT_ChartLines(t, l, oNewVal); + return oThis.ReadCT_NumData(t, l, oNewVal); }); - if (null != oNewVal.spPr) - val.setMinorGridlines(oNewVal.spPr); - else - val.setMinorGridlines(new AscFormat.CSpPr()); + val.setNumLit(oNewVal); } - else if (c_oserct_cataxTITLE === type) { - var oNewVal = new AscFormat.CTitle(); + else if (c_oserct_numdatasourceNUMREF === type) { + var oNewVal = new AscFormat.CNumRef(); res = this.bcr.Read1(length, function (t, l) { - return oThis.ReadCT_Title(t, l, oNewVal); + return oThis.ReadCT_NumRef(t, l, oNewVal); }); - if(!AscFormat.isRealBool(oNewVal.overlay)) - { - oNewVal.setOverlay(true); - } - val.setTitle(oNewVal); + val.setNumRef(oNewVal); } - else if (c_oserct_cataxNUMFMT === type) { - var oNewVal = new AscFormat.CNumFmt(); - res = this.bcr.Read1(length, function (t, l) { - return oThis.ReadCT_NumFmt(t, l, oNewVal); - }); - val.setNumFmt(oNewVal); + else + res = c_oSerConstants.ReadUnknown; + return res; +}; +BinaryChartReader.prototype.ReadCT_NumData = function (type, length, val) { + var res = c_oSerConstants.ReadOk; + var oThis = this; + if (c_oserct_numdataFORMATCODE === type) { + val.setFormatCode(this.stream.GetString2LE(length)); } - else if (c_oserct_cataxMAJORTICKMARK === type) { + else if (c_oserct_numdataPTCOUNT === type) { var oNewVal = { m_val: null }; res = this.bcr.Read1(length, function (t, l) { - return oThis.ReadCT_TickMark(t, l, oNewVal); + return oThis.ReadCT_UnsignedInt(t, l, oNewVal); }); if (null != oNewVal.m_val) - val.setMajorTickMark(oNewVal.m_val); - else{ - val.setMajorTickMark(c_oAscTickMark.TICK_MARK_CROSS); - } + val.setPtCount(oNewVal.m_val); } - else if (c_oserct_cataxMINORTICKMARK === type) { - var oNewVal = { m_val: null }; + else if (c_oserct_numdataPT === type) { + var oNewVal = new AscFormat.CNumericPoint(); res = this.bcr.Read1(length, function (t, l) { - return oThis.ReadCT_TickMark(t, l, oNewVal); + return oThis.ReadCT_NumVal(t, l, oNewVal); }); - if (null != oNewVal.m_val) - val.setMinorTickMark(oNewVal.m_val); - else{ - val.setMajorTickMark(c_oAscTickMark.TICK_MARK_CROSS); - } + val.addPt(oNewVal); } - else if (c_oserct_cataxTICKLBLPOS === type) { - var oNewVal = { m_val: null }; + else if (c_oserct_numdataEXTLST === type) { + var oNewVal; + oNewVal = {}; res = this.bcr.Read1(length, function (t, l) { - return oThis.ReadCT_TickLblPos(t, l, oNewVal); + return oThis.ReadCT_extLst(t, l, oNewVal); }); - if (null != oNewVal.m_val) - val.setTickLblPos(oNewVal.m_val); + // val.m_extLst = oNewVal; } - else if (c_oserct_cataxSPPR === type) { - val.setSpPr(this.ReadSpPr(length)); + else + res = c_oSerConstants.ReadUnknown; + return res; +}; +BinaryChartReader.prototype.ReadCT_NumVal = function (type, length, val) { + var res = c_oSerConstants.ReadOk; + var oThis = this; + if (c_oserct_numvalV === type) { + var nVal = parseFloat(this.stream.GetString2LE(length)); + if(isNaN(nVal)) + nVal = 0; + val.setVal(nVal); } - else if (c_oserct_cataxTXPR === type) { - val.setTxPr(this.ReadTxPr(length)); - val.txPr.setParent(val); + else if (c_oserct_numvalIDX === type) { + val.setIdx(this.stream.GetULongLE()); } - else if (c_oserct_cataxCROSSAX === type) { - var oNewVal = { m_val: null }; - res = this.bcr.Read1(length, function (t, l) { - return oThis.ReadCT_UnsignedInt(t, l, oNewVal); - }); - if (null != oNewVal.m_val) - { - val.crossAxId = oNewVal.m_val; - } + else if (c_oserct_numvalFORMATCODE === type) { + val.setFormatCode(this.stream.GetString2LE(length)); } - else if (c_oserct_cataxCROSSES === type) { - var oNewVal = { m_val: null }; + else + res = c_oSerConstants.ReadUnknown; + return res; +}; +BinaryChartReader.prototype.ReadCT_NumRef = function (type, length, val) { + var res = c_oSerConstants.ReadOk; + var oThis = this; + if (c_oserct_numrefF === type) { + val.setF(this.stream.GetString2LE(length)); + } + else if (c_oserct_numrefNUMCACHE === type) { + var oNewVal = new AscFormat.CNumLit(); res = this.bcr.Read1(length, function (t, l) { - return oThis.ReadCT_Crosses(t, l, oNewVal); + return oThis.ReadCT_NumData(t, l, oNewVal); }); - if (null != oNewVal.m_val) - val.setCrosses(oNewVal.m_val); - + val.setNumCache(oNewVal); } - else if (c_oserct_cataxCROSSESAT === type) { - var oNewVal = { m_val: null }; + else if (c_oserct_numrefEXTLST === type) { + var oNewVal = {}; res = this.bcr.Read1(length, function (t, l) { - return oThis.ReadCT_Double(t, l, oNewVal); + return oThis.ReadCT_extLst(t, l, oNewVal); }); - if (null != oNewVal.m_val) - val.setCrossesAt(oNewVal.m_val); + // val.m_extLst = oNewVal; } - else if (c_oserct_cataxAUTO === type) { - var oNewVal = { m_val: null }; + else + res = c_oSerConstants.ReadUnknown; + return res; +}; +BinaryChartReader.prototype.ReadCT_AxDataSource = function (type, length, val) { + var res = c_oSerConstants.ReadOk; + var oThis = this; + if (c_oserct_axdatasourceMULTILVLSTRREF === type) { + var oNewVal = new AscFormat.CMultiLvlStrRef(); res = this.bcr.Read1(length, function (t, l) { - return oThis.ReadCT_Boolean(t, l, oNewVal); + return oThis.ReadCT_MultiLvlStrRef(t, l, oNewVal); }); - if (null != oNewVal.m_val) - val.setAuto(oNewVal.m_val); + val.setMultiLvlStrRef(oNewVal); } - else if (c_oserct_cataxLBLALGN === type) { - var oNewVal = { m_val: null }; + else if (c_oserct_axdatasourceNUMLIT === type) { + var oNewVal = new AscFormat.CNumLit(); res = this.bcr.Read1(length, function (t, l) { - return oThis.ReadCT_LblAlgn(t, l, oNewVal); + return oThis.ReadCT_NumData(t, l, oNewVal); }); - if (null != oNewVal.m_val) - val.setLblAlgn(oNewVal.m_val); + val.setNumLit(oNewVal); } - else if (c_oserct_cataxLBLOFFSET === type) { - var oNewVal = { m_val: null }; + else if (c_oserct_axdatasourceNUMREF === type) { + var oNewVal = new AscFormat.CNumRef(); res = this.bcr.Read1(length, function (t, l) { - return oThis.ReadCT_LblOffset(t, l, oNewVal); + return oThis.ReadCT_NumRef(t, l, oNewVal); }); - if (null != oNewVal.m_val) - val.setLblOffset(oNewVal.m_val); + val.setNumRef(oNewVal); } - else if (c_oserct_cataxTICKLBLSKIP === type) { - var oNewVal = { m_val: null }; + else if (c_oserct_axdatasourceSTRLIT === type) { + var oNewVal = new AscFormat.CStrCache(); res = this.bcr.Read1(length, function (t, l) { - return oThis.ReadCT_Skip(t, l, oNewVal); + return oThis.ReadCT_StrData(t, l, oNewVal); }); - if (null != oNewVal.m_val) - val.setTickLblSkip(oNewVal.m_val); + val.setStrLit(oNewVal); } - else if (c_oserct_cataxTICKMARKSKIP === type) { - var oNewVal = { m_val: null }; + else if (c_oserct_axdatasourceSTRREF === type) { + var oNewVal = new AscFormat.CStrRef(); res = this.bcr.Read1(length, function (t, l) { - return oThis.ReadCT_Skip(t, l, oNewVal); + return oThis.ReadCT_StrRef(t, l, oNewVal); }); - if (null != oNewVal.m_val) - val.setTickMarkSkip(oNewVal.m_val); + val.setStrRef(oNewVal); } - else if (c_oserct_cataxNOMULTILVLLBL === type) { - var oNewVal = { m_val: null }; + else + res = c_oSerConstants.ReadUnknown; + return res; +}; +BinaryChartReader.prototype.ReadCT_MultiLvlStrRef = function (type, length, val) { + var res = c_oSerConstants.ReadOk; + var oThis = this; + if (c_oserct_multilvlstrrefF === type) { + val.setF(this.stream.GetString2LE(length)); + } + else if (c_oserct_multilvlstrrefMULTILVLSTRCACHE === type) { + var oNewVal = new AscFormat.CMultiLvlStrCache(); res = this.bcr.Read1(length, function (t, l) { - return oThis.ReadCT_Boolean(t, l, oNewVal); + return oThis.ReadCT_MultiLvlStrData(t, l, oNewVal); }); - if (null != oNewVal.m_val) - val.setNoMultiLvlLbl(oNewVal.m_val); + val.setMultiLvlStrCache(oNewVal); } - else if (c_oserct_cataxEXTLST === type) { + else if (c_oserct_multilvlstrrefEXTLST === type) { var oNewVal; oNewVal = {}; res = this.bcr.Read1(length, function (t, l) { @@ -8135,83 +10421,118 @@ BinaryChartReader.prototype.ReadCT_CatAx = function (type, length, val) { res = c_oSerConstants.ReadUnknown; return res; }; -BinaryChartReader.prototype.ReadCT_DispUnitsLbl = function (type, length, val) { +BinaryChartReader.prototype.ReadCT_lvl = function (type, length, val) { var res = c_oSerConstants.ReadOk; var oThis = this; - if (c_oserct_dispunitslblLAYOUT === type) { + if (c_oserct_lvlPT === type) { + var oNewVal = new AscFormat.CStringPoint(); res = this.bcr.Read1(length, function (t, l) { - return oThis.ReadCT_Layout(t, l, val); + return oThis.ReadCT_StrVal(t, l, oNewVal); }); + val.addPt(oNewVal); } - else if (c_oserct_dispunitslblTX === type) { - var oNewVal = new AscFormat.CChartText(); + else + res = c_oSerConstants.ReadUnknown; + return res; +}; +BinaryChartReader.prototype.ReadCT_MultiLvlStrData = function (type, length, val) { + var res = c_oSerConstants.ReadOk; + var oThis = this; + if (c_oserct_multilvlstrdataPTCOUNT === type) { + var oNewVal = { m_val: null }; res = this.bcr.Read1(length, function (t, l) { - return oThis.ReadCT_Tx(t, l, oNewVal); + return oThis.ReadCT_UnsignedInt(t, l, oNewVal); }); - oNewVal.setChart(this.curChart); - val.setTx(oNewVal); + if (null != oNewVal.m_val) + val.setPtCount(oNewVal.m_val); } - else if (c_oserct_dispunitslblSPPR === type) { - val.setSpPr(this.ReadSpPr(length)); + else if (c_oserct_multilvlstrdataLVL === type) { + var oNewVal = new AscFormat.CStrCache(); + res = this.bcr.Read1(length, function (t, l) { + return oThis.ReadCT_lvl(t, l, oNewVal); + }); + val.addLvl(oNewVal); } - else if (c_oserct_dispunitslblTXPR === type) { - val.setTxPr(this.ReadTxPr(length)); - val.txPr.setParent(val); + else if (c_oserct_multilvlstrdataEXTLST === type) { + var oNewVal = {}; + res = this.bcr.Read1(length, function (t, l) { + return oThis.ReadCT_extLst(t, l, oNewVal); + }); + // val.m_extLst = oNewVal; } else res = c_oSerConstants.ReadUnknown; return res; }; -BinaryChartReader.prototype.ReadCT_BuiltInUnit = function (type, length, val) { +BinaryChartReader.prototype.ReadCT_BubbleChart = function (type, length, val, aChartWithAxis) { var res = c_oSerConstants.ReadOk; var oThis = this; - if (c_oserct_builtinunitVAL === type) { - switch (this.stream.GetUChar()) { - case st_builtinunitHUNDREDS: val.m_val = c_oAscValAxUnits.HUNDREDS; break; - case st_builtinunitTHOUSANDS: val.m_val = c_oAscValAxUnits.THOUSANDS; break; - case st_builtinunitTENTHOUSANDS: val.m_val = c_oAscValAxUnits.TEN_THOUSANDS; break; - case st_builtinunitHUNDREDTHOUSANDS: val.m_val = c_oAscValAxUnits.HUNDRED_THOUSANDS; break; - case st_builtinunitMILLIONS: val.m_val = c_oAscValAxUnits.MILLIONS; break; - case st_builtinunitTENMILLIONS: val.m_val = c_oAscValAxUnits.TEN_MILLIONS; break; - case st_builtinunitHUNDREDMILLIONS: val.m_val = c_oAscValAxUnits.HUNDRED_MILLIONS; break; - case st_builtinunitBILLIONS: val.m_val = c_oAscValAxUnits.BILLIONS; break; - case st_builtinunitTRILLIONS: val.m_val = c_oAscValAxUnits.TRILLIONS; break; - } + if (c_oserct_bubblechartVARYCOLORS === type) { + var oNewVal = { m_val: null }; + res = this.bcr.Read1(length, function (t, l) { + return oThis.ReadCT_Boolean(t, l, oNewVal); + }); + if (null != oNewVal.m_val) + val.setVaryColors(oNewVal.m_val); + } + else if (c_oserct_bubblechartSER === type) { + var oNewVal = new AscFormat.CBubbleSeries(); + res = this.bcr.Read1(length, function (t, l) { + return oThis.ReadCT_BubbleSer(t, l, oNewVal); + }); + val.addSer(oNewVal); + } + else if (c_oserct_bubblechartDLBLS === type) { + var oNewVal = new AscFormat.CDLbls(); + this.curChart.oDataLablesData = AscCommon.fSaveStream(this.bcr.stream, length); + res = this.bcr.Read1(length, function (t, l) { + return oThis.ReadCT_DLbls(t, l, oNewVal); + }); + oNewVal.correctValues(); + val.setDLbls(oNewVal); + } + else if (c_oserct_bubblechartBUBBLE3D === type) { + var oNewVal = { m_val: null }; + res = this.bcr.Read1(length, function (t, l) { + return oThis.ReadCT_Boolean(t, l, oNewVal); + }); + if (null != oNewVal.m_val) + val.setBubble3D(oNewVal.m_val); + } + else if (c_oserct_bubblechartBUBBLESCALE === type) { + var oNewVal = { m_val: null }; + res = this.bcr.Read1(length, function (t, l) { + return oThis.ReadCT_BubbleScale(t, l, oNewVal); + }); + if (null != oNewVal.m_val) + val.setBubbleScale(oNewVal.m_val); } - else - res = c_oSerConstants.ReadUnknown; - return res; -}; -BinaryChartReader.prototype.ReadCT_DispUnits = function (type, length, val) { - var res = c_oSerConstants.ReadOk; - var oThis = this; - if (c_oserct_dispunitsBUILTINUNIT === type) { + else if (c_oserct_bubblechartSHOWNEGBUBBLES === type) { var oNewVal = { m_val: null }; res = this.bcr.Read1(length, function (t, l) { - return oThis.ReadCT_BuiltInUnit(t, l, oNewVal); + return oThis.ReadCT_Boolean(t, l, oNewVal); }); if (null != oNewVal.m_val) - val.setBuiltInUnit(oNewVal.m_val); + val.setShowNegBubbles(oNewVal.m_val); } - else if (c_oserct_dispunitsCUSTUNIT === type) { + else if (c_oserct_bubblechartSIZEREPRESENTS === type) { var oNewVal = { m_val: null }; res = this.bcr.Read1(length, function (t, l) { - return oThis.ReadCT_Double(t, l, oNewVal); + return oThis.ReadCT_SizeRepresents(t, l, oNewVal); }); if (null != oNewVal.m_val) - val.setCustUnit(oNewVal.m_val); + val.setSizeRepresents(oNewVal.m_val); } - else if (c_oserct_dispunitsDISPUNITSLBL === type) { - var oNewVal = new AscFormat.CDLbl(); + else if (c_oserct_bubblechartAXID === type) { + var oNewVal = { m_val: null }; res = this.bcr.Read1(length, function (t, l) { - return oThis.ReadCT_DispUnitsLbl(t, l, oNewVal); + return oThis.ReadCT_UnsignedInt(t, l, oNewVal); }); - oNewVal.correctValues(); - val.setDispUnitsLbl(oNewVal); + if (null != oNewVal.m_val) + aChartWithAxis.push({ axisId: oNewVal.m_val, chart: val }); } - else if (c_oserct_dispunitsEXTLST === type) { - var oNewVal; - oNewVal = {}; + else if (c_oserct_bubblechartEXTLST === type) { + var oNewVal = {}; res = this.bcr.Read1(length, function (t, l) { return oThis.ReadCT_extLst(t, l, oNewVal); }); @@ -8221,190 +10542,171 @@ BinaryChartReader.prototype.ReadCT_DispUnits = function (type, length, val) { res = c_oSerConstants.ReadUnknown; return res; }; -BinaryChartReader.prototype.ReadCT_CrossBetween = function (type, length, val) { +BinaryChartReader.prototype.ReadCT_bandFmts = function (type, length, val) { var res = c_oSerConstants.ReadOk; var oThis = this; - if (c_oserct_crossbetweenVAL === type) { - switch (this.stream.GetUChar()) { - case st_crossbetweenBETWEEN: val.m_val = AscFormat.CROSS_BETWEEN_BETWEEN; break; - case st_crossbetweenMIDCAT: val.m_val = AscFormat.CROSS_BETWEEN_MID_CAT; break; - } + if (c_oserct_bandfmtsBANDFMT === type) { + var oNewVal = new AscFormat.CBandFmt(); + res = this.bcr.Read1(length, function (t, l) { + return oThis.ReadCT_BandFmt(t, l, oNewVal); + }); + val.addBandFmt(oNewVal); } else res = c_oSerConstants.ReadUnknown; return res; }; -BinaryChartReader.prototype.ReadCT_ValAx = function (type, length, val) { +BinaryChartReader.prototype.ReadCT_Surface3DChart = function (type, length, val, aChartWithAxis) { var res = c_oSerConstants.ReadOk; var oThis = this; - if (c_oserct_valaxAXID === type) { + if (c_oserct_surface3dchartWIREFRAME === type) { var oNewVal = { m_val: null }; res = this.bcr.Read1(length, function (t, l) { - return oThis.ReadCT_UnsignedInt(t, l, oNewVal); + return oThis.ReadCT_Boolean(t, l, oNewVal); }); if (null != oNewVal.m_val) - val.setAxId(oNewVal.m_val); + val.setWireframe(oNewVal.m_val); } - else if (c_oserct_valaxSCALING === type) { - var oNewVal = new AscFormat.CScaling(); + else if (c_oserct_surface3dchartSER === type) { + var oNewVal = new AscFormat.CSurfaceSeries(); res = this.bcr.Read1(length, function (t, l) { - return oThis.ReadCT_Scaling(t, l, oNewVal); + return oThis.ReadCT_SurfaceSer(t, l, oNewVal); }); - val.setScaling(oNewVal); + val.addSer(oNewVal); } - else if (c_oserct_valaxDELETE === type) { - var oNewVal = { m_val: null }; + else if (c_oserct_surface3dchartBANDFMTS === type) { res = this.bcr.Read1(length, function (t, l) { - return oThis.ReadCT_Boolean(t, l, oNewVal); + return oThis.ReadCT_bandFmts(t, l, val); }); - if (null != oNewVal.m_val) - val.setDelete(oNewVal.m_val); - else - val.setDelete(true); } - else if (c_oserct_valaxAXPOS === type) { + else if (c_oserct_surface3dchartAXID === type) { var oNewVal = { m_val: null }; res = this.bcr.Read1(length, function (t, l) { - return oThis.ReadCT_AxPos(t, l, oNewVal); + return oThis.ReadCT_UnsignedInt(t, l, oNewVal); }); if (null != oNewVal.m_val) - val.setAxPos(oNewVal.m_val); + aChartWithAxis.push({ axisId: oNewVal.m_val, chart: val, surface: true }); } - else if (c_oserct_valaxMAJORGRIDLINES === type) { - var oNewVal = { spPr: null }; + else if (c_oserct_surface3dchartEXTLST === type) { + var oNewVal = {}; res = this.bcr.Read1(length, function (t, l) { - return oThis.ReadCT_ChartLines(t, l, oNewVal); + return oThis.ReadCT_extLst(t, l, oNewVal); }); - if (null != oNewVal.spPr) - val.setMajorGridlines(oNewVal.spPr); - else - val.setMajorGridlines(new AscFormat.CSpPr()); + // val.m_extLst = oNewVal; } - else if (c_oserct_valaxMINORGRIDLINES === type) { - var oNewVal = { spPr: null }; + else + res = c_oSerConstants.ReadUnknown; + return res; +}; +BinaryChartReader.prototype.ReadCT_SurfaceSer = function (type, length, val) { + var res = c_oSerConstants.ReadOk; + var oThis = this; + if (c_oserct_surfaceserIDX === type) { + var oNewVal = { m_val: null }; res = this.bcr.Read1(length, function (t, l) { - return oThis.ReadCT_ChartLines(t, l, oNewVal); + return oThis.ReadCT_UnsignedInt(t, l, oNewVal); }); - if (null != oNewVal.spPr) - val.setMinorGridlines(oNewVal.spPr); - else - val.setMinorGridlines(new AscFormat.CSpPr()); + if (null != oNewVal.m_val) + val.setIdx(oNewVal.m_val); } - else if (c_oserct_valaxTITLE === type) { - var oNewVal = new AscFormat.CTitle(); + else if (c_oserct_surfaceserORDER === type) { + var oNewVal = { m_val: null }; res = this.bcr.Read1(length, function (t, l) { - return oThis.ReadCT_Title(t, l, oNewVal); + return oThis.ReadCT_UnsignedInt(t, l, oNewVal); }); - if(!AscFormat.isRealBool(oNewVal.overlay)) - { - oNewVal.setOverlay(true); - } - val.setTitle(oNewVal); + if (null != oNewVal.m_val) + val.setOrder(oNewVal.m_val); } - else if (c_oserct_valaxNUMFMT === type) { - var oNewVal = new AscFormat.CNumFmt(); + else if (c_oserct_surfaceserTX === type) { + var oNewVal = new AscFormat.CTx(); res = this.bcr.Read1(length, function (t, l) { - return oThis.ReadCT_NumFmt(t, l, oNewVal); + return oThis.ReadCT_SerTx(t, l, oNewVal); }); - val.setNumFmt(oNewVal); + val.setTx(oNewVal); } - else if (c_oserct_valaxMAJORTICKMARK === type) { - var oNewVal = { m_val: null }; + else if (c_oserct_surfaceserSPPR === type) { + val.setSpPr(this.ReadSpPr(length)); + } + else if (c_oserct_surfaceserCAT === type) { + var oNewVal = new AscFormat.CCat(); res = this.bcr.Read1(length, function (t, l) { - return oThis.ReadCT_TickMark(t, l, oNewVal); + return oThis.ReadCT_AxDataSource(t, l, oNewVal); }); - if (null != oNewVal.m_val) - val.setMajorTickMark(oNewVal.m_val); - else{ - val.setMajorTickMark(c_oAscTickMark.TICK_MARK_CROSS); - } + val.setCat(oNewVal); } - else if (c_oserct_valaxMINORTICKMARK === type) { - var oNewVal = { m_val: null }; + else if (c_oserct_surfaceserVAL === type) { + var oNewVal = new AscFormat.CYVal(); res = this.bcr.Read1(length, function (t, l) { - return oThis.ReadCT_TickMark(t, l, oNewVal); + return oThis.ReadCT_NumDataSource(t, l, oNewVal); }); - if (null != oNewVal.m_val) - val.setMinorTickMark(oNewVal.m_val); - else{ - val.setMajorTickMark(c_oAscTickMark.TICK_MARK_CROSS); - } + val.setVal(oNewVal); } - else if (c_oserct_valaxTICKLBLPOS === type) { - var oNewVal = { m_val: null }; + else if (c_oserct_surfaceserEXTLST === type) { + var oNewVal = {}; res = this.bcr.Read1(length, function (t, l) { - return oThis.ReadCT_TickLblPos(t, l, oNewVal); + return oThis.ReadCT_extLst(t, l, oNewVal); }); - if (null != oNewVal.m_val) - val.setTickLblPos(oNewVal.m_val); - } - else if (c_oserct_valaxSPPR === type) { - val.setSpPr(this.ReadSpPr(length)); + // val.m_extLst = oNewVal; } - else if (c_oserct_valaxTXPR === type) { - val.setTxPr(this.ReadTxPr(length)); - val.txPr.setParent(val); + else if(c_oserct_chartFiltering === type) { + res = this.bcr.Read1(length, function (t, l) { + return oThis.ReadCT_ChartFiltering(t, l, val); + }); } - else if (c_oserct_valaxCROSSAX === type) { + else + res = c_oSerConstants.ReadUnknown; + return res; +}; +BinaryChartReader.prototype.ReadCT_BandFmt = function (type, length, val) { + var res = c_oSerConstants.ReadOk; + var oThis = this; + if (c_oserct_bandfmtIDX === type) { var oNewVal = { m_val: null }; res = this.bcr.Read1(length, function (t, l) { return oThis.ReadCT_UnsignedInt(t, l, oNewVal); }); if (null != oNewVal.m_val) - { - val.crossAxId = oNewVal.m_val; - } + val.setIdx(oNewVal.m_val); } - else if (c_oserct_valaxCROSSES === type) { - var oNewVal = { m_val: null }; - res = this.bcr.Read1(length, function (t, l) { - return oThis.ReadCT_Crosses(t, l, oNewVal); - }); - if (null != oNewVal.m_val) - val.setCrosses(oNewVal.m_val); - else - val.setCrosses(AscFormat.CROSSES_AUTO_ZERO); + else if (c_oserct_bandfmtSPPR === type) { + val.setSpPr(this.ReadSpPr(length)); } - else if (c_oserct_valaxCROSSESAT === type) { + else + res = c_oSerConstants.ReadUnknown; + return res; +}; +BinaryChartReader.prototype.ReadCT_SurfaceChart = function (type, length, val, aChartWithAxis) { + var res = c_oSerConstants.ReadOk; + var oThis = this; + if (c_oserct_surfacechartWIREFRAME === type) { var oNewVal = { m_val: null }; res = this.bcr.Read1(length, function (t, l) { - return oThis.ReadCT_Double(t, l, oNewVal); + return oThis.ReadCT_Boolean(t, l, oNewVal); }); if (null != oNewVal.m_val) - val.setCrossesAt(oNewVal.m_val); + val.setWireframe(oNewVal.m_val); } - else if (c_oserct_valaxCROSSBETWEEN === type) { - var oNewVal = { m_val: null }; + else if (c_oserct_surfacechartSER === type) { + var oNewVal = new AscFormat.CSurfaceSeries(); res = this.bcr.Read1(length, function (t, l) { - return oThis.ReadCT_CrossBetween(t, l, oNewVal); + return oThis.ReadCT_SurfaceSer(t, l, oNewVal); }); - if (null != oNewVal.m_val) - val.setCrossBetween(oNewVal.m_val); + val.addSer(oNewVal); } - else if (c_oserct_valaxMAJORUNIT === type) { - var oNewVal = { m_val: null }; + else if (c_oserct_surfacechartBANDFMTS === type) { res = this.bcr.Read1(length, function (t, l) { - return oThis.ReadCT_AxisUnit(t, l, oNewVal); + return oThis.ReadCT_bandFmts(t, l, val); }); - if (null != oNewVal.m_val) - val.setMajorUnit(oNewVal.m_val); } - else if (c_oserct_valaxMINORUNIT === type) { + else if (c_oserct_surfacechartAXID === type) { var oNewVal = { m_val: null }; res = this.bcr.Read1(length, function (t, l) { - return oThis.ReadCT_AxisUnit(t, l, oNewVal); + return oThis.ReadCT_UnsignedInt(t, l, oNewVal); }); if (null != oNewVal.m_val) - val.setMinorUnit(oNewVal.m_val); - } - else if (c_oserct_valaxDISPUNITS === type) { - var oNewVal = new AscFormat.CDispUnits(); - res = this.bcr.Read1(length, function (t, l) { - return oThis.ReadCT_DispUnits(t, l, oNewVal); - }); - val.setDispUnits(oNewVal); + aChartWithAxis.push({ axisId: oNewVal.m_val, chart: val, surface: true }); } - else if (c_oserct_valaxEXTLST === type) { + else if (c_oserct_surfacechartEXTLST === type) { var oNewVal; oNewVal = {}; res = this.bcr.Read1(length, function (t, l) { @@ -8416,164 +10718,158 @@ BinaryChartReader.prototype.ReadCT_ValAx = function (type, length, val) { res = c_oSerConstants.ReadUnknown; return res; }; -BinaryChartReader.prototype.ReadCT_SizeRepresents = function (type, length, val) { +BinaryChartReader.prototype.ReadCT_SecondPieSize = function (type, length, val) { + var res = c_oSerConstants.ReadOk; + var oThis = this; + if (c_oserct_secondpiesizeVAL === type) { + val.m_val = this.ParsePersent(this.stream.GetString2LE(length)); + } + else + res = c_oSerConstants.ReadUnknown; + return res; +}; +BinaryChartReader.prototype.ReadCT_SplitType = function (type, length, val) { var res = c_oSerConstants.ReadOk; var oThis = this; - if (c_oserct_sizerepresentsVAL === type) { + if (c_oserct_splittypeVAL === type) { switch (this.stream.GetUChar()) { - case st_sizerepresentsAREA: val.m_val = SIZE_REPRESENTS_AREA; break; - case st_sizerepresentsW: val.m_val = SIZE_REPRESENTS_W; break; + case st_splittypeAUTO: val.m_val = SPLIT_TYPE_AUTO; break; + case st_splittypeCUST: val.m_val = SPLIT_TYPE_CUST; break; + case st_splittypePERCENT: val.m_val = SPLIT_TYPE_PERCENT; break; + case st_splittypePOS: val.m_val = SPLIT_TYPE_POS; break; + case st_splittypeVAL: val.m_val = SPLIT_TYPE_VAL; break; } } else res = c_oSerConstants.ReadUnknown; return res; }; -BinaryChartReader.prototype.ReadCT_BubbleScale = function (type, length, val) { +BinaryChartReader.prototype.ReadCT_OfPieType = function (type, length, val) { var res = c_oSerConstants.ReadOk; var oThis = this; - if (c_oserct_bubblescaleVAL === type) { - val.m_val = this.ParsePersent(this.stream.GetString2LE(length)); + if (c_oserct_ofpietypeVAL === type) { + switch (this.stream.GetUChar()) { + case st_ofpietypePIE: val.m_val = OF_PIE_TYPE_PIE; break; + case st_ofpietypeBAR: val.m_val = OF_PIE_TYPE_BAR; break; + } } else res = c_oSerConstants.ReadUnknown; return res; }; -BinaryChartReader.prototype.ReadCT_BubbleSer = function (type, length, val) { +BinaryChartReader.prototype.ReadCT_custSplit = function (type, length, val) { var res = c_oSerConstants.ReadOk; var oThis = this; - if (c_oserct_bubbleserIDX === type) { + if (c_oserct_custsplitSECONDPIEPT === type) { var oNewVal = { m_val: null }; res = this.bcr.Read1(length, function (t, l) { return oThis.ReadCT_UnsignedInt(t, l, oNewVal); }); if (null != oNewVal.m_val) - val.setIdx(oNewVal.m_val); + val.addCustSplit(oNewVal.m_val); } - else if (c_oserct_bubbleserORDER === type) { + else + res = c_oSerConstants.ReadUnknown; + return res; +}; +BinaryChartReader.prototype.ReadCT_OfPieChart = function (type, length, val, aChartWithAxis) { + var res = c_oSerConstants.ReadOk; + var oThis = this; + if (c_oserct_ofpiechartOFPIETYPE === type) { var oNewVal = { m_val: null }; res = this.bcr.Read1(length, function (t, l) { - return oThis.ReadCT_UnsignedInt(t, l, oNewVal); + return oThis.ReadCT_OfPieType(t, l, oNewVal); }); if (null != oNewVal.m_val) - val.setOrder(oNewVal.m_val); - } - else if (c_oserct_bubbleserTX === type) { - var oNewVal = new AscFormat.CTx(); - res = this.bcr.Read1(length, function (t, l) { - return oThis.ReadCT_SerTx(t, l, oNewVal); - }); - val.setTx(oNewVal); - } - else if (c_oserct_bubbleserSPPR === type) { - val.setSpPr(this.ReadSpPr(length)); + val.setOfPieType(oNewVal.m_val); } - else if (c_oserct_bubbleserINVERTIFNEGATIVE === type) { + else if (c_oserct_ofpiechartVARYCOLORS === type) { var oNewVal = { m_val: null }; res = this.bcr.Read1(length, function (t, l) { return oThis.ReadCT_Boolean(t, l, oNewVal); }); if (null != oNewVal.m_val) - val.setInvertIfNegative(oNewVal.m_val); + val.setVaryColors(oNewVal.m_val); } - else if (c_oserct_bubbleserDPT === type) { - var oNewVal = new AscFormat.CDPt(); + else if (c_oserct_ofpiechartSER === type) { + var oNewVal = new AscFormat.CPieSeries(); res = this.bcr.Read1(length, function (t, l) { - return oThis.ReadCT_DPt(t, l, oNewVal); + return oThis.ReadCT_PieSer(t, l, oNewVal); }); - val.addDPt(oNewVal); + val.addSer(oNewVal); } - else if (c_oserct_bubbleserDLBLS === type) { + else if (c_oserct_ofpiechartDLBLS === type) { var oNewVal = new AscFormat.CDLbls(); + this.curChart.oDataLablesData = AscCommon.fSaveStream(this.bcr.stream, length); res = this.bcr.Read1(length, function (t, l) { return oThis.ReadCT_DLbls(t, l, oNewVal); }); oNewVal.correctValues(); val.setDLbls(oNewVal); } - else if (c_oserct_bubbleserTRENDLINE === type) { - //todo array - var oNewVal = new AscFormat.CTrendLine(); + else if (c_oserct_ofpiechartGAPWIDTH === type) { + var oNewVal = { m_val: null }; res = this.bcr.Read1(length, function (t, l) { - return oThis.ReadCT_Trendline(t, l, oNewVal); + return oThis.ReadCT_GapAmount(t, l, oNewVal); }); - val.setTrendline(oNewVal); + if (null != oNewVal.m_val) + val.setGapWidth(oNewVal.m_val); } - else if (c_oserct_bubbleserERRBARS === type) { - //todo array - var oNewVal = new AscFormat.CErrBars(); + else if (c_oserct_ofpiechartSPLITTYPE === type) { + var oNewVal = { m_val: null }; res = this.bcr.Read1(length, function (t, l) { - return oThis.ReadCT_ErrBars(t, l, oNewVal); + return oThis.ReadCT_SplitType(t, l, oNewVal); }); - val.setErrBars(oNewVal); + if (null != oNewVal.m_val) + val.setSplitType(oNewVal.m_val) } - else if (c_oserct_bubbleserXVAL === type) { - var oNewVal = new AscFormat.CCat(); + else if (c_oserct_ofpiechartSPLITPOS === type) { + var oNewVal = { m_val: null }; res = this.bcr.Read1(length, function (t, l) { - return oThis.ReadCT_AxDataSource(t, l, oNewVal); + return oThis.ReadCT_Double(t, l, oNewVal); }); - val.setXVal(oNewVal); + if (null != oNewVal.m_val) + val.setSplitPos(oNewVal.m_val); } - else if (c_oserct_bubbleserYVAL === type) { - var oNewVal = new AscFormat.CYVal(); + else if (c_oserct_ofpiechartCUSTSPLIT === type) { res = this.bcr.Read1(length, function (t, l) { - return oThis.ReadCT_NumDataSource(t, l, oNewVal); + return oThis.ReadCT_custSplit(t, l, val); }); - val.setYVal(oNewVal); } - else if (c_oserct_bubbleserBUBBLESIZE === type) { - var oNewVal = new AscFormat.CYVal(); + else if (c_oserct_ofpiechartSECONDPIESIZE === type) { + var oNewVal = { m_val: null }; res = this.bcr.Read1(length, function (t, l) { - return oThis.ReadCT_NumDataSource(t, l, oNewVal); + return oThis.ReadCT_SecondPieSize(t, l, oNewVal); }); - val.setBubbleSize(oNewVal); + if (null != oNewVal.m_val) + val.setSecondPieSize(oNewVal.m_val); } - else if (c_oserct_bubbleserBUBBLE3D === type) { - var oNewVal = { m_val: null }; + else if (c_oserct_ofpiechartSERLINES === type) { + var oNewVal = { spPr: null }; res = this.bcr.Read1(length, function (t, l) { - return oThis.ReadCT_Boolean(t, l, oNewVal); + return oThis.ReadCT_ChartLines(t, l, oNewVal); }); - if (null != oNewVal.m_val) - val.setBubble3D(oNewVal.m_val); + if (null != oNewVal.spPr) + val.setSerLines(oNewVal.spPr); + else + val.setSerLines(new AscFormat.CSpPr()); } - else if (c_oserct_bubbleserEXTLST === type) { + else if (c_oserct_ofpiechartEXTLST === type) { var oNewVal; oNewVal = {}; res = this.bcr.Read1(length, function (t, l) { return oThis.ReadCT_extLst(t, l, oNewVal); }); // val.m_extLst = oNewVal; - } - else if(c_oserct_chartFiltering === type) { - res = this.bcr.Read1(length, function (t, l) { - return oThis.ReadCT_ChartFiltering(t, l, val); - }); - } - else - res = c_oSerConstants.ReadUnknown; - return res; -}; -BinaryChartReader.prototype.ReadCT_SerTx = function (type, length, val) { - var res = c_oSerConstants.ReadOk; - var oThis = this; - if (c_oserct_sertxSTRREF === type) { - var oNewVal = new AscFormat.CStrRef(); - res = this.bcr.Read1(length, function (t, l) { - return oThis.ReadCT_StrRef(t, l, oNewVal); - }); - val.setStrRef(oNewVal); - } - else if (c_oserct_sertxV === type) { - val.setVal(this.stream.GetString2LE(length)); } else res = c_oSerConstants.ReadUnknown; return res; }; -BinaryChartReader.prototype.ReadCT_DPt = function (type, length, val) { +BinaryChartReader.prototype.ReadCT_PieSer = function (type, length, val) { var res = c_oSerConstants.ReadOk; var oThis = this; - if (c_oserct_dptIDX === type) { + if (c_oserct_pieserIDX === type) { var oNewVal = { m_val: null }; res = this.bcr.Read1(length, function (t, l) { return oThis.ReadCT_UnsignedInt(t, l, oNewVal); @@ -8581,30 +10877,25 @@ BinaryChartReader.prototype.ReadCT_DPt = function (type, length, val) { if (null != oNewVal.m_val) val.setIdx(oNewVal.m_val); } - else if (c_oserct_dptINVERTIFNEGATIVE === type) { + else if (c_oserct_pieserORDER === type) { var oNewVal = { m_val: null }; res = this.bcr.Read1(length, function (t, l) { - return oThis.ReadCT_Boolean(t, l, oNewVal); + return oThis.ReadCT_UnsignedInt(t, l, oNewVal); }); if (null != oNewVal.m_val) - val.setInvertIfNegative(oNewVal.m_val); + val.setOrder(oNewVal.m_val); } - else if (c_oserct_dptMARKER === type) { - var oNewVal = new AscFormat.CMarker(); + else if (c_oserct_pieserTX === type) { + var oNewVal = new AscFormat.CTx(); res = this.bcr.Read1(length, function (t, l) { - return oThis.ReadCT_Marker(t, l, oNewVal); + return oThis.ReadCT_SerTx(t, l, oNewVal); }); - val.setMarker(oNewVal); + val.setTx(oNewVal); } - else if (c_oserct_dptBUBBLE3D === type) { - var oNewVal = { m_val: null }; - res = this.bcr.Read1(length, function (t, l) { - return oThis.ReadCT_Boolean(t, l, oNewVal); - }); - if (null != oNewVal.m_val) - val.setBubble3D(oNewVal.m_val); + else if (c_oserct_pieserSPPR === type) { + val.setSpPr(this.ReadSpPr(length)); } - else if (c_oserct_dptEXPLOSION === type) { + else if (c_oserct_pieserEXPLOSION === type) { var oNewVal = { m_val: null }; res = this.bcr.Read1(length, function (t, l) { return oThis.ReadCT_UnsignedInt(t, l, oNewVal); @@ -8612,433 +10903,426 @@ BinaryChartReader.prototype.ReadCT_DPt = function (type, length, val) { if (null != oNewVal.m_val) val.setExplosion(oNewVal.m_val); } - else if (c_oserct_dptSPPR === type) { - val.setSpPr(this.ReadSpPr(length)); - } - else if (c_oserct_dptPICTUREOPTIONS === type) { - var oNewVal = new AscFormat.CPictureOptions(); + else if (c_oserct_pieserDPT === type) { + var oNewVal = new AscFormat.CDPt(); res = this.bcr.Read1(length, function (t, l) { - return oThis.ReadCT_PictureOptions(t, l, oNewVal); + return oThis.ReadCT_DPt(t, l, oNewVal); }); - val.setPictureOptions(oNewVal); + val.addDPt(oNewVal); } - else if (c_oserct_dptEXTLST === type) { - var oNewVal; - oNewVal = {}; + else if (c_oserct_pieserDLBLS === type) { + var oNewVal = new AscFormat.CDLbls(); res = this.bcr.Read1(length, function (t, l) { - return oThis.ReadCT_extLst(t, l, oNewVal); + return oThis.ReadCT_DLbls(t, l, oNewVal); }); - // val.m_extLst = oNewVal; + oNewVal.correctValues(); + val.setDLbls(oNewVal); } - else - res = c_oSerConstants.ReadUnknown; - return res; -}; -BinaryChartReader.prototype.ReadCT_Marker = function (type, length, val) { - var res = c_oSerConstants.ReadOk; - var oThis = this; - if (c_oserct_markerSYMBOL === type) { - var oNewVal = { m_val: null }; + else if (c_oserct_pieserCAT === type) { + var oNewVal = new AscFormat.CCat(); res = this.bcr.Read1(length, function (t, l) { - return oThis.ReadCT_MarkerStyle(t, l, oNewVal); + return oThis.ReadCT_AxDataSource(t, l, oNewVal); }); - if (null != oNewVal.m_val) - val.setSymbol(oNewVal.m_val); + val.setCat(oNewVal); } - else if (c_oserct_markerSIZE === type) { - var oNewVal = { m_val: null }; + else if (c_oserct_pieserVAL === type) { + var oNewVal = new AscFormat.CYVal(); res = this.bcr.Read1(length, function (t, l) { - return oThis.ReadCT_MarkerSize(t, l, oNewVal); + return oThis.ReadCT_NumDataSource(t, l, oNewVal); }); - if (null != oNewVal.m_val) - val.setSize(oNewVal.m_val); - } - else if (c_oserct_markerSPPR === type) { - val.setSpPr(this.ReadSpPr(length)); + val.setVal(oNewVal); } - else if (c_oserct_markerEXTLST === type) { - var oNewVal; - oNewVal = {}; + else if (c_oserct_pieserEXTLST === type) { + var oNewVal = {}; res = this.bcr.Read1(length, function (t, l) { return oThis.ReadCT_extLst(t, l, oNewVal); }); // val.m_extLst = oNewVal; } - else - res = c_oSerConstants.ReadUnknown; - return res; -}; -BinaryChartReader.prototype.MarkerStyleToFormat = function(markerStyle) { - - var val = null; - switch (markerStyle) { - case st_markerstyleCIRCLE: val = AscFormat.SYMBOL_CIRCLE; break; - case st_markerstyleDASH: val = AscFormat.SYMBOL_DASH; break; - case st_markerstyleDIAMOND: val = AscFormat.SYMBOL_DIAMOND; break; - case st_markerstyleDOT: val = AscFormat.SYMBOL_DOT; break; - case st_markerstyleNONE: val = AscFormat.SYMBOL_NONE; break; - case st_markerstylePICTURE: val = AscFormat.SYMBOL_PICTURE; break; - case st_markerstylePLUS: val = AscFormat.SYMBOL_PLUS; break; - case st_markerstyleSQUARE: val = AscFormat.SYMBOL_SQUARE; break; - case st_markerstyleSTAR: val = AscFormat.SYMBOL_STAR; break; - case st_markerstyleTRIANGLE: val = AscFormat.SYMBOL_TRIANGLE; break; - case st_markerstyleX: val = AscFormat.SYMBOL_X; break; - case st_markerstyleAUTO: break; - } - return val; -}; -BinaryChartReader.prototype.ReadCT_MarkerStyle = function (type, length, val) { - var res = c_oSerConstants.ReadOk; - if (c_oserct_markerstyleVAL === type) { - val.m_val = this.MarkerStyleToFormat(this.stream.GetUChar()); + else if(c_oserct_chartFiltering === type) { + res = this.bcr.Read1(length, function (t, l) { + return oThis.ReadCT_ChartFiltering(t, l, val); + }); } else res = c_oSerConstants.ReadUnknown; return res; }; -BinaryChartReader.prototype.ReadCT_MarkerSize = function (type, length, val) { +BinaryChartReader.prototype.ReadCT_GapAmount = function (type, length, val) { var res = c_oSerConstants.ReadOk; var oThis = this; - if (c_oserct_markersizeVAL === type) { - var oNewVal; - oNewVal = this.stream.GetUChar(); - val.m_val = oNewVal; + if (c_oserct_gapamountVAL === type) { + val.m_val = this.ParsePersent(this.stream.GetString2LE(length)); } else res = c_oSerConstants.ReadUnknown; return res; }; -BinaryChartReader.prototype.ReadCT_PictureOptions = function (type, length, val) { +BinaryChartReader.prototype.ReadCT_Bar3DChart = function (type, length, val, aChartWithAxis) { var res = c_oSerConstants.ReadOk; var oThis = this; - if (c_oserct_pictureoptionsAPPLYTOFRONT === type) { + if (c_oserct_bar3dchartBARDIR === type) { var oNewVal = { m_val: null }; res = this.bcr.Read1(length, function (t, l) { - return oThis.ReadCT_Boolean(t, l, oNewVal); + return oThis.ReadCT_BarDir(t, l, oNewVal); }); if (null != oNewVal.m_val) - val.setApplyToFront(oNewVal.m_val); + val.setBarDir(oNewVal.m_val); } - else if (c_oserct_pictureoptionsAPPLYTOSIDES === type) { + else if (c_oserct_bar3dchartGROUPING === type) { var oNewVal = { m_val: null }; res = this.bcr.Read1(length, function (t, l) { - return oThis.ReadCT_Boolean(t, l, oNewVal); + return oThis.ReadCT_BarGrouping(t, l, oNewVal); }); if (null != oNewVal.m_val) - val.setApplyToSides(oNewVal.m_val); + val.setGrouping(oNewVal.m_val); } - else if (c_oserct_pictureoptionsAPPLYTOEND === type) { + else if (c_oserct_bar3dchartVARYCOLORS === type) { var oNewVal = { m_val: null }; res = this.bcr.Read1(length, function (t, l) { return oThis.ReadCT_Boolean(t, l, oNewVal); }); if (null != oNewVal.m_val) - val.setApplyToEnd(oNewVal.m_val); + val.setVaryColors(oNewVal.m_val); } - else if (c_oserct_pictureoptionsPICTUREFORMAT === type) { + else if (c_oserct_bar3dchartSER === type) { + var oNewVal = new AscFormat.CBarSeries(); + res = this.bcr.Read1(length, function (t, l) { + return oThis.ReadCT_BarSer(t, l, oNewVal); + }); + val.addSer(oNewVal); + } + else if (c_oserct_bar3dchartDLBLS === type) { + var oNewVal = new AscFormat.CDLbls(); + this.curChart.oDataLablesData = AscCommon.fSaveStream(this.bcr.stream, length); + res = this.bcr.Read1(length, function (t, l) { + return oThis.ReadCT_DLbls(t, l, oNewVal); + }); + oNewVal.correctValues(); + val.setDLbls(oNewVal); + } + else if (c_oserct_bar3dchartGAPWIDTH === type) { var oNewVal = { m_val: null }; res = this.bcr.Read1(length, function (t, l) { - return oThis.ReadCT_PictureFormat(t, l, oNewVal); + return oThis.ReadCT_GapAmount(t, l, oNewVal); }); if (null != oNewVal.m_val) - val.setPictureFormat(oNewVal.m_val); + val.setGapWidth(oNewVal.m_val); } - else if (c_oserct_pictureoptionsPICTURESTACKUNIT === type) { + else if (c_oserct_bar3dchartGAPDEPTH === type) { + var oNewVal; + oNewVal = {}; + res = this.bcr.Read1(length, function (t, l) { + return oThis.ReadCT_GapAmount(t, l, oNewVal); + }); + if(null != oNewVal.m_val) + val.setGapDepth(oNewVal.m_val); + } + else if (c_oserct_bar3dchartSHAPE === type) { var oNewVal = { m_val: null }; res = this.bcr.Read1(length, function (t, l) { - return oThis.ReadCT_PictureStackUnit(t, l, oNewVal); + return oThis.ReadCT_Shape(t, l, oNewVal); + }); + if(null != oNewVal.m_val) + val.setShape(oNewVal.m_val); + } + else if (c_oserct_bar3dchartAXID === type) { + var oNewVal = { m_val: null }; + res = this.bcr.Read1(length, function (t, l) { + return oThis.ReadCT_UnsignedInt(t, l, oNewVal); }); if (null != oNewVal.m_val) - val.setPictureStackUnit(oNewVal.m_val); + aChartWithAxis.push({ axisId: oNewVal.m_val, chart: val }); + } + else if (c_oserct_bar3dchartEXTLST === type) { + var oNewVal; + oNewVal = {}; + res = this.bcr.Read1(length, function (t, l) { + return oThis.ReadCT_extLst(t, l, oNewVal); + }); + // val.m_extLst = oNewVal; } else res = c_oSerConstants.ReadUnknown; return res; }; -BinaryChartReader.prototype.ReadCT_PictureFormat = function (type, length, val) { +BinaryChartReader.prototype.ReadCT_BarDir = function (type, length, val) { var res = c_oSerConstants.ReadOk; var oThis = this; - if (c_oserct_pictureformatVAL === type) { + if (c_oserct_bardirVAL === type) { switch (this.stream.GetUChar()) { - case st_pictureformatSTRETCH: val.m_val = PICTURE_FORMAT_STACK_STRETCH; break; - case st_pictureformatSTACK: val.m_val = PICTURE_FORMAT_STACK; break; - case st_pictureformatSTACKSCALE: val.m_val = PICTURE_FORMAT_STACK_SCALE; break; + case st_bardirBAR: val.m_val = AscFormat.BAR_DIR_BAR; break; + case st_bardirCOL: val.m_val = AscFormat.BAR_DIR_COL; break; } } else res = c_oSerConstants.ReadUnknown; return res; }; -BinaryChartReader.prototype.ReadCT_PictureStackUnit = function (type, length, val) { +BinaryChartReader.prototype.ReadCT_BarGrouping = function (type, length, val) { var res = c_oSerConstants.ReadOk; var oThis = this; - if (c_oserct_picturestackunitVAL === type) { - var oNewVal; - oNewVal = this.stream.GetDoubleLE(); - val.m_val = oNewVal; + if (c_oserct_bargroupingVAL === type) { + switch (this.stream.GetUChar()) { + case st_bargroupingPERCENTSTACKED: val.m_val = AscFormat.BAR_GROUPING_PERCENT_STACKED; break; + case st_bargroupingCLUSTERED: val.m_val = AscFormat.BAR_GROUPING_CLUSTERED; break; + case st_bargroupingSTANDARD: val.m_val = AscFormat.BAR_GROUPING_STANDARD; break; + case st_bargroupingSTACKED: val.m_val = AscFormat.BAR_GROUPING_STACKED; break; + } } else res = c_oSerConstants.ReadUnknown; return res; }; -BinaryChartReader.prototype.ReadCT_DLbls = function (type, length, val) { +BinaryChartReader.prototype.ReadCT_BarSer = function (type, length, val) { var res = c_oSerConstants.ReadOk; var oThis = this; - if (c_oserct_dlblsDLBL === type) { - var oNewVal = new AscFormat.CDLbl(); + if (c_oserct_barserIDX === type) { + var oNewVal = { m_val: null }; res = this.bcr.Read1(length, function (t, l) { - return oThis.ReadCT_DLbl(t, l, oNewVal); + return oThis.ReadCT_UnsignedInt(t, l, oNewVal); }); - oNewVal.correctValues(); - val.addDLbl(oNewVal); + if (null != oNewVal.m_val) + val.setIdx(oNewVal.m_val); } - else if (c_oserct_dlblsDLBLPOS === type) { + else if (c_oserct_barserORDER === type) { var oNewVal = { m_val: null }; res = this.bcr.Read1(length, function (t, l) { - return oThis.ReadCT_DLblPos(t, l, oNewVal); + return oThis.ReadCT_UnsignedInt(t, l, oNewVal); }); if (null != oNewVal.m_val) - val.setDLblPos(oNewVal.m_val); + val.setOrder(oNewVal.m_val); } - else if (c_oserct_dlblsDELETE === type) { + else if (c_oserct_barserTX === type) { + var oNewVal = new AscFormat.CTx(); + res = this.bcr.Read1(length, function (t, l) { + return oThis.ReadCT_SerTx(t, l, oNewVal); + }); + val.setTx(oNewVal); + } + else if (c_oserct_barserSPPR === type) { + val.setSpPr(this.ReadSpPr(length)); + } + else if (c_oserct_barserINVERTIFNEGATIVE === type) { var oNewVal = { m_val: null }; res = this.bcr.Read1(length, function (t, l) { return oThis.ReadCT_Boolean(t, l, oNewVal); }); if (null != oNewVal.m_val) - val.setDelete(oNewVal.m_val); - else - val.setDelete(true); + val.setInvertIfNegative(oNewVal.m_val); } - else if (c_oserct_dlblsLEADERLINES === type) { - var oNewVal = { spPr: null }; + else if (c_oserct_barserPICTUREOPTIONS === type) { + var oNewVal = new AscFormat.CPictureOptions(); res = this.bcr.Read1(length, function (t, l) { - return oThis.ReadCT_ChartLines(t, l, oNewVal); + return oThis.ReadCT_PictureOptions(t, l, oNewVal); }); - if (null != oNewVal.spPr) - val.setLeaderLines(oNewVal.spPr); - else - val.setLeaderLines(new AscFormat.CSpPr()); + val.setPictureOptions(oNewVal); } - else if (c_oserct_dlblsNUMFMT === type) { - var oNewVal = new AscFormat.CNumFmt(); + else if (c_oserct_barserDPT === type) { + var oNewVal = new AscFormat.CDPt(); res = this.bcr.Read1(length, function (t, l) { - return oThis.ReadCT_NumFmt(t, l, oNewVal); + return oThis.ReadCT_DPt(t, l, oNewVal); }); - val.setNumFmt(oNewVal); - } - else if (c_oserct_dlblsSEPARATOR === type) { - val.setSeparator(this.stream.GetString2LE(length)); + val.addDPt(oNewVal); } - else if (c_oserct_dlblsSHOWBUBBLESIZE === type) { - var oNewVal = { m_val: null }; + else if (c_oserct_barserDLBLS === type) { + var oNewVal = new AscFormat.CDLbls(); res = this.bcr.Read1(length, function (t, l) { - return oThis.ReadCT_Boolean(t, l, oNewVal); + return oThis.ReadCT_DLbls(t, l, oNewVal); }); - if (null != oNewVal.m_val) - val.setShowBubbleSize(oNewVal.m_val); - else - val.setShowBubbleSize(true); + oNewVal.correctValues(); + val.setDLbls(oNewVal); } - else if (c_oserct_dlblsSHOWCATNAME === type) { - var oNewVal = { m_val: null }; + else if (c_oserct_barserTRENDLINE === type) { + //todo array + var oNewVal = new AscFormat.CTrendLine(); res = this.bcr.Read1(length, function (t, l) { - return oThis.ReadCT_Boolean(t, l, oNewVal); + return oThis.ReadCT_Trendline(t, l, oNewVal); }); - if (null != oNewVal.m_val) - val.setShowCatName(oNewVal.m_val); - else - val.setShowCatName(true); + val.setTrendline(oNewVal); } - else if (c_oserct_dlblsSHOWLEADERLINES === type) { - var oNewVal = { m_val: null }; + else if (c_oserct_barserERRBARS === type) { + var oNewVal = new AscFormat.CErrBars(); res = this.bcr.Read1(length, function (t, l) { - return oThis.ReadCT_Boolean(t, l, oNewVal); + return oThis.ReadCT_ErrBars(t, l, oNewVal); }); - if (null != oNewVal.m_val) - val.setShowLeaderLines(oNewVal.m_val); - else - val.setShowLeaderLines(true); + val.setErrBars(oNewVal); } - else if (c_oserct_dlblsSHOWLEGENDKEY === type) { - var oNewVal = { m_val: null }; + else if (c_oserct_barserCAT === type) { + var oNewVal = new AscFormat.CCat(); res = this.bcr.Read1(length, function (t, l) { - return oThis.ReadCT_Boolean(t, l, oNewVal); + return oThis.ReadCT_AxDataSource(t, l, oNewVal); }); - if (null != oNewVal.m_val) - val.setShowLegendKey(oNewVal.m_val); - else - val.setShowLegendKey(true); + val.setCat(oNewVal); } - else if (c_oserct_dlblsSHOWPERCENT === type) { - var oNewVal = { m_val: null }; + else if (c_oserct_barserVAL === type) { + var oNewVal = new AscFormat.CYVal(); res = this.bcr.Read1(length, function (t, l) { - return oThis.ReadCT_Boolean(t, l, oNewVal); + return oThis.ReadCT_NumDataSource(t, l, oNewVal); }); - if (null != oNewVal.m_val) - val.setShowPercent(oNewVal.m_val); - else - val.setShowPercent(true); + val.setVal(oNewVal); } - else if (c_oserct_dlblsSHOWSERNAME === type) { + else if (c_oserct_barserSHAPE === type) { var oNewVal = { m_val: null }; res = this.bcr.Read1(length, function (t, l) { - return oThis.ReadCT_Boolean(t, l, oNewVal); + return oThis.ReadCT_Shape(t, l, oNewVal); }); if (null != oNewVal.m_val) - val.setShowSerName(oNewVal.m_val); - else - val.setShowSerName(true); + val.setShape(oNewVal.m_val); } - else if (c_oserct_dlblsSHOWVAL === type) { - var oNewVal = { m_val: null }; + else if (c_oserct_barserEXTLST === type) { + var oNewVal = {}; res = this.bcr.Read1(length, function (t, l) { - return oThis.ReadCT_Boolean(t, l, oNewVal); + return oThis.ReadCT_extLst(t, l, oNewVal); }); - if (null != oNewVal.m_val) - val.setShowVal(oNewVal.m_val); - else - val.setShowVal(true); + // val.m_extLst = oNewVal; } - else if (c_oserct_dlblsSPPR === type) { - val.setSpPr(this.ReadSpPr(length)); + else if(c_oserct_chartFiltering === type) { + res = this.bcr.Read1(length, function (t, l) { + return oThis.ReadCT_ChartFiltering(t, l, val); + }); } - else if (c_oserct_dlblsTXPR === type) { - val.setTxPr(this.ReadTxPr(length)); - val.txPr.setParent(val); + else + res = c_oSerConstants.ReadUnknown; + return res; +}; +BinaryChartReader.prototype.ReadCT_ChartFiltering = function(type, length, val) { + let res = c_oSerConstants.ReadOk; + let oThis = this; + if (c_oserct_dataLabelsRange === type) { + var oNewVal = new AscFormat.CStrRef(); + res = this.bcr.Read1(length, function (t, l) { + return oThis.ReadCT_dataLabelsRange(t, l, oNewVal); + }); + val.setDataLabelsRange(oNewVal); + } + else + res = c_oSerConstants.ReadUnknown; + return res; +}; +BinaryChartReader.prototype.ReadCT_dataLabelsRange = function(type, length, val) { + let res = c_oSerConstants.ReadOk; + let oThis = this; + if (0 === type) { + val.setF(this.stream.GetString2LE(length)); + } + else if(1 === type) { + var oNewVal = new AscFormat.CStrCache(); + res = this.bcr.Read1(length, function (t, l) { + return oThis.ReadCT_StrData(t, l, oNewVal); + }); + val.setStrCache(oNewVal); + } + else + res = c_oSerConstants.ReadUnknown; + return res; +}; +BinaryChartReader.prototype.ReadCT_Shape = function (type, length, val) { + var res = c_oSerConstants.ReadOk; + var oThis = this; + if (c_oserct_shapeVAL === type) { + switch (this.stream.GetUChar()) { + case st_shapeCONE: val.m_val = AscFormat.BAR_SHAPE_CONE; break; + case st_shapeCONETOMAX: val.m_val = AscFormat.BAR_SHAPE_CONETOMAX; break; + case st_shapeBOX: val.m_val = AscFormat.BAR_SHAPE_BOX; break; + case st_shapeCYLINDER: val.m_val = AscFormat.BAR_SHAPE_CYLINDER; break; + case st_shapePYRAMID: val.m_val = AscFormat.BAR_SHAPE_PYRAMID; break; + case st_shapePYRAMIDTOMAX: val.m_val = AscFormat.BAR_SHAPE_PYRAMIDTOMAX; break; + } } - else if (c_oserct_dlblsEXTLST === type) { - var oNewVal; - oNewVal = {}; - res = this.bcr.Read1(length, function (t, l) { - return oThis.ReadCT_extLst(t, l, oNewVal); - }); - // val.m_extLst = oNewVal; + else + res = c_oSerConstants.ReadUnknown; + return res; +}; +BinaryChartReader.prototype.ReadCT_Overlap = function (type, length, val) { + var res = c_oSerConstants.ReadOk; + var oThis = this; + if (c_oserct_overlapVAL === type) { + val.m_val = this.ParsePersent(this.stream.GetString2LE(length)); } else res = c_oSerConstants.ReadUnknown; return res; }; -BinaryChartReader.prototype.ReadCT_DLbl = function (type, length, val) { +BinaryChartReader.prototype.ReadCT_BarChart = function (type, length, val, aChartWithAxis) { var res = c_oSerConstants.ReadOk; var oThis = this; - if (c_oserct_dlblIDX === type) { + if (c_oserct_barchartBARDIR === type) { var oNewVal = { m_val: null }; res = this.bcr.Read1(length, function (t, l) { - return oThis.ReadCT_UnsignedInt(t, l, oNewVal); + return oThis.ReadCT_BarDir(t, l, oNewVal); }); if (null != oNewVal.m_val) - val.setIdx(oNewVal.m_val); + val.setBarDir(oNewVal.m_val); } - else if (c_oserct_dlblDLBLPOS === type) { + else if (c_oserct_barchartGROUPING === type) { var oNewVal = { m_val: null }; res = this.bcr.Read1(length, function (t, l) { - return oThis.ReadCT_DLblPos(t, l, oNewVal); + return oThis.ReadCT_BarGrouping(t, l, oNewVal); }); if (null != oNewVal.m_val) - val.setDLblPos(oNewVal.m_val); + val.setGrouping(oNewVal.m_val); } - else if (c_oserct_dlblDELETE === type) { + else if (c_oserct_barchartVARYCOLORS === type) { var oNewVal = { m_val: null }; res = this.bcr.Read1(length, function (t, l) { return oThis.ReadCT_Boolean(t, l, oNewVal); }); if (null != oNewVal.m_val) - val.setDelete(oNewVal.m_val); - else - val.setDelete(true); - } - else if (c_oserct_dlblLAYOUT === type) { - res = this.bcr.Read1(length, function (t, l) { - return oThis.ReadCT_Layout(t, l, val); - }); - } - else if (c_oserct_dlblNUMFMT === type) { - var oNewVal = new AscFormat.CNumFmt(); - res = this.bcr.Read1(length, function (t, l) { - return oThis.ReadCT_NumFmt(t, l, oNewVal); - }); - val.setNumFmt(oNewVal); - } - else if (c_oserct_dlblSEPARATOR === type) { - val.setSeparator(this.stream.GetString2LE(length)); + val.setVaryColors(oNewVal.m_val); } - else if (c_oserct_dlblSHOWBUBBLESIZE === type) { - var oNewVal = { m_val: null }; + else if (c_oserct_barchartSER === type) { + var oNewVal = new AscFormat.CBarSeries(); res = this.bcr.Read1(length, function (t, l) { - return oThis.ReadCT_Boolean(t, l, oNewVal); + return oThis.ReadCT_BarSer(t, l, oNewVal); }); - if (null != oNewVal.m_val) - val.setShowBubbleSize(oNewVal.m_val); - else - val.setShowBubbleSize(true); + val.addSer(oNewVal); } - else if (c_oserct_dlblSHOWCATNAME === type) { - var oNewVal = { m_val: null }; + else if (c_oserct_barchartDLBLS === type) { + var oNewVal = new AscFormat.CDLbls(); + this.curChart.oDataLablesData = AscCommon.fSaveStream(this.bcr.stream, length); res = this.bcr.Read1(length, function (t, l) { - return oThis.ReadCT_Boolean(t, l, oNewVal); + return oThis.ReadCT_DLbls(t, l, oNewVal); }); - if (null != oNewVal.m_val) - val.setShowCatName(oNewVal.m_val); - else - val.setShowCatName(true); + oNewVal.correctValues(); + val.setDLbls(oNewVal); } - else if (c_oserct_dlblSHOWLEGENDKEY === type) { + else if (c_oserct_barchartGAPWIDTH === type) { var oNewVal = { m_val: null }; res = this.bcr.Read1(length, function (t, l) { - return oThis.ReadCT_Boolean(t, l, oNewVal); + return oThis.ReadCT_GapAmount(t, l, oNewVal); }); if (null != oNewVal.m_val) - val.setShowLegendKey(oNewVal.m_val); - else - val.setShowLegendKey(true); + val.setGapWidth(oNewVal.m_val); } - else if (c_oserct_dlblSHOWPERCENT === type) { + else if (c_oserct_barchartOVERLAP === type) { var oNewVal = { m_val: null }; res = this.bcr.Read1(length, function (t, l) { - return oThis.ReadCT_Boolean(t, l, oNewVal); + return oThis.ReadCT_Overlap(t, l, oNewVal); }); if (null != oNewVal.m_val) - val.setShowPercent(oNewVal.m_val); - else - val.setShowPercent(true); + val.setOverlap(oNewVal.m_val); } - else if (c_oserct_dlblSHOWSERNAME === type) { - var oNewVal = { m_val: null }; + else if (c_oserct_barchartSERLINES === type) { + //todo array + var oNewVal = { spPr: null }; res = this.bcr.Read1(length, function (t, l) { - return oThis.ReadCT_Boolean(t, l, oNewVal); + return oThis.ReadCT_ChartLines(t, l, oNewVal); }); - if (null != oNewVal.m_val) - val.setShowSerName(oNewVal.m_val); + if (null != oNewVal.spPr) + val.setSerLines(oNewVal.spPr); else - val.setShowSerName(true); + val.setSerLines(new AscFormat.CSpPr()); } - else if (c_oserct_dlblSHOWVAL === type) { + else if (c_oserct_barchartAXID === type) { var oNewVal = { m_val: null }; res = this.bcr.Read1(length, function (t, l) { - return oThis.ReadCT_Boolean(t, l, oNewVal); + return oThis.ReadCT_UnsignedInt(t, l, oNewVal); }); if (null != oNewVal.m_val) - val.setShowVal(oNewVal.m_val); - else - val.setShowVal(true); - } - else if (c_oserct_dlblSPPR === type) { - val.setSpPr(this.ReadSpPr(length)); - } - else if (c_oserct_dlblTX === type) { - var oNewVal = new AscFormat.CChartText(); - res = this.bcr.Read1(length, function (t, l) { - return oThis.ReadCT_Tx(t, l, oNewVal); - }); - oNewVal.setChart(this.curChart); - val.setTx(oNewVal); - } - else if (c_oserct_dlblTXPR === type) { - val.setTxPr(this.ReadTxPr(length)); - val.txPr.setParent(val); + aChartWithAxis.push({ axisId: oNewVal.m_val, chart: val }); } - else if (c_oserct_dlblEXTLST === type) { + else if (c_oserct_barchartEXTLST === type) { var oNewVal; oNewVal = {}; res = this.bcr.Read1(length, function (t, l) { @@ -9046,136 +11330,65 @@ BinaryChartReader.prototype.ReadCT_DLbl = function (type, length, val) { }); // val.m_extLst = oNewVal; } - else if (c_oserct_dataLabel === type) { - res = this.bcr.Read1(length, function (t, l) { - return oThis.ReadCT_DLblExt(t, l, val); - }); - // val.m_extLst = oNewVal; - } else res = c_oSerConstants.ReadUnknown; return res; }; -BinaryChartReader.prototype.ReadCT_DLblExt = function(type, length, val) { - - let res = c_oSerConstants.ReadOk; - let oThis = this; - if (c_oserct_showDataLabelsRange === type) { - let oNewVal = { m_val: null }; - res = this.bcr.Read1(length, function (t, l) { - return oThis.ReadCT_Boolean(t, l, oNewVal); - }); - if (null != oNewVal.m_val) - val.setShowDlblsRange(oNewVal.m_val); - } - else - res = c_oSerConstants.ReadUnknown; - return res; -}; -BinaryChartReader.prototype.ReadCT_DLblPos = function (type, length, val) { +BinaryChartReader.prototype.ReadCT_HoleSize = function (type, length, val) { var res = c_oSerConstants.ReadOk; var oThis = this; - if (c_oserct_dlblposVAL === type) { - switch (this.stream.GetUChar()) { - case st_dlblposBESTFIT: val.m_val = c_oAscChartDataLabelsPos.bestFit; break; - case st_dlblposB: val.m_val = c_oAscChartDataLabelsPos.b; break; - case st_dlblposCTR: val.m_val = c_oAscChartDataLabelsPos.ctr; break; - case st_dlblposINBASE: val.m_val = c_oAscChartDataLabelsPos.inBase; break; - case st_dlblposINEND: val.m_val = c_oAscChartDataLabelsPos.inEnd; break; - case st_dlblposL: val.m_val = c_oAscChartDataLabelsPos.l; break; - case st_dlblposOUTEND: val.m_val = c_oAscChartDataLabelsPos.outEnd; break; - case st_dlblposR: val.m_val = c_oAscChartDataLabelsPos.r; break; - case st_dlblposT: val.m_val = c_oAscChartDataLabelsPos.t; break; - } + if (c_oserct_holesizeVAL === type) { + val.m_val = this.ParsePersent(this.stream.GetString2LE(length)); } else res = c_oSerConstants.ReadUnknown; return res; }; -BinaryChartReader.prototype.ReadCT_Trendline = function (type, length, val) { +BinaryChartReader.prototype.ReadCT_DoughnutChart = function (type, length, val, aChartWithAxis) { var res = c_oSerConstants.ReadOk; var oThis = this; - if (c_oserct_trendlineNAME === type) { - val.setName(this.stream.GetString2LE(length)); - } - else if (c_oserct_trendlineSPPR === type) { - val.setSpPr(this.ReadSpPr(length)); - } - else if (c_oserct_trendlineTRENDLINETYPE === type) { - var oNewVal = { m_val: null }; - res = this.bcr.Read1(length, function (t, l) { - return oThis.ReadCT_TrendlineType(t, l, oNewVal); - }); - if (null != oNewVal.m_val) - val.setTrendlineType(oNewVal.m_val); - } - else if (c_oserct_trendlineORDER === type) { - var oNewVal = { m_val: null }; - res = this.bcr.Read1(length, function (t, l) { - return oThis.ReadCT_Order(t, l, oNewVal); - }); - if (null != oNewVal.m_val) - val.setOrder(oNewVal.m_val); - } - else if (c_oserct_trendlinePERIOD === type) { - var oNewVal = { m_val: null }; - res = this.bcr.Read1(length, function (t, l) { - return oThis.ReadCT_Period(t, l, oNewVal); - }); - if (null != oNewVal.m_val) - val.setPeriod(oNewVal.m_val); - } - else if (c_oserct_trendlineFORWARD === type) { + if (c_oserct_doughnutchartVARYCOLORS === type) { var oNewVal = { m_val: null }; res = this.bcr.Read1(length, function (t, l) { - return oThis.ReadCT_Double(t, l, oNewVal); + return oThis.ReadCT_Boolean(t, l, oNewVal); }); if (null != oNewVal.m_val) - val.setForward(oNewVal.m_val); + val.setVaryColors(oNewVal.m_val); } - else if (c_oserct_trendlineBACKWARD === type) { - var oNewVal = { m_val: null }; + else if (c_oserct_doughnutchartSER === type) { + var oNewVal = new AscFormat.CPieSeries(); res = this.bcr.Read1(length, function (t, l) { - return oThis.ReadCT_Double(t, l, oNewVal); + return oThis.ReadCT_PieSer(t, l, oNewVal); }); - if (null != oNewVal.m_val) - val.setBackward(oNewVal.m_val); + val.addSer(oNewVal); } - else if (c_oserct_trendlineINTERCEPT === type) { - var oNewVal = { m_val: null }; + else if (c_oserct_doughnutchartDLBLS === type) { + var oNewVal = new AscFormat.CDLbls(); + this.curChart.oDataLablesData = AscCommon.fSaveStream(this.bcr.stream, length); res = this.bcr.Read1(length, function (t, l) { - return oThis.ReadCT_Double(t, l, oNewVal); + return oThis.ReadCT_DLbls(t, l, oNewVal); }); - if (null != oNewVal.m_val) - val.setIntercept(oNewVal.m_val); + oNewVal.correctValues(); + val.setDLbls(oNewVal); } - else if (c_oserct_trendlineDISPRSQR === type) { + else if (c_oserct_doughnutchartFIRSTSLICEANG === type) { var oNewVal = { m_val: null }; res = this.bcr.Read1(length, function (t, l) { - return oThis.ReadCT_Boolean(t, l, oNewVal); + return oThis.ReadCT_FirstSliceAng(t, l, oNewVal); }); if (null != oNewVal.m_val) - val.setDispRSqr(oNewVal.m_val); + val.setFirstSliceAng(oNewVal.m_val); } - else if (c_oserct_trendlineDISPEQ === type) { + else if (c_oserct_doughnutchartHOLESIZE === type) { var oNewVal = { m_val: null }; res = this.bcr.Read1(length, function (t, l) { - return oThis.ReadCT_Boolean(t, l, oNewVal); + return oThis.ReadCT_HoleSize(t, l, oNewVal); }); if (null != oNewVal.m_val) - val.setDispEq(oNewVal.m_val); - } - else if (c_oserct_trendlineTRENDLINELBL === type) { - var oNewVal = new AscFormat.CDLbl(); - res = this.bcr.Read1(length, function (t, l) { - return oThis.ReadCT_TrendlineLbl(t, l, oNewVal); - }); - oNewVal.correctValues(); - val.setTrendlineLbl(oNewVal); + val.setHoleSize(oNewVal.m_val); } - else if (c_oserct_trendlineEXTLST === type) { - var oNewVal; - oNewVal = {}; + else if (c_oserct_doughnutchartEXTLST === type) { + var oNewVal = {}; res = this.bcr.Read1(length, function (t, l) { return oThis.ReadCT_extLst(t, l, oNewVal); }); @@ -9185,39 +11398,10 @@ BinaryChartReader.prototype.ReadCT_Trendline = function (type, length, val) { res = c_oSerConstants.ReadUnknown; return res; }; -BinaryChartReader.prototype.ReadCT_TrendlineType = function (type, length, val) { - var res = c_oSerConstants.ReadOk; - var oThis = this; - if (c_oserct_trendlinetypeVAL === type) { - switch (this.stream.GetUChar()) { - case st_trendlinetypeEXP: val.m_val = TRENDLINE_TYPE_EXP; break; - case st_trendlinetypeLINEAR: val.m_val = TRENDLINE_TYPE_LINEAR; break; - case st_trendlinetypeLOG: val.m_val = TRENDLINE_TYPE_LOG; break; - case st_trendlinetypeMOVINGAVG: val.m_val = TRENDLINE_TYPE_MOVING_AVG; break; - case st_trendlinetypePOLY: val.m_val = TRENDLINE_TYPE_POLY; break; - case st_trendlinetypePOWER: val.m_val = TRENDLINE_TYPE_POWER; break; - } - } - else - res = c_oSerConstants.ReadUnknown; - return res; -}; -BinaryChartReader.prototype.ReadCT_Order = function (type, length, val) { - var res = c_oSerConstants.ReadOk; - var oThis = this; - if (c_oserct_orderVAL === type) { - var oNewVal; - oNewVal = this.stream.GetUChar(); - val.m_val = oNewVal; - } - else - res = c_oSerConstants.ReadUnknown; - return res; -}; -BinaryChartReader.prototype.ReadCT_Period = function (type, length, val) { +BinaryChartReader.prototype.ReadCT_FirstSliceAng = function (type, length, val) { var res = c_oSerConstants.ReadOk; var oThis = this; - if (c_oserct_periodVAL === type) { + if (c_oserct_firstsliceangVAL === type) { var oNewVal; oNewVal = this.stream.GetULongLE(); val.m_val = oNewVal; @@ -9226,39 +11410,35 @@ BinaryChartReader.prototype.ReadCT_Period = function (type, length, val) { res = c_oSerConstants.ReadUnknown; return res; }; -BinaryChartReader.prototype.ReadCT_TrendlineLbl = function (type, length, val) { +BinaryChartReader.prototype.ReadCT_Pie3DChart = function (type, length, val, aChartWithAxis) { var res = c_oSerConstants.ReadOk; var oThis = this; - if (c_oserct_trendlinelblLAYOUT === type) { + if (c_oserct_pie3dchartVARYCOLORS === type) { + var oNewVal = { m_val: null }; res = this.bcr.Read1(length, function (t, l) { - return oThis.ReadCT_Layout(t, l, val); + return oThis.ReadCT_Boolean(t, l, oNewVal); }); + if (null != oNewVal.m_val) + val.setVaryColors(oNewVal.m_val); } - else if (c_oserct_trendlinelblTX === type) { - var oNewVal = new AscFormat.CChartText(); + else if (c_oserct_pie3dchartSER === type) { + var oNewVal = new AscFormat.CPieSeries(); res = this.bcr.Read1(length, function (t, l) { - return oThis.ReadCT_Tx(t, l, oNewVal); + return oThis.ReadCT_PieSer(t, l, oNewVal); }); - oNewVal.setChart(this.curChart); - val.setTx(oNewVal); + val.addSer(oNewVal); } - else if (c_oserct_trendlinelblNUMFMT === type) { - var oNewVal = new AscFormat.CNumFmt(); + else if (c_oserct_pie3dchartDLBLS === type) { + var oNewVal = new AscFormat.CDLbls(); + this.curChart.oDataLablesData = AscCommon.fSaveStream(this.bcr.stream, length); res = this.bcr.Read1(length, function (t, l) { - return oThis.ReadCT_NumFmt(t, l, oNewVal); + return oThis.ReadCT_DLbls(t, l, oNewVal); }); - val.setNumFmt(oNewVal); - } - else if (c_oserct_trendlinelblSPPR === type) { - val.setSpPr(this.ReadSpPr(length)); - } - else if (c_oserct_trendlinelblTXPR === type) { - val.setTxPr(this.ReadTxPr(length)); - val.txPr.setParent(val); + oNewVal.correctValues(); + val.setDLbls(oNewVal); } - else if (c_oserct_trendlinelblEXTLST === type) { - var oNewVal; - oNewVal = {}; + else if (c_oserct_pie3dchartEXTLST === type) { + var oNewVal = {}; res = this.bcr.Read1(length, function (t, l) { return oThis.ReadCT_extLst(t, l, oNewVal); }); @@ -9268,208 +11448,225 @@ BinaryChartReader.prototype.ReadCT_TrendlineLbl = function (type, length, val) { res = c_oSerConstants.ReadUnknown; return res; }; -BinaryChartReader.prototype.ReadCT_ErrBars = function (type, length, val) { +BinaryChartReader.prototype.ReadCT_PieChart = function (type, length, val, aChartWithAxis) { var res = c_oSerConstants.ReadOk; var oThis = this; - if (c_oserct_errbarsERRDIR === type) { + if (c_oserct_piechartVARYCOLORS === type) { var oNewVal = { m_val: null }; res = this.bcr.Read1(length, function (t, l) { - return oThis.ReadCT_ErrDir(t, l, oNewVal); + return oThis.ReadCT_Boolean(t, l, oNewVal); }); if (null != oNewVal.m_val) - val.setErrDir(oNewVal.m_val); + val.setVaryColors(oNewVal.m_val); } - else if (c_oserct_errbarsERRBARTYPE === type) { - var oNewVal = { m_val: null }; + else if (c_oserct_piechartSER === type) { + var oNewVal = new AscFormat.CPieSeries(); res = this.bcr.Read1(length, function (t, l) { - return oThis.ReadCT_ErrBarType(t, l, oNewVal); + return oThis.ReadCT_PieSer(t, l, oNewVal); }); - if (null != oNewVal.m_val) - val.setErrBarType(oNewVal.m_val); + val.addSer(oNewVal); } - else if (c_oserct_errbarsERRVALTYPE === type) { - var oNewVal = { m_val: null }; + else if (c_oserct_piechartDLBLS === type) { + var oNewVal = new AscFormat.CDLbls(); + this.curChart.oDataLablesData = AscCommon.fSaveStream(this.bcr.stream, length); res = this.bcr.Read1(length, function (t, l) { - return oThis.ReadCT_ErrValType(t, l, oNewVal); + return oThis.ReadCT_DLbls(t, l, oNewVal); }); - if (null != oNewVal.m_val) - val.setErrValType(oNewVal.m_val); + oNewVal.correctValues(); + val.setDLbls(oNewVal); } - else if (c_oserct_errbarsNOENDCAP === type) { + else if (c_oserct_piechartFIRSTSLICEANG === type) { var oNewVal = { m_val: null }; res = this.bcr.Read1(length, function (t, l) { - return oThis.ReadCT_Boolean(t, l, oNewVal); + return oThis.ReadCT_FirstSliceAng(t, l, oNewVal); }); if (null != oNewVal.m_val) - val.setNoEndCap(oNewVal.m_val); + val.setFirstSliceAng(oNewVal.m_val); } - else if (c_oserct_errbarsPLUS === type) { - var oNewVal = new AscFormat.CMinusPlus(); + else if (c_oserct_piechartEXTLST === type) { + var oNewVal = {}; res = this.bcr.Read1(length, function (t, l) { - return oThis.ReadCT_NumDataSource(t, l, oNewVal); + return oThis.ReadCT_extLst(t, l, oNewVal); }); - val.setPlus(oNewVal); + // val.m_extLst = oNewVal; } - else if (c_oserct_errbarsMINUS === type) { - var oNewVal = new AscFormat.CMinusPlus(); + else + res = c_oSerConstants.ReadUnknown; + return res; +}; +BinaryChartReader.prototype.ReadCT_ScatterSer = function (type, length, val) { + var res = c_oSerConstants.ReadOk; + var oThis = this; + if (c_oserct_scatterserIDX === type) { + var oNewVal = { m_val: null }; res = this.bcr.Read1(length, function (t, l) { - return oThis.ReadCT_NumDataSource(t, l, oNewVal); + return oThis.ReadCT_UnsignedInt(t, l, oNewVal); }); - val.setMinus(oNewVal); + if (null != oNewVal.m_val) + val.setIdx(oNewVal.m_val); } - else if (c_oserct_errbarsVAL === type) { + else if (c_oserct_scatterserORDER === type) { var oNewVal = { m_val: null }; res = this.bcr.Read1(length, function (t, l) { - return oThis.ReadCT_Double(t, l, oNewVal); + return oThis.ReadCT_UnsignedInt(t, l, oNewVal); }); if (null != oNewVal.m_val) - val.setVal(oNewVal.m_val); + val.setOrder(oNewVal.m_val); } - else if (c_oserct_errbarsSPPR === type) { + else if (c_oserct_scatterserTX === type) { + var oNewVal = new AscFormat.CTx(); + res = this.bcr.Read1(length, function (t, l) { + return oThis.ReadCT_SerTx(t, l, oNewVal); + }); + val.setTx(oNewVal); + } + else if (c_oserct_scatterserSPPR === type) { val.setSpPr(this.ReadSpPr(length)); } - else if (c_oserct_errbarsEXTLST === type) { - var oNewVal; - oNewVal = {}; + else if (c_oserct_scatterserMARKER === type) { + var oNewVal = new AscFormat.CMarker(); res = this.bcr.Read1(length, function (t, l) { - return oThis.ReadCT_extLst(t, l, oNewVal); + return oThis.ReadCT_Marker(t, l, oNewVal); }); - // val.m_extLst = oNewVal; + val.setMarker(oNewVal); } - else - res = c_oSerConstants.ReadUnknown; - return res; -}; -BinaryChartReader.prototype.ReadCT_ErrDir = function (type, length, val) { - var res = c_oSerConstants.ReadOk; - var oThis = this; - if (c_oserct_errdirVAL === type) { - switch (this.stream.GetUChar()) { - case st_errdirX: val.m_val = ERR_DIR_X; break; - case st_errdirY: val.m_val = ERR_DIR_Y; break; - } + else if (c_oserct_scatterserDPT === type) { + var oNewVal = new AscFormat.CDPt(); + res = this.bcr.Read1(length, function (t, l) { + return oThis.ReadCT_DPt(t, l, oNewVal); + }); + val.addDPt(oNewVal); } - else - res = c_oSerConstants.ReadUnknown; - return res; -}; -BinaryChartReader.prototype.ReadCT_ErrBarType = function (type, length, val) { - var res = c_oSerConstants.ReadOk; - var oThis = this; - if (c_oserct_errbartypeVAL === type) { - switch (this.stream.GetUChar()) { - case st_errbartypeBOTH: val.m_val = ERR_BAR_TYPE_BOTH; break; - case st_errbartypeMINUS: val.m_val = ERR_BAR_TYPE_MINUS; break; - case st_errbartypePLUS: val.m_val = ERR_BAR_TYPE_PLUS; break; - } + else if (c_oserct_scatterserDLBLS === type) { + var oNewVal = new AscFormat.CDLbls(); + res = this.bcr.Read1(length, function (t, l) { + return oThis.ReadCT_DLbls(t, l, oNewVal); + }); + oNewVal.correctValues(); + val.setDLbls(oNewVal); } - else - res = c_oSerConstants.ReadUnknown; - return res; -}; -BinaryChartReader.prototype.ReadCT_ErrValType = function (type, length, val) { - var res = c_oSerConstants.ReadOk; - var oThis = this; - if (c_oserct_errvaltypeVAL === type) { - switch (this.stream.GetUChar()) { - case st_errvaltypeCUST: val.m_val = ERR_VAL_TYPE_CUST; break; - case st_errvaltypeFIXEDVAL: val.m_val = ERR_VAL_TYPE_FIXED_VAL; break; - case st_errvaltypePERCENTAGE: val.m_val = ERR_VAL_TYPE_PERCENTAGE; break; - case st_errvaltypeSTDDEV: val.m_val = ERR_VAL_TYPE_STD_DEV; break; - case st_errvaltypeSTDERR: val.m_val = ERR_VAL_TYPE_STD_ERR; break; - } + else if (c_oserct_scatterserTRENDLINE === type) { + //todo array + var oNewVal = new AscFormat.CTrendLine(); + res = this.bcr.Read1(length, function (t, l) { + return oThis.ReadCT_Trendline(t, l, oNewVal); + }); + val.setTrendline(oNewVal); } - else - res = c_oSerConstants.ReadUnknown; - return res; -}; -BinaryChartReader.prototype.ReadCT_NumDataSource = function (type, length, val) { - var res = c_oSerConstants.ReadOk; - var oThis = this; - if (c_oserct_numdatasourceNUMLIT === type) { - var oNewVal = new AscFormat.CNumLit(); + else if (c_oserct_scatterserERRBARS === type) { + //todo array + var oNewVal = new AscFormat.CErrBars(); res = this.bcr.Read1(length, function (t, l) { - return oThis.ReadCT_NumData(t, l, oNewVal); + return oThis.ReadCT_ErrBars(t, l, oNewVal); }); - val.setNumLit(oNewVal); + val.setErrBars(oNewVal); } - else if (c_oserct_numdatasourceNUMREF === type) { - var oNewVal = new AscFormat.CNumRef(); + else if (c_oserct_scatterserXVAL === type) { + var oNewVal = new AscFormat.CCat(); res = this.bcr.Read1(length, function (t, l) { - return oThis.ReadCT_NumRef(t, l, oNewVal); + return oThis.ReadCT_AxDataSource(t, l, oNewVal); }); - val.setNumRef(oNewVal); - } - else - res = c_oSerConstants.ReadUnknown; - return res; -}; -BinaryChartReader.prototype.ReadCT_NumData = function (type, length, val) { - var res = c_oSerConstants.ReadOk; - var oThis = this; - if (c_oserct_numdataFORMATCODE === type) { - val.setFormatCode(this.stream.GetString2LE(length)); + val.setXVal(oNewVal); } - else if (c_oserct_numdataPTCOUNT === type) { - var oNewVal = { m_val: null }; + else if (c_oserct_scatterserYVAL === type) { + var oNewVal = new AscFormat.CYVal(); res = this.bcr.Read1(length, function (t, l) { - return oThis.ReadCT_UnsignedInt(t, l, oNewVal); + return oThis.ReadCT_NumDataSource(t, l, oNewVal); }); - if (null != oNewVal.m_val) - val.setPtCount(oNewVal.m_val); + val.setYVal(oNewVal); } - else if (c_oserct_numdataPT === type) { - var oNewVal = new AscFormat.CNumericPoint(); + else if (c_oserct_scatterserSMOOTH === type) { + var oNewVal = { m_val: null }; res = this.bcr.Read1(length, function (t, l) { - return oThis.ReadCT_NumVal(t, l, oNewVal); + return oThis.ReadCT_Boolean(t, l, oNewVal); }); - val.addPt(oNewVal); + if (null != oNewVal.m_val){ + val.setSmooth(oNewVal.m_val); + } + else{ + val.setSmooth(true); + } } - else if (c_oserct_numdataEXTLST === type) { - var oNewVal; - oNewVal = {}; + else if (c_oserct_scatterserEXTLST === type) { + var oNewVal = {}; res = this.bcr.Read1(length, function (t, l) { return oThis.ReadCT_extLst(t, l, oNewVal); }); // val.m_extLst = oNewVal; } + else if(c_oserct_chartFiltering === type) { + res = this.bcr.Read1(length, function (t, l) { + return oThis.ReadCT_ChartFiltering(t, l, val); + }); + } else res = c_oSerConstants.ReadUnknown; return res; }; -BinaryChartReader.prototype.ReadCT_NumVal = function (type, length, val) { +BinaryChartReader.prototype.ReadCT_ScatterStyle = function (type, length, val) { var res = c_oSerConstants.ReadOk; var oThis = this; - if (c_oserct_numvalV === type) { - var nVal = parseFloat(this.stream.GetString2LE(length)); - if(isNaN(nVal)) - nVal = 0; - val.setVal(nVal); - } - else if (c_oserct_numvalIDX === type) { - val.setIdx(this.stream.GetULongLE()); - } - else if (c_oserct_numvalFORMATCODE === type) { - val.setFormatCode(this.stream.GetString2LE(length)); + if (c_oserct_scatterstyleVAL === type) { + switch (this.stream.GetUChar()) { + case st_scatterstyleNONE: val.m_val = AscFormat.SCATTER_STYLE_NONE; break; + case st_scatterstyleLINE: val.m_val = AscFormat.SCATTER_STYLE_LINE; break; + case st_scatterstyleLINEMARKER: val.m_val = AscFormat.SCATTER_STYLE_LINE_MARKER; break; + case st_scatterstyleMARKER: val.m_val = AscFormat.SCATTER_STYLE_MARKER; break; + case st_scatterstyleSMOOTH: val.m_val = AscFormat.SCATTER_STYLE_SMOOTH; break; + case st_scatterstyleSMOOTHMARKER: val.m_val = AscFormat.SCATTER_STYLE_SMOOTH_MARKER; break; + } } else res = c_oSerConstants.ReadUnknown; return res; }; -BinaryChartReader.prototype.ReadCT_NumRef = function (type, length, val) { +BinaryChartReader.prototype.ReadCT_ScatterChart = function (type, length, val, aChartWithAxis) { var res = c_oSerConstants.ReadOk; var oThis = this; - if (c_oserct_numrefF === type) { - val.setF(this.stream.GetString2LE(length)); + if (c_oserct_scatterchartSCATTERSTYLE === type) { + var oNewVal = { m_val: null }; + res = this.bcr.Read1(length, function (t, l) { + return oThis.ReadCT_ScatterStyle(t, l, oNewVal); + }); + if (null != oNewVal.m_val) + val.setScatterStyle(oNewVal.m_val); } - else if (c_oserct_numrefNUMCACHE === type) { - var oNewVal = new AscFormat.CNumLit(); + else if (c_oserct_scatterchartVARYCOLORS === type) { + var oNewVal = { m_val: null }; res = this.bcr.Read1(length, function (t, l) { - return oThis.ReadCT_NumData(t, l, oNewVal); + return oThis.ReadCT_Boolean(t, l, oNewVal); }); - val.setNumCache(oNewVal); + if (null != oNewVal.m_val) + val.setVaryColors(oNewVal.m_val); } - else if (c_oserct_numrefEXTLST === type) { + else if (c_oserct_scatterchartSER === type) { + var oNewVal = new AscFormat.CScatterSeries(); + res = this.bcr.Read1(length, function (t, l) { + return oThis.ReadCT_ScatterSer(t, l, oNewVal); + }); + val.addSer(oNewVal); + if(oNewVal.smooth === null){ + oNewVal.setSmooth(false); + } + } + else if (c_oserct_scatterchartDLBLS === type) { + var oNewVal = new AscFormat.CDLbls(); + this.curChart.oDataLablesData = AscCommon.fSaveStream(this.bcr.stream, length); + res = this.bcr.Read1(length, function (t, l) { + return oThis.ReadCT_DLbls(t, l, oNewVal); + }); + oNewVal.correctValues(); + val.setDLbls(oNewVal); + } + else if (c_oserct_scatterchartAXID === type) { + var oNewVal = { m_val: null }; + res = this.bcr.Read1(length, function (t, l) { + return oThis.ReadCT_UnsignedInt(t, l, oNewVal); + }); + if (null != oNewVal.m_val) + aChartWithAxis.push({ axisId: oNewVal.m_val, chart: val }); + } + else if (c_oserct_scatterchartEXTLST === type) { var oNewVal = {}; res = this.bcr.Read1(length, function (t, l) { return oThis.ReadCT_extLst(t, l, oNewVal); @@ -9480,62 +11677,72 @@ BinaryChartReader.prototype.ReadCT_NumRef = function (type, length, val) { res = c_oSerConstants.ReadUnknown; return res; }; -BinaryChartReader.prototype.ReadCT_AxDataSource = function (type, length, val) { +BinaryChartReader.prototype.ReadCT_RadarSer = function (type, length, val) { var res = c_oSerConstants.ReadOk; var oThis = this; - if (c_oserct_axdatasourceMULTILVLSTRREF === type) { - var oNewVal = new AscFormat.CMultiLvlStrRef(); + if (c_oserct_radarserIDX === type) { + var oNewVal = { m_val: null }; res = this.bcr.Read1(length, function (t, l) { - return oThis.ReadCT_MultiLvlStrRef(t, l, oNewVal); + return oThis.ReadCT_UnsignedInt(t, l, oNewVal); }); - val.setMultiLvlStrRef(oNewVal); + if (null != oNewVal.m_val) + val.setIdx(oNewVal.m_val); } - else if (c_oserct_axdatasourceNUMLIT === type) { - var oNewVal = new AscFormat.CNumLit(); + else if (c_oserct_radarserORDER === type) { + var oNewVal = { m_val: null }; res = this.bcr.Read1(length, function (t, l) { - return oThis.ReadCT_NumData(t, l, oNewVal); + return oThis.ReadCT_UnsignedInt(t, l, oNewVal); }); - val.setNumLit(oNewVal); + if (null != oNewVal.m_val) + val.setOrder(oNewVal.m_val); } - else if (c_oserct_axdatasourceNUMREF === type) { - var oNewVal = new AscFormat.CNumRef(); + else if (c_oserct_radarserTX === type) { + var oNewVal = new AscFormat.CTx(); res = this.bcr.Read1(length, function (t, l) { - return oThis.ReadCT_NumRef(t, l, oNewVal); + return oThis.ReadCT_SerTx(t, l, oNewVal); }); - val.setNumRef(oNewVal); + val.setTx(oNewVal); } - else if (c_oserct_axdatasourceSTRLIT === type) { - var oNewVal = new AscFormat.CStrCache(); + else if (c_oserct_radarserSPPR === type) { + val.setSpPr(this.ReadSpPr(length)); + } + else if (c_oserct_radarserMARKER === type) { + var oNewVal = new AscFormat.CMarker(); res = this.bcr.Read1(length, function (t, l) { - return oThis.ReadCT_StrData(t, l, oNewVal); + return oThis.ReadCT_Marker(t, l, oNewVal); }); - val.setStrLit(oNewVal); + val.setMarker(oNewVal); } - else if (c_oserct_axdatasourceSTRREF === type) { - var oNewVal = new AscFormat.CStrRef(); + else if (c_oserct_radarserDPT === type) { + var oNewVal = new AscFormat.CDPt(); res = this.bcr.Read1(length, function (t, l) { - return oThis.ReadCT_StrRef(t, l, oNewVal); + return oThis.ReadCT_DPt(t, l, oNewVal); }); - val.setStrRef(oNewVal); + val.addDPt(oNewVal); } - else - res = c_oSerConstants.ReadUnknown; - return res; -}; -BinaryChartReader.prototype.ReadCT_MultiLvlStrRef = function (type, length, val) { - var res = c_oSerConstants.ReadOk; - var oThis = this; - if (c_oserct_multilvlstrrefF === type) { - val.setF(this.stream.GetString2LE(length)); + else if (c_oserct_radarserDLBLS === type) { + var oNewVal = new AscFormat.CDLbls(); + res = this.bcr.Read1(length, function (t, l) { + return oThis.ReadCT_DLbls(t, l, oNewVal); + }); + oNewVal.correctValues(); + val.setDLbls(oNewVal); } - else if (c_oserct_multilvlstrrefMULTILVLSTRCACHE === type) { - var oNewVal = new AscFormat.CMultiLvlStrCache(); + else if (c_oserct_radarserCAT === type) { + var oNewVal = new AscFormat.CCat(); res = this.bcr.Read1(length, function (t, l) { - return oThis.ReadCT_MultiLvlStrData(t, l, oNewVal); + return oThis.ReadCT_AxDataSource(t, l, oNewVal); }); - val.setMultiLvlStrCache(oNewVal); + val.setCat(oNewVal); } - else if (c_oserct_multilvlstrrefEXTLST === type) { + else if (c_oserct_radarserVAL === type) { + var oNewVal = new AscFormat.CYVal(); + res = this.bcr.Read1(length, function (t, l) { + return oThis.ReadCT_NumDataSource(t, l, oNewVal); + }); + val.setVal(oNewVal); + } + else if (c_oserct_radarserEXTLST === type) { var oNewVal; oNewVal = {}; res = this.bcr.Read1(length, function (t, l) { @@ -9543,57 +11750,41 @@ BinaryChartReader.prototype.ReadCT_MultiLvlStrRef = function (type, length, val) }); // val.m_extLst = oNewVal; } + else if(c_oserct_chartFiltering === type) { + res = this.bcr.Read1(length, function (t, l) { + return oThis.ReadCT_ChartFiltering(t, l, val); + }); + } else res = c_oSerConstants.ReadUnknown; return res; }; -BinaryChartReader.prototype.ReadCT_lvl = function (type, length, val) { +BinaryChartReader.prototype.ReadCT_RadarStyle = function (type, length, val) { var res = c_oSerConstants.ReadOk; var oThis = this; - if (c_oserct_lvlPT === type) { - var oNewVal = new AscFormat.CStringPoint(); - res = this.bcr.Read1(length, function (t, l) { - return oThis.ReadCT_StrVal(t, l, oNewVal); - }); - val.addPt(oNewVal); + if (c_oserct_radarstyleVAL === type) { + switch (this.stream.GetUChar()) { + case st_radarstyleSTANDARD: val.m_val = RADAR_STYLE_STANDARD; break; + case st_radarstyleMARKER: val.m_val = RADAR_STYLE_MARKER; break; + case st_radarstyleFILLED: val.m_val = RADAR_STYLE_FILLED; break; + } } else res = c_oSerConstants.ReadUnknown; return res; }; -BinaryChartReader.prototype.ReadCT_MultiLvlStrData = function (type, length, val) { +BinaryChartReader.prototype.ReadCT_RadarChart = function (type, length, val, aChartWithAxis) { var res = c_oSerConstants.ReadOk; var oThis = this; - if (c_oserct_multilvlstrdataPTCOUNT === type) { + if (c_oserct_radarchartRADARSTYLE === type) { var oNewVal = { m_val: null }; res = this.bcr.Read1(length, function (t, l) { - return oThis.ReadCT_UnsignedInt(t, l, oNewVal); + return oThis.ReadCT_RadarStyle(t, l, oNewVal); }); if (null != oNewVal.m_val) - val.setPtCount(oNewVal.m_val); - } - else if (c_oserct_multilvlstrdataLVL === type) { - var oNewVal = new AscFormat.CStrCache(); - res = this.bcr.Read1(length, function (t, l) { - return oThis.ReadCT_lvl(t, l, oNewVal); - }); - val.addLvl(oNewVal); - } - else if (c_oserct_multilvlstrdataEXTLST === type) { - var oNewVal = {}; - res = this.bcr.Read1(length, function (t, l) { - return oThis.ReadCT_extLst(t, l, oNewVal); - }); - // val.m_extLst = oNewVal; - } - else - res = c_oSerConstants.ReadUnknown; - return res; -}; -BinaryChartReader.prototype.ReadCT_BubbleChart = function (type, length, val, aChartWithAxis) { - var res = c_oSerConstants.ReadOk; - var oThis = this; - if (c_oserct_bubblechartVARYCOLORS === type) { + val.setRadarStyle(oNewVal.m_val); + } + else if (c_oserct_radarchartVARYCOLORS === type) { var oNewVal = { m_val: null }; res = this.bcr.Read1(length, function (t, l) { return oThis.ReadCT_Boolean(t, l, oNewVal); @@ -9601,14 +11792,14 @@ BinaryChartReader.prototype.ReadCT_BubbleChart = function (type, length, val, aC if (null != oNewVal.m_val) val.setVaryColors(oNewVal.m_val); } - else if (c_oserct_bubblechartSER === type) { - var oNewVal = new AscFormat.CBubbleSeries(); + else if (c_oserct_radarchartSER === type) { + var oNewVal = new AscFormat.CRadarSeries(); res = this.bcr.Read1(length, function (t, l) { - return oThis.ReadCT_BubbleSer(t, l, oNewVal); + return oThis.ReadCT_RadarSer(t, l, oNewVal); }); val.addSer(oNewVal); } - else if (c_oserct_bubblechartDLBLS === type) { + else if (c_oserct_radarchartDLBLS === type) { var oNewVal = new AscFormat.CDLbls(); this.curChart.oDataLablesData = AscCommon.fSaveStream(this.bcr.stream, length); res = this.bcr.Read1(length, function (t, l) { @@ -9617,39 +11808,7 @@ BinaryChartReader.prototype.ReadCT_BubbleChart = function (type, length, val, aC oNewVal.correctValues(); val.setDLbls(oNewVal); } - else if (c_oserct_bubblechartBUBBLE3D === type) { - var oNewVal = { m_val: null }; - res = this.bcr.Read1(length, function (t, l) { - return oThis.ReadCT_Boolean(t, l, oNewVal); - }); - if (null != oNewVal.m_val) - val.setBubble3D(oNewVal.m_val); - } - else if (c_oserct_bubblechartBUBBLESCALE === type) { - var oNewVal = { m_val: null }; - res = this.bcr.Read1(length, function (t, l) { - return oThis.ReadCT_BubbleScale(t, l, oNewVal); - }); - if (null != oNewVal.m_val) - val.setBubbleScale(oNewVal.m_val); - } - else if (c_oserct_bubblechartSHOWNEGBUBBLES === type) { - var oNewVal = { m_val: null }; - res = this.bcr.Read1(length, function (t, l) { - return oThis.ReadCT_Boolean(t, l, oNewVal); - }); - if (null != oNewVal.m_val) - val.setShowNegBubbles(oNewVal.m_val); - } - else if (c_oserct_bubblechartSIZEREPRESENTS === type) { - var oNewVal = { m_val: null }; - res = this.bcr.Read1(length, function (t, l) { - return oThis.ReadCT_SizeRepresents(t, l, oNewVal); - }); - if (null != oNewVal.m_val) - val.setSizeRepresents(oNewVal.m_val); - } - else if (c_oserct_bubblechartAXID === type) { + else if (c_oserct_radarchartAXID === type) { var oNewVal = { m_val: null }; res = this.bcr.Read1(length, function (t, l) { return oThis.ReadCT_UnsignedInt(t, l, oNewVal); @@ -9657,7 +11816,7 @@ BinaryChartReader.prototype.ReadCT_BubbleChart = function (type, length, val, aC if (null != oNewVal.m_val) aChartWithAxis.push({ axisId: oNewVal.m_val, chart: val }); } - else if (c_oserct_bubblechartEXTLST === type) { + else if (c_oserct_radarchartEXTLST === type) { var oNewVal = {}; res = this.bcr.Read1(length, function (t, l) { return oThis.ReadCT_extLst(t, l, oNewVal); @@ -9668,52 +11827,61 @@ BinaryChartReader.prototype.ReadCT_BubbleChart = function (type, length, val, aC res = c_oSerConstants.ReadUnknown; return res; }; -BinaryChartReader.prototype.ReadCT_bandFmts = function (type, length, val) { +BinaryChartReader.prototype.ReadCT_StockChart = function (type, length, val, aChartWithAxis) { var res = c_oSerConstants.ReadOk; var oThis = this; - if (c_oserct_bandfmtsBANDFMT === type) { - var oNewVal = new AscFormat.CBandFmt(); + if (c_oserct_stockchartSER === type) { + var oNewVal = new AscFormat.CLineSeries(); res = this.bcr.Read1(length, function (t, l) { - return oThis.ReadCT_BandFmt(t, l, oNewVal); + return oThis.ReadCT_LineSer(t, l, oNewVal); }); - val.addBandFmt(oNewVal); + val.addSer(oNewVal); } - else - res = c_oSerConstants.ReadUnknown; - return res; -}; -BinaryChartReader.prototype.ReadCT_Surface3DChart = function (type, length, val, aChartWithAxis) { - var res = c_oSerConstants.ReadOk; - var oThis = this; - if (c_oserct_surface3dchartWIREFRAME === type) { - var oNewVal = { m_val: null }; + else if (c_oserct_stockchartDLBLS === type) { + var oNewVal = new AscFormat.CDLbls(); + this.curChart.oDataLablesData = AscCommon.fSaveStream(this.bcr.stream, length); res = this.bcr.Read1(length, function (t, l) { - return oThis.ReadCT_Boolean(t, l, oNewVal); + return oThis.ReadCT_DLbls(t, l, oNewVal); }); - if (null != oNewVal.m_val) - val.setWireframe(oNewVal.m_val); + oNewVal.correctValues(); + val.setDLbls(oNewVal); } - else if (c_oserct_surface3dchartSER === type) { - var oNewVal = new AscFormat.CSurfaceSeries(); + else if (c_oserct_stockchartDROPLINES === type) { + var oNewVal = { spPr: null }; res = this.bcr.Read1(length, function (t, l) { - return oThis.ReadCT_SurfaceSer(t, l, oNewVal); + return oThis.ReadCT_ChartLines(t, l, oNewVal); }); - val.addSer(oNewVal); + if (null != oNewVal.spPr) + val.setDropLines(oNewVal.spPr); + else + val.setDropLines(new AscFormat.CSpPr()); } - else if (c_oserct_surface3dchartBANDFMTS === type) { + else if (c_oserct_stockchartHILOWLINES === type) { + var oNewVal = { spPr: null }; res = this.bcr.Read1(length, function (t, l) { - return oThis.ReadCT_bandFmts(t, l, val); + return oThis.ReadCT_ChartLines(t, l, oNewVal); }); + if (null != oNewVal.spPr) + val.setHiLowLines(oNewVal.spPr); + else + val.setHiLowLines(new AscFormat.CSpPr()); } - else if (c_oserct_surface3dchartAXID === type) { + else if (c_oserct_stockchartUPDOWNBARS === type) { + var oNewVal = new AscFormat.CUpDownBars(); + res = this.bcr.Read1(length, function (t, l) { + return oThis.ReadCT_UpDownBars(t, l, oNewVal); + }); + val.setUpDownBars(oNewVal); + } + else if (c_oserct_stockchartAXID === type) { var oNewVal = { m_val: null }; res = this.bcr.Read1(length, function (t, l) { return oThis.ReadCT_UnsignedInt(t, l, oNewVal); }); if (null != oNewVal.m_val) - aChartWithAxis.push({ axisId: oNewVal.m_val, chart: val, surface: true }); + aChartWithAxis.push({ axisId: oNewVal.m_val, chart: val }); } - else if (c_oserct_surface3dchartEXTLST === type) { + else if (c_oserct_stockchartEXTLST === type) { var oNewVal = {}; res = this.bcr.Read1(length, function (t, l) { return oThis.ReadCT_extLst(t, l, oNewVal); @@ -9724,10 +11892,10 @@ BinaryChartReader.prototype.ReadCT_Surface3DChart = function (type, length, val, res = c_oSerConstants.ReadUnknown; return res; }; -BinaryChartReader.prototype.ReadCT_SurfaceSer = function (type, length, val) { +BinaryChartReader.prototype.ReadCT_LineSer = function (type, length, val) { var res = c_oSerConstants.ReadOk; var oThis = this; - if (c_oserct_surfaceserIDX === type) { + if (c_oserct_lineserIDX === type) { var oNewVal = { m_val: null }; res = this.bcr.Read1(length, function (t, l) { return oThis.ReadCT_UnsignedInt(t, l, oNewVal); @@ -9735,7 +11903,7 @@ BinaryChartReader.prototype.ReadCT_SurfaceSer = function (type, length, val) { if (null != oNewVal.m_val) val.setIdx(oNewVal.m_val); } - else if (c_oserct_surfaceserORDER === type) { + else if (c_oserct_lineserORDER === type) { var oNewVal = { m_val: null }; res = this.bcr.Read1(length, function (t, l) { return oThis.ReadCT_UnsignedInt(t, l, oNewVal); @@ -9743,173 +11911,159 @@ BinaryChartReader.prototype.ReadCT_SurfaceSer = function (type, length, val) { if (null != oNewVal.m_val) val.setOrder(oNewVal.m_val); } - else if (c_oserct_surfaceserTX === type) { + else if (c_oserct_lineserTX === type) { var oNewVal = new AscFormat.CTx(); res = this.bcr.Read1(length, function (t, l) { return oThis.ReadCT_SerTx(t, l, oNewVal); }); val.setTx(oNewVal); } - else if (c_oserct_surfaceserSPPR === type) { + else if (c_oserct_lineserSPPR === type) { val.setSpPr(this.ReadSpPr(length)); } - else if (c_oserct_surfaceserCAT === type) { - var oNewVal = new AscFormat.CCat(); + else if (c_oserct_lineserMARKER === type) { + var oNewVal = new AscFormat.CMarker(); res = this.bcr.Read1(length, function (t, l) { - return oThis.ReadCT_AxDataSource(t, l, oNewVal); + return oThis.ReadCT_Marker(t, l, oNewVal); }); - val.setCat(oNewVal); + val.setMarker(oNewVal); } - else if (c_oserct_surfaceserVAL === type) { - var oNewVal = new AscFormat.CYVal(); + else if (c_oserct_lineserDPT === type) { + var oNewVal = new AscFormat.CDPt(); res = this.bcr.Read1(length, function (t, l) { - return oThis.ReadCT_NumDataSource(t, l, oNewVal); + return oThis.ReadCT_DPt(t, l, oNewVal); }); - val.setVal(oNewVal); + val.addDPt(oNewVal); } - else if (c_oserct_surfaceserEXTLST === type) { - var oNewVal = {}; + else if (c_oserct_lineserDLBLS === type) { + var oNewVal = new AscFormat.CDLbls(); res = this.bcr.Read1(length, function (t, l) { - return oThis.ReadCT_extLst(t, l, oNewVal); + return oThis.ReadCT_DLbls(t, l, oNewVal); }); - // val.m_extLst = oNewVal; - } - else if(c_oserct_chartFiltering === type) { - res = this.bcr.Read1(length, function (t, l) { - return oThis.ReadCT_ChartFiltering(t, l, val); - }); + oNewVal.correctValues(); + val.setDLbls(oNewVal); } - else - res = c_oSerConstants.ReadUnknown; - return res; -}; -BinaryChartReader.prototype.ReadCT_BandFmt = function (type, length, val) { - var res = c_oSerConstants.ReadOk; - var oThis = this; - if (c_oserct_bandfmtIDX === type) { - var oNewVal = { m_val: null }; + else if (c_oserct_lineserTRENDLINE === type) { + //todo array + var oNewVal = new AscFormat.CTrendLine(); res = this.bcr.Read1(length, function (t, l) { - return oThis.ReadCT_UnsignedInt(t, l, oNewVal); + return oThis.ReadCT_Trendline(t, l, oNewVal); }); - if (null != oNewVal.m_val) - val.setIdx(oNewVal.m_val); - } - else if (c_oserct_bandfmtSPPR === type) { - val.setSpPr(this.ReadSpPr(length)); + val.setTrendline(oNewVal); } - else - res = c_oSerConstants.ReadUnknown; - return res; -}; -BinaryChartReader.prototype.ReadCT_SurfaceChart = function (type, length, val, aChartWithAxis) { - var res = c_oSerConstants.ReadOk; - var oThis = this; - if (c_oserct_surfacechartWIREFRAME === type) { - var oNewVal = { m_val: null }; + else if (c_oserct_lineserERRBARS === type) { + var oNewVal = new AscFormat.CErrBars(); res = this.bcr.Read1(length, function (t, l) { - return oThis.ReadCT_Boolean(t, l, oNewVal); + return oThis.ReadCT_ErrBars(t, l, oNewVal); }); - if (null != oNewVal.m_val) - val.setWireframe(oNewVal.m_val); + val.setErrBars(oNewVal); } - else if (c_oserct_surfacechartSER === type) { - var oNewVal = new AscFormat.CSurfaceSeries(); + else if (c_oserct_lineserCAT === type) { + var oNewVal = new AscFormat.CCat(); res = this.bcr.Read1(length, function (t, l) { - return oThis.ReadCT_SurfaceSer(t, l, oNewVal); + return oThis.ReadCT_AxDataSource(t, l, oNewVal); }); - val.addSer(oNewVal); + val.setCat(oNewVal); } - else if (c_oserct_surfacechartBANDFMTS === type) { + else if (c_oserct_lineserVAL === type) { + var oNewVal = new AscFormat.CYVal(); res = this.bcr.Read1(length, function (t, l) { - return oThis.ReadCT_bandFmts(t, l, val); + return oThis.ReadCT_NumDataSource(t, l, oNewVal); }); + val.setVal(oNewVal); } - else if (c_oserct_surfacechartAXID === type) { + else if (c_oserct_lineserSMOOTH === type) { var oNewVal = { m_val: null }; res = this.bcr.Read1(length, function (t, l) { - return oThis.ReadCT_UnsignedInt(t, l, oNewVal); + return oThis.ReadCT_Boolean(t, l, oNewVal); }); - if (null != oNewVal.m_val) - aChartWithAxis.push({ axisId: oNewVal.m_val, chart: val, surface: true }); + if (null != oNewVal.m_val) { + val.setSmooth(oNewVal.m_val); + } + else { + val.setSmooth(true); + } } - else if (c_oserct_surfacechartEXTLST === type) { - var oNewVal; - oNewVal = {}; + else if (c_oserct_lineserEXTLST === type) { + var oNewVal = {}; res = this.bcr.Read1(length, function (t, l) { return oThis.ReadCT_extLst(t, l, oNewVal); }); // val.m_extLst = oNewVal; } - else - res = c_oSerConstants.ReadUnknown; - return res; -}; -BinaryChartReader.prototype.ReadCT_SecondPieSize = function (type, length, val) { - var res = c_oSerConstants.ReadOk; - var oThis = this; - if (c_oserct_secondpiesizeVAL === type) { - val.m_val = this.ParsePersent(this.stream.GetString2LE(length)); + else if(c_oserct_chartFiltering === type) { + res = this.bcr.Read1(length, function (t, l) { + return oThis.ReadCT_ChartFiltering(t, l, val); + }); } else res = c_oSerConstants.ReadUnknown; return res; }; -BinaryChartReader.prototype.ReadCT_SplitType = function (type, length, val) { +BinaryChartReader.prototype.ReadCT_UpDownBars = function (type, length, val) { var res = c_oSerConstants.ReadOk; var oThis = this; - if (c_oserct_splittypeVAL === type) { - switch (this.stream.GetUChar()) { - case st_splittypeAUTO: val.m_val = SPLIT_TYPE_AUTO; break; - case st_splittypeCUST: val.m_val = SPLIT_TYPE_CUST; break; - case st_splittypePERCENT: val.m_val = SPLIT_TYPE_PERCENT; break; - case st_splittypePOS: val.m_val = SPLIT_TYPE_POS; break; - case st_splittypeVAL: val.m_val = SPLIT_TYPE_VAL; break; - } + if (c_oserct_updownbarsGAPWIDTH === type) { + var oNewVal = { m_val: null }; + res = this.bcr.Read1(length, function (t, l) { + return oThis.ReadCT_GapAmount(t, l, oNewVal); + }); + if (null != oNewVal.m_val) + val.setGapWidth(oNewVal.m_val); + } + else if (c_oserct_updownbarsUPBARS === type) { + var oNewVal = { spPr: null }; + res = this.bcr.Read1(length, function (t, l) { + return oThis.ReadCT_UpDownBar(t, l, oNewVal); + }); + if (null != oNewVal.spPr) + val.setUpBars(oNewVal.spPr); + else + val.setUpBars(new AscFormat.CSpPr()); + } + else if (c_oserct_updownbarsDOWNBARS === type) { + var oNewVal = { spPr: null }; + res = this.bcr.Read1(length, function (t, l) { + return oThis.ReadCT_UpDownBar(t, l, oNewVal); + }); + if (null != oNewVal.spPr) + val.setDownBars(oNewVal.spPr); + else + val.setDownBars(new AscFormat.CSpPr()); } - else - res = c_oSerConstants.ReadUnknown; - return res; -}; -BinaryChartReader.prototype.ReadCT_OfPieType = function (type, length, val) { - var res = c_oSerConstants.ReadOk; - var oThis = this; - if (c_oserct_ofpietypeVAL === type) { - switch (this.stream.GetUChar()) { - case st_ofpietypePIE: val.m_val = OF_PIE_TYPE_PIE; break; - case st_ofpietypeBAR: val.m_val = OF_PIE_TYPE_BAR; break; - } + else if (c_oserct_updownbarsEXTLST === type) { + var oNewVal = {}; + res = this.bcr.Read1(length, function (t, l) { + return oThis.ReadCT_extLst(t, l, oNewVal); + }); + // val.m_extLst = oNewVal; } else res = c_oSerConstants.ReadUnknown; return res; }; -BinaryChartReader.prototype.ReadCT_custSplit = function (type, length, val) { +BinaryChartReader.prototype.ReadCT_UpDownBar = function (type, length, val) { var res = c_oSerConstants.ReadOk; var oThis = this; - if (c_oserct_custsplitSECONDPIEPT === type) { - var oNewVal = { m_val: null }; - res = this.bcr.Read1(length, function (t, l) { - return oThis.ReadCT_UnsignedInt(t, l, oNewVal); - }); - if (null != oNewVal.m_val) - val.addCustSplit(oNewVal.m_val); + if (c_oserct_updownbarSPPR === type) { + val.spPr = this.ReadSpPr(length); } else res = c_oSerConstants.ReadUnknown; return res; }; -BinaryChartReader.prototype.ReadCT_OfPieChart = function (type, length, val, aChartWithAxis) { +BinaryChartReader.prototype.ReadCT_Line3DChart = function (type, length, val, aChartWithAxis) { var res = c_oSerConstants.ReadOk; var oThis = this; - if (c_oserct_ofpiechartOFPIETYPE === type) { + if (c_oserct_line3dchartGROUPING === type) { var oNewVal = { m_val: null }; res = this.bcr.Read1(length, function (t, l) { - return oThis.ReadCT_OfPieType(t, l, oNewVal); + return oThis.ReadCT_Grouping(t, l, oNewVal); }); if (null != oNewVal.m_val) - val.setOfPieType(oNewVal.m_val); + val.setGrouping(oNewVal.m_val); } - else if (c_oserct_ofpiechartVARYCOLORS === type) { + else if (c_oserct_line3dchartVARYCOLORS === type) { var oNewVal = { m_val: null }; res = this.bcr.Read1(length, function (t, l) { return oThis.ReadCT_Boolean(t, l, oNewVal); @@ -9917,14 +12071,17 @@ BinaryChartReader.prototype.ReadCT_OfPieChart = function (type, length, val, aCh if (null != oNewVal.m_val) val.setVaryColors(oNewVal.m_val); } - else if (c_oserct_ofpiechartSER === type) { - var oNewVal = new AscFormat.CPieSeries(); + else if (c_oserct_line3dchartSER === type) { + var oNewVal = new AscFormat.CLineSeries(); res = this.bcr.Read1(length, function (t, l) { - return oThis.ReadCT_PieSer(t, l, oNewVal); + return oThis.ReadCT_LineSer(t, l, oNewVal); }); + if(oNewVal.smooth === null){ + oNewVal.setSmooth(false); + } val.addSer(oNewVal); } - else if (c_oserct_ofpiechartDLBLS === type) { + else if (c_oserct_line3dchartDLBLS === type) { var oNewVal = new AscFormat.CDLbls(); this.curChart.oDataLablesData = AscCommon.fSaveStream(this.bcr.stream, length); res = this.bcr.Read1(length, function (t, l) { @@ -9933,56 +12090,34 @@ BinaryChartReader.prototype.ReadCT_OfPieChart = function (type, length, val, aCh oNewVal.correctValues(); val.setDLbls(oNewVal); } - else if (c_oserct_ofpiechartGAPWIDTH === type) { - var oNewVal = { m_val: null }; - res = this.bcr.Read1(length, function (t, l) { - return oThis.ReadCT_GapAmount(t, l, oNewVal); - }); - if (null != oNewVal.m_val) - val.setGapWidth(oNewVal.m_val); - } - else if (c_oserct_ofpiechartSPLITTYPE === type) { - var oNewVal = { m_val: null }; - res = this.bcr.Read1(length, function (t, l) { - return oThis.ReadCT_SplitType(t, l, oNewVal); - }); - if (null != oNewVal.m_val) - val.setSplitType(oNewVal.m_val) - } - else if (c_oserct_ofpiechartSPLITPOS === type) { - var oNewVal = { m_val: null }; + else if (c_oserct_line3dchartDROPLINES === type) { + var oNewVal = { spPr: null }; res = this.bcr.Read1(length, function (t, l) { - return oThis.ReadCT_Double(t, l, oNewVal); + return oThis.ReadCT_ChartLines(t, l, oNewVal); }); - if (null != oNewVal.m_val) - val.setSplitPos(oNewVal.m_val); + if (null != oNewVal.spPr) + val.setDropLines(oNewVal.spPr); + else + val.setDropLines(new AscFormat.CSpPr()); } - else if (c_oserct_ofpiechartCUSTSPLIT === type) { + else if (c_oserct_line3dchartGAPDEPTH === type) { + var oNewVal; + oNewVal = {}; res = this.bcr.Read1(length, function (t, l) { - return oThis.ReadCT_custSplit(t, l, val); + return oThis.ReadCT_GapAmount(t, l, oNewVal); }); + //val.m_gapDepth = oNewVal; } - else if (c_oserct_ofpiechartSECONDPIESIZE === type) { + else if (c_oserct_line3dchartAXID === type) { var oNewVal = { m_val: null }; res = this.bcr.Read1(length, function (t, l) { - return oThis.ReadCT_SecondPieSize(t, l, oNewVal); + return oThis.ReadCT_UnsignedInt(t, l, oNewVal); }); if (null != oNewVal.m_val) - val.setSecondPieSize(oNewVal.m_val); - } - else if (c_oserct_ofpiechartSERLINES === type) { - var oNewVal = { spPr: null }; - res = this.bcr.Read1(length, function (t, l) { - return oThis.ReadCT_ChartLines(t, l, oNewVal); - }); - if (null != oNewVal.spPr) - val.setSerLines(oNewVal.spPr); - else - val.setSerLines(new AscFormat.CSpPr()); + aChartWithAxis.push({ axisId: oNewVal.m_val, chart: val }); } - else if (c_oserct_ofpiechartEXTLST === type) { - var oNewVal; - oNewVal = {}; + else if (c_oserct_line3dchartEXTLST === type) { + var oNewVal = {}; res = this.bcr.Read1(length, function (t, l) { return oThis.ReadCT_extLst(t, l, oNewVal); }); @@ -9992,118 +12127,136 @@ BinaryChartReader.prototype.ReadCT_OfPieChart = function (type, length, val, aCh res = c_oSerConstants.ReadUnknown; return res; }; -BinaryChartReader.prototype.ReadCT_PieSer = function (type, length, val) { +BinaryChartReader.prototype.ReadCT_Grouping = function (type, length, val) { var res = c_oSerConstants.ReadOk; var oThis = this; - if (c_oserct_pieserIDX === type) { + if (c_oserct_groupingVAL === type) { + switch (this.stream.GetUChar()) { + case st_groupingPERCENTSTACKED: val.m_val = AscFormat.GROUPING_PERCENT_STACKED; break; + case st_groupingSTANDARD: val.m_val = AscFormat.GROUPING_STANDARD; break; + case st_groupingSTACKED: val.m_val = AscFormat.GROUPING_STACKED; break; + } + } + else + res = c_oSerConstants.ReadUnknown; + return res; +}; +BinaryChartReader.prototype.ReadCT_LineChart = function (type, length, val, aChartWithAxis) { + var res = c_oSerConstants.ReadOk; + var oThis = this; + if (c_oserct_linechartGROUPING === type) { var oNewVal = { m_val: null }; res = this.bcr.Read1(length, function (t, l) { - return oThis.ReadCT_UnsignedInt(t, l, oNewVal); + return oThis.ReadCT_Grouping(t, l, oNewVal); }); if (null != oNewVal.m_val) - val.setIdx(oNewVal.m_val); + val.setGrouping(oNewVal.m_val); } - else if (c_oserct_pieserORDER === type) { + else if (c_oserct_linechartVARYCOLORS === type) { var oNewVal = { m_val: null }; res = this.bcr.Read1(length, function (t, l) { - return oThis.ReadCT_UnsignedInt(t, l, oNewVal); + return oThis.ReadCT_Boolean(t, l, oNewVal); }); if (null != oNewVal.m_val) - val.setOrder(oNewVal.m_val); + val.setVaryColors(oNewVal.m_val); } - else if (c_oserct_pieserTX === type) { - var oNewVal = new AscFormat.CTx(); + else if (c_oserct_linechartSER === type) { + var oNewVal = new AscFormat.CLineSeries(); res = this.bcr.Read1(length, function (t, l) { - return oThis.ReadCT_SerTx(t, l, oNewVal); + return oThis.ReadCT_LineSer(t, l, oNewVal); }); - val.setTx(oNewVal); + val.addSer(oNewVal); + if(oNewVal.smooth === null){ + oNewVal.setSmooth(false); + } } - else if (c_oserct_pieserSPPR === type) { - val.setSpPr(this.ReadSpPr(length)); + else if (c_oserct_linechartDLBLS === type) { + var oNewVal = new AscFormat.CDLbls(); + this.curChart.oDataLablesData = AscCommon.fSaveStream(this.bcr.stream, length); + res = this.bcr.Read1(length, function (t, l) { + return oThis.ReadCT_DLbls(t, l, oNewVal); + }); + oNewVal.correctValues(); + val.setDLbls(oNewVal); } - else if (c_oserct_pieserEXPLOSION === type) { - var oNewVal = { m_val: null }; + else if (c_oserct_linechartDROPLINES === type) { + var oNewVal = { spPr: null }; res = this.bcr.Read1(length, function (t, l) { - return oThis.ReadCT_UnsignedInt(t, l, oNewVal); + return oThis.ReadCT_ChartLines(t, l, oNewVal); }); - if (null != oNewVal.m_val) - val.setExplosion(oNewVal.m_val); + if (null != oNewVal.spPr) + val.setDropLines(oNewVal.spPr); + else + val.setDropLines(new AscFormat.CSpPr()); } - else if (c_oserct_pieserDPT === type) { - var oNewVal = new AscFormat.CDPt(); + else if (c_oserct_linechartHILOWLINES === type) { + var oNewVal = { spPr: null }; res = this.bcr.Read1(length, function (t, l) { - return oThis.ReadCT_DPt(t, l, oNewVal); + return oThis.ReadCT_ChartLines(t, l, oNewVal); }); - val.addDPt(oNewVal); + if (null != oNewVal.spPr) + val.setHiLowLines(oNewVal.spPr); + else + val.setHiLowLines(new AscFormat.CSpPr()); } - else if (c_oserct_pieserDLBLS === type) { - var oNewVal = new AscFormat.CDLbls(); + else if (c_oserct_linechartUPDOWNBARS === type) { + var oNewVal = new AscFormat.CUpDownBars(); res = this.bcr.Read1(length, function (t, l) { - return oThis.ReadCT_DLbls(t, l, oNewVal); + return oThis.ReadCT_UpDownBars(t, l, oNewVal); }); - oNewVal.correctValues(); - val.setDLbls(oNewVal); + val.setUpDownBars(oNewVal); } - else if (c_oserct_pieserCAT === type) { - var oNewVal = new AscFormat.CCat(); + else if (c_oserct_linechartMARKER === type) { + var oNewVal = { m_val: null }; res = this.bcr.Read1(length, function (t, l) { - return oThis.ReadCT_AxDataSource(t, l, oNewVal); + return oThis.ReadCT_Boolean(t, l, oNewVal); }); - val.setCat(oNewVal); + if (null != oNewVal.m_val) + val.setMarker(oNewVal.m_val); } - else if (c_oserct_pieserVAL === type) { - var oNewVal = new AscFormat.CYVal(); + else if (c_oserct_linechartSMOOTH === type) { + var oNewVal = { m_val: null }; res = this.bcr.Read1(length, function (t, l) { - return oThis.ReadCT_NumDataSource(t, l, oNewVal); + return oThis.ReadCT_Boolean(t, l, oNewVal); }); - val.setVal(oNewVal); + if (null != oNewVal.m_val){ + val.setSmooth(oNewVal.m_val); + } + else{ + val.setSmooth(true); + } } - else if (c_oserct_pieserEXTLST === type) { + else if (c_oserct_linechartAXID === type) { + var oNewVal = { m_val: null }; + res = this.bcr.Read1(length, function (t, l) { + return oThis.ReadCT_UnsignedInt(t, l, oNewVal); + }); + if (null != oNewVal.m_val) + aChartWithAxis.push({ axisId: oNewVal.m_val, chart: val }); + } + else if (c_oserct_linechartEXTLST === type) { var oNewVal = {}; res = this.bcr.Read1(length, function (t, l) { return oThis.ReadCT_extLst(t, l, oNewVal); }); // val.m_extLst = oNewVal; } - else if(c_oserct_chartFiltering === type) { - res = this.bcr.Read1(length, function (t, l) { - return oThis.ReadCT_ChartFiltering(t, l, val); - }); - } - else - res = c_oSerConstants.ReadUnknown; - return res; -}; -BinaryChartReader.prototype.ReadCT_GapAmount = function (type, length, val) { - var res = c_oSerConstants.ReadOk; - var oThis = this; - if (c_oserct_gapamountVAL === type) { - val.m_val = this.ParsePersent(this.stream.GetString2LE(length)); - } else res = c_oSerConstants.ReadUnknown; return res; }; -BinaryChartReader.prototype.ReadCT_Bar3DChart = function (type, length, val, aChartWithAxis) { - var res = c_oSerConstants.ReadOk; - var oThis = this; - if (c_oserct_bar3dchartBARDIR === type) { - var oNewVal = { m_val: null }; - res = this.bcr.Read1(length, function (t, l) { - return oThis.ReadCT_BarDir(t, l, oNewVal); - }); - if (null != oNewVal.m_val) - val.setBarDir(oNewVal.m_val); - } - else if (c_oserct_bar3dchartGROUPING === type) { +BinaryChartReader.prototype.ReadCT_Area3DChart = function (type, length, val, aChartWithAxis) { + var res = c_oSerConstants.ReadOk; + var oThis = this; + if (c_oserct_area3dchartGROUPING === type) { var oNewVal = { m_val: null }; res = this.bcr.Read1(length, function (t, l) { - return oThis.ReadCT_BarGrouping(t, l, oNewVal); + return oThis.ReadCT_Grouping(t, l, oNewVal); }); if (null != oNewVal.m_val) val.setGrouping(oNewVal.m_val); } - else if (c_oserct_bar3dchartVARYCOLORS === type) { + else if (c_oserct_area3dchartVARYCOLORS === type) { var oNewVal = { m_val: null }; res = this.bcr.Read1(length, function (t, l) { return oThis.ReadCT_Boolean(t, l, oNewVal); @@ -10111,14 +12264,14 @@ BinaryChartReader.prototype.ReadCT_Bar3DChart = function (type, length, val, aCh if (null != oNewVal.m_val) val.setVaryColors(oNewVal.m_val); } - else if (c_oserct_bar3dchartSER === type) { - var oNewVal = new AscFormat.CBarSeries(); + else if (c_oserct_area3dchartSER === type) { + var oNewVal = new AscFormat.CAreaSeries(); res = this.bcr.Read1(length, function (t, l) { - return oThis.ReadCT_BarSer(t, l, oNewVal); + return oThis.ReadCT_AreaSer(t, l, oNewVal); }); val.addSer(oNewVal); } - else if (c_oserct_bar3dchartDLBLS === type) { + else if (c_oserct_area3dchartDLBLS === type) { var oNewVal = new AscFormat.CDLbls(); this.curChart.oDataLablesData = AscCommon.fSaveStream(this.bcr.stream, length); res = this.bcr.Read1(length, function (t, l) { @@ -10127,32 +12280,25 @@ BinaryChartReader.prototype.ReadCT_Bar3DChart = function (type, length, val, aCh oNewVal.correctValues(); val.setDLbls(oNewVal); } - else if (c_oserct_bar3dchartGAPWIDTH === type) { - var oNewVal = { m_val: null }; + else if (c_oserct_area3dchartDROPLINES === type) { + var oNewVal = { spPr: null }; res = this.bcr.Read1(length, function (t, l) { - return oThis.ReadCT_GapAmount(t, l, oNewVal); + return oThis.ReadCT_ChartLines(t, l, oNewVal); }); - if (null != oNewVal.m_val) - val.setGapWidth(oNewVal.m_val); + if (null != oNewVal.spPr) + val.setDropLines(oNewVal.spPr); + else + val.setDropLines(new AscFormat.CSpPr()); } - else if (c_oserct_bar3dchartGAPDEPTH === type) { + else if (c_oserct_area3dchartGAPDEPTH === type) { var oNewVal; oNewVal = {}; res = this.bcr.Read1(length, function (t, l) { return oThis.ReadCT_GapAmount(t, l, oNewVal); }); - if(null != oNewVal.m_val) - val.setGapDepth(oNewVal.m_val); - } - else if (c_oserct_bar3dchartSHAPE === type) { - var oNewVal = { m_val: null }; - res = this.bcr.Read1(length, function (t, l) { - return oThis.ReadCT_Shape(t, l, oNewVal); - }); - if(null != oNewVal.m_val) - val.setShape(oNewVal.m_val); + //val.m_gapDepth = oNewVal; } - else if (c_oserct_bar3dchartAXID === type) { + else if (c_oserct_area3dchartAXID === type) { var oNewVal = { m_val: null }; res = this.bcr.Read1(length, function (t, l) { return oThis.ReadCT_UnsignedInt(t, l, oNewVal); @@ -10160,9 +12306,8 @@ BinaryChartReader.prototype.ReadCT_Bar3DChart = function (type, length, val, aCh if (null != oNewVal.m_val) aChartWithAxis.push({ axisId: oNewVal.m_val, chart: val }); } - else if (c_oserct_bar3dchartEXTLST === type) { - var oNewVal; - oNewVal = {}; + else if (c_oserct_area3dchartEXTLST === type) { + var oNewVal = {}; res = this.bcr.Read1(length, function (t, l) { return oThis.ReadCT_extLst(t, l, oNewVal); }); @@ -10172,38 +12317,10 @@ BinaryChartReader.prototype.ReadCT_Bar3DChart = function (type, length, val, aCh res = c_oSerConstants.ReadUnknown; return res; }; -BinaryChartReader.prototype.ReadCT_BarDir = function (type, length, val) { - var res = c_oSerConstants.ReadOk; - var oThis = this; - if (c_oserct_bardirVAL === type) { - switch (this.stream.GetUChar()) { - case st_bardirBAR: val.m_val = AscFormat.BAR_DIR_BAR; break; - case st_bardirCOL: val.m_val = AscFormat.BAR_DIR_COL; break; - } - } - else - res = c_oSerConstants.ReadUnknown; - return res; -}; -BinaryChartReader.prototype.ReadCT_BarGrouping = function (type, length, val) { - var res = c_oSerConstants.ReadOk; - var oThis = this; - if (c_oserct_bargroupingVAL === type) { - switch (this.stream.GetUChar()) { - case st_bargroupingPERCENTSTACKED: val.m_val = AscFormat.BAR_GROUPING_PERCENT_STACKED; break; - case st_bargroupingCLUSTERED: val.m_val = AscFormat.BAR_GROUPING_CLUSTERED; break; - case st_bargroupingSTANDARD: val.m_val = AscFormat.BAR_GROUPING_STANDARD; break; - case st_bargroupingSTACKED: val.m_val = AscFormat.BAR_GROUPING_STACKED; break; - } - } - else - res = c_oSerConstants.ReadUnknown; - return res; -}; -BinaryChartReader.prototype.ReadCT_BarSer = function (type, length, val) { +BinaryChartReader.prototype.ReadCT_AreaSer = function (type, length, val) { var res = c_oSerConstants.ReadOk; var oThis = this; - if (c_oserct_barserIDX === type) { + if (c_oserct_areaserIDX === type) { var oNewVal = { m_val: null }; res = this.bcr.Read1(length, function (t, l) { return oThis.ReadCT_UnsignedInt(t, l, oNewVal); @@ -10211,7 +12328,7 @@ BinaryChartReader.prototype.ReadCT_BarSer = function (type, length, val) { if (null != oNewVal.m_val) val.setIdx(oNewVal.m_val); } - else if (c_oserct_barserORDER === type) { + else if (c_oserct_areaserORDER === type) { var oNewVal = { m_val: null }; res = this.bcr.Read1(length, function (t, l) { return oThis.ReadCT_UnsignedInt(t, l, oNewVal); @@ -10219,261 +12336,96 @@ BinaryChartReader.prototype.ReadCT_BarSer = function (type, length, val) { if (null != oNewVal.m_val) val.setOrder(oNewVal.m_val); } - else if (c_oserct_barserTX === type) { + else if (c_oserct_areaserTX === type) { var oNewVal = new AscFormat.CTx(); res = this.bcr.Read1(length, function (t, l) { return oThis.ReadCT_SerTx(t, l, oNewVal); }); val.setTx(oNewVal); } - else if (c_oserct_barserSPPR === type) { + else if (c_oserct_areaserSPPR === type) { val.setSpPr(this.ReadSpPr(length)); } - else if (c_oserct_barserINVERTIFNEGATIVE === type) { - var oNewVal = { m_val: null }; - res = this.bcr.Read1(length, function (t, l) { - return oThis.ReadCT_Boolean(t, l, oNewVal); - }); - if (null != oNewVal.m_val) - val.setInvertIfNegative(oNewVal.m_val); - } - else if (c_oserct_barserPICTUREOPTIONS === type) { + else if (c_oserct_areaserPICTUREOPTIONS === type) { var oNewVal = new AscFormat.CPictureOptions(); res = this.bcr.Read1(length, function (t, l) { return oThis.ReadCT_PictureOptions(t, l, oNewVal); }); val.setPictureOptions(oNewVal); } - else if (c_oserct_barserDPT === type) { + else if (c_oserct_areaserDPT === type) { var oNewVal = new AscFormat.CDPt(); res = this.bcr.Read1(length, function (t, l) { return oThis.ReadCT_DPt(t, l, oNewVal); }); val.addDPt(oNewVal); } - else if (c_oserct_barserDLBLS === type) { - var oNewVal = new AscFormat.CDLbls(); - res = this.bcr.Read1(length, function (t, l) { - return oThis.ReadCT_DLbls(t, l, oNewVal); - }); - oNewVal.correctValues(); - val.setDLbls(oNewVal); - } - else if (c_oserct_barserTRENDLINE === type) { - //todo array - var oNewVal = new AscFormat.CTrendLine(); - res = this.bcr.Read1(length, function (t, l) { - return oThis.ReadCT_Trendline(t, l, oNewVal); - }); - val.setTrendline(oNewVal); - } - else if (c_oserct_barserERRBARS === type) { - var oNewVal = new AscFormat.CErrBars(); - res = this.bcr.Read1(length, function (t, l) { - return oThis.ReadCT_ErrBars(t, l, oNewVal); - }); - val.setErrBars(oNewVal); - } - else if (c_oserct_barserCAT === type) { - var oNewVal = new AscFormat.CCat(); - res = this.bcr.Read1(length, function (t, l) { - return oThis.ReadCT_AxDataSource(t, l, oNewVal); - }); - val.setCat(oNewVal); - } - else if (c_oserct_barserVAL === type) { - var oNewVal = new AscFormat.CYVal(); - res = this.bcr.Read1(length, function (t, l) { - return oThis.ReadCT_NumDataSource(t, l, oNewVal); - }); - val.setVal(oNewVal); - } - else if (c_oserct_barserSHAPE === type) { - var oNewVal = { m_val: null }; - res = this.bcr.Read1(length, function (t, l) { - return oThis.ReadCT_Shape(t, l, oNewVal); - }); - if (null != oNewVal.m_val) - val.setShape(oNewVal.m_val); - } - else if (c_oserct_barserEXTLST === type) { - var oNewVal = {}; - res = this.bcr.Read1(length, function (t, l) { - return oThis.ReadCT_extLst(t, l, oNewVal); - }); - // val.m_extLst = oNewVal; - } - else if(c_oserct_chartFiltering === type) { - res = this.bcr.Read1(length, function (t, l) { - return oThis.ReadCT_ChartFiltering(t, l, val); - }); - } - else - res = c_oSerConstants.ReadUnknown; - return res; -}; -BinaryChartReader.prototype.ReadCT_ChartFiltering = function(type, length, val) { - let res = c_oSerConstants.ReadOk; - let oThis = this; - if (c_oserct_dataLabelsRange === type) { - var oNewVal = new AscFormat.CStrRef(); - res = this.bcr.Read1(length, function (t, l) { - return oThis.ReadCT_dataLabelsRange(t, l, oNewVal); - }); - val.setDataLabelsRange(oNewVal); - } - else - res = c_oSerConstants.ReadUnknown; - return res; -}; -BinaryChartReader.prototype.ReadCT_dataLabelsRange = function(type, length, val) { - let res = c_oSerConstants.ReadOk; - let oThis = this; - if (0 === type) { - val.setF(this.stream.GetString2LE(length)); - } - else if(1 === type) { - var oNewVal = new AscFormat.CStrCache(); - res = this.bcr.Read1(length, function (t, l) { - return oThis.ReadCT_StrData(t, l, oNewVal); - }); - val.setStrCache(oNewVal); - } - else - res = c_oSerConstants.ReadUnknown; - return res; -}; -BinaryChartReader.prototype.ReadCT_Shape = function (type, length, val) { - var res = c_oSerConstants.ReadOk; - var oThis = this; - if (c_oserct_shapeVAL === type) { - switch (this.stream.GetUChar()) { - case st_shapeCONE: val.m_val = AscFormat.BAR_SHAPE_CONE; break; - case st_shapeCONETOMAX: val.m_val = AscFormat.BAR_SHAPE_CONETOMAX; break; - case st_shapeBOX: val.m_val = AscFormat.BAR_SHAPE_BOX; break; - case st_shapeCYLINDER: val.m_val = AscFormat.BAR_SHAPE_CYLINDER; break; - case st_shapePYRAMID: val.m_val = AscFormat.BAR_SHAPE_PYRAMID; break; - case st_shapePYRAMIDTOMAX: val.m_val = AscFormat.BAR_SHAPE_PYRAMIDTOMAX; break; - } - } - else - res = c_oSerConstants.ReadUnknown; - return res; -}; -BinaryChartReader.prototype.ReadCT_Overlap = function (type, length, val) { - var res = c_oSerConstants.ReadOk; - var oThis = this; - if (c_oserct_overlapVAL === type) { - val.m_val = this.ParsePersent(this.stream.GetString2LE(length)); - } - else - res = c_oSerConstants.ReadUnknown; - return res; -}; -BinaryChartReader.prototype.ReadCT_BarChart = function (type, length, val, aChartWithAxis) { - var res = c_oSerConstants.ReadOk; - var oThis = this; - if (c_oserct_barchartBARDIR === type) { - var oNewVal = { m_val: null }; - res = this.bcr.Read1(length, function (t, l) { - return oThis.ReadCT_BarDir(t, l, oNewVal); - }); - if (null != oNewVal.m_val) - val.setBarDir(oNewVal.m_val); - } - else if (c_oserct_barchartGROUPING === type) { - var oNewVal = { m_val: null }; - res = this.bcr.Read1(length, function (t, l) { - return oThis.ReadCT_BarGrouping(t, l, oNewVal); - }); - if (null != oNewVal.m_val) - val.setGrouping(oNewVal.m_val); - } - else if (c_oserct_barchartVARYCOLORS === type) { - var oNewVal = { m_val: null }; - res = this.bcr.Read1(length, function (t, l) { - return oThis.ReadCT_Boolean(t, l, oNewVal); - }); - if (null != oNewVal.m_val) - val.setVaryColors(oNewVal.m_val); - } - else if (c_oserct_barchartSER === type) { - var oNewVal = new AscFormat.CBarSeries(); - res = this.bcr.Read1(length, function (t, l) { - return oThis.ReadCT_BarSer(t, l, oNewVal); - }); - val.addSer(oNewVal); - } - else if (c_oserct_barchartDLBLS === type) { + else if (c_oserct_areaserDLBLS === type) { var oNewVal = new AscFormat.CDLbls(); - this.curChart.oDataLablesData = AscCommon.fSaveStream(this.bcr.stream, length); res = this.bcr.Read1(length, function (t, l) { return oThis.ReadCT_DLbls(t, l, oNewVal); }); oNewVal.correctValues(); val.setDLbls(oNewVal); } - else if (c_oserct_barchartGAPWIDTH === type) { - var oNewVal = { m_val: null }; + else if (c_oserct_areaserTRENDLINE === type) { + //todo array + var oNewVal = new AscFormat.CTrendLine(); res = this.bcr.Read1(length, function (t, l) { - return oThis.ReadCT_GapAmount(t, l, oNewVal); + return oThis.ReadCT_Trendline(t, l, oNewVal); }); - if (null != oNewVal.m_val) - val.setGapWidth(oNewVal.m_val); + val.setTrendline(oNewVal); } - else if (c_oserct_barchartOVERLAP === type) { - var oNewVal = { m_val: null }; + else if (c_oserct_areaserERRBARS === type) { + //todo array + var oNewVal = new AscFormat.CErrBars(); res = this.bcr.Read1(length, function (t, l) { - return oThis.ReadCT_Overlap(t, l, oNewVal); + return oThis.ReadCT_ErrBars(t, l, oNewVal); }); - if (null != oNewVal.m_val) - val.setOverlap(oNewVal.m_val); + val.setErrBars(oNewVal); } - else if (c_oserct_barchartSERLINES === type) { - //todo array - var oNewVal = { spPr: null }; + else if (c_oserct_areaserCAT === type) { + var oNewVal = new AscFormat.CCat(); res = this.bcr.Read1(length, function (t, l) { - return oThis.ReadCT_ChartLines(t, l, oNewVal); + return oThis.ReadCT_AxDataSource(t, l, oNewVal); }); - if (null != oNewVal.spPr) - val.setSerLines(oNewVal.spPr); - else - val.setSerLines(new AscFormat.CSpPr()); + val.setCat(oNewVal); } - else if (c_oserct_barchartAXID === type) { - var oNewVal = { m_val: null }; + else if (c_oserct_areaserVAL === type) { + var oNewVal = new AscFormat.CYVal(); res = this.bcr.Read1(length, function (t, l) { - return oThis.ReadCT_UnsignedInt(t, l, oNewVal); + return oThis.ReadCT_NumDataSource(t, l, oNewVal); }); - if (null != oNewVal.m_val) - aChartWithAxis.push({ axisId: oNewVal.m_val, chart: val }); + val.setVal(oNewVal); } - else if (c_oserct_barchartEXTLST === type) { - var oNewVal; - oNewVal = {}; + else if (c_oserct_areaserEXTLST === type) { + var oNewVal = {}; res = this.bcr.Read1(length, function (t, l) { return oThis.ReadCT_extLst(t, l, oNewVal); }); // val.m_extLst = oNewVal; } - else - res = c_oSerConstants.ReadUnknown; - return res; -}; -BinaryChartReader.prototype.ReadCT_HoleSize = function (type, length, val) { - var res = c_oSerConstants.ReadOk; - var oThis = this; - if (c_oserct_holesizeVAL === type) { - val.m_val = this.ParsePersent(this.stream.GetString2LE(length)); + else if(c_oserct_chartFiltering === type) { + res = this.bcr.Read1(length, function (t, l) { + return oThis.ReadCT_ChartFiltering(t, l, val); + }); } else res = c_oSerConstants.ReadUnknown; return res; }; -BinaryChartReader.prototype.ReadCT_DoughnutChart = function (type, length, val, aChartWithAxis) { +BinaryChartReader.prototype.ReadCT_AreaChart = function (type, length, val, aChartWithAxis) { var res = c_oSerConstants.ReadOk; var oThis = this; - if (c_oserct_doughnutchartVARYCOLORS === type) { + if (c_oserct_areachartGROUPING === type) { + var oNewVal = { m_val: null }; + res = this.bcr.Read1(length, function (t, l) { + return oThis.ReadCT_Grouping(t, l, oNewVal); + }); + if (null != oNewVal.m_val) + val.setGrouping(oNewVal.m_val); + } + else if (c_oserct_areachartVARYCOLORS === type) { var oNewVal = { m_val: null }; res = this.bcr.Read1(length, function (t, l) { return oThis.ReadCT_Boolean(t, l, oNewVal); @@ -10481,14 +12433,14 @@ BinaryChartReader.prototype.ReadCT_DoughnutChart = function (type, length, val, if (null != oNewVal.m_val) val.setVaryColors(oNewVal.m_val); } - else if (c_oserct_doughnutchartSER === type) { - var oNewVal = new AscFormat.CPieSeries(); + else if (c_oserct_areachartSER === type) { + var oNewVal = new AscFormat.CAreaSeries(); res = this.bcr.Read1(length, function (t, l) { - return oThis.ReadCT_PieSer(t, l, oNewVal); + return oThis.ReadCT_AreaSer(t, l, oNewVal); }); val.addSer(oNewVal); } - else if (c_oserct_doughnutchartDLBLS === type) { + else if (c_oserct_areachartDLBLS === type) { var oNewVal = new AscFormat.CDLbls(); this.curChart.oDataLablesData = AscCommon.fSaveStream(this.bcr.stream, length); res = this.bcr.Read1(length, function (t, l) { @@ -10497,23 +12449,25 @@ BinaryChartReader.prototype.ReadCT_DoughnutChart = function (type, length, val, oNewVal.correctValues(); val.setDLbls(oNewVal); } - else if (c_oserct_doughnutchartFIRSTSLICEANG === type) { - var oNewVal = { m_val: null }; + else if (c_oserct_areachartDROPLINES === type) { + var oNewVal = { spPr: null }; res = this.bcr.Read1(length, function (t, l) { - return oThis.ReadCT_FirstSliceAng(t, l, oNewVal); + return oThis.ReadCT_ChartLines(t, l, oNewVal); }); - if (null != oNewVal.m_val) - val.setFirstSliceAng(oNewVal.m_val); + if (null != oNewVal.spPr) + val.setDropLines(oNewVal.spPr); + else + val.setDropLines(new AscFormat.CSpPr()); } - else if (c_oserct_doughnutchartHOLESIZE === type) { + else if (c_oserct_areachartAXID === type) { var oNewVal = { m_val: null }; res = this.bcr.Read1(length, function (t, l) { - return oThis.ReadCT_HoleSize(t, l, oNewVal); + return oThis.ReadCT_UnsignedInt(t, l, oNewVal); }); if (null != oNewVal.m_val) - val.setHoleSize(oNewVal.m_val); + aChartWithAxis.push({ axisId: oNewVal.m_val, chart: val }); } - else if (c_oserct_doughnutchartEXTLST === type) { + else if (c_oserct_areachartEXTLST === type) { var oNewVal = {}; res = this.bcr.Read1(length, function (t, l) { return oThis.ReadCT_extLst(t, l, oNewVal); @@ -10524,275 +12478,239 @@ BinaryChartReader.prototype.ReadCT_DoughnutChart = function (type, length, val, res = c_oSerConstants.ReadUnknown; return res; }; -BinaryChartReader.prototype.ReadCT_FirstSliceAng = function (type, length, val) { +BinaryChartReader.prototype.ReadCT_PlotArea = function (type, length, val, aChartWithAxis) { var res = c_oSerConstants.ReadOk; var oThis = this; - if (c_oserct_firstsliceangVAL === type) { - var oNewVal; - oNewVal = this.stream.GetULongLE(); - val.m_val = oNewVal; + if (c_oserct_plotareaLAYOUT === type) { + res = this.bcr.Read1(length, function (t, l) { + return oThis.ReadCT_Layout(t, l, val); + }); } - else - res = c_oSerConstants.ReadUnknown; - return res; -}; -BinaryChartReader.prototype.ReadCT_Pie3DChart = function (type, length, val, aChartWithAxis) { - var res = c_oSerConstants.ReadOk; - var oThis = this; - if (c_oserct_pie3dchartVARYCOLORS === type) { - var oNewVal = { m_val: null }; + else if (c_oserct_plotareaAREA3DCHART === type) { + var oNewVal = new AscFormat.CAreaChart(); res = this.bcr.Read1(length, function (t, l) { - return oThis.ReadCT_Boolean(t, l, oNewVal); + return oThis.ReadCT_Area3DChart(t, l, oNewVal, aChartWithAxis); }); - if (null != oNewVal.m_val) - val.setVaryColors(oNewVal.m_val); + val.addChart(oNewVal); } - else if (c_oserct_pie3dchartSER === type) { - var oNewVal = new AscFormat.CPieSeries(); + else if (c_oserct_plotareaAREACHART === type) { + var oNewVal = new AscFormat.CAreaChart(); res = this.bcr.Read1(length, function (t, l) { - return oThis.ReadCT_PieSer(t, l, oNewVal); + return oThis.ReadCT_AreaChart(t, l, oNewVal, aChartWithAxis); }); - val.addSer(oNewVal); + val.addChart(oNewVal); } - else if (c_oserct_pie3dchartDLBLS === type) { - var oNewVal = new AscFormat.CDLbls(); - this.curChart.oDataLablesData = AscCommon.fSaveStream(this.bcr.stream, length); + else if (c_oserct_plotareaBAR3DCHART === type) { + var oNewVal = new AscFormat.CBarChart(); res = this.bcr.Read1(length, function (t, l) { - return oThis.ReadCT_DLbls(t, l, oNewVal); + return oThis.ReadCT_Bar3DChart(t, l, oNewVal, aChartWithAxis); }); - oNewVal.correctValues(); - val.setDLbls(oNewVal); + oNewVal.set3D(true); + //3d->2d + /*if (AscFormat.BAR_GROUPING_STANDARD == oNewVal.grouping) + oNewVal.setGrouping(AscFormat.BAR_GROUPING_CLUSTERED); + else if(AscFormat.BAR_GROUPING_CLUSTERED != oNewVal.grouping){ + oNewVal.setOverlap(100); + }*/ + val.addChart(oNewVal); } - else if (c_oserct_pie3dchartEXTLST === type) { - var oNewVal = {}; + else if (c_oserct_plotareaBARCHART === type) { + var oNewVal = new AscFormat.CBarChart(); res = this.bcr.Read1(length, function (t, l) { - return oThis.ReadCT_extLst(t, l, oNewVal); + return oThis.ReadCT_BarChart(t, l, oNewVal, aChartWithAxis); }); - // val.m_extLst = oNewVal; + val.addChart(oNewVal); } - else - res = c_oSerConstants.ReadUnknown; - return res; -}; -BinaryChartReader.prototype.ReadCT_PieChart = function (type, length, val, aChartWithAxis) { - var res = c_oSerConstants.ReadOk; - var oThis = this; - if (c_oserct_piechartVARYCOLORS === type) { - var oNewVal = { m_val: null }; + else if (c_oserct_plotareaBUBBLECHART === type) { + var oNewVal = new AscFormat.CBubbleChart(); res = this.bcr.Read1(length, function (t, l) { - return oThis.ReadCT_Boolean(t, l, oNewVal); + return oThis.ReadCT_BubbleChart(t, l, oNewVal, aChartWithAxis); }); - if (null != oNewVal.m_val) - val.setVaryColors(oNewVal.m_val); + //bubble -> scatter + var scatter = oNewVal.convertToScutterChart(); + this.CorrectChartWithAxis(oNewVal, scatter, aChartWithAxis); + val.addChart(scatter); } - else if (c_oserct_piechartSER === type) { - var oNewVal = new AscFormat.CPieSeries(); + else if (c_oserct_plotareaDOUGHNUTCHART === type) { + var oNewVal = new AscFormat.CDoughnutChart(); res = this.bcr.Read1(length, function (t, l) { - return oThis.ReadCT_PieSer(t, l, oNewVal); + return oThis.ReadCT_DoughnutChart(t, l, oNewVal, aChartWithAxis); }); - val.addSer(oNewVal); + val.addChart(oNewVal); } - else if (c_oserct_piechartDLBLS === type) { - var oNewVal = new AscFormat.CDLbls(); - this.curChart.oDataLablesData = AscCommon.fSaveStream(this.bcr.stream, length); + else if (c_oserct_plotareaLINE3DCHART === type) { + var oNewVal = new AscFormat.CLineChart(); res = this.bcr.Read1(length, function (t, l) { - return oThis.ReadCT_DLbls(t, l, oNewVal); + return oThis.ReadCT_Line3DChart(t, l, oNewVal, aChartWithAxis); }); - oNewVal.correctValues(); - val.setDLbls(oNewVal); + oNewVal.convert3Dto2D(); + val.addChart(oNewVal); } - else if (c_oserct_piechartFIRSTSLICEANG === type) { - var oNewVal = { m_val: null }; + else if (c_oserct_plotareaLINECHART === type) { + var oNewVal = new AscFormat.CLineChart(); res = this.bcr.Read1(length, function (t, l) { - return oThis.ReadCT_FirstSliceAng(t, l, oNewVal); + return oThis.ReadCT_LineChart(t, l, oNewVal, aChartWithAxis); }); - if (null != oNewVal.m_val) - val.setFirstSliceAng(oNewVal.m_val); + val.addChart(oNewVal); } - else if (c_oserct_piechartEXTLST === type) { - var oNewVal = {}; + else if (c_oserct_plotareaOFPIECHART === type) { + var oNewVal = new AscFormat.COfPieChart(); res = this.bcr.Read1(length, function (t, l) { - return oThis.ReadCT_extLst(t, l, oNewVal); + return oThis.ReadCT_OfPieChart(t, l, oNewVal, aChartWithAxis); }); - // val.m_extLst = oNewVal; + //ofPie -> pie + var pie = oNewVal.convertToPieChart(); + this.CorrectChartWithAxis(oNewVal, pie, aChartWithAxis); + val.addChart(pie); } - else - res = c_oSerConstants.ReadUnknown; - return res; -}; -BinaryChartReader.prototype.ReadCT_ScatterSer = function (type, length, val) { - var res = c_oSerConstants.ReadOk; - var oThis = this; - if (c_oserct_scatterserIDX === type) { - var oNewVal = { m_val: null }; + else if (c_oserct_plotareaPIE3DCHART === type) { + var oNewVal = new AscFormat.CPieChart(); res = this.bcr.Read1(length, function (t, l) { - return oThis.ReadCT_UnsignedInt(t, l, oNewVal); + return oThis.ReadCT_Pie3DChart(t, l, oNewVal, aChartWithAxis); }); - if (null != oNewVal.m_val) - val.setIdx(oNewVal.m_val); + oNewVal.set3D(true); + //3d->2d + // oNewVal.setFirstSliceAng(0); + val.addChart(oNewVal); } - else if (c_oserct_scatterserORDER === type) { - var oNewVal = { m_val: null }; + else if (c_oserct_plotareaPIECHART === type) { + var oNewVal = new AscFormat.CPieChart(); res = this.bcr.Read1(length, function (t, l) { - return oThis.ReadCT_UnsignedInt(t, l, oNewVal); + return oThis.ReadCT_PieChart(t, l, oNewVal, aChartWithAxis); }); - if (null != oNewVal.m_val) - val.setOrder(oNewVal.m_val); + val.addChart(oNewVal); } - else if (c_oserct_scatterserTX === type) { - var oNewVal = new AscFormat.CTx(); + else if (c_oserct_plotareaRADARCHART === type) { + var oNewVal = new AscFormat.CRadarChart(); res = this.bcr.Read1(length, function (t, l) { - return oThis.ReadCT_SerTx(t, l, oNewVal); + return oThis.ReadCT_RadarChart(t, l, oNewVal, aChartWithAxis); + }); + //radar -> line + //var line = this.ConvertRadarToLine(oNewVal, aChartWithAxis); + val.addChart(oNewVal); + } + else if (c_oserct_plotareaSCATTERCHART === type) { + var oNewVal = new AscFormat.CScatterChart(); + res = this.bcr.Read1(length, function (t, l) { + return oThis.ReadCT_ScatterChart(t, l, oNewVal, aChartWithAxis); }); - val.setTx(oNewVal); - } - else if (c_oserct_scatterserSPPR === type) { - val.setSpPr(this.ReadSpPr(length)); + val.addChart(oNewVal); } - else if (c_oserct_scatterserMARKER === type) { - var oNewVal = new AscFormat.CMarker(); + else if (c_oserct_plotareaSTOCKCHART === type) { + var oNewVal = new AscFormat.CStockChart(); res = this.bcr.Read1(length, function (t, l) { - return oThis.ReadCT_Marker(t, l, oNewVal); + return oThis.ReadCT_StockChart(t, l, oNewVal, aChartWithAxis); }); - val.setMarker(oNewVal); + val.addChart(oNewVal); } - else if (c_oserct_scatterserDPT === type) { - var oNewVal = new AscFormat.CDPt(); + else if (c_oserct_plotareaSURFACE3DCHART === type) { + var oNewVal = new AscFormat.CSurfaceChart(); res = this.bcr.Read1(length, function (t, l) { - return oThis.ReadCT_DPt(t, l, oNewVal); + return oThis.ReadCT_Surface3DChart(t, l, oNewVal, aChartWithAxis); }); - val.addDPt(oNewVal); + val.addChart(oNewVal); } - else if (c_oserct_scatterserDLBLS === type) { - var oNewVal = new AscFormat.CDLbls(); + else if (c_oserct_plotareaSURFACECHART === type) { + var oNewVal = new AscFormat.CSurfaceChart(); res = this.bcr.Read1(length, function (t, l) { - return oThis.ReadCT_DLbls(t, l, oNewVal); + return oThis.ReadCT_SurfaceChart(t, l, oNewVal, aChartWithAxis); }); - oNewVal.correctValues(); - val.setDLbls(oNewVal); + val.addChart(oNewVal); } - else if (c_oserct_scatterserTRENDLINE === type) { - //todo array - var oNewVal = new AscFormat.CTrendLine(); + else if (c_oserct_plotareaCATAX === type) { + var oNewVal = new AscFormat.CCatAx(); + + this.curChart.oCatAxData = AscCommon.fSaveStream(this.bcr.stream, length); res = this.bcr.Read1(length, function (t, l) { - return oThis.ReadCT_Trendline(t, l, oNewVal); + return oThis.ReadCT_CatAx(t, l, oNewVal); }); - val.setTrendline(oNewVal); + val.addAxis(oNewVal); } - else if (c_oserct_scatterserERRBARS === type) { - //todo array - var oNewVal = new AscFormat.CErrBars(); + else if (c_oserct_plotareaDATEAX === type) { + var oNewVal = new AscFormat.CDateAx(); res = this.bcr.Read1(length, function (t, l) { - return oThis.ReadCT_ErrBars(t, l, oNewVal); + return oThis.ReadCT_DateAx(t, l, oNewVal); }); - val.setErrBars(oNewVal); + val.addAxis(oNewVal); } - else if (c_oserct_scatterserXVAL === type) { - var oNewVal = new AscFormat.CCat(); + else if (c_oserct_plotareaSERAX === type) { + var oNewVal = new AscFormat.CSerAx(); res = this.bcr.Read1(length, function (t, l) { - return oThis.ReadCT_AxDataSource(t, l, oNewVal); + return oThis.ReadCT_SerAx(t, l, oNewVal); }); - val.setXVal(oNewVal); + val.addAxis(oNewVal); } - else if (c_oserct_scatterserYVAL === type) { - var oNewVal = new AscFormat.CYVal(); + else if (c_oserct_plotareaVALAX === type) { + this.curChart.oValAxData = AscCommon.fSaveStream(this.bcr.stream, length); + var oNewVal = new AscFormat.CValAx(); res = this.bcr.Read1(length, function (t, l) { - return oThis.ReadCT_NumDataSource(t, l, oNewVal); + return oThis.ReadCT_ValAx(t, l, oNewVal); }); - val.setYVal(oNewVal); + val.addAxis(oNewVal); + //if(!AscFormat.isRealNumber(oNewVal.crossBetween)) + //{ + // oNewVal.setCrossBetween(AscFormat.CROSS_BETWEEN_BETWEEN); + //} } - else if (c_oserct_scatterserSMOOTH === type) { - var oNewVal = { m_val: null }; + else if (c_oserct_plotareaDTABLE === type) { + var oNewVal = new AscFormat.CDTable(); res = this.bcr.Read1(length, function (t, l) { - return oThis.ReadCT_Boolean(t, l, oNewVal); + return oThis.ReadCT_DTable(t, l, oNewVal); }); - if (null != oNewVal.m_val){ - val.setSmooth(oNewVal.m_val); - } - else{ - val.setSmooth(true); - } + val.setDTable(oNewVal); } - else if (c_oserct_scatterserEXTLST === type) { + else if (c_oserct_plotareaSPPR === type) { + val.setSpPr(this.ReadSpPr(length)); + } + else if (c_oserct_plotareaEXTLST === type) { var oNewVal = {}; res = this.bcr.Read1(length, function (t, l) { return oThis.ReadCT_extLst(t, l, oNewVal); }); // val.m_extLst = oNewVal; } - else if(c_oserct_chartFiltering === type) { - res = this.bcr.Read1(length, function (t, l) { - return oThis.ReadCT_ChartFiltering(t, l, val); - }); + else if (c_oserct_plotareaPLOTAREAREGION === type) { + var oNewVal = {}; + res = this.bcr.Read1(length, function (t, l) { + return oThis.ReadCT_PlotAreaRegion(t, l, oNewVal); // todoo this class + }); } else res = c_oSerConstants.ReadUnknown; return res; }; -BinaryChartReader.prototype.ReadCT_ScatterStyle = function (type, length, val) { +BinaryChartReader.prototype.ReadCT_Thickness = function (type, length, val) { var res = c_oSerConstants.ReadOk; var oThis = this; - if (c_oserct_scatterstyleVAL === type) { - switch (this.stream.GetUChar()) { - case st_scatterstyleNONE: val.m_val = AscFormat.SCATTER_STYLE_NONE; break; - case st_scatterstyleLINE: val.m_val = AscFormat.SCATTER_STYLE_LINE; break; - case st_scatterstyleLINEMARKER: val.m_val = AscFormat.SCATTER_STYLE_LINE_MARKER; break; - case st_scatterstyleMARKER: val.m_val = AscFormat.SCATTER_STYLE_MARKER; break; - case st_scatterstyleSMOOTH: val.m_val = AscFormat.SCATTER_STYLE_SMOOTH; break; - case st_scatterstyleSMOOTHMARKER: val.m_val = AscFormat.SCATTER_STYLE_SMOOTH_MARKER; break; - } + if (c_oserct_thicknessVAL === type) { + val.m_val = this.ParsePersent(this.stream.GetString2LE(length)); } else res = c_oSerConstants.ReadUnknown; return res; }; -BinaryChartReader.prototype.ReadCT_ScatterChart = function (type, length, val, aChartWithAxis) { +BinaryChartReader.prototype.ReadCT_Surface = function (type, length, val) { var res = c_oSerConstants.ReadOk; var oThis = this; - if (c_oserct_scatterchartSCATTERSTYLE === type) { - var oNewVal = { m_val: null }; - res = this.bcr.Read1(length, function (t, l) { - return oThis.ReadCT_ScatterStyle(t, l, oNewVal); - }); - if (null != oNewVal.m_val) - val.setScatterStyle(oNewVal.m_val); - } - else if (c_oserct_scatterchartVARYCOLORS === type) { + if (c_oserct_surfaceTHICKNESS === type) { var oNewVal = { m_val: null }; res = this.bcr.Read1(length, function (t, l) { - return oThis.ReadCT_Boolean(t, l, oNewVal); + return oThis.ReadCT_Thickness(t, l, oNewVal); }); if (null != oNewVal.m_val) - val.setVaryColors(oNewVal.m_val); - } - else if (c_oserct_scatterchartSER === type) { - var oNewVal = new AscFormat.CScatterSeries(); - res = this.bcr.Read1(length, function (t, l) { - return oThis.ReadCT_ScatterSer(t, l, oNewVal); - }); - val.addSer(oNewVal); - if(oNewVal.smooth === null){ - oNewVal.setSmooth(false); - } + val.setThickness(oNewVal.m_val); } - else if (c_oserct_scatterchartDLBLS === type) { - var oNewVal = new AscFormat.CDLbls(); - this.curChart.oDataLablesData = AscCommon.fSaveStream(this.bcr.stream, length); - res = this.bcr.Read1(length, function (t, l) { - return oThis.ReadCT_DLbls(t, l, oNewVal); - }); - oNewVal.correctValues(); - val.setDLbls(oNewVal); + else if (c_oserct_surfaceSPPR === type) { + val.setSpPr(this.ReadSpPr(length)); } - else if (c_oserct_scatterchartAXID === type) { - var oNewVal = { m_val: null }; + else if (c_oserct_surfacePICTUREOPTIONS === type) { + var oNewVal = new AscFormat.CPictureOptions(); res = this.bcr.Read1(length, function (t, l) { - return oThis.ReadCT_UnsignedInt(t, l, oNewVal); + return oThis.ReadCT_PictureOptions(t, l, oNewVal); }); - if (null != oNewVal.m_val) - aChartWithAxis.push({ axisId: oNewVal.m_val, chart: val }); + val.setPictureOptions(oNewVal); } - else if (c_oserct_scatterchartEXTLST === type) { + else if (c_oserct_surfaceEXTLST === type) { var oNewVal = {}; res = this.bcr.Read1(length, function (t, l) { return oThis.ReadCT_extLst(t, l, oNewVal); @@ -10803,146 +12721,120 @@ BinaryChartReader.prototype.ReadCT_ScatterChart = function (type, length, val, a res = c_oSerConstants.ReadUnknown; return res; }; -BinaryChartReader.prototype.ReadCT_RadarSer = function (type, length, val) { +BinaryChartReader.prototype.ReadCT_Perspective = function (type, length, val) { var res = c_oSerConstants.ReadOk; var oThis = this; - if (c_oserct_radarserIDX === type) { - var oNewVal = { m_val: null }; - res = this.bcr.Read1(length, function (t, l) { - return oThis.ReadCT_UnsignedInt(t, l, oNewVal); - }); - if (null != oNewVal.m_val) - val.setIdx(oNewVal.m_val); - } - else if (c_oserct_radarserORDER === type) { - var oNewVal = { m_val: null }; - res = this.bcr.Read1(length, function (t, l) { - return oThis.ReadCT_UnsignedInt(t, l, oNewVal); - }); - if (null != oNewVal.m_val) - val.setOrder(oNewVal.m_val); - } - else if (c_oserct_radarserTX === type) { - var oNewVal = new AscFormat.CTx(); - res = this.bcr.Read1(length, function (t, l) { - return oThis.ReadCT_SerTx(t, l, oNewVal); - }); - val.setTx(oNewVal); - } - else if (c_oserct_radarserSPPR === type) { - val.setSpPr(this.ReadSpPr(length)); - } - else if (c_oserct_radarserMARKER === type) { - var oNewVal = new AscFormat.CMarker(); - res = this.bcr.Read1(length, function (t, l) { - return oThis.ReadCT_Marker(t, l, oNewVal); - }); - val.setMarker(oNewVal); - } - else if (c_oserct_radarserDPT === type) { - var oNewVal = new AscFormat.CDPt(); - res = this.bcr.Read1(length, function (t, l) { - return oThis.ReadCT_DPt(t, l, oNewVal); - }); - val.addDPt(oNewVal); - } - else if (c_oserct_radarserDLBLS === type) { - var oNewVal = new AscFormat.CDLbls(); - res = this.bcr.Read1(length, function (t, l) { - return oThis.ReadCT_DLbls(t, l, oNewVal); - }); - oNewVal.correctValues(); - val.setDLbls(oNewVal); - } - else if (c_oserct_radarserCAT === type) { - var oNewVal = new AscFormat.CCat(); - res = this.bcr.Read1(length, function (t, l) { - return oThis.ReadCT_AxDataSource(t, l, oNewVal); - }); - val.setCat(oNewVal); - } - else if (c_oserct_radarserVAL === type) { - var oNewVal = new AscFormat.CYVal(); - res = this.bcr.Read1(length, function (t, l) { - return oThis.ReadCT_NumDataSource(t, l, oNewVal); - }); - val.setVal(oNewVal); + if (c_oserct_perspectiveVAL === type) { + var oNewVal; + oNewVal = this.stream.GetUChar(); + val.m_val = oNewVal; } - else if (c_oserct_radarserEXTLST === type) { + else + res = c_oSerConstants.ReadUnknown; + return res; +}; +BinaryChartReader.prototype.ReadCT_DepthPercent = function (type, length, val) { + var res = c_oSerConstants.ReadOk; + var oThis = this; + if (c_oserct_depthpercentVAL === type) { var oNewVal; - oNewVal = {}; - res = this.bcr.Read1(length, function (t, l) { - return oThis.ReadCT_extLst(t, l, oNewVal); - }); - // val.m_extLst = oNewVal; + oNewVal = this.stream.GetString2LE(length); + val.m_val = oNewVal; } - else if(c_oserct_chartFiltering === type) { - res = this.bcr.Read1(length, function (t, l) { - return oThis.ReadCT_ChartFiltering(t, l, val); - }); + else + res = c_oSerConstants.ReadUnknown; + return res; +}; +BinaryChartReader.prototype.ReadCT_RotY = function (type, length, val) { + var res = c_oSerConstants.ReadOk; + var oThis = this; + if (c_oserct_rotyVAL === type) { + var oNewVal; + oNewVal = this.stream.GetULongLE(); + val.m_val = oNewVal; } else res = c_oSerConstants.ReadUnknown; return res; }; -BinaryChartReader.prototype.ReadCT_RadarStyle = function (type, length, val) { +BinaryChartReader.prototype.ReadCT_HPercent = function (type, length, val) { var res = c_oSerConstants.ReadOk; var oThis = this; - if (c_oserct_radarstyleVAL === type) { - switch (this.stream.GetUChar()) { - case st_radarstyleSTANDARD: val.m_val = RADAR_STYLE_STANDARD; break; - case st_radarstyleMARKER: val.m_val = RADAR_STYLE_MARKER; break; - case st_radarstyleFILLED: val.m_val = RADAR_STYLE_FILLED; break; - } + if (c_oserct_hpercentVAL === type) { + val.m_val = this.ParsePersent(this.stream.GetString2LE(length)); } else res = c_oSerConstants.ReadUnknown; return res; }; -BinaryChartReader.prototype.ReadCT_RadarChart = function (type, length, val, aChartWithAxis) { +BinaryChartReader.prototype.ReadCT_RotX = function (type, length, val) { var res = c_oSerConstants.ReadOk; var oThis = this; - if (c_oserct_radarchartRADARSTYLE === type) { + if (c_oserct_rotxVAL === type) { + var oNewVal; + oNewVal = this.stream.GetChar(); + val.m_val = oNewVal; + } + else + res = c_oSerConstants.ReadUnknown; + return res; +}; +BinaryChartReader.prototype.ReadCT_View3D = function (type, length, val) { + var res = c_oSerConstants.ReadOk; + var oThis = this; + if (c_oserct_view3dROTX === type) { var oNewVal = { m_val: null }; res = this.bcr.Read1(length, function (t, l) { - return oThis.ReadCT_RadarStyle(t, l, oNewVal); + return oThis.ReadCT_RotX(t, l, oNewVal); }); if (null != oNewVal.m_val) - val.setRadarStyle(oNewVal.m_val); + val.setRotX(oNewVal.m_val); } - else if (c_oserct_radarchartVARYCOLORS === type) { + else if (c_oserct_view3dHPERCENT === type) { var oNewVal = { m_val: null }; res = this.bcr.Read1(length, function (t, l) { - return oThis.ReadCT_Boolean(t, l, oNewVal); + return oThis.ReadCT_HPercent(t, l, oNewVal); }); if (null != oNewVal.m_val) - val.setVaryColors(oNewVal.m_val); + val.setHPercent(oNewVal.m_val); } - else if (c_oserct_radarchartSER === type) { - var oNewVal = new AscFormat.CRadarSeries(); + else if (c_oserct_view3dROTY === type) { + var oNewVal = { m_val: null }; res = this.bcr.Read1(length, function (t, l) { - return oThis.ReadCT_RadarSer(t, l, oNewVal); + return oThis.ReadCT_RotY(t, l, oNewVal); }); - val.addSer(oNewVal); + if (null != oNewVal.m_val) + val.setRotY(oNewVal.m_val); } - else if (c_oserct_radarchartDLBLS === type) { - var oNewVal = new AscFormat.CDLbls(); - this.curChart.oDataLablesData = AscCommon.fSaveStream(this.bcr.stream, length); + else if (c_oserct_view3dDEPTHPERCENT === type) { + var oNewVal = { m_val: null }; res = this.bcr.Read1(length, function (t, l) { - return oThis.ReadCT_DLbls(t, l, oNewVal); + return oThis.ReadCT_DepthPercent(t, l, oNewVal); }); - oNewVal.correctValues(); - val.setDLbls(oNewVal); + if (null != oNewVal.m_val){ + var nPercent = parseInt(oNewVal.m_val) + if(AscFormat.isRealNumber(nPercent)){ + val.setDepthPercent(nPercent); + } + } } - else if (c_oserct_radarchartAXID === type) { + else if (c_oserct_view3dRANGAX === type) { var oNewVal = { m_val: null }; res = this.bcr.Read1(length, function (t, l) { - return oThis.ReadCT_UnsignedInt(t, l, oNewVal); + return oThis.ReadCT_Boolean(t, l, oNewVal); }); if (null != oNewVal.m_val) - aChartWithAxis.push({ axisId: oNewVal.m_val, chart: val }); + val.setRAngAx(oNewVal.m_val); } - else if (c_oserct_radarchartEXTLST === type) { + else if (c_oserct_view3dPERSPECTIVE === type) { + var oNewVal = { m_val: null }; + res = this.bcr.Read1(length, function (t, l) { + return oThis.ReadCT_Perspective(t, l, oNewVal); + }); + if (null != oNewVal.m_val) + val.setPerspective(oNewVal.m_val); + } + else if (c_oserct_view3dEXTLST === type) { var oNewVal = {}; res = this.bcr.Read1(length, function (t, l) { return oThis.ReadCT_extLst(t, l, oNewVal); @@ -10953,61 +12845,40 @@ BinaryChartReader.prototype.ReadCT_RadarChart = function (type, length, val, aCh res = c_oSerConstants.ReadUnknown; return res; }; -BinaryChartReader.prototype.ReadCT_StockChart = function (type, length, val, aChartWithAxis) { +BinaryChartReader.prototype.ReadCT_PivotFmt = function (type, length, val) { var res = c_oSerConstants.ReadOk; var oThis = this; - if (c_oserct_stockchartSER === type) { - var oNewVal = new AscFormat.CLineSeries(); - res = this.bcr.Read1(length, function (t, l) { - return oThis.ReadCT_LineSer(t, l, oNewVal); - }); - val.addSer(oNewVal); - } - else if (c_oserct_stockchartDLBLS === type) { - var oNewVal = new AscFormat.CDLbls(); - this.curChart.oDataLablesData = AscCommon.fSaveStream(this.bcr.stream, length); + if (c_oserct_pivotfmtIDX === type) { + var oNewVal = { m_val: null }; res = this.bcr.Read1(length, function (t, l) { - return oThis.ReadCT_DLbls(t, l, oNewVal); + return oThis.ReadCT_UnsignedInt(t, l, oNewVal); }); - oNewVal.correctValues(); - val.setDLbls(oNewVal); + if (null != oNewVal.m_val) + val.setIdx(oNewVal.m_val); } - else if (c_oserct_stockchartDROPLINES === type) { - var oNewVal = { spPr: null }; - res = this.bcr.Read1(length, function (t, l) { - return oThis.ReadCT_ChartLines(t, l, oNewVal); - }); - if (null != oNewVal.spPr) - val.setDropLines(oNewVal.spPr); - else - val.setDropLines(new AscFormat.CSpPr()); + else if (c_oserct_pivotfmtSPPR === type) { + val.setSpPr(this.ReadSpPr(length)); } - else if (c_oserct_stockchartHILOWLINES === type) { - var oNewVal = { spPr: null }; - res = this.bcr.Read1(length, function (t, l) { - return oThis.ReadCT_ChartLines(t, l, oNewVal); - }); - if (null != oNewVal.spPr) - val.setHiLowLines(oNewVal.spPr); - else - val.setHiLowLines(new AscFormat.CSpPr()); + else if (c_oserct_pivotfmtTXPR === type) { + val.setTxPr(this.ReadTxPr(length)); + val.txPr.setParent(val); } - else if (c_oserct_stockchartUPDOWNBARS === type) { - var oNewVal = new AscFormat.CUpDownBars(); + else if (c_oserct_pivotfmtMARKER === type) { + var oNewVal = new AscFormat.CMarker(); res = this.bcr.Read1(length, function (t, l) { - return oThis.ReadCT_UpDownBars(t, l, oNewVal); + return oThis.ReadCT_Marker(t, l, oNewVal); }); - val.setUpDownBars(oNewVal); + val.setMarker(oNewVal); } - else if (c_oserct_stockchartAXID === type) { - var oNewVal = { m_val: null }; + else if (c_oserct_pivotfmtDLBL === type) { + var oNewVal = new AscFormat.CDLbl(); res = this.bcr.Read1(length, function (t, l) { - return oThis.ReadCT_UnsignedInt(t, l, oNewVal); + return oThis.ReadCT_DLbl(t, l, oNewVal); }); - if (null != oNewVal.m_val) - aChartWithAxis.push({ axisId: oNewVal.m_val, chart: val }); + oNewVal.correctValues(); + val.setLbl(oNewVal); } - else if (c_oserct_stockchartEXTLST === type) { + else if (c_oserct_pivotfmtEXTLST === type) { var oNewVal = {}; res = this.bcr.Read1(length, function (t, l) { return oThis.ReadCT_extLst(t, l, oNewVal); @@ -11018,146 +12889,120 @@ BinaryChartReader.prototype.ReadCT_StockChart = function (type, length, val, aCh res = c_oSerConstants.ReadUnknown; return res; }; -BinaryChartReader.prototype.ReadCT_LineSer = function (type, length, val) { +BinaryChartReader.prototype.ReadCT_pivotFmts = function (type, length, val) { var res = c_oSerConstants.ReadOk; var oThis = this; - if (c_oserct_lineserIDX === type) { - var oNewVal = { m_val: null }; - res = this.bcr.Read1(length, function (t, l) { - return oThis.ReadCT_UnsignedInt(t, l, oNewVal); - }); - if (null != oNewVal.m_val) - val.setIdx(oNewVal.m_val); - } - else if (c_oserct_lineserORDER === type) { - var oNewVal = { m_val: null }; - res = this.bcr.Read1(length, function (t, l) { - return oThis.ReadCT_UnsignedInt(t, l, oNewVal); - }); - if (null != oNewVal.m_val) - val.setOrder(oNewVal.m_val); - } - else if (c_oserct_lineserTX === type) { - var oNewVal = new AscFormat.CTx(); + if (c_oserct_pivotfmtsPIVOTFMT === type) { + var oNewVal = new AscFormat.CPivotFmt(); res = this.bcr.Read1(length, function (t, l) { - return oThis.ReadCT_SerTx(t, l, oNewVal); + return oThis.ReadCT_PivotFmt(t, l, oNewVal); }); - val.setTx(oNewVal); - } - else if (c_oserct_lineserSPPR === type) { - val.setSpPr(this.ReadSpPr(length)); + val.setPivotFmts(oNewVal); } - else if (c_oserct_lineserMARKER === type) { - var oNewVal = new AscFormat.CMarker(); + else + res = c_oSerConstants.ReadUnknown; + return res; +}; +BinaryChartReader.prototype.ReadCT_Chart = function (type, length, val) { + var res = c_oSerConstants.ReadOk; + var oThis = this; + if (c_oserct_chartTITLE === type) { + var oNewVal = new AscFormat.CTitle(); res = this.bcr.Read1(length, function (t, l) { - return oThis.ReadCT_Marker(t, l, oNewVal); + return oThis.ReadCT_Title(t, l, oNewVal); }); - val.setMarker(oNewVal); + val.setTitle(oNewVal); } - else if (c_oserct_lineserDPT === type) { - var oNewVal = new AscFormat.CDPt(); + else if (c_oserct_chartAUTOTITLEDELETED === type) { + var oNewVal = { m_val: null }; res = this.bcr.Read1(length, function (t, l) { - return oThis.ReadCT_DPt(t, l, oNewVal); + return oThis.ReadCT_Boolean(t, l, oNewVal); }); - val.addDPt(oNewVal); + if (null != oNewVal.m_val) + val.setAutoTitleDeleted(oNewVal.m_val); + else + val.setAutoTitleDeleted(true); } - else if (c_oserct_lineserDLBLS === type) { - var oNewVal = new AscFormat.CDLbls(); + else if (c_oserct_chartPIVOTFMTS === type) { res = this.bcr.Read1(length, function (t, l) { - return oThis.ReadCT_DLbls(t, l, oNewVal); + return oThis.ReadCT_pivotFmts(t, l, val); }); - oNewVal.correctValues(); - val.setDLbls(oNewVal); } - else if (c_oserct_lineserTRENDLINE === type) { - //todo array - var oNewVal = new AscFormat.CTrendLine(); + else if (c_oserct_chartVIEW3D === type) { + var oNewVal = new AscFormat.CView3d(); + + this.curChart.oView3DData = AscCommon.fSaveStream(this.bcr.stream, length); res = this.bcr.Read1(length, function (t, l) { - return oThis.ReadCT_Trendline(t, l, oNewVal); + return oThis.ReadCT_View3D(t, l, oNewVal); }); - val.setTrendline(oNewVal); + val.setView3D(oNewVal); } - else if (c_oserct_lineserERRBARS === type) { - var oNewVal = new AscFormat.CErrBars(); + else if (c_oserct_chartFLOOR === type) { + var oNewVal = new AscFormat.CChartWall(); res = this.bcr.Read1(length, function (t, l) { - return oThis.ReadCT_ErrBars(t, l, oNewVal); + return oThis.ReadCT_Surface(t, l, oNewVal); }); - val.setErrBars(oNewVal); + val.setFloor(oNewVal); } - else if (c_oserct_lineserCAT === type) { - var oNewVal = new AscFormat.CCat(); + else if (c_oserct_chartSIDEWALL === type) { + var oNewVal = new AscFormat.CChartWall(); res = this.bcr.Read1(length, function (t, l) { - return oThis.ReadCT_AxDataSource(t, l, oNewVal); + return oThis.ReadCT_Surface(t, l, oNewVal); }); - val.setCat(oNewVal); + val.setSideWall(oNewVal); } - else if (c_oserct_lineserVAL === type) { - var oNewVal = new AscFormat.CYVal(); + else if (c_oserct_chartBACKWALL === type) { + var oNewVal = new AscFormat.CChartWall(); res = this.bcr.Read1(length, function (t, l) { - return oThis.ReadCT_NumDataSource(t, l, oNewVal); + return oThis.ReadCT_Surface(t, l, oNewVal); }); - val.setVal(oNewVal); + val.setBackWall(oNewVal); } - else if (c_oserct_lineserSMOOTH === type) { - var oNewVal = { m_val: null }; + else if (c_oserct_chartPLOTAREA === type) { + var oNewVal = new AscFormat.CPlotArea(); + var aChartWithAxis = []; res = this.bcr.Read1(length, function (t, l) { - return oThis.ReadCT_Boolean(t, l, oNewVal); + return oThis.ReadCT_PlotArea(t, l, oNewVal, aChartWithAxis); }); - if (null != oNewVal.m_val) { - val.setSmooth(oNewVal.m_val); - } - else { - val.setSmooth(true); - } + oNewVal.initPostOpen(aChartWithAxis); + val.setPlotArea(oNewVal); } - else if (c_oserct_lineserEXTLST === type) { - var oNewVal = {}; + else if (c_oserct_chartLEGEND === type) { + this.curChart.oLegendData = AscCommon.fSaveStream(this.bcr.stream, length); + var oNewVal = new AscFormat.CLegend(); res = this.bcr.Read1(length, function (t, l) { - return oThis.ReadCT_extLst(t, l, oNewVal); + return oThis.ReadCT_Legend(t, l, oNewVal); }); - // val.m_extLst = oNewVal; - } - else if(c_oserct_chartFiltering === type) { - res = this.bcr.Read1(length, function (t, l) { - return oThis.ReadCT_ChartFiltering(t, l, val); - }); + oNewVal.updateLegendPos(); + val.setLegend(oNewVal); } - else - res = c_oSerConstants.ReadUnknown; - return res; -}; -BinaryChartReader.prototype.ReadCT_UpDownBars = function (type, length, val) { - var res = c_oSerConstants.ReadOk; - var oThis = this; - if (c_oserct_updownbarsGAPWIDTH === type) { + else if (c_oserct_chartPLOTVISONLY === type) { var oNewVal = { m_val: null }; res = this.bcr.Read1(length, function (t, l) { - return oThis.ReadCT_GapAmount(t, l, oNewVal); + return oThis.ReadCT_Boolean(t, l, oNewVal); }); if (null != oNewVal.m_val) - val.setGapWidth(oNewVal.m_val); + val.setPlotVisOnly(oNewVal.m_val); } - else if (c_oserct_updownbarsUPBARS === type) { - var oNewVal = { spPr: null }; + else if (c_oserct_chartDISPBLANKSAS === type) { + var oNewVal = { m_val: null }; res = this.bcr.Read1(length, function (t, l) { - return oThis.ReadCT_UpDownBar(t, l, oNewVal); + return oThis.ReadCT_DispBlanksAs(t, l, oNewVal); }); - if (null != oNewVal.spPr) - val.setUpBars(oNewVal.spPr); - else - val.setUpBars(new AscFormat.CSpPr()); + if (null != oNewVal.m_val) + val.setDispBlanksAs(oNewVal.m_val); } - else if (c_oserct_updownbarsDOWNBARS === type) { - var oNewVal = { spPr: null }; + else if (c_oserct_chartSHOWDLBLSOVERMAX === type) { + var oNewVal = { m_val: null }; res = this.bcr.Read1(length, function (t, l) { - return oThis.ReadCT_UpDownBar(t, l, oNewVal); + return oThis.ReadCT_Boolean(t, l, oNewVal); }); - if (null != oNewVal.spPr) - val.setDownBars(oNewVal.spPr); + if (null != oNewVal.m_val) + val.setShowDLblsOverMax(oNewVal.m_val); else - val.setDownBars(new AscFormat.CSpPr()); + val.setShowDLblsOverMax(true); } - else if (c_oserct_updownbarsEXTLST === type) { + else if (c_oserct_chartEXTLST === type) { var oNewVal = {}; res = this.bcr.Read1(length, function (t, l) { return oThis.ReadCT_extLst(t, l, oNewVal); @@ -11168,1085 +13013,1241 @@ BinaryChartReader.prototype.ReadCT_UpDownBars = function (type, length, val) { res = c_oSerConstants.ReadUnknown; return res; }; -BinaryChartReader.prototype.ReadCT_UpDownBar = function (type, length, val) { - var res = c_oSerConstants.ReadOk; - var oThis = this; - if (c_oserct_updownbarSPPR === type) { - val.spPr = this.ReadSpPr(length); - } - else - res = c_oSerConstants.ReadUnknown; - return res; -}; -BinaryChartReader.prototype.ReadCT_Line3DChart = function (type, length, val, aChartWithAxis) { +BinaryChartReader.prototype.ReadCT_Protection = function (type, length, val) { var res = c_oSerConstants.ReadOk; var oThis = this; - if (c_oserct_line3dchartGROUPING === type) { + if (c_oserct_protectionCHARTOBJECT === type) { var oNewVal = { m_val: null }; res = this.bcr.Read1(length, function (t, l) { - return oThis.ReadCT_Grouping(t, l, oNewVal); + return oThis.ReadCT_Boolean(t, l, oNewVal); }); if (null != oNewVal.m_val) - val.setGrouping(oNewVal.m_val); + val.setChartObject(oNewVal.m_val); } - else if (c_oserct_line3dchartVARYCOLORS === type) { + else if (c_oserct_protectionDATA === type) { var oNewVal = { m_val: null }; res = this.bcr.Read1(length, function (t, l) { return oThis.ReadCT_Boolean(t, l, oNewVal); }); if (null != oNewVal.m_val) - val.setVaryColors(oNewVal.m_val); + val.setData(oNewVal.m_val); } - else if (c_oserct_line3dchartSER === type) { - var oNewVal = new AscFormat.CLineSeries(); + else if (c_oserct_protectionFORMATTING === type) { + var oNewVal = { m_val: null }; res = this.bcr.Read1(length, function (t, l) { - return oThis.ReadCT_LineSer(t, l, oNewVal); + return oThis.ReadCT_Boolean(t, l, oNewVal); }); - if(oNewVal.smooth === null){ - oNewVal.setSmooth(false); - } - val.addSer(oNewVal); + if (null != oNewVal.m_val) + val.setFormatting(oNewVal.m_val); } - else if (c_oserct_line3dchartDLBLS === type) { - var oNewVal = new AscFormat.CDLbls(); - this.curChart.oDataLablesData = AscCommon.fSaveStream(this.bcr.stream, length); + else if (c_oserct_protectionSELECTION === type) { + var oNewVal = { m_val: null }; res = this.bcr.Read1(length, function (t, l) { - return oThis.ReadCT_DLbls(t, l, oNewVal); + return oThis.ReadCT_Boolean(t, l, oNewVal); }); - oNewVal.correctValues(); - val.setDLbls(oNewVal); + if (null != oNewVal.m_val) + val.setSelection(oNewVal.m_val); } - else if (c_oserct_line3dchartDROPLINES === type) { - var oNewVal = { spPr: null }; + else if (c_oserct_protectionUSERINTERFACE === type) { + var oNewVal = { m_val: null }; res = this.bcr.Read1(length, function (t, l) { - return oThis.ReadCT_ChartLines(t, l, oNewVal); + return oThis.ReadCT_Boolean(t, l, oNewVal); }); - if (null != oNewVal.spPr) - val.setDropLines(oNewVal.spPr); - else - val.setDropLines(new AscFormat.CSpPr()); + if (null != oNewVal.m_val) + val.setUserInterface(oNewVal.m_val); } - else if (c_oserct_line3dchartGAPDEPTH === type) { - var oNewVal; - oNewVal = {}; - res = this.bcr.Read1(length, function (t, l) { - return oThis.ReadCT_GapAmount(t, l, oNewVal); - }); - //val.m_gapDepth = oNewVal; + else + res = c_oSerConstants.ReadUnknown; + return res; +}; +BinaryChartReader.prototype.ReadCT_PivotSource = function (type, length, val) { + var res = c_oSerConstants.ReadOk; + var oThis = this; + if (c_oserct_pivotsourceNAME === type) { + val.setName(this.stream.GetString2LE(length)); } - else if (c_oserct_line3dchartAXID === type) { + else if (c_oserct_pivotsourceFMTID === type) { var oNewVal = { m_val: null }; res = this.bcr.Read1(length, function (t, l) { return oThis.ReadCT_UnsignedInt(t, l, oNewVal); }); if (null != oNewVal.m_val) - aChartWithAxis.push({ axisId: oNewVal.m_val, chart: val }); + val.setFmtId(oNewVal.m_val); } - else if (c_oserct_line3dchartEXTLST === type) { + else if (c_oserct_pivotsourceEXTLST === type) { var oNewVal = {}; res = this.bcr.Read1(length, function (t, l) { return oThis.ReadCT_extLst(t, l, oNewVal); }); - // val.m_extLst = oNewVal; + // if (null == val.m_extLst) + // val.m_extLst = []; + // val.m_extLst.push(oNewVal); } else res = c_oSerConstants.ReadUnknown; return res; }; -BinaryChartReader.prototype.ReadCT_Grouping = function (type, length, val) { +BinaryChartReader.prototype.ReadCT_Style1 = function (type, length, val) { var res = c_oSerConstants.ReadOk; var oThis = this; - if (c_oserct_groupingVAL === type) { - switch (this.stream.GetUChar()) { - case st_groupingPERCENTSTACKED: val.m_val = AscFormat.GROUPING_PERCENT_STACKED; break; - case st_groupingSTANDARD: val.m_val = AscFormat.GROUPING_STANDARD; break; - case st_groupingSTACKED: val.m_val = AscFormat.GROUPING_STACKED; break; - } + if (c_oserct_style1VAL === type) { + var oNewVal; + oNewVal = this.stream.GetUChar(); + val.m_val = oNewVal; } else res = c_oSerConstants.ReadUnknown; return res; }; -BinaryChartReader.prototype.ReadCT_LineChart = function (type, length, val, aChartWithAxis) { +BinaryChartReader.prototype.ReadCT_Style = function (type, length, val) { var res = c_oSerConstants.ReadOk; var oThis = this; - if (c_oserct_linechartGROUPING === type) { - var oNewVal = { m_val: null }; + if (c_oserct_styleVAL === type) { + var oNewVal; + oNewVal = this.stream.GetUChar(); + val.m_val = oNewVal; + } + else + res = c_oSerConstants.ReadUnknown; + return res; +}; +BinaryChartReader.prototype.ReadCT_TextLanguageID = function (type, length, val) { + var res = c_oSerConstants.ReadOk; + var oThis = this; + if (c_oserct_textlanguageidVAL === type) { + var oNewVal; + oNewVal = this.stream.GetString2LE(length); + val.m_val = oNewVal; + } + else + res = c_oSerConstants.ReadUnknown; + return res; +}; +BinaryChartReader.prototype.ReadCT_Axis = function (type, length, val) { + var res = c_oSerConstants.ReadOk; + var oThis = this; + var oNewVal; + if (c_oserct_chartExAxisID === type) + { + val.setId(this.stream.GetULongLE()); + } + else if (c_oserct_chartExAxisHIDDEN === type) + { + val.setHidden(this.stream.GetBool()); + } + else if (c_oserct_chartExAxisCATSCALING === type) + { + var oNewVal = new AscFormat.CCategoryAxisScaling(); res = this.bcr.Read1(length, function (t, l) { - return oThis.ReadCT_Grouping(t, l, oNewVal); + return oThis.ReadCT_CategoryAxisScaling(t, l, oNewVal); }); - if (null != oNewVal.m_val) - val.setGrouping(oNewVal.m_val); + val.setCatScaling(oNewVal); } - else if (c_oserct_linechartVARYCOLORS === type) { - var oNewVal = { m_val: null }; + else if (c_oserct_chartExAxisVALSCALING === type) + { + var oNewVal = new AscFormat.CValueAxisScaling(); res = this.bcr.Read1(length, function (t, l) { - return oThis.ReadCT_Boolean(t, l, oNewVal); + return oThis.ReadCT_ValueAxisScaling(t, l, oNewVal); }); - if (null != oNewVal.m_val) - val.setVaryColors(oNewVal.m_val); + val.setValScaling(oNewVal); } - else if (c_oserct_linechartSER === type) { - var oNewVal = new AscFormat.CLineSeries(); + else if (c_oserct_chartExAxisTITLE === type) + { + var oNewVal = new AscFormat.CChartExTitle(); res = this.bcr.Read1(length, function (t, l) { - return oThis.ReadCT_LineSer(t, l, oNewVal); + return oThis.ReadCT_ChartExTitle(t, l, oNewVal); }); - val.addSer(oNewVal); - if(oNewVal.smooth === null){ - oNewVal.setSmooth(false); - } + val.setTitle(oNewVal); } - else if (c_oserct_linechartDLBLS === type) { - var oNewVal = new AscFormat.CDLbls(); - this.curChart.oDataLablesData = AscCommon.fSaveStream(this.bcr.stream, length); + else if (c_oserct_chartExAxisUNIT === type) + { + var oNewVal = new AscFormat.CAxisUnits(); res = this.bcr.Read1(length, function (t, l) { - return oThis.ReadCT_DLbls(t, l, oNewVal); + return oThis.ReadCT_AxisUnits(t, l, oNewVal); }); - oNewVal.correctValues(); - val.setDLbls(oNewVal); + val.setUnits(oNewVal); } - else if (c_oserct_linechartDROPLINES === type) { - var oNewVal = { spPr: null }; + else if (c_oserct_chartExAxisNUMFMT === type) + { + var oNewVal = new AscFormat.CNumFmt(); res = this.bcr.Read1(length, function (t, l) { - return oThis.ReadCT_ChartLines(t, l, oNewVal); + return oThis.ReadCT_ChartExNumFmt(t, l, oNewVal); }); - if (null != oNewVal.spPr) - val.setDropLines(oNewVal.spPr); - else - val.setDropLines(new AscFormat.CSpPr()); + val.setNumFmt(oNewVal); } - else if (c_oserct_linechartHILOWLINES === type) { - var oNewVal = { spPr: null }; + else if (c_oserct_chartExAxisMAJORTICK === type) + { + var oNewVal = new AscFormat.CTickMarks(); res = this.bcr.Read1(length, function (t, l) { - return oThis.ReadCT_ChartLines(t, l, oNewVal); + return oThis.ReadCT_TickMarks(t, l, oNewVal); }); - if (null != oNewVal.spPr) - val.setHiLowLines(oNewVal.spPr); - else - val.setHiLowLines(new AscFormat.CSpPr()); + val.setMajorTickMarks(oNewVal); } - else if (c_oserct_linechartUPDOWNBARS === type) { - var oNewVal = new AscFormat.CUpDownBars(); + else if (c_oserct_chartExAxisMINORTICK === type) + { + var oNewVal = new AscFormat.CTickMarks(); res = this.bcr.Read1(length, function (t, l) { - return oThis.ReadCT_UpDownBars(t, l, oNewVal); + return oThis.ReadCT_TickMarks(t, l, oNewVal); }); - val.setUpDownBars(oNewVal); + val.setMinorTickMarks(oNewVal); } - else if (c_oserct_linechartMARKER === type) { - var oNewVal = { m_val: null }; + else if (c_oserct_chartExAxisMAJORGRID === type) + { + var oNewVal = new AscFormat.CGridlines(); res = this.bcr.Read1(length, function (t, l) { - return oThis.ReadCT_Boolean(t, l, oNewVal); + return oThis.ReadCT_Gridlines(t, l, oNewVal); }); - if (null != oNewVal.m_val) - val.setMarker(oNewVal.m_val); + val.setMajorGridlines(oNewVal); } - else if (c_oserct_linechartSMOOTH === type) { - var oNewVal = { m_val: null }; + else if (c_oserct_chartExAxisMINORGRID === type) + { + var oNewVal = new AscFormat.CGridlines(); res = this.bcr.Read1(length, function (t, l) { - return oThis.ReadCT_Boolean(t, l, oNewVal); + return oThis.ReadCT_Gridlines(t, l, oNewVal); }); - if (null != oNewVal.m_val){ - val.setSmooth(oNewVal.m_val); - } - else{ - val.setSmooth(true); - } + val.setMinorGridlines(oNewVal); + } + else if (c_oserct_chartExAxisTICKLABELS === type) + { + val.setTickLabels(this.stream.GetBool()); + } + else if (c_oserct_chartExAxisTXPR === type) + { + val.setTxPr(this.ReadTxPr(length)); + val.txPr.setParent(val); + } + else if (c_oserct_chartExAxisSPPR === type) + { + val.setSpPr(this.ReadSpPr(length)); + val.spPr.setParent(val); + } + else + { + res = c_oSerConstants.ReadUnknown; } - else if (c_oserct_linechartAXID === type) { - var oNewVal = { m_val: null }; + return res; +}; +BinaryChartReader.prototype.ReadCT_ChartData = function (type, length, val) { + var res = c_oSerConstants.ReadOk; + var oThis = this; + var oNewVal; + if (c_oserct_chartExDATA === type) { + var oNewVal = new AscFormat.CData(); res = this.bcr.Read1(length, function (t, l) { - return oThis.ReadCT_UnsignedInt(t, l, oNewVal); + return oThis.ReadCT_Data(t, l, oNewVal); }); - if (null != oNewVal.m_val) - aChartWithAxis.push({ axisId: oNewVal.m_val, chart: val }); + val.addData(oNewVal); } - else if (c_oserct_linechartEXTLST === type) { - var oNewVal = {}; - res = this.bcr.Read1(length, function (t, l) { - return oThis.ReadCT_extLst(t, l, oNewVal); + else if (c_oserct_chartExEXTERNALDATA === type) + { + var oNewVal = new AscFormat.CExternalData(); + res = this.bcr.Read2(length, function (t, l) { + return oThis.ReadCT_ChartExExternalData(t, l, oNewVal); }); - // val.m_extLst = oNewVal; + val.setExternalData(oNewVal); } else + { res = c_oSerConstants.ReadUnknown; + } return res; }; -BinaryChartReader.prototype.ReadCT_Area3DChart = function (type, length, val, aChartWithAxis) { +BinaryChartReader.prototype.ReadCT_ChartExExternalData = function (type, length, val) { var res = c_oSerConstants.ReadOk; var oThis = this; - if (c_oserct_area3dchartGROUPING === type) { - var oNewVal = { m_val: null }; - res = this.bcr.Read1(length, function (t, l) { - return oThis.ReadCT_Grouping(t, l, oNewVal); - }); - if (null != oNewVal.m_val) - val.setGrouping(oNewVal.m_val); - } - else if (c_oserct_area3dchartVARYCOLORS === type) { - var oNewVal = { m_val: null }; + if (c_oserct_chartExExternalAUTOUPDATE === type) { + var oNewVal; + oNewVal = {}; res = this.bcr.Read1(length, function (t, l) { return oThis.ReadCT_Boolean(t, l, oNewVal); }); - if (null != oNewVal.m_val) - val.setVaryColors(oNewVal.m_val); + val.m_autoUpdate = oNewVal; } - else if (c_oserct_area3dchartSER === type) { - var oNewVal = new AscFormat.CAreaSeries(); + else + res = c_oSerConstants.ReadUnknown; + return res; +}; +BinaryChartReader.prototype.ReadCT_ChartEx = function (type, length, val) { + var res = c_oSerConstants.ReadOk; + var oThis = this; + var oNewVal; + if (c_oserct_chartExChartPLOTAREA === type) + { + var oNewVal = new AscFormat.CChartExPlotArea(); res = this.bcr.Read1(length, function (t, l) { - return oThis.ReadCT_AreaSer(t, l, oNewVal); + return oThis.ReadCT_ChartExPlotArea(t, l, oNewVal); }); - val.addSer(oNewVal); + val.setPlotArea(oNewVal); } - else if (c_oserct_area3dchartDLBLS === type) { - var oNewVal = new AscFormat.CDLbls(); - this.curChart.oDataLablesData = AscCommon.fSaveStream(this.bcr.stream, length); - res = this.bcr.Read1(length, function (t, l) { - return oThis.ReadCT_DLbls(t, l, oNewVal); + else if (c_oserct_chartExChartTITLE === type) + { + var oNewVal = new AscFormat.CChartExTitle(); + res = this.bcr.Read2(length, function (t, l) { + return oThis.ReadCT_ChartExTitle(t, l, oNewVal); }); - oNewVal.correctValues(); - val.setDLbls(oNewVal); + val.setTitle(oNewVal); } - else if (c_oserct_area3dchartDROPLINES === type) { - var oNewVal = { spPr: null }; - res = this.bcr.Read1(length, function (t, l) { - return oThis.ReadCT_ChartLines(t, l, oNewVal); + else if (c_oserct_chartExChartLEGEND === type) + { + var oNewVal = new AscFormat.CChartExLegend(); + res = this.bcr.Read2(length, function (t, l) { + return oThis.ReadCT_ChartExLegend(t, l, oNewVal); }); - if (null != oNewVal.spPr) - val.setDropLines(oNewVal.spPr); - else - val.setDropLines(new AscFormat.CSpPr()); + val.setLegend(oNewVal); } - else if (c_oserct_area3dchartGAPDEPTH === type) { - var oNewVal; - oNewVal = {}; - res = this.bcr.Read1(length, function (t, l) { - return oThis.ReadCT_GapAmount(t, l, oNewVal); - }); - //val.m_gapDepth = oNewVal; + else + { + res = c_oSerConstants.ReadUnknown; } - else if (c_oserct_area3dchartAXID === type) { - var oNewVal = { m_val: null }; + return res; +}; +BinaryChartReader.prototype.ReadCT_ChartExPlotArea = function (type, length, val) { + var res = c_oSerConstants.ReadOk; + var oThis = this; + var oNewVal; + if (c_oserct_chartExChartAREAREGION === type) + { + var oNewVal = new AscFormat.CPlotAreaRegion(); res = this.bcr.Read1(length, function (t, l) { - return oThis.ReadCT_UnsignedInt(t, l, oNewVal); + return oThis.ReadCT_ChartAreaRegion(t, l, oNewVal); }); - if (null != oNewVal.m_val) - aChartWithAxis.push({ axisId: oNewVal.m_val, chart: val }); + val.setPlotAreaRegion(oNewVal); } - else if (c_oserct_area3dchartEXTLST === type) { - var oNewVal = {}; + else if (c_oserct_chartExChartAXIS === type) { + var oNewVal = new AscFormat.CAxis(); res = this.bcr.Read1(length, function (t, l) { - return oThis.ReadCT_extLst(t, l, oNewVal); + return oThis.ReadCT_Axis(t, l, oNewVal); }); - // val.m_extLst = oNewVal; + val.addAxis(oNewVal); + } + else if (c_oserct_chartExChartSPPR === type) + { + val.setSpPr(this.ReadSpPr(length)); + val.spPr.setParent(val); } else + { res = c_oSerConstants.ReadUnknown; + } return res; }; -BinaryChartReader.prototype.ReadCT_AreaSer = function (type, length, val) { +BinaryChartReader.prototype.ReadCT_PlotAreaRegion = function (type, length, val) { var res = c_oSerConstants.ReadOk; var oThis = this; - if (c_oserct_areaserIDX === type) { - var oNewVal = { m_val: null }; + var oNewVal; + if (c_oserct_chartExAreaPLOTSURFACE === type) + { + var oNewVal = new AscFormat.CPlotSurface(); res = this.bcr.Read1(length, function (t, l) { - return oThis.ReadCT_UnsignedInt(t, l, oNewVal); + return oThis.ReadCT_PlotSurface(t, l, oNewVal); }); - if (null != oNewVal.m_val) - val.setIdx(oNewVal.m_val); + val.setPlotSurface(oNewVal); } - else if (c_oserct_areaserORDER === type) { - var oNewVal = { m_val: null }; + else if (c_oserct_chartExAreaSERIES === type) { + var oNewVal = new AscFormat.CSeries(); res = this.bcr.Read1(length, function (t, l) { - return oThis.ReadCT_UnsignedInt(t, l, oNewVal); + return oThis.ReadCT_Series(t, l, oNewVal); }); - if (null != oNewVal.m_val) - val.setOrder(oNewVal.m_val); + val.addSeries(oNewVal); } - else if (c_oserct_areaserTX === type) { - var oNewVal = new AscFormat.CTx(); - res = this.bcr.Read1(length, function (t, l) { - return oThis.ReadCT_SerTx(t, l, oNewVal); - }); - val.setTx(oNewVal); + else + { + res = c_oSerConstants.ReadUnknown; } - else if (c_oserct_areaserSPPR === type) { + return res; +}; +BinaryChartReader.prototype.ReadCT_PlotSurface = function (type, length, val) { + var res = c_oSerConstants.ReadOk; + var oThis = this; + var oNewVal; + if (c_oserct_chartExPlotSurfaceSPPR === type) + { val.setSpPr(this.ReadSpPr(length)); + val.spPr.setParent(val); } - else if (c_oserct_areaserPICTUREOPTIONS === type) { - var oNewVal = new AscFormat.CPictureOptions(); - res = this.bcr.Read1(length, function (t, l) { - return oThis.ReadCT_PictureOptions(t, l, oNewVal); - }); - val.setPictureOptions(oNewVal); + else + { + res = c_oSerConstants.ReadUnknown; } - else if (c_oserct_areaserDPT === type) { - var oNewVal = new AscFormat.CDPt(); + return res; +}; +BinaryChartReader.prototype.ReadCT_Series = function (type, length, val) { + var res = c_oSerConstants.ReadOk; + var oThis = this; + var oNewVal; + if (c_oserct_chartExSeriesDATAPT === type) { + var oNewVal = new AscFormat.CDataPoint(); res = this.bcr.Read1(length, function (t, l) { - return oThis.ReadCT_DPt(t, l, oNewVal); + return oThis.ReadCT_DataPoint(t, l, oNewVal); }); - val.addDPt(oNewVal); + val.addDataPt(oNewVal); } - else if (c_oserct_areaserDLBLS === type) { - var oNewVal = new AscFormat.CDLbls(); - res = this.bcr.Read1(length, function (t, l) { - return oThis.ReadCT_DLbls(t, l, oNewVal); + else if (c_oserct_chartExSeriesDATALABELS === type) + { + var oNewVal = new AscFormat.CDataLabels(); + res = this.bcr.Read2(length, function (t, l) { + return oThis.ReadCT_DataLabels(t, l, oNewVal); }); - oNewVal.correctValues(); - val.setDLbls(oNewVal); + val.setDataLabels(oNewVal); } - else if (c_oserct_areaserTRENDLINE === type) { - //todo array - var oNewVal = new AscFormat.CTrendLine(); - res = this.bcr.Read1(length, function (t, l) { - return oThis.ReadCT_Trendline(t, l, oNewVal); + else if (c_oserct_chartExSeriesLAYOUTPROPS === type) + { + var oNewVal = new AscFormat.CSeriesLayoutProperties(); + res = this.bcr.Read2(length, function (t, l) { + return oThis.ReadCT_SeriesLayoutProperties(t, l, oNewVal); }); - val.setTrendline(oNewVal); + val.setLayoutPr(oNewVal); } - else if (c_oserct_areaserERRBARS === type) { - //todo array - var oNewVal = new AscFormat.CErrBars(); - res = this.bcr.Read1(length, function (t, l) { - return oThis.ReadCT_ErrBars(t, l, oNewVal); - }); - val.setErrBars(oNewVal); + else if (c_oserct_chartExSeriesTEXT === type) + { + val.setTx(this.stream.GetDoubleLE()); } - else if (c_oserct_areaserCAT === type) { - var oNewVal = new AscFormat.CCat(); + else if (c_oserct_chartExSeriesAXIS === type) { + var oNewVal = new AscFormat.CAxis(); res = this.bcr.Read1(length, function (t, l) { - return oThis.ReadCT_AxDataSource(t, l, oNewVal); + return oThis.ReadCT_Axis(t, l, oNewVal); }); - val.setCat(oNewVal); + val.addAxisId(oNewVal); } - else if (c_oserct_areaserVAL === type) { - var oNewVal = new AscFormat.CYVal(); - res = this.bcr.Read1(length, function (t, l) { - return oThis.ReadCT_NumDataSource(t, l, oNewVal); - }); - val.setVal(oNewVal); + else if (c_oserct_chartExSeriesDATAID === type) + { + val.setTx(this.stream.GetDoubleLE()); } - else if (c_oserct_areaserEXTLST === type) { - var oNewVal = {}; - res = this.bcr.Read1(length, function (t, l) { - return oThis.ReadCT_extLst(t, l, oNewVal); - }); - // val.m_extLst = oNewVal; + else if (c_oserct_chartExSeriesSPPR === type) + { + val.setSpPr(this.ReadSpPr(length)); + val.spPr.setParent(val); } - else if(c_oserct_chartFiltering === type) { - res = this.bcr.Read1(length, function (t, l) { - return oThis.ReadCT_ChartFiltering(t, l, val); - }); + else if (c_oserct_chartExSeriesLAYOUTID === type) + { + val.setLayoutId(this.stream.GetUChar()); + } + else if (c_oserct_chartExSeriesHIDDEN === type) + { + val.setHidden(this.stream.GetBool()); + } + else if (c_oserct_chartExSeriesOWNERIDX === type) + { + val.setOwnerIdx(this.stream.GetULongLE()); + } + else if (c_oserct_chartExSeriesFORMATIDX === type) + { + val.setFormatIdx(this.stream.GetULongLE()); + } + else if (c_oserct_chartExSeriesUNIQUEID === type) + { + val.setUniqueId(this.stream.GetString2LE(length)); } else + { res = c_oSerConstants.ReadUnknown; + } return res; }; -BinaryChartReader.prototype.ReadCT_AreaChart = function (type, length, val, aChartWithAxis) { +BinaryChartReader.prototype.ReadCT_DataPoint = function (type, length, val) { var res = c_oSerConstants.ReadOk; var oThis = this; - if (c_oserct_areachartGROUPING === type) { - var oNewVal = { m_val: null }; - res = this.bcr.Read1(length, function (t, l) { - return oThis.ReadCT_Grouping(t, l, oNewVal); - }); - if (null != oNewVal.m_val) - val.setGrouping(oNewVal.m_val); + var oNewVal; + if (c_oserct_chartExDataPointIDX === type) + { + val.setId(this.stream.GetULongLE()); } - else if (c_oserct_areachartVARYCOLORS === type) { - var oNewVal = { m_val: null }; - res = this.bcr.Read1(length, function (t, l) { - return oThis.ReadCT_Boolean(t, l, oNewVal); - }); - if (null != oNewVal.m_val) - val.setVaryColors(oNewVal.m_val); + else if (c_oserct_chartExDataPointSPPR === type) + { + val.setSpPr(this.ReadSpPr(length)); + val.spPr.setParent(val); } - else if (c_oserct_areachartSER === type) { - var oNewVal = new AscFormat.CAreaSeries(); - res = this.bcr.Read1(length, function (t, l) { - return oThis.ReadCT_AreaSer(t, l, oNewVal); - }); - val.addSer(oNewVal); + else + { + res = c_oSerConstants.ReadUnknown; } - else if (c_oserct_areachartDLBLS === type) { - var oNewVal = new AscFormat.CDLbls(); - this.curChart.oDataLablesData = AscCommon.fSaveStream(this.bcr.stream, length); - res = this.bcr.Read1(length, function (t, l) { - return oThis.ReadCT_DLbls(t, l, oNewVal); + return res; +}; +BinaryChartReader.prototype.ReadCT_DataLabels = function (type, length, val) { + var res = c_oSerConstants.ReadOk; + var oThis = this; + var oNewVal; + if (c_oserct_chartExDataLabelsPOS === type) + { + val.setPos(this.stream.GetUChar()); + } + else if (c_oserct_chartExDataLabelsNUMFMT === type) + { + var oNewVal = new AscFormat.CNumFmt(); + res = this.bcr.Read2(length, function (t, l) { + return oThis.ReadCT_ChartExNumFmt(t, l, oNewVal); }); - oNewVal.correctValues(); - val.setDLbls(oNewVal); + val.setNumFmt(oNewVal); + } + else if (c_oserct_chartExDataLabelsTXPR === type) + { + val.setTxPr(this.ReadTxPr(length)); + val.txPr.setParent(val); + } + else if (c_oserct_chartExDataLabelsSPPR === type) + { + val.setSpPr(this.ReadSpPr(length)); + val.spPr.setParent(val); } - else if (c_oserct_areachartDROPLINES === type) { - var oNewVal = { spPr: null }; - res = this.bcr.Read1(length, function (t, l) { - return oThis.ReadCT_ChartLines(t, l, oNewVal); + else if (c_oserct_chartExDataLabelsVISABILITIES === type) + { + var oNewVal = new AscFormat.CDataLabelVisibilities(); + res = this.bcr.Read2(length, function (t, l) { + return oThis.ReadCT_DataLabelVisibilities(t, l, oNewVal); }); - if (null != oNewVal.spPr) - val.setDropLines(oNewVal.spPr); - else - val.setDropLines(new AscFormat.CSpPr()); + val.setVisibility(oNewVal); } - else if (c_oserct_areachartAXID === type) { - var oNewVal = { m_val: null }; + else if (c_oserct_chartExDataLabelsSEPARATOR === type) + { + val.setSeparator(this.stream.GetString2LE(length)); + } + else if (c_oserct_chartExDataLabelsDATALABEL === type) { + var oNewVal = new AscFormat.CDatalabel(); res = this.bcr.Read1(length, function (t, l) { - return oThis.ReadCT_UnsignedInt(t, l, oNewVal); + return oThis.ReadCT_Datalabel(t, l, oNewVal); }); - if (null != oNewVal.m_val) - aChartWithAxis.push({ axisId: oNewVal.m_val, chart: val }); + val.addDatalabel(oNewVal); } - else if (c_oserct_areachartEXTLST === type) { - var oNewVal = {}; + else if (c_oserct_chartExDataLabelsDATALABELHIDDEN === type) { + var oNewVal = new AscFormat.CDataLabelHidden(); res = this.bcr.Read1(length, function (t, l) { - return oThis.ReadCT_extLst(t, l, oNewVal); + return oThis.ReadCT_DataLabelHidden(t, l, oNewVal); }); - // val.m_extLst = oNewVal; + val.addDataLabelHidden(oNewVal); } else + { res = c_oSerConstants.ReadUnknown; + } return res; }; -BinaryChartReader.prototype.ReadCT_PlotArea = function (type, length, val, aChartWithAxis) { +BinaryChartReader.prototype.ReadCT_ChartExNumFmt = function (type, length, val) { var res = c_oSerConstants.ReadOk; var oThis = this; - if (c_oserct_plotareaLAYOUT === type) { - res = this.bcr.Read1(length, function (t, l) { - return oThis.ReadCT_Layout(t, l, val); - }); + var oNewVal; + if (c_oserct_chartExNumberFormatFORMATCODE === type) { + val.setFormatCode(this.stream.GetString2LE(length)); } - else if (c_oserct_plotareaAREA3DCHART === type) { - var oNewVal = new AscFormat.CAreaChart(); - res = this.bcr.Read1(length, function (t, l) { - return oThis.ReadCT_Area3DChart(t, l, oNewVal, aChartWithAxis); - }); - val.addChart(oNewVal); + else if (c_oserct_chartExNumberFormatSOURCELINKED === type) { + val.setSourceLinked(this.stream.GetBool()); } - else if (c_oserct_plotareaAREACHART === type) { - var oNewVal = new AscFormat.CAreaChart(); - res = this.bcr.Read1(length, function (t, l) { - return oThis.ReadCT_AreaChart(t, l, oNewVal, aChartWithAxis); - }); - val.addChart(oNewVal); + else + { + res = c_oSerConstants.ReadUnknown; } - else if (c_oserct_plotareaBAR3DCHART === type) { - var oNewVal = new AscFormat.CBarChart(); - res = this.bcr.Read1(length, function (t, l) { - return oThis.ReadCT_Bar3DChart(t, l, oNewVal, aChartWithAxis); - }); - oNewVal.set3D(true); - //3d->2d - /*if (AscFormat.BAR_GROUPING_STANDARD == oNewVal.grouping) - oNewVal.setGrouping(AscFormat.BAR_GROUPING_CLUSTERED); - else if(AscFormat.BAR_GROUPING_CLUSTERED != oNewVal.grouping){ - oNewVal.setOverlap(100); - }*/ - val.addChart(oNewVal); + return res; +}; +BinaryChartReader.prototype.ReadCT_DataLabel = function (type, length, val) { + var res = c_oSerConstants.ReadOk; + var oThis = this; + var oNewVal; + if (c_oserct_chartExDataLabelIDX === type) + { + val.setIdx(this.stream.GetULongLE()); } - else if (c_oserct_plotareaBARCHART === type) { - var oNewVal = new AscFormat.CBarChart(); - res = this.bcr.Read1(length, function (t, l) { - return oThis.ReadCT_BarChart(t, l, oNewVal, aChartWithAxis); - }); - val.addChart(oNewVal); + else if (c_oserct_chartExDataLabelPOS === type) + { + val.setPos(this.stream.GetUChar()); } - else if (c_oserct_plotareaBUBBLECHART === type) { - var oNewVal = new AscFormat.CBubbleChart(); - res = this.bcr.Read1(length, function (t, l) { - return oThis.ReadCT_BubbleChart(t, l, oNewVal, aChartWithAxis); + else if (c_oserct_chartExDataLabelNUMFMT === type) + { + var oNewVal = new AscFormat.CNumFmt(); + res = this.bcr.Read2(length, function (t, l) { + return oThis.ReadCT_ChartExNumFmt(t, l, oNewVal); }); - //bubble -> scatter - var scatter = oNewVal.convertToScutterChart(); - this.CorrectChartWithAxis(oNewVal, scatter, aChartWithAxis); - val.addChart(scatter); + val.setNumFmt(oNewVal); } - else if (c_oserct_plotareaDOUGHNUTCHART === type) { - var oNewVal = new AscFormat.CDoughnutChart(); - res = this.bcr.Read1(length, function (t, l) { - return oThis.ReadCT_DoughnutChart(t, l, oNewVal, aChartWithAxis); - }); - val.addChart(oNewVal); + else if (c_oserct_chartExDataLabelTXPR === type) + { + val.setTxPr(this.ReadTxPr(length)); + val.txPr.setParent(val); } - else if (c_oserct_plotareaLINE3DCHART === type) { - var oNewVal = new AscFormat.CLineChart(); - res = this.bcr.Read1(length, function (t, l) { - return oThis.ReadCT_Line3DChart(t, l, oNewVal, aChartWithAxis); - }); - oNewVal.convert3Dto2D(); - val.addChart(oNewVal); + else if (c_oserct_chartExDataLabelSPPR === type) + { + val.setSpPr(this.ReadSpPr(length)); + val.spPr.setParent(val); } - else if (c_oserct_plotareaLINECHART === type) { - var oNewVal = new AscFormat.CLineChart(); - res = this.bcr.Read1(length, function (t, l) { - return oThis.ReadCT_LineChart(t, l, oNewVal, aChartWithAxis); + else if (c_oserct_chartExDataLabelVISABILITIES === type) + { + var oNewVal = new AscFormat.CDataLabelVisibilities(); + res = this.bcr.Read2(length, function (t, l) { + return oThis.ReadCT_DataLabelVisibilities(t, l, oNewVal); }); - val.addChart(oNewVal); + val.setVisibility(oNewVal); } - else if (c_oserct_plotareaOFPIECHART === type) { - var oNewVal = new AscFormat.COfPieChart(); - res = this.bcr.Read1(length, function (t, l) { - return oThis.ReadCT_OfPieChart(t, l, oNewVal, aChartWithAxis); - }); - //ofPie -> pie - var pie = oNewVal.convertToPieChart(); - this.CorrectChartWithAxis(oNewVal, pie, aChartWithAxis); - val.addChart(pie); + else if (c_oserct_chartExDataLabelSEPARATOR === type) + { + val.setSeparator(this.stream.GetString2LE(length)); } - else if (c_oserct_plotareaPIE3DCHART === type) { - var oNewVal = new AscFormat.CPieChart(); - res = this.bcr.Read1(length, function (t, l) { - return oThis.ReadCT_Pie3DChart(t, l, oNewVal, aChartWithAxis); - }); - oNewVal.set3D(true); - //3d->2d - // oNewVal.setFirstSliceAng(0); - val.addChart(oNewVal); + else + { + res = c_oSerConstants.ReadUnknown; } - else if (c_oserct_plotareaPIECHART === type) { - var oNewVal = new AscFormat.CPieChart(); - res = this.bcr.Read1(length, function (t, l) { - return oThis.ReadCT_PieChart(t, l, oNewVal, aChartWithAxis); - }); - val.addChart(oNewVal); + return res; +}; +BinaryChartReader.prototype.ReadCT_DataLabelHidden = function (type, length, val) { + var res = c_oSerConstants.ReadOk; + var oThis = this; + var oNewVal; + if (c_oserct_chartExDataLabelHiddenIDX === type) + { + val.setIdx(this.stream.GetULongLE()); } - else if (c_oserct_plotareaRADARCHART === type) { - var oNewVal = new AscFormat.CRadarChart(); - res = this.bcr.Read1(length, function (t, l) { - return oThis.ReadCT_RadarChart(t, l, oNewVal, aChartWithAxis); - }); - //radar -> line - //var line = this.ConvertRadarToLine(oNewVal, aChartWithAxis); - val.addChart(oNewVal); + else + { + res = c_oSerConstants.ReadUnknown; } - else if (c_oserct_plotareaSCATTERCHART === type) { - var oNewVal = new AscFormat.CScatterChart(); + return res; +}; +BinaryChartReader.prototype.ReadCT_SeriesLayoutProperties = function (type, length, val) { + var res = c_oSerConstants.ReadOk; + var oThis = this; + var oNewVal; + if (c_oserct_chartExSeriesLayoutPARENT === type) + { + var oNewVal = new AscFormat.CParentLabelLayout(); res = this.bcr.Read1(length, function (t, l) { - return oThis.ReadCT_ScatterChart(t, l, oNewVal, aChartWithAxis); + return oThis.ReadCT_ParentLabelLayout(t, l, oNewVal); }); - val.addChart(oNewVal); + val.setParentLabelLayout(oNewVal); } - else if (c_oserct_plotareaSTOCKCHART === type) { - var oNewVal = new AscFormat.CStockChart(); - res = this.bcr.Read1(length, function (t, l) { - return oThis.ReadCT_StockChart(t, l, oNewVal, aChartWithAxis); + else if (c_oserct_chartExSeriesLayoutREGION === type) + { + var oNewVal = new AscFormat.CRegionLabelLayout(); + res = this.bcr.Read2(length, function (t, l) { + return oThis.ReadCT_RegionLabelLayout(t, l, oNewVal); }); - val.addChart(oNewVal); + val.setRegionLabelLayout(oNewVal); } - else if (c_oserct_plotareaSURFACE3DCHART === type) { - var oNewVal = new AscFormat.CSurfaceChart(); - res = this.bcr.Read1(length, function (t, l) { - return oThis.ReadCT_Surface3DChart(t, l, oNewVal, aChartWithAxis); + else if (c_oserct_chartExSeriesLayoutVISABILITIES === type) + { + var oNewVal = new AscFormat.CSeriesElementVisibilities(); + res = this.bcr.Read2(length, function (t, l) { + return oThis.ReadCT_SeriesElementVisibilities(t, l, oNewVal); }); - val.addChart(oNewVal); + val.setVisibility(oNewVal); } - else if (c_oserct_plotareaSURFACECHART === type) { - var oNewVal = new AscFormat.CSurfaceChart(); - res = this.bcr.Read1(length, function (t, l) { - return oThis.ReadCT_SurfaceChart(t, l, oNewVal, aChartWithAxis); - }); - val.addChart(oNewVal); + else if (c_oserct_chartExSeriesLayoutAGGREGATION === type) + { + val.setAggregation(this.stream.GetBool()); } - else if (c_oserct_plotareaCATAX === type) { - var oNewVal = new AscFormat.CCatAx(); - - this.curChart.oCatAxData = AscCommon.fSaveStream(this.bcr.stream, length); - res = this.bcr.Read1(length, function (t, l) { - return oThis.ReadCT_CatAx(t, l, oNewVal); + else if (c_oserct_chartExSeriesLayoutBINNING === type) + { + var oNewVal = new AscFormat.CBinning(); + res = this.bcr.Read2(length, function (t, l) { + return oThis.ReadCT_Binning(t, l, oNewVal); }); - val.addAxis(oNewVal); + val.setBinning(oNewVal); } - else if (c_oserct_plotareaDATEAX === type) { - var oNewVal = new AscFormat.CDateAx(); - res = this.bcr.Read1(length, function (t, l) { - return oThis.ReadCT_DateAx(t, l, oNewVal); + else if (c_oserct_chartExSeriesLayoutSTATISTIC === type) + { + var oNewVal = new AscFormat.CStatistics(); + res = this.bcr.Read2(length, function (t, l) { + return oThis.ReadCT_Statistics(t, l, oNewVal); }); - val.addAxis(oNewVal); + val.setStatistics(oNewVal); } - else if (c_oserct_plotareaSERAX === type) { - var oNewVal = new AscFormat.CSerAx(); - res = this.bcr.Read1(length, function (t, l) { - return oThis.ReadCT_SerAx(t, l, oNewVal); + else if (c_oserct_chartExSeriesLayoutSUBTOTALS === type) + { + var oNewVal = new AscFormat.CSubtotals(); + res = this.bcr.Read2(length, function (t, l) { + return oThis.ReadCT_Subtotals(t, l, oNewVal); }); - val.addAxis(oNewVal); + val.setSubtotals(oNewVal); } - else if (c_oserct_plotareaVALAX === type) { - this.curChart.oValAxData = AscCommon.fSaveStream(this.bcr.stream, length); - var oNewVal = new AscFormat.CValAx(); - res = this.bcr.Read1(length, function (t, l) { - return oThis.ReadCT_ValAx(t, l, oNewVal); - }); - val.addAxis(oNewVal); - //if(!AscFormat.isRealNumber(oNewVal.crossBetween)) - //{ - // oNewVal.setCrossBetween(AscFormat.CROSS_BETWEEN_BETWEEN); - //} + else + { + res = c_oSerConstants.ReadUnknown; + } + return res; +}; +BinaryChartReader.prototype.ReadCT_DataLabelVisibilities = function (type, length, val) { + var res = c_oSerConstants.ReadOk; + var oThis = this; + var oNewVal; + if (c_oserct_chartExDataLabelVisibilitiesSERIES === type) + { + val.setSeriesName(this.stream.GetBool()); + } + else if (c_oserct_chartExDataLabelVisibilitiesCATEGORY === type) + { + val.setCategoryName(this.stream.GetBool()); + } + else if (c_oserct_chartExDataLabelVisibilitiesVALUE === type) + { + val.setValue(this.stream.GetBool()); + } + else + { + res = c_oSerConstants.ReadUnknown; + } + return res; +}; +BinaryChartReader.prototype.ReadCT_Binning = function (type, length, val) { + var res = c_oSerConstants.ReadOk; + var oThis = this; + var oNewVal; + if (c_oserct_chartExBinningBINSIZE === type) + { + val.setBinSize(this.stream.GetDoubleLE()); + } + else if (c_oserct_chartExBinningBINCOUNT === type) + { + val.setBinCount(this.stream.GetULongLE()); + } + else if (c_oserct_chartExBinningINTERVAL === type) + { + val.setIntervalClosed(this.stream.GetUChar()); + } + else if (c_oserct_chartExBinningUNDERVAL === type) + { + val.setUnderflow(this.stream.GetDoubleLE()); + } + else if (c_oserct_chartExBinningUNDERAUTO === type) + { + val.setUnderflow(this.stream.GetUChar()); + } + else if (c_oserct_chartExBinningOVERVAL === type) + { + val.setOverflow(this.stream.GetDoubleLE()); + } + else if (c_oserct_chartExBinningOVERAUTO === type) + { + val.setOverflow(this.stream.GetUChar()); + } + else + { + res = c_oSerConstants.ReadUnknown; } - else if (c_oserct_plotareaDTABLE === type) { - var oNewVal = new AscFormat.CDTable(); + return res; +}; +BinaryChartReader.prototype.ReadCT_ChartExTitle = function (type, length, val) { + var res = c_oSerConstants.ReadOk; + var oThis = this; + var oNewVal; + if (c_oserct_chartExTitleTX === type) + { + var oNewVal = new AscFormat.CText(); res = this.bcr.Read1(length, function (t, l) { - return oThis.ReadCT_DTable(t, l, oNewVal); + return oThis.ReadCT_Text(t, l, oNewVal); }); - val.setDTable(oNewVal); + val.setTx(oNewVal); } - else if (c_oserct_plotareaSPPR === type) { + else if (c_oserct_chartExTitleTXPR === type) + { + val.setTxPr(this.ReadTxPr(length)); + val.txPr.setParent(val); + } + else if (c_oserct_chartExTitleSPPR === type) + { val.setSpPr(this.ReadSpPr(length)); + val.spPr.setParent(val); } - else if (c_oserct_plotareaEXTLST === type) { - var oNewVal = {}; - res = this.bcr.Read1(length, function (t, l) { - return oThis.ReadCT_extLst(t, l, oNewVal); - }); - // val.m_extLst = oNewVal; + else if (c_oserct_chartExTitlePOS === type) + { + val.setPos(this.stream.GetUChar()); } - else if (c_oserct_plotareaPLOTAREAREGION === type) { - var oNewVal = {}; - res = this.bcr.Read1(length, function (t, l) { - return oThis.ReadCT_PlotAreaRegion(t, l, oNewVal); // todoo this class - }); + else if (c_oserct_chartExTitleALIGN === type) + { + val.setAlign(this.stream.GetUChar()); + } + else if (c_oserct_chartExTitleOVERLAY === type) + { + val.setOverlay(this.stream.GetBool()); } else + { res = c_oSerConstants.ReadUnknown; + } return res; }; -BinaryChartReader.prototype.ReadCT_Thickness = function (type, length, val) { +BinaryChartReader.prototype.ReadCT_ChartExLegend = function (type, length, val) { var res = c_oSerConstants.ReadOk; var oThis = this; - if (c_oserct_thicknessVAL === type) { - val.m_val = this.ParsePersent(this.stream.GetString2LE(length)); + var oNewVal; + if (c_oserct_chartExLegendTXPR === type) + { + val.setTxPr(this.ReadTxPr(length)); + val.txPr.setParent(val); + } + else if (c_oserct_chartExLegendSPPR === type) + { + val.setSpPr(this.ReadSpPr(length)); + val.spPr.setParent(val); + } + else if (c_oserct_chartExLegendPOS === type) + { + val.setPos(this.stream.GetUChar()); + } + else if (c_oserct_chartExLegendALIGN === type) + { + val.setAlign(this.stream.GetUChar()); + } + else if (c_oserct_chartExLegendOVERLAY === type) + { + val.setOverlay(this.stream.GetBool()); } else + { res = c_oSerConstants.ReadUnknown; + } return res; }; -BinaryChartReader.prototype.ReadCT_Surface = function (type, length, val) { +BinaryChartReader.prototype.ReadCT_Text = function (type, length, val) { var res = c_oSerConstants.ReadOk; var oThis = this; - if (c_oserct_surfaceTHICKNESS === type) { - var oNewVal = { m_val: null }; - res = this.bcr.Read1(length, function (t, l) { - return oThis.ReadCT_Thickness(t, l, oNewVal); - }); - if (null != oNewVal.m_val) - val.setThickness(oNewVal.m_val); - } - else if (c_oserct_surfaceSPPR === type) { - val.setSpPr(this.ReadSpPr(length)); - } - else if (c_oserct_surfacePICTUREOPTIONS === type) { - var oNewVal = new AscFormat.CPictureOptions(); + var oNewVal; + if (c_oserct_chartExTextRICH === type) + { + var oNewVal = new AscFormat.CTextBody(); res = this.bcr.Read1(length, function (t, l) { - return oThis.ReadCT_PictureOptions(t, l, oNewVal); + return oThis.ReadCT_TextBody(t, l, oNewVal); }); - val.setPictureOptions(oNewVal); + val.setRich(oNewVal); } - else if (c_oserct_surfaceEXTLST === type) { - var oNewVal = {}; - res = this.bcr.Read1(length, function (t, l) { - return oThis.ReadCT_extLst(t, l, oNewVal); + else if (c_oserct_chartExTextDATA === type) + { + var oNewVal = new AscFormat.CTextData(); + res = this.bcr.Read2(length, function (t, l) { + return oThis.ReadCT_TextData(t, l, oNewVal); }); - // val.m_extLst = oNewVal; + val.setTxData(oNewVal); } else + { res = c_oSerConstants.ReadUnknown; + } return res; }; -BinaryChartReader.prototype.ReadCT_Perspective = function (type, length, val) { +BinaryChartReader.prototype.ReadCT_TextData = function (type, length, val) { var res = c_oSerConstants.ReadOk; var oThis = this; - if (c_oserct_perspectiveVAL === type) { - var oNewVal; - oNewVal = this.stream.GetUChar(); - val.m_val = oNewVal; + var oNewVal; + if (c_oserct_chartExTextDataFORMULA === type) + { + var oNewVal = new AscFormat.CFormula(); + res = this.bcr.Read1(length, function (t, l) { + return oThis.ReadCT_Formula(t, l, oNewVal); + }); + val.setF(oNewVal); + } + else if (c_oserct_chartExTextDataVALUE === type) + { + val.setV(this.stream.GetString2LE(length)); } else + { res = c_oSerConstants.ReadUnknown; + } return res; }; -BinaryChartReader.prototype.ReadCT_DepthPercent = function (type, length, val) { +BinaryChartReader.prototype.ReadCT_Data = function (type, length, val) { var res = c_oSerConstants.ReadOk; var oThis = this; - if (c_oserct_depthpercentVAL === type) { - var oNewVal; - oNewVal = this.stream.GetString2LE(length); - val.m_val = oNewVal; + var oNewVal; + if (c_oserct_chartExDataID === type) + { + val.setId(this.stream.GetULongLE()); + } + else if (c_oserct_chartExDataSTRDIMENSION === type) + { + var oNewVal = new AscFormat.CStringDimension(); + res = this.bcr.Read1(length, function (t, l) { + return oThis.ReadCT_StringDimension(t, l, oNewVal); + }); + val.addDimension(oNewVal); + } + else if (c_oserct_chartExDataNUMDIMENSION === type) + { + var oNewVal = new AscFormat.CNumericDimension(); + res = this.bcr.Read1(length, function (t, l) { + return oThis.ReadCT_NumericDimension(t, l, oNewVal); + }); + val.addDimension(oNewVal); } else + { res = c_oSerConstants.ReadUnknown; + } return res; }; -BinaryChartReader.prototype.ReadCT_RotY = function (type, length, val) { +BinaryChartReader.prototype.ReadCT_Subtotals = function (type, length, val) { var res = c_oSerConstants.ReadOk; var oThis = this; - if (c_oserct_rotyVAL === type) { - var oNewVal; - oNewVal = this.stream.GetULongLE(); - val.m_val = oNewVal; + var oNewVal; + if (c_oserct_chartExSubtotalsIDX === type) + { + val.addIdx(this.stream.GetULongLE()); } else + { res = c_oSerConstants.ReadUnknown; + } return res; }; -BinaryChartReader.prototype.ReadCT_HPercent = function (type, length, val) { +BinaryChartReader.prototype.ReadCT_SeriesElementVisibilities = function (type, length, val) { var res = c_oSerConstants.ReadOk; var oThis = this; - if (c_oserct_hpercentVAL === type) { - val.m_val = this.ParsePersent(this.stream.GetString2LE(length)); + var oNewVal; + if (c_oserct_chartExSeriesVisibilitiesCONNECTOR === type) + { + val.setConnectorLines(this.stream.GetBool()); + } + else if (c_oserct_chartExSeriesVisibilitiesMEANLINE === type) + { + val.setMeanLine(this.stream.GetBool()); + } + else if (c_oserct_chartExSeriesVisibilitiesMEANMARKER === type) + { + val.setMeanMarker(this.stream.GetBool()); + } + else if (c_oserct_chartExSeriesVisibilitiesNONOUTLIERS === type) + { + val.setNonoutliers(this.stream.GetBool()); + } + else if (c_oserct_chartExSeriesVisibilitiesOUTLIERS === type) + { + val.setOutliers(this.stream.GetBool()); } else + { res = c_oSerConstants.ReadUnknown; + } return res; }; -BinaryChartReader.prototype.ReadCT_RotX = function (type, length, val) { +BinaryChartReader.prototype.ReadCT_CategoryAxisScaling = function (type, length, val) { var res = c_oSerConstants.ReadOk; var oThis = this; - if (c_oserct_rotxVAL === type) { - var oNewVal; - oNewVal = this.stream.GetChar(); - val.m_val = oNewVal; + var oNewVal; + if (c_oserct_chartExCatScalingGAPVAL === type) + { + val.setGapWidth(this.stream.GetDoubleLE()); + } + else if (c_oserct_chartExCatScalingGAPAUTO === type) + { + val.setGapWidth(this.stream.GetUChar()); } else + { res = c_oSerConstants.ReadUnknown; + } return res; }; -BinaryChartReader.prototype.ReadCT_View3D = function (type, length, val) { +BinaryChartReader.prototype.ReadCT_ValueAxisScaling = function (type, length, val) { var res = c_oSerConstants.ReadOk; var oThis = this; - if (c_oserct_view3dROTX === type) { - var oNewVal = { m_val: null }; - res = this.bcr.Read1(length, function (t, l) { - return oThis.ReadCT_RotX(t, l, oNewVal); - }); - if (null != oNewVal.m_val) - val.setRotX(oNewVal.m_val); + var oNewVal; + if (c_oserct_chartExValScalingMAXAUTO === type) + { + val.setMax(this.stream.GetUChar()); } - else if (c_oserct_view3dHPERCENT === type) { - var oNewVal = { m_val: null }; - res = this.bcr.Read1(length, function (t, l) { - return oThis.ReadCT_HPercent(t, l, oNewVal); - }); - if (null != oNewVal.m_val) - val.setHPercent(oNewVal.m_val); + else if (c_oserct_chartExValScalingMAXVAL === type) + { + val.setMax(this.stream.GetDoubleLE()); } - else if (c_oserct_view3dROTY === type) { - var oNewVal = { m_val: null }; - res = this.bcr.Read1(length, function (t, l) { - return oThis.ReadCT_RotY(t, l, oNewVal); - }); - if (null != oNewVal.m_val) - val.setRotY(oNewVal.m_val); + else if (c_oserct_chartExValScalingMINAUTO === type) + { + val.setMin(this.stream.GetUChar()); } - else if (c_oserct_view3dDEPTHPERCENT === type) { - var oNewVal = { m_val: null }; - res = this.bcr.Read1(length, function (t, l) { - return oThis.ReadCT_DepthPercent(t, l, oNewVal); - }); - if (null != oNewVal.m_val){ - var nPercent = parseInt(oNewVal.m_val) - if(AscFormat.isRealNumber(nPercent)){ - val.setDepthPercent(nPercent); - } - } + else if (c_oserct_chartExValScalingMINVAL === type) + { + val.setMin(this.stream.GetDoubleLE()); } - else if (c_oserct_view3dRANGAX === type) { - var oNewVal = { m_val: null }; - res = this.bcr.Read1(length, function (t, l) { - return oThis.ReadCT_Boolean(t, l, oNewVal); - }); - if (null != oNewVal.m_val) - val.setRAngAx(oNewVal.m_val); + else if (c_oserct_chartExValScalingMAJUNITAUTO === type) + { + val.setMajorUnit(this.stream.GetUChar()); } - else if (c_oserct_view3dPERSPECTIVE === type) { - var oNewVal = { m_val: null }; - res = this.bcr.Read1(length, function (t, l) { - return oThis.ReadCT_Perspective(t, l, oNewVal); - }); - if (null != oNewVal.m_val) - val.setPerspective(oNewVal.m_val); + else if (c_oserct_chartExValScalingMAJUNITVAL === type) + { + val.setMajorUnit(this.stream.GetDoubleLE()); } - else if (c_oserct_view3dEXTLST === type) { - var oNewVal = {}; - res = this.bcr.Read1(length, function (t, l) { - return oThis.ReadCT_extLst(t, l, oNewVal); - }); - // val.m_extLst = oNewVal; + else if (c_oserct_chartExValScalingMINUNITAUTO === type) + { + val.setMinorUnit(this.stream.GetUChar()); + } + else if (c_oserct_chartExValScalingMINUNITVAL === type) + { + val.setMinorUnit(this.stream.GetDoubleLE()); } else + { res = c_oSerConstants.ReadUnknown; + } return res; }; -BinaryChartReader.prototype.ReadCT_PivotFmt = function (type, length, val) { +BinaryChartReader.prototype.ReadCT_AxisUnits = function (type, length, val) { var res = c_oSerConstants.ReadOk; var oThis = this; - if (c_oserct_pivotfmtIDX === type) { - var oNewVal = { m_val: null }; + var oNewVal; + if (c_oserct_chartExAxisUnitLABEL === type) + { + var oNewVal = new AscFormat.CAxisUnitsLabel(); res = this.bcr.Read1(length, function (t, l) { - return oThis.ReadCT_UnsignedInt(t, l, oNewVal); + return oThis.ReadCT_AxisUnitsLabel(t, l, oNewVal); }); - if (null != oNewVal.m_val) - val.setIdx(oNewVal.m_val); - } - else if (c_oserct_pivotfmtSPPR === type) { - val.setSpPr(this.ReadSpPr(length)); + val.setUnitsLabel(oNewVal); } - else if (c_oserct_pivotfmtTXPR === type) { - val.setTxPr(this.ReadTxPr(length)); - val.txPr.setParent(val); - } - else if (c_oserct_pivotfmtMARKER === type) { - var oNewVal = new AscFormat.CMarker(); - res = this.bcr.Read1(length, function (t, l) { - return oThis.ReadCT_Marker(t, l, oNewVal); - }); - val.setMarker(oNewVal); + else if (c_oserct_chartExAxisUnitTYPE === type) + { + val.setUnit(this.stream.GetUChar()); } - else if (c_oserct_pivotfmtDLBL === type) { - var oNewVal = new AscFormat.CDLbl(); - res = this.bcr.Read1(length, function (t, l) { - return oThis.ReadCT_DLbl(t, l, oNewVal); - }); - oNewVal.correctValues(); - val.setLbl(oNewVal); + else + { + res = c_oSerConstants.ReadUnknown; } - else if (c_oserct_pivotfmtEXTLST === type) { - var oNewVal = {}; + return res; +}; +BinaryChartReader.prototype.ReadCT_AxisUnitsLabel = function (type, length, val) { + var res = c_oSerConstants.ReadOk; + var oThis = this; + var oNewVal; + if (c_oserct_chartExAxisUnitsLabelTEXT === type) + { + var oNewVal = new AscFormat.CText(); res = this.bcr.Read1(length, function (t, l) { - return oThis.ReadCT_extLst(t, l, oNewVal); + return oThis.ReadCT_Text(t, l, oNewVal); }); - // val.m_extLst = oNewVal; + val.setTx(oNewVal); + } + else if (c_oserct_chartExAxisUnitsLabelSPPR === type) + { + val.setSpPr(this.ReadSpPr(length)); + val.spPr.setParent(val); + } + else if (c_oserct_chartExAxisUnitsLabelTXPR === type) + { + val.setTxPr(this.ReadTxPr(length)); + val.txPr.setParent(val); } else + { res = c_oSerConstants.ReadUnknown; + } return res; }; -BinaryChartReader.prototype.ReadCT_pivotFmts = function (type, length, val) { +BinaryChartReader.prototype.ReadCT_TickMarks = function (type, length, val) { var res = c_oSerConstants.ReadOk; var oThis = this; - if (c_oserct_pivotfmtsPIVOTFMT === type) { - var oNewVal = new AscFormat.CPivotFmt(); - res = this.bcr.Read1(length, function (t, l) { - return oThis.ReadCT_PivotFmt(t, l, oNewVal); - }); - val.setPivotFmts(oNewVal); + var oNewVal; + if (c_oserct_chartExTickMarksTYPE === type) + { + val.setType(this.stream.GetUChar()); } else + { res = c_oSerConstants.ReadUnknown; + } return res; }; -BinaryChartReader.prototype.ReadCT_Chart = function (type, length, val) { +BinaryChartReader.prototype.ReadCT_Gridlines = function (type, length, val) { var res = c_oSerConstants.ReadOk; var oThis = this; - if (c_oserct_chartTITLE === type) { - var oNewVal = new AscFormat.CTitle(); - res = this.bcr.Read1(length, function (t, l) { - return oThis.ReadCT_Title(t, l, oNewVal); - }); - val.setTitle(oNewVal); + var oNewVal; + if (c_oserct_chartExGridlinesSPPR === type) + { + val.setSpPr(this.ReadSpPr(length)); + val.spPr.setParent(val); } - else if (c_oserct_chartAUTOTITLEDELETED === type) { - var oNewVal = { m_val: null }; - res = this.bcr.Read1(length, function (t, l) { - return oThis.ReadCT_Boolean(t, l, oNewVal); - }); - if (null != oNewVal.m_val) - val.setAutoTitleDeleted(oNewVal.m_val); - else - val.setAutoTitleDeleted(true); + else + { + res = c_oSerConstants.ReadUnknown; } - else if (c_oserct_chartPIVOTFMTS === type) { - res = this.bcr.Read1(length, function (t, l) { - return oThis.ReadCT_pivotFmts(t, l, val); - }); + return res; +}; +BinaryChartReader.prototype.ReadCT_Statistics = function (type, length, val) { + var res = c_oSerConstants.ReadOk; + var oThis = this; + var oNewVal; + if (c_oserct_chartExStatisticsMETHOD === type) + { + val.setQuartileMethod(this.stream.GetUChar()); } - else if (c_oserct_chartVIEW3D === type) { - var oNewVal = new AscFormat.CView3d(); - - this.curChart.oView3DData = AscCommon.fSaveStream(this.bcr.stream, length); - res = this.bcr.Read1(length, function (t, l) { - return oThis.ReadCT_View3D(t, l, oNewVal); - }); - val.setView3D(oNewVal); + else + { + res = c_oSerConstants.ReadUnknown; } - else if (c_oserct_chartFLOOR === type) { - var oNewVal = new AscFormat.CChartWall(); - res = this.bcr.Read1(length, function (t, l) { - return oThis.ReadCT_Surface(t, l, oNewVal); - }); - val.setFloor(oNewVal); + return res; +}; +BinaryChartReader.prototype.ReadCT_StringDimension = function (type, length, val) { + var res = c_oSerConstants.ReadOk; + var oThis = this; + var oNewVal; + if (c_oserct_chartExDataDimensionTYPE === type) + { + var oNewVal = new AscFormat.CDimensionType(); + oNewVal.setDimensionType(this.stream.GetUChar()); + val.addLevelData(oNewVal); } - else if (c_oserct_chartSIDEWALL === type) { - var oNewVal = new AscFormat.CChartWall(); - res = this.bcr.Read1(length, function (t, l) { - return oThis.ReadCT_Surface(t, l, oNewVal); + else if (c_oserct_chartExDataDimensionFORMULA === type) + { + var oNewVal = new AscFormat.CFormula(); + res = this.bcr.Read2(length, function (t, l) { + return oThis.ReadCT_Formula(t, l, oNewVal); }); - val.setSideWall(oNewVal); + val.setF(oNewVal); } - else if (c_oserct_chartBACKWALL === type) { - var oNewVal = new AscFormat.CChartWall(); - res = this.bcr.Read1(length, function (t, l) { - return oThis.ReadCT_Surface(t, l, oNewVal); - }); - val.setBackWall(oNewVal); + else if (c_oserct_chartExDataDimensionNF === type) + { + val.setNf(this.stream.GetString2LE(length)); } - else if (c_oserct_chartPLOTAREA === type) { - var oNewVal = new AscFormat.CPlotArea(); - var aChartWithAxis = []; + else if (c_oserct_chartExDataDimensionSTRINGLEVEL === type) + { + var oNewVal = new AscFormat.CStringLevel(); res = this.bcr.Read1(length, function (t, l) { - return oThis.ReadCT_PlotArea(t, l, oNewVal, aChartWithAxis); + return oThis.ReadCT_StringLevel(t, l, oNewVal); }); - oNewVal.initPostOpen(aChartWithAxis); - val.setPlotArea(oNewVal); + val.addLevelData(oNewVal); } - else if (c_oserct_chartLEGEND === type) { - this.curChart.oLegendData = AscCommon.fSaveStream(this.bcr.stream, length); - var oNewVal = new AscFormat.CLegend(); - res = this.bcr.Read1(length, function (t, l) { - return oThis.ReadCT_Legend(t, l, oNewVal); - }); - oNewVal.updateLegendPos(); - val.setLegend(oNewVal); + else + { + res = c_oSerConstants.ReadUnknown; } - else if (c_oserct_chartPLOTVISONLY === type) { - var oNewVal = { m_val: null }; - res = this.bcr.Read1(length, function (t, l) { - return oThis.ReadCT_Boolean(t, l, oNewVal); - }); - if (null != oNewVal.m_val) - val.setPlotVisOnly(oNewVal.m_val); + return res; +}; +BinaryChartReader.prototype.ReadCT_NumericDimension = function (type, length, val) { + var res = c_oSerConstants.ReadOk; + var oThis = this; + var oNewVal; + if (c_oserct_chartExDataDimensionTYPE === type) + { + var oNewVal = new AscFormat.CDimensionType(); + oNewVal.setDimensionType(this.stream.GetUChar()); + val.addLevelData(oNewVal); } - else if (c_oserct_chartDISPBLANKSAS === type) { - var oNewVal = { m_val: null }; - res = this.bcr.Read1(length, function (t, l) { - return oThis.ReadCT_DispBlanksAs(t, l, oNewVal); + else if (c_oserct_chartExDataDimensionFORMULA === type) + { + var oNewVal = new AscFormat.CFormula(); + res = this.bcr.Read2(length, function (t, l) { + return oThis.ReadCT_Formula(t, l, oNewVal); }); - if (null != oNewVal.m_val) - val.setDispBlanksAs(oNewVal.m_val); + val.setF(oNewVal); } - else if (c_oserct_chartSHOWDLBLSOVERMAX === type) { - var oNewVal = { m_val: null }; - res = this.bcr.Read1(length, function (t, l) { - return oThis.ReadCT_Boolean(t, l, oNewVal); - }); - if (null != oNewVal.m_val) - val.setShowDLblsOverMax(oNewVal.m_val); - else - val.setShowDLblsOverMax(true); + else if (c_oserct_chartExDataDimensionNF === type) + { + val.setNf(this.stream.GetString2LE(length)); } - else if (c_oserct_chartEXTLST === type) { - var oNewVal = {}; + else if (c_oserct_chartExDataDimensionNUMERICLEVEL === type) + { + var oNewVal = new AscFormat.CNumericLevel(); res = this.bcr.Read1(length, function (t, l) { - return oThis.ReadCT_extLst(t, l, oNewVal); + return oThis.ReadCT_NumericLevel(t, l, oNewVal); }); - // val.m_extLst = oNewVal; + val.addLevelData(oNewVal); } else + { res = c_oSerConstants.ReadUnknown; + } return res; }; -BinaryChartReader.prototype.ReadCT_Protection = function (type, length, val) { +BinaryChartReader.prototype.ReadCT_Formula = function (type, length, val) { var res = c_oSerConstants.ReadOk; var oThis = this; - if (c_oserct_protectionCHARTOBJECT === type) { - var oNewVal = { m_val: null }; - res = this.bcr.Read1(length, function (t, l) { - return oThis.ReadCT_Boolean(t, l, oNewVal); - }); - if (null != oNewVal.m_val) - val.setChartObject(oNewVal.m_val); - } - else if (c_oserct_protectionDATA === type) { - var oNewVal = { m_val: null }; - res = this.bcr.Read1(length, function (t, l) { - return oThis.ReadCT_Boolean(t, l, oNewVal); - }); - if (null != oNewVal.m_val) - val.setData(oNewVal.m_val); - } - else if (c_oserct_protectionFORMATTING === type) { - var oNewVal = { m_val: null }; - res = this.bcr.Read1(length, function (t, l) { - return oThis.ReadCT_Boolean(t, l, oNewVal); - }); - if (null != oNewVal.m_val) - val.setFormatting(oNewVal.m_val); - } - else if (c_oserct_protectionSELECTION === type) { - var oNewVal = { m_val: null }; - res = this.bcr.Read1(length, function (t, l) { - return oThis.ReadCT_Boolean(t, l, oNewVal); - }); - if (null != oNewVal.m_val) - val.setSelection(oNewVal.m_val); + var oNewVal; + if (c_oserct_chartExFormulaCONTENT === type) + { + val.setContent(this.stream.GetString2LE(length)); } - else if (c_oserct_protectionUSERINTERFACE === type) { - var oNewVal = { m_val: null }; - res = this.bcr.Read1(length, function (t, l) { - return oThis.ReadCT_Boolean(t, l, oNewVal); - }); - if (null != oNewVal.m_val) - val.setUserInterface(oNewVal.m_val); + else if (c_oserct_chartExFormulaDIRECTION === type) + { + val.setDir(this.stream.GetUChar()); } else + { res = c_oSerConstants.ReadUnknown; + } return res; }; -BinaryChartReader.prototype.ReadCT_PivotSource = function (type, length, val) { +BinaryChartReader.prototype.ReadCT_StringLevel = function (type, length, val) { var res = c_oSerConstants.ReadOk; var oThis = this; - if (c_oserct_pivotsourceNAME === type) { + var oNewVal; + if (c_oserct_chartExDataLevelNAME === type) + { val.setName(this.stream.GetString2LE(length)); } - else if (c_oserct_pivotsourceFMTID === type) { - var oNewVal = { m_val: null }; - res = this.bcr.Read1(length, function (t, l) { - return oThis.ReadCT_UnsignedInt(t, l, oNewVal); - }); - if (null != oNewVal.m_val) - val.setFmtId(oNewVal.m_val); + else if (c_oserct_chartExDataLevelCOUNT === type) + { + val.setPtCount(this.stream.GetULongLE()); } - else if (c_oserct_pivotsourceEXTLST === type) { - var oNewVal = {}; - res = this.bcr.Read1(length, function (t, l) { - return oThis.ReadCT_extLst(t, l, oNewVal); + else if (c_oserct_chartExDataLevelPT === type) + { + var oNewVal = new AscFormat.CStringValue(); + res = this.bcr.Read2(length, function (t, l) { + return oThis.ReadCT_StringValue(t, l, oNewVal); }); - // if (null == val.m_extLst) - // val.m_extLst = []; - // val.m_extLst.push(oNewVal); + val.addPt(oNewVal); } else + { res = c_oSerConstants.ReadUnknown; + } return res; }; -BinaryChartReader.prototype.ReadCT_Style1 = function (type, length, val) { +BinaryChartReader.prototype.ReadCT_NumericLevel = function (type, length, val) { var res = c_oSerConstants.ReadOk; var oThis = this; - if (c_oserct_style1VAL === type) { - var oNewVal; - oNewVal = this.stream.GetUChar(); - val.m_val = oNewVal; + var oNewVal; + if (c_oserct_chartExDataLevelNAME === type) + { + val.setName(this.stream.GetString2LE(length)); + } + else if (c_oserct_chartExDataLevelCOUNT === type) + { + val.setPtCount(this.stream.GetULongLE()); + } + else if (c_oserct_chartExDataLevelPT === type) + { + var oNewVal = new AscFormat.CNumericValue(); + res = this.bcr.Read2(length, function (t, l) { + return oThis.ReadCT_NumericValue(t, l, oNewVal); + }); + val.addPt(oNewVal); + } + else if (c_oserct_chartExDataLevelFORMATCODE === type) + { + val.setFormatCode(this.stream.GetString2LE(length)); } else + { res = c_oSerConstants.ReadUnknown; + } return res; }; -BinaryChartReader.prototype.ReadCT_Style = function (type, length, val) { +BinaryChartReader.prototype.ReadCT_StringValue = function (type, length, val) { var res = c_oSerConstants.ReadOk; var oThis = this; - if (c_oserct_styleVAL === type) { - var oNewVal; - oNewVal = this.stream.GetUChar(); - val.m_val = oNewVal; + var oNewVal; + if (c_oserct_chartExDataValueIDX === type) + { + val.setIdx(this.stream.GetULongLE()); + } + else if (c_oserct_chartExDataValueCONTENT === type) + { + val.setContent(this.stream.GetString2LE(length)); } else + { res = c_oSerConstants.ReadUnknown; + } return res; }; -BinaryChartReader.prototype.ReadCT_TextLanguageID = function (type, length, val) { +BinaryChartReader.prototype.ReadCT_NumericValue = function (type, length, val) { var res = c_oSerConstants.ReadOk; var oThis = this; - if (c_oserct_textlanguageidVAL === type) { - var oNewVal; - oNewVal = this.stream.GetString2LE(length); - val.m_val = oNewVal; + var oNewVal; + if (c_oserct_chartExDataValueIDX === type) + { + val.setIdx(this.stream.GetULongLE()); + } + else if (c_oserct_chartExDataValueCONTENT === type) + { + val.setContent(this.stream.GetDoubleLE()); } else + { res = c_oSerConstants.ReadUnknown; + } return res; }; BinaryChartReader.prototype.ReadAlternateContent = function (type, length, val) { diff --git a/common/tempSerializeChart.js b/common/tempSerializeChart.js deleted file mode 100644 index 7ffb1e5f41..0000000000 --- a/common/tempSerializeChart.js +++ /dev/null @@ -1,2409 +0,0 @@ - -// // CAddress (unused) -// var c_oserct_addressADDRESS1 = 0; -// var c_oserct_addressCOUTNRYREGION = 1; -// var c_oserct_addressADMINDISTRICT1 = 2; -// var c_oserct_addressADMINDISTRICT2 = 3; -// var c_oserct_addressPOSTALCODE = 4; -// var c_oserct_addressLOCALITY = 5; -// var c_oserct_addressISOCOUTRYCODE = 6; - -// BinaryChartWriter.prototype.WriteCT_Address = function (oVal) { -// var oThis = this; -// if(oVal.address1 !== null) { -// this.bs.WriteItem(c_oserct_addressADDRESS1, function() { -// oThis.memory.WriteString3(oVal.address1); -// }); -// } -// if(oVal.countryRegion !== null) { -// this.bs.WriteItem(c_oserct_addressCOUTNRYREGION, function() { -// oThis.memory.WriteString3(oVal.countryRegion); -// }); -// } -// if(oVal.adminDistrict1 !== null) { -// this.bs.WriteItem(c_oserct_addressADMINDISTRICT1, function() { -// oThis.memory.WriteString3(oVal.adminDistrict1); -// }); -// } -// if(oVal.adminDistrict2 !== null) { -// this.bs.WriteItem(c_oserct_addressADMINDISTRICT2, function() { -// oThis.memory.WriteString3(oVal.adminDistrict2); -// }); -// } -// if(oVal.postalCode !== null) { -// this.bs.WriteItem(c_oserct_addressPOSTALCODE, function() { -// oThis.memory.WriteString3(oVal.postalCode); -// }); -// } -// if(oVal.locality !== null) { -// this.bs.WriteItem(c_oserct_addressLOCALITY, function() { -// oThis.memory.WriteString3(oVal.locality); -// }); -// } -// if(oVal.isoCountryCode !== null) { -// this.bs.WriteItem(c_oserct_addressISOCOUTRYCODE, function() { -// oThis.memory.WriteString3(oVal.isoCountryCode); -// }); -// } -// }; -// BinaryChartReader.prototype.ReadCT_Address = function (type, length, val) { -// var res = c_oSerConstants.ReadOk; -// var oThis = this; -// var oNewVal; -// if (c_oserct_addressADDRESS1 === type) -// { -// val.setAddress1(this.stream.GetString2LE(length)); -// } -// else if (c_oserct_addressCOUTNRYREGION === type) -// { -// val.setCountryRegion(this.stream.GetString2LE(length)); -// } -// else if (c_oserct_addressADMINDISTRICT1 === type) -// { -// val.setAdminDistrict1(this.stream.GetString2LE(length)); -// } -// else if (c_oserct_addressADMINDISTRICT2 === type) -// { -// val.setAdminDistrict2(this.stream.GetString2LE(length)); -// } -// else if (c_oserct_addressPOSTALCODE === type) -// { -// val.setPostalCode(this.stream.GetString2LE(length)); -// } -// else if (c_oserct_addressLOCALITY === type) -// { -// val.setLocality(this.stream.GetString2LE(length)); -// } -// else if (c_oserct_addressISOCOUTRYCODE === type) -// { -// val.setISOCountryCode(this.stream.GetString2LE(length)); -// } -// else -// { -// res = c_oSerConstants.ReadUnknown; -// } -// return res; -// }; - -// CAxis -var c_oserct_chartExAxisID = 0 -var c_oserct_chartExAxisHIDDEN = 1; -var c_oserct_chartExAxisCATSCALING = 2; -var c_oserct_chartExAxisVALSCALING = 3; -var c_oserct_chartExAxisTITLE = 4; -var c_oserct_chartExAxisUNIT = 5; -var c_oserct_chartExAxisNUMFMT = 6; -var c_oserct_chartExAxisMAJORTICK = 7; -var c_oserct_chartExAxisMINORTICK = 8; -var c_oserct_chartExAxisMAJORGRID = 9; -var c_oserct_chartExAxisMINORGRID = 10; -var c_oserct_chartExAxisTICKLABELS = 11; -var c_oserct_chartExAxisTXPR = 12; -var c_oserct_chartExAxisSPPR = 13; - - -BinaryChartWriter.prototype.WriteCT_Axis = function (oVal) { - var oThis = this; - if(oVal.id !== null) { - this.bs.WriteItem(c_oserct_chartExAxisID, function() { - oThis.memory.WriteLong(oVal.id); - }); - } - if(oVal.hidden !== null) { - this.bs.WriteItem(c_oserct_chartExAxisHIDDEN, function() { - oThis.memory.WriteBool(oVal.hidden); - }); - } - if(oVal.catScaling !== null) { - this.bs.WriteItem(c_oserct_chartExAxisCATSCALING, function() { - oThis.WriteCT_CategoryAxisScaling(oVal.catScaling); - }); - } - if(oVal.valScaling !== null) { - this.bs.WriteItem(c_oserct_chartExAxisVALSCALING, function() { - oThis.WriteCT_ValueAxisScaling(oVal.valScaling); - }); - } - if(oVal.title !== null) { - this.bs.WriteItem(c_oserct_chartExAxisTITLE, function() { - oThis.WriteCT_ChartExTitle(oVal.title); - }); - } - if(oVal.units !== null) { - this.bs.WriteItem(c_oserct_chartExAxisUNIT, function() { - oThis.WriteCT_AxisUnits(oVal.units); - }); - } - if(oVal.numFmt !== null) { - this.bs.WriteItem(c_oserct_chartExAxisNUMFMT, function() { - oThis.WriteCT_ChartExNumFmt(oVal.numFmt); - }); - } - if(oVal.majorTickMarks !== null) { - this.bs.WriteItem(c_oserct_chartExAxisMAJORTICK, function() { - oThis.WriteCT_TickMarks(oVal.majorTickMarks); - }); - } - if(oVal.minorTickMarks !== null) { - this.bs.WriteItem(c_oserct_chartExAxisMINORTICK, function() { - oThis.WriteCT_TickMarks(oVal.minorTickMarks); - }); - } - if(oVal.majorGridlines !== null) { - this.bs.WriteItem(c_oserct_chartExAxisMAJORGRID, function() { - oThis.WriteCT_Gridlines(oVal.majorGridlines); - }); - } - if(oVal.minorGridlines !== null) { - this.bs.WriteItem(c_oserct_chartExAxisMINORGRID, function() { - oThis.WriteCT_Gridlines(oVal.minorGridlines); - }); - } - if(oVal.tickLabels !== null) { - this.bs.WriteItem(c_oserct_chartExAxisTICKLABELS, function() { - oThis.memory.WriteBool(oVal.tickLabels); - }); - } - if(oVal.txPr !== null) { - this.bs.WriteItem(c_oserct_chartExAxisTXPR, function() { - oThis.WriteTxPr(oVal.txPr); - }); - } - if(oVal.spPr !== null) { - this.bs.WriteItem(c_oserct_chartExAxisSPPR, function() { - oThis.WriteSpPr(oVal.spPr); - }); - } -}; -BinaryChartReader.prototype.ReadCT_Axis = function (type, length, val) { - var res = c_oSerConstants.ReadOk; - var oThis = this; - var oNewVal; - if (c_oserct_chartExAxisID === type) - { - val.setId(this.stream.GetULongLE()); - } - else if (c_oserct_chartExAxisHIDDEN === type) - { - val.setHidden(this.stream.GetBool()); - } - else if (c_oserct_chartExAxisCATSCALING === type) - { - var oNewVal = new AscFormat.CCategoryAxisScaling(); - res = this.bcr.Read1(length, function (t, l) { - return oThis.ReadCT_CategoryAxisScaling(t, l, oNewVal); - }); - val.setCatScaling(oNewVal); - } - else if (c_oserct_chartExAxisVALSCALING === type) - { - var oNewVal = new AscFormat.CValueAxisScaling(); - res = this.bcr.Read1(length, function (t, l) { - return oThis.ReadCT_ValueAxisScaling(t, l, oNewVal); - }); - val.setValScaling(oNewVal); - } - else if (c_oserct_chartExAxisTITLE === type) - { - var oNewVal = new AscFormat.CChartExTitle(); - res = this.bcr.Read1(length, function (t, l) { - return oThis.ReadCT_ChartExTitle(t, l, oNewVal); - }); - val.setTitle(oNewVal); - } - else if (c_oserct_chartExAxisUNIT === type) - { - var oNewVal = new AscFormat.CAxisUnits(); - res = this.bcr.Read1(length, function (t, l) { - return oThis.ReadCT_AxisUnits(t, l, oNewVal); - }); - val.setUnits(oNewVal); - } - else if (c_oserct_chartExAxisNUMFMT === type) - { - var oNewVal = new AscFormat.CNumFmt(); - res = this.bcr.Read1(length, function (t, l) { - return oThis.ReadCT_ChartExNumFmt(t, l, oNewVal); - }); - val.setNumFmt(oNewVal); - } - else if (c_oserct_chartExAxisMAJORTICK === type) - { - var oNewVal = new AscFormat.CTickMarks(); - res = this.bcr.Read1(length, function (t, l) { - return oThis.ReadCT_TickMarks(t, l, oNewVal); - }); - val.setMajorTickMarks(oNewVal); - } - else if (c_oserct_chartExAxisMINORTICK === type) - { - var oNewVal = new AscFormat.CTickMarks(); - res = this.bcr.Read1(length, function (t, l) { - return oThis.ReadCT_TickMarks(t, l, oNewVal); - }); - val.setMinorTickMarks(oNewVal); - } - else if (c_oserct_chartExAxisMAJORGRID === type) - { - var oNewVal = new AscFormat.CGridlines(); - res = this.bcr.Read1(length, function (t, l) { - return oThis.ReadCT_Gridlines(t, l, oNewVal); - }); - val.setMajorGridlines(oNewVal); - } - else if (c_oserct_chartExAxisMINORGRID === type) - { - var oNewVal = new AscFormat.CGridlines(); - res = this.bcr.Read1(length, function (t, l) { - return oThis.ReadCT_Gridlines(t, l, oNewVal); - }); - val.setMinorGridlines(oNewVal); - } - else if (c_oserct_chartExAxisTICKLABELS === type) - { - val.setTickLabels(this.stream.GetBool()); - } - else if (c_oserct_chartExAxisTXPR === type) - { - val.setTxPr(this.ReadTxPr(length)); - val.txPr.setParent(val); - } - else if (c_oserct_chartExAxisSPPR === type) - { - val.setSpPr(this.ReadSpPr(length)); - val.spPr.setParent(val); - } - else - { - res = c_oSerConstants.ReadUnknown; - } - return res; -}; - -// CChartData -var c_oserct_chartExDATA = 0; -var c_oserct_chartExEXTERNALDATA = 1; - -BinaryChartWriter.prototype.WriteCT_ChartData = function (oVal) { - var oThis = this; - if (oVal.data !== null) { - for (var i = 0, length = oVal.data.length; i < length; ++i) { - var oCurVal = oVal.data[i]; - if (oCurVal !== null) { - this.bs.WriteItem(c_oserct_chartExDATA, function () { - oThis.WriteCT_Data(oCurVal); - }); - } - } - } - if(oVal.externalData !== null) { - this.bs.WriteItem(c_oserct_chartExEXTERNALDATA, function() { - oThis.WriteCT_ChartExExternalData(oVal.externalData); - }); - } -}; -BinaryChartReader.prototype.ReadCT_ChartData = function (type, length, val) { - var res = c_oSerConstants.ReadOk; - var oThis = this; - var oNewVal; - if (c_oserct_chartExDATA === type) { - var oNewVal = new AscFormat.CData(); - res = this.bcr.Read1(length, function (t, l) { - return oThis.ReadCT_Data(t, l, oNewVal); - }); - val.addData(oNewVal); - } - else if (c_oserct_chartExEXTERNALDATA === type) - { - var oNewVal = new AscFormat.CExternalData(); - res = this.bcr.Read2(length, function (t, l) { - return oThis.ReadCT_ChartExExternalData(t, l, oNewVal); - }); - val.setExternalData(oNewVal); - } - else - { - res = c_oSerConstants.ReadUnknown; - } - return res; -}; - -// CExternalData (ChartExExternalData)(contains in ChartFormat.js) -var c_oserct_chartExExternalAUTOUPDATE = 0; - -BinaryChartWriter.prototype.WriteCT_ChartExExternalData = function (oVal) { - var res = c_oSerConstants.ReadOk; - var oThis = this; - var oCurVal = oVal.m_autoUpdate; - if (oCurVal !== null) { - this.bs.WriteItem(c_oserct_chartExExternalAUTOUPDATE, function () { - oThis.WriteCT_Boolean(oCurVal); - }); - } -}; -BinaryChartReader.prototype.ReadCT_ChartExExternalData = function (type, length, val) { - var res = c_oSerConstants.ReadOk; - var oThis = this; - if (c_oserct_chartExExternalAUTOUPDATE === type) { - var oNewVal; - oNewVal = {}; - res = this.bcr.Read1(length, function (t, l) { - return oThis.ReadCT_Boolean(t, l, oNewVal); - }); - val.m_autoUpdate = oNewVal; - } - else - res = c_oSerConstants.ReadUnknown; - return res; -}; - -// CChartEx -var c_oserct_chartExChartPLOTAREA = 0; -var c_oserct_chartExChartTITLE = 1; -var c_oserct_chartExChartLEGEND = 2; - -BinaryChartWriter.prototype.WriteCT_ChartEx = function (oVal) { - var oThis = this; - if(oVal.plotArea !== null) { - this.bs.WriteItem(c_oserct_chartExChartPLOTAREA, function() { - oThis.WriteCT_ChartExPlotArea(oVal.plotArea); - }); - } - if(oVal.title !== null) { - this.bs.WriteItem(c_oserct_chartExChartTITLE, function() { - oThis.WriteCT_ChartExTitle(oVal.title); - }); - } - if(oVal.legend !== null) { - this.bs.WriteItem(c_oserct_chartExChartLEGEND, function() { - oThis.WriteCT_ChartExLegend(oVal.legend); - }); - } -}; -BinaryChartReader.prototype.ReadCT_ChartEx = function (type, length, val) { - var res = c_oSerConstants.ReadOk; - var oThis = this; - var oNewVal; - if (c_oserct_chartExChartPLOTAREA === type) - { - var oNewVal = new AscFormat.CChartExPlotArea(); - res = this.bcr.Read1(length, function (t, l) { - return oThis.ReadCT_ChartExPlotArea(t, l, oNewVal); - }); - val.setPlotArea(oNewVal); - } - else if (c_oserct_chartExChartTITLE === type) - { - var oNewVal = new AscFormat.CChartExTitle(); - res = this.bcr.Read2(length, function (t, l) { - return oThis.ReadCT_ChartExTitle(t, l, oNewVal); - }); - val.setTitle(oNewVal); - } - else if (c_oserct_chartExChartLEGEND === type) - { - var oNewVal = new AscFormat.CChartExLegend(); - res = this.bcr.Read2(length, function (t, l) { - return oThis.ReadCT_ChartExLegend(t, l, oNewVal); - }); - val.setLegend(oNewVal); - } - else - { - res = c_oSerConstants.ReadUnknown; - } - return res; -}; - -// CChartExPlotArea -var c_oserct_chartExChartAREAREGION = 0; -var c_oserct_chartExChartAXIS = 1; -var c_oserct_chartExChartSPPR = 2; - -BinaryChartWriter.prototype.WriteCT_ChartExPlotArea = function (oVal) { - var oThis = this; - if(oVal.plotAreaRegion !== null) { - this.bs.WriteItem(c_oserct_chartExChartAREAREGION, function() { - oThis.WriteCT_PlotAreaRegion(oVal.plotAreaRegion); - }); - } - if (oVal.axis !== null) { - for (var i = 0, length = oVal.axis.length; i < length; ++i) { - var oCurVal = oVal.axis[i]; - if (oCurVal !== null) { - this.bs.WriteItem(c_oserct_chartExChartAXIS, function () { - oThis.WriteCT_Axis(oCurVal); - }); - } - } - } - if(oVal.spPr !== null) { - this.bs.WriteItem(c_oserct_chartExChartSPPR, function() { - oThis.WriteSpPr(oVal.spPr); - }); - } -}; -BinaryChartReader.prototype.ReadCT_ChartExPlotArea = function (type, length, val) { - var res = c_oSerConstants.ReadOk; - var oThis = this; - var oNewVal; - if (c_oserct_chartExChartAREAREGION === type) - { - var oNewVal = new AscFormat.CPlotAreaRegion(); - res = this.bcr.Read1(length, function (t, l) { - return oThis.ReadCT_ChartAreaRegion(t, l, oNewVal); - }); - val.setPlotAreaRegion(oNewVal); - } - else if (c_oserct_chartExChartAXIS === type) { - var oNewVal = new AscFormat.CAxis(); - res = this.bcr.Read1(length, function (t, l) { - return oThis.ReadCT_Axis(t, l, oNewVal); - }); - val.addAxis(oNewVal); - } - else if (c_oserct_chartExChartSPPR === type) - { - val.setSpPr(this.ReadSpPr(length)); - val.spPr.setParent(val); - } - else - { - res = c_oSerConstants.ReadUnknown; - } - return res; -}; - -// CPlotAreaRegion -var c_oserct_chartExAreaPLOTSURFACE = 0; -var c_oserct_chartExAreaSERIES = 1; - -BinaryChartWriter.prototype.WriteCT_PlotAreaRegion = function (oVal) { - var oThis = this; - if(oVal.plotSurface !== null) { - this.bs.WriteItem(c_oserct_chartExAreaPLOTSURFACE, function() { - oThis.WriteCT_PlotSurface(oVal.plotSurface); - }); - } - if (oVal.series !== null) { - for (var i = 0, length = oVal.series.length; i < length; ++i) { - var oCurVal = oVal.series[i]; - if (null != oCurVal) { - this.bs.WriteItem(c_oserct_chartExAreaSERIES, function () { - oThis.WriteCT_Series(oCurVal); - }); - } - } - } -}; -BinaryChartReader.prototype.ReadCT_PlotAreaRegion = function (type, length, val) { - var res = c_oSerConstants.ReadOk; - var oThis = this; - var oNewVal; - if (c_oserct_chartExAreaPLOTSURFACE === type) - { - var oNewVal = new AscFormat.CPlotSurface(); - res = this.bcr.Read1(length, function (t, l) { - return oThis.ReadCT_PlotSurface(t, l, oNewVal); - }); - val.setPlotSurface(oNewVal); - } - else if (c_oserct_chartExAreaSERIES === type) { - var oNewVal = new AscFormat.CSeries(); - res = this.bcr.Read1(length, function (t, l) { - return oThis.ReadCT_Series(t, l, oNewVal); - }); - val.addSeries(oNewVal); - } - else - { - res = c_oSerConstants.ReadUnknown; - } - return res; -}; - -// CPlotSurface -var c_oserct_chartExPlotSurfaceSPPR = 0; - -BinaryChartWriter.prototype.WriteCT_PlotSurface = function (oVal) { - var oThis = this; - if(oVal.spPr !== null) { - this.bs.WriteItem(c_oserct_chartExPlotSurfaceSPPR, function() { - oThis.WriteSpPr(oVal.spPr); - }); - } -}; -BinaryChartReader.prototype.ReadCT_PlotSurface = function (type, length, val) { - var res = c_oSerConstants.ReadOk; - var oThis = this; - var oNewVal; - if (c_oserct_chartExPlotSurfaceSPPR === type) - { - val.setSpPr(this.ReadSpPr(length)); - val.spPr.setParent(val); - } - else - { - res = c_oSerConstants.ReadUnknown; - } - return res; -}; - -// CSeries -var c_oserct_chartExSeriesDATAPT = 0; -var c_oserct_chartExSeriesDATALABELS = 1; -var c_oserct_chartExSeriesLAYOUTPROPS = 2; -var c_oserct_chartExSeriesTEXT = 3; -var c_oserct_chartExSeriesAXIS = 4; -var c_oserct_chartExSeriesDATAID = 5; -var c_oserct_chartExSeriesSPPR = 6; -var c_oserct_chartExSeriesLAYOUTID = 7; // ST SeriesLayout -var c_oserct_chartExSeriesHIDDEN = 8; -var c_oserct_chartExSeriesOWNERIDX = 9; -var c_oserct_chartExSeriesFORMATIDX = 10; -var c_oserct_chartExSeriesUNIQUEID = 11; - -BinaryChartWriter.prototype.WriteCT_Series = function (oVal) { - var oThis = this; - if (oVal.dataPt !== null) { - for (var i = 0, length = oVal.dataPt.length; i < length; ++i) { - var oCurVal = oVal.dataPt[i]; - if (null != oCurVal) { - this.bs.WriteItem(c_oserct_chartExSeriesDATAPT, function () { - oThis.WriteCT_DataPoint(oCurVal); - }); - } - } - } - if(oVal.dataLabels !== null) { - this.bs.WriteItem(c_oserct_chartExSeriesDATALABELS, function() { - oThis.WriteCT_DataLabels(oVal.dataLabels); - }); - } - if(oVal.layoutPr !== null) { - this.bs.WriteItem(c_oserct_chartExSeriesLAYOUTPROPS, function() { - oThis.WriteCT_SeriesLayoutProperties(oVal.layoutPr); - }); - } - if(oVal.tx !== null) { - this.bs.WriteItem(c_oserct_chartExSeriesTEXT, function() { - oThis.WriteCT_Text(oVal.tx); - }); - } - if (oVal.axisId !== null) { - for (var i = 0, length = oVal.axisId.length; i < length; ++i) { - var oCurVal = oVal.axisId[i]; - if (null != oCurVal) { - this.bs.WriteItem(c_oserct_chartExSeriesAXIS, function () { - oThis.WriteCT_Axis(oCurVal); - }); - } - } - } - if(oVal.dataId !== null) { - this.bs.WriteItem(c_oserct_chartExSeriesDATAID, function() { - oThis.memory.WriteDouble2(oVal.dataId); - }); - } - if(oVal.spPr !== null) { - this.bs.WriteItem(c_oserct_chartExSeriesSPPR, function() { - oThis.WriteSpPr(oVal.spPr); - }); - } - if(oVal.layoutId !== null) { - this.bs.WriteItem(c_oserct_chartExSeriesLAYOUTID, function() { - oThis.memory.WriteByte(oVal.layoutId); - }); - } - if(oVal.hidden !== null) { - this.bs.WriteItem(c_oserct_chartExSeriesHIDDEN, function() { - oThis.memory.WriteBool(oVal.hidden); - }); - } - if(oVal.ownerIdx !== null) { - this.bs.WriteItem(c_oserct_chartExSeriesOWNERIDX, function() { - oThis.memory.WriteLong(oVal.ownerIdx); - }); - } - if(oVal.formatIdx !== null) { - this.bs.WriteItem(c_oserct_chartExSeriesFORMATIDX, function() { - oThis.memory.WriteLong(oVal.formatIdx); - }); - } - if(oVal.uniqueId !== null) { - this.bs.WriteItem(c_oserct_chartExSeriesUNIQUEID, function() { - oThis.memory.WriteString3(oVal.uniqueId); - }); - } -}; -BinaryChartReader.prototype.ReadCT_Series = function (type, length, val) { - var res = c_oSerConstants.ReadOk; - var oThis = this; - var oNewVal; - if (c_oserct_chartExSeriesDATAPT === type) { - var oNewVal = new AscFormat.CDataPoint(); - res = this.bcr.Read1(length, function (t, l) { - return oThis.ReadCT_DataPoint(t, l, oNewVal); - }); - val.addDataPt(oNewVal); - } - else if (c_oserct_chartExSeriesDATALABELS === type) - { - var oNewVal = new AscFormat.CDataLabels(); - res = this.bcr.Read2(length, function (t, l) { - return oThis.ReadCT_DataLabels(t, l, oNewVal); - }); - val.setDataLabels(oNewVal); - } - else if (c_oserct_chartExSeriesLAYOUTPROPS === type) - { - var oNewVal = new AscFormat.CSeriesLayoutProperties(); - res = this.bcr.Read2(length, function (t, l) { - return oThis.ReadCT_SeriesLayoutProperties(t, l, oNewVal); - }); - val.setLayoutPr(oNewVal); - } - else if (c_oserct_chartExSeriesTEXT === type) - { - val.setTx(this.stream.GetDoubleLE()); - } - else if (c_oserct_chartExSeriesAXIS === type) { - var oNewVal = new AscFormat.CAxis(); - res = this.bcr.Read1(length, function (t, l) { - return oThis.ReadCT_Axis(t, l, oNewVal); - }); - val.addAxisId(oNewVal); - } - else if (c_oserct_chartExSeriesDATAID === type) - { - val.setTx(this.stream.GetDoubleLE()); - } - else if (c_oserct_chartExSeriesSPPR === type) - { - val.setSpPr(this.ReadSpPr(length)); - val.spPr.setParent(val); - } - else if (c_oserct_chartExSeriesLAYOUTID === type) - { - val.setLayoutId(this.stream.GetUChar()); - } - else if (c_oserct_chartExSeriesHIDDEN === type) - { - val.setHidden(this.stream.GetBool()); - } - else if (c_oserct_chartExSeriesOWNERIDX === type) - { - val.setOwnerIdx(this.stream.GetULongLE()); - } - else if (c_oserct_chartExSeriesFORMATIDX === type) - { - val.setFormatIdx(this.stream.GetULongLE()); - } - else if (c_oserct_chartExSeriesUNIQUEID === type) - { - val.setUniqueId(this.stream.GetString2LE(length)); - } - else - { - res = c_oSerConstants.ReadUnknown; - } - return res; -}; - -// CDataPoint -var c_oserct_chartExDataPointIDX = 0; -var c_oserct_chartExDataPointSPPR = 1; - -BinaryChartWriter.prototype.WriteCT_DataPoint = function (oVal) { - var oThis = this; - if(oVal.idx !== null) { - this.bs.WriteItem(c_oserct_chartExDataPointIDX, function() { - oThis.memory.WriteLong(oVal.idx); - }); - } - if(oVal.spPr !== null) { - this.bs.WriteItem(c_oserct_chartExDataPointSPPR, function() { - oThis.WriteSpPr(oVal.spPr); - }); - } -}; -BinaryChartReader.prototype.ReadCT_DataPoint = function (type, length, val) { - var res = c_oSerConstants.ReadOk; - var oThis = this; - var oNewVal; - if (c_oserct_chartExDataPointIDX === type) - { - val.setId(this.stream.GetULongLE()); - } - else if (c_oserct_chartExDataPointSPPR === type) - { - val.setSpPr(this.ReadSpPr(length)); - val.spPr.setParent(val); - } - else - { - res = c_oSerConstants.ReadUnknown; - } - return res; -}; - -// CDataLabels -var c_oserct_chartExDataLabelsPOS = 0; // ST DataLabelPos -var c_oserct_chartExDataLabelsNUMFMT = 1; -var c_oserct_chartExDataLabelsTXPR = 2; -var c_oserct_chartExDataLabelsSPPR = 3; -var c_oserct_chartExDataLabelsVISABILITIES = 4; -var c_oserct_chartExDataLabelsSEPARATOR = 5; -var c_oserct_chartExDataLabelsDATALABEL = 6; -var c_oserct_chartExDataLabelsDATALABELHIDDEN = 7; - -BinaryChartWriter.prototype.WriteCT_DataLabels = function (oVal) { - var oThis = this; - if(oVal.pos !== null) { - this.bs.WriteItem(c_oserct_chartExDataLabelsPOS, function() { - oThis.memory.WriteByte(oVal.pos); - }); - } - if(oVal.numFmt !== null) { - this.bs.WriteItem(c_oserct_chartExDataLabelsNUMFMT, function() { - oThis.WriteCT_ChartExNumFmt(oVal.numFmt); - }); - } - if(oVal.txPr !== null) { - this.bs.WriteItem(c_oserct_chartExDataLabelsTXPR, function() { - oThis.WriteTxPr(oVal.txPr); - }); - } - if(oVal.spPr !== null) { - this.bs.WriteItem(c_oserct_chartExDataLabelsSPPR, function() { - oThis.WriteSpPr(oVal.spPr); - }); - } - if(oVal.visibility !== null) { - this.bs.WriteItem(c_oserct_chartExDataLabelsVISABILITIES, function() { - oThis.WriteCT_DataLabelVisibilities(oVal.visibility); - }); - } - if(oVal.separator !== null) { - this.bs.WriteItem(c_oserct_chartExDataLabelsSEPARATOR, function() { - oThis.memory.WriteString3(oVal.separator); - }); - } - if (oVal.dataLabel !== null) { - for (var i = 0, length = oVal.dataLabel.length; i < length; ++i) { - var oCurVal = oVal.dataLabel[i]; - if (null != oCurVal) { - this.bs.WriteItem(c_oserct_chartExDataLabelsDATALABEL, function () { - oThis.WriteCT_Datalabel(oCurVal); - }); - } - } - } - if (oVal.dataLabelHidden !== null) { - for (var i = 0, length = oVal.dataLabelHidden.length; i < length; ++i) { - var oCurVal = oVal.dataLabelHidden[i]; - if (null != oCurVal) { - this.bs.WriteItem(c_oserct_chartExDataLabelsDATALABELHIDDEN, function () { - oThis.WriteCT_DataLabelHidden(oCurVal); - }); - } - } - } -}; -BinaryChartReader.prototype.ReadCT_DataLabels = function (type, length, val) { - var res = c_oSerConstants.ReadOk; - var oThis = this; - var oNewVal; - if (c_oserct_chartExDataLabelsPOS === type) - { - val.setPos(this.stream.GetUChar()); - } - else if (c_oserct_chartExDataLabelsNUMFMT === type) - { - var oNewVal = new AscFormat.CNumFmt(); - res = this.bcr.Read2(length, function (t, l) { - return oThis.ReadCT_ChartExNumFmt(t, l, oNewVal); - }); - val.setNumFmt(oNewVal); - } - else if (c_oserct_chartExDataLabelsTXPR === type) - { - val.setTxPr(this.ReadTxPr(length)); - val.txPr.setParent(val); - } - else if (c_oserct_chartExDataLabelsSPPR === type) - { - val.setSpPr(this.ReadSpPr(length)); - val.spPr.setParent(val); - } - else if (c_oserct_chartExDataLabelsVISABILITIES === type) - { - var oNewVal = new AscFormat.CDataLabelVisibilities(); - res = this.bcr.Read2(length, function (t, l) { - return oThis.ReadCT_DataLabelVisibilities(t, l, oNewVal); - }); - val.setVisibility(oNewVal); - } - else if (c_oserct_chartExDataLabelsSEPARATOR === type) - { - val.setSeparator(this.stream.GetString2LE(length)); - } - else if (c_oserct_chartExDataLabelsDATALABEL === type) { - var oNewVal = new AscFormat.CDatalabel(); - res = this.bcr.Read1(length, function (t, l) { - return oThis.ReadCT_Datalabel(t, l, oNewVal); - }); - val.addDatalabel(oNewVal); - } - else if (c_oserct_chartExDataLabelsDATALABELHIDDEN === type) { - var oNewVal = new AscFormat.CDataLabelHidden(); - res = this.bcr.Read1(length, function (t, l) { - return oThis.ReadCT_DataLabelHidden(t, l, oNewVal); - }); - val.addDataLabelHidden(oNewVal); - } - else - { - res = c_oSerConstants.ReadUnknown; - } - return res; -}; - -// CNumFmt (ChartExNumFmt) -var c_oserct_chartExNumberFormatFORMATCODE = 0; -var c_oserct_chartExNumberFormatSOURCELINKED = 1; - -BinaryChartWriter.prototype.WriteCT_ChartExNumFmt = function (oVal) { - var oThis = this; - if (oVal.formatCode !== null) { - this.bs.WriteItem(c_oserct_chartExNumberFormatFORMATCODE, function () { - oThis.memory.WriteString3(oVal.formatCode); - }); - } - if (oVal.sourceLinked !== null) { - this.bs.WriteItem(c_oserct_chartExNumberFormatSOURCELINKED, function () { - oThis.memory.WriteBool(oVal.sourceLinked); - }); - } -}; -BinaryChartReader.prototype.ReadCT_ChartExNumFmt = function (type, length, val) { - var res = c_oSerConstants.ReadOk; - var oThis = this; - var oNewVal; - if (c_oserct_chartExNumberFormatFORMATCODE === type) { - val.setFormatCode(this.stream.GetString2LE(length)); - } - else if (c_oserct_chartExNumberFormatSOURCELINKED === type) { - val.setSourceLinked(this.stream.GetBool()); - } - else - { - res = c_oSerConstants.ReadUnknown; - } - return res; -}; - -// CDataLabel -var c_oserct_chartExDataLabelIDX = 0; -var c_oserct_chartExDataLabelPOS = 1; // ST DataLabelPos -var c_oserct_chartExDataLabelNUMFMT = 2; -var c_oserct_chartExDataLabelTXPR = 3; -var c_oserct_chartExDataLabelSPPR = 4; -var c_oserct_chartExDataLabelVISABILITIES = 5; -var c_oserct_chartExDataLabelSEPARATOR = 6; - -BinaryChartWriter.prototype.WriteCT_DataLabel = function (oVal) { - var oThis = this; - if(oVal.idx !== null) { - this.bs.WriteItem(c_oserct_chartExDataLabelIDX, function() { - oThis.memory.WriteLong(oVal.idx); - }); - } - if(oVal.pos !== null) { - this.bs.WriteItem(c_oserct_chartExDataLabelPOS, function() { - oThis.memory.WriteByte(oVal.pos); - }); - } - if(oVal.numFmt !== null) { - this.bs.WriteItem(c_oserct_chartExDataLabelNUMFMT, function() { - oThis.WriteCT_ChartExNumFmt(oVal.numFmt); - }); - } - if(oVal.txPr !== null) { - this.bs.WriteItem(c_oserct_chartExDataLabelTXPR, function() { - oThis.WriteTxPr(oVal.txPr); - }); - } - if(oVal.spPr !== null) { - this.bs.WriteItem(c_oserct_chartExDataLabelSPPR, function() { - oThis.WriteSpPr(oVal.spPr); - }); - } - if(oVal.visibility !== null) { - this.bs.WriteItem(c_oserct_chartExDataLabelVISABILITIES, function() { - oThis.WriteCT_DataLabelVisibilities(oVal.visibility); - }); - } - if(oVal.separator !== null) { - this.bs.WriteItem(c_oserct_chartExDataLabelSEPARATOR, function() { - oThis.memory.WriteString3(oVal.separator); - }); - } -}; -BinaryChartReader.prototype.ReadCT_DataLabel = function (type, length, val) { - var res = c_oSerConstants.ReadOk; - var oThis = this; - var oNewVal; - if (c_oserct_chartExDataLabelIDX === type) - { - val.setIdx(this.stream.GetULongLE()); - } - else if (c_oserct_chartExDataLabelPOS === type) - { - val.setPos(this.stream.GetUChar()); - } - else if (c_oserct_chartExDataLabelNUMFMT === type) - { - var oNewVal = new AscFormat.CNumFmt(); - res = this.bcr.Read2(length, function (t, l) { - return oThis.ReadCT_ChartExNumFmt(t, l, oNewVal); - }); - val.setNumFmt(oNewVal); - } - else if (c_oserct_chartExDataLabelTXPR === type) - { - val.setTxPr(this.ReadTxPr(length)); - val.txPr.setParent(val); - } - else if (c_oserct_chartExDataLabelSPPR === type) - { - val.setSpPr(this.ReadSpPr(length)); - val.spPr.setParent(val); - } - else if (c_oserct_chartExDataLabelVISABILITIES === type) - { - var oNewVal = new AscFormat.CDataLabelVisibilities(); - res = this.bcr.Read2(length, function (t, l) { - return oThis.ReadCT_DataLabelVisibilities(t, l, oNewVal); - }); - val.setVisibility(oNewVal); - } - else if (c_oserct_chartExDataLabelSEPARATOR === type) - { - val.setSeparator(this.stream.GetString2LE(length)); - } - else - { - res = c_oSerConstants.ReadUnknown; - } - return res; -}; - -// CDataLabelHidden -var c_oserct_chartExDataLabelHiddenIDX = 0; - -BinaryChartWriter.prototype.WriteCT_DataLabelHidden = function (oVal) { - var oThis = this; - if(oVal.idx !== null) { - this.bs.WriteItem(c_oserct_chartExDataLabelHiddenIDX, function() { - oThis.memory.WriteLong(oVal.idx); - }); - } -}; -BinaryChartReader.prototype.ReadCT_DataLabelHidden = function (type, length, val) { - var res = c_oSerConstants.ReadOk; - var oThis = this; - var oNewVal; - if (c_oserct_chartExDataLabelHiddenIDX === type) - { - val.setIdx(this.stream.GetULongLE()); - } - else - { - res = c_oSerConstants.ReadUnknown; - } - return res; -}; - -// CSeriesLayoutProperties -var c_oserct_chartExSeriesLayoutPARENT = 0; -var c_oserct_chartExSeriesLayoutREGION = 1; -var c_oserct_chartExSeriesLayoutVISABILITIES = 2; -var c_oserct_chartExSeriesLayoutAGGREGATION = 3; -var c_oserct_chartExSeriesLayoutBINNING = 4; -var c_oserct_chartExSeriesLayoutSTATISTIC = 5; -var c_oserct_chartExSeriesLayoutSUBTOTALS = 6; - -BinaryChartWriter.prototype.WriteCT_SeriesLayoutProperties = function (oVal) { - var oThis = this; - if(oVal.parentLabelLayout !== null) { - this.bs.WriteItem(c_oserct_chartExSeriesLayoutPARENT, function() { - oThis.WriteCT_ParentLabelLayout(oVal.parentLabelLayout); - }); - } - if(oVal.regionLabelLayout !== null) { - this.bs.WriteItem(c_oserct_chartExSeriesLayoutREGION, function() { - oThis.WriteCT_RegionLabelLayout(oVal.regionLabelLayout); - }); - } - if(oVal.visibility !== null) { - this.bs.WriteItem(c_oserct_chartExSeriesLayoutVISABILITIES, function() { - oThis.WriteCT_SeriesElementVisibilities(oVal.visibility); - }); - } - if(oVal.aggregation !== null) { - this.bs.WriteItem(c_oserct_chartExSeriesLayoutAGGREGATION, function() { - oThis.memory.WriteBool(oVal.aggregation); - }); - } - if(oVal.binning !== null) { - this.bs.WriteItem(c_oserct_chartExSeriesLayoutBINNING, function() { - oThis.WriteCT_Binning(oVal.binning); - }); - } - if(oVal.statistics !== null) { - this.bs.WriteItem(c_oserct_chartExSeriesLayoutSTATISTIC, function() { - oThis.WriteCT_Statistics(oVal.statistics); - }); - } - if(oVal.subtotals !== null) { - this.bs.WriteItem(c_oserct_chartExSeriesLayoutSUBTOTALS, function() { - oThis.WriteCT_Subtotals(oVal.subtotals); - }); - } -}; -BinaryChartReader.prototype.ReadCT_SeriesLayoutProperties = function (type, length, val) { - var res = c_oSerConstants.ReadOk; - var oThis = this; - var oNewVal; - if (c_oserct_chartExSeriesLayoutPARENT === type) - { - var oNewVal = new AscFormat.CParentLabelLayout(); - res = this.bcr.Read1(length, function (t, l) { - return oThis.ReadCT_ParentLabelLayout(t, l, oNewVal); - }); - val.setParentLabelLayout(oNewVal); - } - else if (c_oserct_chartExSeriesLayoutREGION === type) - { - var oNewVal = new AscFormat.CRegionLabelLayout(); - res = this.bcr.Read2(length, function (t, l) { - return oThis.ReadCT_RegionLabelLayout(t, l, oNewVal); - }); - val.setRegionLabelLayout(oNewVal); - } - else if (c_oserct_chartExSeriesLayoutVISABILITIES === type) - { - var oNewVal = new AscFormat.CSeriesElementVisibilities(); - res = this.bcr.Read2(length, function (t, l) { - return oThis.ReadCT_SeriesElementVisibilities(t, l, oNewVal); - }); - val.setVisibility(oNewVal); - } - else if (c_oserct_chartExSeriesLayoutAGGREGATION === type) - { - val.setAggregation(this.stream.GetBool()); - } - else if (c_oserct_chartExSeriesLayoutBINNING === type) - { - var oNewVal = new AscFormat.CBinning(); - res = this.bcr.Read2(length, function (t, l) { - return oThis.ReadCT_Binning(t, l, oNewVal); - }); - val.setBinning(oNewVal); - } - else if (c_oserct_chartExSeriesLayoutSTATISTIC === type) - { - var oNewVal = new AscFormat.CStatistics(); - res = this.bcr.Read2(length, function (t, l) { - return oThis.ReadCT_Statistics(t, l, oNewVal); - }); - val.setStatistics(oNewVal); - } - else if (c_oserct_chartExSeriesLayoutSUBTOTALS === type) - { - var oNewVal = new AscFormat.CSubtotals(); - res = this.bcr.Read2(length, function (t, l) { - return oThis.ReadCT_Subtotals(t, l, oNewVal); - }); - val.setSubtotals(oNewVal); - } - else - { - res = c_oSerConstants.ReadUnknown; - } - return res; -}; - -// CDataLabelVisibilities -var c_oserct_chartExDataLabelVisibilitiesSERIES = 0; -var c_oserct_chartExDataLabelVisibilitiesCATEGORY = 1; -var c_oserct_chartExDataLabelVisibilitiesVALUE = 2; - -BinaryChartWriter.prototype.WriteCT_DataLabelVisibilities = function (oVal) { - var oThis = this; - if(oVal.seriesName !== null) { - this.bs.WriteItem(c_oserct_chartExDataLabelVisibilitiesSERIES, function() { - oThis.memory.WriteBool(oVal.seriesName); - }); - } - if(oVal.categoryName !== null) { - this.bs.WriteItem(c_oserct_chartExDataLabelVisibilitiesCATEGORY, function() { - oThis.memory.WriteBool(oVal.categoryName); - }); - } - if(oVal.value !== null) { - this.bs.WriteItem(c_oserct_chartExDataLabelVisibilitiesVALUE, function() { - oThis.memory.WriteBool(oVal.value); - }); - } -}; -BinaryChartReader.prototype.ReadCT_DataLabelVisibilities = function (type, length, val) { - var res = c_oSerConstants.ReadOk; - var oThis = this; - var oNewVal; - if (c_oserct_chartExDataLabelVisibilitiesSERIES === type) - { - val.setSeriesName(this.stream.GetBool()); - } - else if (c_oserct_chartExDataLabelVisibilitiesCATEGORY === type) - { - val.setCategoryName(this.stream.GetBool()); - } - else if (c_oserct_chartExDataLabelVisibilitiesVALUE === type) - { - val.setValue(this.stream.GetBool()); - } - else - { - res = c_oSerConstants.ReadUnknown; - } - return res; -}; - -// CBinning -var c_oserct_chartExBinningBINSIZE = 0; -var c_oserct_chartExBinningBINCOUNT = 1; -var c_oserct_chartExBinningINTERVAL = 2; // ST CIntervalClosedSide -var c_oserct_chartExBinningUNDERVAL = 3; // ST DoubleOrAutomatic -var c_oserct_chartExBinningUNDERAUTO = 4; // ST DoubleOrAutomatic -var c_oserct_chartExBinningOVERVAL = 5; // ST DoubleOrAutomatic -var c_oserct_chartExBinningOVERAUTO = 6; // ST DoubleOrAutomatic - -BinaryChartWriter.prototype.WriteCT_Binning = function (oVal) { - var oThis = this; - if(oVal.binSize !== null) { - this.bs.WriteItem(c_oserct_chartExBinningBINSIZE, function() { - oThis.memory.WriteDouble2(oVal.binSize); - }); - } - if(oVal.binCount !== null) { - this.bs.WriteItem(c_oserct_chartExBinningBINCOUNT, function() { - oThis.memory.WriteLong(oVal.binCount); - }); - } - if(oVal.intervalClosed !== null) { - this.bs.WriteItem(c_oserct_chartExBinningINTERVAL, function() { - oThis.memory.WriteByte(oVal.intervalClosed); - }); - } - if(oVal.underflow !== null) { - if (oVal.underflow.type === EDoubleOrAutomatic.typeDouble) { - this.bs.WriteItem(c_oserct_chartExBinningUNDERVAL, function() { - oThis.memory.WriteDouble2(oVal.underflow.value); - }); - } else { - this.bs.WriteItem(c_oserct_chartExBinningUNDERAUTO, function() { - oThis.memory.WriteByte(oVal.underflow.value); - }); - } - } - if(oVal.overflow !== null) { - if (oVal.overflow.type === EDoubleOrAutomatic.typeDouble) { - this.bs.WriteItem(c_oserct_chartExBinningOVERVAL, function() { - oThis.memory.WriteDouble2(oVal.overflow.value); - }); - } else { - this.bs.WriteItem(c_oserct_chartExBinningOVERAUTO, function() { - oThis.memory.WriteByte(oVal.overflow.value); - }); - } - } -}; -BinaryChartReader.prototype.ReadCT_Binning = function (type, length, val) { - var res = c_oSerConstants.ReadOk; - var oThis = this; - var oNewVal; - if (c_oserct_chartExBinningBINSIZE === type) - { - val.setBinSize(this.stream.GetDoubleLE()); - } - else if (c_oserct_chartExBinningBINCOUNT === type) - { - val.setBinCount(this.stream.GetULongLE()); - } - else if (c_oserct_chartExBinningINTERVAL === type) - { - val.setIntervalClosed(this.stream.GetUChar()); - } - else if (c_oserct_chartExBinningUNDERVAL === type) - { - var oNewVal = new AscFormat.CDoubleOrAutomatic(); - oNewVal.setValue(this.stream.GetDoubleLE()); - oNewVal.setType(EDoubleOrAutomatic.typeDouble); - val.setUnderflow(oNewVal); - } - else if (c_oserct_chartExBinningUNDERAUTO === type) - { - var oNewVal = new AscFormat.CDoubleOrAutomatic(); - oNewVal.setValue(this.stream.GetUChar()); - oNewVal.setType(EDoubleOrAutomatic.typeAuto); - val.setUnderflow(oNewVal); - } - else if (c_oserct_chartExBinningOVERVAL === type) - { - var oNewVal = new AscFormat.CDoubleOrAutomatic(); - oNewVal.setValue(this.stream.GetDoubleLE()); - oNewVal.setType(EDoubleOrAutomatic.typeDouble); - val.setOverflow(oNewVal); - } - else if (c_oserct_chartExBinningOVERAUTO === type) - { - var oNewVal = new AscFormat.CDoubleOrAutomatic(); - oNewVal.setValue(this.stream.GetUChar()); - oNewVal.setType(EDoubleOrAutomatic.typeAuto); - val.setOverflow(oNewVal); - } - else - { - res = c_oSerConstants.ReadUnknown; - } - return res; -}; - -// CChartExTitle -var c_oserct_chartExTitleTX = 0; -var c_oserct_chartExTitleTXPR = 1; -var c_oserct_chartExTitleSPPR = 2; -var c_oserct_chartExTitlePOS = 3; // ST SidePos -var c_oserct_chartExTitleALIGN = 4; // ST PosAlign -var c_oserct_chartExTitleOVERLAY = 5; - -BinaryChartWriter.prototype.WriteCT_ChartExTitle = function (oVal) { - var oThis = this; - if(oVal.tx !== null) { - this.bs.WriteItem(c_oserct_chartExTitleTX, function() { - oThis.WriteCT_Text(oVal.tx); - }); - } - if(oVal.txPr !== null) { - this.bs.WriteItem(c_oserct_chartExTitleTXPR, function() { - oThis.WriteTxPr(oVal.txPr); - }); - } - if(oVal.spPr !== null) { - this.bs.WriteItem(c_oserct_chartExTitleSPPR, function() { - oThis.WriteSpPr(oVal.spPr); - }); - } - if(oVal.pos !== null) { - this.bs.WriteItem(c_oserct_chartExTitlePOS, function() { - oThis.memory.WriteByte(oVal.pos); - }); - } - if(oVal.align !== null) { - this.bs.WriteItem(c_oserct_chartExTitleALIGN, function() { - oThis.memory.WriteByte(oVal.align); - }); - } - if(oVal.overlay !== null) { - this.bs.WriteItem(c_oserct_chartExTitleOVERLAY, function() { - oThis.memory.WriteBool(oVal.overlay); - }); - } -}; -BinaryChartReader.prototype.ReadCT_ChartExTitle = function (type, length, val) { - var res = c_oSerConstants.ReadOk; - var oThis = this; - var oNewVal; - if (c_oserct_chartExTitleTX === type) - { - var oNewVal = new AscFormat.CText(); - res = this.bcr.Read1(length, function (t, l) { - return oThis.ReadCT_Text(t, l, oNewVal); - }); - val.setTx(oNewVal); - } - else if (c_oserct_chartExTitleTXPR === type) - { - val.setTxPr(this.ReadTxPr(length)); - val.txPr.setParent(val); - } - else if (c_oserct_chartExTitleSPPR === type) - { - val.setSpPr(this.ReadSpPr(length)); - val.spPr.setParent(val); - } - else if (c_oserct_chartExTitlePOS === type) - { - val.setPos(this.stream.GetUChar()); - } - else if (c_oserct_chartExTitleALIGN === type) - { - val.setAlign(this.stream.GetUChar()); - } - else if (c_oserct_chartExTitleOVERLAY === type) - { - val.setOverlay(this.stream.GetBool()); - } - else - { - res = c_oSerConstants.ReadUnknown; - } - return res; -}; - -// CChartExLegend -var c_oserct_chartExLegendTXPR = 0; -var c_oserct_chartExLegendSPPR = 1; -var c_oserct_chartExLegendPOS = 2; // ST SidePos -var c_oserct_chartExLegendALIGN = 3; // ST PosAlign -var c_oserct_chartExLegendOVERLAY = 4; - -BinaryChartWriter.prototype.WriteCT_ChartExLegend = function (oVal) { - var oThis = this; - if(oVal.txPr !== null) { - this.bs.WriteItem(c_oserct_chartExLegendTXPR, function() { - oThis.WriteTxPr(oVal.txPr); - }); - } - if(oVal.spPr !== null) { - this.bs.WriteItem(c_oserct_chartExLegendSPPR, function() { - oThis.WriteSpPr(oVal.spPr); - }); - } - if(oVal.pos !== null) { - this.bs.WriteItem(c_oserct_chartExLegendPOS, function() { - oThis.memory.WriteByte(oVal.pos); - }); - } - if(oVal.align !== null) { - this.bs.WriteItem(c_oserct_chartExLegendALIGN, function() { - oThis.memory.WriteByte(oVal.align); - }); - } - if(oVal.overlay !== null) { - this.bs.WriteItem(c_oserct_chartExLegendOVERLAY, function() { - oThis.memory.WriteBool(oVal.overlay); - }); - } -}; -BinaryChartReader.prototype.ReadCT_ChartExLegend = function (type, length, val) { - var res = c_oSerConstants.ReadOk; - var oThis = this; - var oNewVal; - if (c_oserct_chartExLegendTXPR === type) - { - val.setTxPr(this.ReadTxPr(length)); - val.txPr.setParent(val); - } - else if (c_oserct_chartExLegendSPPR === type) - { - val.setSpPr(this.ReadSpPr(length)); - val.spPr.setParent(val); - } - else if (c_oserct_chartExLegendPOS === type) - { - val.setPos(this.stream.GetUChar()); - } - else if (c_oserct_chartExLegendALIGN === type) - { - val.setAlign(this.stream.GetUChar()); - } - else if (c_oserct_chartExLegendOVERLAY === type) - { - val.setOverlay(this.stream.GetBool()); - } - else - { - res = c_oSerConstants.ReadUnknown; - } - return res; -}; - -// CText -var c_oserct_chartExTextRICH = 0; -var c_oserct_chartExTextDATA = 1; - -BinaryChartWriter.prototype.WriteCT_Text = function (oVal) { - var oThis = this; - if(oVal.rich !== null) { - this.bs.WriteItem(c_oserct_chartExTextRICH, function() { - oThis.WriteCT_TextBody(oVal.rich); - }); - } - if(oVal.txData !== null) { - this.bs.WriteItem(c_oserct_chartExTextDATA, function() { - oThis.WriteCT_TextData(oVal.txData); - }); - } -}; -BinaryChartReader.prototype.ReadCT_Text = function (type, length, val) { - var res = c_oSerConstants.ReadOk; - var oThis = this; - var oNewVal; - if (c_oserct_chartExTextRICH === type) - { - var oNewVal = new AscFormat.CTextBody(); - res = this.bcr.Read1(length, function (t, l) { - return oThis.ReadCT_TextBody(t, l, oNewVal); - }); - val.setRich(oNewVal); - } - else if (c_oserct_chartExTextDATA === type) - { - var oNewVal = new AscFormat.CTextData(); - res = this.bcr.Read2(length, function (t, l) { - return oThis.ReadCT_TextData(t, l, oNewVal); - }); - val.setTxData(oNewVal); - } - else - { - res = c_oSerConstants.ReadUnknown; - } - return res; -}; - -// CTextData -var c_oserct_chartExTextDataFORMULA = 0; -var c_oserct_chartExTextDataVALUE = 1; - -BinaryChartWriter.prototype.WriteCT_TextData = function (oVal) { - var oThis = this; - if(oVal.f !== null) { - this.bs.WriteItem(c_oserct_chartExTextDataFORMULA, function() { - oThis.WriteCT_Formula(oVal.f); - }); - } - if(oVal.v !== null) { - this.bs.WriteItem(c_oserct_chartExTextDataVALUE, function() { - oThis.memory.WriteString3(oVal.v); - }); - } -}; -BinaryChartReader.prototype.ReadCT_TextData = function (type, length, val) { - var res = c_oSerConstants.ReadOk; - var oThis = this; - var oNewVal; - if (c_oserct_chartExTextDataFORMULA === type) - { - var oNewVal = new AscFormat.CFormula(); - res = this.bcr.Read1(length, function (t, l) { - return oThis.ReadCT_Formula(t, l, oNewVal); - }); - val.setF(oNewVal); - } - else if (c_oserct_chartExTextDataVALUE === type) - { - val.setV(this.stream.GetString2LE(length)); - } - else - { - res = c_oSerConstants.ReadUnknown; - } - return res; -}; - -// CData -var c_oserct_chartExDataID = 0; -var c_oserct_chartExDataSTRDIMENSION = 1; -var c_oserct_chartExDataNUMDIMENSION = 2; - -BinaryChartWriter.prototype.WriteCT_Data = function (oVal) { - var oThis = this; - if(oVal.id !== null) { - this.bs.WriteItem(c_oserct_chartExDataID, function() { - oThis.memory.WriteLong(oVal.id); - }); - } - if(oVal.dimension !== null) { - for (var i = 0, length = oVal.dimension.length; i < length; ++i) { - var oDimension = oVal.dimension[i]; - if (oDimension instanceof AscFormat.CNumericDimension) { - this.bs.WriteItem(c_oserct_chartExDataNUMDIMENSION, function() { - oThis.WriteCT_NumericDimension(oDimension); - }); - } else { - this.bs.WriteItem(c_oserct_chartExDataSTRDIMENSION, function() { - oThis.WriteCT_StringDimension(oDimension); - }); - } - } - } -}; -BinaryChartReader.prototype.ReadCT_Data = function (type, length, val) { - var res = c_oSerConstants.ReadOk; - var oThis = this; - var oNewVal; - if (c_oserct_chartExDataID === type) - { - val.setId(this.stream.GetULongLE()); - } - else if (c_oserct_chartExDataSTRDIMENSION === type) - { - var oNewVal = new AscFormat.CStringDimension(); - res = this.bcr.Read1(length, function (t, l) { - return oThis.ReadCT_StringDimension(t, l, oNewVal); - }); - val.addDimension(oNewVal); - } - else if (c_oserct_chartExDataNUMDIMENSION === type) - { - var oNewVal = new AscFormat.CNumericDimension(); - res = this.bcr.Read1(length, function (t, l) { - return oThis.ReadCT_NumericDimension(t, l, oNewVal); - }); - val.addDimension(oNewVal); - } - else - { - res = c_oSerConstants.ReadUnknown; - } - return res; -}; - -// CSubtotals -var c_oserct_chartExSubtotalsIDX = 0; - -BinaryChartWriter.prototype.WriteCT_Subtotals = function (oVal) { - var oThis = this; - if(oVal.idx !== null) { - for (var i = 0, length = oVal.idx.length; i < length; ++i) { - var oCurVal = oVal.idx[i]; - if (null != oCurVal) { - this.bs.WriteItem(c_oserct_chartExSubtotalsIDX, function () { - oThis.memory.WriteLong(oCurVal); - }); - } - } - } -}; -BinaryChartReader.prototype.ReadCT_Subtotals = function (type, length, val) { - var res = c_oSerConstants.ReadOk; - var oThis = this; - var oNewVal; - if (c_oserct_chartExSubtotalsIDX === type) - { - val.addIdx(this.stream.GetULongLE()); - } - else - { - res = c_oSerConstants.ReadUnknown; - } - return res; -}; - -// CSeriesElementVisibilities -var c_oserct_chartExSeriesVisibilitiesCONNECTOR = 0; -var c_oserct_chartExSeriesVisibilitiesMEANLINE = 1; -var c_oserct_chartExSeriesVisibilitiesMEANMARKER = 2; -var c_oserct_chartExSeriesVisibilitiesNONOUTLIERS = 3; -var c_oserct_chartExSeriesVisibilitiesOUTLIERS = 4; - -BinaryChartWriter.prototype.WriteCT_SeriesElementVisibilities = function (oVal) { - var oThis = this; - if(oVal.connectorLines !== null) { - this.bs.WriteItem(c_oserct_chartExSeriesVisibilitiesCONNECTOR, function() { - oThis.memory.WriteBool(oVal.connectorLines); - }); - } - if(oVal.meanLine !== null) { - this.bs.WriteItem(c_oserct_chartExSeriesVisibilitiesMEANLINE, function() { - oThis.memory.WriteBool(oVal.meanLine); - }); - } - if(oVal.meanMarker !== null) { - this.bs.WriteItem(c_oserct_chartExSeriesVisibilitiesMEANMARKER, function() { - oThis.memory.WriteBool(oVal.meanMarker); - }); - } - if(oVal.nonoutliers !== null) { - this.bs.WriteItem(c_oserct_chartExSeriesVisibilitiesNONOUTLIERS, function() { - oThis.memory.WriteBool(oVal.nonoutliers); - }); - } - if(oVal.outliers !== null) { - this.bs.WriteItem(c_oserct_chartExSeriesVisibilitiesOUTLIERS, function() { - oThis.memory.WriteBool(oVal.outliers); - }); - } -}; -BinaryChartReader.prototype.ReadCT_SeriesElementVisibilities = function (type, length, val) { - var res = c_oSerConstants.ReadOk; - var oThis = this; - var oNewVal; - if (c_oserct_chartExSeriesVisibilitiesCONNECTOR === type) - { - val.setConnectorLines(this.stream.GetBool()); - } - else if (c_oserct_chartExSeriesVisibilitiesMEANLINE === type) - { - val.setMeanLine(this.stream.GetBool()); - } - else if (c_oserct_chartExSeriesVisibilitiesMEANMARKER === type) - { - val.setMeanMarker(this.stream.GetBool()); - } - else if (c_oserct_chartExSeriesVisibilitiesNONOUTLIERS === type) - { - val.setNonoutliers(this.stream.GetBool()); - } - else if (c_oserct_chartExSeriesVisibilitiesOUTLIERS === type) - { - val.setOutliers(this.stream.GetBool()); - } - else - { - res = c_oSerConstants.ReadUnknown; - } - return res; -}; - -// CCategoryAxisScaling -var c_oserct_chartExCatScalingGAPAUTO = 0; // ST DoubleOrAutomatic -var c_oserct_chartExCatScalingGAPVAL = 1; // ST DoubleOrAutomatic - -BinaryChartWriter.prototype.WriteCT_CategoryAxisScaling = function (oVal) { - var oThis = this; - if(oVal.gapWidth !== null) { - if (oVal.gapWidth.type === EDoubleOrAutomatic.typeDouble) { - this.bs.WriteItem(c_oserct_chartExCatScalingGAPVAL, function() { - oThis.memory.WriteDouble2(oVal.gapWidth.value); - }); - } else { - this.bs.WriteItem(c_oserct_chartExCatScalingGAPAUTO, function() { - oThis.memory.WriteByte(oVal.gapWidth.value); - }); - } - } -}; -BinaryChartReader.prototype.ReadCT_CategoryAxisScaling = function (type, length, val) { - var res = c_oSerConstants.ReadOk; - var oThis = this; - var oNewVal; - if (c_oserct_chartExCatScalingGAPVAL === type) - { - var oNewVal = new AscFormat.CDoubleOrAutomatic(); - oNewVal.setValue(this.stream.GetDoubleLE()); - oNewVal.setType(EDoubleOrAutomatic.typeDouble); - val.setGapWidth(oNewVal); - } - else if (c_oserct_chartExCatScalingGAPAUTO === type) - { - var oNewVal = new AscFormat.CDoubleOrAutomatic(); - oNewVal.setValue(this.stream.GetUChar()); - oNewVal.setType(EDoubleOrAutomatic.typeAuto); - val.setGapWidth(oNewVal); - } - else - { - res = c_oSerConstants.ReadUnknown; - } - return res; -}; - -// CValueAxisScaling -var c_oserct_chartExValScalingMAXAUTO = 0; // ST DoubleOrAutomatic -var c_oserct_chartExValScalingMAXVAL = 1; // ST DoubleOrAutomatic -var c_oserct_chartExValScalingMINAUTO = 2; // ST DoubleOrAutomatic -var c_oserct_chartExValScalingMINVAL = 3; // ST DoubleOrAutomatic -var c_oserct_chartExValScalingMAJUNITAUTO = 4; // ST DoubleOrAutomatic -var c_oserct_chartExValScalingMAJUNITVAL = 5; // ST DoubleOrAutomatic -var c_oserct_chartExValScalingMINUNITAUTO = 6; // ST DoubleOrAutomatic -var c_oserct_chartExValScalingMINUNITVAL = 7; // ST DoubleOrAutomatic - -BinaryChartWriter.prototype.WriteCT_ValueAxisScaling = function (oVal) { - var oThis = this; - if(oVal.max !== null) { - if (oVal.max.type === EDoubleOrAutomatic.typeDouble) { - this.bs.WriteItem(c_oserct_chartExValScalingMAXVAL, function() { - oThis.memory.WriteDouble2(oVal.max.value); - }); - } else { - this.bs.WriteItem(c_oserct_chartExValScalingMAXAUTO, function() { - oThis.memory.WriteByte(oVal.max.value); - }); - } - } - if(oVal.min !== null) { - if (oVal.min.type === EDoubleOrAutomatic.typeDouble) { - this.bs.WriteItem(c_oserct_chartExValScalingMINVAL, function() { - oThis.memory.WriteDouble2(oVal.min.value); - }); - } else { - this.bs.WriteItem(c_oserct_chartExValScalingMINAUTO, function() { - oThis.memory.WriteByte(oVal.min.value); - }); - } - } - if(oVal.majorUnit !== null) { - if (oVal.majorUnit.type === EDoubleOrAutomatic.typeDouble) { - this.bs.WriteItem(c_oserct_chartExValScalingMAJUNITVAL, function() { - oThis.memory.WriteDouble2(oVal.majorUnit.value); - }); - } else { - this.bs.WriteItem(c_oserct_chartExValScalingMAJUNITAUTO, function() { - oThis.memory.WriteByte(oVal.majorUnit.value); - }); - } - } - if(oVal.minorUnit !== null) { - if (oVal.minorUnit.type === EDoubleOrAutomatic.typeDouble) { - this.bs.WriteItem(c_oserct_chartExValScalingMINUNITVAL, function() { - oThis.memory.WriteDouble2(oVal.minorUnit.value); - }); - } else { - this.bs.WriteItem(c_oserct_chartExValScalingMINUNITAUTO, function() { - oThis.memory.WriteByte(oVal.minorUnit.value); - }); - } - } -}; -BinaryChartReader.prototype.ReadCT_ValueAxisScaling = function (type, length, val) { - var res = c_oSerConstants.ReadOk; - var oThis = this; - var oNewVal; - if (c_oserct_chartExValScalingMAXAUTO === type) - { - var oNewVal = new AscFormat.CDoubleOrAutomatic(); - oNewVal.setValue(this.stream.GetUChar()); - oNewVal.setType(EDoubleOrAutomatic.typeAuto); - val.setMax(oNewVal); - } - else if (c_oserct_chartExValScalingMAXVAL === type) - { - var oNewVal = new AscFormat.CDoubleOrAutomatic(); - oNewVal.setValue(this.stream.GetDoubleLE()); - oNewVal.setType(EDoubleOrAutomatic.typeDouble); - val.setMax(oNewVal); - } - else if (c_oserct_chartExValScalingMINAUTO === type) - { - var oNewVal = new AscFormat.CDoubleOrAutomatic(); - oNewVal.setValue(this.stream.GetUChar()); - oNewVal.setType(EDoubleOrAutomatic.typeAuto); - val.setMin(oNewVal); - } - else if (c_oserct_chartExValScalingMINVAL === type) - { - var oNewVal = new AscFormat.CDoubleOrAutomatic(); - oNewVal.setValue(this.stream.GetDoubleLE()); - oNewVal.setType(EDoubleOrAutomatic.typeDouble); - val.setMin(oNewVal); - } - else if (c_oserct_chartExValScalingMAJUNITAUTO === type) - { - var oNewVal = new AscFormat.CDoubleOrAutomatic(); - oNewVal.setValue(this.stream.GetUChar()); - oNewVal.setType(EDoubleOrAutomatic.typeAuto); - val.setMajorUnit(oNewVal); - } - else if (c_oserct_chartExValScalingMAJUNITVAL === type) - { - var oNewVal = new AscFormat.CDoubleOrAutomatic(); - oNewVal.setValue(this.stream.GetDoubleLE()); - oNewVal.setType(EDoubleOrAutomatic.typeDouble); - val.setMajorUnit(oNewVal); - } - else if (c_oserct_chartExValScalingMINUNITAUTO === type) - { - var oNewVal = new AscFormat.CDoubleOrAutomatic(); - oNewVal.setValue(this.stream.GetUChar()); - oNewVal.setType(EDoubleOrAutomatic.typeAuto); - val.setMinorUnit(oNewVal); - } - else if (c_oserct_chartExValScalingMINUNITVAL === type) - { - var oNewVal = new AscFormat.CDoubleOrAutomatic(); - oNewVal.setValue(this.stream.GetDoubleLE()); - oNewVal.setType(EDoubleOrAutomatic.typeDouble); - val.setMinorUnit(oNewVal); - } - else - { - res = c_oSerConstants.ReadUnknown; - } - return res; -}; - -// CAxisUnits -var c_oserct_chartExAxisUnitTYPE = 0; // ST AxisUnit -var c_oserct_chartExAxisUnitLABEL = 1; - -BinaryChartWriter.prototype.WriteCT_AxisUnits = function (oVal) { - var oThis = this; - if(oVal.unitsLabel !== null) { - this.bs.WriteItem(c_oserct_chartExAxisUnitLABEL, function() { - oThis.WriteCT_AxisUnitsLabel(oVal.unitsLabel); - }); - } - if(oVal.unit !== null) { - this.bs.WriteItem(c_oserct_chartExAxisUnitTYPE, function() { - oThis.memory.WriteByte(oVal.unit); - }); - } -}; -BinaryChartReader.prototype.ReadCT_AxisUnits = function (type, length, val) { - var res = c_oSerConstants.ReadOk; - var oThis = this; - var oNewVal; - if (c_oserct_chartExAxisUnitLABEL === type) - { - var oNewVal = new AscFormat.CAxisUnitsLabel(); - res = this.bcr.Read1(length, function (t, l) { - return oThis.ReadCT_AxisUnitsLabel(t, l, oNewVal); - }); - val.setUnitsLabel(oNewVal); - } - else if (c_oserct_chartExAxisUnitTYPE === type) - { - val.setUnit(this.stream.GetUChar()); - } - else - { - res = c_oSerConstants.ReadUnknown; - } - return res; -}; - -// CAxisUnitsLabel -var c_oserct_chartExAxisUnitsLabelTEXT = 0; -var c_oserct_chartExAxisUnitsLabelSPPR = 1; -var c_oserct_chartExAxisUnitsLabelTXPR = 2; - -BinaryChartWriter.prototype.WriteCT_AxisUnitsLabel = function (oVal) { - var oThis = this; - if(oVal.tx !== null) { - this.bs.WriteItem(c_oserct_chartExAxisUnitsLabelTEXT, function() { - oThis.WriteCT_Text(oVal.tx); - }); - } - if(oVal.spPr !== null) { - this.bs.WriteItem(c_oserct_chartExAxisUnitsLabelSPPR, function() { - oThis.WriteSpPr(oVal.spPr); - }); - } - if(oVal.txPr !== null) { - this.bs.WriteItem(c_oserct_chartExAxisUnitsLabelTXPR, function() { - oThis.WriteTxPr(oVal.txPr); - }); - } -}; -BinaryChartReader.prototype.ReadCT_AxisUnitsLabel = function (type, length, val) { - var res = c_oSerConstants.ReadOk; - var oThis = this; - var oNewVal; - if (c_oserct_chartExAxisUnitsLabelTEXT === type) - { - var oNewVal = new AscFormat.CText(); - res = this.bcr.Read1(length, function (t, l) { - return oThis.ReadCT_Text(t, l, oNewVal); - }); - val.setTx(oNewVal); - } - else if (c_oserct_chartExAxisUnitsLabelSPPR === type) - { - val.setSpPr(this.ReadSpPr(length)); - val.spPr.setParent(val); - } - else if (c_oserct_chartExAxisUnitsLabelTXPR === type) - { - val.setTxPr(this.ReadTxPr(length)); - val.txPr.setParent(val); - } - else - { - res = c_oSerConstants.ReadUnknown; - } - return res; -}; - -// CTickMarks -var c_oserct_chartExTickMarksTYPE = 0; // ST TickMarksType - -BinaryChartWriter.prototype.WriteCT_TickMarks = function (oVal) { - var oThis = this; - if(oVal.type !== null) { - this.bs.WriteItem(c_oserct_chartExTickMarksTYPE, function() { - oThis.memory.WriteByte(oVal.type); - }); - } -}; -BinaryChartReader.prototype.ReadCT_TickMarks = function (type, length, val) { - var res = c_oSerConstants.ReadOk; - var oThis = this; - var oNewVal; - if (c_oserct_chartExTickMarksTYPE === type) - { - val.setType(this.stream.GetUChar()); - } - else - { - res = c_oSerConstants.ReadUnknown; - } - return res; -}; - -// CGridlines -var c_oserct_chartExGridlinesSPPR = 0; - -BinaryChartWriter.prototype.WriteCT_Gridlines = function (oVal) { - var oThis = this; - if(oVal.spPr !== null) { - this.bs.WriteItem(c_oserct_chartExGridlinesSPPR, function() { - oThis.WriteSpPr(oVal.spPr); - }); - } -}; -BinaryChartReader.prototype.ReadCT_Gridlines = function (type, length, val) { - var res = c_oSerConstants.ReadOk; - var oThis = this; - var oNewVal; - if (c_oserct_chartExGridlinesSPPR === type) - { - val.setSpPr(this.ReadSpPr(length)); - val.spPr.setParent(val); - } - else - { - res = c_oSerConstants.ReadUnknown; - } - return res; -}; - -// CStatistics -var c_oserct_chartExStatisticsMETHOD = 0; // ST QuartileMethod - -BinaryChartWriter.prototype.WriteCT_Statistics = function (oVal) { - var oThis = this; - if(oVal.quartileMethod !== null) { - this.bs.WriteItem(c_oserct_chartExStatisticsMETHOD, function() { - oThis.memory.WriteByte(oVal.quartileMethod); - }); - } -}; -BinaryChartReader.prototype.ReadCT_Statistics = function (type, length, val) { - var res = c_oSerConstants.ReadOk; - var oThis = this; - var oNewVal; - if (c_oserct_chartExStatisticsMETHOD === type) - { - val.setQuartileMethod(this.stream.GetUChar()); - } - else - { - res = c_oSerConstants.ReadUnknown; - } - return res; -}; - -// CStringDimension, CNumericDimension -var c_oserct_chartExDataDimensionTYPE = 0; -var c_oserct_chartExDataDimensionFORMULA = 1; -var c_oserct_chartExDataDimensionNF = 2; -var c_oserct_chartExDataDimensionSTRINGLEVEL = 3; -var c_oserct_chartExDataDimensionNUMERICLEVEL = 4; - -BinaryChartWriter.prototype.WriteCT_StringDimension = function (oVal) { - var oThis = this; - if(oVal.type !== null) { - this.bs.WriteItem(c_oserct_chartExDataDimensionTYPE, function() { - oThis.memory.WriteBool(oVal.type.dimensionType); - }); - } - if(oVal.f !== null) { - this.bs.WriteItem(c_oserct_chartExDataDimensionFORMULA, function() { - oThis.WriteCT_Formula(oVal.f); - }); - } - if(oVal.nf !== null) { - this.bs.WriteItem(c_oserct_chartExDataDimensionNF, function() { - oThis.memory.WriteString3(oVal.nf); - }); - } - if(oVal.levelData !== null) { - for (var i = 0, length = oVal.levelData.length; i < length; ++i) { - var oCurVal = oVal.levelData[i]; - if (null != oCurVal) { - this.bs.WriteItem(c_oserct_chartExDataDimensionSTRINGLEVEL, function () { - oThis.WriteCT_StringLevel(oCurVal); - }); - } - } - } -}; -BinaryChartReader.prototype.ReadCT_StringDimension = function (type, length, val) { - var res = c_oSerConstants.ReadOk; - var oThis = this; - var oNewVal; - if (c_oserct_chartExDataDimensionTYPE === type) - { - var oNewVal = new AscFormat.CDimensionType(); - oNewVal.setDimensionType(this.stream.GetUChar()); - val.addLevelData(oNewVal); - } - else if (c_oserct_chartExDataDimensionFORMULA === type) - { - var oNewVal = new AscFormat.CFormula(); - res = this.bcr.Read2(length, function (t, l) { - return oThis.ReadCT_Formula(t, l, oNewVal); - }); - val.setF(oNewVal); - } - else if (c_oserct_chartExDataDimensionNF === type) - { - val.setNf(this.stream.GetString2LE(length)); - } - else if (c_oserct_chartExDataDimensionSTRINGLEVEL === type) - { - var oNewVal = new AscFormat.CStringLevel(); - res = this.bcr.Read1(length, function (t, l) { - return oThis.ReadCT_StringLevel(t, l, oNewVal); - }); - val.addLevelData(oNewVal); - } - else - { - res = c_oSerConstants.ReadUnknown; - } - return res; -}; - -BinaryChartWriter.prototype.WriteCT_NumericDimension = function (oVal) { - var oThis = this; - if(oVal.type !== null) { - this.bs.WriteItem(c_oserct_chartExDataDimensionTYPE, function() { - oThis.memory.WriteBool(oVal.type.dimensionType); - }); - } - if(oVal.f !== null) { - this.bs.WriteItem(c_oserct_chartExDataDimensionFORMULA, function() { - oThis.WriteCT_Formula(oVal.f); - }); - } - if(oVal.nf !== null) { - this.bs.WriteItem(c_oserct_chartExDataDimensionNF, function() { - oThis.memory.WriteString3(oVal.nf); - }); - } - if(oVal.levelData !== null) { - for (var i = 0, length = oVal.levelData.length; i < length; ++i) { - var oCurVal = oVal.levelData[i]; - if (null != oCurVal) { - this.bs.WriteItem(c_oserct_chartExDataDimensionNUMERICLEVEL, function () { - oThis.WriteCT_NumericLevel(oCurVal); - }); - } - } - } -}; -BinaryChartReader.prototype.ReadCT_NumericDimension = function (type, length, val) { - var res = c_oSerConstants.ReadOk; - var oThis = this; - var oNewVal; - if (c_oserct_chartExDataDimensionTYPE === type) - { - var oNewVal = new AscFormat.CDimensionType(); - oNewVal.setDimensionType(this.stream.GetUChar()); - val.addLevelData(oNewVal); - } - else if (c_oserct_chartExDataDimensionFORMULA === type) - { - var oNewVal = new AscFormat.CFormula(); - res = this.bcr.Read2(length, function (t, l) { - return oThis.ReadCT_Formula(t, l, oNewVal); - }); - val.setF(oNewVal); - } - else if (c_oserct_chartExDataDimensionNF === type) - { - val.setNf(this.stream.GetString2LE(length)); - } - else if (c_oserct_chartExDataDimensionNUMERICLEVEL === type) - { - var oNewVal = new AscFormat.CNumericLevel(); - res = this.bcr.Read1(length, function (t, l) { - return oThis.ReadCT_NumericLevel(t, l, oNewVal); - }); - val.addLevelData(oNewVal); - } - else - { - res = c_oSerConstants.ReadUnknown; - } - return res; -}; - -// CFormula -var c_oserct_chartExFormulaCONTENT = 0; -var c_oserct_chartExFormulaDIRECTION = 1; // ST DimensionType - -BinaryChartWriter.prototype.WriteCT_Formula = function (oVal) { - var oThis = this; - if(oVal.content !== null) { - this.bs.WriteItem(c_oserct_chartExFormulaCONTENT, function() { - oThis.memory.WriteString3(oVal.content); - }); - } - if(oVal.dir !== null) { - this.bs.WriteItem(c_oserct_chartExFormulaDIRECTION, function() { - oThis.memory.WriteByte(oVal.dir); - }); - } -}; -BinaryChartReader.prototype.ReadCT_Formula = function (type, length, val) { - var res = c_oSerConstants.ReadOk; - var oThis = this; - var oNewVal; - if (c_oserct_chartExFormulaCONTENT === type) - { - val.setContent(this.stream.GetString2LE(length)); - } - else if (c_oserct_chartExFormulaDIRECTION === type) - { - val.setDir(this.stream.GetUChar()); - } - else - { - res = c_oSerConstants.ReadUnknown; - } - return res; -}; - -// CStringLevel, CNumericLevel -var c_oserct_chartExDataLevelNAME = 0; -var c_oserct_chartExDataLevelCOUNT = 1; -var c_oserct_chartExDataLevelPT = 2; -var c_oserct_chartExDataLevelFORMATCODE = 3; - -BinaryChartWriter.prototype.WriteCT_StringLevel = function (oVal) { - var oThis = this; - if(oVal.name !== null) { - this.bs.WriteItem(c_oserct_chartExDataLevelNAME, function() { - oThis.memory.WriteString3(oVal.name); - }); - } - if(oVal.ptCount !== null) { - this.bs.WriteItem(c_oserct_chartExDataLevelCOUNT, function() { - oThis.memory.WriteLong(oVal.ptCount); - }); - } - if(oVal.pt !== null) { - for (var i = 0, length = oVal.pt.length; i < length; ++i) { - var oCurVal = oVal.pt[i]; - if (null != oCurVal) { - this.bs.WriteItem(c_oserct_chartExDataLevelPT, function () { - oThis.WriteCT_StringValue(oCurVal); - }); - } - } - } -}; -BinaryChartReader.prototype.ReadCT_StringLevel = function (type, length, val) { - var res = c_oSerConstants.ReadOk; - var oThis = this; - var oNewVal; - if (c_oserct_chartExDataLevelNAME === type) - { - val.setName(this.stream.GetString2LE(length)); - } - else if (c_oserct_chartExDataLevelCOUNT === type) - { - val.setPtCount(this.stream.GetULongLE()); - } - else if (c_oserct_chartExDataLevelPT === type) - { - var oNewVal = new AscFormat.CStringValue(); - res = this.bcr.Read2(length, function (t, l) { - return oThis.ReadCT_StringValue(t, l, oNewVal); - }); - val.addPt(oNewVal); - } - else - { - res = c_oSerConstants.ReadUnknown; - } - return res; -}; - -BinaryChartWriter.prototype.WriteCT_NumericLevel = function (oVal) { - var oThis = this; - if(oVal.name !== null) { - this.bs.WriteItem(c_oserct_chartExDataLevelNAME, function() { - oThis.memory.WriteString3(oVal.name); - }); - } - if(oVal.ptCount !== null) { - this.bs.WriteItem(c_oserct_chartExDataLevelCOUNT, function() { - oThis.memory.WriteLong(oVal.ptCount); - }); - } - if(oVal.pt !== null) { - for (var i = 0, length = oVal.pt.length; i < length; ++i) { - var oCurVal = oVal.pt[i]; - if (null != oCurVal) { - this.bs.WriteItem(c_oserct_chartExDataLevelPT, function () { - oThis.WriteCT_NumericValue(oCurVal); - }); - } - } - } - if(oVal.formatCode !== null) { - this.bs.WriteItem(c_oserct_chartExDataLevelFORMATCODE, function() { - oThis.memory.WriteString3(oVal.formatCode); - }); - } -}; -BinaryChartReader.prototype.ReadCT_NumericLevel = function (type, length, val) { - var res = c_oSerConstants.ReadOk; - var oThis = this; - var oNewVal; - if (c_oserct_chartExDataLevelNAME === type) - { - val.setName(this.stream.GetString2LE(length)); - } - else if (c_oserct_chartExDataLevelCOUNT === type) - { - val.setPtCount(this.stream.GetULongLE()); - } - else if (c_oserct_chartExDataLevelPT === type) - { - var oNewVal = new AscFormat.CNumericValue(); - res = this.bcr.Read2(length, function (t, l) { - return oThis.ReadCT_NumericValue(t, l, oNewVal); - }); - val.addPt(oNewVal); - } - else if (c_oserct_chartExDataLevelFORMATCODE === type) - { - val.setFormatCode(this.stream.GetString2LE(length)); - } - else - { - res = c_oSerConstants.ReadUnknown; - } - return res; -}; - -// CStringValue, CNumericValue -var c_oserct_chartExDataValueIDX = 0; -var c_oserct_chartExDataValueCONTENT = 1; - -BinaryChartWriter.prototype.WriteCT_StringValue = function (oVal) { - var oThis = this; - if(oVal.idx !== null) { - this.bs.WriteItem(c_oserct_chartExDataValueIDX, function() { - oThis.memory.WriteLong(oVal.idx); - }); - } - if(oVal.content !== null) { - this.bs.WriteItem(c_oserct_chartExDataValueCONTENT, function() { - oThis.memory.WriteString3(oVal.content); - }); - } -}; -BinaryChartReader.prototype.ReadCT_StringValue = function (type, length, val) { - var res = c_oSerConstants.ReadOk; - var oThis = this; - var oNewVal; - if (c_oserct_chartExDataValueIDX === type) - { - val.setIdx(this.stream.GetULongLE()); - } - else if (c_oserct_chartExDataValueCONTENT === type) - { - val.setContent(this.stream.GetString2LE(length)); - } - else - { - res = c_oSerConstants.ReadUnknown; - } - return res; -}; - -BinaryChartWriter.prototype.WriteCT_NumericValue = function (oVal) { - var oThis = this; - if(oVal.idx !== null) { - this.bs.WriteItem(c_oserct_chartExDataValueIDX, function() { - oThis.memory.WriteLong(oVal.idx); - }); - } - if(oVal.content !== null) { - this.bs.WriteItem(c_oserct_chartExDataValueCONTENT, function() { - oThis.memory.WriteDouble2(oVal.content); - }); - } -}; -BinaryChartReader.prototype.ReadCT_NumericValue = function (type, length, val) { - var res = c_oSerConstants.ReadOk; - var oThis = this; - var oNewVal; - if (c_oserct_chartExDataValueIDX === type) - { - val.setIdx(this.stream.GetULongLE()); - } - else if (c_oserct_chartExDataValueCONTENT === type) - { - val.setContent(this.stream.GetDoubleLE()); - } - else - { - res = c_oSerConstants.ReadUnknown; - } - return res; -}; - -// template -var c_oserct_testATTR1 = 0; -var c_oserct_testATTR2 = 1; - -BinaryChartWriter.prototype.WriteCT_Test = function (oVal) { - var oThis = this; - if(oVal.attr1 !== null) { - this.bs.WriteItem(c_oserct_testATTR1, function() { - oThis.WriteCT_ATTR1(oVal.attr1); - }); - } - if(oVal.attr2 !== null) { - this.bs.WriteItem(c_oserct_testATTR1, function() { - oThis.WriteCT_Attr2(oVal.attr2); - }); - } -}; -BinaryChartReader.prototype.ReadCT_Test = function (type, length, val) { - var res = c_oSerConstants.ReadOk; - var oThis = this; - var oNewVal; - if (c_oserct_testATTR1 === type) - { - var oNewVal = new AscFormat.CAttr1(); - res = this.bcr.Read1(length, function (t, l) { - return oThis.ReadCT_Attr1(t, l, oNewVal); - }); - val.setAttr1(oNewVal); - } - else if (c_oserct_testATTR2 === type) - { - var oNewVal = new AscFormat.CAttr2(); - res = this.bcr.Read2(length, function (t, l) { - return oThis.ReadCT_Attr2(t, l, oNewVal); - }); - val.setAttr2(oNewVal); - } - else - { - res = c_oSerConstants.ReadUnknown; - } - return res; -}; From 6fdbb04b574880bf500a39861003f244cd9986fd Mon Sep 17 00:00:00 2001 From: Dmitriy Aleksandrov Date: Thu, 24 Aug 2023 16:04:31 +0600 Subject: [PATCH 21/30] For bug #62819 Comment Simple Types. Fix problem with opening chartex. --- common/Drawings/Format/ChartEx.js | 609 +++++++++++++++--------------- common/SerializeChart.js | 49 +-- 2 files changed, 325 insertions(+), 333 deletions(-) diff --git a/common/Drawings/Format/ChartEx.js b/common/Drawings/Format/ChartEx.js index e747d8a214..a436ef86c3 100644 --- a/common/Drawings/Format/ChartEx.js +++ b/common/Drawings/Format/ChartEx.js @@ -2196,6 +2196,41 @@ // }; // + // Dimension + drawingsChangesMap[AscDFH.historyitem_Dimension_SetF] = function(oClass, value) { + oClass.f = value; + }; + drawingsChangesMap[AscDFH.historyitem_Dimension_SetNf] = function(oClass, value) { + oClass.nf = value; + }; + drawingsChangesMap[AscDFH.historyitem_Dimension_SetType] = function(oClass, value) { + oClass.type = value; + }; + AscDFH.changesFactory[AscDFH.historyitem_Dimension_SetF] = window['AscDFH'].CChangesDrawingsObjectNoId; + AscDFH.changesFactory[AscDFH.historyitem_Dimension_SetNf] = window['AscDFH'].CChangesDrawingsString; + AscDFH.changesFactory[AscDFH.historyitem_Dimension_SetType] = window['AscDFH'].CChangesDrawingsObjectNoId; + function CDimension() { + CBaseChartObject.call(this); + this.f = null; + this.nf = null; + this.type = null; + } + + InitClass(CDimension, CBaseChartObject, AscDFH.historyitem_type_Unknown); + + CDimension.prototype.setF = function(pr) { + History.CanAddChanges() && History.Add(new CChangesDrawingsObjectNoId(this, AscDFH.historyitem_Dimension_SetF, this.f, pr)); + this.f = pr; + }; + CDimension.prototype.setNf = function(pr) { + History.CanAddChanges() && History.Add(new CChangesDrawingsString(this, AscDFH.historyitem_Dimension_SetNf, this.nf, pr)); + this.nf = pr; + }; + CDimension.prototype.setType = function(pr) { + History.CanAddChanges() && History.Add(new CChangesDrawingsObjectNoId(this, AscDFH.historyitem_Dimension_SetType, this.type, pr)); + this.type = pr; + }; + // NumericDimension drawingsChangesMap[AscDFH.historyitem_NumericDimension_SetLevelData] = function(oClass, value) { oClass.levelData = value; @@ -3041,43 +3076,6 @@ History.CanAddChanges() && History.Add(new CChangesDrawingsObjectNoId(this, AscDFH.historyitem_Statistics_SetQuartileMethod, this.quartileMethod, pr)); this.quartileMethod = pr; }; - - - // Dimension - drawingsChangesMap[AscDFH.historyitem_Dimension_SetF] = function(oClass, value) { - oClass.f = value; - }; - drawingsChangesMap[AscDFH.historyitem_Dimension_SetNf] = function(oClass, value) { - oClass.nf = value; - }; - drawingsChangesMap[AscDFH.historyitem_Dimension_SetType] = function(oClass, value) { - oClass.type = value; - }; - AscDFH.changesFactory[AscDFH.historyitem_Dimension_SetF] = window['AscDFH'].CChangesDrawingsObjectNoId; - AscDFH.changesFactory[AscDFH.historyitem_Dimension_SetNf] = window['AscDFH'].CChangesDrawingsString; - AscDFH.changesFactory[AscDFH.historyitem_Dimension_SetType] = window['AscDFH'].CChangesDrawingsObjectNoId; - function CDimension() { - CBaseChartObject.call(this); - this.f = null; - this.nf = null; - this.type = null; - } - - InitClass(CDimension, CBaseChartObject, AscDFH.historyitem_type_Dimension); - - CDimension.prototype.setF = function(pr) { - History.CanAddChanges() && History.Add(new CChangesDrawingsObjectNoId(this, AscDFH.historyitem_Dimension_SetF, this.f, pr)); - this.f = pr; - }; - CDimension.prototype.setNf = function(pr) { - History.CanAddChanges() && History.Add(new CChangesDrawingsString(this, AscDFH.historyitem_Dimension_SetNf, this.nf, pr)); - this.nf = pr; - }; - CDimension.prototype.setType = function(pr) { - History.CanAddChanges() && History.Add(new CChangesDrawingsObjectNoId(this, AscDFH.historyitem_Dimension_SetType, this.type, pr)); - this.type = pr; - }; - // StringDimension drawingsChangesMap[AscDFH.historyitem_StringDimension_SetLevelData] = function(oClass, value) { @@ -3518,320 +3516,320 @@ // Simple Types - // SidePos - drawingsChangesMap[AscDFH.historyitem_SidePos_SetSidePos] = function(oClass, value) { - oClass.sidePos = value; - }; - AscDFH.changesFactory[AscDFH.historyitem_SidePos_SetSidePos] = window['AscDFH'].CChangesDrawingsLong; - function CSidePos() { - CBaseChartObject.call(this); - this.sidePos = null; - } + // // SidePos + // drawingsChangesMap[AscDFH.historyitem_SidePos_SetSidePos] = function(oClass, value) { + // oClass.sidePos = value; + // }; + // AscDFH.changesFactory[AscDFH.historyitem_SidePos_SetSidePos] = window['AscDFH'].CChangesDrawingsLong; + // function CSidePos() { + // CBaseChartObject.call(this); + // this.sidePos = null; + // } - InitClass(CSidePos, CBaseChartObject, AscDFH.historyitem_type_SidePos); + // InitClass(CSidePos, CBaseChartObject, AscDFH.historyitem_type_SidePos); - CSidePos.prototype.setSidePos = function(pr) { - History.CanAddChanges() && History.Add(new CChangesDrawingsLong(this, AscDFH.historyitem_SidePos_SetSidePos, this.sidePos, pr)); - this.sidePos = pr; - }; + // CSidePos.prototype.setSidePos = function(pr) { + // History.CanAddChanges() && History.Add(new CChangesDrawingsLong(this, AscDFH.historyitem_SidePos_SetSidePos, this.sidePos, pr)); + // this.sidePos = pr; + // }; - // PosAlign - drawingsChangesMap[AscDFH.historyitem_PosAlign_SetPosAlign] = function(oClass, value) { - oClass.posAlign = value; - }; - AscDFH.changesFactory[AscDFH.historyitem_PosAlign_SetPosAlign] = window['AscDFH'].CChangesDrawingsLong; - function CPosAlign() { - CBaseChartObject.call(this); - this.posAlign = null; - } + // // PosAlign + // drawingsChangesMap[AscDFH.historyitem_PosAlign_SetPosAlign] = function(oClass, value) { + // oClass.posAlign = value; + // }; + // AscDFH.changesFactory[AscDFH.historyitem_PosAlign_SetPosAlign] = window['AscDFH'].CChangesDrawingsLong; + // function CPosAlign() { + // CBaseChartObject.call(this); + // this.posAlign = null; + // } - InitClass(CPosAlign, CBaseChartObject, AscDFH.historyitem_type_PosAlign); + // InitClass(CPosAlign, CBaseChartObject, AscDFH.historyitem_type_PosAlign); - CPosAlign.prototype.setPosAlign = function(pr) { - History.CanAddChanges() && History.Add(new CChangesDrawingsLong(this, AscDFH.historyitem_PosAlign_SetPosAlign, this.posAlign, pr)); - this.posAlign = pr; - }; + // CPosAlign.prototype.setPosAlign = function(pr) { + // History.CanAddChanges() && History.Add(new CChangesDrawingsLong(this, AscDFH.historyitem_PosAlign_SetPosAlign, this.posAlign, pr)); + // this.posAlign = pr; + // }; - // AxisUnit - drawingsChangesMap[AscDFH.historyitem_AxisUnit_SetAxisUnit] = function(oClass, value) { - oClass.axisUnit = value; - }; - AscDFH.changesFactory[AscDFH.historyitem_AxisUnit_SetAxisUnit] = window['AscDFH'].CChangesDrawingsLong; - function CAxisUnit() { - CBaseChartObject.call(this); - this.axisUnit = null; - } + // // AxisUnit + // drawingsChangesMap[AscDFH.historyitem_AxisUnit_SetAxisUnit] = function(oClass, value) { + // oClass.axisUnit = value; + // }; + // AscDFH.changesFactory[AscDFH.historyitem_AxisUnit_SetAxisUnit] = window['AscDFH'].CChangesDrawingsLong; + // function CAxisUnit() { + // CBaseChartObject.call(this); + // this.axisUnit = null; + // } - InitClass(CAxisUnit, CBaseChartObject, AscDFH.historyitem_type_AxisUnit); + // InitClass(CAxisUnit, CBaseChartObject, AscDFH.historyitem_type_AxisUnit); - CAxisUnit.prototype.setAxisUnit = function(pr) { - History.CanAddChanges() && History.Add(new CChangesDrawingsLong(this, AscDFH.historyitem_AxisUnit_SetAxisUnit, this.axisUnit, pr)); - this.axisUnit = pr; - }; + // CAxisUnit.prototype.setAxisUnit = function(pr) { + // History.CanAddChanges() && History.Add(new CChangesDrawingsLong(this, AscDFH.historyitem_AxisUnit_SetAxisUnit, this.axisUnit, pr)); + // this.axisUnit = pr; + // }; - // FormulaDirection - drawingsChangesMap[AscDFH.historyitem_FormulaDirection_SetFormulaDirection] = function(oClass, value) { - oClass.formulaDirection = value; - }; - AscDFH.changesFactory[AscDFH.historyitem_FormulaDirection_SetFormulaDirection] = window['AscDFH'].CChangesDrawingsLong; - function CFormulaDirection() { - CBaseChartObject.call(this); - this.formulaDirection = null; - } + // // FormulaDirection + // drawingsChangesMap[AscDFH.historyitem_FormulaDirection_SetFormulaDirection] = function(oClass, value) { + // oClass.formulaDirection = value; + // }; + // AscDFH.changesFactory[AscDFH.historyitem_FormulaDirection_SetFormulaDirection] = window['AscDFH'].CChangesDrawingsLong; + // function CFormulaDirection() { + // CBaseChartObject.call(this); + // this.formulaDirection = null; + // } - InitClass(CFormulaDirection, CBaseChartObject, AscDFH.historyitem_type_FormulaDirection); + // InitClass(CFormulaDirection, CBaseChartObject, AscDFH.historyitem_type_FormulaDirection); - CFormulaDirection.prototype.setFormulaDirection = function(pr) { - History.CanAddChanges() && History.Add(new CChangesDrawingsLong(this, AscDFH.historyitem_FormulaDirection_SetFormulaDirection, this.formulaDirection, pr)); - this.formulaDirection = pr; - }; + // CFormulaDirection.prototype.setFormulaDirection = function(pr) { + // History.CanAddChanges() && History.Add(new CChangesDrawingsLong(this, AscDFH.historyitem_FormulaDirection_SetFormulaDirection, this.formulaDirection, pr)); + // this.formulaDirection = pr; + // }; - // IntervalClosedSide - drawingsChangesMap[AscDFH.historyitem_IntervalClosedSide_SetIntervalClosedSide] = function(oClass, value) { - oClass.intervalClosedSide = value; - }; - AscDFH.changesFactory[AscDFH.historyitem_IntervalClosedSide_SetIntervalClosedSide] = window['AscDFH'].CChangesDrawingsLong; - function CIntervalClosedSide() { - CBaseChartObject.call(this); - this.intervalClosedSide = null; - } + // // IntervalClosedSide + // drawingsChangesMap[AscDFH.historyitem_IntervalClosedSide_SetIntervalClosedSide] = function(oClass, value) { + // oClass.intervalClosedSide = value; + // }; + // AscDFH.changesFactory[AscDFH.historyitem_IntervalClosedSide_SetIntervalClosedSide] = window['AscDFH'].CChangesDrawingsLong; + // function CIntervalClosedSide() { + // CBaseChartObject.call(this); + // this.intervalClosedSide = null; + // } - InitClass(CIntervalClosedSide, CBaseChartObject, AscDFH.historyitem_type_IntervalClosedSide); + // InitClass(CIntervalClosedSide, CBaseChartObject, AscDFH.historyitem_type_IntervalClosedSide); - CIntervalClosedSide.prototype.setIntervalClosedSide = function(pr) { - History.CanAddChanges() && History.Add(new CChangesDrawingsLong(this, AscDFH.historyitem_IntervalClosedSide_SetIntervalClosedSide, this.intervalClosedSide, pr)); - this.intervalClosedSide = pr; - }; + // CIntervalClosedSide.prototype.setIntervalClosedSide = function(pr) { + // History.CanAddChanges() && History.Add(new CChangesDrawingsLong(this, AscDFH.historyitem_IntervalClosedSide_SetIntervalClosedSide, this.intervalClosedSide, pr)); + // this.intervalClosedSide = pr; + // }; - // DimensionType (NumericDimensionType) - drawingsChangesMap[AscDFH.historyitem_DimensionType_SetDimensionType] = function(oClass, value) { - oClass.dimensionType = value; - }; - AscDFH.changesFactory[AscDFH.historyitem_DimensionType_SetDimensionType] = window['AscDFH'].CChangesDrawingsLong; - function CDimensionType() { - CBaseChartObject.call(this); - this.dimensionType = null; - } + // // DimensionType (NumericDimensionType) + // drawingsChangesMap[AscDFH.historyitem_DimensionType_SetDimensionType] = function(oClass, value) { + // oClass.dimensionType = value; + // }; + // AscDFH.changesFactory[AscDFH.historyitem_DimensionType_SetDimensionType] = window['AscDFH'].CChangesDrawingsLong; + // function CDimensionType() { + // CBaseChartObject.call(this); + // this.dimensionType = null; + // } - InitClass(CDimensionType, CBaseChartObject, AscDFH.historyitem_type_DimensionType); + // InitClass(CDimensionType, CBaseChartObject, AscDFH.historyitem_type_DimensionType); - CDimensionType.prototype.setDimensionType = function(pr) { - History.CanAddChanges() && History.Add(new CChangesDrawingsLong(this, AscDFH.historyitem_DimensionType_SetDimensionType, this.dimensionType, pr)); - this.dimensionType = pr; - }; + // CDimensionType.prototype.setDimensionType = function(pr) { + // History.CanAddChanges() && History.Add(new CChangesDrawingsLong(this, AscDFH.historyitem_DimensionType_SetDimensionType, this.dimensionType, pr)); + // this.dimensionType = pr; + // }; - // QuartileMethod - drawingsChangesMap[AscDFH.historyitem_QuartileMethod_SetQuartileMethod] = function(oClass, value) { - oClass.quartileMethod = value; - }; - AscDFH.changesFactory[AscDFH.historyitem_QuartileMethod_SetQuartileMethod] = window['AscDFH'].CChangesDrawingsLong; - function CQuartileMethod() { - CBaseChartObject.call(this); - this.quartileMethod = null; - } + // // QuartileMethod + // drawingsChangesMap[AscDFH.historyitem_QuartileMethod_SetQuartileMethod] = function(oClass, value) { + // oClass.quartileMethod = value; + // }; + // AscDFH.changesFactory[AscDFH.historyitem_QuartileMethod_SetQuartileMethod] = window['AscDFH'].CChangesDrawingsLong; + // function CQuartileMethod() { + // CBaseChartObject.call(this); + // this.quartileMethod = null; + // } - InitClass(CQuartileMethod, CBaseChartObject, AscDFH.historyitem_type_QuartileMethod); + // InitClass(CQuartileMethod, CBaseChartObject, AscDFH.historyitem_type_QuartileMethod); - CQuartileMethod.prototype.setQuartileMethod = function(pr) { - History.CanAddChanges() && History.Add(new CChangesDrawingsLong(this, AscDFH.historyitem_QuartileMethod_SetQuartileMethod, this.quartileMethod, pr)); - this.quartileMethod = pr; - }; + // CQuartileMethod.prototype.setQuartileMethod = function(pr) { + // History.CanAddChanges() && History.Add(new CChangesDrawingsLong(this, AscDFH.historyitem_QuartileMethod_SetQuartileMethod, this.quartileMethod, pr)); + // this.quartileMethod = pr; + // }; - // DataLabelPos - drawingsChangesMap[AscDFH.historyitem_DataLabelPos_SetDataLabelPos] = function(oClass, value) { - oClass.dataLabelPos = value; - }; - AscDFH.changesFactory[AscDFH.historyitem_DataLabelPos_SetDataLabelPos] = window['AscDFH'].CChangesDrawingsLong; - function CDataLabelPos() { - CBaseChartObject.call(this); - this.dataLabelPos = null; - } + // // DataLabelPos + // drawingsChangesMap[AscDFH.historyitem_DataLabelPos_SetDataLabelPos] = function(oClass, value) { + // oClass.dataLabelPos = value; + // }; + // AscDFH.changesFactory[AscDFH.historyitem_DataLabelPos_SetDataLabelPos] = window['AscDFH'].CChangesDrawingsLong; + // function CDataLabelPos() { + // CBaseChartObject.call(this); + // this.dataLabelPos = null; + // } - InitClass(CDataLabelPos, CBaseChartObject, AscDFH.historyitem_type_DataLabelPos); + // InitClass(CDataLabelPos, CBaseChartObject, AscDFH.historyitem_type_DataLabelPos); - CDataLabelPos.prototype.setDataLabelPos = function(pr) { - History.CanAddChanges() && History.Add(new CChangesDrawingsLong(this, AscDFH.historyitem_DataLabelPos_SetDataLabelPos, this.dataLabelPos, pr)); - this.dataLabelPos = pr; - }; + // CDataLabelPos.prototype.setDataLabelPos = function(pr) { + // History.CanAddChanges() && History.Add(new CChangesDrawingsLong(this, AscDFH.historyitem_DataLabelPos_SetDataLabelPos, this.dataLabelPos, pr)); + // this.dataLabelPos = pr; + // }; - // SeriesLayout - drawingsChangesMap[AscDFH.historyitem_SeriesLayout_SetSeriesLayout] = function(oClass, value) { - oClass.seriesLayout = value; - }; - AscDFH.changesFactory[AscDFH.historyitem_SeriesLayout_SetSeriesLayout] = window['AscDFH'].CChangesDrawingsLong; - function CSeriesLayout() { - CBaseChartObject.call(this); - this.seriesLayout = null; - } + // // SeriesLayout + // drawingsChangesMap[AscDFH.historyitem_SeriesLayout_SetSeriesLayout] = function(oClass, value) { + // oClass.seriesLayout = value; + // }; + // AscDFH.changesFactory[AscDFH.historyitem_SeriesLayout_SetSeriesLayout] = window['AscDFH'].CChangesDrawingsLong; + // function CSeriesLayout() { + // CBaseChartObject.call(this); + // this.seriesLayout = null; + // } - InitClass(CSeriesLayout, CBaseChartObject, AscDFH.historyitem_type_SeriesLayout); + // InitClass(CSeriesLayout, CBaseChartObject, AscDFH.historyitem_type_SeriesLayout); - CSeriesLayout.prototype.setSeriesLayout = function(pr) { - History.CanAddChanges() && History.Add(new CChangesDrawingsLong(this, AscDFH.historyitem_SeriesLayout_SetSeriesLayout, this.seriesLayout, pr)); - this.seriesLayout = pr; - }; + // CSeriesLayout.prototype.setSeriesLayout = function(pr) { + // History.CanAddChanges() && History.Add(new CChangesDrawingsLong(this, AscDFH.historyitem_SeriesLayout_SetSeriesLayout, this.seriesLayout, pr)); + // this.seriesLayout = pr; + // }; - // TickMarksType - drawingsChangesMap[AscDFH.historyitem_TickMarksType_SetTickMarksType] = function(oClass, value) { - oClass.tickMarksType = value; - }; - AscDFH.changesFactory[AscDFH.historyitem_TickMarksType_SetTickMarksType] = window['AscDFH'].CChangesDrawingsLong; - function CTickMarksType() { - CBaseChartObject.call(this); - this.tickMarksType = null; - } + // // TickMarksType + // drawingsChangesMap[AscDFH.historyitem_TickMarksType_SetTickMarksType] = function(oClass, value) { + // oClass.tickMarksType = value; + // }; + // AscDFH.changesFactory[AscDFH.historyitem_TickMarksType_SetTickMarksType] = window['AscDFH'].CChangesDrawingsLong; + // function CTickMarksType() { + // CBaseChartObject.call(this); + // this.tickMarksType = null; + // } - InitClass(CTickMarksType, CBaseChartObject, AscDFH.historyitem_type_TickMarksType); + // InitClass(CTickMarksType, CBaseChartObject, AscDFH.historyitem_type_TickMarksType); - CTickMarksType.prototype.setTickMarksType = function(pr) { - History.CanAddChanges() && History.Add(new CChangesDrawingsLong(this, AscDFH.historyitem_TickMarksType_SetTickMarksType, this.tickMarksType, pr)); - this.tickMarksType = pr; - }; + // CTickMarksType.prototype.setTickMarksType = function(pr) { + // History.CanAddChanges() && History.Add(new CChangesDrawingsLong(this, AscDFH.historyitem_TickMarksType_SetTickMarksType, this.tickMarksType, pr)); + // this.tickMarksType = pr; + // }; - // EntityType - drawingsChangesMap[AscDFH.historyitem_EntityType_SetEntityType] = function(oClass, value) { - oClass.entityType = value; - }; - AscDFH.changesFactory[AscDFH.historyitem_EntityType_SetEntityType] = window['AscDFH'].CChangesDrawingsLong; - function CEntityType() { - CBaseChartObject.call(this); - this.entityType = null; - } + // // EntityType + // drawingsChangesMap[AscDFH.historyitem_EntityType_SetEntityType] = function(oClass, value) { + // oClass.entityType = value; + // }; + // AscDFH.changesFactory[AscDFH.historyitem_EntityType_SetEntityType] = window['AscDFH'].CChangesDrawingsLong; + // function CEntityType() { + // CBaseChartObject.call(this); + // this.entityType = null; + // } - InitClass(CEntityType, CBaseChartObject, AscDFH.historyitem_type_EntityType); + // InitClass(CEntityType, CBaseChartObject, AscDFH.historyitem_type_EntityType); - CEntityType.prototype.setEntityType = function(pr) { - History.CanAddChanges() && History.Add(new CChangesDrawingsLong(this, AscDFH.historyitem_EntityType_SetEntityType, this.entityType, pr)); - this.entityType = pr; - }; + // CEntityType.prototype.setEntityType = function(pr) { + // History.CanAddChanges() && History.Add(new CChangesDrawingsLong(this, AscDFH.historyitem_EntityType_SetEntityType, this.entityType, pr)); + // this.entityType = pr; + // }; - // GeoProjectionType - drawingsChangesMap[AscDFH.historyitem_GeoProjectionType_SetGeoProjectionType] = function(oClass, value) { - oClass.geoProjectionType = value; - }; - AscDFH.changesFactory[AscDFH.historyitem_GeoProjectionType_SetGeoProjectionType] = window['AscDFH'].CChangesDrawingsLong; - function CGeoProjectionType() { - CBaseChartObject.call(this); - this.geoProjectionType = null; - } + // // GeoProjectionType + // drawingsChangesMap[AscDFH.historyitem_GeoProjectionType_SetGeoProjectionType] = function(oClass, value) { + // oClass.geoProjectionType = value; + // }; + // AscDFH.changesFactory[AscDFH.historyitem_GeoProjectionType_SetGeoProjectionType] = window['AscDFH'].CChangesDrawingsLong; + // function CGeoProjectionType() { + // CBaseChartObject.call(this); + // this.geoProjectionType = null; + // } - InitClass(CGeoProjectionType, CBaseChartObject, AscDFH.historyitem_type_GeoProjectionType); + // InitClass(CGeoProjectionType, CBaseChartObject, AscDFH.historyitem_type_GeoProjectionType); - CGeoProjectionType.prototype.setGeoProjectionType = function(pr) { - History.CanAddChanges() && History.Add(new CChangesDrawingsLong(this, AscDFH.historyitem_GeoProjectionType_SetGeoProjectionType, this.geoProjectionType, pr)); - this.geoProjectionType = pr; - }; + // CGeoProjectionType.prototype.setGeoProjectionType = function(pr) { + // History.CanAddChanges() && History.Add(new CChangesDrawingsLong(this, AscDFH.historyitem_GeoProjectionType_SetGeoProjectionType, this.geoProjectionType, pr)); + // this.geoProjectionType = pr; + // }; - // GeoMappingLevel - drawingsChangesMap[AscDFH.historyitem_GeoMappingLevel_SetGeoMappingLevel] = function(oClass, value) { - oClass.geoMappingLevel = value; - }; - AscDFH.changesFactory[AscDFH.historyitem_GeoMappingLevel_SetGeoMappingLevel] = window['AscDFH'].CChangesDrawingsLong; - function CGeoMappingLevel() { - CBaseChartObject.call(this); - this.geoMappingLevel = null; - } + // // GeoMappingLevel + // drawingsChangesMap[AscDFH.historyitem_GeoMappingLevel_SetGeoMappingLevel] = function(oClass, value) { + // oClass.geoMappingLevel = value; + // }; + // AscDFH.changesFactory[AscDFH.historyitem_GeoMappingLevel_SetGeoMappingLevel] = window['AscDFH'].CChangesDrawingsLong; + // function CGeoMappingLevel() { + // CBaseChartObject.call(this); + // this.geoMappingLevel = null; + // } - InitClass(CGeoMappingLevel, CBaseChartObject, AscDFH.historyitem_type_GeoMappingLevel); + // InitClass(CGeoMappingLevel, CBaseChartObject, AscDFH.historyitem_type_GeoMappingLevel); - CGeoMappingLevel.prototype.setGeoMappingLevel = function(pr) { - History.CanAddChanges() && History.Add(new CChangesDrawingsLong(this, AscDFH.historyitem_GeoMappingLevel_SetGeoMappingLevel, this.geoMappingLevel, pr)); - this.geoMappingLevel = pr; - }; + // CGeoMappingLevel.prototype.setGeoMappingLevel = function(pr) { + // History.CanAddChanges() && History.Add(new CChangesDrawingsLong(this, AscDFH.historyitem_GeoMappingLevel_SetGeoMappingLevel, this.geoMappingLevel, pr)); + // this.geoMappingLevel = pr; + // }; - // PageOrientation - drawingsChangesMap[AscDFH.historyitem_PageOrientation_SetPageOrientation] = function(oClass, value) { - oClass.pageOrientation = value; - }; - AscDFH.changesFactory[AscDFH.historyitem_PageOrientation_SetPageOrientation] = window['AscDFH'].CChangesDrawingsLong; - function CPageOrientation() { - CBaseChartObject.call(this); - this.pageOrientation = null; - } + // // PageOrientation + // drawingsChangesMap[AscDFH.historyitem_PageOrientation_SetPageOrientation] = function(oClass, value) { + // oClass.pageOrientation = value; + // }; + // AscDFH.changesFactory[AscDFH.historyitem_PageOrientation_SetPageOrientation] = window['AscDFH'].CChangesDrawingsLong; + // function CPageOrientation() { + // CBaseChartObject.call(this); + // this.pageOrientation = null; + // } - InitClass(CPageOrientation, CBaseChartObject, AscDFH.historyitem_type_PageOrientation); + // InitClass(CPageOrientation, CBaseChartObject, AscDFH.historyitem_type_PageOrientation); - CPageOrientation.prototype.setPageOrientation = function(pr) { - History.CanAddChanges() && History.Add(new CChangesDrawingsLong(this, AscDFH.historyitem_PageOrientation_SetPageOrientation, this.pageOrientation, pr)); - this.pageOrientation = pr; - }; + // CPageOrientation.prototype.setPageOrientation = function(pr) { + // History.CanAddChanges() && History.Add(new CChangesDrawingsLong(this, AscDFH.historyitem_PageOrientation_SetPageOrientation, this.pageOrientation, pr)); + // this.pageOrientation = pr; + // }; - // LabelLayout (ST_ParentLabelLayout) - drawingsChangesMap[AscDFH.historyitem_LabelLayout_SetLabelLayout] = function(oClass, value) { - oClass.labelLayout = value; - }; - AscDFH.changesFactory[AscDFH.historyitem_LabelLayout_SetLabelLayout] = window['AscDFH'].CChangesDrawingsLong; - function CLabelLayout() { - CBaseChartObject.call(this); - this.labelLayout = null; - } + // // LabelLayout (ST_ParentLabelLayout) + // drawingsChangesMap[AscDFH.historyitem_LabelLayout_SetLabelLayout] = function(oClass, value) { + // oClass.labelLayout = value; + // }; + // AscDFH.changesFactory[AscDFH.historyitem_LabelLayout_SetLabelLayout] = window['AscDFH'].CChangesDrawingsLong; + // function CLabelLayout() { + // CBaseChartObject.call(this); + // this.labelLayout = null; + // } - InitClass(CLabelLayout, CBaseChartObject, AscDFH.historyitem_type_LabelLayout); + // InitClass(CLabelLayout, CBaseChartObject, AscDFH.historyitem_type_LabelLayout); - CLabelLayout.prototype.setPageOrientation = function(pr) { - History.CanAddChanges() && History.Add(new CChangesDrawingsLong(this, AscDFH.historyitem_LabelLayout_SetLabelLayout, this.labelLayout, pr)); - this.labelLayout = pr; - }; + // CLabelLayout.prototype.setPageOrientation = function(pr) { + // History.CanAddChanges() && History.Add(new CChangesDrawingsLong(this, AscDFH.historyitem_LabelLayout_SetLabelLayout, this.labelLayout, pr)); + // this.labelLayout = pr; + // }; - // RegionLabelLayout (ST) - drawingsChangesMap[AscDFH.historyitem_RegionLabelLayout_SetRegionLabelLayout] = function(oClass, value) { - oClass.regionLabelLayout = value; - }; - AscDFH.changesFactory[AscDFH.historyitem_RegionLabelLayout_SetRegionLabelLayout] = window['AscDFH'].CChangesDrawingsLong; - function CRegionLabelLayout() { - CBaseChartObject.call(this); - this.regionLabelLayout = null; - } + // // RegionLabelLayout (ST) + // drawingsChangesMap[AscDFH.historyitem_RegionLabelLayout_SetRegionLabelLayout] = function(oClass, value) { + // oClass.regionLabelLayout = value; + // }; + // AscDFH.changesFactory[AscDFH.historyitem_RegionLabelLayout_SetRegionLabelLayout] = window['AscDFH'].CChangesDrawingsLong; + // function CRegionLabelLayout() { + // CBaseChartObject.call(this); + // this.regionLabelLayout = null; + // } - InitClass(CRegionLabelLayout, CBaseChartObject, AscDFH.historyitem_type_RegionLabelLayout); + // InitClass(CRegionLabelLayout, CBaseChartObject, AscDFH.historyitem_type_RegionLabelLayout); - CRegionLabelLayout.prototype.setPageOrientation = function(pr) { - History.CanAddChanges() && History.Add(new CChangesDrawingsLong(this, AscDFH.historyitem_RegionLabelLayout_SetRegionLabelLayout, this.regionLabelLayout, pr)); - this.regionLabelLayout = pr; - }; + // CRegionLabelLayout.prototype.setPageOrientation = function(pr) { + // History.CanAddChanges() && History.Add(new CChangesDrawingsLong(this, AscDFH.historyitem_RegionLabelLayout_SetRegionLabelLayout, this.regionLabelLayout, pr)); + // this.regionLabelLayout = pr; + // }; - // DoubleOrAutomatic - drawingsChangesMap[AscDFH.historyitem_DoubleOrAutomatic_SetValue] = function(oClass, value) { - oClass.value = value; - }; - drawingsChangesMap[AscDFH.historyitem_DoubleOrAutomatic_SetType] = function(oClass, value) { - oClass.type = value; - }; - AscDFH.changesFactory[AscDFH.historyitem_DoubleOrAutomatic_SetValue] = window['AscDFH'].CChangesDrawingsLong; - AscDFH.changesFactory[AscDFH.historyitem_DoubleOrAutomatic_SetType] = window['AscDFH'].CChangesDrawingsDouble2; + // // DoubleOrAutomatic + // drawingsChangesMap[AscDFH.historyitem_DoubleOrAutomatic_SetValue] = function(oClass, value) { + // oClass.value = value; + // }; + // drawingsChangesMap[AscDFH.historyitem_DoubleOrAutomatic_SetType] = function(oClass, value) { + // oClass.type = value; + // }; + // AscDFH.changesFactory[AscDFH.historyitem_DoubleOrAutomatic_SetValue] = window['AscDFH'].CChangesDrawingsLong; + // AscDFH.changesFactory[AscDFH.historyitem_DoubleOrAutomatic_SetType] = window['AscDFH'].CChangesDrawingsDouble2; - const EDoubleOrAutomatic = { typeAuto: 0, typeDouble: 1}; - function CDoubleOrAutomatic() { - CBaseChartObject.call(this); - this.value = 0; - this.type = EDoubleOrAutomatic.typeAuto; - } + // const EDoubleOrAutomatic = { typeAuto: 0, typeDouble: 1}; + // function CDoubleOrAutomatic() { + // CBaseChartObject.call(this); + // this.value = 0; + // this.type = EDoubleOrAutomatic.typeAuto; + // } - InitClass(CDoubleOrAutomatic, CBaseChartObject, AscDFH.historyitem_type_DoubleOrAutomatic); - CDoubleOrAutomatic.prototype.setValue = function(pr) { - History.CanAddChanges() && History.Add(new CChangesDrawingsLong(this, AscDFH.historyitem_DoubleOrAutomatic_SetValue, this.value, pr)); - this.value = pr; - }; - CDoubleOrAutomatic.prototype.setType = function(pr) { - History.CanAddChanges() && History.Add(new CChangesDrawingsDouble2(this, AscDFH.historyitem_DoubleOrAutomatic_SetType, this.type, pr)); - this.type = pr; - }; + // InitClass(CDoubleOrAutomatic, CBaseChartObject, AscDFH.historyitem_type_DoubleOrAutomatic); + // CDoubleOrAutomatic.prototype.setValue = function(pr) { + // History.CanAddChanges() && History.Add(new CChangesDrawingsLong(this, AscDFH.historyitem_DoubleOrAutomatic_SetValue, this.value, pr)); + // this.value = pr; + // }; + // CDoubleOrAutomatic.prototype.setType = function(pr) { + // History.CanAddChanges() && History.Add(new CChangesDrawingsDouble2(this, AscDFH.historyitem_DoubleOrAutomatic_SetType, this.type, pr)); + // this.type = pr; + // }; //--------------------------------------------------------export---------------------------------------------------- window['AscFormat'] = window['AscFormat'] || {}; @@ -3890,7 +3888,7 @@ window['AscFormat'].CChartExLegend = CChartExLegend; // window['AscFormat'].CNumberColorPosition = CNumberColorPosition; // window['AscFormat'].CNumberFormat = CNumberFormat; - window['AscFormat'].CNumericDimension = CNumericDimension; + window['AscFormat'].CNumericLevel = CNumericLevel; window['AscFormat'].CNumericValue = CNumericValue; // window['AscFormat'].CPageMargins = CPageMargins; @@ -3901,13 +3899,13 @@ window['AscFormat'].CPlotAreaRegion = CPlotAreaRegion; window['AscFormat'].CPlotSurface = CPlotSurface; // window['AscFormat'].CPrintSettings = CPrintSettings; - window['AscFormat'].CRegionLabelLayout = CRegionLabelLayout; window['AscFormat'].CRelId = CRelId; window['AscFormat'].CSeries = CSeries; window['AscFormat'].CSeriesElementVisibilities = CSeriesElementVisibilities; window['AscFormat'].CSeriesLayoutProperties = CSeriesLayoutProperties; window['AscFormat'].CStatistics = CStatistics; window['AscFormat'].CDimension = CDimension; + window['AscFormat'].CNumericDimension = CNumericDimension; window['AscFormat'].CStringDimension = CStringDimension; window['AscFormat'].CStringLevel = CStringLevel; window['AscFormat'].CStringValue = CStringValue; @@ -3921,21 +3919,24 @@ window['AscFormat'].CValueColorMiddlePosition = CValueColorMiddlePosition; window['AscFormat'].CValueColorPositions = CValueColorPositions; window['AscFormat'].CValueColors = CValueColors; - window['AscFormat'].CSidePos = CSidePos; - window['AscFormat'].CPosAlign = CPosAlign; - window['AscFormat'].CAxisUnit = CAxisUnit; - window['AscFormat'].CFormulaDirection = CFormulaDirection; - window['AscFormat'].CIntervalClosedSide = CIntervalClosedSide; - window['AscFormat'].CDimensionType = CDimensionType; - window['AscFormat'].CQuartileMethod = CQuartileMethod; - window['AscFormat'].CDataLabelPos = CDataLabelPos; - window['AscFormat'].CSeriesLayout = CSeriesLayout; - window['AscFormat'].CTickMarksType = CTickMarksType; - window['AscFormat'].CEntityType = CEntityType; - window['AscFormat'].CGeoProjectionType = CGeoProjectionType; - window['AscFormat'].CGeoMappingLevel = CGeoMappingLevel; - window['AscFormat'].CPageOrientation = CPageOrientation; - window['AscFormat'].CLabelLayout = CLabelLayout; - window['AscFormat'].CRegionLabelLayout = CRegionLabelLayout; - window['AscFormat'].CDoubleOrAutomatic = CDoubleOrAutomatic; + // --------------------------------------------- + // Simple Types + // --------------------------------------------- + // window['AscFormat'].CSidePos = CSidePos; + // window['AscFormat'].CPosAlign = CPosAlign; + // window['AscFormat'].CAxisUnit = CAxisUnit; + // window['AscFormat'].CFormulaDirection = CFormulaDirection; + // window['AscFormat'].CIntervalClosedSide = CIntervalClosedSide; + // window['AscFormat'].CDimensionType = CDimensionType; + // window['AscFormat'].CQuartileMethod = CQuartileMethod; + // window['AscFormat'].CDataLabelPos = CDataLabelPos; + // window['AscFormat'].CSeriesLayout = CSeriesLayout; + // window['AscFormat'].CTickMarksType = CTickMarksType; + // window['AscFormat'].CEntityType = CEntityType; + // window['AscFormat'].CGeoProjectionType = CGeoProjectionType; + // window['AscFormat'].CGeoMappingLevel = CGeoMappingLevel; + // window['AscFormat'].CPageOrientation = CPageOrientation; + // window['AscFormat'].CLabelLayout = CLabelLayout; + // window['AscFormat'].CRegionLabelLayout = CRegionLabelLayout; + // window['AscFormat'].CDoubleOrAutomatic = CDoubleOrAutomatic; })(window); \ No newline at end of file diff --git a/common/SerializeChart.js b/common/SerializeChart.js index 3a065131a7..156c84a113 100644 --- a/common/SerializeChart.js +++ b/common/SerializeChart.js @@ -1400,7 +1400,7 @@ BinaryChartWriter.prototype.WriteCT_ChartSpace = function (oVal) { } if(null != oVal.chartData) { this.bs.WriteItem(c_oserct_chartspaceCHARTDATA, function() { - oThis.WriteCT_ChartData(oVal.chartData); // todoo this class + oThis.WriteCT_ChartData(oVal.chartData); }); } }; @@ -1408,7 +1408,7 @@ BinaryChartWriter.prototype.WriteCT_ChartExSpace = function (oVal) { var oThis = this; if(oVal.chartData !== null) { this.bs.WriteItem(c_oserct_chartExSpaceCHARTDATA, function() { - oThis.WriteCT_ChartData(oVal.chartData); // todoo this class + oThis.WriteCT_ChartData(oVal.chartData); }); } if (oVal.chart !== null) { @@ -1958,7 +1958,7 @@ BinaryChartWriter.prototype.WriteCT_Legend = function (oVal) { } if (null != oVal.align) { this.bs.WriteItem(c_oserct_legendALIGN, function () { - oThis.WriteCT_PosAlign(oVal.align); // todoo this class + oThis.memory.WriteByte(oVal.align); }); } // var oCurVal = oVal.m_extLst; @@ -2316,7 +2316,7 @@ BinaryChartWriter.prototype.WriteCT_Title = function (oVal) { } if (null != oVal.align) { this.bs.WriteItem(c_oserct_titleALIGN, function () { - oThis.WriteCT_PosAlign(oVal.align); // todoo this class + oThis.memory.WriteByte(oVal.align); }); } // var oCurVal = oVal.m_extLst; @@ -5522,7 +5522,7 @@ BinaryChartWriter.prototype.WriteCT_PlotArea = function (oVal, oChart) { } if (null != oVal.plotAreaRegion) { this.bs.WriteItem(c_oserct_plotareaPLOTAREAREGION, function () { - oThis.WriteCT_PlotAreaRegion(oVal.plotAreaRegion); // todoo this class + oThis.WriteCT_PlotAreaRegion(oVal.plotAreaRegion); }); } // var oCurVal = oVal.m_extLst; @@ -6567,7 +6567,7 @@ BinaryChartWriter.prototype.WriteCT_StringDimension = function (oVal) { var oThis = this; if(oVal.type !== null) { this.bs.WriteItem(c_oserct_chartExDataDimensionTYPE, function() { - oThis.memory.WriteBool(oVal.type.dimensionType); + oThis.memory.WriteBool(oVal.type); }); } if(oVal.f !== null) { @@ -6595,7 +6595,7 @@ BinaryChartWriter.prototype.WriteCT_NumericDimension = function (oVal) { var oThis = this; if(oVal.type !== null) { this.bs.WriteItem(c_oserct_chartExDataDimensionTYPE, function() { - oThis.memory.WriteBool(oVal.type.dimensionType); + oThis.memory.WriteBool(oVal.type); }); } if(oVal.f !== null) { @@ -7166,10 +7166,11 @@ BinaryChartReader.prototype.ReadCT_ChartSpace = function (type, length, val, cur } } else if(c_oserct_chartspaceCHARTDATA === type) { - oNewVal = {}; + oNewVal = new AscFormat.CChartData(); res = this.bcr.Read1(length, function (t, l) { - return oThis.ReadCT_ChartData(t, l, oNewVal); // todoo this class + return oThis.ReadCT_ChartData(t, l, oNewVal); }); + val.setChartData(oNewVal); } else { res = c_oSerConstants.ReadUnknown; @@ -7182,10 +7183,11 @@ BinaryChartReader.prototype.ReadCT_ChartExSpace = function (type, length, val) { var oNewVal; if(c_oserct_chartExSpaceCHARTDATA === type) { - oNewVal = {}; + oNewVal = new AscFormat.CChartData(); res = this.bcr.Read1(length, function (t, l) { - return oThis.ReadCT_ChartData(t, l, oNewVal); // todoo this class + return oThis.ReadCT_ChartData(t, l, oNewVal); }); + val.setChartData(oNewVal); } else if (c_oserct_chartExSpaceCHART === type) { oNewVal = new AscFormat.CChartEx(); @@ -7868,11 +7870,7 @@ BinaryChartReader.prototype.ReadCT_Legend = function (type, length, val) { val.txPr.setParent(val); } else if (c_oserct_legendALIGN === type) { - var oNewVal; - oNewVal = {}; - res = this.bcr.Read1(length, function (t, l) { - return oThis.ReadCT_PosAlign(t, l, oNewVal); - }); + val.setPos(this.stream.GetUChar()) } else if (c_oserct_legendEXTLST === type) { var oNewVal; @@ -8382,11 +8380,7 @@ BinaryChartReader.prototype.ReadCT_Title = function (type, length, val) { val.txPr.setParent(val); } else if (c_oserct_titleALIGN === type) { - var oNewVal; - oNewVal = {}; - res = this.bcr.Read1(length, function (t, l) { - return oThis.ReadCT_PosAlign(t, l, oNewVal); // todoo this class - }); + val.setAlign(this.stream.GetUChar()); } else if (c_oserct_titleEXTLST === type) { var oNewVal; @@ -12670,10 +12664,11 @@ BinaryChartReader.prototype.ReadCT_PlotArea = function (type, length, val, aChar // val.m_extLst = oNewVal; } else if (c_oserct_plotareaPLOTAREAREGION === type) { - var oNewVal = {}; + var oNewVal = new AscFormat.CPlotAreaRegion(); res = this.bcr.Read1(length, function (t, l) { - return oThis.ReadCT_PlotAreaRegion(t, l, oNewVal); // todoo this class + return oThis.ReadCT_PlotAreaRegion(t, l, oNewVal); }); + val.setPlotAreaRegion(oNewVal); } else res = c_oSerConstants.ReadUnknown; @@ -14074,9 +14069,7 @@ BinaryChartReader.prototype.ReadCT_StringDimension = function (type, length, val var oNewVal; if (c_oserct_chartExDataDimensionTYPE === type) { - var oNewVal = new AscFormat.CDimensionType(); - oNewVal.setDimensionType(this.stream.GetUChar()); - val.addLevelData(oNewVal); + val.setType(this.stream.GetUChar()); } else if (c_oserct_chartExDataDimensionFORMULA === type) { @@ -14110,9 +14103,7 @@ BinaryChartReader.prototype.ReadCT_NumericDimension = function (type, length, va var oNewVal; if (c_oserct_chartExDataDimensionTYPE === type) { - var oNewVal = new AscFormat.CDimensionType(); - oNewVal.setDimensionType(this.stream.GetUChar()); - val.addLevelData(oNewVal); + val.setType(this.stream.GetUChar()); } else if (c_oserct_chartExDataDimensionFORMULA === type) { From 3c49bfc22c00dc06918b0f66c5eb9dd71a49a84c Mon Sep 17 00:00:00 2001 From: Dmitriy Aleksandrov Date: Thu, 31 Aug 2023 00:29:47 +0600 Subject: [PATCH 22/30] For #62819 Add constants for Simple Types. --- common/SerializeChart.js | 70 ++++++++++++++++++++++++++++++++++++++++ 1 file changed, 70 insertions(+) diff --git a/common/SerializeChart.js b/common/SerializeChart.js index 156c84a113..d576672dc6 100644 --- a/common/SerializeChart.js +++ b/common/SerializeChart.js @@ -1280,6 +1280,76 @@ var TRENDLINE_TYPE_MOVING_AVG = 3; var TRENDLINE_TYPE_POLY = 4; var TRENDLINE_TYPE_POWER = 5; +var SERIES_LAYOUT_BOX_WHISKER = 0; +var SERIES_LAYOUT_CLUSTERED_COLUMN = 1; +var SERIES_LAYOUT_FUNNEL = 2; +var SERIES_LAYOUT_PARETO_LINE = 3; +var SERIES_LAYOUT_REGION_MAP = 4; +var SERIES_LAYOUT_SUNBURST = 5; +var SERIES_LAYOUT_TREEMAP = 6; +var SERIES_LAYOUT_WATERFALL = 7; + +var DATA_LABEL_POS_BEST_FIT = 0; +var DATA_LABEL_POS_B = 1; +var DATA_LABEL_POS_CTR = 2; +var DATA_LABEL_POS_IN_BASE = 3; +var DATA_LABEL_POS_IN_END = 4; +var DATA_LABEL_POS_L = 5; +var DATA_LABEL_POS_OUT_END = 6; +var DATA_LABEL_POS_R = 7; +var DATA_LABEL_POS_T = 8; + +var PARENT_LABEL_LAYOUT_NONE = 0; +var PARENT_LABEL_LAYOUT_BANNER = 1; +var PARENT_LABEL_LAYOUT_OVERLAPPING = 2; + +var REGION_LABEL_LAYOUT_NONE = 0; +var REGION_LABEL_LAYOUT_BEST_FIT_ONLY = 1; +var REGION_LABEL_LAYOUT_SHOW_ALL = 2; + +var INTERVAL_CLOSED_SIDE_L = 0; +var INTERVAL_CLOSED_SIDE_R = 1; + +var AXIS_UNIT_HUNDREDS = 0; +var AXIS_UNIT_THOUSANDS = 1; +var AXIS_UNIT_TEN_THOUSANDS = 2; +var AXIS_UNIT_HUNDRED_THOUSANDS = 3; +var AXIS_UNIT_MILLIONS = 4; +var AXIS_UNIT_TEN_MILLIONS = 5; +var AXIS_UNIT_HUNDRED_MILLIONS = 6; +var AXIS_UNIT_BILLIONS = 7; +var AXIS_UNIT_TRILLIONS = 8; +var AXIS_UNIT_PERCENTAGE = 9; + +var SIDE_POS_L = 0; +var SIDE_POS_T = 1; +var SIDE_POS_R = 2; +var SIDE_POS_B = 3; + +var POS_ALIGN_MIN = 0; +var POS_ALIGN_CTR = 1; +var POS_ALIGN_MAX = 2; + +var TICK_MARKS_TYPE_IN = 0; +var TICK_MARKS_TYPE_OUT = 1; +var TICK_MARKS_TYPE_CROSS = 2; +var TICK_MARKS_TYPE_NONE = 3; + +var QUARTILE_METHOD_INCLUSIVE = 0; +var QUARTILE_METHOD_EXCLUSIVE = 1; + +var STRING_DIMENSION_TYPE_CAT = 0; +var STRING_DIMENSION_TYPE_COLOR_STR = 1; + +var NUMERIC_DIMENSION_TYPE_VAL = 0; +var NUMERIC_DIMENSION_TYPE_X = 1; +var NUMERIC_DIMENSION_TYPE_Y = 2; +var NUMERIC_DIMENSION_TYPE_SIZE = 3; +var NUMERIC_DIMENSION_TYPE_COLOR_VAL = 4; + +var FORMULA_DIRECTION_COL = 0; +var FORMULA_DIRECTION_ROW = 1; + function BinaryChartWriter(memory) { this.memory = memory; this.bs = new AscCommon.BinaryCommonWriter(this.memory); From 2c310d0764561957c73b5c6004d15dfab5334976 Mon Sep 17 00:00:00 2001 From: Dmitriy Aleksandrov Date: Thu, 31 Aug 2023 13:59:58 +0600 Subject: [PATCH 23/30] For bug #62819 Add ChartExSpace --- common/Drawings/Format/ChartEx.js | 134 +++++++++++++++--------------- 1 file changed, 67 insertions(+), 67 deletions(-) diff --git a/common/Drawings/Format/ChartEx.js b/common/Drawings/Format/ChartEx.js index a436ef86c3..ebc0fa7e0e 100644 --- a/common/Drawings/Format/ChartEx.js +++ b/common/Drawings/Format/ChartEx.js @@ -552,79 +552,79 @@ }; - // // ChartSpace (constains in ChartSpace.js) - // drawingsChangesMap[AscDFH.historyitem_ChartSpace_SetChartData] = function(oClass, value) { - // oClass.chartData = value; - // }; - // drawingsChangesMap[AscDFH.historyitem_ChartSpace_SetChart] = function(oClass, value) { - // oClass.chart = value; - // }; - // drawingsChangesMap[AscDFH.historyitem_ChartSpace_SetSpPr] = function(oClass, value) { - // oClass.spPr = value; + // ChartExSpace (constains in ChartSpace.js) + drawingsChangesMap[AscDFH.historyitem_ChartSpace_SetChartData] = function(oClass, value) { + oClass.chartData = value; + }; + drawingsChangesMap[AscDFH.historyitem_ChartSpace_SetChart] = function(oClass, value) { + oClass.chart = value; + }; + drawingsChangesMap[AscDFH.historyitem_ChartSpace_SetSpPr] = function(oClass, value) { + oClass.spPr = value; + }; + drawingsChangesMap[AscDFH.historyitem_ChartSpace_SetTxPr] = function(oClass, value) { + oClass.txPr = value; + }; + drawingsChangesMap[AscDFH.historyitem_ChartSpace_SetClrMapOvr] = function(oClass, value) { + oClass.clrMapOvr = value; + }; + // drawingsChangesMap[AscDFH.historyitem_ChartSpace_SetFmtOvrs] = function(oClass, value) { + // oClass.fmtOvrs = value; // }; - // drawingsChangesMap[AscDFH.historyitem_ChartSpace_SetTxPr] = function(oClass, value) { - // oClass.txPr = value; + // drawingsChangesMap[AscDFH.historyitem_ChartSpace_SetPrintSettings] = function(oClass, value) { + // oClass.printSettings = value; // }; - // drawingsChangesMap[AscDFH.historyitem_ChartSpace_SetClrMapOvr] = function(oClass, value) { - // oClass.clrMapOvr = value; - // }; - // // drawingsChangesMap[AscDFH.historyitem_ChartSpace_SetFmtOvrs] = function(oClass, value) { - // // oClass.fmtOvrs = value; - // // }; - // // drawingsChangesMap[AscDFH.historyitem_ChartSpace_SetPrintSettings] = function(oClass, value) { - // // oClass.printSettings = value; - // // }; - // AscDFH.changesFactory[AscDFH.historyitem_ChartSpace_SetChartData] = window['AscDFH'].CChangesDrawingsObjectNoId; - // AscDFH.changesFactory[AscDFH.historyitem_ChartSpace_SetChart] = window['AscDFH'].CChangesDrawingsObjectNoId; - // AscDFH.changesFactory[AscDFH.historyitem_ChartSpace_SetSpPr] = window['AscDFH'].CChangesDrawingsObjectNoId; - // AscDFH.changesFactory[AscDFH.historyitem_ChartSpace_SetTxPr] = window['AscDFH'].CChangesDrawingsObjectNoId; - // AscDFH.changesFactory[AscDFH.historyitem_ChartSpace_SetClrMapOvr] = window['AscDFH'].CChangesDrawingsObjectNoId; - // // AscDFH.changesFactory[AscDFH.historyitem_ChartSpace_SetFmtOvrs] = window['AscDFH'].CChangesDrawingsObjectNoId; - // // AscDFH.changesFactory[AscDFH.historyitem_ChartSpace_SetPrintSettings] = window['AscDFH'].CChangesDrawingsObjectNoId; - // function CChartSpace() { - // CBaseChartObject.call(this); - // this.chartData = null; - // this.chart = null; - // this.spPr = null; - // this.txPr = null; - // this.clrMapOvr = null; - // // unused in ChartSerializeEx.h - // // this.fmtOvrs = null; - // // this.printSettings = null; + AscDFH.changesFactory[AscDFH.historyitem_ChartSpace_SetChartData] = window['AscDFH'].CChangesDrawingsObjectNoId; + AscDFH.changesFactory[AscDFH.historyitem_ChartSpace_SetChart] = window['AscDFH'].CChangesDrawingsObjectNoId; + AscDFH.changesFactory[AscDFH.historyitem_ChartSpace_SetSpPr] = window['AscDFH'].CChangesDrawingsObjectNoId; + AscDFH.changesFactory[AscDFH.historyitem_ChartSpace_SetTxPr] = window['AscDFH'].CChangesDrawingsObjectNoId; + AscDFH.changesFactory[AscDFH.historyitem_ChartSpace_SetClrMapOvr] = window['AscDFH'].CChangesDrawingsObjectNoId; + // AscDFH.changesFactory[AscDFH.historyitem_ChartSpace_SetFmtOvrs] = window['AscDFH'].CChangesDrawingsObjectNoId; + // AscDFH.changesFactory[AscDFH.historyitem_ChartSpace_SetPrintSettings] = window['AscDFH'].CChangesDrawingsObjectNoId; + function CChartExSpace() { + CBaseChartObject.call(this); + this.chartData = null; + this.chart = null; + this.spPr = null; + this.txPr = null; + this.clrMapOvr = null; + // unused in ChartSerializeEx.h + // this.fmtOvrs = null; + // this.printSettings = null; - // } + } - // InitClass(CChartSpace, CBaseChartObject, AscDFH.historyitem_type_ChartSpace); + InitClass(CChartExSpace, CBaseChartObject, AscDFH.historyitem_type_ChartSpace); - // CChartSpace.prototype.setChartData = function(pr) { - // History.CanAddChanges() && History.Add(new CChangesDrawingsObjectNoId(this, AscDFH.historyitem_ChartSpace_SetChartData, this.chartData, pr)); - // this.chartData = pr; - // }; - // CChartSpace.prototype.setChart = function(pr) { - // History.CanAddChanges() && History.Add(new CChangesDrawingsObjectNoId(this, AscDFH.historyitem_ChartSpace_SetChart, this.chart, pr)); - // this.chart = pr; - // }; - // CChartSpace.prototype.setSpPr = function(pr) { - // History.CanAddChanges() && History.Add(new CChangesDrawingsObjectNoId(this, AscDFH.historyitem_ChartSpace_SetSpPr, this.spPr, pr)); - // this.spPr = pr; + CChartExSpace.prototype.setChartData = function(pr) { + History.CanAddChanges() && History.Add(new CChangesDrawingsObjectNoId(this, AscDFH.historyitem_ChartSpace_SetChartData, this.chartData, pr)); + this.chartData = pr; + }; + CChartExSpace.prototype.setChart = function(pr) { + History.CanAddChanges() && History.Add(new CChangesDrawingsObjectNoId(this, AscDFH.historyitem_ChartSpace_SetChart, this.chart, pr)); + this.chart = pr; + }; + CChartExSpace.prototype.setSpPr = function(pr) { + History.CanAddChanges() && History.Add(new CChangesDrawingsObjectNoId(this, AscDFH.historyitem_ChartSpace_SetSpPr, this.spPr, pr)); + this.spPr = pr; + }; + CChartExSpace.prototype.setTxPr = function(pr) { + History.CanAddChanges() && History.Add(new CChangesDrawingsObjectNoId(this, AscDFH.historyitem_ChartSpace_SetTxPr, this.txPr, pr)); + this.txPr = pr; + }; + CChartExSpace.prototype.setClrMapOvr = function(pr) { + History.CanAddChanges() && History.Add(new CChangesDrawingsObjectNoId(this, AscDFH.historyitem_ChartSpace_SetClrMapOvr, this.clrMapOvr, pr)); + this.clrMapOvr = pr; + }; + // CChartExSpace.prototype.setFmtOvrs = function(pr) { + // History.CanAddChanges() && History.Add(new CChangesDrawingsObjectNoId(this, AscDFH.historyitem_ChartSpace_SetFmtOvrs, this.fmtOvrs, pr)); + // this.fmtOvrs = pr; // }; - // CChartSpace.prototype.setTxPr = function(pr) { - // History.CanAddChanges() && History.Add(new CChangesDrawingsObjectNoId(this, AscDFH.historyitem_ChartSpace_SetTxPr, this.txPr, pr)); - // this.txPr = pr; + // CChartExSpace.prototype.setPrintSettings = function(pr) { + // History.CanAddChanges() && History.Add(new CChangesDrawingsObjectNoId(this, AscDFH.historyitem_ChartSpace_SetPrintSettings, this.printSettings, pr)); + // this.printSettings = pr; // }; - // CChartSpace.prototype.setClrMapOvr = function(pr) { - // History.CanAddChanges() && History.Add(new CChangesDrawingsObjectNoId(this, AscDFH.historyitem_ChartSpace_SetClrMapOvr, this.clrMapOvr, pr)); - // this.clrMapOvr = pr; - // }; - // // CChartSpace.prototype.setFmtOvrs = function(pr) { - // // History.CanAddChanges() && History.Add(new CChangesDrawingsObjectNoId(this, AscDFH.historyitem_ChartSpace_SetFmtOvrs, this.fmtOvrs, pr)); - // // this.fmtOvrs = pr; - // // }; - // // CChartSpace.prototype.setPrintSettings = function(pr) { - // // History.CanAddChanges() && History.Add(new CChangesDrawingsObjectNoId(this, AscDFH.historyitem_ChartSpace_SetPrintSettings, this.printSettings, pr)); - // // this.printSettings = pr; - // // }; - // + // // ChartTitle (CTitle instead of CChartTitle) // drawingsChangesMap[AscDFH.historyitem_ChartTitle_SetTx] = function(oClass, value) { @@ -3843,7 +3843,7 @@ window['AscFormat'].CCategoryAxisScaling = CCategoryAxisScaling; window['AscFormat'].CChartEx = CChartEx; window['AscFormat'].CChartData = CChartData; - // window['AscFormat'].CChartSpace = CChartSpace; + window['AscFormat'].CChartExSpace = CChartExSpace; // window['AscFormat'].CChartTitle = CChartTitle; window['AscFormat'].CClear = CClear; window['AscFormat'].CCopyrights = CCopyrights; From f4abc4856a22d2ae11711cf6f81a59421bd53433 Mon Sep 17 00:00:00 2001 From: Dmitriy Aleksandrov Date: Thu, 31 Aug 2023 20:45:09 +0600 Subject: [PATCH 24/30] For bug #62819 Add license text. --- common/Drawings/Format/ChartEx.js | 34 ++++++++++++++++++++++++++++++- 1 file changed, 33 insertions(+), 1 deletion(-) diff --git a/common/Drawings/Format/ChartEx.js b/common/Drawings/Format/ChartEx.js index ebc0fa7e0e..bfa19dcada 100644 --- a/common/Drawings/Format/ChartEx.js +++ b/common/Drawings/Format/ChartEx.js @@ -1,3 +1,35 @@ +/* + * (c) Copyright Ascensio System SIA 2010-2023 + * + * This program is a free software product. You can redistribute it and/or + * modify it under the terms of the GNU Affero General Public License (AGPL) + * version 3 as published by the Free Software Foundation. In accordance with + * Section 7(a) of the GNU AGPL its Section 15 shall be amended to the effect + * that Ascensio System SIA expressly excludes the warranty of non-infringement + * of any third-party rights. + * + * This program is distributed WITHOUT ANY WARRANTY; without even the implied + * warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. For + * details, see the GNU AGPL at: http://www.gnu.org/licenses/agpl-3.0.html + * + * You can contact Ascensio System SIA at 20A-6 Ernesta Birznieka-Upish + * street, Riga, Latvia, EU, LV-1050. + * + * The interactive user interfaces in modified source and object code versions + * of the Program must display Appropriate Legal Notices, as required under + * Section 5 of the GNU AGPL version 3. + * + * Pursuant to Section 7(b) of the License you must retain the original Product + * logo when distributing the program. Pursuant to Section 7(e) we decline to + * grant you any rights under trademark law for use of our trademarks. + * + * All the Product's GUI elements, including illustrations and icon sets, as + * well as technical writing content are licensed under the terms of the + * Creative Commons Attribution-ShareAlike 4.0 International. See the License + * terms at http://creativecommons.org/licenses/by-sa/4.0/legalcode + * + */ + "use strict"; (/** @@ -3939,4 +3971,4 @@ // window['AscFormat'].CLabelLayout = CLabelLayout; // window['AscFormat'].CRegionLabelLayout = CRegionLabelLayout; // window['AscFormat'].CDoubleOrAutomatic = CDoubleOrAutomatic; -})(window); \ No newline at end of file +})(window); From fa6b5f761b3a65fe33d515407b57f099f2e337a8 Mon Sep 17 00:00:00 2001 From: Dmitriy Aleksandrov Date: Fri, 1 Sep 2023 21:52:34 +0600 Subject: [PATCH 25/30] For bug #62819 Remove dublicate classes --- common/Drawings/Format/ChartEx.js | 516 +++++++++++++------------- common/Drawings/Format/ChartFormat.js | 63 ++++ common/Drawings/Format/ChartSpace.js | 9 + common/SerializeChart.js | 34 +- 4 files changed, 345 insertions(+), 277 deletions(-) diff --git a/common/Drawings/Format/ChartEx.js b/common/Drawings/Format/ChartEx.js index bfa19dcada..511e88b6bf 100644 --- a/common/Drawings/Format/ChartEx.js +++ b/common/Drawings/Format/ChartEx.js @@ -263,69 +263,69 @@ }; - // ChartExTitle (Title contains in ChartFormat.js but different fields) - drawingsChangesMap[AscDFH.historyitem_ChartExTitle_SetTx] = function(oClass, value) { - oClass.tx = value; - }; - drawingsChangesMap[AscDFH.historyitem_ChartExTitle_SetSpPr] = function(oClass, value) { - oClass.spPr = value; - }; - drawingsChangesMap[AscDFH.historyitem_ChartExTitle_SetTxPr] = function(oClass, value) { - oClass.txPr = value; - }; - drawingsChangesMap[AscDFH.historyitem_ChartExTitle_SetPos] = function(oClass, value) { - oClass.pos = value; - }; - drawingsChangesMap[AscDFH.historyitem_ChartExTitle_SetAlign] = function(oClass, value) { - oClass.align = value; - }; - drawingsChangesMap[AscDFH.historyitem_ChartExTitle_SetOverlay] = function(oClass, value) { - oClass.overlay = value; - }; - AscDFH.changesFactory[AscDFH.historyitem_ChartExTitle_SetTx] = window['AscDFH'].CChangesDrawingsObjectNoId; - AscDFH.changesFactory[AscDFH.historyitem_ChartExTitle_SetSpPr] = window['AscDFH'].CChangesDrawingsObjectNoId; - AscDFH.changesFactory[AscDFH.historyitem_ChartExTitle_SetTxPr] = window['AscDFH'].CChangesDrawingsObjectNoId; - AscDFH.changesFactory[AscDFH.historyitem_ChartExTitle_SetPos] = window['AscDFH'].CChangesDrawingsObjectNoId; - AscDFH.changesFactory[AscDFH.historyitem_ChartExTitle_SetAlign] = window['AscDFH'].CChangesDrawingsObjectNoId; - AscDFH.changesFactory[AscDFH.historyitem_ChartExTitle_SetOverlay] = window['AscDFH'].CChangesDrawingsBool; - function CChartExTitle() { - CBaseChartObject.call(this); - this.tx = null; - this.spPr = null; - this.txPr = null; + // // ChartExTitle (Title contains in ChartFormat.js but different fields) + // drawingsChangesMap[AscDFH.historyitem_ChartExTitle_SetTx] = function(oClass, value) { + // oClass.tx = value; + // }; + // drawingsChangesMap[AscDFH.historyitem_ChartExTitle_SetSpPr] = function(oClass, value) { + // oClass.spPr = value; + // }; + // drawingsChangesMap[AscDFH.historyitem_ChartExTitle_SetTxPr] = function(oClass, value) { + // oClass.txPr = value; + // }; + // drawingsChangesMap[AscDFH.historyitem_ChartExTitle_SetPos] = function(oClass, value) { + // oClass.pos = value; + // }; + // drawingsChangesMap[AscDFH.historyitem_ChartExTitle_SetAlign] = function(oClass, value) { + // oClass.align = value; + // }; + // drawingsChangesMap[AscDFH.historyitem_ChartExTitle_SetOverlay] = function(oClass, value) { + // oClass.overlay = value; + // }; + // AscDFH.changesFactory[AscDFH.historyitem_ChartExTitle_SetTx] = window['AscDFH'].CChangesDrawingsObjectNoId; + // AscDFH.changesFactory[AscDFH.historyitem_ChartExTitle_SetSpPr] = window['AscDFH'].CChangesDrawingsObjectNoId; + // AscDFH.changesFactory[AscDFH.historyitem_ChartExTitle_SetTxPr] = window['AscDFH'].CChangesDrawingsObjectNoId; + // AscDFH.changesFactory[AscDFH.historyitem_ChartExTitle_SetPos] = window['AscDFH'].CChangesDrawingsObjectNoId; + // AscDFH.changesFactory[AscDFH.historyitem_ChartExTitle_SetAlign] = window['AscDFH'].CChangesDrawingsObjectNoId; + // AscDFH.changesFactory[AscDFH.historyitem_ChartExTitle_SetOverlay] = window['AscDFH'].CChangesDrawingsBool; + // function CChartExTitle() { + // CBaseChartObject.call(this); + // this.tx = null; + // this.spPr = null; + // this.txPr = null; - //for chart title only (but not axis title) - this.pos = null; - this.align = null; - this.overlay = null; - } + // //for chart title only (but not axis title) + // this.pos = null; + // this.align = null; + // this.overlay = null; + // } - InitClass(CChartExTitle, CBaseChartObject, AscDFH.historyitem_type_ChartExTitle); + // InitClass(CChartExTitle, CBaseChartObject, AscDFH.historyitem_type_ChartExTitle); - CChartExTitle.prototype.setTx = function(pr) { - History.CanAddChanges() && History.Add(new CChangesDrawingsObjectNoId(this, AscDFH.historyitem_ChartExTitle_SetTx, this.tx, pr)); - this.tx = pr; - }; - CChartExTitle.prototype.setSpPr = function(pr) { - History.CanAddChanges() && History.Add(new CChangesDrawingsObjectNoId(this, AscDFH.historyitem_ChartExTitle_SetSpPr, this.spPr, pr)); - this.spPr = pr; - }; - CChartExTitle.prototype.setTxPr = function(pr) { - History.CanAddChanges() && History.Add(new CChangesDrawingsObjectNoId(this, AscDFH.historyitem_ChartExTitle_SetTxPr, this.txPr, pr)); - this.txPr = pr; - }; - CChartExTitle.prototype.setPos = function(pr) { - History.CanAddChanges() && History.Add(new CChangesDrawingsObjectNoId(this, AscDFH.historyitem_ChartExTitle_SetPos, this.pos, pr)); - this.pos = pr; - }; - CChartExTitle.prototype.setAlign = function(pr) { - History.CanAddChanges() && History.Add(new CChangesDrawingsObjectNoId(this, AscDFH.historyitem_ChartExTitle_SetAlign, this.align, pr)); - this.align = pr; - }; - CChartExTitle.prototype.setOverlay = function(pr) { - History.CanAddChanges() && History.Add(new CChangesDrawingsBool(this, AscDFH.historyitem_ChartExTitle_SetOverlay, this.overlay, pr)); - this.overlay = pr; - }; + // CChartExTitle.prototype.setTx = function(pr) { + // History.CanAddChanges() && History.Add(new CChangesDrawingsObjectNoId(this, AscDFH.historyitem_ChartExTitle_SetTx, this.tx, pr)); + // this.tx = pr; + // }; + // CChartExTitle.prototype.setSpPr = function(pr) { + // History.CanAddChanges() && History.Add(new CChangesDrawingsObjectNoId(this, AscDFH.historyitem_ChartExTitle_SetSpPr, this.spPr, pr)); + // this.spPr = pr; + // }; + // CChartExTitle.prototype.setTxPr = function(pr) { + // History.CanAddChanges() && History.Add(new CChangesDrawingsObjectNoId(this, AscDFH.historyitem_ChartExTitle_SetTxPr, this.txPr, pr)); + // this.txPr = pr; + // }; + // CChartExTitle.prototype.setPos = function(pr) { + // History.CanAddChanges() && History.Add(new CChangesDrawingsObjectNoId(this, AscDFH.historyitem_ChartExTitle_SetPos, this.pos, pr)); + // this.pos = pr; + // }; + // CChartExTitle.prototype.setAlign = function(pr) { + // History.CanAddChanges() && History.Add(new CChangesDrawingsObjectNoId(this, AscDFH.historyitem_ChartExTitle_SetAlign, this.align, pr)); + // this.align = pr; + // }; + // CChartExTitle.prototype.setOverlay = function(pr) { + // History.CanAddChanges() && History.Add(new CChangesDrawingsBool(this, AscDFH.historyitem_ChartExTitle_SetOverlay, this.overlay, pr)); + // this.overlay = pr; + // }; // // AxisTitle (CTitle instead of CAxisTitle) @@ -584,78 +584,78 @@ }; - // ChartExSpace (constains in ChartSpace.js) - drawingsChangesMap[AscDFH.historyitem_ChartSpace_SetChartData] = function(oClass, value) { - oClass.chartData = value; - }; - drawingsChangesMap[AscDFH.historyitem_ChartSpace_SetChart] = function(oClass, value) { - oClass.chart = value; - }; - drawingsChangesMap[AscDFH.historyitem_ChartSpace_SetSpPr] = function(oClass, value) { - oClass.spPr = value; - }; - drawingsChangesMap[AscDFH.historyitem_ChartSpace_SetTxPr] = function(oClass, value) { - oClass.txPr = value; - }; - drawingsChangesMap[AscDFH.historyitem_ChartSpace_SetClrMapOvr] = function(oClass, value) { - oClass.clrMapOvr = value; - }; - // drawingsChangesMap[AscDFH.historyitem_ChartSpace_SetFmtOvrs] = function(oClass, value) { - // oClass.fmtOvrs = value; + // // ChartExSpace (constains in ChartSpace.js) + // drawingsChangesMap[AscDFH.historyitem_ChartSpace_SetChartData] = function(oClass, value) { + // oClass.chartData = value; // }; - // drawingsChangesMap[AscDFH.historyitem_ChartSpace_SetPrintSettings] = function(oClass, value) { - // oClass.printSettings = value; + // drawingsChangesMap[AscDFH.historyitem_ChartSpace_SetChart] = function(oClass, value) { + // oClass.chart = value; // }; - AscDFH.changesFactory[AscDFH.historyitem_ChartSpace_SetChartData] = window['AscDFH'].CChangesDrawingsObjectNoId; - AscDFH.changesFactory[AscDFH.historyitem_ChartSpace_SetChart] = window['AscDFH'].CChangesDrawingsObjectNoId; - AscDFH.changesFactory[AscDFH.historyitem_ChartSpace_SetSpPr] = window['AscDFH'].CChangesDrawingsObjectNoId; - AscDFH.changesFactory[AscDFH.historyitem_ChartSpace_SetTxPr] = window['AscDFH'].CChangesDrawingsObjectNoId; - AscDFH.changesFactory[AscDFH.historyitem_ChartSpace_SetClrMapOvr] = window['AscDFH'].CChangesDrawingsObjectNoId; - // AscDFH.changesFactory[AscDFH.historyitem_ChartSpace_SetFmtOvrs] = window['AscDFH'].CChangesDrawingsObjectNoId; - // AscDFH.changesFactory[AscDFH.historyitem_ChartSpace_SetPrintSettings] = window['AscDFH'].CChangesDrawingsObjectNoId; - function CChartExSpace() { - CBaseChartObject.call(this); - this.chartData = null; - this.chart = null; - this.spPr = null; - this.txPr = null; - this.clrMapOvr = null; - // unused in ChartSerializeEx.h - // this.fmtOvrs = null; - // this.printSettings = null; + // drawingsChangesMap[AscDFH.historyitem_ChartSpace_SetSpPr] = function(oClass, value) { + // oClass.spPr = value; + // }; + // drawingsChangesMap[AscDFH.historyitem_ChartSpace_SetTxPr] = function(oClass, value) { + // oClass.txPr = value; + // }; + // drawingsChangesMap[AscDFH.historyitem_ChartSpace_SetClrMapOvr] = function(oClass, value) { + // oClass.clrMapOvr = value; + // }; + // // drawingsChangesMap[AscDFH.historyitem_ChartSpace_SetFmtOvrs] = function(oClass, value) { + // // oClass.fmtOvrs = value; + // // }; + // // drawingsChangesMap[AscDFH.historyitem_ChartSpace_SetPrintSettings] = function(oClass, value) { + // // oClass.printSettings = value; + // // }; + // AscDFH.changesFactory[AscDFH.historyitem_ChartSpace_SetChartData] = window['AscDFH'].CChangesDrawingsObjectNoId; + // AscDFH.changesFactory[AscDFH.historyitem_ChartSpace_SetChart] = window['AscDFH'].CChangesDrawingsObjectNoId; + // AscDFH.changesFactory[AscDFH.historyitem_ChartSpace_SetSpPr] = window['AscDFH'].CChangesDrawingsObjectNoId; + // AscDFH.changesFactory[AscDFH.historyitem_ChartSpace_SetTxPr] = window['AscDFH'].CChangesDrawingsObjectNoId; + // AscDFH.changesFactory[AscDFH.historyitem_ChartSpace_SetClrMapOvr] = window['AscDFH'].CChangesDrawingsObjectNoId; + // // AscDFH.changesFactory[AscDFH.historyitem_ChartSpace_SetFmtOvrs] = window['AscDFH'].CChangesDrawingsObjectNoId; + // // AscDFH.changesFactory[AscDFH.historyitem_ChartSpace_SetPrintSettings] = window['AscDFH'].CChangesDrawingsObjectNoId; + // function CChartExSpace() { + // CBaseChartObject.call(this); + // this.chartData = null; + // this.chart = null; + // this.spPr = null; + // this.txPr = null; + // this.clrMapOvr = null; + // // unused in ChartSerializeEx.h + // // this.fmtOvrs = null; + // // this.printSettings = null; - } + // } - InitClass(CChartExSpace, CBaseChartObject, AscDFH.historyitem_type_ChartSpace); + // InitClass(CChartExSpace, CBaseChartObject, AscDFH.historyitem_type_ChartSpace); - CChartExSpace.prototype.setChartData = function(pr) { - History.CanAddChanges() && History.Add(new CChangesDrawingsObjectNoId(this, AscDFH.historyitem_ChartSpace_SetChartData, this.chartData, pr)); - this.chartData = pr; - }; - CChartExSpace.prototype.setChart = function(pr) { - History.CanAddChanges() && History.Add(new CChangesDrawingsObjectNoId(this, AscDFH.historyitem_ChartSpace_SetChart, this.chart, pr)); - this.chart = pr; - }; - CChartExSpace.prototype.setSpPr = function(pr) { - History.CanAddChanges() && History.Add(new CChangesDrawingsObjectNoId(this, AscDFH.historyitem_ChartSpace_SetSpPr, this.spPr, pr)); - this.spPr = pr; - }; - CChartExSpace.prototype.setTxPr = function(pr) { - History.CanAddChanges() && History.Add(new CChangesDrawingsObjectNoId(this, AscDFH.historyitem_ChartSpace_SetTxPr, this.txPr, pr)); - this.txPr = pr; - }; - CChartExSpace.prototype.setClrMapOvr = function(pr) { - History.CanAddChanges() && History.Add(new CChangesDrawingsObjectNoId(this, AscDFH.historyitem_ChartSpace_SetClrMapOvr, this.clrMapOvr, pr)); - this.clrMapOvr = pr; - }; - // CChartExSpace.prototype.setFmtOvrs = function(pr) { - // History.CanAddChanges() && History.Add(new CChangesDrawingsObjectNoId(this, AscDFH.historyitem_ChartSpace_SetFmtOvrs, this.fmtOvrs, pr)); - // this.fmtOvrs = pr; + // CChartExSpace.prototype.setChartData = function(pr) { + // History.CanAddChanges() && History.Add(new CChangesDrawingsObjectNoId(this, AscDFH.historyitem_ChartSpace_SetChartData, this.chartData, pr)); + // this.chartData = pr; // }; - // CChartExSpace.prototype.setPrintSettings = function(pr) { - // History.CanAddChanges() && History.Add(new CChangesDrawingsObjectNoId(this, AscDFH.historyitem_ChartSpace_SetPrintSettings, this.printSettings, pr)); - // this.printSettings = pr; + // CChartExSpace.prototype.setChart = function(pr) { + // History.CanAddChanges() && History.Add(new CChangesDrawingsObjectNoId(this, AscDFH.historyitem_ChartSpace_SetChart, this.chart, pr)); + // this.chart = pr; // }; + // CChartExSpace.prototype.setSpPr = function(pr) { + // History.CanAddChanges() && History.Add(new CChangesDrawingsObjectNoId(this, AscDFH.historyitem_ChartSpace_SetSpPr, this.spPr, pr)); + // this.spPr = pr; + // }; + // CChartExSpace.prototype.setTxPr = function(pr) { + // History.CanAddChanges() && History.Add(new CChangesDrawingsObjectNoId(this, AscDFH.historyitem_ChartSpace_SetTxPr, this.txPr, pr)); + // this.txPr = pr; + // }; + // CChartExSpace.prototype.setClrMapOvr = function(pr) { + // History.CanAddChanges() && History.Add(new CChangesDrawingsObjectNoId(this, AscDFH.historyitem_ChartSpace_SetClrMapOvr, this.clrMapOvr, pr)); + // this.clrMapOvr = pr; + // }; + // // CChartExSpace.prototype.setFmtOvrs = function(pr) { + // // History.CanAddChanges() && History.Add(new CChangesDrawingsObjectNoId(this, AscDFH.historyitem_ChartSpace_SetFmtOvrs, this.fmtOvrs, pr)); + // // this.fmtOvrs = pr; + // // }; + // // CChartExSpace.prototype.setPrintSettings = function(pr) { + // // History.CanAddChanges() && History.Add(new CChangesDrawingsObjectNoId(this, AscDFH.historyitem_ChartSpace_SetPrintSettings, this.printSettings, pr)); + // // this.printSettings = pr; + // // }; // // ChartTitle (CTitle instead of CChartTitle) @@ -2129,58 +2129,58 @@ // }; // - // ChartExLegend (Legend contains in ChartFormat.js) - drawingsChangesMap[AscDFH.historyitem_ChartExLegend_SetSpPr] = function(oClass, value) { - oClass.spPr = value; - }; - drawingsChangesMap[AscDFH.historyitem_ChartExLegend_SetTxPr] = function(oClass, value) { - oClass.txPr = value; - }; - drawingsChangesMap[AscDFH.historyitem_ChartExLegend_SetPos] = function(oClass, value) { - oClass.pos = value; - }; - drawingsChangesMap[AscDFH.historyitem_ChartExLegend_SetAlign] = function(oClass, value) { - oClass.align = value; - }; - drawingsChangesMap[AscDFH.historyitem_ChartExLegend_SetOverlay] = function(oClass, value) { - oClass.overlay = value; - }; - AscDFH.changesFactory[AscDFH.historyitem_ChartExLegend_SetSpPr] = window['AscDFH'].CChangesDrawingsObjectNoId; - AscDFH.changesFactory[AscDFH.historyitem_ChartExLegend_SetTxPr] = window['AscDFH'].CChangesDrawingsObjectNoId; - AscDFH.changesFactory[AscDFH.historyitem_ChartExLegend_SetPos] = window['AscDFH'].CChangesDrawingsObjectNoId; - AscDFH.changesFactory[AscDFH.historyitem_ChartExLegend_SetAlign] = window['AscDFH'].CChangesDrawingsObjectNoId; - AscDFH.changesFactory[AscDFH.historyitem_ChartExLegend_SetOverlay] = window['AscDFH'].CChangesDrawingsBool; - function CChartExLegend() { - CBaseChartObject.call(this); - this.spPr = null; - this.txPr = null; - this.pos = null; - this.align = null; - this.overlay = null; - } + // // ChartExLegend (Legend contains in ChartFormat.js) + // drawingsChangesMap[AscDFH.historyitem_ChartExLegend_SetSpPr] = function(oClass, value) { + // oClass.spPr = value; + // }; + // drawingsChangesMap[AscDFH.historyitem_ChartExLegend_SetTxPr] = function(oClass, value) { + // oClass.txPr = value; + // }; + // drawingsChangesMap[AscDFH.historyitem_ChartExLegend_SetPos] = function(oClass, value) { + // oClass.pos = value; + // }; + // drawingsChangesMap[AscDFH.historyitem_ChartExLegend_SetAlign] = function(oClass, value) { + // oClass.align = value; + // }; + // drawingsChangesMap[AscDFH.historyitem_ChartExLegend_SetOverlay] = function(oClass, value) { + // oClass.overlay = value; + // }; + // AscDFH.changesFactory[AscDFH.historyitem_ChartExLegend_SetSpPr] = window['AscDFH'].CChangesDrawingsObjectNoId; + // AscDFH.changesFactory[AscDFH.historyitem_ChartExLegend_SetTxPr] = window['AscDFH'].CChangesDrawingsObjectNoId; + // AscDFH.changesFactory[AscDFH.historyitem_ChartExLegend_SetPos] = window['AscDFH'].CChangesDrawingsObjectNoId; + // AscDFH.changesFactory[AscDFH.historyitem_ChartExLegend_SetAlign] = window['AscDFH'].CChangesDrawingsObjectNoId; + // AscDFH.changesFactory[AscDFH.historyitem_ChartExLegend_SetOverlay] = window['AscDFH'].CChangesDrawingsBool; + // function CChartExLegend() { + // CBaseChartObject.call(this); + // this.spPr = null; + // this.txPr = null; + // this.pos = null; + // this.align = null; + // this.overlay = null; + // } - InitClass(CChartExLegend, CBaseChartObject, AscDFH.historyitem_type_ChartExLegend); + // InitClass(CChartExLegend, CBaseChartObject, AscDFH.historyitem_type_ChartExLegend); - CChartExLegend.prototype.setSpPr = function(pr) { - History.CanAddChanges() && History.Add(new CChangesDrawingsObjectNoId(this, AscDFH.historyitem_ChartExLegend_SetSpPr, this.spPr, pr)); - this.spPr = pr; - }; - CChartExLegend.prototype.setTxPr = function(pr) { - History.CanAddChanges() && History.Add(new CChangesDrawingsObjectNoId(this, AscDFH.historyitem_ChartExLegend_SetTxPr, this.txPr, pr)); - this.txPr = pr; - }; - CChartExLegend.prototype.setPos = function(pr) { - History.CanAddChanges() && History.Add(new CChangesDrawingsObjectNoId(this, AscDFH.historyitem_ChartExLegend_SetPos, this.pos, pr)); - this.pos = pr; - }; - CChartExLegend.prototype.setAlign = function(pr) { - History.CanAddChanges() && History.Add(new CChangesDrawingsObjectNoId(this, AscDFH.historyitem_ChartExLegend_SetAlign, this.align, pr)); - this.align = pr; - }; - CChartExLegend.prototype.setOverlay = function(pr) { - History.CanAddChanges() && History.Add(new CChangesDrawingsBool(this, AscDFH.historyitem_ChartExLegend_SetOverlay, this.overlay, pr)); - this.overlay = pr; - }; + // CChartExLegend.prototype.setSpPr = function(pr) { + // History.CanAddChanges() && History.Add(new CChangesDrawingsObjectNoId(this, AscDFH.historyitem_ChartExLegend_SetSpPr, this.spPr, pr)); + // this.spPr = pr; + // }; + // CChartExLegend.prototype.setTxPr = function(pr) { + // History.CanAddChanges() && History.Add(new CChangesDrawingsObjectNoId(this, AscDFH.historyitem_ChartExLegend_SetTxPr, this.txPr, pr)); + // this.txPr = pr; + // }; + // CChartExLegend.prototype.setPos = function(pr) { + // History.CanAddChanges() && History.Add(new CChangesDrawingsObjectNoId(this, AscDFH.historyitem_ChartExLegend_SetPos, this.pos, pr)); + // this.pos = pr; + // }; + // CChartExLegend.prototype.setAlign = function(pr) { + // History.CanAddChanges() && History.Add(new CChangesDrawingsObjectNoId(this, AscDFH.historyitem_ChartExLegend_SetAlign, this.align, pr)); + // this.align = pr; + // }; + // CChartExLegend.prototype.setOverlay = function(pr) { + // History.CanAddChanges() && History.Add(new CChangesDrawingsBool(this, AscDFH.historyitem_ChartExLegend_SetOverlay, this.overlay, pr)); + // this.overlay = pr; + // }; // // NumberColorPosition (CNumericPoint replaces this class) @@ -2304,7 +2304,7 @@ }; - // NumericLevel (CNumLit contains in ChartFormat.js but different fields) + // NumericLevel drawingsChangesMap[AscDFH.historyitem_NumericLevel_SetPt] = function(oClass, value) { oClass.pt = value; }; @@ -2580,61 +2580,61 @@ }; - // PlotArea (contains in chartFormat.js but different fields) - drawingsChangesMap[AscDFH.historyitem_ChartExPlotArea_SetPlotAreaRegion] = function(oClass, value) { - oClass.plotAreaRegion = value; - }; - drawingsChangesMap[AscDFH.historyitem_ChartExPlotArea_SetAxis] = function(oClass, value) { - oClass.axis = value; - }; - drawingsChangesMap[AscDFH.historyitem_ChartExPlotArea_SetSpPr] = function(oClass, value) { - oClass.spPr = value; - }; - drawingContentChanges[AscDFH.historyitem_ChartExPlotArea_AddAxis] = - drawingContentChanges[AscDFH.historyitem_ChartExPlotArea_RemoveAxis] = function(oClass) { - return oClass.axis; - }; - AscDFH.changesFactory[AscDFH.historyitem_ChartExPlotArea_SetPlotAreaRegion] = window['AscDFH'].CChangesDrawingsObjectNoId; - AscDFH.changesFactory[AscDFH.historyitem_ChartExPlotArea_SetAxis] = window['AscDFH'].CChangesDrawingsObjectNoId; - AscDFH.changesFactory[AscDFH.historyitem_ChartExPlotArea_SetSpPr] = window['AscDFH'].CChangesDrawingsObjectNoId; - AscDFH.changesFactory[AscDFH.historyitem_ChartExPlotArea_AddAxis] = window['AscDFH'].CChangesDrawingsContent; - AscDFH.changesFactory[AscDFH.historyitem_ChartExPlotArea_RemoveAxis] = window['AscDFH'].CChangesDrawingsContent; - function CChartExPlotArea() { - CBaseChartObject.call(this); - this.plotAreaRegion = null; - this.axis = []; - this.spPr = null; - } + // // PlotArea (contains in chartFormat.js but different fields) + // drawingsChangesMap[AscDFH.historyitem_ChartExPlotArea_SetPlotAreaRegion] = function(oClass, value) { + // oClass.plotAreaRegion = value; + // }; + // drawingsChangesMap[AscDFH.historyitem_ChartExPlotArea_SetAxis] = function(oClass, value) { + // oClass.axis = value; + // }; + // drawingsChangesMap[AscDFH.historyitem_ChartExPlotArea_SetSpPr] = function(oClass, value) { + // oClass.spPr = value; + // }; + // drawingContentChanges[AscDFH.historyitem_ChartExPlotArea_AddAxis] = + // drawingContentChanges[AscDFH.historyitem_ChartExPlotArea_RemoveAxis] = function(oClass) { + // return oClass.axis; + // }; + // AscDFH.changesFactory[AscDFH.historyitem_ChartExPlotArea_SetPlotAreaRegion] = window['AscDFH'].CChangesDrawingsObjectNoId; + // AscDFH.changesFactory[AscDFH.historyitem_ChartExPlotArea_SetAxis] = window['AscDFH'].CChangesDrawingsObjectNoId; + // AscDFH.changesFactory[AscDFH.historyitem_ChartExPlotArea_SetSpPr] = window['AscDFH'].CChangesDrawingsObjectNoId; + // AscDFH.changesFactory[AscDFH.historyitem_ChartExPlotArea_AddAxis] = window['AscDFH'].CChangesDrawingsContent; + // AscDFH.changesFactory[AscDFH.historyitem_ChartExPlotArea_RemoveAxis] = window['AscDFH'].CChangesDrawingsContent; + // function CChartExPlotArea() { + // CBaseChartObject.call(this); + // this.plotAreaRegion = null; + // this.axis = []; + // this.spPr = null; + // } - InitClass(CChartExPlotArea, CBaseChartObject, AscDFH.historyitem_type_ChartExPlotArea); + // InitClass(CChartExPlotArea, CBaseChartObject, AscDFH.historyitem_type_ChartExPlotArea); - CChartExPlotArea.prototype.setPlotAreaRegion = function(pr) { - History.CanAddChanges() && History.Add(new CChangesDrawingsObjectNoId(this, AscDFH.historyitem_ChartExPlotArea_SetPlotAreaRegion, this.plotAreaRegion, pr)); - this.plotAreaRegion = pr; - }; - CChartExPlotArea.prototype.setAxis = function(pr) { - History.CanAddChanges() && History.Add(new CChangesDrawingsObjectNoId(this, AscDFH.historyitem_ChartExPlotArea_SetAxis, this.axis, pr)); - this.axis = pr; - }; - CChartExPlotArea.prototype.setSpPr = function(pr) { - History.CanAddChanges() && History.Add(new CChangesDrawingsObjectNoId(this, AscDFH.historyitem_ChartExPlotArea_SetSpPr, this.spPr, pr)); - this.spPr = pr; - }; - CChartExPlotArea.prototype.addAxis = function(pr, idx) { - var pos; - if(AscFormat.isRealNumber(idx)) - pos = idx; - else - pos = this.axis.length; - History.CanAddChanges() && History.Add(new CChangesDrawingsContent(this, AscDFH.historyitem_ChartExPlotArea_AddAxis, pos, [pr], true)); - this.axis.splice(pos, 0, pr); - }; - CChartExPlotArea.prototype.removeAxisByPos = function(pos) { - if(this.axis[pos]) { - var axis = this.axis.splice(pos, 1)[0]; - History.CanAddChanges() && History.Add(new CChangesDrawingsContent(this, AscDFH.historyitem_ChartExPlotArea_RemoveAxis, pos, [axis], false)); - } - }; + // CChartExPlotArea.prototype.setPlotAreaRegion = function(pr) { + // History.CanAddChanges() && History.Add(new CChangesDrawingsObjectNoId(this, AscDFH.historyitem_ChartExPlotArea_SetPlotAreaRegion, this.plotAreaRegion, pr)); + // this.plotAreaRegion = pr; + // }; + // CChartExPlotArea.prototype.setAxis = function(pr) { + // History.CanAddChanges() && History.Add(new CChangesDrawingsObjectNoId(this, AscDFH.historyitem_ChartExPlotArea_SetAxis, this.axis, pr)); + // this.axis = pr; + // }; + // CChartExPlotArea.prototype.setSpPr = function(pr) { + // History.CanAddChanges() && History.Add(new CChangesDrawingsObjectNoId(this, AscDFH.historyitem_ChartExPlotArea_SetSpPr, this.spPr, pr)); + // this.spPr = pr; + // }; + // CChartExPlotArea.prototype.addAxis = function(pr, idx) { + // var pos; + // if(AscFormat.isRealNumber(idx)) + // pos = idx; + // else + // pos = this.axis.length; + // History.CanAddChanges() && History.Add(new CChangesDrawingsContent(this, AscDFH.historyitem_ChartExPlotArea_AddAxis, pos, [pr], true)); + // this.axis.splice(pos, 0, pr); + // }; + // CChartExPlotArea.prototype.removeAxisByPos = function(pos) { + // if(this.axis[pos]) { + // var axis = this.axis.splice(pos, 1)[0]; + // History.CanAddChanges() && History.Add(new CChangesDrawingsContent(this, AscDFH.historyitem_ChartExPlotArea_RemoveAxis, pos, [axis], false)); + // } + // }; // PlotAreaRegion @@ -3149,7 +3149,7 @@ }; - // StringLevel (CStrCache contains in ChartFormat.js) + // StringLevel drawingsChangesMap[AscDFH.historyitem_StringLevel_SetPt] = function(oClass, value) { oClass.pt = value; }; @@ -3267,31 +3267,31 @@ }; - // Text - drawingsChangesMap[AscDFH.historyitem_Text_SetTxData] = function(oClass, value) { - oClass.txData = value; - }; - drawingsChangesMap[AscDFH.historyitem_Text_SetRich] = function(oClass, value) { - oClass.rich = value; - }; - AscDFH.changesFactory[AscDFH.historyitem_Text_SetTxData] = window['AscDFH'].CChangesDrawingsObjectNoId; - AscDFH.changesFactory[AscDFH.historyitem_Text_SetRich] = window['AscDFH'].CChangesDrawingsObjectNoId; - function CText() { - CBaseChartObject.call(this); - this.txData = null; - this.rich = null; - } + // // Text (CChartText instead CText) + // drawingsChangesMap[AscDFH.historyitem_Text_SetTxData] = function(oClass, value) { + // oClass.txData = value; + // }; + // drawingsChangesMap[AscDFH.historyitem_Text_SetRich] = function(oClass, value) { + // oClass.rich = value; + // }; + // AscDFH.changesFactory[AscDFH.historyitem_Text_SetTxData] = window['AscDFH'].CChangesDrawingsObjectNoId; + // AscDFH.changesFactory[AscDFH.historyitem_Text_SetRich] = window['AscDFH'].CChangesDrawingsObjectNoId; + // function CText() { + // CBaseChartObject.call(this); + // this.txData = null; + // this.rich = null; + // } - InitClass(CText, CBaseChartObject, AscDFH.historyitem_type_Text); + // InitClass(CText, CBaseChartObject, AscDFH.historyitem_type_Text); - CText.prototype.setTxData = function(pr) { - History.CanAddChanges() && History.Add(new CChangesDrawingsObjectNoId(this, AscDFH.historyitem_Text_SetTxData, this.txData, pr)); - this.txData = pr; - }; - CText.prototype.setRich = function(pr) { - History.CanAddChanges() && History.Add(new CChangesDrawingsObjectNoId(this, AscDFH.historyitem_Text_SetRich, this.rich, pr)); - this.rich = pr; - }; + // CText.prototype.setTxData = function(pr) { + // History.CanAddChanges() && History.Add(new CChangesDrawingsObjectNoId(this, AscDFH.historyitem_Text_SetTxData, this.txData, pr)); + // this.txData = pr; + // }; + // CText.prototype.setRich = function(pr) { + // History.CanAddChanges() && History.Add(new CChangesDrawingsObjectNoId(this, AscDFH.historyitem_Text_SetRich, this.rich, pr)); + // this.rich = pr; + // }; // TextData @@ -3867,7 +3867,7 @@ window['AscFormat'] = window['AscFormat'] || {}; window['AscFormat'].CAddress = CAddress; window['AscFormat'].CAxis = CAxis; - window['AscFormat'].CChartExTitle = CChartExTitle; + // window['AscFormat'].CChartExTitle = CChartExTitle; // window['AscFormat'].CAxisTitle = CAxisTitle; window['AscFormat'].CAxisUnits = CAxisUnits; window['AscFormat'].CAxisUnitsLabel = CAxisUnitsLabel; @@ -3875,7 +3875,7 @@ window['AscFormat'].CCategoryAxisScaling = CCategoryAxisScaling; window['AscFormat'].CChartEx = CChartEx; window['AscFormat'].CChartData = CChartData; - window['AscFormat'].CChartExSpace = CChartExSpace; + // window['AscFormat'].CChartExSpace = CChartExSpace; // window['AscFormat'].CChartTitle = CChartTitle; window['AscFormat'].CClear = CClear; window['AscFormat'].CCopyrights = CCopyrights; @@ -3917,7 +3917,7 @@ window['AscFormat'].CGeoPolygons = CGeoPolygons; window['AscFormat'].CGridlines = CGridlines; // window['AscFormat'].CHeaderFooter = CHeaderFooter; - window['AscFormat'].CChartExLegend = CChartExLegend; + // window['AscFormat'].CChartExLegend = CChartExLegend; // window['AscFormat'].CNumberColorPosition = CNumberColorPosition; // window['AscFormat'].CNumberFormat = CNumberFormat; @@ -3927,7 +3927,7 @@ // window['AscFormat'].CPageSetup = CPageSetup; window['AscFormat'].CParentLabelLayout = CParentLabelLayout; window['AscFormat'].CPercentageColorPosition = CPercentageColorPosition; - window['AscFormat'].CChartExPlotArea = CChartExPlotArea; + // window['AscFormat'].CChartExPlotArea = CChartExPlotArea; window['AscFormat'].CPlotAreaRegion = CPlotAreaRegion; window['AscFormat'].CPlotSurface = CPlotSurface; // window['AscFormat'].CPrintSettings = CPrintSettings; @@ -3942,7 +3942,7 @@ window['AscFormat'].CStringLevel = CStringLevel; window['AscFormat'].CStringValue = CStringValue; window['AscFormat'].CSubtotals = CSubtotals; - window['AscFormat'].CText = CText; + // window['AscFormat'].CText = CText; window['AscFormat'].CTextData = CTextData; // window['AscFormat'].CTickLabels = CTickLabels; window['AscFormat'].CTickMarks = CTickMarks; diff --git a/common/Drawings/Format/ChartFormat.js b/common/Drawings/Format/ChartFormat.js index 1cba857d42..7dc351668e 100644 --- a/common/Drawings/Format/ChartFormat.js +++ b/common/Drawings/Format/ChartFormat.js @@ -101,6 +101,9 @@ drawingsChangesMap[AscDFH.historyitem_PlotArea_SetDateAx] = function(oClass, value) { oClass.dateAx = value; }; + drawingsChangesMap[AscDFH.historyitem_PlotArea_SetIsForChartEx] = function(oClass, value) { + oClass.isForChartEx = value; + }; drawingsChangesMap[AscDFH.historyitem_PlotArea_SetPlotAreaRegion] = function(oClass, value) { oClass.plotAreaRegion = value; }; @@ -556,6 +559,12 @@ oClass.strRef = value; oClass.onChangeDataRefs(); }; + drawingsChangesMap[AscDFH.historyitem_ChartText_SetIsForChartEx] = function(oClass, value) { + oClass.isForChartEx = value; + }; + drawingsChangesMap[AscDFH.historyitem_ChartText_SetTxData] = function(oClass, value) { + oClass.txData = value; + }; drawingsChangesMap[AscDFH.historyitem_ChartText_SetRich] = function(oClass, value) { oClass.rich = value; }; @@ -723,6 +732,9 @@ drawingsChangesMap[AscDFH.historyitem_Layout_SetParent] = function(oClass, value) { oClass.parent = value; }; + drawingsChangesMap[AscDFH.historyitem_Legend_SetIsForChartEx] = function(oClass, value) { + oClass.isForChartEx = value; + }; drawingsChangesMap[AscDFH.historyitem_Legend_SetLayout] = function(oClass, value) { oClass.layout = value; }; @@ -1110,9 +1122,15 @@ drawingsChangesMap[AscDFH.historyitem_Title_SetTxPr] = function(oClass, value) { oClass.txPr = value; }; + drawingsChangesMap[AscDFH.historyitem_Title_SetIsForChartEx] = function(oClass, value) { + oClass.isForChartEx = value; + }; drawingsChangesMap[AscDFH.historyitem_Title_SetAlign] = function(oClass, value) { oClass.align = value; }; + drawingsChangesMap[AscDFH.historyitem_Title_SetPos] = function(oClass, value) { + oClass.pos = value; + }; drawingsChangesMap[AscDFH.historyitem_Trendline_SetBackward] = function(oClass, value) { oClass.backward = value; }; @@ -1163,6 +1181,9 @@ oClass.numRef = value; oClass.onChangeDataRefs(); }; + drawingsChangesMap[AscDFH.historyitem_Chart_SetIsForChartEx] = function(oClass, value) { + oClass.isForChartEx = value; + }; drawingsChangesMap[AscDFH.historyitem_Chart_SetAutoTitleDeleted] = function(oClass, value) { oClass.autoTitleDeleted = value; }; @@ -1560,6 +1581,7 @@ AscDFH.changesFactory[AscDFH.historyitem_Title_SetOverlay] = window['AscDFH'].CChangesDrawingsBool; AscDFH.changesFactory[AscDFH.historyitem_Trendline_SetDispEq] = window['AscDFH'].CChangesDrawingsBool; AscDFH.changesFactory[AscDFH.historyitem_Trendline_SetDispRSqr] = window['AscDFH'].CChangesDrawingsBool; + AscDFH.changesFactory[AscDFH.historyitem_Chart_SetIsForChartEx] = window['AscDFH'].CChangesDrawingsBool; AscDFH.changesFactory[AscDFH.historyitem_Chart_SetAutoTitleDeleted] = window['AscDFH'].CChangesDrawingsBool; AscDFH.changesFactory[AscDFH.historyitem_Chart_SetPlotVisOnly] = window['AscDFH'].CChangesDrawingsBool; AscDFH.changesFactory[AscDFH.historyitem_Chart_SetShowDLblsOverMax] = window['AscDFH'].CChangesDrawingsBool; @@ -1719,6 +1741,7 @@ AscDFH.changesFactory[AscDFH.historyitem_DLbl_SetTx] = window['AscDFH'].CChangesDrawingsObject; AscDFH.changesFactory[AscDFH.historyitem_DLbl_SetTxPr] = window['AscDFH'].CChangesDrawingsObject; AscDFH.changesFactory[AscDFH.historyitem_DLbl_SetParent] = window['AscDFH'].CChangesDrawingsObject; + AscDFH.changesFactory[AscDFH.historyitem_PlotArea_SetIsForChartEx] = window['AscDFH'].CChangesDrawingsBool; AscDFH.changesFactory[AscDFH.historyitem_PlotArea_SetPlotAreaRegion] = window['AscDFH'].CChangesDrawingsObjectNoId; AscDFH.changesFactory[AscDFH.historyitem_PlotArea_SetDTable] = window['AscDFH'].CChangesDrawingsObject; AscDFH.changesFactory[AscDFH.historyitem_PlotArea_SetLayout] = window['AscDFH'].CChangesDrawingsObject; @@ -1793,6 +1816,8 @@ AscDFH.changesFactory[AscDFH.historyitem_Cat_SetStrLit] = window['AscDFH'].CChangesDrawingsObject; AscDFH.changesFactory[AscDFH.historyitem_Cat_SetStrRef] = window['AscDFH'].CChangesDrawingsObject; AscDFH.changesFactory[AscDFH.historyitem_ChartFormatSetChart] = window['AscDFH'].CChangesDrawingsObject; + AscDFH.changesFactory[AscDFH.historyitem_ChartText_SetIsForChartEx] = window['AscDFH'].CChangesDrawingsBool; + AscDFH.changesFactory[AscDFH.historyitem_ChartText_SetTxData] = window['AscDFH'].CChangesDrawingsObjectNoId; AscDFH.changesFactory[AscDFH.historyitem_ChartText_SetRich] = window['AscDFH'].CChangesDrawingsObject; AscDFH.changesFactory[AscDFH.historyitem_ChartText_SetStrRef] = window['AscDFH'].CChangesDrawingsObject; AscDFH.changesFactory[AscDFH.historyitem_DLbls_SetLeaderLines] = window['AscDFH'].CChangesDrawingsObject; @@ -1810,6 +1835,7 @@ AscDFH.changesFactory[AscDFH.historyitem_ErrBars_SetMinus] = window['AscDFH'].CChangesDrawingsObject; AscDFH.changesFactory[AscDFH.historyitem_ErrBars_SetPlus] = window['AscDFH'].CChangesDrawingsObject; AscDFH.changesFactory[AscDFH.historyitem_ErrBars_SetSpPr] = window['AscDFH'].CChangesDrawingsObject; + AscDFH.changesFactory[AscDFH.historyitem_Legend_SetIsForChartEx] = window['AscDFH'].CChangesDrawingsBool; AscDFH.changesFactory[AscDFH.historyitem_Legend_SetLayout] = window['AscDFH'].CChangesDrawingsObject; AscDFH.changesFactory[AscDFH.historyitem_Legend_SetSpPr] = window['AscDFH'].CChangesDrawingsObject; AscDFH.changesFactory[AscDFH.historyitem_Legend_SetAlign] = window['AscDFH'].CChangesDrawingsObjectNoId; @@ -1877,7 +1903,9 @@ AscDFH.changesFactory[AscDFH.historyitem_Title_SetSpPr] = window['AscDFH'].CChangesDrawingsObject; AscDFH.changesFactory[AscDFH.historyitem_Title_SetTx] = window['AscDFH'].CChangesDrawingsObject; AscDFH.changesFactory[AscDFH.historyitem_Title_SetTxPr] = window['AscDFH'].CChangesDrawingsObject; + AscDFH.changesFactory[AscDFH.historyitem_Title_SetIsForChartEx] = window['AscDFH'].CChangesDrawingsBool; AscDFH.changesFactory[AscDFH.historyitem_Title_SetAlign] = window['AscDFH'].CChangesDrawingsObjectNoId; + AscDFH.changesFactory[AscDFH.historyitem_Title_SetPos] = window['AscDFH'].CChangesDrawingsObjectNoId; AscDFH.changesFactory[AscDFH.historyitem_Trendline_SetSpPr] = window['AscDFH'].CChangesDrawingsObject; AscDFH.changesFactory[AscDFH.historyitem_Trendline_SetTrendlineLbl] = window['AscDFH'].CChangesDrawingsObject; AscDFH.changesFactory[AscDFH.historyitem_UpDownBars_SetDownBars] = window['AscDFH'].CChangesDrawingsObject; @@ -4744,6 +4772,7 @@ function CPlotArea() { CBaseChartObject.call(this); + this.isForChartEx = false; this.plotAreaRegion = null; this.charts = []; this.dTable = null; @@ -5082,6 +5111,10 @@ } } }; + CPlotArea.prototype.setIsForChartEx = function(pr) { + History.CanAddChanges() && History.Add(new CChangesDrawingsBool(this, AscDFH.historyitem_PlotArea_SetIsForChartEx, this.isForChartEx, pr)); + this.isForChartEx = pr; + }; CPlotArea.prototype.setPlotAreaRegion = function(pr) { History.CanAddChanges() && History.Add(new CChangesDrawingsObjectNoId(this, AscDFH.historyitem_PlotArea_SetPlotAreaRegion, this.plotAreaRegion, pr)); this.plotAreaRegion = pr; @@ -9207,9 +9240,11 @@ function CChartText() { CBaseChartObject.call(this); + this.isForChartEx = false; this.rich = null; this.strRef = null; this.chart = null; + this.txData = null; } InitClass(CChartText, CBaseChartObject, AscDFH.historyitem_type_ChartText); @@ -9246,6 +9281,14 @@ this.strRef = tx.strRef; } }; + CChartText.prototype.setIsForChartEx = function(pr) { + History.CanAddChanges() && History.Add(new CChangesDrawingsBool(this, AscDFH.historyitem_ChartText_SetIsForChartEx, this.isForChartEx, pr)); + this.isForChartEx = pr; + }; + CChartText.prototype.setTxData = function(pr) { + History.CanAddChanges() && History.Add(new CChangesDrawingsObjectNoId(this, AscDFH.historyitem_ChartText_SetTxData, this.txData, pr)); + this.txData = pr; + }; CChartText.prototype.setRich = function(pr) { History.CanAddChanges() && History.Add(new CChangesDrawingsObject(this, AscDFH.historyitem_ChartText_SetRich, this.rich, pr)); this.rich = pr; @@ -10085,6 +10128,7 @@ function CLegend() { CBaseChartObject.call(this); + this.isForChartEx = false; this.layout = null; this.legendEntryes = []; this.legendPos = null; @@ -10345,6 +10389,10 @@ } } }; + CLegend.prototype.setIsForChartEx = function(pr) { + History.CanAddChanges() && History.Add(new CChangesDrawingsBool(this, AscDFH.historyitem_Legend_SetIsForChartEx, this.isForChartEx, pr)); + this.isForChartEx = pr; + }; CLegend.prototype.setLayout = function(layout) { History.CanAddChanges() && History.Add(new CChangesDrawingsObject(this, AscDFH.historyitem_Legend_SetLayout, this.layout, layout)); this.layout = layout; @@ -13564,6 +13612,7 @@ function CTitle() { CBaseChartObject.call(this); + this.isForChartEx = false; this.layout = null; this.overlay = false; this.spPr = null; @@ -13587,6 +13636,7 @@ //for chart title only (but not axis title) this.align = null; + this.pos = null; this.recalcInfo = { @@ -13890,10 +13940,18 @@ this.invertTransformText = global_MatrixTransformer.Invert(this.transformText); }; + CTitle.prototype.setIsForChartEx = function(pr) { + History.CanAddChanges() && History.Add(new CChangesDrawingsBool(this, AscDFH.historyitem_Title_SetIsForChartEx, this.isForChartEx, pr)); + this.isForChartEx = pr; + }; CTitle.prototype.setAlign = function(pr) { History.CanAddChanges() && History.Add(new CChangesDrawingsObjectNoId(this, AscDFH.historyitem_Title_SetAlign, this.align, pr)); this.align = pr; }; + CTitle.prototype.setPos = function(pr) { + History.CanAddChanges() && History.Add(new CChangesDrawingsObjectNoId(this, AscDFH.historyitem_Title_SetPos, this.pos, pr)); + this.pos = pr; + }; CTitle.prototype.getParentObjects = function() { if(this.chart) { return this.chart.getParentObjects(); @@ -14706,6 +14764,7 @@ function CChart() { CBaseChartObject.call(this); + this.isForChartEx = false; this.autoTitleDeleted = null; this.backWall = null; this.dispBlanksAs = null; @@ -14857,6 +14916,10 @@ } return null; }; + CChart.prototype.setIsForChartEx = function(pr) { + History.CanAddChanges() && History.Add(new CChangesDrawingsBool(this, AscDFH.historyitem_Chart_SetIsForChartEx, this.isForChartEx, pr)); + this.isForChartEx = pr; + }; CChart.prototype.setAutoTitleDeleted = function(autoTitleDeleted) { History.CanAddChanges() && History.Add(new CChangesDrawingsBool(this, AscDFH.historyitem_Chart_SetAutoTitleDeleted, this.autoTitleDeleted, autoTitleDeleted)); this.autoTitleDeleted = autoTitleDeleted; diff --git a/common/Drawings/Format/ChartSpace.js b/common/Drawings/Format/ChartSpace.js index 4f7f9c9164..4dd799d940 100644 --- a/common/Drawings/Format/ChartSpace.js +++ b/common/Drawings/Format/ChartSpace.js @@ -373,6 +373,7 @@ function(window, undefined) { AscDFH.changesFactory[AscDFH.historyitem_ChartSpace_SetNvGrFrProps] = CChangesDrawingsObject; AscDFH.changesFactory[AscDFH.historyitem_ChartSpace_SetThemeOverride] = CChangesDrawingsObject; AscDFH.changesFactory[AscDFH.historyitem_ShapeSetBDeleted] = CChangesDrawingsBool; + AscDFH.changesFactory[AscDFH.historyitem_ChartSpace_SetIsForChartEx] = CChangesDrawingsBool; AscDFH.changesFactory[AscDFH.historyitem_ChartSpace_SetChartData] = CChangesDrawingsObjectNoId; AscDFH.changesFactory[AscDFH.historyitem_ChartSpace_SetParent] = CChangesDrawingsObject; AscDFH.changesFactory[AscDFH.historyitem_ChartSpace_SetChart] = CChangesDrawingsObject; @@ -536,6 +537,9 @@ function(window, undefined) { drawingsChangesMap[AscDFH.historyitem_ShapeSetBDeleted] = function (oClass, value) { oClass.bDeleted = value; }; + drawingsChangesMap[AscDFH.historyitem_ChartSpace_SetIsForChartEx] = function(oClass, value) { + oClass.isForChartEx = value; + }; drawingsChangesMap[AscDFH.historyitem_ChartSpace_SetChartData] = function(oClass, value) { oClass.chartData = value; }; @@ -1310,6 +1314,7 @@ function(window, undefined) { function CChartSpace() { AscFormat.CGraphicObjectBase.call(this); + this.isForChartEx = false; this.nvGraphicFramePr = null; this.chart = null; this.clrMapOvr = null; @@ -1368,6 +1373,10 @@ function(window, undefined) { } return this.dataRefs; }; + CChartSpace.prototype.setIsForChartEx = function(pr) { + History.CanAddChanges() && History.Add(new CChangesDrawingsBool(this, AscDFH.historyitem_ChartSpace_SetIsForChartEx, this.isForChartEx, pr)); + this.isForChartEx = pr; + }; CChartSpace.prototype.setChartData = function(pr) { History.CanAddChanges() && History.Add(new CChangesDrawingsObjectNoId(this, AscDFH.historyitem_ChartSpace_SetChartData, this.chartData, pr)); this.chartData = pr; diff --git a/common/SerializeChart.js b/common/SerializeChart.js index d576672dc6..a80c3340fe 100644 --- a/common/SerializeChart.js +++ b/common/SerializeChart.js @@ -7260,7 +7260,8 @@ BinaryChartReader.prototype.ReadCT_ChartExSpace = function (type, length, val) { val.setChartData(oNewVal); } else if (c_oserct_chartExSpaceCHART === type) { - oNewVal = new AscFormat.CChartEx(); + oNewVal = new AscFormat.CChart(); + oNewVal.setIsForChartEx(true); res = this.bcr.Read1(length, function (t, l) { return oThis.ReadCT_ChartEx(t, l, oNewVal); }); @@ -7268,7 +7269,6 @@ BinaryChartReader.prototype.ReadCT_ChartExSpace = function (type, length, val) { } else if (c_oserct_chartExSpaceSPPR === type) { val.setSpPr(this.ReadSpPr(length)); - val.spPr.setParent(val); } else if (c_oserct_chartExSpaceTXPR === type) { val.setTxPr(this.ReadTxPr(length)); @@ -13218,7 +13218,8 @@ BinaryChartReader.prototype.ReadCT_Axis = function (type, length, val) { } else if (c_oserct_chartExAxisTITLE === type) { - var oNewVal = new AscFormat.CChartExTitle(); + var oNewVal = new AscFormat.CTitle(); + oNewVal.setIsForChartEx(true); res = this.bcr.Read1(length, function (t, l) { return oThis.ReadCT_ChartExTitle(t, l, oNewVal); }); @@ -13284,7 +13285,6 @@ BinaryChartReader.prototype.ReadCT_Axis = function (type, length, val) { else if (c_oserct_chartExAxisSPPR === type) { val.setSpPr(this.ReadSpPr(length)); - val.spPr.setParent(val); } else { @@ -13338,7 +13338,8 @@ BinaryChartReader.prototype.ReadCT_ChartEx = function (type, length, val) { var oNewVal; if (c_oserct_chartExChartPLOTAREA === type) { - var oNewVal = new AscFormat.CChartExPlotArea(); + var oNewVal = new AscFormat.CPlotArea(); + oNewVal.setIsForChartEx(true); res = this.bcr.Read1(length, function (t, l) { return oThis.ReadCT_ChartExPlotArea(t, l, oNewVal); }); @@ -13346,7 +13347,8 @@ BinaryChartReader.prototype.ReadCT_ChartEx = function (type, length, val) { } else if (c_oserct_chartExChartTITLE === type) { - var oNewVal = new AscFormat.CChartExTitle(); + var oNewVal = new AscFormat.CTitle(); + oNewVal.setIsForChartEx(true); res = this.bcr.Read2(length, function (t, l) { return oThis.ReadCT_ChartExTitle(t, l, oNewVal); }); @@ -13354,7 +13356,8 @@ BinaryChartReader.prototype.ReadCT_ChartEx = function (type, length, val) { } else if (c_oserct_chartExChartLEGEND === type) { - var oNewVal = new AscFormat.CChartExLegend(); + var oNewVal = new AscFormat.CLegend(); + oNewVal.setIsForChartEx(true); res = this.bcr.Read2(length, function (t, l) { return oThis.ReadCT_ChartExLegend(t, l, oNewVal); }); @@ -13388,7 +13391,6 @@ BinaryChartReader.prototype.ReadCT_ChartExPlotArea = function (type, length, val else if (c_oserct_chartExChartSPPR === type) { val.setSpPr(this.ReadSpPr(length)); - val.spPr.setParent(val); } else { @@ -13428,7 +13430,6 @@ BinaryChartReader.prototype.ReadCT_PlotSurface = function (type, length, val) { if (c_oserct_chartExPlotSurfaceSPPR === type) { val.setSpPr(this.ReadSpPr(length)); - val.spPr.setParent(val); } else { @@ -13481,7 +13482,6 @@ BinaryChartReader.prototype.ReadCT_Series = function (type, length, val) { else if (c_oserct_chartExSeriesSPPR === type) { val.setSpPr(this.ReadSpPr(length)); - val.spPr.setParent(val); } else if (c_oserct_chartExSeriesLAYOUTID === type) { @@ -13520,7 +13520,6 @@ BinaryChartReader.prototype.ReadCT_DataPoint = function (type, length, val) { else if (c_oserct_chartExDataPointSPPR === type) { val.setSpPr(this.ReadSpPr(length)); - val.spPr.setParent(val); } else { @@ -13552,7 +13551,6 @@ BinaryChartReader.prototype.ReadCT_DataLabels = function (type, length, val) { else if (c_oserct_chartExDataLabelsSPPR === type) { val.setSpPr(this.ReadSpPr(length)); - val.spPr.setParent(val); } else if (c_oserct_chartExDataLabelsVISABILITIES === type) { @@ -13630,7 +13628,6 @@ BinaryChartReader.prototype.ReadCT_DataLabel = function (type, length, val) { else if (c_oserct_chartExDataLabelSPPR === type) { val.setSpPr(this.ReadSpPr(length)); - val.spPr.setParent(val); } else if (c_oserct_chartExDataLabelVISABILITIES === type) { @@ -13792,10 +13789,12 @@ BinaryChartReader.prototype.ReadCT_ChartExTitle = function (type, length, val) { var oNewVal; if (c_oserct_chartExTitleTX === type) { - var oNewVal = new AscFormat.CText(); + var oNewVal = new AscFormat.CChartText(); + oNewVal.setIsForChartEx(true); res = this.bcr.Read1(length, function (t, l) { return oThis.ReadCT_Text(t, l, oNewVal); }); + oNewVal.setChart(this.curChart); val.setTx(oNewVal); } else if (c_oserct_chartExTitleTXPR === type) @@ -13806,7 +13805,6 @@ BinaryChartReader.prototype.ReadCT_ChartExTitle = function (type, length, val) { else if (c_oserct_chartExTitleSPPR === type) { val.setSpPr(this.ReadSpPr(length)); - val.spPr.setParent(val); } else if (c_oserct_chartExTitlePOS === type) { @@ -13838,7 +13836,6 @@ BinaryChartReader.prototype.ReadCT_ChartExLegend = function (type, length, val) else if (c_oserct_chartExLegendSPPR === type) { val.setSpPr(this.ReadSpPr(length)); - val.spPr.setParent(val); } else if (c_oserct_chartExLegendPOS === type) { @@ -14068,7 +14065,8 @@ BinaryChartReader.prototype.ReadCT_AxisUnitsLabel = function (type, length, val) var oNewVal; if (c_oserct_chartExAxisUnitsLabelTEXT === type) { - var oNewVal = new AscFormat.CText(); + var oNewVal = new AscFormat.CChartText(); + oNewVal.setIsForChartEx(true); res = this.bcr.Read1(length, function (t, l) { return oThis.ReadCT_Text(t, l, oNewVal); }); @@ -14077,7 +14075,6 @@ BinaryChartReader.prototype.ReadCT_AxisUnitsLabel = function (type, length, val) else if (c_oserct_chartExAxisUnitsLabelSPPR === type) { val.setSpPr(this.ReadSpPr(length)); - val.spPr.setParent(val); } else if (c_oserct_chartExAxisUnitsLabelTXPR === type) { @@ -14111,7 +14108,6 @@ BinaryChartReader.prototype.ReadCT_Gridlines = function (type, length, val) { if (c_oserct_chartExGridlinesSPPR === type) { val.setSpPr(this.ReadSpPr(length)); - val.spPr.setParent(val); } else { From 6c98c4956a3f1aec59da2f5704cb843b6149814f Mon Sep 17 00:00:00 2001 From: Dmitriy Aleksandrov Date: Mon, 4 Sep 2023 18:46:10 +0600 Subject: [PATCH 26/30] For bug #62819 Fix issue with field names. --- common/SerializeChart.js | 26 ++++++++++++++------------ 1 file changed, 14 insertions(+), 12 deletions(-) diff --git a/common/SerializeChart.js b/common/SerializeChart.js index a80c3340fe..a7187cccf8 100644 --- a/common/SerializeChart.js +++ b/common/SerializeChart.js @@ -6031,9 +6031,9 @@ BinaryChartWriter.prototype.WriteCT_ChartExPlotArea = function (oVal) { oThis.WriteCT_PlotAreaRegion(oVal.plotAreaRegion); }); } - if (oVal.axis !== null) { - for (var i = 0, length = oVal.axis.length; i < length; ++i) { - var oCurVal = oVal.axis[i]; + if (oVal.axId !== null) { + for (var i = 0, length = oVal.axId.length; i < length; ++i) { + var oCurVal = oVal.axId[i]; if (oCurVal !== null) { this.bs.WriteItem(c_oserct_chartExChartAXIS, function () { oThis.WriteCT_Axis(oCurVal); @@ -6412,9 +6412,9 @@ BinaryChartWriter.prototype.WriteCT_ChartExLegend = function (oVal) { oThis.WriteSpPr(oVal.spPr); }); } - if(oVal.pos !== null) { + if(oVal.legendPos !== null) { this.bs.WriteItem(c_oserct_chartExLegendPOS, function() { - oThis.memory.WriteByte(oVal.pos); + oThis.memory.WriteByte(oVal.legendPos); }); } if(oVal.align !== null) { @@ -6432,7 +6432,7 @@ BinaryChartWriter.prototype.WriteCT_Text = function (oVal) { var oThis = this; if(oVal.rich !== null) { this.bs.WriteItem(c_oserct_chartExTextRICH, function() { - oThis.WriteCT_TextBody(oVal.rich); + oThis.WriteTxPr(oVal.rich); }); } if(oVal.txData !== null) { @@ -13839,7 +13839,7 @@ BinaryChartReader.prototype.ReadCT_ChartExLegend = function (type, length, val) } else if (c_oserct_chartExLegendPOS === type) { - val.setPos(this.stream.GetUChar()); + val.setLegendPos(this.stream.GetUChar()); } else if (c_oserct_chartExLegendALIGN === type) { @@ -13861,11 +13861,13 @@ BinaryChartReader.prototype.ReadCT_Text = function (type, length, val) { var oNewVal; if (c_oserct_chartExTextRICH === type) { - var oNewVal = new AscFormat.CTextBody(); - res = this.bcr.Read1(length, function (t, l) { - return oThis.ReadCT_TextBody(t, l, oNewVal); - }); - val.setRich(oNewVal); + // var oNewVal = new AscFormat.CTextBody(); + // res = this.bcr.Read1(length, function (t, l) { + // return oThis.ReadCT_TextBody(t, l, oNewVal); + // }); + // val.setRich(oNewVal); + val.setRich(this.ReadTxPr(length)); + val.rich.setParent(val); } else if (c_oserct_chartExTextDATA === type) { From e7831742197ec69e2682d4da95e3adf782ae6cb2 Mon Sep 17 00:00:00 2001 From: Dmitriy Aleksandrov Date: Tue, 5 Sep 2023 13:45:03 +0600 Subject: [PATCH 27/30] For bug#62819 --- common/SerializeChart.js | 5 ----- common/Shapes/Serialize.js | 1 + 2 files changed, 1 insertion(+), 5 deletions(-) diff --git a/common/SerializeChart.js b/common/SerializeChart.js index a7187cccf8..ec719b4e27 100644 --- a/common/SerializeChart.js +++ b/common/SerializeChart.js @@ -1321,11 +1321,6 @@ var AXIS_UNIT_BILLIONS = 7; var AXIS_UNIT_TRILLIONS = 8; var AXIS_UNIT_PERCENTAGE = 9; -var SIDE_POS_L = 0; -var SIDE_POS_T = 1; -var SIDE_POS_R = 2; -var SIDE_POS_B = 3; - var POS_ALIGN_MIN = 0; var POS_ALIGN_CTR = 1; var POS_ALIGN_MAX = 2; diff --git a/common/Shapes/Serialize.js b/common/Shapes/Serialize.js index 370b6b7f0b..2ab1074792 100644 --- a/common/Shapes/Serialize.js +++ b/common/Shapes/Serialize.js @@ -7115,6 +7115,7 @@ function BinaryPPTYLoader() _stream.cur = s.cur; _stream.size = s.size; _chart = new AscFormat.CChartSpace(); + _chart.setIsForChartEx(true); _chart.setBDeleted(false); AscCommon.pptx_content_loader.ImageMapChecker = this.ImageMapChecker; AscCommon.pptx_content_loader.Reader.ImageMapChecker = this.ImageMapChecker; From db6196d2ed5532cc3c17f9f1150e4c23bf165cd5 Mon Sep 17 00:00:00 2001 From: Dmitriy Aleksandrov Date: Tue, 5 Sep 2023 22:26:55 +0600 Subject: [PATCH 28/30] For bug #62819 Fix reading from file. --- common/Drawings/Format/ChartEx.js | 30 +++++----- common/Drawings/Format/ChartSpace.js | 3 +- common/SerializeChart.js | 84 ++++++++++++++++------------ common/Shapes/SerializeWriter.js | 6 +- 4 files changed, 71 insertions(+), 52 deletions(-) diff --git a/common/Drawings/Format/ChartEx.js b/common/Drawings/Format/ChartEx.js index 511e88b6bf..1b467094ad 100644 --- a/common/Drawings/Format/ChartEx.js +++ b/common/Drawings/Format/ChartEx.js @@ -2544,22 +2544,22 @@ // }; // - // ParentLabelLayout - drawingsChangesMap[AscDFH.historyitem_ParentLabelLayout_SetVal] = function(oClass, value) { - oClass.val = value; - }; - AscDFH.changesFactory[AscDFH.historyitem_ParentLabelLayout_SetVal] = window['AscDFH'].CChangesDrawingsObjectNoId; - function CParentLabelLayout() { - CBaseChartObject.call(this); - this.val = null; - } + // // ParentLabelLayout ( st instead ct_ParentLabelLayout ) + // drawingsChangesMap[AscDFH.historyitem_ParentLabelLayout_SetVal] = function(oClass, value) { + // oClass.val = value; + // }; + // AscDFH.changesFactory[AscDFH.historyitem_ParentLabelLayout_SetVal] = window['AscDFH'].CChangesDrawingsObjectNoId; + // function CParentLabelLayout() { + // CBaseChartObject.call(this); + // this.val = null; + // } - InitClass(CParentLabelLayout, CBaseChartObject, AscDFH.historyitem_type_ParentLabelLayout); + // InitClass(CParentLabelLayout, CBaseChartObject, AscDFH.historyitem_type_ParentLabelLayout); - CParentLabelLayout.prototype.setVal = function(pr) { - History.CanAddChanges() && History.Add(new CChangesDrawingsObjectNoId(this, AscDFH.historyitem_ParentLabelLayout_SetVal, this.val, pr)); - this.val = pr; - }; + // CParentLabelLayout.prototype.setVal = function(pr) { + // History.CanAddChanges() && History.Add(new CChangesDrawingsObjectNoId(this, AscDFH.historyitem_ParentLabelLayout_SetVal, this.val, pr)); + // this.val = pr; + // }; // PercentageColorPosition @@ -3925,7 +3925,7 @@ window['AscFormat'].CNumericValue = CNumericValue; // window['AscFormat'].CPageMargins = CPageMargins; // window['AscFormat'].CPageSetup = CPageSetup; - window['AscFormat'].CParentLabelLayout = CParentLabelLayout; + // window['AscFormat'].CParentLabelLayout = CParentLabelLayout; window['AscFormat'].CPercentageColorPosition = CPercentageColorPosition; // window['AscFormat'].CChartExPlotArea = CChartExPlotArea; window['AscFormat'].CPlotAreaRegion = CPlotAreaRegion; diff --git a/common/Drawings/Format/ChartSpace.js b/common/Drawings/Format/ChartSpace.js index 4dd799d940..36a8c4c997 100644 --- a/common/Drawings/Format/ChartSpace.js +++ b/common/Drawings/Format/ChartSpace.js @@ -3731,7 +3731,8 @@ function(window, undefined) { this.group = group; }; CChartSpace.prototype.hasCharts = function () { - if (this.chart && this.chart.plotArea && this.chart.plotArea.charts.length > 0) { + if (!this.isForChartEx && this.chart && this.chart.plotArea && this.chart.plotArea.charts.length > 0 || + this.isForChartEx && this.chart && this.chart.plotArea) { return true; } return false; diff --git a/common/SerializeChart.js b/common/SerializeChart.js index ec719b4e27..41c2949337 100644 --- a/common/SerializeChart.js +++ b/common/SerializeChart.js @@ -6107,7 +6107,7 @@ BinaryChartWriter.prototype.WriteCT_Series = function (oVal) { } if(oVal.dataId !== null) { this.bs.WriteItem(c_oserct_chartExSeriesDATAID, function() { - oThis.memory.WriteDouble2(oVal.dataId); + oThis.memory.WriteLong(oVal.dataId); }); } if(oVal.spPr !== null) { @@ -6270,12 +6270,14 @@ BinaryChartWriter.prototype.WriteCT_SeriesLayoutProperties = function (oVal) { var oThis = this; if(oVal.parentLabelLayout !== null) { this.bs.WriteItem(c_oserct_chartExSeriesLayoutPARENT, function() { - oThis.WriteCT_ParentLabelLayout(oVal.parentLabelLayout); + // oThis.WriteCT_ParentLabelLayout(oVal.parentLabelLayout); + oThis.memory.WriteByte(oVal.parentLabelLayout); }); } if(oVal.regionLabelLayout !== null) { this.bs.WriteItem(c_oserct_chartExSeriesLayoutREGION, function() { - oThis.WriteCT_RegionLabelLayout(oVal.regionLabelLayout); + // oThis.WriteCT_RegionLabelLayout(oVal.regionLabelLayout); + oThis.memory.WriteByte(oVal.regionLabelLayout); }); } if(oVal.visibility !== null) { @@ -7269,7 +7271,7 @@ BinaryChartReader.prototype.ReadCT_ChartExSpace = function (type, length, val) { val.setTxPr(this.ReadTxPr(length)); val.txPr.setParent(val); } - else if (c_oserct_chartExspaceCLRMAPOVR === type) { + else if (c_oserct_chartExSpaceCLRMAPOVR === type) { val.setClrMapOvr(this.ReadClrOverride(length)); } // else if(c_oserct_chartExSpaceXLSX === type) { @@ -13301,7 +13303,7 @@ BinaryChartReader.prototype.ReadCT_ChartData = function (type, length, val) { else if (c_oserct_chartExEXTERNALDATA === type) { var oNewVal = new AscFormat.CExternalData(); - res = this.bcr.Read2(length, function (t, l) { + res = this.bcr.Read1(length, function (t, l) { return oThis.ReadCT_ChartExExternalData(t, l, oNewVal); }); val.setExternalData(oNewVal); @@ -13344,7 +13346,7 @@ BinaryChartReader.prototype.ReadCT_ChartEx = function (type, length, val) { { var oNewVal = new AscFormat.CTitle(); oNewVal.setIsForChartEx(true); - res = this.bcr.Read2(length, function (t, l) { + res = this.bcr.Read1(length, function (t, l) { return oThis.ReadCT_ChartExTitle(t, l, oNewVal); }); val.setTitle(oNewVal); @@ -13353,7 +13355,7 @@ BinaryChartReader.prototype.ReadCT_ChartEx = function (type, length, val) { { var oNewVal = new AscFormat.CLegend(); oNewVal.setIsForChartEx(true); - res = this.bcr.Read2(length, function (t, l) { + res = this.bcr.Read1(length, function (t, l) { return oThis.ReadCT_ChartExLegend(t, l, oNewVal); }); val.setLegend(oNewVal); @@ -13372,7 +13374,7 @@ BinaryChartReader.prototype.ReadCT_ChartExPlotArea = function (type, length, val { var oNewVal = new AscFormat.CPlotAreaRegion(); res = this.bcr.Read1(length, function (t, l) { - return oThis.ReadCT_ChartAreaRegion(t, l, oNewVal); + return oThis.ReadCT_PlotAreaRegion(t, l, oNewVal); }); val.setPlotAreaRegion(oNewVal); } @@ -13446,7 +13448,7 @@ BinaryChartReader.prototype.ReadCT_Series = function (type, length, val) { else if (c_oserct_chartExSeriesDATALABELS === type) { var oNewVal = new AscFormat.CDataLabels(); - res = this.bcr.Read2(length, function (t, l) { + res = this.bcr.Read1(length, function (t, l) { return oThis.ReadCT_DataLabels(t, l, oNewVal); }); val.setDataLabels(oNewVal); @@ -13454,7 +13456,7 @@ BinaryChartReader.prototype.ReadCT_Series = function (type, length, val) { else if (c_oserct_chartExSeriesLAYOUTPROPS === type) { var oNewVal = new AscFormat.CSeriesLayoutProperties(); - res = this.bcr.Read2(length, function (t, l) { + res = this.bcr.Read1(length, function (t, l) { return oThis.ReadCT_SeriesLayoutProperties(t, l, oNewVal); }); val.setLayoutPr(oNewVal); @@ -13472,7 +13474,7 @@ BinaryChartReader.prototype.ReadCT_Series = function (type, length, val) { } else if (c_oserct_chartExSeriesDATAID === type) { - val.setTx(this.stream.GetDoubleLE()); + val.setDataId(this.stream.GetULongLE()); } else if (c_oserct_chartExSeriesSPPR === type) { @@ -13510,7 +13512,7 @@ BinaryChartReader.prototype.ReadCT_DataPoint = function (type, length, val) { var oNewVal; if (c_oserct_chartExDataPointIDX === type) { - val.setId(this.stream.GetULongLE()); + val.setIdx(this.stream.GetULongLE()); } else if (c_oserct_chartExDataPointSPPR === type) { @@ -13533,7 +13535,7 @@ BinaryChartReader.prototype.ReadCT_DataLabels = function (type, length, val) { else if (c_oserct_chartExDataLabelsNUMFMT === type) { var oNewVal = new AscFormat.CNumFmt(); - res = this.bcr.Read2(length, function (t, l) { + res = this.bcr.Read1(length, function (t, l) { return oThis.ReadCT_ChartExNumFmt(t, l, oNewVal); }); val.setNumFmt(oNewVal); @@ -13550,7 +13552,7 @@ BinaryChartReader.prototype.ReadCT_DataLabels = function (type, length, val) { else if (c_oserct_chartExDataLabelsVISABILITIES === type) { var oNewVal = new AscFormat.CDataLabelVisibilities(); - res = this.bcr.Read2(length, function (t, l) { + res = this.bcr.Read1(length, function (t, l) { return oThis.ReadCT_DataLabelVisibilities(t, l, oNewVal); }); val.setVisibility(oNewVal); @@ -13610,7 +13612,7 @@ BinaryChartReader.prototype.ReadCT_DataLabel = function (type, length, val) { else if (c_oserct_chartExDataLabelNUMFMT === type) { var oNewVal = new AscFormat.CNumFmt(); - res = this.bcr.Read2(length, function (t, l) { + res = this.bcr.Read1(length, function (t, l) { return oThis.ReadCT_ChartExNumFmt(t, l, oNewVal); }); val.setNumFmt(oNewVal); @@ -13627,7 +13629,7 @@ BinaryChartReader.prototype.ReadCT_DataLabel = function (type, length, val) { else if (c_oserct_chartExDataLabelVISABILITIES === type) { var oNewVal = new AscFormat.CDataLabelVisibilities(); - res = this.bcr.Read2(length, function (t, l) { + res = this.bcr.Read1(length, function (t, l) { return oThis.ReadCT_DataLabelVisibilities(t, l, oNewVal); }); val.setVisibility(oNewVal); @@ -13656,30 +13658,42 @@ BinaryChartReader.prototype.ReadCT_DataLabelHidden = function (type, length, val } return res; }; +BinaryChartReader.prototype.ReadCT_ParentLabelLayout = function (type, length, val) { + var res = c_oSerConstants.ReadOk; + var oThis = this; + switch (this.stream.GetUChar()) { + case st_splittypeAUTO: val = SPLIT_TYPE_AUTO; break; + case st_splittypeCUST: val = SPLIT_TYPE_CUST; break; + case st_splittypePERCENT: val = SPLIT_TYPE_PERCENT; break; + case st_splittypePOS: val = SPLIT_TYPE_POS; break; + case st_splittypeVAL: val = SPLIT_TYPE_VAL; break; + } + return val; +}; BinaryChartReader.prototype.ReadCT_SeriesLayoutProperties = function (type, length, val) { var res = c_oSerConstants.ReadOk; var oThis = this; var oNewVal; if (c_oserct_chartExSeriesLayoutPARENT === type) { - var oNewVal = new AscFormat.CParentLabelLayout(); - res = this.bcr.Read1(length, function (t, l) { - return oThis.ReadCT_ParentLabelLayout(t, l, oNewVal); - }); - val.setParentLabelLayout(oNewVal); + var oNewVal;// = new AscFormat.CParentLabelLayout(); + // res = this.bcr.Read1(length, function (t, l) { + // return oThis.ReadCT_ParentLabelLayout(t, l, oNewVal); + // }); + val.setParentLabelLayout(oThis.ReadCT_ParentLabelLayout(type, length, oNewVal)); } else if (c_oserct_chartExSeriesLayoutREGION === type) { - var oNewVal = new AscFormat.CRegionLabelLayout(); - res = this.bcr.Read2(length, function (t, l) { - return oThis.ReadCT_RegionLabelLayout(t, l, oNewVal); - }); - val.setRegionLabelLayout(oNewVal); + // var oNewVal; // = new AscFormat.CRegionLabelLayout(); + // res = this.bcr.Read1(length, function (t, l) { + // return oThis.ReadCT_RegionLabelLayout(t, l, oNewVal); + // }); + val.setRegionLabelLayout(this.stream.GetUChar()); } else if (c_oserct_chartExSeriesLayoutVISABILITIES === type) { var oNewVal = new AscFormat.CSeriesElementVisibilities(); - res = this.bcr.Read2(length, function (t, l) { + res = this.bcr.Read1(length, function (t, l) { return oThis.ReadCT_SeriesElementVisibilities(t, l, oNewVal); }); val.setVisibility(oNewVal); @@ -13691,7 +13705,7 @@ BinaryChartReader.prototype.ReadCT_SeriesLayoutProperties = function (type, leng else if (c_oserct_chartExSeriesLayoutBINNING === type) { var oNewVal = new AscFormat.CBinning(); - res = this.bcr.Read2(length, function (t, l) { + res = this.bcr.Read1(length, function (t, l) { return oThis.ReadCT_Binning(t, l, oNewVal); }); val.setBinning(oNewVal); @@ -13699,7 +13713,7 @@ BinaryChartReader.prototype.ReadCT_SeriesLayoutProperties = function (type, leng else if (c_oserct_chartExSeriesLayoutSTATISTIC === type) { var oNewVal = new AscFormat.CStatistics(); - res = this.bcr.Read2(length, function (t, l) { + res = this.bcr.Read1(length, function (t, l) { return oThis.ReadCT_Statistics(t, l, oNewVal); }); val.setStatistics(oNewVal); @@ -13707,7 +13721,7 @@ BinaryChartReader.prototype.ReadCT_SeriesLayoutProperties = function (type, leng else if (c_oserct_chartExSeriesLayoutSUBTOTALS === type) { var oNewVal = new AscFormat.CSubtotals(); - res = this.bcr.Read2(length, function (t, l) { + res = this.bcr.Read1(length, function (t, l) { return oThis.ReadCT_Subtotals(t, l, oNewVal); }); val.setSubtotals(oNewVal); @@ -13867,7 +13881,7 @@ BinaryChartReader.prototype.ReadCT_Text = function (type, length, val) { else if (c_oserct_chartExTextDATA === type) { var oNewVal = new AscFormat.CTextData(); - res = this.bcr.Read2(length, function (t, l) { + res = this.bcr.Read1(length, function (t, l) { return oThis.ReadCT_TextData(t, l, oNewVal); }); val.setTxData(oNewVal); @@ -14137,7 +14151,7 @@ BinaryChartReader.prototype.ReadCT_StringDimension = function (type, length, val else if (c_oserct_chartExDataDimensionFORMULA === type) { var oNewVal = new AscFormat.CFormula(); - res = this.bcr.Read2(length, function (t, l) { + res = this.bcr.Read1(length, function (t, l) { return oThis.ReadCT_Formula(t, l, oNewVal); }); val.setF(oNewVal); @@ -14171,7 +14185,7 @@ BinaryChartReader.prototype.ReadCT_NumericDimension = function (type, length, va else if (c_oserct_chartExDataDimensionFORMULA === type) { var oNewVal = new AscFormat.CFormula(); - res = this.bcr.Read2(length, function (t, l) { + res = this.bcr.Read1(length, function (t, l) { return oThis.ReadCT_Formula(t, l, oNewVal); }); val.setF(oNewVal); @@ -14227,7 +14241,7 @@ BinaryChartReader.prototype.ReadCT_StringLevel = function (type, length, val) { else if (c_oserct_chartExDataLevelPT === type) { var oNewVal = new AscFormat.CStringValue(); - res = this.bcr.Read2(length, function (t, l) { + res = this.bcr.Read1(length, function (t, l) { return oThis.ReadCT_StringValue(t, l, oNewVal); }); val.addPt(oNewVal); @@ -14253,7 +14267,7 @@ BinaryChartReader.prototype.ReadCT_NumericLevel = function (type, length, val) { else if (c_oserct_chartExDataLevelPT === type) { var oNewVal = new AscFormat.CNumericValue(); - res = this.bcr.Read2(length, function (t, l) { + res = this.bcr.Read1(length, function (t, l) { return oThis.ReadCT_NumericValue(t, l, oNewVal); }); val.addPt(oNewVal); diff --git a/common/Shapes/SerializeWriter.js b/common/Shapes/SerializeWriter.js index e4537d4646..a49c2b4177 100644 --- a/common/Shapes/SerializeWriter.js +++ b/common/Shapes/SerializeWriter.js @@ -3594,7 +3594,11 @@ function CBinaryFileWriter() oThis.UseContinueWriter++; var oBinaryChartWriter = new AscCommon.BinaryChartWriter(_memory); - oBinaryChartWriter.WriteCT_ChartSpace(grObj); + if (grObj.isForChartEx) { + oBinaryChartWriter.WriteCT_ChartExSpace(grObj); + } else { + oBinaryChartWriter.WriteCT_ChartSpace(grObj); + } oThis.ImData = _memory.ImData; oThis.data = _memory.data; From 675b4ebd3450456609d43e1750670d0ac5bb7a50 Mon Sep 17 00:00:00 2001 From: Dmitriy Aleksandrov Date: Tue, 5 Sep 2023 22:28:19 +0600 Subject: [PATCH 29/30] For bug #62819 Temporary break drawing chart --- common/Charts/DrawingObjects.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/common/Charts/DrawingObjects.js b/common/Charts/DrawingObjects.js index a11450b760..d4fb272dae 100644 --- a/common/Charts/DrawingObjects.js +++ b/common/Charts/DrawingObjects.js @@ -2128,7 +2128,7 @@ CSparklineView.prototype.setMinMaxValAx = function(minVal, maxVal, oSparklineGro _this.recalculate = function(all) { - _this.controller.recalculate2(all); + // _this.controller.recalculate2(all); }; _this.preCopy = function() { From e792311e723e8e68eea6be1ed938b192291f90dd Mon Sep 17 00:00:00 2001 From: Sergey Luzyanin Date: Wed, 6 Sep 2023 11:00:10 +0300 Subject: [PATCH 30/30] [chart-ex] fix type for chartEx object --- common/SerializeChart.js | 2 +- common/Shapes/SerializeWriter.js | 9 ++++++++- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/common/SerializeChart.js b/common/SerializeChart.js index 41c2949337..ad42e4c3d7 100644 --- a/common/SerializeChart.js +++ b/common/SerializeChart.js @@ -1493,7 +1493,7 @@ BinaryChartWriter.prototype.WriteCT_ChartExSpace = function (oVal) { } if (oVal.clrMapOvr !== null) { this.bs.WriteItem(c_oserct_chartExSpaceCLRMAPOVR, function () { - oThis.WriteClrMapOverride(oCurVal); + oThis.WriteClrMapOverride(oVal.clrMapOvr); }); } // if(oVal.chartStyle !== null) { diff --git a/common/Shapes/SerializeWriter.js b/common/Shapes/SerializeWriter.js index a49c2b4177..828ae18c34 100644 --- a/common/Shapes/SerializeWriter.js +++ b/common/Shapes/SerializeWriter.js @@ -3560,7 +3560,14 @@ function CBinaryFileWriter() } case AscDFH.historyitem_type_ChartSpace: { - oThis.WriteRecord2(3, grObj, oThis.WriteChart2); + if(grObj.isForChartEx) + { + oThis.WriteRecord2(7, grObj, oThis.WriteChart2); + } + else + { + oThis.WriteRecord2(3, grObj, oThis.WriteChart2); + } break; } case AscDFH.historyitem_type_SlicerView: