Commit 8663b035 authored by Sergey Luzyanin's avatar Sergey Luzyanin

calculation legend for surface chart; calculation legend for surface chart;

parent 1a1d8d8c
...@@ -407,6 +407,8 @@ DrawingObjectsController.prototype.addChartDrawingObject = function(options) ...@@ -407,6 +407,8 @@ DrawingObjectsController.prototype.addChartDrawingObject = function(options)
var old_range = options.getRange(); var old_range = options.getRange();
options.putRange(null); options.putRange(null);
options.style = null; options.style = null;
options.horAxisProps = null;
options.vertAxisProps = null;
this.editChartCallback(options); this.editChartCallback(options);
options.style = 1; options.style = 1;
options.bCreate = true; options.bCreate = true;
......
...@@ -4480,6 +4480,7 @@ DrawingObjectsController.prototype = ...@@ -4480,6 +4480,7 @@ DrawingObjectsController.prototype =
return ret; return ret;
}, },
_getChartSpace: function (chartSeries, options, bUseCache) { _getChartSpace: function (chartSeries, options, bUseCache) {
options.type = c_oAscChartTypeSettings.surfaceNormal;
switch (options.type) { switch (options.type) {
case c_oAscChartTypeSettings.lineNormal: case c_oAscChartTypeSettings.lineNormal:
case c_oAscChartTypeSettings.lineNormalMarker: case c_oAscChartTypeSettings.lineNormalMarker:
...@@ -4540,6 +4541,14 @@ DrawingObjectsController.prototype = ...@@ -4540,6 +4541,14 @@ DrawingObjectsController.prototype =
case c_oAscChartTypeSettings.scatterSmooth: case c_oAscChartTypeSettings.scatterSmooth:
case c_oAscChartTypeSettings.scatterSmoothMarker: case c_oAscChartTypeSettings.scatterSmoothMarker:
return AscFormat.CreateScatterChart(chartSeries, bUseCache, options); return AscFormat.CreateScatterChart(chartSeries, bUseCache, options);
case c_oAscChartTypeSettings.surfaceNormal:
return AscFormat.CreateSurfaceChart(chartSeries, bUseCache, options, false, false);
case c_oAscChartTypeSettings.surfaceWireframe:
return AscFormat.CreateSurfaceChart(chartSeries, bUseCache, options, false, true);
case c_oAscChartTypeSettings.contourNormal:
return AscFormat.CreateSurfaceChart(chartSeries, bUseCache, options, true, false);
case c_oAscChartTypeSettings.contourWireframe:
return AscFormat.CreateSurfaceChart(chartSeries, bUseCache, options, true, true);
// radar return CreateRadarChart(chartSeries); // radar return CreateRadarChart(chartSeries);
} }
......
...@@ -22414,6 +22414,9 @@ function CSurfaceChart() ...@@ -22414,6 +22414,9 @@ function CSurfaceChart()
this.parent = null; this.parent = null;
this.compiledBandFormats = [];
this.Id = g_oIdCounter.Get_NewId(); this.Id = g_oIdCounter.Get_NewId();
} }
...@@ -22461,6 +22464,19 @@ CSurfaceChart.prototype = ...@@ -22461,6 +22464,19 @@ CSurfaceChart.prototype =
} }
}, },
isWireframe: function(){
return this.wireframe !== false;
},
getBandFmtByIndex: function(idx){
for(var i = 0; i < this.bandFmts.length; ++i){
if(this.bandFmts[i].idx === idx){
return this.bandFmts[i];
}
}
return null;
},
removeSeries: function(idx) removeSeries: function(idx)
{ {
if(this.series[idx]) if(this.series[idx])
......
This diff is collapsed.
...@@ -421,7 +421,11 @@ ...@@ -421,7 +421,11 @@
scatterNone : 31, scatterNone : 31,
scatterSmooth : 32, scatterSmooth : 32,
scatterSmoothMarker : 33, scatterSmoothMarker : 33,
unknown : 34 surfaceNormal : 34,
surfaceWireframe : 35,
contourNormal : 36,
contourWireframe : 37,
unknown : 38
}; };
......
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