Skip to content

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

updateRect у graphics 

git-svn-id: svn://192.168.3.15/activex/AVS/Sources/TeamlabOffice/trunk/OfficeWeb@56406 954022d7-b5bf-4e40-9824-e11837661b57
parent a9bf5f3b
Hide whitespace changes
Inline Side-by-side
Showing with 659 additions and 178 deletions
Common/Drawings/Format/ChartSpace.js
View file @ 9b2d22a7
......@@ -201,6 +201,8 @@ function CChartSpace()
this.snapArrayY = [];
this.bbox = null;
this.setRecalculateInfo();
......@@ -387,6 +389,136 @@ CChartSpace.prototype =
return this;
},
rebuildSeriesFromAsc: function(asc_chart)
{
if(this.chart && this.chart.plotArea && this.chart.plotArea.charts[0])
{
var asc_series = asc_chart.series;
var chart_type = this.chart.plotArea.charts[0];
var first_series = chart_type.series[0] ? chart_type.series[0] : new chart_type.getSeriesConstructor()();
removeAllSeriesFromChart(chart_type);
var parsedHeaders = asc_chart.parseSeriesHeaders();
if(chart_type.getObjectType() !== historyitem_type_ScatterChart)
{
for(var i = 0; i < asc_series.length; ++i)
{
var series = first_series.createDuplicate();
series.setIdx(i);
series.setOrder(i);
series.setVal(new CYVal());
var val = series.val;
val.setNumRef(new CNumRef());
var num_ref = val.numRef;
num_ref.setF(asc_series[i].Val.Formula);
num_ref.setNumCache(new CNumLit());
var num_cache = num_ref.numCache;
num_cache.setPtCount(asc_series[i].Val.NumCache.length);
for(var j = 0; j < asc_series[i].Val.NumCache.length; ++j)
{
var pt = new CNumericPoint();
pt.setIdx(j);
pt.setFormatCode(asc_series[i].Val.NumCache[j].numFormatStr);
pt.setVal(asc_series[i].Val.NumCache[j].val);
num_cache.addPt(pt);
}
if(parsedHeaders.bTop)
{
series.setCat(new CCat());
var cat = series.cat;
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);
}
}
else
{
series.setCat(null);
}
if(parsedHeaders.bLeft && asc_series[i].TxCache)
{
series.setTx(new CTx());
var tx= series.tx;
tx.setStrRef(new CStrRef());
var str_ref = tx.strRef;
str_ref.setF(asc_series[i].TxCache.Formula);
str_ref.setStrCache(new CStrCache());
var str_cache = str_ref.strCache;
str_cache.setPtCount(1);
str_cache.addPt(new CStringPoint());
var pt = str_cache.pt[0];
pt.setIdx(0);
pt.setVal(asc_series[i].TxCache.Tx);
}
else
{
series.setTx(null);
}
chart_type.addSer(series);
}
}
else
{
var first_series = asc_series.length > 1 ? asc_series[0] : null;
var start_index = asc_series.length > 1 ? 1 : 0;
var parsedHeaders = asc_chart.parseSeriesHeaders();
var minus = start_index === 1 ? 1 : 0;
for(var i = start_index; i < asc_series.length; ++i)
{
var series = new CScatterSeries();
series.setIdx(i - minus);
series.setOrder(i - minus);
if(first_series)
{
series.setXVal(new CXVal());
var x_val = series.xVal;
x_val.setNumRef(new CNumRef());
var num_ref = x_val.numRef;
num_ref.setF(first_series.Val.Formula);
num_ref.setNumCache(new CNumLit());
var num_cache = num_ref.numCache;
num_cache.setPtCount(first_series.Val.NumCache.length);
for(var j = 0; j < first_series.Val.NumCache.length; ++j)
{
var pt = new CNumericPoint();
pt.setIdx(j);
pt.setFormatCode(first_series.Val.NumCache[j].numFormatStr);
pt.setVal(first_series.Val.NumCache[j].val);
num_cache.addPt(pt);
}
}
series.setYVal(new CYVal());
var y_val = series.yVal;
y_val.setNumRef(new CNumRef());
var num_ref = y_val.numRef;
num_ref.setF(asc_series[i].Val.Formula);
num_ref.setNumCache(new CNumLit());
var num_cache = num_ref.numCache;
num_cache.setPtCount(asc_series[i].Val.NumCache.length);
for(var j = 0; j < asc_series[i].Val.NumCache.length; ++j)
{
var pt = new CNumericPoint();
pt.setIdx(j);
pt.setFormatCode(asc_series[i].Val.NumCache[j].numFormatStr);
pt.setVal(asc_series[i].Val.NumCache[j].val);
num_cache.addPt(pt);
}
chart_type.addSer(series);
}
}
this.setRecalculateInfo();
}
},
Write_ToBinary2: function (w)
{
w.WriteLong(this.getObjectType());
......@@ -654,7 +786,312 @@ CChartSpace.prototype =
return ShapeToImageConverter(this, this.pageIndex).ImageUrl;
},
getRangeObjectStr: function()
{
if(!this.recalcInfo.recalculateBBox)
{
this.recalculateBBox();
}
var ret = {range: null, bVert: null};
if(this.bbox && this.bbox.seriesBBox)
{
var r1 = this.bbox.seriesBBox.r1, r2 = this.bbox.seriesBBox.r2, c1 = this.bbox.seriesBBox.c1, c2 = this.bbox.seriesBBox.c2;
if(this.bbox.seriesBBox.bVert)
{
ret.bVert = true;
if(this.bbox.catBBox)
{
--r1;
}
if(this.bbox.serBBox)
{
--c1;
}
}
else
{
ret.bVert = false;
if(this.bbox.catBBox)
{
--c1;
}
if(this.bbox.serBBox)
{
--r1;
}
}
var startCell = new CellAddress(r1, c1, 0);
var endCell = new CellAddress(r2, c2, 0);
if (startCell && endCell)
{
var wsName = this.worksheet.sName;
if ( !rx_test_ws_name.test(wsName) )
wsName = "'" + wsName + "'";
if (startCell.getID() == endCell.getID())
ret.range = wsName + "!" + startCell.getID();
else
ret.range = wsName + "!" + startCell.getID() + ":" + endCell.getID();
}
}
return ret;
},
recalculateBBox: function()
{
this.bbox = null;
if(this.chart && this.chart.plotArea && this.chart.plotArea.charts[0] && this.worksheet)
{
var series = this.chart.plotArea.charts[0].series;
if(Array.isArray(series) && series.length > 0)
{
var series_title_f = [], cat_title_f, series_f = [], i, range1;
var ref;
if(series[0].cat && series[0].cat.strRef)
{
ref = series[0].cat.strRef;
}
else if(series[0].xVal)
{
if(series[0].xVal.strRef)
{
ref = series[0].xVal.strRef;
}
else if(series[0].xVal.numRef)
{
ref = series[0].xVal.numRef;
}
}
if(ref)
{
var cat_title_parsed_ref = parserHelp.parse3DRef(ref.f);
if(cat_title_parsed_ref)
{
var cat_title_sheet = this.worksheet.workbook.getWorksheetByName(cat_title_parsed_ref.sheet);
if(cat_title_sheet === this.worksheet)
{
range1 = cat_title_sheet.getRange2(cat_title_parsed_ref.range);
if(range1 && range1.bbox)
{
cat_title_f = range1.bbox;
}
}
}
}
var b_vert/*флаг означает, что значения в серии идут по горизонтали, а сами серии по вертикали сверху вниз*/
, b_titles_vert;
for(i = 0; i < series.length; ++i)
{
var numRef = null;
if(series[i].val)
numRef = series[i].val.numRef;
else if(series[i].yVal)
numRef = series[i].yVal.numRef;
if(numRef)
{
var series_parsed_ref = parserHelp.parse3DRef(numRef.f);
if(!series_parsed_ref)
return;
var series_sheet = this.worksheet.workbook.getWorksheetByName(series_parsed_ref.sheet);
if(series_sheet !== this.worksheet)
return;
range1 = series_sheet.getRange2(series_parsed_ref.range);
if(range1 && range1.bbox)
{
if(range1.bbox.r1 !== range1.bbox.r2 && range1.bbox.c1 !== range1.bbox.c2)
return;
if(series_f.length > 0)
{
if(!isRealBool(b_vert))
{
if(series_f[0].c1 === range1.bbox.c1 && series_f[0].c2 === range1.bbox.c2)
{
b_vert = true;
}
else if(series_f[0].r1 === range1.bbox.r1 && series_f[0].r2 === range1.bbox.r2)
{
b_vert = false;
}
else
{
return;
}
}
else
{
if(b_vert)
{
if(!(series_f[0].c1 === range1.bbox.c1 && series_f[0].c2 === range1.bbox.c2))
{
return;
}
}
else
{
if(!(series_f[0].r1 === range1.bbox.r1 && series_f[0].r2 === range1.bbox.r2))
{
return;
}
}
}
if(b_vert)
{
if(range1.bbox.r1 - series_f[series_f.length-1].r1 !== 1)
return;
}
else
{
if(range1.bbox.c1 - series_f[series_f.length-1].c1 !== 1)
return;
}
}
series_f.push(range1.bbox);
}
else
return;
}
else
return;
if(Array.isArray(series_title_f))
{
if(series[i].tx && series[i].tx.strRef)
{
var series_cat_parsed_ref = parserHelp.parse3DRef(series[i].tx.strRef.f);
if(!series_cat_parsed_ref)
{
series_title_f = null;
continue;
}
var series_cat_sheet = this.worksheet.workbook.getWorksheetByName(series_cat_parsed_ref.sheet);
if(series_cat_sheet !== this.worksheet)
{
series_title_f = null;
continue;
}
range1 = series_cat_sheet.getRange2(series_cat_parsed_ref.range);
if(range1 && range1.bbox)
{
if(range1.bbox.r1 !== range1.bbox.r2 || range1.bbox.c1 !== range1.bbox.c2)
{
series_title_f = null;
continue;
}
if(!isRealBool(b_titles_vert))
{
if(series_title_f.length > 0)
{
if( range1.bbox.r1 - series_title_f[0].r1 === 1)
b_titles_vert = true;
else if(range1.bbox.c1 - series_title_f[0].c1 === 1)
b_titles_vert = false;
else
{
series_title_f = null;
continue;
}
}
}
else
{
if(b_titles_vert)
{
if( range1.bbox.r1 - series_title_f[series_title_f.length-1].r1 !== 1)
{
series_title_f = null;
continue;
}
}
else
{
if( range1.bbox.c1 - series_title_f[series_title_f.length-1].c1 !== 1)
{
series_title_f = null;
continue;
}
}
}
series_title_f.push(range1.bbox);
}
else
{
series_title_f = null;
continue;
}
}
else
{
series_title_f = null;
}
}
}
this.bbox = {
seriesBBox: null,
catBBox: null,
serBBox: null
};
//if(b_vert)
//{
this.bbox.seriesBBox = {
r1: series_f[0].r1,
r2: series_f[series_f.length-1].r2,
c1: series_f[0].c1,
c2: series_f[series_f.length-1].c2,
bVert: b_vert
};
/* }
else
{
this.bbox.seriesBox = {
r1: series_f[0].
};
}*/
if(cat_title_f)
{
if(b_vert)
{
if(cat_title_f.c1 !== this.bbox.seriesBBox.c1
|| cat_title_f.c2 !== this.bbox.seriesBBox.c2
|| cat_title_f.r1 !== cat_title_f.r1
|| cat_title_f.r1 !== this.bbox.seriesBBox.r1-1)
{
cat_title_f = null;
}
}
else
{
if(cat_title_f.c1 !== cat_title_f.c2
|| cat_title_f.r1 !== this.bbox.seriesBBox.r1
|| cat_title_f.r2 !== this.bbox.seriesBBox.r2
|| cat_title_f.c1 !== this.bbox.seriesBBox.c1-1)
{
cat_title_f = null;
}
}
this.bbox.catBBox = cat_title_f;
}
if(Array.isArray(series_title_f))
{
// if(b_titles_vert)
// {
this.bbox.serBBox = {
r1: series_title_f[0].r1,
r2: series_title_f[series_title_f.length-1].r2,
c1: series_title_f[0].c1,
c2: series_title_f[series_title_f.length-1].c2
};
// }
// else
// {
// this.bbox.serBBox = {
// r1: series_title_f[0].r1,
// r2: series_title_f[0].r1,
// };
// }
}
}
}
},
recalculateReferences: function()
{
......@@ -3677,11 +4114,13 @@ CChartSpace.prototype =
for(i = 0; i < calc_entryes.length; ++i)
{
calc_entry = calc_entryes[i];
calc_entry.calcMarkerUnion.marker.localX = cur_left_x + distance_to_text + line_marker_width/2 - marker_size/2;
if(calc_entry.calcMarkerUnion.marker)
calc_entry.calcMarkerUnion.marker.localX = cur_left_x + distance_to_text + line_marker_width/2 - marker_size/2;
calc_entry.calcMarkerUnion.lineMarker.localX = cur_left_x + distance_to_text;
calc_entry.calcMarkerUnion.lineMarker.localY = legend_height/2;
cur_left_x += arr_width[i];
calc_entry.calcMarkerUnion.marker.localY = legend_height/2 - marker_size/2;
if(calc_entry.calcMarkerUnion.marker)
calc_entry.calcMarkerUnion.marker.localY = legend_height/2 - marker_size/2;
calc_entry.localX = calc_entry.calcMarkerUnion.lineMarker.localX+line_marker_width+distance_to_text;
calc_entry.localY = 0;
}
......@@ -5426,6 +5865,16 @@ CChartSpace.prototype =
{
/*this.setRecalculateInfo();
this.recalculate();*/
if(graphics.updatedRect)
{
var rect = graphics.updatedRect;
var bounds = this.bounds;
if(bounds.x > rect.x + rect.w
|| bounds.y > rect.y + rect.h
|| bounds.x + bounds.w < rect.x
|| bounds.y + bounds.h < rect.y)
return;
}
var intGrid = graphics.GetIntegerGrid();
graphics.SetIntegerGrid(false);
graphics.transform3(this.transform, false);
......@@ -6604,7 +7053,8 @@ CPrintSettings.prototype =
Load_Changes: function(r)
{
switch (data.Type)
var type = r.GetLong();
switch (type)
{
case historyitem_PrintSettingsSetHeaderFooter:
{
......@@ -7440,14 +7890,14 @@ function CreateLineChart(asc_chart, type)
chart.setPlotArea(new CPlotArea());
chart.setLegend(new CLegend());
chart.setPlotVisOnly(true);
chart.setTitle(new CTitle());
chart.title.setOverlay(false);
chart.title.setSpPr(new CSpPr());
chart.title.spPr.setFill(new CUniFill());
chart.title.spPr.Fill.setFill(new CSolidFill());
chart.title.spPr.Fill.fill.setColor(new CUniColor());
chart.title.spPr.Fill.fill.color.setColor(new CSchemeColor());
chart.title.spPr.Fill.fill.color.color.setId(0);
//chart.setTitle(new CTitle());
//chart.title.setOverlay(false);
//chart.title.setSpPr(new CSpPr());
//chart.title.spPr.setFill(new CUniFill());
//chart.title.spPr.Fill.setFill(new CSolidFill());
//chart.title.spPr.Fill.fill.setColor(new CUniColor());
//chart.title.spPr.Fill.fill.color.setColor(new CSchemeColor());
//chart.title.spPr.Fill.fill.color.color.setId(0);
var disp_blanks_as;
if(type === GROUPING_STANDARD)
{
......@@ -7463,16 +7913,16 @@ function CreateLineChart(asc_chart, type)
plot_area.setLayout(new CLayout());
plot_area.addChart(new CLineChart());
plot_area.addAxis(new CCatAx());
plot_area.catAx.setTitle(new CTitle());
//plot_area.catAx.setTitle(new CTitle());
plot_area.addAxis(new CValAx());
plot_area.valAx.setTitle(new CTitle());
var title = plot_area.valAx.title;
title.setTxPr(new CTextBody());
title.txPr.setBodyPr(new CBodyPr());
//plot_area.valAx.setTitle(new CTitle());
//var title = plot_area.valAx.title;
//title.setTxPr(new CTextBody());
//title.txPr.setBodyPr(new CBodyPr());
var line_chart = plot_area.charts[0];
line_chart.setGrouping(type);
line_chart.setVaryColors(false);
line_chart.setDLbls(new CDLbls());
//line_chart.setDLbls(new CDLbls());
line_chart.setMarker(true);
line_chart.setSmooth(false);
line_chart.addAxId(plot_area.catAx);
......@@ -7534,13 +7984,14 @@ function CreateLineChart(asc_chart, type)
str_cache.setPtCount(1);
str_cache.addPt(new CStringPoint());
var pt = str_cache.pt[0];
pt.setIdx(0);
pt.setVal(asc_series[i].TxCache.Tx);
}
line_chart.addSer(series);
}
var d_lbls = line_chart.dLbls;
d_lbls.setShowLegendKey(false);
d_lbls.setShowVal(true);
//var d_lbls = line_chart.dLbls;
//d_lbls.setShowLegendKey(false);
//d_lbls.setShowVal(true);
var cat_ax = plot_area.catAx;
cat_ax.setScaling(new CScaling());
cat_ax.setDelete(false);
......@@ -7679,17 +8130,18 @@ function CreateBarChart(asc_chart, type)
str_cache.setPtCount(1);
str_cache.addPt(new CStringPoint());
var pt = str_cache.pt[0];
pt.setIdx(0);
pt.setVal(asc_series[i].TxCache.Tx);
}
bar_chart.addSer(series);
}
bar_chart.setDLbls(new CDLbls());
//bar_chart.setDLbls(new CDLbls());
bar_chart.setGapWidth(150);
bar_chart.addAxId(plot_area.catAx);
bar_chart.addAxId(plot_area.valAx);
var d_lbls = bar_chart.dLbls;
d_lbls.setShowLegendKey(false);
d_lbls.setShowVal(true);
//var d_lbls = bar_chart.dLbls;
//d_lbls.setShowLegendKey(false);
//d_lbls.setShowVal(true);
var cat_ax = plot_area.catAx;
cat_ax.setScaling(new CScaling());
cat_ax.setDelete(false);
......@@ -7828,15 +8280,16 @@ function CreateHBarChart(asc_chart, type)
str_cache.setPtCount(1);
str_cache.addPt(new CStringPoint());
var pt = str_cache.pt[0];
pt.setIdx(0);
pt.setVal(asc_series[i].TxCache.Tx);
}
bar_chart.addSer(series);
}
bar_chart.setDLbls(new CDLbls());
var d_lbls = bar_chart.dLbls;
d_lbls.setShowLegendKey(false);
d_lbls.setShowVal(true);
//bar_chart.setDLbls(new CDLbls());
//var d_lbls = bar_chart.dLbls;
//d_lbls.setShowLegendKey(false);
//d_lbls.setShowVal(true);
bar_chart.setGapWidth(150);
bar_chart.addAxId(plot_area.catAx);
bar_chart.addAxId(plot_area.valAx);
......@@ -7977,17 +8430,18 @@ function CreateAreaChart(asc_chart, type)
str_cache.setPtCount(1);
str_cache.addPt(new CStringPoint());
var pt = str_cache.pt[0];
pt.setIdx(0);
pt.setVal(asc_series[i].TxCache.Tx);
}
area_chart.addSer(series);
}
area_chart.setDLbls(new CDLbls());
//area_chart.setDLbls(new CDLbls());
area_chart.addAxId(plot_area.catAx);
area_chart.addAxId(plot_area.valAx);
var d_lbls = area_chart.dLbls;
d_lbls.setShowLegendKey(false);
d_lbls.setShowVal(true);
//var d_lbls = area_chart.dLbls;
//d_lbls.setShowLegendKey(false);
//d_lbls.setShowVal(true);
var cat_ax = plot_area.catAx;
cat_ax.setScaling(new CScaling());
cat_ax.setDelete(false);
......@@ -8117,14 +8571,15 @@ function CreatePieChart(asc_chart, bDoughnut)
str_cache.setPtCount(1);
str_cache.addPt(new CStringPoint());
var pt = str_cache.pt[0];
pt.setIdx(0);
pt.setVal(asc_series[i].TxCache.Tx);
}
pie_chart.addSer(series);
}
pie_chart.setDLbls(new CDLbls());
pie_chart.dLbls.setShowLegendKey(false);
pie_chart.dLbls.setShowVal(true);
//pie_chart.setDLbls(new CDLbls());
//pie_chart.dLbls.setShowLegendKey(false);
//pie_chart.dLbls.setShowVal(true);
pie_chart.setFirstSliceAng(0);
if(bDoughnut)
pie_chart.setHoleSize(50);
......@@ -8252,12 +8707,12 @@ function CreateScatterChart(asc_chart)
//}
scatter_chart.addSer(series);
}
scatter_chart.setDLbls(new CDLbls());
//scatter_chart.setDLbls(new CDLbls());
scatter_chart.addAxId(plot_area.catAx);
scatter_chart.addAxId(plot_area.valAx);
var d_lbls = scatter_chart.dLbls;
d_lbls.setShowLegendKey(false);
d_lbls.setShowVal(true);
//var d_lbls = scatter_chart.dLbls;
//d_lbls.setShowLegendKey(false);
//d_lbls.setShowVal(true);
var cat_ax = plot_area.catAx;
cat_ax.setScaling(new CScaling());
cat_ax.setDelete(false);
......@@ -8330,7 +8785,7 @@ function CreateStockChart(asc_chart)
plot_area.addAxis(new CCatAx());
plot_area.addAxis(new CValAx());
var line_chart = plot_area.charts[0];
line_chart.setDLbls(new CDLbls());
//line_chart.setDLbls(new CDLbls());
line_chart.addAxId(plot_area.catAx);
line_chart.addAxId(plot_area.valAx);
line_chart.setHiLowLines(new CSpPr());
......@@ -8395,14 +8850,15 @@ function CreateStockChart(asc_chart)
str_cache.setPtCount(1);
str_cache.addPt(new CStringPoint());
var pt = str_cache.pt[0];
pt.setIdx(0);
pt.setVal(asc_series[i].TxCache.Tx);
}
line_chart.addSer(series);
}
var d_lbls = line_chart.dLbls;
d_lbls.setShowLegendKey(false);
d_lbls.setShowVal(true);
//var d_lbls = line_chart.dLbls;
//d_lbls.setShowLegendKey(false);
//d_lbls.setShowVal(true);
var cat_ax = plot_area.catAx;
cat_ax.setScaling(new CScaling());
cat_ax.setDelete(false);
......@@ -8488,8 +8944,8 @@ function CreateDefaultAxises(valFormatCode)
scaling = val_ax.scaling;
scaling.setOrientation(ORIENTATION_MIN_MAX);
cat_ax.setCrossAx(val_ax);
cat_ax.setTitle(new CTitle());
val_ax.setTitle(new CTitle());
//cat_ax.setTitle(new CTitle());
//val_ax.setTitle(new CTitle());
var title = val_ax.title;
title.setTxPr(new CTextBody());
title.txPr.setBodyPr(new CBodyPr());
......@@ -8607,16 +9063,17 @@ function CreateRadarChart(asc_chart)
str_cache.setPtCount(1);
str_cache.addPt(new CStringPoint());
var pt = str_cache.pt[0];
pt.setIdx(0);
pt.setVal(asc_series[i].TxCache.Tx);
}
bar_chart.addSer(series);
}
bar_chart.setDLbls(new CDLbls());
//bar_chart.setDLbls(new CDLbls());
bar_chart.addAxId(plot_area.catAx);
bar_chart.addAxId(plot_area.valAx);
var d_lbls = bar_chart.dLbls;
d_lbls.setShowLegendKey(false);
d_lbls.setShowVal(true);
//var d_lbls = bar_chart.dLbls;
//d_lbls.setShowLegendKey(false);
//d_lbls.setShowVal(true);
var cat_ax = plot_area.catAx;
cat_ax.setScaling(new CScaling());
cat_ax.setDelete(false);
......
Common/Drawings/Format/Image.js
View file @ 9b2d22a7
......@@ -784,6 +784,16 @@ CImageShape.prototype =
draw: function(graphics, transform)
{
if(graphics.updatedRect)
{
var rect = graphics.updatedRect;
var bounds = this.bounds;
if(bounds.x > rect.x + rect.w
|| bounds.y > rect.y + rect.h
|| bounds.x + bounds.w < rect.x
|| bounds.y + bounds.h < rect.y)
return;
}
var _transform = transform ? transform :this.transform;
graphics.SetIntegerGrid(false);
graphics.transform3(_transform, false);
......
Common/Drawings/Format/Shape.js
View file @ 9b2d22a7
......@@ -1884,160 +1884,164 @@ CShape.prototype =
recalculateTextStyles: function (level)
{
var parent_objects = this.getParentObjects();
var default_style = new CStyle("defaultStyle", null, null, null);
default_style.ParaPr.Spacing.LineRule = linerule_Auto;
default_style.ParaPr.Spacing.Line = 1;
default_style.ParaPr.Spacing.Before = 0;
default_style.ParaPr.Spacing.After = 0;
if (isRealObject(parent_objects.presentation) && isRealObject(parent_objects.presentation.defaultTextStyle)
&& isRealObject(parent_objects.presentation.defaultTextStyle.levels[level]))
return ExecuteNoHistory(function()
{
var default_ppt_style = parent_objects.presentation.defaultTextStyle.levels[level];
default_style.ParaPr.Merge(default_ppt_style.pPr.Copy());
default_style.TextPr.Merge(default_ppt_style.rPr.Copy());
}
var master_style;
if (isRealObject(parent_objects.master) && isRealObject(parent_objects.master.txStyles))
{
var master_ppt_styles;
master_style = new CStyle("masterStyele", null, null, null);
if (this.isPlaceholder())
var parent_objects = this.getParentObjects();
var default_style = new CStyle("defaultStyle", null, null, null);
default_style.ParaPr.Spacing.LineRule = linerule_Auto;
default_style.ParaPr.Spacing.Line = 1;
default_style.ParaPr.Spacing.Before = 0;
default_style.ParaPr.Spacing.After = 0;
if (isRealObject(parent_objects.presentation) && isRealObject(parent_objects.presentation.defaultTextStyle)
&& isRealObject(parent_objects.presentation.defaultTextStyle.levels[level]))
{
var default_ppt_style = parent_objects.presentation.defaultTextStyle.levels[level];
default_style.ParaPr.Merge(default_ppt_style.pPr.Copy());
default_style.TextPr.Merge(default_ppt_style.rPr.Copy());
}
var master_style;
if (isRealObject(parent_objects.master) && isRealObject(parent_objects.master.txStyles))
{
switch (this.getPlaceholderType())
var master_ppt_styles;
master_style = new CStyle("masterStyele", null, null, null);
if (this.isPlaceholder())
{
case phType_ctrTitle:
case phType_title:
{
master_ppt_styles = parent_objects.master.txStyles.titleStyle;
break;
}
case phType_body:
case phType_subTitle:
case phType_obj:
case null:
{
master_ppt_styles = parent_objects.master.txStyles.bodyStyle;
break;
}
default:
switch (this.getPlaceholderType())
{
master_ppt_styles = parent_objects.master.txStyles.otherStyle;
break;
case phType_ctrTitle:
case phType_title:
{
master_ppt_styles = parent_objects.master.txStyles.titleStyle;
break;
}
case phType_body:
case phType_subTitle:
case phType_obj:
case null:
{
master_ppt_styles = parent_objects.master.txStyles.bodyStyle;
break;
}
default:
{
master_ppt_styles = parent_objects.master.txStyles.otherStyle;
break;
}
}
}
}
else
{
master_ppt_styles = parent_objects.master.txStyles.otherStyle;
else
{
master_ppt_styles = parent_objects.master.txStyles.otherStyle;
}
if (isRealObject(master_ppt_styles) && isRealObject(master_ppt_styles.levels) && isRealObject(master_ppt_styles.levels[level]))
{
var master_ppt_style = master_ppt_styles.levels[level];
master_style.ParaPr = master_ppt_style.pPr.Copy();
master_style.TextPr = master_ppt_style.rPr.Copy();
}
}
if (isRealObject(master_ppt_styles) && isRealObject(master_ppt_styles.levels) && isRealObject(master_ppt_styles.levels[level]))
var hierarchy = this.getHierarchy();
var hierarchy_styles = [];
for (var i = 0; i < hierarchy.length; ++i)
{
var master_ppt_style = master_ppt_styles.levels[level];
master_style.ParaPr = master_ppt_style.pPr.Copy();
master_style.TextPr = master_ppt_style.rPr.Copy();
var hierarchy_shape = hierarchy[i];
if (isRealObject(hierarchy_shape)
&& isRealObject(hierarchy_shape.txBody)
&& isRealObject(hierarchy_shape.txBody.lstStyle)
&& isRealObject(hierarchy_shape.txBody.lstStyle.levels)
&& isRealObject(hierarchy_shape.txBody.lstStyle.levels[level]))
{
var hierarchy_ppt_style = hierarchy_shape.txBody.lstStyle.levels[level];
var hierarchy_style = new CStyle("hierarchyStyle" + i, null, null, null);
hierarchy_style.ParaPr = hierarchy_ppt_style.pPr.Copy();
hierarchy_style.TextPr = hierarchy_ppt_style.rPr.Copy();
hierarchy_styles.push(hierarchy_style);
}
}
}
var hierarchy = this.getHierarchy();
var hierarchy_styles = [];
for (var i = 0; i < hierarchy.length; ++i)
{
var hierarchy_shape = hierarchy[i];
if (isRealObject(hierarchy_shape)
&& isRealObject(hierarchy_shape.txBody)
&& isRealObject(hierarchy_shape.txBody.lstStyle)
&& isRealObject(hierarchy_shape.txBody.lstStyle.levels)
&& isRealObject(hierarchy_shape.txBody.lstStyle.levels[level]))
var ownStyle;
if (isRealObject(this.txBody) && isRealObject(this.txBody.lstStyle) && isRealObject(this.txBody.lstStyle[level]))
{
var hierarchy_ppt_style = hierarchy_shape.txBody.lstStyle.levels[level];
var hierarchy_style = new CStyle("hierarchyStyle" + i, null, null, null);
hierarchy_style.ParaPr = hierarchy_ppt_style.pPr.Copy();
hierarchy_style.TextPr = hierarchy_ppt_style.rPr.Copy();
hierarchy_styles.push(hierarchy_style);
ownStyle = new CStyle("ownStyle", null, null, null);
var own_ppt_style = this.txBody.lstStyle[level];
ownStyle.ParaPr = own_ppt_style.pPr.Copy();
ownStyle.TextPr = own_ppt_style.rPr.Copy();
}
}
var ownStyle;
if (isRealObject(this.txBody) && isRealObject(this.txBody.lstStyle) && isRealObject(this.txBody.lstStyle[level]))
{
ownStyle = new CStyle("ownStyle", null, null, null);
var own_ppt_style = this.txBody.lstStyle[level];
ownStyle.ParaPr = own_ppt_style.pPr.Copy();
ownStyle.TextPr = own_ppt_style.rPr.Copy();
}
var shape_text_style;
if (isRealObject(this.style) && isRealObject(this.style.fontRef))
{
shape_text_style = new CStyle("shapeTextStyle", null, null, null);
var first_name;
if(this.style.fontRef.idx === fntStyleInd_major)
first_name = "+mj-";
else
first_name = "+mn-";
var shape_text_style;
if (isRealObject(this.style) && isRealObject(this.style.fontRef))
{
shape_text_style = new CStyle("shapeTextStyle", null, null, null);
var first_name;
if(this.style.fontRef.idx === fntStyleInd_major)
first_name = "+mj-";
else
first_name = "+mn-";
shape_text_style.TextPr.RFonts.Ascii = { Name: first_name + "lt", Index: -1 };
shape_text_style.TextPr.RFonts.EastAsia = { Name: first_name +"ea", Index: -1 };
shape_text_style.TextPr.RFonts.CS = { Name: first_name +"cs", Index: -1 };
shape_text_style.TextPr.RFonts.Ascii = { Name: first_name + "lt", Index: -1 };
shape_text_style.TextPr.RFonts.EastAsia = { Name: first_name +"ea", Index: -1 };
shape_text_style.TextPr.RFonts.CS = { Name: first_name +"cs", Index: -1 };
if (this.style.fontRef.Color != null && this.style.fontRef.Color.color != null)
{
var unifill = new CUniFill();
unifill.fill = new CSolidFill();
unifill.fill.color = this.style.fontRef.Color;
shape_text_style.TextPr.Unifill = unifill;
if (this.style.fontRef.Color != null && this.style.fontRef.Color.color != null)
{
var unifill = new CUniFill();
unifill.fill = new CSolidFill();
unifill.fill.color = this.style.fontRef.Color;
shape_text_style.TextPr.Unifill = unifill;
}
}
}
var Styles = new CStyles();
var Styles = new CStyles();
var last_style_id;
var isPlaceholder = this.isPlaceholder();
if (isPlaceholder) {
if (default_style) {
Styles.Add(default_style);
default_style.BasedOn = null;
last_style_id = default_style.Id;
}
var last_style_id;
var isPlaceholder = this.isPlaceholder();
if (isPlaceholder) {
if (default_style) {
Styles.Add(default_style);
default_style.BasedOn = null;
last_style_id = default_style.Id;
}
if (master_style) {
Styles.Add(master_style);
master_style.BasedOn = last_style_id;
last_style_id = master_style.Id;
}
}
else {
if (master_style) {
Styles.Add(master_style);
master_style.BasedOn = null;
last_style_id = master_style.Id;
if (master_style) {
Styles.Add(master_style);
master_style.BasedOn = last_style_id;
last_style_id = master_style.Id;
}
}
else {
if (master_style) {
Styles.Add(master_style);
master_style.BasedOn = null;
last_style_id = master_style.Id;
}
if (default_style) {
Styles.Add(default_style);
default_style.BasedOn = last_style_id;
last_style_id = default_style.Id;
if (default_style) {
Styles.Add(default_style);
default_style.BasedOn = last_style_id;
last_style_id = default_style.Id;
}
}
}
for (var i = hierarchy_styles.length - 1; i > -1; --i) {
for (var i = hierarchy_styles.length - 1; i > -1; --i) {
if (hierarchy_styles[i]) {
Styles.Add(hierarchy_styles[i]);
hierarchy_styles[i].BasedOn = last_style_id;
last_style_id = hierarchy_styles[i].Id;
if (hierarchy_styles[i]) {
Styles.Add(hierarchy_styles[i]);
hierarchy_styles[i].BasedOn = last_style_id;
last_style_id = hierarchy_styles[i].Id;
}
}
}
if (shape_text_style) {
Styles.Add(shape_text_style);
shape_text_style.BasedOn = last_style_id;
last_style_id = shape_text_style.Id;
}
if (shape_text_style) {
Styles.Add(shape_text_style);
shape_text_style.BasedOn = last_style_id;
last_style_id = shape_text_style.Id;
}
this.compiledStyles[level] = {styles: Styles, lastId: last_style_id};
return this.compiledStyles[level];
this.compiledStyles[level] = {styles: Styles, lastId: last_style_id};
return this.compiledStyles[level];
}, this, []);
},
recalculateBrush: function () {
......@@ -3080,6 +3084,16 @@ CShape.prototype =
draw: function (graphics, transform, transformText, pageIndex) {
if(graphics.updatedRect)
{
var rect = graphics.updatedRect;
var bounds = this.bounds;
if(bounds.x > rect.x + rect.w
|| bounds.y > rect.y + rect.h
|| bounds.x + bounds.w < rect.x
|| bounds.y + bounds.h < rect.y)
return;
}
var _transform = transform ? transform : this.transform;
var _transform_text = transformText ? transformText : this.transformText;
if (graphics.IsSlideBoundsCheckerType === true) {
......@@ -3686,12 +3700,12 @@ CShape.prototype =
},
hitInInnerArea: function (x, y) {
if (this.brush != null && this.brush.fill != null
if ((this.getObjectType && this.getObjectType() === historyitem_type_ChartSpace) || this.brush != null && this.brush.fill != null
&& this.brush.fill.type != FILL_TYPE_NOFILL) {
var invert_transform = this.getInvertTransform();
var x_t = invert_transform.TransformPointX(x, y);
var y_t = invert_transform.TransformPointY(x, y);
if (isRealObject(this.spPr) && isRealObject(this.spPr.geometry))
if (isRealObject(this.spPr) && isRealObject(this.spPr.geometry) && !(this.getObjectType && this.getObjectType() === historyitem_type_ChartSpace))
return this.spPr.geometry.hitInInnerArea(this.getCanvasContext(), x_t, y_t);
return x_t > 0 && x_t < this.extX && y_t > 0 && y_t < this.extY;
}
......
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