From c452e595f00ef094758af94acae562460aa0f66e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Motiejus=20Jak=C5=A1tys?= Date: Thu, 18 Jun 2020 10:03:55 +0300 Subject: [PATCH] add chaikin generator and group3 --- II/Referatas/Makefile | 7 +++---- II/Referatas/layer2img.py | 7 +++++++ 2 files changed, 10 insertions(+), 4 deletions(-) diff --git a/II/Referatas/Makefile b/II/Referatas/Makefile index 472da19..08adec4 100644 --- a/II/Referatas/Makefile +++ b/II/Referatas/Makefile @@ -34,12 +34,11 @@ db/.faux_$(1)_$(2)_%: $(2).sql db/.faux_ready -v tbl=$(1)_$(2)_$$* \ -f $(2).sql touch $$@ -db/.chaikin_$(1)_%: chaikin.sql db/.faux_ready +db/.chaikin_$(1)_$(2)_%: db/.faux_$(1)_$(2)_% chaikin.sql ./managedb -- --echo-all \ -v ON_ERROR_STOP=1 \ - -v src=$(1) \ - -v param1=$$* \ - -v tbl=chaikin_$(1)_$$* \ + -v src=$(1)_$(2)_$$* \ + -v tbl=chaikin_$(1)_$(2)_$$* \ -f chaikin.sql touch $$@ $(1)_$(2)_%.pdf: layer2img.py db/.faux_$(1)_$(2)_% diff --git a/II/Referatas/layer2img.py b/II/Referatas/layer2img.py index 1d2a9da..95b6a4c 100755 --- a/II/Referatas/layer2img.py +++ b/II/Referatas/layer2img.py @@ -35,6 +35,10 @@ def parse_args(): group2 = parser.add_mutually_exclusive_group() group2.add_argument('--group2-infile', type=str) group2.add_argument('--group2-table', type=str) + + group3 = parser.add_mutually_exclusive_group() + group3.add_argument('--group3-infile', type=str) + group3.add_argument('--group3-table', type=str) return parser.parse_args() @@ -51,6 +55,7 @@ def main(): args = parse_args() group1 = read_layer(args.group1_table, args.group1_infile) group2 = read_layer(args.group2_table, args.group2_infile) + group3 = read_layer(args.group3_table, args.group3_infile) rc('text', usetex=True) fig, ax = plt.subplots() @@ -64,6 +69,8 @@ def main(): group1.plot(ax=ax, color=PURPLE) if group2 is not None: group2.plot(ax=ax, color=ORANGE) + if group3 is not None: + group3.plot(ax=ax, color=GREEN) ax.axis('off') ax.margins(0, 0)