motiejus/stud
1
Fork 0
Code Releases Activity

some legends

Browse Source
This commit is contained in:
Motiejus Jakštys 2021-05-18 09:25:18 +03:00
parent efaeaab019
commit 97673ec498
2 changed files with 22 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
IV/Makefile
View File

@ -102,7 +102,7 @@ mj-msc.pdf: mj-msc.tex version.inc.tex vars.inc.tex bib.bib \
define FIG_template define FIG_template
$(1).pdf: layer2img.py Makefile $(2) $(1).pdf: layer2img.py Makefile $(2)
python3 ./layer2img.py --outfile=$(1).pdf \ python3 ./layer2img.py --outfile=$(1).pdf \
$$(if $$($(1)_LEGEND),--legend=$$($(1)_LEGEND)) \ $$(if $$($(1)_LEGEND),--legend="$$($(1)_LEGEND)") \
$$(if $$($(1)_WIDTHDIV),--widthdiv=$$($(1)_WIDTHDIV)) \ $$(if $$($(1)_WIDTHDIV),--widthdiv=$$($(1)_WIDTHDIV)) \
$$(if $$($(1)_QUADRANT),--quadrant=$$($(1)_QUADRANT)) \ $$(if $$($(1)_QUADRANT),--quadrant=$$($(1)_QUADRANT)) \
$$(foreach i,1 2 3, \ $$(foreach i,1 2 3, \
@ -269,17 +269,6 @@ salvis-wm-dp-chaikin-50k_1COLOR = green
salvis-wm-dp-chaikin-50k_2COLOR = orange salvis-wm-dp-chaikin-50k_2COLOR = orange
salvis-wm-dp-chaikin-50k_3LINESTYLE = dotted salvis-wm-dp-chaikin-50k_3LINESTYLE = dotted
salvis-wm-vw-50k_1SELECT = wm_visuals where name='salvis-vw-64'
salvis-wm-vw-50k_2SELECT = wm_visuals where name='salvis-wm-75'
salvis-wm-vw-50k_3SELECT = wm_visuals where name='salvis'
salvis-wm-vw-50k_1COLOR = green
salvis-wm-vw-50k_1LABEL = Visvalingam--Whyatt
salvis-wm-vw-50k_2COLOR = orange
salvis-wm-vw-50k_2LABEL = Wang--Müller
salvis-wm-vw-50k_3LINESTYLE = dotted
salvis-wm-vw-50k_3LABEL = GRPK
salvis-wm-vw-50k_LEGEND = "lower left"
salvis-wm-vw-chaikin-50k_1SELECT = wm_visuals where name='salvis-vw-64-chaikin' salvis-wm-vw-chaikin-50k_1SELECT = wm_visuals where name='salvis-vw-64-chaikin'
salvis-wm-vw-chaikin-50k_2SELECT = wm_visuals where name='salvis-wm-75' salvis-wm-vw-chaikin-50k_2SELECT = wm_visuals where name='salvis-wm-75'
salvis-wm-vw-chaikin-50k_3SELECT = wm_visuals where name='salvis' salvis-wm-vw-chaikin-50k_3SELECT = wm_visuals where name='salvis'
@ -287,6 +276,26 @@ salvis-wm-vw-chaikin-50k_1COLOR = green
salvis-wm-vw-chaikin-50k_2COLOR = orange salvis-wm-vw-chaikin-50k_2COLOR = orange
salvis-wm-vw-chaikin-50k_3LINESTYLE = dotted salvis-wm-vw-chaikin-50k_3LINESTYLE = dotted
label_wm = Wang--Müller
label_vw = Visvalingam--Whyatt
label_dp = Douglas \& Peucker
label_vw-chaikin = $(label_vw) and Chaikin
label_dp-chaikin = $(label_dp) and Chaikin
define wm_vwdp50k
RIVERS += salvis-wm-$(1)-50k
salvis-wm-$(1)-50k_1SELECT = wm_visuals where name='salvis-$(1)-64'
salvis-wm-$(1)-50k_3SELECT = wm_visuals where name='salvis'
salvis-wm-$(1)-50k_1COLOR = green
salvis-wm-$(1)-50k_1LABEL = $(label_$(1))
salvis-wm-$(1)-50k_2COLOR = orange
salvis-wm-$(1)-50k_2LABEL = $(label_wm)
salvis-wm-$(1)-50k_3LINESTYLE = dotted
salvis-wm-$(1)-50k_3LABEL = GRPK 1:\\numprint{10000}
salvis-wm-$(1)-50k_LEGEND = lower left
endef
$(foreach x,vw dp vw-chaikin dp-chaikin,$(eval $(call wm_vwdp50k,$(x))))
.faux_db_pre: db init.sql .faux_db_pre: db init.sql
bash db start bash db start

1
IV/layer2img.py
View File

@ -111,6 +111,7 @@ def main():
c3 = plot_args(g3, args.g3_color, args.g3_linestyle, args.g3_label) c3 = plot_args(g3, args.g3_color, args.g3_linestyle, args.g3_label)
rc('text', usetex=True) rc('text', usetex=True)
rc('text.latex', preamble='\\usepackage{numprint}\n')
fig, ax = plt.subplots(constrained_layout=True) fig, ax = plt.subplots(constrained_layout=True)
fig.set_figwidth(inch(width)) fig.set_figwidth(inch(width))