Skip to content

S
sdkjs
Commit 6eeffb8b authored by Sergey.Luzyanin's avatar Sergey.Luzyanin
Browse files
Options

Поправлен баг 26683 - [AutoSave] После сохранения и переоткрытия происходит... 

Поправлен баг 26683 - [AutoSave] После сохранения и переоткрытия происходит смена Gridlines диаграммы. Убраны лишние изменения при применении настроек диаграммы.

git-svn-id: svn://192.168.3.15/activex/AVS/Sources/TeamlabOffice/trunk/OfficeWeb@58525 954022d7-b5bf-4e40-9824-e11837661b57
parent 97b03dcf
Hide whitespace changes
Inline Side-by-side
Showing with 155 additions and 48 deletions
Common/Drawings/CommonController.js
View file @ 6eeffb8b
......@@ -1789,7 +1789,10 @@ DrawingObjectsController.prototype =
{
chart.setTitle(new CTitle());
}
chart.title.setOverlay(title_show_settings === c_oAscChartTitleShowSettings.overlay);
if(chart.title.overlay !== (title_show_settings === c_oAscChartTitleShowSettings.overlay))
{
chart.title.setOverlay(title_show_settings === c_oAscChartTitleShowSettings.overlay);
}
}
var plot_area = chart.plotArea;
//horAxisLabel
......@@ -1814,7 +1817,7 @@ DrawingObjectsController.prototype =
}
if(isRealNumber(LEGEND_POS_MAP[legend_pos_settings]))
{
if(chart.legendPos !== LEGEND_POS_MAP[legend_pos_settings])
if(chart.legend.legendPos !== LEGEND_POS_MAP[legend_pos_settings])
chart.legend.setLegendPos(LEGEND_POS_MAP[legend_pos_settings]);
var b_overlay = c_oAscChartLegendShowSettings.leftOverlay === legend_pos_settings || legend_pos_settings === c_oAscChartLegendShowSettings.rightOverlay;
if(chart.legend.overlay !== b_overlay)
......@@ -2027,7 +2030,7 @@ DrawingObjectsController.prototype =
else
need_num_fmt = "0%";
var b_marker = type === c_oAscChartTypeSettings.lineNormalMarker|| type === c_oAscChartTypeSettings.lineStackedMarker || type === c_oAscChartTypeSettings.lineStackedPerMarker;
var b_marker = chartSettings.getShowMarker();
if(chart_type.getObjectType() === historyitem_type_LineChart)
{
......@@ -2044,8 +2047,8 @@ DrawingObjectsController.prototype =
val_axis[i].numFmt.setFormatCode(need_num_fmt);
}
if(chart_type.marker !== b_marker)
chart_type.setMarker(b_marker);
// if((isRealBool(chart_type.marker) && chart_type.marker) !== b_marker)
// chart_type.setMarker(b_marker);
}
else
{
......@@ -2356,9 +2359,8 @@ DrawingObjectsController.prototype =
chart_type = plot_area.charts[0];
//подписи данных
if(typeof chart_type.setDLbls === "function")
if(typeof chart_type.setDLbls === "function" && isRealNumber(chartSettings.getDataLabelsPos()) && chartSettings.getDataLabelsPos() !== c_oAscChartDataLabelsPos.none)
{
var data_lbls;
var checkDataLabels = function(chartType)
{
chartType.removeDataLabels();
......@@ -2381,13 +2383,17 @@ DrawingObjectsController.prototype =
{
if(isRealBool(chartSettings.showMarker))
{
for(var j = 0; j < chart_type.series.length; ++j)
//for(var j = 0; j < chart_type.series.length; ++j)
//{
// chart_type.series[j].setMarker(null);
//}
if(chartSettings.showMarker === true)
{
chart_type.series[j].setMarker(null);
if(!chart_type.marker)
{
chart_type.setMarker(true);
}
}
var prop_to_set = chartSettings.showMarker === false ? null : true;
chart_type.setMarker(prop_to_set);
if(chartSettings.showMarker)
{
for(var j = 0; j < chart_type.series.length; ++j)
......@@ -2404,12 +2410,17 @@ DrawingObjectsController.prototype =
{
if(!chart_type.series[j].marker)
{
chart_type.series[j].setMarker(new CMarker());
chart_type.series[j].marker.setSymbol(SYMBOL_NONE);
if(!chart_type.series[j].marker)
{
chart_type.series[j].setMarker(new CMarker());
}
if(chart_type.series[j].marker.symbol !== SYMBOL_NONE)
{
chart_type.series[j].marker.setSymbol(SYMBOL_NONE);
}
}
}
}
}
if(isRealBool(chartSettings.bLine))
{
......@@ -2435,17 +2446,26 @@ DrawingObjectsController.prototype =
for(var j = 0; j < chart_type.series.length; ++j)
{
removeDPtsFromSeries(chart_type.series[j]);
chart_type.series[j].setSmooth(chartSettings.smooth === true ? true : null);
if(chart_type.series[j].smooth !== (chartSettings.smooth === true))
{
chart_type.series[j].setSmooth(chartSettings.smooth === true);
}
if(chart_type.series[j].spPr && chart_type.series[j].spPr.ln)
{
chart_type.series[j].spPr.setLn(null);
}
}
}
chart_type.setSmooth(chartSettings.smooth === true);
if(chart_type.smooth !== (chartSettings.smooth === true))
{
chart_type.setSmooth(chartSettings.smooth === true);
}
for(var j = 0; j < chart_type.series.length; ++j)
{
chart_type.series[j].setSmooth(chartSettings.smooth === true);
if(chart_type.series[j].smooth !== (chartSettings.smooth === true))
{
chart_type.series[j].setSmooth(chartSettings.smooth === true);
}
}
}
}
......@@ -2662,7 +2682,14 @@ DrawingObjectsController.prototype =
ret.putSeparator(data_labels.separator);
ret.putDataLabelsPos(isRealNumber(REV_DLBL_POS_DEFINES_MAP[data_labels.dLblPos]) ? REV_DLBL_POS_DEFINES_MAP[data_labels.dLblPos] : c_oAscChartDataLabelsPos.none);
}
else
{
ret.putShowSerName(false);
ret.putShowCatName(false);
ret.putShowVal(false);
ret.putSeparator("");
ret.putDataLabelsPos(c_oAscChartDataLabelsPos.none);
}
if(chart.legend)
{
......@@ -2785,7 +2812,27 @@ DrawingObjectsController.prototype =
break;
}
}
ret.putShowMarker(chart_type.marker === true);
var bShowMarker = false;
if(chart_type.marker !== false)
{
for(var j = 0; j < chart_type.series.length; ++j)
{
if(!chart_type.series[j].marker)
{
if(!chart_type.series[j].marker)
{
bShowMarker = true;
break;
}
if(chart_type.series[j].marker.symbol !== SYMBOL_NONE)
{
bShowMarker = true;
break;
}
}
}
}
ret.putShowMarker(bShowMarker);
var b_no_line = true;
for(var i = 0; i < chart_type.series.length; ++i)
{
......
Common/Drawings/Format/ChartFormat.js
View file @ 6eeffb8b
......@@ -4118,7 +4118,7 @@ CCatAx.prototype =
var labelsPosition = props.getLabelsPosition();
if(isRealNumber(intervalBetweenTick))
if(isRealNumber(intervalBetweenTick) && this.tickMarkSkip !== intervalBetweenTick)
this.setTickMarkSkip(intervalBetweenTick);
if(isRealNumber(intervalBetweenLabelsRule))
......@@ -4130,7 +4130,7 @@ CCatAx.prototype =
this.setTickLblSkip(null);
}
}
else if(intervalBetweenLabelsRule === c_oAscBetweenLabelsRule.manual && isRealNumber(intervalBetweenLabels))
else if(intervalBetweenLabelsRule === c_oAscBetweenLabelsRule.manual && isRealNumber(intervalBetweenLabels) && this.tickLblSkip !== intervalBetweenLabels)
{
this.setTickLblSkip(intervalBetweenLabels);
}
......@@ -4140,8 +4140,14 @@ CCatAx.prototype =
this.setScaling(new CScaling());
var scaling = this.scaling;
if(isRealBool(invertCatOrder))
scaling.setOrientation(invertCatOrder ? ORIENTATION_MAX_MIN : ORIENTATION_MIN_MAX);
if(isRealNumber(labelsAxisDistance))
{
var new_orientation = invertCatOrder ? ORIENTATION_MAX_MIN : ORIENTATION_MIN_MAX;
if(scaling.orientation !== new_orientation)
{
scaling.setOrientation(invertCatOrder ? ORIENTATION_MAX_MIN : ORIENTATION_MIN_MAX);
}
}
if(isRealNumber(labelsAxisDistance) && this.lblOffset !== labelsAxisDistance)
this.setLblOffset(labelsAxisDistance);
if(isRealNumber(axisType))
......@@ -4149,13 +4155,13 @@ CCatAx.prototype =
//TODO
}
if(isRealNumber(majorTickMark) && isRealNumber(MENU_SETTINGS_TICK_MARK[majorTickMark]))
if(isRealNumber(majorTickMark) && isRealNumber(MENU_SETTINGS_TICK_MARK[majorTickMark]) && this.majorTickMark !== MENU_SETTINGS_TICK_MARK[majorTickMark])
this.setMajorTickMark(MENU_SETTINGS_TICK_MARK[majorTickMark]);
if(isRealNumber(minorTickMark) && isRealNumber(MENU_SETTINGS_TICK_MARK[minorTickMark]))
if(isRealNumber(minorTickMark) && isRealNumber(MENU_SETTINGS_TICK_MARK[minorTickMark]) && this.minorTickMark !== MENU_SETTINGS_TICK_MARK[minorTickMark])
this.setMinorTickMark(MENU_SETTINGS_TICK_MARK[minorTickMark]);
if(isRealNumber(tickLabelsPos) && isRealNumber(MENU_SETTINGS_LABELS_POS[tickLabelsPos]))
if(isRealNumber(tickLabelsPos) && isRealNumber(MENU_SETTINGS_LABELS_POS[tickLabelsPos]) && this.tickLblPos !== MENU_SETTINGS_LABELS_POS[tickLabelsPos])
this.setTickLblPos(MENU_SETTINGS_LABELS_POS[tickLabelsPos]);
......@@ -4163,26 +4169,50 @@ CCatAx.prototype =
{
if(crossesRule === c_oAscCrossesRule.auto)
{
this.crossAx.setCrossesAt(null);
this.crossAx.setCrosses(CROSSES_AUTO_ZERO);
if(this.crossAx.crossesAt !== null)
{
this.crossAx.setCrossesAt(null);
}
if(this.crossAx.crosses !== CROSSES_AUTO_ZERO)
{
this.crossAx.setCrosses(CROSSES_AUTO_ZERO);
}
}
else if(crossesRule === c_oAscCrossesRule.value)
{
if(isRealNumber(crosses))
{
this.crossAx.setCrossesAt(crosses);
this.crossAx.setCrosses(null);
if(this.crossAx.crossesAt !== crosses)
{
this.crossAx.setCrossesAt(crosses);
}
if(this.crossAx !== null)
{
this.crossAx.setCrosses(null);
}
}
}
else if(crossesRule === c_oAscCrossesRule.maxValue)
{
this.crossAx.setCrossesAt(null);
this.crossAx.setCrosses(CROSSES_MAX);
if(this.crossAx.crossesAt !== null)
{
this.crossAx.setCrossesAt(null);
}
if(this.crossAx.crosses !== CROSSES_MAX)
{
this.crossAx.setCrosses(CROSSES_MAX);
}
}
}
if(isRealNumber(labelsPosition) && isRealObject(this.crossAx) && this.crossAx.setCrossBetween)
this.crossAx.setCrossBetween(labelsPosition === c_oAscLabelsPosition.byDivisions ? CROSS_BETWEEN_MID_CAT : CROSS_BETWEEN_BETWEEN);
{
var new_lbl_position = labelsPosition === c_oAscLabelsPosition.byDivisions ? CROSS_BETWEEN_MID_CAT : CROSS_BETWEEN_BETWEEN;
if(this.crossAx.crossBetween !== new_lbl_position)
{
this.crossAx.setCrossBetween(new_lbl_position);
}
}
},
getObjectType: function()
......@@ -5068,7 +5098,7 @@ CCatAx.prototype =
}
case historyitem_CatAxSetMinorGridlines:
{
this.majorGridlines = readObject(r);
this.minorGridlines = readObject(r);
if(this.parent && this.parent.parent && this.parent.parent.parent)
{
this.parent.parent.parent.handleUpdateGridlines();
......@@ -8392,16 +8422,28 @@ CValAx.prototype =
}
if(isRealBool(props.invertValOrder))
scaling.setOrientation(props.invertValOrder ? ORIENTATION_MAX_MIN : ORIENTATION_MIN_MAX);
{
var new_or = props.invertValOrder ? ORIENTATION_MAX_MIN : ORIENTATION_MIN_MAX;
if(scaling.orientation !== new_or)
{
scaling.setOrientation(new_or);
}
}
if(isRealBool(props.logScale))
{
if(props.logScale && isRealNumber(props.logBase) && props.logBase >= 2 && props.logBase <=1000)
scaling.setLogBase(props.logBase);
else if(!props.logBase)
{
if(scaling.logBase !== props.logBase)
{
scaling.setLogBase(props.logBase);
}
}
else if(!props.logBase && scaling.logBase !== null)
{
scaling.setLogBase(null);
}
}
if(isRealNumber(props.units))
......@@ -8421,34 +8463,52 @@ CValAx.prototype =
}
}
if(isRealNumber(props.majorTickMark) && isRealNumber(MENU_SETTINGS_TICK_MARK[props.majorTickMark]))
if(isRealNumber(props.majorTickMark) && isRealNumber(MENU_SETTINGS_TICK_MARK[props.majorTickMark]) && this.majorTickMark !== MENU_SETTINGS_TICK_MARK[props.majorTickMark])
this.setMajorTickMark(MENU_SETTINGS_TICK_MARK[props.majorTickMark]);
if(isRealNumber(props.minorTickMark) && isRealNumber(MENU_SETTINGS_TICK_MARK[props.minorTickMark]))
if(isRealNumber(props.minorTickMark) && isRealNumber(MENU_SETTINGS_TICK_MARK[props.minorTickMark]) && this.minorTickMark !== MENU_SETTINGS_TICK_MARK[props.minorTickMark])
this.setMinorTickMark(MENU_SETTINGS_TICK_MARK[props.minorTickMark]);
if(isRealNumber(props.tickLabelsPos) && isRealNumber(MENU_SETTINGS_LABELS_POS[props.tickLabelsPos]))
if(isRealNumber(props.tickLabelsPos) && isRealNumber(MENU_SETTINGS_LABELS_POS[props.tickLabelsPos]) && this.tickLblPos !== MENU_SETTINGS_LABELS_POS[props.tickLabelsPos])
this.setTickLblPos(MENU_SETTINGS_LABELS_POS[props.tickLabelsPos]);
if(isRealNumber(props.crossesRule) && isRealObject(this.crossAx))
{
if(props.crossesRule === c_oAscCrossesRule.auto)
{
this.crossAx.setCrossesAt(null);
this.crossAx.setCrosses(CROSSES_AUTO_ZERO);
if(this.crossAx.crossesAt !== null)
{
this.crossAx.setCrossesAt(null);
}
if(this.crossAx.crosses !== CROSSES_AUTO_ZERO)
{
this.crossAx.setCrosses(CROSSES_AUTO_ZERO);
}
}
else if(props.crossesRule === c_oAscCrossesRule.value)
{
if(isRealNumber(props.crosses))
{
this.crossAx.setCrossesAt(props.crosses);
this.crossAx.setCrosses(null);
if(this.crossAx.crossesAt !== props.crosses)
{
this.crossAx.setCrossesAt(props.crosses);
}
if(this.crossAx.crosses !== null)
{
this.crossAx.setCrosses(null);
}
}
}
else if(props.crossesRule === c_oAscCrossesRule.maxValue)
{
this.crossAx.setCrossesAt(null);
this.crossAx.setCrosses(CROSSES_MAX);
if(this.crossAx.crossesAt !== null)
{
this.crossAx.setCrossesAt(null);
}
if(this.crossAx.crosses !== CROSSES_MAX)
{
this.crossAx.setCrosses(CROSSES_MAX);
}
}
}
}
......
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