diff --git a/Makefile b/Makefile index 3320329..0c7c232 100644 --- a/Makefile +++ b/Makefile @@ -187,14 +187,14 @@ salvis-douglas-64-chaikin-50k_WIDTHDIV = 2 salvis-visvalingam-64-chaikin-50k_2SELECT = wm_visuals where name='salvis-visvalingam-64-chaikin' salvis-visvalingam-64-chaikin-50k_WIDTHDIV = 2 -salvis-overlaid-douglas-64-chaikin-50k_1SELECT = wm_visuals where name='salvis' -salvis-overlaid-douglas-64-chaikin-50k_2SELECT = wm_visuals where name='salvis-douglas-64-chaikin' +salvis-overlaid-douglas-64-chaikin-50k_1SELECT = wm_visuals where name='salvis-douglas-64-chaikin' +salvis-overlaid-douglas-64-chaikin-50k_2SELECT = wm_visuals where name='salvis' salvis-overlaid-douglas-64-chaikin-50k_1COLOR = orange salvis-overlaid-douglas-64-chaikin-50k_WIDTHDIV = 2 salvis-overlaid-douglas-64-chaikin-50k_QUADRANT = 1 -salvis-overlaid-visvalingam-64-chaikin-50k_1SELECT = wm_visuals where name='salvis' -salvis-overlaid-visvalingam-64-chaikin-50k_2SELECT = wm_visuals where name='salvis-visvalingam-64-chaikin' +salvis-overlaid-visvalingam-64-chaikin-50k_1SELECT = wm_visuals where name='salvis-visvalingam-64-chaikin' +salvis-overlaid-visvalingam-64-chaikin-50k_2SELECT = wm_visuals where name='salvis' salvis-overlaid-visvalingam-64-chaikin-50k_1COLOR = orange salvis-overlaid-visvalingam-64-chaikin-50k_WIDTHDIV = 2 salvis-overlaid-visvalingam-64-chaikin-50k_QUADRANT = 1 @@ -205,8 +205,8 @@ salvis-wm-50k_WIDTHDIV = 2 salvis-wm-250k_1SELECT = wm_visuals where name='salvis-wm-220' salvis-wm-250k_WIDTHDIV = 10 -salvis-wm-overlaid-50k-zoom_1SELECT = wm_visuals where name='salvis' -salvis-wm-overlaid-50k-zoom_2SELECT = wm_visuals where name='salvis-wm-75' +salvis-wm-overlaid-50k-zoom_1SELECT = wm_visuals where name='salvis-wm-75' +salvis-wm-overlaid-50k-zoom_2SELECT = wm_visuals where name='salvis' salvis-wm-overlaid-50k-zoom_1COLOR = orange salvis-wm-overlaid-250k-zoom_1SELECT = wm_visuals where name='salvis-wm-220' diff --git a/mj-msc.tex b/mj-msc.tex index d7015c6..4e7950c 100644 --- a/mj-msc.tex +++ b/mj-msc.tex @@ -311,16 +311,16 @@ generalization, illustrated in figure~\ref{fig:salvis-generalized-chaikin-50k}. \begin{subfigure}[b]{.49\textwidth} \includegraphics[width=\textwidth]{salvis-overlaid-douglas-64-chaikin-50k} - \caption{Overlaid \ref{fig:salvis-50k} (orange) and - \ref{fig:salvis-douglas-64-chaikin-50k}.} + \caption{Original (fig.~\ref{fig:salvis-50k}) and simplified + (fig.~\ref{fig:salvis-douglas-64-chaikin-50k}).} \end{subfigure} \hfill \begin{subfigure}[b]{.49\textwidth} \includegraphics[width=\textwidth]{salvis-overlaid-visvalingam-64-chaikin-50k} - \caption{Overlaid \ref{fig:salvis-50k} (orange) and - \ref{fig:salvis-visvalingam-64-chaikin-50k}.} + \caption{Original (fig.~\ref{fig:salvis-50k}) and simplified + (fig.~\ref{fig:salvis-visvalingam-64-chaikin-50k}.)} \end{subfigure} \caption{Zoomed-in simplified and smoothened river and original.}