Mercurial > repos > public > sbplib
changeset 437:b0361f203492 feature/grids
Merge default into feature/grids
author | Jonatan Werpers <jonatan@werpers.com> |
---|---|
date | Tue, 21 Feb 2017 16:48:04 +0100 |
parents | f23b30400f46 (current diff) 51d818bc8915 (diff) |
children | 225765e345c4 |
files | |
diffstat | 1 files changed, 4 insertions(+), 4 deletions(-) [+] |
line wrap: on
line diff
--- a/Color.m Tue Feb 21 13:16:56 2017 +0100 +++ b/Color.m Tue Feb 21 16:48:04 2017 +0100 @@ -9,6 +9,7 @@ darkred = [0.635 0.078 0.184]; black = [0.000 0.000 0.000]; white = [1.000 1.000 1.000]; + colors = { Color.blue, Color.red, Color.yellow, Color.green, Color.purple, Color.lightblue, Color.darkred, Color.black, Color.white}; end methods(Static) @@ -16,7 +17,6 @@ markers ={'+', 'o', '*', '.', 'x', 'square', 'diamond', 'v', '^', '>', '<', 'pentagram', 'hexagram'}; % Filled and non-filled markers? lineStyles = {'-', '--', ':', '-.'}; - colors = { Color.blue, Color.red, Color.yellow, Color.purple, Color.green, Color.lightblue, Color.darkred, Color.black, Color.white}; function showMarkers(x0, y0, lx, ly, color, filled) @@ -41,7 +41,7 @@ end function showColors(x0, y0, lx, ly) - n = length(colors); + n = length(Color.colors); s = ceil(sqrt(n)); x = linspace(x0, x0 + lx, s); @@ -52,8 +52,8 @@ for i = 1:n lh = line(X(i),Y(i)); lh.Marker = 'o'; - lh.MarkerFaceColor = colors{i}; - lh.Color = colors{i}; + lh.MarkerFaceColor = Color.colors{i}; + lh.Color = Color.colors{i}; lh.MarkerSize = 12; end end