Skip to content

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

Баги с потерей формата точек при смене диапазона. Баг с невозможностью... 

Баги с потерей формата точек при смене диапазона. Баг с невозможностью изменить аджастмент при смене типа геометрии.(Bug 25849)
Bug 25849 - Не отображается изменение контура автофигуры

git-svn-id: svn://192.168.3.15/activex/AVS/Sources/TeamlabOffice/trunk/OfficeWeb@57654 954022d7-b5bf-4e40-9824-e11837661b57
parent 35ec7ffd
Hide whitespace changes
Inline Side-by-side
Showing with 47 additions and 100 deletions
Common/Drawings/Format/ChartSpace.js
View file @ 747b95a4
...@@ -763,63 +763,6 @@ CChartSpace.prototype = ...@@ -763,63 +763,6 @@ CChartSpace.prototype =
return false; return false;
}, },
rebuildVal: function(val)
{
if(val)
{
var i, j, k, parsed_formula, idx, cell, pt, bbox, worksheet;
var buildCache = function (ref, cache, pointConstructor)
{
idx = 0;
removePtsFromLit(cache);
for(i = 0; i < ref.parsedFormulas.length; ++i)
{
parsed_formula = ref.parsedFormulas[i];
bbox = parsed_formula.bbox;
worksheet = parsed_formula.worksheet;
for(j = bbox.r1; j <= bbox.r2; ++j)
{
for(k = bbox.c1; k <= bbox.c2; ++k)
{
if(!worksheet._getCol(i).hd && !worksheet._getRow(row).hd)
{
cell = worksheet.getCell(new CellAddress(j, k, 0));
pt = new pointConstructor();
pt.setIdx(idx);
pt.setFormatCode && pt.setFormatCode(cell.getNumFormatStr());
pt.setVal(cell.getValue());
cache.addPt(pt);
}
++idx;
}
}
}
};
if(val.numRef)
{
if(!val.numRef.numCache)
{
val.numRef.setNumCache(new CNumLit());
}
if(Array.isArray(val.numRef.parsedFormulas))
{
buildCache(val.numRef, val.numRef.numCache, CNumericPoint);
}
}
if(val.strRef)
{
if(!val.strRef.strCache)
{
val.strRef.setStrCache(new CStrCache());
}
if(Array.isArray(val.strRef.parsedFormulas))
{
buildCache(val.strRef, val.strRef.strCache, CStringPoint);
}
}
}
},
clearCacheVal: function(val) clearCacheVal: function(val)
{ {
...@@ -1126,14 +1069,14 @@ CChartSpace.prototype = ...@@ -1126,14 +1069,14 @@ CChartSpace.prototype =
num_ref.setNumCache(new CNumLit()); num_ref.setNumCache(new CNumLit());
var num_cache = num_ref.numCache; var num_cache = num_ref.numCache;
num_cache.setPtCount(asc_series[i].Val.NumCache.length); num_cache.setPtCount(asc_series[i].Val.NumCache.length);
for(var j = 0; j < asc_series[i].Val.NumCache.length; ++j) // for(var j = 0; j < asc_series[i].Val.NumCache.length; ++j)
{ // {
var pt = new CNumericPoint(); // var pt = new CNumericPoint();
pt.setIdx(j); // pt.setIdx(j);
pt.setFormatCode(asc_series[i].Val.NumCache[j].numFormatStr); // pt.setFormatCode(asc_series[i].Val.NumCache[j].numFormatStr);
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(asc_series[i].Cat && asc_series[i].Cat.NumCache) if(asc_series[i].Cat && asc_series[i].Cat.NumCache)
{ {
series.setCat(new CCat()); series.setCat(new CCat());
...@@ -1145,13 +1088,13 @@ CChartSpace.prototype = ...@@ -1145,13 +1088,13 @@ CChartSpace.prototype =
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);
} //}
} }
else else
{ {
...@@ -1167,10 +1110,10 @@ CChartSpace.prototype = ...@@ -1167,10 +1110,10 @@ CChartSpace.prototype =
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.setIdx(0); //pt.setIdx(0);
pt.setVal(asc_series[i].TxCache.Tx); //pt.setVal(asc_series[i].TxCache.Tx);
} }
else else
{ {
...@@ -1199,14 +1142,14 @@ CChartSpace.prototype = ...@@ -1199,14 +1142,14 @@ CChartSpace.prototype =
num_ref.setNumCache(new CNumLit()); num_ref.setNumCache(new CNumLit());
var num_cache = num_ref.numCache; var num_cache = num_ref.numCache;
num_cache.setPtCount(first_series.Val.NumCache.length); num_cache.setPtCount(first_series.Val.NumCache.length);
for(var j = 0; j < first_series.Val.NumCache.length; ++j) //for(var j = 0; j < first_series.Val.NumCache.length; ++j)
{ //{
var pt = new CNumericPoint(); // var pt = new CNumericPoint();
pt.setIdx(j); // pt.setIdx(j);
pt.setFormatCode(first_series.Val.NumCache[j].numFormatStr); // pt.setFormatCode(first_series.Val.NumCache[j].numFormatStr);
pt.setVal(first_series.Val.NumCache[j].val); // pt.setVal(first_series.Val.NumCache[j].val);
num_cache.addPt(pt); // num_cache.addPt(pt);
} //}
} }
series.setYVal(new CYVal()); series.setYVal(new CYVal());
var y_val = series.yVal; var y_val = series.yVal;
...@@ -1216,17 +1159,18 @@ CChartSpace.prototype = ...@@ -1216,17 +1159,18 @@ CChartSpace.prototype =
num_ref.setNumCache(new CNumLit()); num_ref.setNumCache(new CNumLit());
var num_cache = num_ref.numCache; var num_cache = num_ref.numCache;
num_cache.setPtCount(asc_series[i].Val.NumCache.length); num_cache.setPtCount(asc_series[i].Val.NumCache.length);
for(var j = 0; j < asc_series[i].Val.NumCache.length; ++j) //for(var j = 0; j < asc_series[i].Val.NumCache.length; ++j)
{ //{
var pt = new CNumericPoint(); // var pt = new CNumericPoint();
pt.setIdx(j); // pt.setIdx(j);
pt.setFormatCode(asc_series[i].Val.NumCache[j].numFormatStr); // pt.setFormatCode(asc_series[i].Val.NumCache[j].numFormatStr);
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);
} //}
chart_type.addSer(series); chart_type.addSer(series);
} }
} }
this.recalculateReferences();
} }
}, },
...@@ -2176,6 +2120,7 @@ CChartSpace.prototype = ...@@ -2176,6 +2120,7 @@ CChartSpace.prototype =
{ {
num_cache = val.numRef.numCache; num_cache = val.numRef.numCache;
} }
var lit_format_code = typeof num_cache.formatCode === "string" && num_cache.formatCode.length > 0 ? num_cache.formatCode : "General";
var pt_index = 0, i, j, cell, pt, worksheet_id, hidden = true; var pt_index = 0, i, j, cell, pt, worksheet_id, hidden = true;
for(i = 0; i < arr_f.length; ++i) for(i = 0; i < arr_f.length; ++i)
{ {
...@@ -2205,7 +2150,7 @@ CChartSpace.prototype = ...@@ -2205,7 +2150,7 @@ CChartSpace.prototype =
pt = new CNumericPoint(); pt = new CNumericPoint();
pt.setIdx(pt_index++); pt.setIdx(pt_index++);
pt.setVal(parseFloat(cell.getValue())); pt.setVal(parseFloat(cell.getValue()));
if(cell.getNumFormatStr() !== "General") if(cell.getNumFormatStr() !== lit_format_code)
{ {
pt.setFormatCode(cell.getNumFormatStr()) pt.setFormatCode(cell.getNumFormatStr())
} }
...@@ -2230,7 +2175,7 @@ CChartSpace.prototype = ...@@ -2230,7 +2175,7 @@ CChartSpace.prototype =
pt = new CNumericPoint(); pt = new CNumericPoint();
pt.setIdx(pt_index++); pt.setIdx(pt_index++);
pt.setVal(parseFloat(cell.getValue())); pt.setVal(parseFloat(cell.getValue()));
if(cell.getNumFormatStr() !== "General") if(cell.getNumFormatStr() !== lit_format_code)
{ {
pt.setFormatCode(cell.getNumFormatStr()) pt.setFormatCode(cell.getNumFormatStr())
} }
...@@ -2298,7 +2243,7 @@ CChartSpace.prototype = ...@@ -2298,7 +2243,7 @@ CChartSpace.prototype =
cell = source_worksheet.getCell( new CellAddress(range.r1, j, 0) ); cell = source_worksheet.getCell( new CellAddress(range.r1, j, 0) );
pt = new CStringPoint(); pt = new CStringPoint();
pt.setIdx(pt_index++); pt.setIdx(pt_index++);
pt.setVal(cell.getValue()); pt.setVal(cell.getValueWithFormat());
str_cache.addPt(pt); str_cache.addPt(pt);
addPointToMap(oThis.pointsMap, source_worksheet, range.r1, j, pt); addPointToMap(oThis.pointsMap, source_worksheet, range.r1, j, pt);
...@@ -2319,7 +2264,7 @@ CChartSpace.prototype = ...@@ -2319,7 +2264,7 @@ CChartSpace.prototype =
cell = source_worksheet.getCell(new CellAddress(j, range.c1, 0)); cell = source_worksheet.getCell(new CellAddress(j, range.c1, 0));
pt = new CStringPoint(); pt = new CStringPoint();
pt.setIdx(pt_index++); pt.setIdx(pt_index++);
pt.setVal(cell.getValue()); pt.setVal(cell.getValueWithFormat());
str_cache.addPt(pt); str_cache.addPt(pt);
addPointToMap(oThis.pointsMap, source_worksheet, j, range.c1, pt); addPointToMap(oThis.pointsMap, source_worksheet, j, range.c1, pt);
...@@ -5752,7 +5697,7 @@ CChartSpace.prototype = ...@@ -5752,7 +5697,7 @@ CChartSpace.prototype =
{ {
if(typeof pt.formatCode === "string" && pt.formatCode.length > 0) if(typeof pt.formatCode === "string" && pt.formatCode.length > 0)
{ {
pt_format = oNumFormatCache.get(lit.formatCode); pt_format = oNumFormatCache.get(pt.formatCode);
if(pt_format) if(pt_format)
{ {
str_pt = pt_format.formatToChart(pt.val); str_pt = pt_format.formatToChart(pt.val);
...@@ -6823,7 +6768,7 @@ CChartSpace.prototype = ...@@ -6823,7 +6768,7 @@ CChartSpace.prototype =
{ {
if(typeof pt.formatCode === "string" && pt.formatCode.length > 0) if(typeof pt.formatCode === "string" && pt.formatCode.length > 0)
{ {
pt_format = oNumFormatCache.get(lit.formatCode); pt_format = oNumFormatCache.get(pt.formatCode);
if(pt_format) if(pt_format)
{ {
str_pt = pt_format.formatToChart(pt.val); str_pt = pt_format.formatToChart(pt.val);
......
Common/Drawings/Format/Shape.js
View file @ 747b95a4
...@@ -3769,14 +3769,16 @@ CShape.prototype = ...@@ -3769,14 +3769,16 @@ CShape.prototype =
break; break;
} }
} }
var old_geometry = this.spPr && isRealObject(this.spPr.geometry) ? this.spPr.geometry : null;
if (_final_preset != null) { if (_final_preset != null) {
this.spPr.setGeometry(CreateGeometry(_final_preset)); this.spPr.setGeometry(CreateGeometry(_final_preset));
if(this.spPr.geometry)
{
this.spPr.geometry.setParent(this.spPr);
}
} }
else { else {
this.spPr.geometry = null; this.spPr.geometry = null;
} }
var new_geometry = this.spPr && isRealObject(this.spPr.geometry) ? this.spPr.geometry : null;
if ((!this.brush || !this.brush.fill) && (!this.pen || !this.pen.Fill || !this.pen.Fill.fill)) { if ((!this.brush || !this.brush.fill) && (!this.pen || !this.pen.Fill || !this.pen.Fill.fill)) {
var new_line2 = new CLn(); var new_line2 = new CLn();
new_line2.Fill = new CUniFill(); new_line2.Fill = new CUniFill();
......
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