Skip to content

fix sign and pixel_to_world #225

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
BruceSherwood merged 1 commit into from
Nov 18, 2022
Merged

fix sign and pixel_to_world #225

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 20 additions & 2 deletions vpython/vpython.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,11 @@
# vpython provides clock in its namespace
clock = time.perf_counter

def sign(x): # for compatibility with Web VPython
if x > 0: return 1
if x < 0: return -1
return 0

import sys
from . import __version__, __gs_version__
from ._notebook_helpers import _isnotebook
Expand Down Expand Up @@ -1851,9 +1856,12 @@ def process_args(self, *args1, **args):
col = c
rad = r
vi = vis
opaq = None
cp = {'pos':pt['pos'].value}
if 'color' in pt:
col = pt['color']
if 'opacity' in pt:
opaq = pt['opacity']
if 'radius' in pt:
rad = pt['radius']
if 'visible' in pt:
Expand All @@ -1867,6 +1875,9 @@ def process_args(self, *args1, **args):
if vi is not None:
pt['visible'] = vi
cp['visible'] = vi
if opaq is not None:
pt['opacity'] = opaq
cp['opacity'] = opaq
pts.append(pt)
cps.append(cp)
return [pts, cps]
Expand Down Expand Up @@ -2059,7 +2070,7 @@ def __init__(self,*args1, **args):
if 'pos' in args:
tpos = args['pos']
del args['pos']

super(curveMethods, self).setup(args)

if tpos is not None:
Expand Down Expand Up @@ -3206,7 +3217,14 @@ def lights(self, value):

@property
def pixel_to_world(self):
return self._pixel_to_world
# Convert number of pixels into distance in real-world coordinates
w = self._width
h = self._height
d = 2*self._range
if w >= h:
return d/h
else:
return d/w
@pixel_to_world.setter
def pixel_to_world(self, value):
raise AttributeError('pixel_to_world is read-only')
Expand Down