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
2ff49bbc
Commit
2ff49bbc
authored
Oct 26, 2016
by
Alexander.Trofimov
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
add functions
asc_getManualMax asc_getManualMin asc_setManualMax asc_setManualMin
parent
5456e8d1
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
26 additions
and
8 deletions
+26
-8
cell/model/WorkbookElems.js
cell/model/WorkbookElems.js
+24
-6
common/Charts/DrawingObjects.js
common/Charts/DrawingObjects.js
+2
-2
No files found.
cell/model/WorkbookElems.js
View file @
2ff49bbc
...
...
@@ -4596,9 +4596,9 @@ CellArea.prototype = {
this
.
minAxisType
=
null
;
this
.
maxAxisType
=
null
;
this
.
rightToLeft
=
null
;
this
.
manualMax
=
null
;
this
.
manualMin
=
null
;
this
.
manualMax
=
undefined
;
this
.
manualMin
=
undefined
;
this
.
dateAxis
=
false
;
// elements
...
...
@@ -4643,6 +4643,8 @@ CellArea.prototype = {
this
.
minAxisType
=
Asc
.
c_oAscSparklineAxisMinMax
.
Individual
;
this
.
maxAxisType
=
Asc
.
c_oAscSparklineAxisMinMax
.
Individual
;
this
.
rightToLeft
=
false
;
this
.
manualMax
=
null
;
this
.
manualMin
=
null
;
// elements
var
defaultSeriesColor
=
3629202
;
...
...
@@ -4658,8 +4660,6 @@ CellArea.prototype = {
this
.
colorLow
=
new
AscCommonExcel
.
RgbColor
(
defaultOtherColor
);
};
sparklineGroup
.
prototype
.
set
=
function
(
val
)
{
this
.
manualMax
=
null
!==
val
.
manualMax
?
val
.
manualMax
:
this
.
manualMax
;
this
.
manualMin
=
null
!==
val
.
manualMin
?
val
.
manualMin
:
this
.
manualMin
;
this
.
lineWeight
=
null
!==
val
.
lineWeight
?
val
.
lineWeight
:
this
.
lineWeight
;
this
.
type
=
null
!==
val
.
type
?
val
.
type
:
this
.
type
;
this
.
dateAxis
=
null
!==
val
.
dateAxis
?
val
.
dateAxis
:
this
.
dateAxis
;
...
...
@@ -4675,6 +4675,8 @@ CellArea.prototype = {
this
.
minAxisType
=
null
!==
val
.
minAxisType
?
val
.
minAxisType
:
this
.
minAxisType
;
this
.
maxAxisType
=
null
!==
val
.
maxAxisType
?
val
.
maxAxisType
:
this
.
maxAxisType
;
this
.
rightToLeft
=
null
!==
val
.
rightToLeft
?
val
.
rightToLeft
:
this
.
rightToLeft
;
this
.
manualMax
=
null
!==
val
.
manualMax
?
val
.
manualMax
:
this
.
manualMax
;
this
.
manualMin
=
null
!==
val
.
manualMin
?
val
.
manualMin
:
this
.
manualMin
;
var
getColor
=
function
(
color
)
{
return
color
instanceof
Asc
.
asc_CColor
?
AscCommonExcel
.
CorrectAscColor
(
color
)
:
color
;
...
...
@@ -4693,8 +4695,6 @@ CellArea.prototype = {
sparklineGroup
.
prototype
.
clone
=
function
(
onlyProps
)
{
var
res
=
new
sparklineGroup
(
!
onlyProps
);
res
.
Id
=
this
.
Id
;
res
.
manualMax
=
this
.
manualMax
;
res
.
manualMin
=
this
.
manualMin
;
res
.
lineWeight
=
this
.
lineWeight
;
res
.
type
=
this
.
type
;
res
.
dateAxis
=
this
.
dateAxis
;
...
...
@@ -4710,6 +4710,8 @@ CellArea.prototype = {
res
.
minAxisType
=
this
.
minAxisType
;
res
.
maxAxisType
=
this
.
maxAxisType
;
res
.
rightToLeft
=
this
.
rightToLeft
;
res
.
manualMax
=
this
.
manualMax
;
res
.
manualMin
=
this
.
manualMin
;
res
.
colorSeries
=
this
.
colorSeries
?
this
.
colorSeries
.
clone
()
:
null
;
res
.
colorNegative
=
this
.
colorNegative
?
this
.
colorNegative
.
clone
()
:
null
;
...
...
@@ -4810,6 +4812,12 @@ CellArea.prototype = {
sparklineGroup
.
prototype
.
asc_getRightToLeft
=
function
()
{
return
this
.
rightToLeft
;
};
sparklineGroup
.
prototype
.
asc_getManualMax
=
function
()
{
return
this
.
manualMax
;
};
sparklineGroup
.
prototype
.
asc_getManualMin
=
function
()
{
return
this
.
manualMin
;
};
sparklineGroup
.
prototype
.
asc_getColorSeries
=
function
()
{
return
this
.
colorSeries
?
Asc
.
colorObjToAscColor
(
this
.
colorSeries
)
:
this
.
colorSeries
;
};
...
...
@@ -4876,6 +4884,12 @@ CellArea.prototype = {
sparklineGroup
.
prototype
.
asc_setRightToLeft
=
function
(
val
)
{
this
.
rightToLeft
=
val
;
};
sparklineGroup
.
prototype
.
asc_setManualMax
=
function
(
val
)
{
this
.
manualMax
=
val
;
};
sparklineGroup
.
prototype
.
asc_setManualMin
=
function
(
val
)
{
this
.
manualMin
=
val
;
};
sparklineGroup
.
prototype
.
asc_setColorSeries
=
function
(
val
)
{
this
.
colorSeries
=
val
;
};
...
...
@@ -7259,6 +7273,8 @@ function getCurrencyFormat(opt_cultureInfo, opt_fraction, opt_currency, opt_curr
prot
[
"
asc_getMinAxisType
"
]
=
prot
.
asc_getMinAxisType
;
prot
[
"
asc_getMaxAxisType
"
]
=
prot
.
asc_getMaxAxisType
;
prot
[
"
asc_getRightToLeft
"
]
=
prot
.
asc_getRightToLeft
;
prot
[
"
asc_getManualMax
"
]
=
prot
.
asc_getManualMax
;
prot
[
"
asc_getManualMin
"
]
=
prot
.
asc_getManualMin
;
prot
[
"
asc_getColorSeries
"
]
=
prot
.
asc_getColorSeries
;
prot
[
"
asc_getColorNegative
"
]
=
prot
.
asc_getColorNegative
;
prot
[
"
asc_getColorAxis
"
]
=
prot
.
asc_getColorAxis
;
...
...
@@ -7281,6 +7297,8 @@ function getCurrencyFormat(opt_cultureInfo, opt_fraction, opt_currency, opt_curr
prot
[
"
asc_setMinAxisType
"
]
=
prot
.
asc_setMinAxisType
;
prot
[
"
asc_setMaxAxisType
"
]
=
prot
.
asc_setMaxAxisType
;
prot
[
"
asc_setRightToLeft
"
]
=
prot
.
asc_setRightToLeft
;
prot
[
"
asc_setManualMax
"
]
=
prot
.
asc_setManualMax
;
prot
[
"
asc_setManualMin
"
]
=
prot
.
asc_setManualMin
;
prot
[
"
asc_setColorSeries
"
]
=
prot
.
asc_setColorSeries
;
prot
[
"
asc_setColorNegative
"
]
=
prot
.
asc_setColorNegative
;
prot
[
"
asc_setColorAxis
"
]
=
prot
.
asc_setColorAxis
;
...
...
common/Charts/DrawingObjects.js
View file @
2ff49bbc
...
...
@@ -691,7 +691,7 @@ CSparklineView.prototype.initFromSparkline = function(oSparkline, oSparklineGrou
var
val_ax_props
=
new
AscCommon
.
asc_ValAxisSettings
();
if
(
settings
.
type
!==
c_oAscChartTypeSettings
.
barStackedPer
)
{
if
(
oSparklineGroup
.
minAxisType
===
Asc
.
c_oAscSparklineAxisMinMax
.
Custom
&&
oSparklineGroup
.
manualMin
!=
null
)
if
(
oSparklineGroup
.
minAxisType
===
Asc
.
c_oAscSparklineAxisMinMax
.
Custom
&&
oSparklineGroup
.
manualMin
!=
=
null
)
{
val_ax_props
.
putMinValRule
(
c_oAscValAxisRule
.
fixed
);
val_ax_props
.
putMinVal
(
oSparklineGroup
.
manualMin
);
...
...
@@ -700,7 +700,7 @@ CSparklineView.prototype.initFromSparkline = function(oSparkline, oSparklineGrou
{
val_ax_props
.
putMinValRule
(
c_oAscValAxisRule
.
auto
);
}
if
(
oSparklineGroup
.
maxAxisType
===
Asc
.
c_oAscSparklineAxisMinMax
.
Custom
&&
oSparklineGroup
.
manualMax
!=
null
)
if
(
oSparklineGroup
.
maxAxisType
===
Asc
.
c_oAscSparklineAxisMinMax
.
Custom
&&
oSparklineGroup
.
manualMax
!=
=
null
)
{
val_ax_props
.
putMinValRule
(
c_oAscValAxisRule
.
fixed
);
val_ax_props
.
putMinVal
(
oSparklineGroup
.
manualMax
);
...
...
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