Skip to content
GitLab
Menu
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
Dóra Kocsis
dynare
Commits
f6ff010b
Commit
f6ff010b
authored
May 14, 2013
by
Houtan Bastani
Browse files
reporting: @series: rename lineStyle as graphLineStyle
parent
8a45999e
Changes
3
Hide whitespace changes
Inline
Side-by-side
matlab/reports/@series/display.m
View file @
f6ff010b
...
...
@@ -40,9 +40,9 @@ disp(' ');
disp
([
'
''
'
o
.
graphLineColor
'
''
'
]);
disp
(
' '
);
disp
([
name
'.
l
ine
_s
tyle = '
]);
disp
([
name
'.
graphL
ine
S
tyle = '
]);
disp
(
' '
);
disp
([
'
''
'
o
.
l
ine
_s
tyle
'
''
'
]);
disp
([
'
''
'
o
.
graphL
ine
S
tyle
'
''
'
]);
disp
(
' '
);
disp
([
name
'.line_width = '
]);
...
...
matlab/reports/@series/getLine.m
View file @
f6ff010b
...
...
@@ -36,8 +36,8 @@ assert(~isempty(o.data) && isa(o.data, 'dynSeries'), ['@series.getLine: must ' .
% Line
assert
(
ischar
(
o
.
graphLineColor
),
'@series.getLine: graphLineColor must be a string'
);
valid_line_style
=
{
'none'
,
'-'
,
'--'
,
':'
,
'-.'
};
assert
(
any
(
strcmp
(
o
.
l
ineStyle
,
valid_line_style
)),
...
[
'@series.getLine:
l
ineStyle must be one of '
strjoin
(
valid_line_style
,
' '
)]);
assert
(
any
(
strcmp
(
o
.
graphL
ineStyle
,
valid_line_style
)),
...
[
'@series.getLine:
graphL
ineStyle must be one of '
strjoin
(
valid_line_style
,
' '
)]);
assert
(
isfloat
(
o
.
lineWidth
),
[
'@series.getLine: lineWidth must be a '
...
'positive number'
]);
...
...
@@ -54,8 +54,8 @@ assert(isfloat(o.graphMarkerSize), ['@series.getLine: graphMarkerSize must be a
'positive number'
]);
% Marker & Line
assert
(
~
(
strcmp
(
o
.
l
ineStyle
,
'none'
)
&&
isempty
(
o
.
graphMarker
)),
[
'@series.getLine: '
...
'you must provide at least one of
l
ineStyle and graphMarker'
]);
assert
(
~
(
strcmp
(
o
.
graphL
ineStyle
,
'none'
)
&&
isempty
(
o
.
graphMarker
)),
[
'@series.getLine: '
...
'you must provide at least one of
graphL
ineStyle and graphMarker'
]);
% Validate xrange
assert
(
isempty
(
xrange
)
||
isa
(
xrange
,
'dynDates'
));
...
...
@@ -71,7 +71,7 @@ opt = {'XData', 1:length(ds.data)};
opt
=
{
opt
{:},
'YData'
,
ds
.
data
};
opt
=
{
opt
{:},
'Color'
,
o
.
graphLineColor
};
opt
=
{
opt
{:},
'LineStyle'
,
o
.
l
ineStyle
};
opt
=
{
opt
{:},
'LineStyle'
,
o
.
graphL
ineStyle
};
opt
=
{
opt
{:},
'LineWidth'
,
o
.
lineWidth
};
if
~
isempty
(
o
.
graphMarker
)
...
...
matlab/reports/@series/series.m
View file @
f6ff010b
...
...
@@ -36,7 +36,7 @@ o = struct;
o
.
data
=
''
;
o
.
graphLineColor
=
'k'
;
o
.
l
ineStyle
=
'-'
;
o
.
graphL
ineStyle
=
'-'
;
o
.
lineWidth
=
0.5
;
o
.
graphMarker
=
''
;
...
...
Write
Preview
Supports
Markdown
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