diff --git a/matlab/reporting/@series/display.m b/matlab/reporting/@series/display.m index df38e8440495e60d1756ec1b9f188fb55d2b9f20..7c8ce7848534506e46e12dcc89a62696544785e5 100644 --- a/matlab/reporting/@series/display.m +++ b/matlab/reporting/@series/display.m @@ -50,22 +50,22 @@ disp(' '); disp([' ''' o.line_width '''']); disp(' '); -disp([name '.marker = ']); +disp([name '.graph_marker = ']); disp(' '); -disp([' ''' o.marker '''']); +disp([' ''' o.graph_marker '''']); disp(' '); -disp([name '.marker_edge_color = ']); +disp([name '.graph_marker_edge_color = ']); disp(' '); -disp([' ''' o.marker_edge_color '''']); +disp([' ''' o.graph_marker_edge_color '''']); disp(' '); -disp([name '.marker_face_color = ']); +disp([name '.graph_marker_face_color = ']); disp(' '); -disp([' ''' o.marker_face_color '''']); +disp([' ''' o.graph_marker_face_color '''']); disp(' '); -disp([name '.marker_size = ']); +disp([name '.graph_marker_size = ']); disp(' '); -disp([' ''' o.marker_size '''']); +disp([' ''' o.graph_marker_size '''']); end \ No newline at end of file diff --git a/matlab/reporting/@series/getLine.m b/matlab/reporting/@series/getLine.m index 751f7487b594a7f0f42ab35945c4f913517c12e0..4439a8b4f7cc70bfc9b7539ab4b1eb196164a095 100644 --- a/matlab/reporting/@series/getLine.m +++ b/matlab/reporting/@series/getLine.m @@ -41,21 +41,21 @@ assert(any(strcmp(o.line_style, valid_line_style)), ... assert(isfloat(o.line_width), ['@series.series: line_width must be a ' ... 'positive number']); -% Marker -valid_marker = {'+', 'o', '*', '.', 'x', 's', 'square', 'd', 'diamond', ... +% Graph_Marker +valid_graph_marker = {'+', 'o', '*', '.', 'x', 's', 'square', 'd', 'diamond', ... '^', 'v', '>', '<', 'p', 'pentagram', 'h', 'hexagram', ... 'none'}; -assert(isempty(o.marker) || any(strcmp(o.marker, valid_marker)), ... - ['@series.series: marker must be one of ' strjoin(valid_marker)]); +assert(isempty(o.graph_marker) || any(strcmp(o.graph_marker, valid_graph_marker)), ... + ['@series.series: graph_marker must be one of ' strjoin(valid_graph_marker)]); -assert(ischar(o.marker_edge_color), '@series.series: marker_edge_color must be a string'); -assert(ischar(o.marker_face_color), '@series.series: marker_face_color must be a string'); -assert(isfloat(o.marker_size), ['@series.series: marker_size must be a ' ... +assert(ischar(o.graph_marker_edge_color), '@series.series: graph_marker_edge_color must be a string'); +assert(ischar(o.graph_marker_face_color), '@series.series: graph_marker_face_color must be a string'); +assert(isfloat(o.graph_marker_size), ['@series.series: graph_marker_size must be a ' ... 'positive number']); % Marker & Line -assert(~(strcmp(o.line_style, 'none') && isempty(o.marker)), ['@series.series: ' ... - 'you must provide at least one of line_style and marker']); +assert(~(strcmp(o.line_style, 'none') && isempty(o.graph_marker)), ['@series.series: ' ... + 'you must provide at least one of line_style and graph_marker']); % Validate xrange assert(isempty(xrange) || isa(xrange, 'dynDates')); @@ -74,11 +74,11 @@ opt = {opt{:}, 'Color', o.color}; opt = {opt{:}, 'LineStyle', o.line_style}; opt = {opt{:}, 'LineWidth', o.line_width}; -if ~isempty(o.marker) - opt = {opt{:}, 'Marker', o.marker}; - opt = {opt{:}, 'MarkerSize', o.marker_size}; - opt = {opt{:}, 'MarkerEdgeColor', o.marker_edge_color}; - opt = {opt{:}, 'MarkerFaceColor', o.marker_face_color}; +if ~isempty(o.graph_marker) + opt = {opt{:}, 'Marker', o.graph_marker}; + opt = {opt{:}, 'MarkerSize', o.graph_marker_size}; + opt = {opt{:}, 'MarkerEdgeColor', o.graph_marker_edge_color}; + opt = {opt{:}, 'MarkerFaceColor', o.graph_marker_face_color}; end line(opt{:}); diff --git a/matlab/reporting/@series/series.m b/matlab/reporting/@series/series.m index 33e07c12b95812805ed73d321b1b46161f712f46..72922fdf7600c530b67c8c9b5112c75e918c3017 100644 --- a/matlab/reporting/@series/series.m +++ b/matlab/reporting/@series/series.m @@ -39,10 +39,10 @@ o.color = 'k'; o.line_style = '-'; o.line_width = 0.5; -o.marker = ''; -o.marker_edge_color = 'auto'; -o.marker_face_color = 'auto'; -o.marker_size = 6; +o.graph_marker = ''; +o.graph_marker_edge_color = 'auto'; +o.graph_marker_face_color = 'auto'; +o.graph_marker_size = 6; if nargin == 1 assert(isa(varargin{1}, 'series'),['@series.series: with one arg you ' ...