Skip to content

S
sdkjs
Commit 449c5ff9 authored by Dmitry.Vikulov's avatar Dmitry.Vikulov Committed by Alexander.Trofimov
Browse files
Options

- Поправлены превью pie, scatter, stock диаграмм 

- Сделан doubleClick для чартов в редакторе документов

git-svn-id: svn://192.168.3.15/activex/AVS/Sources/TeamlabOffice/trunk/OfficeWeb@49332 954022d7-b5bf-4e40-9824-e11837661b57
parent 5e5461fe
Hide whitespace changes
Inline Side-by-side
Showing with 29 additions and 75 deletions
Common/Charts/DrawingObjects.js
View file @ 449c5ff9
...@@ -498,7 +498,7 @@ asc_CChart.prototype = { ...@@ -498,7 +498,7 @@ asc_CChart.prototype = {
if ( _t.series[j].Cat.Formula && _t.series[j].Cat.NumCache.length ) if ( _t.series[j].Cat.Formula && _t.series[j].Cat.NumCache.length )
seria.TxCache.Tx = _t.series[j].Cat.NumCache[i].val; seria.TxCache.Tx = _t.series[j].Cat.NumCache[i].val;
else else
seria.TxCache.Tx = api.chartTranslate.series + " " + i; seria.TxCache.Tx = api.chartTranslate.series + " " + (i + 1);
} }
revSeries.push(seria); revSeries.push(seria);
} }
......
Common/Charts/charts.js
View file @ 449c5ff9
...@@ -173,12 +173,9 @@ function ChartPreviewManager() { ...@@ -173,12 +173,9 @@ function ChartPreviewManager() {
switch (chart.type) { switch (chart.type) {
case c_oAscChartType.line: case c_oAscChartType.line:
switch (chart.subType) { switch (chart.subType) {
case c_oAscChartSubType.normal: case c_oAscChartSubType.normal:
/*chart.data.push( [createItem(2), createItem(1)] );
chart.data.push( [createItem(3), createItem(2)] );
chart.data.push( [createItem(2), createItem(3)] );
chart.data.push( [createItem(3), createItem(2)] );*/
var ser = new asc_CChartSeria(); var ser = new asc_CChartSeria();
ser.Val.NumCache = [ createItem(2), createItem(3), createItem(2), createItem(3) ]; ser.Val.NumCache = [ createItem(2), createItem(3), createItem(2), createItem(3) ];
...@@ -192,10 +189,6 @@ function ChartPreviewManager() { ...@@ -192,10 +189,6 @@ function ChartPreviewManager() {
break; break;
case c_oAscChartSubType.stacked: case c_oAscChartSubType.stacked:
/*chart.data.push( [createItem(1), createItem(4)] );
chart.data.push( [createItem(6), createItem(4)] );
chart.data.push( [createItem(2), createItem(4)] );
chart.data.push( [createItem(8), createItem(5)] );*/
var ser = new asc_CChartSeria(); var ser = new asc_CChartSeria();
ser.Val.NumCache = [ createItem(1), createItem(6), createItem(2), createItem(8) ]; ser.Val.NumCache = [ createItem(1), createItem(6), createItem(2), createItem(8) ];
...@@ -209,10 +202,6 @@ function ChartPreviewManager() { ...@@ -209,10 +202,6 @@ function ChartPreviewManager() {
break; break;
case c_oAscChartSubType.stackedPer: case c_oAscChartSubType.stackedPer:
/*chart.data.push( [createItem(2), createItem(2)] );
chart.data.push( [createItem(4), createItem(2)] );
chart.data.push( [createItem(2), createItem(2)] );
chart.data.push( [createItem(4), createItem(2)] );*/
var ser = new asc_CChartSeria(); var ser = new asc_CChartSeria();
ser.Val.NumCache = [ createItem(2), createItem(4), createItem(2), createItem(4) ]; ser.Val.NumCache = [ createItem(2), createItem(4), createItem(2), createItem(4) ];
...@@ -235,7 +224,6 @@ function ChartPreviewManager() { ...@@ -235,7 +224,6 @@ function ChartPreviewManager() {
switch (chart.subType) { switch (chart.subType) {
case c_oAscChartSubType.normal: case c_oAscChartSubType.normal:
//chart.data.push( [createItem(4), createItem(3), createItem(2), createItem(1)] );
var ser = new asc_CChartSeria(); var ser = new asc_CChartSeria();
ser.Val.NumCache = [ createItem(4) ]; ser.Val.NumCache = [ createItem(4) ];
...@@ -259,10 +247,6 @@ function ChartPreviewManager() { ...@@ -259,10 +247,6 @@ function ChartPreviewManager() {
break; break;
case c_oAscChartSubType.stacked: case c_oAscChartSubType.stacked:
/*chart.data.push( [createItem(4), createItem(5)] );
chart.data.push( [createItem(3), createItem(4)] );
chart.data.push( [createItem(2), createItem(3)] );
chart.data.push( [createItem(1), createItem(2)] );*/
var ser = new asc_CChartSeria(); var ser = new asc_CChartSeria();
ser.Val.NumCache = [ createItem(4), createItem(3), createItem(2), createItem(1) ]; ser.Val.NumCache = [ createItem(4), createItem(3), createItem(2), createItem(1) ];
...@@ -276,10 +260,6 @@ function ChartPreviewManager() { ...@@ -276,10 +260,6 @@ function ChartPreviewManager() {
break; break;
case c_oAscChartSubType.stackedPer: case c_oAscChartSubType.stackedPer:
/*chart.data.push( [createItem(7), createItem(7)] );
chart.data.push( [createItem(5), createItem(6)] );
chart.data.push( [createItem(3), createItem(5)] );
chart.data.push( [createItem(1), createItem(4)] );*/
var ser = new asc_CChartSeria(); var ser = new asc_CChartSeria();
ser.Val.NumCache = [ createItem(7), createItem(5), createItem(3), createItem(1) ]; ser.Val.NumCache = [ createItem(7), createItem(5), createItem(3), createItem(1) ];
...@@ -298,7 +278,6 @@ function ChartPreviewManager() { ...@@ -298,7 +278,6 @@ function ChartPreviewManager() {
case c_oAscChartType.bar: case c_oAscChartType.bar:
switch (chart.subType) { switch (chart.subType) {
case c_oAscChartSubType.normal: case c_oAscChartSubType.normal:
//chart.data.push( [createItem(1), createItem(2), createItem(3), createItem(4)] );
var ser = new asc_CChartSeria(); var ser = new asc_CChartSeria();
ser.Val.NumCache = [ createItem(1) ]; ser.Val.NumCache = [ createItem(1) ];
...@@ -322,10 +301,6 @@ function ChartPreviewManager() { ...@@ -322,10 +301,6 @@ function ChartPreviewManager() {
break; break;
case c_oAscChartSubType.stacked: case c_oAscChartSubType.stacked:
/*chart.data.push( [createItem(1), createItem(2)] );
chart.data.push( [createItem(2), createItem(3)] );
chart.data.push( [createItem(3), createItem(4)] );
chart.data.push( [createItem(4), createItem(5)] );*/
var ser = new asc_CChartSeria(); var ser = new asc_CChartSeria();
ser.Val.NumCache = [ createItem(1), createItem(2), createItem(3), createItem(4) ]; ser.Val.NumCache = [ createItem(1), createItem(2), createItem(3), createItem(4) ];
...@@ -339,10 +314,6 @@ function ChartPreviewManager() { ...@@ -339,10 +314,6 @@ function ChartPreviewManager() {
break; break;
case c_oAscChartSubType.stackedPer: case c_oAscChartSubType.stackedPer:
/*chart.data.push( [createItem(1), createItem(4)] );
chart.data.push( [createItem(3), createItem(5)] );
chart.data.push( [createItem(5), createItem(6)] );
chart.data.push( [createItem(7), createItem(7)] );*/
var ser = new asc_CChartSeria(); var ser = new asc_CChartSeria();
ser.Val.NumCache = [ createItem(1), createItem(3), createItem(5), createItem(7) ]; ser.Val.NumCache = [ createItem(1), createItem(3), createItem(5), createItem(7) ];
...@@ -360,28 +331,18 @@ function ChartPreviewManager() { ...@@ -360,28 +331,18 @@ function ChartPreviewManager() {
break; break;
case c_oAscChartType.pie: case c_oAscChartType.pie:
/*chart.data.push( [createItem(3)] );
chart.data.push( [createItem(1)] );*/
var ser = new asc_CChartSeria(); var ser = new asc_CChartSeria();
ser.Val.NumCache = [ createItem(3) ]; ser.Val.NumCache = [ createItem(3), createItem(1) ];
ser.OutlineColor = uniColors[0]; ser.OutlineColor = uniColors[0];
chart.series.push(ser); chart.series.push(ser);
var ser = new asc_CChartSeria();
ser.Val.NumCache = [ createItem(1) ];
ser.OutlineColor = uniColors[1];
chart.series.push(ser);
break; break;
case c_oAscChartType.area: case c_oAscChartType.area:
switch (chart.subType) { switch (chart.subType) {
case c_oAscChartSubType.normal: case c_oAscChartSubType.normal:
/*chart.data.push( [createItem(0), createItem(0)] );
chart.data.push( [createItem(8), createItem(4)] );
chart.data.push( [createItem(5), createItem(2)] );
chart.data.push( [createItem(6), createItem(9)] );*/
var ser = new asc_CChartSeria(); var ser = new asc_CChartSeria();
ser.Val.NumCache = [ createItem(0), createItem(8), createItem(5), createItem(6) ]; ser.Val.NumCache = [ createItem(0), createItem(8), createItem(5), createItem(6) ];
...@@ -395,10 +356,6 @@ function ChartPreviewManager() { ...@@ -395,10 +356,6 @@ function ChartPreviewManager() {
break; break;
case c_oAscChartSubType.stacked: case c_oAscChartSubType.stacked:
/*chart.data.push( [createItem(0), createItem(4)] );
chart.data.push( [createItem(8), createItem(4)] );
chart.data.push( [createItem(5), createItem(4)] );
chart.data.push( [createItem(11), createItem(4)] );*/
var ser = new asc_CChartSeria(); var ser = new asc_CChartSeria();
ser.Val.NumCache = [ createItem(0), createItem(8), createItem(5), createItem(11) ]; ser.Val.NumCache = [ createItem(0), createItem(8), createItem(5), createItem(11) ];
...@@ -412,10 +369,6 @@ function ChartPreviewManager() { ...@@ -412,10 +369,6 @@ function ChartPreviewManager() {
break; break;
case c_oAscChartSubType.stackedPer: case c_oAscChartSubType.stackedPer:
/*chart.data.push( [createItem(0), createItem(4)] );
chart.data.push( [createItem(4), createItem(4)] );
chart.data.push( [createItem(1), createItem(4)] );
chart.data.push( [createItem(16), createItem(4)] );*/
var ser = new asc_CChartSeria(); var ser = new asc_CChartSeria();
ser.Val.NumCache = [ createItem(0), createItem(4), createItem(1), createItem(16) ]; ser.Val.NumCache = [ createItem(0), createItem(4), createItem(1), createItem(16) ];
...@@ -430,21 +383,9 @@ function ChartPreviewManager() { ...@@ -430,21 +383,9 @@ function ChartPreviewManager() {
break; break;
} }
break; break;
default:
/*for (var row = 0; row < maxRow; row++) {
var values = [];
for (var col = 0; col < maxCol; col++) {
var item = {};
item.numFormatStr = "General";
item.isDateTimeFormat = false;
item.value = row + col + 1;
values.push(item);
}
chart.data.push(values);
}*/
case c_oAscChartType.scatter:
var ser = new asc_CChartSeria(); var ser = new asc_CChartSeria();
ser.Val.NumCache = [ createItem(1), createItem(5) ]; ser.Val.NumCache = [ createItem(1), createItem(5) ];
ser.OutlineColor = uniColors[0]; ser.OutlineColor = uniColors[0];
...@@ -454,14 +395,27 @@ function ChartPreviewManager() { ...@@ -454,14 +395,27 @@ function ChartPreviewManager() {
ser.Val.NumCache = [ createItem(2), createItem(6) ]; ser.Val.NumCache = [ createItem(2), createItem(6) ];
ser.OutlineColor = uniColors[1]; ser.OutlineColor = uniColors[1];
chart.series.push(ser); chart.series.push(ser);
break;
default:
var ser = new asc_CChartSeria();
ser.Val.NumCache = [ createItem(3), createItem(5), createItem(7) ];
ser.OutlineColor = uniColors[0];
chart.series.push(ser);
ser = new asc_CChartSeria();
ser.Val.NumCache = [ createItem(10), createItem(12), createItem(14) ];
ser.OutlineColor = uniColors[1];
chart.series.push(ser);
ser = new asc_CChartSeria(); ser = new asc_CChartSeria();
ser.Val.NumCache = [ createItem(3), createItem(7) ]; ser.Val.NumCache = [ createItem(1), createItem(3), createItem(5) ];
ser.OutlineColor = uniColors[2]; ser.OutlineColor = uniColors[2];
chart.series.push(ser); chart.series.push(ser);
ser = new asc_CChartSeria(); ser = new asc_CChartSeria();
ser.Val.NumCache = [ createItem(4), createItem(8) ]; ser.Val.NumCache = [ createItem(8), createItem(10), createItem(12) ];
ser.OutlineColor = uniColors[3]; ser.OutlineColor = uniColors[3];
chart.series.push(ser); chart.series.push(ser);
......
Word/Editor/GraphicObjects/States.js
View file @ 449c5ff9
...@@ -4482,12 +4482,12 @@ function PreMoveInlineObject(graphicObjects, objectId, ctrlShiftFlag, bSelectedM ...@@ -4482,12 +4482,12 @@ function PreMoveInlineObject(graphicObjects, objectId, ctrlShiftFlag, bSelectedM
{ {
if(false === this.graphicObjects.document.Document_Is_SelectionLocked(changestype_Drawing_Props, {Type : changestype_2_Element_and_Type , Element : gr_obj.Parent, CheckType : changestype_Paragraph_Content} )) { if(false === this.graphicObjects.document.Document_Is_SelectionLocked(changestype_Drawing_Props, {Type : changestype_2_Element_and_Type , Element : gr_obj.Parent, CheckType : changestype_Paragraph_Content} )) {
var chart = this.graphicObjects.majorGraphicObject.GraphicObj; var graphicObject = this.graphicObjects.majorGraphicObject.GraphicObj;
chart["themeColors"] = []; graphicObject.chart.themeColors = [];
for (var i = 0; i < this.graphicObjects.drawingDocument.GuiControlColorsMap.length; i++) { for (var i = 0; i < this.graphicObjects.drawingDocument.GuiControlColorsMap.length; i++) {
chart["themeColors"].push( this.graphicObjects.drawingDocument.GuiControlColorsMap[i].get_hex() ); graphicObject.chart.themeColors.push( this.graphicObjects.drawingDocument.GuiControlColorsMap[i].get_hex() );
} }
editor.asc_fireCallback("asc_doubleClickOnChart", chart); editor.asc_fireCallback("asc_doubleClickOnChart", graphicObject);
} }
} }
} }
...@@ -5101,12 +5101,12 @@ function PreMoveState(graphicObjects, ctrlShiftFlag/*был ли нажат Ctrl ...@@ -5101,12 +5101,12 @@ function PreMoveState(graphicObjects, ctrlShiftFlag/*был ли нажат Ctrl
if(gr_obj.GraphicObj.chart) if(gr_obj.GraphicObj.chart)
{ {
if(false === this.graphicObjects.document.Document_Is_SelectionLocked(changestype_Drawing_Props, {Type : changestype_2_Element_and_Type , Element : gr_obj.Parent, CheckType : changestype_Paragraph_Content} )) { if(false === this.graphicObjects.document.Document_Is_SelectionLocked(changestype_Drawing_Props, {Type : changestype_2_Element_and_Type , Element : gr_obj.Parent, CheckType : changestype_Paragraph_Content} )) {
var chart = gr_obj.GraphicObj; var graphicObject = gr_obj.GraphicObj;
chart["themeColors"] = []; graphicObject.chart.themeColors = [];
for (var i = 0; i < this.graphicObjects.drawingDocument.GuiControlColorsMap.length; i++) { for (var i = 0; i < this.graphicObjects.drawingDocument.GuiControlColorsMap.length; i++) {
chart["themeColors"].push( this.graphicObjects.drawingDocument.GuiControlColorsMap[i].get_hex() ); graphicObject.chart.themeColors.push( this.graphicObjects.drawingDocument.GuiControlColorsMap[i].get_hex() );
} }
editor.asc_fireCallback("asc_doubleClickOnChart", chart); editor.asc_fireCallback("asc_doubleClickOnChart", graphicObject);
} }
} }
} }
......
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