From 0f48b7dce3431ce7571d2b419ae4c7b26cdda89c Mon Sep 17 00:00:00 2001
From: Houtan Bastani <houtan@dynare.org>
Date: Tue, 14 May 2013 16:37:28 +0200
Subject: [PATCH] reporting: @series: rename lineStyle as graphLineStyle
---
matlab/reporting/@series/display.m | 4 ++--
matlab/reporting/@series/getLine.m | 10 +++++-----
matlab/reporting/@series/series.m | 2 +-
3 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/matlab/reporting/@series/display.m b/matlab/reporting/@series/display.m
index 4946dac2bd..cce508ccd4 100644
--- a/matlab/reporting/@series/display.m
+++ b/matlab/reporting/@series/display.m
@@ -40,9 +40,9 @@ disp(' ');
disp([' ''' o.graphLineColor '''']);
disp(' ');
-disp([name '.line_style = ']);
+disp([name '.graphLineStyle = ']);
disp(' ');
-disp([' ''' o.line_style '''']);
+disp([' ''' o.graphLineStyle '''']);
disp(' ');
disp([name '.line_width = ']);
diff --git a/matlab/reporting/@series/getLine.m b/matlab/reporting/@series/getLine.m
index 1a03ce9167..65717cc232 100644
--- a/matlab/reporting/@series/getLine.m
+++ b/matlab/reporting/@series/getLine.m
@@ -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.lineStyle, valid_line_style)), ...
- ['@series.getLine: lineStyle must be one of ' strjoin(valid_line_style, ' ')]);
+assert(any(strcmp(o.graphLineStyle, valid_line_style)), ...
+ ['@series.getLine: graphLineStyle 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.lineStyle, 'none') && isempty(o.graphMarker)), ['@series.getLine: ' ...
- 'you must provide at least one of lineStyle and graphMarker']);
+assert(~(strcmp(o.graphLineStyle, 'none') && isempty(o.graphMarker)), ['@series.getLine: ' ...
+ 'you must provide at least one of graphLineStyle 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.lineStyle};
+opt = {opt{:}, 'LineStyle', o.graphLineStyle};
opt = {opt{:}, 'LineWidth', o.lineWidth};
if ~isempty(o.graphMarker)
diff --git a/matlab/reporting/@series/series.m b/matlab/reporting/@series/series.m
index 9140b12ac6..44eb3e91e6 100644
--- a/matlab/reporting/@series/series.m
+++ b/matlab/reporting/@series/series.m
@@ -36,7 +36,7 @@ o = struct;
o.data = '';
o.graphLineColor = 'k';
-o.lineStyle = '-';
+o.graphLineStyle = '-';
o.lineWidth = 0.5;
o.graphMarker = '';
--
GitLab