Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
S
sdkjs
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Boris Kocherov
sdkjs
Commits
ee46ce37
Commit
ee46ce37
authored
Mar 23, 2017
by
Sergey Luzyanin
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix Bug 34471
parent
ca2ae175
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
26 additions
and
0 deletions
+26
-0
common/Drawings/Format/ChartSpace.js
common/Drawings/Format/ChartSpace.js
+26
-0
No files found.
common/Drawings/Format/ChartSpace.js
View file @
ee46ce37
...
@@ -11667,6 +11667,28 @@ function GetNumFormatFromSeries(aAscSeries){
...
@@ -11667,6 +11667,28 @@ function GetNumFormatFromSeries(aAscSeries){
return
"
General
"
;
return
"
General
"
;
}
}
function
FillCatAxNumFormat
(
oCatAxis
,
aAscSeries
){
if
(
!
oCatAxis
){
return
;
}
var
sFormatCode
=
null
;
if
(
aAscSeries
&&
aAscSeries
[
0
]
&&
aAscSeries
[
0
].
Cat
&&
aAscSeries
[
0
].
Cat
.
NumCache
&&
aAscSeries
[
0
].
Cat
.
NumCache
[
0
]){
if
(
typeof
(
aAscSeries
[
0
].
Cat
.
NumCache
[
0
].
numFormatStr
)
===
"
string
"
&&
aAscSeries
[
0
].
Cat
.
NumCache
[
0
].
numFormatStr
.
length
>
0
){
sFormatCode
=
aAscSeries
[
0
].
Cat
.
NumCache
[
0
].
numFormatStr
;
}
}
if
(
sFormatCode
){
oCatAxis
.
setNumFmt
(
new
AscFormat
.
CNumFmt
());
oCatAxis
.
numFmt
.
setFormatCode
(
sFormatCode
?
sFormatCode
:
"
General
"
);
oCatAxis
.
numFmt
.
setSourceLinked
(
true
);
}
}
function
CreateLineChart
(
chartSeries
,
type
,
bUseCache
,
oOptions
,
b3D
)
function
CreateLineChart
(
chartSeries
,
type
,
bUseCache
,
oOptions
,
b3D
)
{
{
var
asc_series
=
chartSeries
.
series
;
var
asc_series
=
chartSeries
.
series
;
...
@@ -11762,6 +11784,7 @@ function CreateLineChart(chartSeries, type, bUseCache, oOptions, b3D)
...
@@ -11762,6 +11784,7 @@ function CreateLineChart(chartSeries, type, bUseCache, oOptions, b3D)
cat_ax
.
setNoMultiLvlLbl
(
false
);
cat_ax
.
setNoMultiLvlLbl
(
false
);
var
scaling
=
cat_ax
.
scaling
;
var
scaling
=
cat_ax
.
scaling
;
scaling
.
setOrientation
(
AscFormat
.
ORIENTATION_MIN_MAX
);
scaling
.
setOrientation
(
AscFormat
.
ORIENTATION_MIN_MAX
);
FillCatAxNumFormat
(
cat_ax
,
asc_series
);
val_ax
.
setScaling
(
new
AscFormat
.
CScaling
());
val_ax
.
setScaling
(
new
AscFormat
.
CScaling
());
val_ax
.
setDelete
(
false
);
val_ax
.
setDelete
(
false
);
val_ax
.
setAxPos
(
AscFormat
.
AX_POS_L
);
val_ax
.
setAxPos
(
AscFormat
.
AX_POS_L
);
...
@@ -11906,6 +11929,7 @@ function CreateBarChart(chartSeries, type, bUseCache, oOptions, b3D, bDepth)
...
@@ -11906,6 +11929,7 @@ function CreateBarChart(chartSeries, type, bUseCache, oOptions, b3D, bDepth)
cat_ax
.
setNoMultiLvlLbl
(
false
);
cat_ax
.
setNoMultiLvlLbl
(
false
);
var
scaling
=
cat_ax
.
scaling
;
var
scaling
=
cat_ax
.
scaling
;
scaling
.
setOrientation
(
AscFormat
.
ORIENTATION_MIN_MAX
);
scaling
.
setOrientation
(
AscFormat
.
ORIENTATION_MIN_MAX
);
FillCatAxNumFormat
(
cat_ax
,
asc_series
);
val_ax
.
setScaling
(
new
AscFormat
.
CScaling
());
val_ax
.
setScaling
(
new
AscFormat
.
CScaling
());
val_ax
.
setDelete
(
false
);
val_ax
.
setDelete
(
false
);
val_ax
.
setAxPos
(
AscFormat
.
AX_POS_L
);
val_ax
.
setAxPos
(
AscFormat
.
AX_POS_L
);
...
@@ -12048,6 +12072,7 @@ function CreateHBarChart(chartSeries, type, bUseCache, oOptions, b3D)
...
@@ -12048,6 +12072,7 @@ function CreateHBarChart(chartSeries, type, bUseCache, oOptions, b3D)
cat_ax
.
setNoMultiLvlLbl
(
false
);
cat_ax
.
setNoMultiLvlLbl
(
false
);
var
scaling
=
cat_ax
.
scaling
;
var
scaling
=
cat_ax
.
scaling
;
scaling
.
setOrientation
(
AscFormat
.
ORIENTATION_MIN_MAX
);
scaling
.
setOrientation
(
AscFormat
.
ORIENTATION_MIN_MAX
);
FillCatAxNumFormat
(
cat_ax
,
asc_series
);
val_ax
.
setScaling
(
new
AscFormat
.
CScaling
());
val_ax
.
setScaling
(
new
AscFormat
.
CScaling
());
val_ax
.
setDelete
(
false
);
val_ax
.
setDelete
(
false
);
val_ax
.
setAxPos
(
AscFormat
.
AX_POS_B
);
val_ax
.
setAxPos
(
AscFormat
.
AX_POS_B
);
...
@@ -12175,6 +12200,7 @@ function CreateAreaChart(chartSeries, type, bUseCache, oOptions)
...
@@ -12175,6 +12200,7 @@ function CreateAreaChart(chartSeries, type, bUseCache, oOptions)
cat_ax
.
setLblOffset
(
100
);
cat_ax
.
setLblOffset
(
100
);
cat_ax
.
setNoMultiLvlLbl
(
false
);
cat_ax
.
setNoMultiLvlLbl
(
false
);
cat_ax
.
scaling
.
setOrientation
(
AscFormat
.
ORIENTATION_MIN_MAX
);
cat_ax
.
scaling
.
setOrientation
(
AscFormat
.
ORIENTATION_MIN_MAX
);
FillCatAxNumFormat
(
cat_ax
,
asc_series
);
val_ax
.
setScaling
(
new
AscFormat
.
CScaling
());
val_ax
.
setScaling
(
new
AscFormat
.
CScaling
());
val_ax
.
setDelete
(
false
);
val_ax
.
setDelete
(
false
);
val_ax
.
setAxPos
(
AscFormat
.
AX_POS_L
);
val_ax
.
setAxPos
(
AscFormat
.
AX_POS_L
);
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment