Skip to content

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

Bug 25240 - Добавить подходящие данные для биржевой диаграммы 

git-svn-id: svn://192.168.3.15/activex/AVS/Sources/TeamlabOffice/trunk/OfficeWeb@57629 954022d7-b5bf-4e40-9824-e11837661b57
parent 9f52c6a6
Hide whitespace changes
Inline Side-by-side
Showing with 273 additions and 75 deletions
Common/Charts/DrawingObjects.js
View file @ 50aea9d5
...@@ -2671,8 +2671,18 @@ function DrawingObjects() { ...@@ -2671,8 +2671,18 @@ function DrawingObjects() {
function fillTableFromRef(ref) function fillTableFromRef(ref)
{ {
var cache = ref.numCache ? ref.numCache : (ref.strCache ? ref.strCache : null); var cache = ref.numCache ? ref.numCache : (ref.strCache ? ref.strCache : null);
var lit_format_code;
if(cache) if(cache)
{ {
if(typeof cache.formatCode === "string" && cache.formatCode.length > 0)
{
lit_format_code = cache.formatCode;
}
else
{
lit_format_code = "General"
}
var f1 = ref.f.replace(/\(|\)/g,""); var f1 = ref.f.replace(/\(|\)/g,"");
var arr_f = f1.split(","); var arr_f = f1.split(",");
var pt_index = 0, i, j, cell, pt; var pt_index = 0, i, j, cell, pt;
...@@ -2722,7 +2732,7 @@ function DrawingObjects() { ...@@ -2722,7 +2732,7 @@ function DrawingObjects() {
pt = cache.getPtByIndex(pt_index); pt = cache.getPtByIndex(pt_index);
if(pt) if(pt)
{ {
cell.setNumFormat(typeof pt.formatCode === "string" && pt.formatCode.length > 0 ? pt.formatCode : "General"); cell.setNumFormat(typeof pt.formatCode === "string" && pt.formatCode.length > 0 ? pt.formatCode : lit_format_code);
cell.setValue(pt.val + ""); cell.setValue(pt.val + "");
} }
++pt_index; ++pt_index;
...@@ -2736,7 +2746,7 @@ function DrawingObjects() { ...@@ -2736,7 +2746,7 @@ function DrawingObjects() {
pt = cache.getPtByIndex(pt_index); pt = cache.getPtByIndex(pt_index);
if(pt) if(pt)
{ {
cell.setNumFormat(typeof pt.formatCode === "string" && pt.formatCode.length > 0 ? pt.formatCode : "General"); cell.setNumFormat(typeof pt.formatCode === "string" && pt.formatCode.length > 0 ? pt.formatCode : lit_format_code);
cell.setValue(pt.val + ""); cell.setValue(pt.val + "");
} }
++pt_index; ++pt_index;
......
Common/Drawings/CommonController.js
View file @ 50aea9d5
...@@ -2945,49 +2945,96 @@ DrawingObjectsController.prototype = ...@@ -2945,49 +2945,96 @@ DrawingObjectsController.prototype =
getSeriesDefault: function (type) { getSeriesDefault: function (type) {
// Обновлены тестовые данные для новой диаграммы // Обновлены тестовые данные для новой диаграммы
function createItem(value) {
return { numFormatStr: "General", isDateTimeFormat: false, val: value, isHidden: false };
} var series = [], seria, Cat;
var bIsScatter = (c_oAscChartTypeSettings.scatter <= type && type <= c_oAscChartTypeSettings.scatterSmoothMarker); var createItem = function(value) {
return { numFormatStr: "General", isDateTimeFormat: false, val: value, isHidden: false };
var Cat = { Formula: "Sheet1!A2:A7", NumCache: [createItem("USA"), createItem("CHN"), createItem("RUS"), createItem("GBR"), createItem("GER"), createItem("JPN")] }; };
var createItem2 = function(value, formatCode) {
var series = []; return { numFormatStr: formatCode, isDateTimeFormat: false, val: value, isHidden: false };
};
var seria = new asc_CChartSeria(); if(type !== c_oAscChartTypeSettings.stock)
seria.Val.Formula = "Sheet1!B2:B7"; {
seria.Val.NumCache = [ createItem(46), createItem(38), createItem(24), createItem(29), createItem(11), createItem(7) ];
seria.TxCache.Formula = "Sheet1!B1"; var bIsScatter = (c_oAscChartTypeSettings.scatter <= type && type <= c_oAscChartTypeSettings.scatterSmoothMarker);
seria.TxCache.Tx = "Gold";
if (!bIsScatter) Cat = { Formula: "Sheet1!A2:A7", NumCache: [createItem("USA"), createItem("CHN"), createItem("RUS"), createItem("GBR"), createItem("GER"), createItem("JPN")] };
seria.Cat = Cat;
else
seria.xVal = Cat; seria = new asc_CChartSeria();
series.push(seria); seria.Val.Formula = "Sheet1!B2:B7";
seria.Val.NumCache = [ createItem(46), createItem(38), createItem(24), createItem(29), createItem(11), createItem(7) ];
seria = new asc_CChartSeria(); seria.TxCache.Formula = "Sheet1!B1";
seria.Val.Formula = "Sheet1!C2:C7"; seria.TxCache.Tx = "Gold";
seria.Val.NumCache = [ createItem(29), createItem(27), createItem(26), createItem(17), createItem(19), createItem(14) ]; if (!bIsScatter)
seria.TxCache.Formula = "Sheet1!C1"; seria.Cat = Cat;
seria.TxCache.Tx = "Silver"; else
if (!bIsScatter) seria.xVal = Cat;
seria.Cat = Cat; series.push(seria);
else
seria.xVal = Cat; seria = new asc_CChartSeria();
series.push(seria); seria.Val.Formula = "Sheet1!C2:C7";
seria.Val.NumCache = [ createItem(29), createItem(27), createItem(26), createItem(17), createItem(19), createItem(14) ];
seria = new asc_CChartSeria(); seria.TxCache.Formula = "Sheet1!C1";
seria.Val.Formula = "Sheet1!D2:D7"; seria.TxCache.Tx = "Silver";
seria.Val.NumCache = [ createItem(29), createItem(23), createItem(32), createItem(19), createItem(14), createItem(17) ]; if (!bIsScatter)
seria.TxCache.Formula = "Sheet1!D1"; seria.Cat = Cat;
seria.TxCache.Tx = "Bronze"; else
if (!bIsScatter) seria.xVal = Cat;
seria.Cat = Cat; series.push(seria);
else
seria.xVal = Cat; seria = new asc_CChartSeria();
series.push(seria); seria.Val.Formula = "Sheet1!D2:D7";
seria.Val.NumCache = [ createItem(29), createItem(23), createItem(32), createItem(19), createItem(14), createItem(17) ];
return series; seria.TxCache.Formula = "Sheet1!D1";
seria.TxCache.Tx = "Bronze";
if (!bIsScatter)
seria.Cat = Cat;
else
seria.xVal = Cat;
series.push(seria);
return series;
}
else
{
Cat = { Formula: "Sheet1!A2:A5", NumCache: [createItem2(38719, "d\-mmm\-yy"), createItem2(38720, "d\-mmm\-yy"), createItem2(38721, "d\-mmm\-yy"), createItem2(38722, "d\-mmm\-yy"), createItem2(38723, "d\-mmm\-yy")], formatCode: "d\-mmm\-yy" };
seria = new asc_CChartSeria();
seria.Val.Formula = "Sheet1!B2:B5";
seria.Val.NumCache = [ createItem(40), createItem(21), createItem(37), createItem(49), createItem(32)];
seria.TxCache.Formula = "Sheet1!B1";
seria.TxCache.Tx = "Open";
seria.Cat = Cat;
series.push(seria);
seria = new asc_CChartSeria();
seria.Val.Formula = "Sheet1!C2:C5";
seria.Val.NumCache = [ createItem(57), createItem(54), createItem(52), createItem(59), createItem(34)];
seria.TxCache.Formula = "Sheet1!C1";
seria.TxCache.Tx = "High";
seria.Cat = Cat;
series.push(seria);
seria = new asc_CChartSeria();
seria.Val.Formula = "Sheet1!D2:D5";
seria.Val.NumCache = [ createItem(10), createItem(14), createItem(14), createItem(12), createItem(6)];
seria.TxCache.Formula = "Sheet1!D1";
seria.TxCache.Tx = "Low";
seria.Cat = Cat;
series.push(seria);
seria = new asc_CChartSeria();
seria.Val.Formula = "Sheet1!E2:E5";
seria.Val.NumCache = [ createItem(24), createItem(35), createItem(48), createItem(35), createItem(15)];
seria.TxCache.Formula = "Sheet1!E1";
seria.TxCache.Tx = "Close";
seria.Cat = Cat;
series.push(seria);
return series;
}
}, },
changeCurrentState: function(newState) changeCurrentState: function(newState)
......
Common/Drawings/Format/ChartSpace.js
View file @ 50aea9d5
...@@ -1968,9 +1968,16 @@ CChartSpace.prototype = ...@@ -1968,9 +1968,16 @@ CChartSpace.prototype =
} }
} }
if(series[0].cat && series[0].cat.strRef) if(series[0].cat)
{ {
ref = series[0].cat.strRef; if(series[0].cat.strRef)
{
ref = series[0].cat.strRef;
}
else if(series[0].cat.numRef)
{
ref = series[0].cat.numRef;
}
} }
else if(series[0].xVal) else if(series[0].xVal)
{ {
...@@ -5698,7 +5705,7 @@ CChartSpace.prototype = ...@@ -5698,7 +5705,7 @@ CChartSpace.prototype =
/*string_pts pts_len*/ /*string_pts pts_len*/
if(ser && ser.cat) if(ser && ser.cat)
{ {
var lit; var lit, b_num_lit = true;
if(ser.cat.strRef && ser.cat.strRef.strCache) if(ser.cat.strRef && ser.cat.strRef.strCache)
{ {
lit = ser.cat.strRef.strCache; lit = ser.cat.strRef.strCache;
...@@ -5710,20 +5717,55 @@ CChartSpace.prototype = ...@@ -5710,20 +5717,55 @@ CChartSpace.prototype =
else if(ser.cat.numRef && ser.cat.numRef.numCache) else if(ser.cat.numRef && ser.cat.numRef.numCache)
{ {
lit = ser.cat.numRef.numCache; lit = ser.cat.numRef.numCache;
b_num_lit = true;
} }
else if(ser.cat.numLit) else if(ser.cat.numLit)
{ {
lit = ser.cat.numLit; lit = ser.cat.numLit;
b_num_lit = true;
} }
if(lit) if(lit)
{ {
var lit_format = null, pt_format = null;
if(b_num_lit && typeof lit.formatCode === "string" && lit.formatCode.length > 0)
{
lit_format = oNumFormatCache.get(lit.formatCode);
}
pts_len = lit.ptCount; pts_len = lit.ptCount;
for(i = 0; i < pts_len; ++i) for(i = 0; i < pts_len; ++i)
{ {
var pt = lit.getPtByIndex(i); var pt = lit.getPtByIndex(i);
if(pt) if(pt)
{ {
string_pts.push({val: pt.val + ""}); var str_pt;
if(b_num_lit)
{
if(typeof pt.formatCode === "string" && pt.formatCode.length > 0)
{
pt_format = oNumFormatCache.get(lit.formatCode);
if(pt_format)
{
str_pt = pt_format.formatToChart(pt.val);
}
else
{
str_pt = pt.val;
}
}
else if(lit_format)
{
str_pt = lit_format.formatToChart(pt.val);
}
else
{
str_pt = pt.val;
}
}
else
{
str_pt = pt.val;
}
string_pts.push({val: str_pt + ""});
} }
else else
{ {
...@@ -6730,33 +6772,101 @@ CChartSpace.prototype = ...@@ -6730,33 +6772,101 @@ CChartSpace.prototype =
//расчитаем подписи для горизонтальной оси //расчитаем подписи для горизонтальной оси
var ser = chart_object.series[0]; var ser = chart_object.series[0];
var string_pts = [], pts_len = 0; var string_pts = [], pts_len = 0;
/*string_pts pts_len*/
if(ser && ser.cat) if(ser && ser.cat)
{ {
var lit, b_num_lit = true;
if(ser.cat.strRef && ser.cat.strRef.strCache) if(ser.cat.strRef && ser.cat.strRef.strCache)
{ {
string_pts = ser.cat.strRef.strCache.pt; lit = ser.cat.strRef.strCache;
pts_len = string_pts.length;
} }
else if(ser.cat.strLit) else if(ser.cat.strLit)
{ {
string_pts = ser.cat.strLit.pt; lit = ser.cat.strLit;
pts_len = string_pts.length; }
else if(ser.cat.numRef && ser.cat.numRef.numCache)
{
lit = ser.cat.numRef.numCache;
b_num_lit = true;
}
else if(ser.cat.numLit)
{
lit = ser.cat.numLit;
b_num_lit = true;
}
if(lit)
{
var lit_format = null, pt_format = null;
if(b_num_lit && typeof lit.formatCode === "string" && lit.formatCode.length > 0)
{
lit_format = oNumFormatCache.get(lit.formatCode);
}
pts_len = lit.ptCount;
for(i = 0; i < pts_len; ++i)
{
var pt = lit.getPtByIndex(i);
if(pt)
{
var str_pt;
if(b_num_lit)
{
if(typeof pt.formatCode === "string" && pt.formatCode.length > 0)
{
pt_format = oNumFormatCache.get(lit.formatCode);
if(pt_format)
{
str_pt = pt_format.formatToChart(pt.val);
}
else
{
str_pt = pt.val;
}
}
else if(lit_format)
{
str_pt = lit_format.formatToChart(pt.val);
}
else
{
str_pt = pt.val;
}
}
else
{
str_pt = pt.val;
}
string_pts.push({val: str_pt + ""});
}
else
{
string_pts.push({val: i + ""});
}
}
} }
} }
var pts_len2 = pts_len; //if(string_pts.length === 0)
// if(string_pts.length === 0)
{ {
if(ser.val) pts_len = 0;
for(i = 0; i < chart_object.series.length; ++i)
{ {
if(ser.val.numRef && ser.val.numRef.numCache) var cur_pts= null;
pts_len2 = ser.val.numRef.numCache.pts.length; ser = chart_object.series[i];
else if(ser.val.numLit) if(ser.val)
pts_len2 = ser.val.numLit.pts.length; {
if(ser.val.numRef && ser.val.numRef.numCache)
cur_pts = ser.val.numRef.numCache;
else if(ser.val.numLit)
cur_pts = ser.val.numLit;
if(cur_pts)
{
pts_len = Math.max(pts_len, cur_pts.ptCount);
}
}
} }
if(pts_len2 > pts_len) if(pts_len > string_pts.length)
{ {
pts_len = pts_len2; for(i = 0; i < pts_len; ++i)
for(i = 0; i < pts_len2; ++i)
{ {
string_pts.push({val:i+1 + ""}); string_pts.push({val:i+1 + ""});
} }
...@@ -13002,6 +13112,10 @@ function CreateStockChart(chartSeries) ...@@ -13002,6 +13112,10 @@ function CreateStockChart(chartSeries)
series.setIdx(i); series.setIdx(i);
series.setOrder(i); series.setOrder(i);
series.setMarker(new CMarker()); series.setMarker(new CMarker());
series.setSpPr(new CSpPr());
series.spPr.setLn(new CLn());
series.spPr.ln.setW(28575);
series.spPr.ln.setFill(CreateNoFillUniFill());
series.marker.setSymbol(SYMBOL_NONE); series.marker.setSymbol(SYMBOL_NONE);
series.setSmooth(false); series.setSmooth(false);
series.setVal(new CYVal()); series.setVal(new CYVal());
...@@ -13025,20 +13139,47 @@ function CreateStockChart(chartSeries) ...@@ -13025,20 +13139,47 @@ function CreateStockChart(chartSeries)
{ {
series.setCat(new CCat()); series.setCat(new CCat());
var cat = series.cat; var cat = series.cat;
cat.setStrRef(new CStrRef());
var str_ref = cat.strRef; if(typeof asc_series[i].Cat.formatCode === "string" && asc_series[i].Cat.formatCode.length > 0)
str_ref.setF(asc_series[i].Cat.Formula);
str_ref.setStrCache(new CStrCache());
var str_cache = str_ref.strCache;
var cat_num_cache = asc_series[i].Cat.NumCache;
str_cache.setPtCount(cat_num_cache.length);
for(var j= 0; j < cat_num_cache.length; ++j)
{ {
var string_pt = new CStringPoint(); cat.setNumRef(new CNumRef());
string_pt.setIdx(j); var num_ref = cat.numRef;
string_pt.setVal(cat_num_cache[j].val); num_ref.setF(asc_series[i].Cat.Formula);
str_cache.addPt(string_pt); num_ref.setNumCache(new CNumLit());
var num_cache = num_ref.numCache;
var cat_num_cache = asc_series[i].Cat.NumCache;
num_cache.setPtCount(cat_num_cache.length);
num_cache.setFormatCode(asc_series[i].Cat.formatCode);
for(var j= 0; j < cat_num_cache.length; ++j)
{
var pt = new CNumericPoint();
pt.setIdx(j);
pt.setVal(cat_num_cache[j].val);
if(cat_num_cache[j].numFormatStr !== asc_series[i].Cat.formatCode)
{
pt.setFormatCode(cat_num_cache[j].numFormatStr);
}
num_cache.addPt(pt);
}
} }
else
{
cat.setStrRef(new CStrRef());
var str_ref = cat.strRef;
str_ref.setF(asc_series[i].Cat.Formula);
str_ref.setStrCache(new CStrCache());
var str_cache = str_ref.strCache;
var cat_num_cache = asc_series[i].Cat.NumCache;
str_cache.setPtCount(cat_num_cache.length);
for(var j= 0; j < cat_num_cache.length; ++j)
{
var string_pt = new CStringPoint();
string_pt.setIdx(j);
string_pt.setVal(cat_num_cache[j].val);
str_cache.addPt(string_pt);
}
}
} }
if(parsedHeaders.bLeft && asc_series[i].TxCache && typeof asc_series[i].TxCache.Formula === "string" && asc_series[i].TxCache.Formula.length > 0) if(parsedHeaders.bLeft && asc_series[i].TxCache && typeof asc_series[i].TxCache.Formula === "string" && asc_series[i].TxCache.Formula.length > 0)
{ {
......
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