Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
dynare
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Container registry
Model registry
Operate
Environments
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
GitLab community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Dynare
dynare
Commits
0f48b7dc
Commit
0f48b7dc
authored
May 14, 2013
by
Houtan Bastani
Browse files
Options
Downloads
Patches
Plain Diff
reporting: @series: rename lineStyle as graphLineStyle
parent
7b97c358
No related branches found
No related tags found
No related merge requests found
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
matlab/reporting/@series/display.m
+2
-2
2 additions, 2 deletions
matlab/reporting/@series/display.m
matlab/reporting/@series/getLine.m
+5
-5
5 additions, 5 deletions
matlab/reporting/@series/getLine.m
matlab/reporting/@series/series.m
+1
-1
1 addition, 1 deletion
matlab/reporting/@series/series.m
with
8 additions
and
8 deletions
matlab/reporting/@series/display.m
+
2
−
2
View file @
0f48b7dc
...
@@ -40,9 +40,9 @@ disp(' ');
...
@@ -40,9 +40,9 @@ disp(' ');
disp
([
'
''
'
o
.
graphLineColor
'
''
'
]);
disp
([
'
''
'
o
.
graphLineColor
'
''
'
]);
disp
(
' '
);
disp
(
' '
);
disp
([
name
'.
l
ine
_s
tyle = '
]);
disp
([
name
'.
graphL
ine
S
tyle = '
]);
disp
(
' '
);
disp
(
' '
);
disp
([
'
''
'
o
.
l
ine
_s
tyle
'
''
'
]);
disp
([
'
''
'
o
.
graphL
ine
S
tyle
'
''
'
]);
disp
(
' '
);
disp
(
' '
);
disp
([
name
'.line_width = '
]);
disp
([
name
'.line_width = '
]);
...
...
This diff is collapsed.
Click to expand it.
matlab/reporting/@series/getLine.m
+
5
−
5
View file @
0f48b7dc
...
@@ -36,8 +36,8 @@ assert(~isempty(o.data) && isa(o.data, 'dynSeries'), ['@series.getLine: must ' .
...
@@ -36,8 +36,8 @@ assert(~isempty(o.data) && isa(o.data, 'dynSeries'), ['@series.getLine: must ' .
% Line
% Line
assert
(
ischar
(
o
.
graphLineColor
),
'@series.getLine: graphLineColor must be a string'
);
assert
(
ischar
(
o
.
graphLineColor
),
'@series.getLine: graphLineColor must be a string'
);
valid_line_style
=
{
'none'
,
'-'
,
'--'
,
':'
,
'-.'
};
valid_line_style
=
{
'none'
,
'-'
,
'--'
,
':'
,
'-.'
};
assert
(
any
(
strcmp
(
o
.
l
ineStyle
,
valid_line_style
)),
...
assert
(
any
(
strcmp
(
o
.
graphL
ineStyle
,
valid_line_style
)),
...
[
'@series.getLine:
l
ineStyle must be one of '
strjoin
(
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 '
...
assert
(
isfloat
(
o
.
lineWidth
),
[
'@series.getLine: lineWidth must be a '
...
'positive number'
]);
'positive number'
]);
...
@@ -54,8 +54,8 @@ assert(isfloat(o.graphMarkerSize), ['@series.getLine: graphMarkerSize must be a
...
@@ -54,8 +54,8 @@ assert(isfloat(o.graphMarkerSize), ['@series.getLine: graphMarkerSize must be a
'positive number'
]);
'positive number'
]);
% Marker & Line
% Marker & Line
assert
(
~
(
strcmp
(
o
.
l
ineStyle
,
'none'
)
&&
isempty
(
o
.
graphMarker
)),
[
'@series.getLine: '
...
assert
(
~
(
strcmp
(
o
.
graphL
ineStyle
,
'none'
)
&&
isempty
(
o
.
graphMarker
)),
[
'@series.getLine: '
...
'you must provide at least one of
l
ineStyle and graphMarker'
]);
'you must provide at least one of
graphL
ineStyle and graphMarker'
]);
% Validate xrange
% Validate xrange
assert
(
isempty
(
xrange
)
||
isa
(
xrange
,
'dynDates'
));
assert
(
isempty
(
xrange
)
||
isa
(
xrange
,
'dynDates'
));
...
@@ -71,7 +71,7 @@ opt = {'XData', 1:length(ds.data)};
...
@@ -71,7 +71,7 @@ opt = {'XData', 1:length(ds.data)};
opt
=
{
opt
{:},
'YData'
,
ds
.
data
};
opt
=
{
opt
{:},
'YData'
,
ds
.
data
};
opt
=
{
opt
{:},
'Color'
,
o
.
graphLineColor
};
opt
=
{
opt
{:},
'Color'
,
o
.
graphLineColor
};
opt
=
{
opt
{:},
'LineStyle'
,
o
.
l
ineStyle
};
opt
=
{
opt
{:},
'LineStyle'
,
o
.
graphL
ineStyle
};
opt
=
{
opt
{:},
'LineWidth'
,
o
.
lineWidth
};
opt
=
{
opt
{:},
'LineWidth'
,
o
.
lineWidth
};
if
~
isempty
(
o
.
graphMarker
)
if
~
isempty
(
o
.
graphMarker
)
...
...
This diff is collapsed.
Click to expand it.
matlab/reporting/@series/series.m
+
1
−
1
View file @
0f48b7dc
...
@@ -36,7 +36,7 @@ o = struct;
...
@@ -36,7 +36,7 @@ o = struct;
o
.
data
=
''
;
o
.
data
=
''
;
o
.
graphLineColor
=
'k'
;
o
.
graphLineColor
=
'k'
;
o
.
l
ineStyle
=
'-'
;
o
.
graphL
ineStyle
=
'-'
;
o
.
lineWidth
=
0.5
;
o
.
lineWidth
=
0.5
;
o
.
graphMarker
=
''
;
o
.
graphMarker
=
''
;
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment