Skip to content

Commit

Permalink
Merge pull request #110 from evil-mad/275
Browse files Browse the repository at this point in the history
v275
  • Loading branch information
oskay authored Aug 19, 2021
2 parents 3e32db9 + 07381f7 commit 29aaa55
Show file tree
Hide file tree
Showing 11 changed files with 276 additions and 227 deletions.
4 changes: 2 additions & 2 deletions cli/axicli/axidraw_cli.py
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@
Copyright 2020 Windell H. Oskay, Evil Mad Scientist Laboratories
Copyright 2021 Windell H. Oskay, Evil Mad Scientist Laboratories
The MIT License (MIT)
Expand Down Expand Up @@ -73,7 +73,7 @@
from plotink.plot_utils_import import from_dependency_import # plotink
exit_status = from_dependency_import("ink_extensions_utils.exit_status")

cli_version = "AxiDraw Command Line Interface 2.7.4"
cli_version = "AxiDraw Command Line Interface 2.7.5"

quick_help = '''
Basic syntax to plot a file: axicli svg_in [OPTIONS]
Expand Down
32 changes: 32 additions & 0 deletions cli/pyaxidraw/changelog.txt
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,38 @@ not cover all internal changes nor bug fixes.

Please see https://axidraw.com/doc/cli_api/ for full documentation


=========================================

v 2.7.5 (August 2021)

Add support for Python 3.10; Python 3.6-3.10 are now supported.


Improved handling of Interactive-context movements beyond travel bounds.

By default, whenever the "turtle" (theoretical XY) position is outside
of the travel limits, (1) the physical XY position is clipped to remain within
those limits, and (2) the pen is in kept in the pen-up state.
While both have always been the case in in the Plot context,
both are now true in the Interactive context as well.

(Previously, Interactive context motion was clipped, but the pen state was not
automatically raised when the motion was clipped.)

As part of this change:

* Interactive-context pen-down moves that begin and/or end outside of the bounds
are now linked by automatic pen-up moves, giving more consistent and predictable
behavior.
* The pendown() function, by default, no longer lowers the pen when
the turtle position is outside of the plotting bounds.
* New current_pen() and turtle_pen() query functions.
* New parameter in the axidraw_conf.py configuration file: auto_clip_lift, which
can disable automatic pen lifts at plotting bounds and the new behavior of pendown.



=========================================

v 2.7.0 (November 2020)
Expand Down
2 changes: 1 addition & 1 deletion cli/requirements/requirements.txt
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ future==0.18.2
idna==2.10
ink-extensions>=1.1.0
lxml>=4.6.2
plotink>=1.2.2
plotink>=1.2.4
pyserial>=3.5
requests==2.25.1
urllib3==1.26.5
4 changes: 2 additions & 2 deletions cli/setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ def replacement_setup(*args, **kwargs):

replacement_setup(
name='pyaxidraw',
version='2.7.4',
version='2.7.5',
python_requires='>=3.6.0',
long_description=long_description,
long_description_content_type='text/plain',
Expand All @@ -66,7 +66,7 @@ def replacement_setup(*args, **kwargs):
# this only includes publicly available dependencies
'ink_extensions>=1.1.0',
'lxml',
'plotink>=1.2.3',
'plotink>=1.2.4',
'requests', # just for the certificates for now
],
extras_require=extras_require,
Expand Down
2 changes: 1 addition & 1 deletion inkscape driver/axidraw.inx
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@

<page name="plot" _gui-text="Plot">
<_param indent="1" name="splashpage" type="description" appearance="header">AxiDraw Control</_param>
<_param indent="1" name="splashpage2" type="description">Version 2.7.4 - 2021-06-17</_param>
<_param indent="1" name="splashpage2" type="description">Version 2.7.5 - 2021-08-10</_param>
<_param indent="2" name="splashpage3" type="description" xml:space="preserve" >
Press 'Apply' to begin plotting. Use other tabs to adjust
settings or access additional AxiDraw functions.
Expand Down
Loading

0 comments on commit 29aaa55

Please sign in to comment.