abey79 · abey79 · Apr 7, 2022 · Apr 2, 2022 · Apr 4, 2022 · Apr 5, 2022
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -7,6 +7,12 @@ Release date: UNRELEASED
 ### New features and improvements
 
 * Added the `alpha` command to set layer opacity without changing the base color (#447) 
+* Improved support for layer pen width and opacity in the viewer (#448)
+
+  * The "Pen Width" and "Pen Opacity" menus are now named "Default Pen Width" and "Default Pen Opacity". 
+  * The layer opacity is now used for display by default. It can be overridden by the default pen opacity by checking the "Override" item from the "Default Pen Opacity" menu.
+  * The layer pen width is now used for display by default as well. Likewise, it can be overridden by checking the "Override" item from the "Default Pen Width" menu.
+
 * Added HPGL configuration for the Calcomp Artisan plotter (thanks to Andee Collard and @ithinkido) (#418)
 * Added the `--dont-set-date` option to the `write` command (#442)
 * The `read` command now better handles SVGs with missing `width` or `height` attributes (#446)
@@ -19,11 +25,14 @@ Release date: UNRELEASED
 * Fixed an issue with `forlayer` where the `_n` variable was set improperly (#443)
 * Fixed an issue with `write` where layer opacity was included in the `stroke` attribute instead of using `stroke-opacity`, which, although compliant, was not compatible with Inkscape (#429)
 * Fixed an issue with `vpype --help` where commands from plug-ins would not be listed (#444)
-* Fixed a minor issue where plug-ins would be reloaded each time `vpype_cli.execute()` is called (#444) 
+* Fixed a minor issue where plug-ins would be reloaded each time `vpype_cli.execute()` is called (#444)
+* Fixed a rendering inconsistency in the viewer where the ruler width could vary by one pixel depending on the OpenGL driver/GPU/OS combination (#448)
 
 
 ### API changes
 
+* Changed the parameter name of both `vpype_viewer.Engine()` and `vpype_viewer.render_image()` from `pen_width` and `pen_opacity` to `default_pen_width` and `default_pen_opacity` (breaking change) (#448)
+* Added `override_pen_width` and `override_pen_opacity` boolean parameters to both `vpype_viewer.Engine()` and `vpype_viewer.render_image()` (#448)
 * Added `vpype_cli.FloatType()`, `vpype_cli.IntRangeType()`, `vpype_cli.FloatRangeType()`, and `vpype_cli.ChoiceType()` (#430, #447)
 * Changed `vpype.Document.add_to_sources()` to also modify the `vp_source` property (#431)
 * Added a `set_date:bool = True` argument to `vpype.write_svg()` (#442)

diff --git a/poetry.lock b/poetry.lock
diff --git a/tests/data/baseline/test_text_block_render-center-1-False-futural.png b/tests/data/baseline/test_text_block_render-center-1-False-futural.png
diff --git a/tests/data/baseline/test_text_block_render-center-1-False-gothiceng.png b/tests/data/baseline/test_text_block_render-center-1-False-gothiceng.png
diff --git a/tests/data/baseline/test_text_block_render-center-1-False-timesg.png b/tests/data/baseline/test_text_block_render-center-1-False-timesg.png
diff --git a/tests/data/baseline/test_text_block_render-left-1-False-futural.png b/tests/data/baseline/test_text_block_render-left-1-False-futural.png
diff --git a/tests/data/baseline/test_text_block_render-left-1-False-gothiceng.png b/tests/data/baseline/test_text_block_render-left-1-False-gothiceng.png
diff --git a/tests/data/baseline/test_text_block_render-left-1-False-timesg.png b/tests/data/baseline/test_text_block_render-left-1-False-timesg.png
diff --git a/tests/data/baseline/test_text_block_render-left-1-True-futural.png b/tests/data/baseline/test_text_block_render-left-1-True-futural.png
diff --git a/tests/data/baseline/test_text_block_render-left-1-True-gothiceng.png b/tests/data/baseline/test_text_block_render-left-1-True-gothiceng.png
diff --git a/tests/data/baseline/test_text_block_render-left-1-True-timesg.png b/tests/data/baseline/test_text_block_render-left-1-True-timesg.png
diff --git a/tests/data/baseline/test_text_block_render-left-2-False-futural.png b/tests/data/baseline/test_text_block_render-left-2-False-futural.png
diff --git a/tests/data/baseline/test_text_block_render-left-2-False-gothiceng.png b/tests/data/baseline/test_text_block_render-left-2-False-gothiceng.png
diff --git a/tests/data/baseline/test_text_block_render-left-2-False-timesg.png b/tests/data/baseline/test_text_block_render-left-2-False-timesg.png
diff --git a/tests/data/baseline/test_text_block_render-right-1-False-futural.png b/tests/data/baseline/test_text_block_render-right-1-False-futural.png
diff --git a/tests/data/baseline/test_text_block_render-right-1-False-gothiceng.png b/tests/data/baseline/test_text_block_render-right-1-False-gothiceng.png
diff --git a/tests/data/baseline/test_text_block_render-right-1-False-timesg.png b/tests/data/baseline/test_text_block_render-right-1-False-timesg.png
diff --git a/tests/data/baseline/test_viewer-outline_imperial-issue_124_plotter.png b/tests/data/baseline/test_viewer-outline_imperial-issue_124_plotter.png
diff --git a/tests/data/baseline/test_viewer-outline_imperial-misc_empty.png b/tests/data/baseline/test_viewer-outline_imperial-misc_empty.png
diff --git a/tests/data/baseline/test_viewer-outline_imperial-misc_multilayer.png b/tests/data/baseline/test_viewer-outline_imperial-misc_multilayer.png
diff --git a/tests/data/baseline/test_viewer-outline_metric-issue_124_plotter.png b/tests/data/baseline/test_viewer-outline_metric-issue_124_plotter.png
diff --git a/tests/data/baseline/test_viewer-outline_metric-misc_empty.png b/tests/data/baseline/test_viewer-outline_metric-misc_empty.png
diff --git a/tests/data/baseline/test_viewer-outline_metric-misc_multilayer.png b/tests/data/baseline/test_viewer-outline_metric-misc_multilayer.png
diff --git a/tests/data/baseline/test_viewer-outline_pixels-issue_124_plotter.png b/tests/data/baseline/test_viewer-outline_pixels-issue_124_plotter.png
diff --git a/tests/data/baseline/test_viewer-outline_pixels-misc_empty.png b/tests/data/baseline/test_viewer-outline_pixels-misc_empty.png
diff --git a/tests/data/baseline/test_viewer-outline_pixels-misc_multilayer.png b/tests/data/baseline/test_viewer-outline_pixels-misc_multilayer.png
diff --git a/...aseline/test_viewer-preview_imperial_override_pen_opacity-issue_124_plotter.png b/...aseline/test_viewer-preview_imperial_override_pen_opacity-issue_124_plotter.png
diff --git a/.../data/baseline/test_viewer-preview_imperial_override_pen_opacity-misc_empty.png b/.../data/baseline/test_viewer-preview_imperial_override_pen_opacity-misc_empty.png
diff --git a/.../baseline/test_viewer-preview_imperial_override_pen_opacity-misc_multilayer.png b/.../baseline/test_viewer-preview_imperial_override_pen_opacity-misc_multilayer.png
diff --git a/.../baseline/test_viewer-preview_imperial_override_pen_width-issue_124_plotter.png b/.../baseline/test_viewer-preview_imperial_override_pen_width-issue_124_plotter.png
diff --git a/tests/data/baseline/test_viewer-preview_imperial_override_pen_width-misc_empty.png b/tests/data/baseline/test_viewer-preview_imperial_override_pen_width-misc_empty.png
diff --git a/...ta/baseline/test_viewer-preview_imperial_override_pen_width-misc_multilayer.png b/...ta/baseline/test_viewer-preview_imperial_override_pen_width-misc_multilayer.png
diff --git a/...e/test_viewer-preview_imperial_override_pen_width_opacity-issue_124_plotter.png b/...e/test_viewer-preview_imperial_override_pen_width_opacity-issue_124_plotter.png
diff --git a/...baseline/test_viewer-preview_imperial_override_pen_width_opacity-misc_empty.png b/...baseline/test_viewer-preview_imperial_override_pen_width_opacity-misc_empty.png
diff --git a/...ine/test_viewer-preview_imperial_override_pen_width_opacity-misc_multilayer.png b/...ine/test_viewer-preview_imperial_override_pen_width_opacity-misc_multilayer.png
diff --git a/...baseline/test_viewer_with_metadata-colorful_points-misc_color_width_opacity.png b/...baseline/test_viewer_with_metadata-colorful_points-misc_color_width_opacity.png
diff --git a/tests/data/baseline/test_viewer_with_metadata-colorful_points-misc_multilayer.png b/tests/data/baseline/test_viewer_with_metadata-colorful_points-misc_multilayer.png
diff --git a/tests/data/baseline/test_viewer_with_metadata-outline-misc_color_width_opacity.png b/tests/data/baseline/test_viewer_with_metadata-outline-misc_color_width_opacity.png
diff --git a/tests/data/baseline/test_viewer_with_metadata-outline-misc_multilayer.png b/tests/data/baseline/test_viewer_with_metadata-outline-misc_multilayer.png
diff --git a/...aseline/test_viewer_with_metadata-outline_colorful-misc_color_width_opacity.png b/...aseline/test_viewer_with_metadata-outline_colorful-misc_color_width_opacity.png
diff --git a/tests/data/baseline/test_viewer_with_metadata-outline_colorful-misc_multilayer.png b/tests/data/baseline/test_viewer_with_metadata-outline_colorful-misc_multilayer.png
diff --git a/...aseline/test_viewer_with_metadata-outline_imperial-misc_color_width_opacity.png b/...aseline/test_viewer_with_metadata-outline_imperial-misc_color_width_opacity.png
diff --git a/tests/data/baseline/test_viewer_with_metadata-outline_imperial-misc_multilayer.png b/tests/data/baseline/test_viewer_with_metadata-outline_imperial-misc_multilayer.png
diff --git a/.../baseline/test_viewer_with_metadata-outline_metric-misc_color_width_opacity.png b/.../baseline/test_viewer_with_metadata-outline_metric-misc_color_width_opacity.png
diff --git a/tests/data/baseline/test_viewer_with_metadata-outline_metric-misc_multilayer.png b/tests/data/baseline/test_viewer_with_metadata-outline_metric-misc_multilayer.png
diff --git a/.../baseline/test_viewer_with_metadata-outline_pen_up-misc_color_width_opacity.png b/.../baseline/test_viewer_with_metadata-outline_pen_up-misc_color_width_opacity.png
diff --git a/tests/data/baseline/test_viewer_with_metadata-outline_pen_up-misc_multilayer.png b/tests/data/baseline/test_viewer_with_metadata-outline_pen_up-misc_multilayer.png
diff --git a/.../baseline/test_viewer_with_metadata-outline_pixels-misc_color_width_opacity.png b/.../baseline/test_viewer_with_metadata-outline_pixels-misc_color_width_opacity.png
diff --git a/tests/data/baseline/test_viewer_with_metadata-outline_pixels-misc_multilayer.png b/tests/data/baseline/test_viewer_with_metadata-outline_pixels-misc_multilayer.png
diff --git a/tests/data/baseline/test_viewer_with_metadata-points-misc_color_width_opacity.png b/tests/data/baseline/test_viewer_with_metadata-points-misc_color_width_opacity.png
diff --git a/tests/data/baseline/test_viewer_with_metadata-points-misc_multilayer.png b/tests/data/baseline/test_viewer_with_metadata-points-misc_multilayer.png
diff --git a/tests/data/baseline/test_viewer_with_metadata-preview-misc_color_width_opacity.png b/tests/data/baseline/test_viewer_with_metadata-preview-misc_color_width_opacity.png
diff --git a/tests/data/baseline/test_viewer_with_metadata-preview-misc_multilayer.png b/tests/data/baseline/test_viewer_with_metadata-preview-misc_multilayer.png
diff --git a/...ith_metadata-preview_imperial_override_pen_opacity-misc_color_width_opacity.png b/...ith_metadata-preview_imperial_override_pen_opacity-misc_color_width_opacity.png
diff --git a/..._viewer_with_metadata-preview_imperial_override_pen_opacity-misc_multilayer.png b/..._viewer_with_metadata-preview_imperial_override_pen_opacity-misc_multilayer.png
diff --git a/..._with_metadata-preview_imperial_override_pen_width-misc_color_width_opacity.png b/..._with_metadata-preview_imperial_override_pen_width-misc_color_width_opacity.png
diff --git a/...st_viewer_with_metadata-preview_imperial_override_pen_width-misc_multilayer.png b/...st_viewer_with_metadata-preview_imperial_override_pen_width-misc_multilayer.png
diff --git a/...tadata-preview_imperial_override_pen_width_opacity-misc_color_width_opacity.png b/...tadata-preview_imperial_override_pen_width_opacity-misc_color_width_opacity.png
diff --git a/...r_with_metadata-preview_imperial_override_pen_width_opacity-misc_multilayer.png b/...r_with_metadata-preview_imperial_override_pen_width_opacity-misc_multilayer.png
diff --git a/.../baseline/test_viewer_with_metadata-preview_pen_up-misc_color_width_opacity.png b/.../baseline/test_viewer_with_metadata-preview_pen_up-misc_color_width_opacity.png
diff --git a/tests/data/baseline/test_viewer_with_metadata-preview_pen_up-misc_multilayer.png b/tests/data/baseline/test_viewer_with_metadata-preview_pen_up-misc_multilayer.png
diff --git a/...a/baseline/test_viewer_with_metadata-preview_thick-misc_color_width_opacity.png b/...a/baseline/test_viewer_with_metadata-preview_thick-misc_color_width_opacity.png
diff --git a/tests/data/baseline/test_viewer_with_metadata-preview_thick-misc_multilayer.png b/tests/data/baseline/test_viewer_with_metadata-preview_thick-misc_multilayer.png
diff --git a/...line/test_viewer_with_metadata-preview_transparent-misc_color_width_opacity.png b/...line/test_viewer_with_metadata-preview_transparent-misc_color_width_opacity.png
diff --git a/...data/baseline/test_viewer_with_metadata-preview_transparent-misc_multilayer.png b/...data/baseline/test_viewer_with_metadata-preview_transparent-misc_multilayer.png
diff --git a/tests/data/test_svg/misc/color_width_opacity.svg b/tests/data/test_svg/misc/color_width_opacity.svg
diff --git a/tests/test_text.py b/tests/test_text.py
@@ -64,7 +64,10 @@ def test_text_block_render(assert_image_similarity, font_name, align, line_spaci
             justify=justify,
         )
     )
-    doc[1].append(vp.line(500, -20, 500, 500))
+
+    # the X coordinate is chosen such as not to yield an integer screen-space coordinate, which
+    # leads to unpredictable, half-pixel rounding errors
+    doc[1].append(vp.line(500.1, -20, 500.1, 500))
     renderer = ImageRenderer((1024, 1024))
     renderer.engine.document = doc
     renderer.engine.show_rulers = True