Skip to content

S
sdkjs
Commit 1fe7c504 authored by Sergey.Luzyanin's avatar Sergey.Luzyanin Committed by Alexander.Trofimov
Browse files
Options

оси для точеченых диаграмм 

git-svn-id: svn://192.168.3.15/activex/AVS/Sources/TeamlabOffice/trunk/OfficeWeb@54546 954022d7-b5bf-4e40-9824-e11837661b57
parent 02b9ea64
Hide whitespace changes
Inline Side-by-side
Showing with 280 additions and 45 deletions
Common/Drawings/Format/ChartSpace.js
View file @ 1fe7c504
...@@ -280,6 +280,7 @@ CChartSpace.prototype = ...@@ -280,6 +280,7 @@ CChartSpace.prototype =
{ {
History.Add(this, {Type: historyitem_ChartSpace_SetStyle, oldStyle: this.style, newStyle: style}); History.Add(this, {Type: historyitem_ChartSpace_SetStyle, oldStyle: this.style, newStyle: style});
this.style = style; this.style = style;
this.handleUpdateStyle();
}, },
setTxPr: function(txPr) setTxPr: function(txPr)
{ {
...@@ -2701,7 +2702,7 @@ function CreateScatterChart(asc_chart) ...@@ -2701,7 +2702,7 @@ function CreateScatterChart(asc_chart)
var scatter_chart = plot_area.chart; var scatter_chart = plot_area.chart;
scatter_chart.setScatterStyle(SCATTER_STYLE_LINE_MARKER); scatter_chart.setScatterStyle(SCATTER_STYLE_LINE_MARKER);
scatter_chart.setVaryColors(false); scatter_chart.setVaryColors(false);
plot_area.setCatAx(new CCatAx()); plot_area.setCatAx(new CValAx());
plot_area.setValAx(new CValAx()); plot_area.setValAx(new CValAx());
var first_series = asc_series.length > 1 ? asc_series[0] : null; var first_series = asc_series.length > 1 ? asc_series[0] : null;
...@@ -2747,39 +2748,39 @@ function CreateScatterChart(asc_chart) ...@@ -2747,39 +2748,39 @@ function CreateScatterChart(asc_chart)
pt.setVal(asc_series[i].Val.NumCache[j].val); pt.setVal(asc_series[i].Val.NumCache[j].val);
num_cache.addPt(pt); num_cache.addPt(pt);
} }
if(parsedHeaders.bTop) //if(parsedHeaders.bTop)
{ //{
series.setCat(new CCat()); // series.setCat(new CCat());
var cat = series.cat; // var cat = series.cat;
cat.setStrRef(new CStrRef()); // cat.setStrRef(new CStrRef());
var str_ref = cat.strRef; // var str_ref = cat.strRef;
str_ref.setF(asc_series[i].Cat.Formula); // str_ref.setF(asc_series[i].Cat.Formula);
str_ref.setStrCache(new CStrCache()); // str_ref.setStrCache(new CStrCache());
var str_cache = str_ref.strCache; // var str_cache = str_ref.strCache;
var cat_num_cache = asc_series[i].Cat.NumCache; // var cat_num_cache = asc_series[i].Cat.NumCache;
str_cache.setPtCount(cat_num_cache.length); // str_cache.setPtCount(cat_num_cache.length);
for(var j= 0; j < cat_num_cache.length; ++j) // for(var j= 0; j < cat_num_cache.length; ++j)
{ // {
var string_pt = new CStringPoint(); // var string_pt = new CStringPoint();
string_pt.setIdx(j); // string_pt.setIdx(j);
string_pt.setVal(cat_num_cache[j].val); // string_pt.setVal(cat_num_cache[j].val);
str_cache.addPt(string_pt); // str_cache.addPt(string_pt);
} // }
} //}
if(parsedHeaders.bLeft && asc_series[i].TxCache) //if(parsedHeaders.bLeft && asc_series[i].TxCache)
{ //{
series.setTx(new CTx()); // series.setTx(new CTx());
var tx= series.tx; // var tx= series.tx;
tx.setStrRef(new CStrRef()); // tx.setStrRef(new CStrRef());
var str_ref = tx.strRef; // var str_ref = tx.strRef;
str_ref.setF(asc_series[i].TxCache.Formula); // str_ref.setF(asc_series[i].TxCache.Formula);
str_ref.setStrCache(new CStrCache()); // str_ref.setStrCache(new CStrCache());
var str_cache = str_ref.strCache; // var str_cache = str_ref.strCache;
str_cache.setPtCount(1); // str_cache.setPtCount(1);
str_cache.addPt(new CStringPoint()); // str_cache.addPt(new CStringPoint());
var pt = str_cache.pt[0]; // var pt = str_cache.pt[0];
pt.setVal(asc_series[i].TxCache.Tx); // pt.setVal(asc_series[i].TxCache.Tx);
} //}
scatter_chart.addSer(series); scatter_chart.addSer(series);
} }
scatter_chart.setDLbls(new CDLbls()); scatter_chart.setDLbls(new CDLbls());
...@@ -2801,10 +2802,6 @@ function CreateScatterChart(asc_chart) ...@@ -2801,10 +2802,6 @@ function CreateScatterChart(asc_chart)
cat_ax.setTickLblPos(TICK_LABEL_POSITION_NEXT_TO); cat_ax.setTickLblPos(TICK_LABEL_POSITION_NEXT_TO);
cat_ax.setCrossAx(plot_area.valAx); cat_ax.setCrossAx(plot_area.valAx);
cat_ax.setCrosses(CROSSES_AUTO_ZERO); cat_ax.setCrosses(CROSSES_AUTO_ZERO);
cat_ax.setAuto(true);
cat_ax.setLblAlgn(LBL_ALG_CTR);
cat_ax.setLblOffset(100);
cat_ax.setNoMultiLvlLbl(false);
cat_ax.scaling.setOrientation(ORIENTATION_MIN_MAX); cat_ax.scaling.setOrientation(ORIENTATION_MIN_MAX);
var val_ax = plot_area.valAx; var val_ax = plot_area.valAx;
val_ax.setScaling(new CScaling()); val_ax.setScaling(new CScaling());
......
Common/Drawings/Format/Format.js
View file @ 1fe7c504
...@@ -10206,6 +10206,36 @@ function CBodyPr() ...@@ -10206,6 +10206,36 @@ function CBodyPr()
this.vert = val; this.vert = val;
}; };
this.setRot = function(val)
{
this.rot = val;
};
this.reset = function()
{
this.flatTx = null;
this.anchor = null;
this.anchorCtr = null;
this.bIns = null;
this.compatLnSpc = null;
this.forceAA = null;
this.fromWordArt = null;
this.horzOverflow = null;
this.lIns = null;
this.numCol = null;
this.rIns = null;
this.rot = null;
this.rtlCol = null;
this.spcCol = null;
this.spcFirstLastPara = null;
this.tIns = null;
this.upright = null;
this.vert = null;
this.vertOverflow = null;
this.wrap = null;
this.textFit = null;
};
this.Write_ToBinary2 = function(w) this.Write_ToBinary2 = function(w)
{ {
......
Excel/model/DrawingObjects/Format/ChartSpacePrototype.js
View file @ 1fe7c504
...@@ -1127,9 +1127,17 @@ CChartSpace.prototype.getValAxisValues = function() ...@@ -1127,9 +1127,17 @@ CChartSpace.prototype.getValAxisValues = function()
this.chartObj = new CChartsDrawer() this.chartObj = new CChartsDrawer()
} }
this.chartObj.preCalculateData(this); this.chartObj.preCalculateData(this);
var ret = []; return [].concat(this.chartObj.calcProp.scale);
ret = ret.concat(this.chartObj.calcProp.scale); };
return ret;
CChartSpace.prototype.getXValAxisValues = function()
{
if(!this.chartObj)
{
this.chartObj = new CChartsDrawer()
}
this.chartObj.preCalculateData(this);
return [].concat(this.chartObj.calcProp.xScale);
}; };
...@@ -1723,7 +1731,208 @@ CChartSpace.prototype.recalculateAxis = function() ...@@ -1723,7 +1731,208 @@ CChartSpace.prototype.recalculateAxis = function()
{ {
case historyitem_type_ScatterChart: case historyitem_type_ScatterChart:
{ {
//TODO var gap_hor_axis = 4;
var axis = chart_object.axId;
var x_ax, y_ax;
for(i = 0; i < axis.length; ++i)
{
if(!x_ax && axis[i].axPos === AX_POS_B)
{
x_ax = axis[i];
}
if(!y_ax && axis[i].axPos === AX_POS_L)
{
y_ax = axis[i];
}
if(x_ax && y_ax)
break;
}
if(x_ax && y_ax)
{
y_ax.labels = null;
x_ax.labels = null;
var sizes = this.getChartSizes();
var rect = {x: sizes.startX, y:sizes.startY, w:sizes.w, h: sizes.h};
var arr_val = this.getValAxisValues();
//Получим строки для оси значений с учетом формата и единиц
var arr_strings = [];
var multiplier;
if(y_ax.dispUnits)
multiplier = y_ax.dispUnits.getMultiplier;
else
multiplier = 1;
var num_fmt = y_ax.numFmt;
if(num_fmt && typeof num_fmt.formatCode === "string" /*&& !(num_fmt.formatCode === "General")*/)
{
var num_format = oNumFormatCache.get(num_fmt.formatCode);
for(i = 0; i < arr_val.length; ++i)
{
var calc_value = arr_val[i]*multiplier;
var rich_value = num_format.format(calc_value, CellValueType.number, 15);
arr_strings.push(rich_value[0].text);
}
}
else
{
for(i = 0; i < arr_val.length; ++i)
{
var calc_value = arr_val[i]*multiplier;
arr_strings.push(calc_value + "");
}
}
//расчитаем подписи для вертикальной оси найдем ширину максимальной и возьмем её удвоенную за ширину подписей верт оси
for(i = 0; i < arr_strings.length; ++i)
{
y_ax.labels = new CValAxisLabels(this);
var max_width = 0;
y_ax.yPoints = [];
for(i = 0; i < arr_strings.length; ++i)
{
var dlbl = new CDLbl();
dlbl.parent = y_ax;
dlbl.chart = this;
dlbl.spPr = y_ax.spPr;
dlbl.txPr = y_ax.txPr;
dlbl.tx = new CChartText();
dlbl.tx.rich = CreateTextBodyFromString(arr_strings[i], this.getDrawingDocument(), dlbl);
dlbl.recalculate();
if(dlbl.tx.rich.content.XLimit > max_width)
max_width = dlbl.tx.rich.content.XLimit;
y_ax.labels.arrLabels.push(dlbl);
y_ax.yPoints.push({val: arr_val[i], pos: null});
}
}
for(i = 0; i < arr_strings.length; ++i)
{
y_ax.labels.arrLabels[i].tx.rich.content.Set_ApplyToAll(true);
y_ax.labels.arrLabels[i].tx.rich.content.Set_ParagraphAlign(align_Right);
y_ax.labels.arrLabels[i].tx.rich.content.Set_ApplyToAll(false);
y_ax.labels.arrLabels[i].tx.rich.content.Reset(0,0, max_width, 20000);
y_ax.labels.arrLabels[i].tx.rich.content.Recalculate_Page(0, true);
}
y_ax.labels.extX = max_width*2;
//расчитаем подписи для горизонтальной оси
var arr_x_val = this.getXValAxisValues();
var num_fmt = x_ax.numFmt;
var string_pts = [];
if(num_fmt && typeof num_fmt.formatCode === "string" /*&& !(num_fmt.formatCode === "General")*/)
{
var num_format = oNumFormatCache.get(num_fmt.formatCode);
for(i = 0; i < arr_x_val.length; ++i)
{
var calc_value = arr_x_val[i]*multiplier;
var rich_value = num_format.format(calc_value, CellValueType.number, 15);
string_pts.push({val:rich_value[0].text});
}
}
else
{
for(i = 0; i < arr_x_val.length; ++i)
{
var calc_value = arr_x_val[i]*multiplier;
string_pts.push({val:calc_value + ""});
}
}
//расчитаем ширину интервала без учета горизонтальной оси;
var crosses = y_ax.crosses;
if(crosses === CROSSES_AUTO_ZERO)
{
crosses = 0;
}
else
{
crosses -=1;
}
var point_width = rect.w/string_pts.length;
//смотрим выходят ли подписи верт. оси влево: TODO:вправо нужно потом рассмотреть
var left_points_width = point_width*crosses;//общая ширина левых точек если считать что точки занимают все пространство
if(left_points_width < y_ax.labels.extX)//подписи верт. оси выходят за пределы области построения
{
point_width = (rect.w - y_ax.labels.extX)/(string_pts.length - crosses - 1);//делим ширину оставшуюся после вычета ширины на количество оставшихся справа точек
y_ax.labels.x = rect.x;
}
else
{
point_width = rect.w/string_pts.length;
y_ax.labels.x = rect.x + left_points_width - y_ax.labels.extX;
}
//проверим умещаются ли подписи горизонтальной оси в point_width
x_ax.labels = new CValAxisLabels(this);
var tick_lbl_skip = isRealNumber(x_ax.tickLblSkip) ? x_ax.tickLblSkip : 1;
var max_min_width = 0;
var max_max_width = 0;
var max_height = 0;
var cur_height;
for(i = 0; i < string_pts.length; ++i)
{
var dlbl = null;
if(i%tick_lbl_skip === 0)
{
dlbl = new CDLbl();
dlbl.parent = x_ax;
dlbl.chart = this;
dlbl.spPr = x_ax.spPr;
dlbl.txPr = x_ax.txPr;
dlbl.tx = new CChartText();
dlbl.tx.rich = CreateTextBodyFromString(string_pts[i].val, this.getDrawingDocument(), dlbl);
dlbl.recalculate();
cur_height = dlbl.tx.rich.content.Get_SummaryHeight();
if(cur_height > max_height)
max_height = cur_height;
}
x_ax.labels.arrLabels.push(dlbl);
}
y_ax.labels.y = rect.y;
y_ax.labels.extY = rect.h;
x_ax.labels.extY = max_height + gap_hor_axis;
x_ax.labels.x = y_ax.labels.x+y_ax.labels.extX - left_points_width;
x_ax.labels.extX = point_width*(string_pts.length - 1);
var crosses_at = isRealNumber(x_ax.crossesAt) ? x_ax.crossesAt : arr_val[arr_val.length-1];
var interval = arr_val[arr_val.length-1] - arr_val[0];
x_ax.labels.y = y_ax.labels.y + y_ax.labels.extY - ((arr_val[arr_val.length-1] - crosses_at)/interval)*y_ax.labels.extY;
//посмотрим на сколько выходят подписи вниз за пределы ректа
var gap = x_ax.labels.y + x_ax.labels.extY - (rect.y + rect.h);
if(gap > 0)
{
y_ax.labels.extY *= ((rect.h - gap)/rect.h);
x_ax.labels.y = y_ax.labels.y + y_ax.labels.extY - ((arr_val[arr_val.length-1] - crosses_at)/interval)*y_ax.labels.extY;
}
var dist = y_ax.labels.extY/(y_ax.labels.arrLabels.length-1);
for(i = 0; i < y_ax.labels.arrLabels.length; ++i)
{
y_ax.labels.arrLabels[i].setPosition(y_ax.labels.x, y_ax.labels.y + dist*(y_ax.labels.arrLabels.length - i -1)
-y_ax.labels.arrLabels[i].tx.rich.content.Get_SummaryHeight()/2);
y_ax.yPoints[i].pos = y_ax.labels.y + dist*(y_ax.labels.arrLabels.length - i -1);
}
x_ax.xPoints = [];
for(i = 0; i < x_ax.labels.arrLabels.length; ++i)
{
if(x_ax.labels.arrLabels[i])
{
x_ax.labels.arrLabels[i].setPosition(x_ax.labels.x + point_width*i - x_ax.labels.arrLabels[i].tx.rich.content.XLimit/2, x_ax.labels.y + gap_hor_axis);
}
x_ax.xPoints.push({val: arr_x_val[i], pos: x_ax.labels.x + point_width*i})
}
y_ax.posX = y_ax.labels.x + y_ax.labels.extX;
x_ax.posY = x_ax.labels.y;
}
break; break;
} }
case historyitem_type_PieChart: case historyitem_type_PieChart:
...@@ -1746,11 +1955,10 @@ CChartSpace.prototype.recalculateAxis = function() ...@@ -1746,11 +1955,10 @@ CChartSpace.prototype.recalculateAxis = function()
} }
if(val_ax && cat_ax) if(val_ax && cat_ax)
{ {
val_ax.labels = null; val_ax.labels = null;
cat_ax.labels = null; cat_ax.labels = null;
var sizes = this.getChartSizes(); var sizes = this.getChartSizes();
var rect = {x: sizes.startX, y:sizes.startY,w:sizes.w, h: sizes.h}; var rect = {x: sizes.startX, y:sizes.startY, w:sizes.w, h: sizes.h};
var arr_val = this.getValAxisValues(); var arr_val = this.getValAxisValues();
//Получим строки для оси значений с учетом формата и единиц //Получим строки для оси значений с учетом формата и единиц
var arr_strings = []; var arr_strings = [];
...@@ -1992,7 +2200,7 @@ CChartSpace.prototype.recalculateAxis = function() ...@@ -1992,7 +2200,7 @@ CChartSpace.prototype.recalculateAxis = function()
{ {
val_ax.labels.arrLabels[i].setPosition(val_ax.labels.x, val_ax.labels.y + dist*(val_ax.labels.arrLabels.length - i -1) val_ax.labels.arrLabels[i].setPosition(val_ax.labels.x, val_ax.labels.y + dist*(val_ax.labels.arrLabels.length - i -1)
-val_ax.labels.arrLabels[i].tx.rich.content.Get_SummaryHeight()/2); -val_ax.labels.arrLabels[i].tx.rich.content.Get_SummaryHeight()/2);
val_ax.yPoints[i].y = val_ax.labels.y + dist*(val_ax.labels.arrLabels.length - i -1); val_ax.yPoints[i].pos = val_ax.labels.y + dist*(val_ax.labels.arrLabels.length - i -1);
} }
cat_ax.xPoints = []; cat_ax.xPoints = [];
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7