motiejus/wm
1
Fork 0
Code Releases Activity

fix quadrants

Browse Source
This commit is contained in:
Motiejus Jakštys 2021-05-19 22:57:52 +03:00 committed by Motiejus Jakštys
parent dce3028324
commit 502cd5025a
3 changed files with 9 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
Makefile
View File

@ -48,7 +48,7 @@ RIVERS = \
salvis-wm-50k-ne \
salvis-wm-overlaid-250k-zoom \
salvis-wm-grpk50 \
salvis-wm-grpk50-ne \
salvis-wm75-grpk50-grpk10ne \
salvis-wm220
################################################################################
@ -191,13 +191,6 @@ salvis-wm-grpk50_1COLOR = orange
salvis-wm-grpk50_2COLOR = green
salvis-wm-grpk50_3LINESTYLE = dotted
salvis-wm-grpk50-ne_1SELECT = wm_visuals where name='salvis-wm75'
salvis-wm-grpk50-ne_2SELECT = wm_visuals where name='salvis-grpk50'
salvis-wm-grpk50-ne_3SELECT = wm_visuals where name='salvis-grpk10'
salvis-wm-grpk50-ne_1COLOR = orange
salvis-wm-grpk50-ne_2COLOR = green
salvis-wm-grpk50-ne_3LINESTYLE = dotted
salvis-wm-grpk50-ne_QUADRANT = tl
salvis-wm220_1SELECT = wm_visuals where name='salvis-wm220'
salvis-wm220_WIDTHDIV = 2
@ -206,11 +199,12 @@ label_wm75 = Wang--Müller
label_vw64 = Visvalingam--Whyatt
label_dp64 = Douglas \& Peucker
label_grpk10 = GRPK 1:\numprint{10000}
label_grpk50 = GRPK 1:\numprint{50000}
label_vw64chaikin = $(label_vw64) and Chaikin
label_dp64chaikin = $(label_dp64) and Chaikin
legend_ = lower left
legend_tr = lower right
legend_tl = lower right
legend_tl = lower center
define wm_vwdp50k
RIVERS += salvis-$(1)-$(2)-$(3)-50k$(4)
@ -231,6 +225,7 @@ $(foreach x,vw64 dp64 vwchaikin64 dpchaikin64,\
$(eval $(call wm_vwdp50k,wm75,$(x),grpk10,tl)) \
$(eval $(call wm_vwdp50k,wm75,$(x),grpk10,tr)) \
)
$(eval $(call wm_vwdp50k,wm75,grpk50,grpk10,tr))
define FIG_template
$(1).pdf: layer2img.py Makefile $(2)
@ -246,6 +241,7 @@ $(1).pdf: layer2img.py Makefile $(2)
)
endef
$(foreach fig,$(FIGURES),$(eval $(call FIG_template,$(fig),.faux_test)))
$(foreach fig,$(RIVERS), $(eval $(call FIG_template,$(fig),.faux_visuals)))

2
layer2img.py
View File

@ -22,7 +22,7 @@ COLORS = {
# see `NOTICE` in the LaTeX document; this is the width of the main text block.
TEXTWIDTH_CM = 12.12364
QUADRANTS = {'tl':1, 'tr':2, 'br':3, 'bl':4}
QUADRANTS = {'tr':1, 'br':2, 'bl':3, 'tl':4}
def color(string):
return COLORS[string if string else 'black']

6
mj-msc.tex
View File

@ -1526,12 +1526,12 @@ all three shapes: grpk50LT, {\WM}--simplified GDB10LT, and the original GDB10LT.
\begin{figure}[h!]
\centering
\includegraphics[width=\textwidth]{salvis-wm-grpk50-ne}
\includegraphics[width=\textwidth]{salvis-wm75-grpk50-grpk10-50ktr}
\caption{Top--right side of Figure~\ref{fig:salvis-wm-grpk50}.}
\label{fig:salvis-wm-grpk50-ne}
\label{fig:salvis-wm75-grpk50-grpk10-50ktr}
\end{figure}
Although figures are almost identical, Figure~\ref{fig:salvis-wm-grpk50-ne}
Although figures are almost identical, Figure~\ref{fig:salvis-wm75-grpk50-grpk10-50ktr}
illustrates two small bends that have been removed in grpk50LT, but have been
exaggerated by our implementation.