Commit 866500bf authored by Alexander.Trofimov's avatar Alexander.Trofimov

Поправил чтение sqref. Поправил проверки.

parent 536980ce
This diff is collapsed.
...@@ -4456,7 +4456,7 @@ function sparklineGroup() { ...@@ -4456,7 +4456,7 @@ function sparklineGroup() {
this.rightToLeft = false; this.rightToLeft = false;
// elements // elements
this.colorSeries = null; // ToDo добавить значения по умолчанию this.colorSeries = null;
this.colorNegative = null; this.colorNegative = null;
this.colorAxis = null; this.colorAxis = null;
this.colorMarkers = null; this.colorMarkers = null;
...@@ -4464,7 +4464,7 @@ function sparklineGroup() { ...@@ -4464,7 +4464,7 @@ function sparklineGroup() {
this.colorLast = null; this.colorLast = null;
this.colorHigh = null; this.colorHigh = null;
this.colorLow = null; this.colorLow = null;
this.f = '??'; this.f = null;
this.arrSparklines = []; this.arrSparklines = [];
this.arrCachedSparklines = []; this.arrCachedSparklines = [];
} }
...@@ -4492,11 +4492,14 @@ sparklineGroup.prototype.updateCache = function(range) { ...@@ -4492,11 +4492,14 @@ sparklineGroup.prototype.updateCache = function(range) {
}; };
/** @constructor */ /** @constructor */
function sparkline() { function sparkline() {
this.sqref = '??'; // ToDo добавить значение по умолчанию this.sqref = null;
this.f = '??'; this.f = null;
} }
sparkline.prototype.setSqref = function(sqref) {
this.sqref = Asc.g_oRangeCache.getAscRange(sqref);
};
sparkline.prototype.checkInRange = function(range) { sparkline.prototype.checkInRange = function(range) {
range.intersectionSimple(this.sqref); return this.sqref ? range.isIntersect(this.sqref) : false;
}; };
// For Auto Filters // For Auto Filters
......
...@@ -369,7 +369,7 @@ CSparklineView.prototype.initFromSparkline = function(oSparkline, oSparklineGrou ...@@ -369,7 +369,7 @@ CSparklineView.prototype.initFromSparkline = function(oSparkline, oSparklineGrou
var chart_space = DrawingObjectsController.prototype._getChartSpace(chartSeries, settings, true); var chart_space = DrawingObjectsController.prototype._getChartSpace(chartSeries, settings, true);
chart_space.setWorksheet(worksheetView.model); chart_space.setWorksheet(worksheetView.model);
this.chartSpace = chart_space; this.chartSpace = chart_space;
var oBBox = worksheetView.model.getCell2(oSparkline.sqref); var oBBox = oSparkline.sqref;
this.col = oBBox.c1; this.col = oBBox.c1;
this.row = oBBox.r1; this.row = oBBox.r1;
this.extX = worksheetView.getColumnWidth(oBBox.c1, 3); this.extX = worksheetView.getColumnWidth(oBBox.c1, 3);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment