Skip to content

Commit d928a92

Browse files
Merge pull request #251 from vpython/GSprint
Delete GSprint
2 parents f1da2d4 + 688de0c commit d928a92

File tree

7 files changed

+11
-45
lines changed

7 files changed

+11
-45
lines changed

vpython/__init__.py

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -22,18 +22,16 @@
2222
from .vpython import canvas
2323

2424
# Need to initialize canvas before user does anything and before
25-
# importing GSprint
2625
scene = canvas()
2726

2827
from .vpython import *
2928
from .shapespaths import *
3029
from ._vector_import_helper import *
3130
from .rate_control import rate
32-
from .gsprint import GSprint
3331

34-
# gsprint and vpython are showing up in the
32+
# vpython is showing up in the
3533
# namespace, so delete them
36-
del gsprint, vpython
34+
del vpython
3735

3836
# cyvector may be in the namespace. Get rid of it
3937
try:

vpython/gsprint.py

Lines changed: 0 additions & 27 deletions
This file was deleted.

vpython/test/test_namespace.py

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@
33

44
API_NAMES = [
55
'Camera',
6-
'GSprint',
76
'GSversion',
87
'GlowWidget',
98
'Mouse',

vpython/vpython.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -116,7 +116,7 @@ def Exit():
116116
__methods = {'select':'a', 'pos':'b', 'start':'c', 'stop':'d', 'clear':'f', # unused eghijklmnopvxyzCDFABu
117117
'plot':'q', 'add_to_trail':'s',
118118
'follow':'t', 'clear_trail':'w',
119-
'bind':'G', 'unbind':'H', 'waitfor':'I', 'pause':'J', 'pick':'K', 'GSprint':'L',
119+
'bind':'G', 'unbind':'H', 'waitfor':'I', 'pause':'J', 'pick':'K',
120120
'delete':'M', 'capture':'N'}
121121

122122
__vecattrs = ['pos', 'up', 'color', 'trail_color', 'axis', 'size', 'origin',
@@ -125,7 +125,7 @@ def Exit():
125125
'marker_color', 'offset']
126126

127127
__textattrs = ['text', 'align', 'caption', 'title', 'xtitle', 'ytitle', 'selected', 'label', 'capture', 'name',
128-
'append_to_caption', 'append_to_title', 'bind', 'unbind', 'pause', 'GSprint', 'choices']
128+
'append_to_caption', 'append_to_title', 'bind', 'unbind', 'pause', 'choices']
129129

130130
def _encode_attr2(sendval, val, ismethods):
131131
s = ''

vpython/vpython_libraries/glow.min.js

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

vpython/vpython_libraries/glowcomm.html

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -406,7 +406,7 @@
406406
var methods = {'a':'select', 'b':'pos', 'c':'start', 'd':'stop', 'f':'clear', // unused eghijklmnopvxyzCDFAB
407407
'q':'plot', 's':'add_to_trail',
408408
't':'follow', 'u':'_attach_arrow', 'w':'clear_trail',
409-
'G':'bind', 'H':'unbind', 'I':'waitfor', 'J':'pause', 'K':'pick', 'L':'GSprint',
409+
'G':'bind', 'H':'unbind', 'I':'waitfor', 'J':'pause', 'K':'pick',
410410
'M':'delete', 'N':'capture'}
411411

412412
var vecattrs = ['pos', 'up', 'color', 'trail_color', 'axis', 'size', 'origin', '_attach_arrow',
@@ -415,7 +415,7 @@
415415
'marker_color']
416416

417417
var textattrs = ['text', 'align', 'caption', 'title', 'title_align', 'xtitle', 'ytitle', 'selected', 'capture',
418-
'label', 'append_to_caption', 'append_to_title', 'bind', 'unbind', 'pause', 'GSprint', 'choices']
418+
'label', 'append_to_caption', 'append_to_title', 'bind', 'unbind', 'pause', 'choices']
419419

420420
// patt gets idx and attr code; vpatt gets x,y,z of a vector
421421
var patt = /(\d+)(.)(.*)/
@@ -839,9 +839,7 @@
839839
var val = cmd.val
840840
var obj = glowObjs[idx]
841841

842-
if (method == 'GSprint') {
843-
GSprint(val)
844-
} else if (val == 'None') {
842+
if (val == 'None') {
845843
if (method == 'delete') obj['remove']()
846844
else obj[method]()
847845
} else if (method === 'rotate') {

vpython/vpython_libraries/glowcomm.js

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -453,7 +453,7 @@ var attrsb = {'a':'userzoom', 'b':'userspin', 'c':'range', 'd':'autoscale', 'e':
453453
var methods = {'a':'select', 'b':'pos', 'c':'start', 'd':'stop', 'f':'clear', // unused eghijklmnopvxyzCDFAB
454454
'q':'plot', 's':'add_to_trail',
455455
't':'follow', 'u':'_attach_arrow', 'w':'clear_trail',
456-
'G':'bind', 'H':'unbind', 'I':'waitfor', 'J':'pause', 'K':'pick', 'L':'GSprint',
456+
'G':'bind', 'H':'unbind', 'I':'waitfor', 'J':'pause', 'K':'pick',
457457
'M':'delete', 'N':'capture'}
458458

459459
var vecattrs = ['pos', 'up', 'color', 'trail_color', 'axis', 'size', 'origin', '_attach_arrow',
@@ -462,7 +462,7 @@ var vecattrs = ['pos', 'up', 'color', 'trail_color', 'axis', 'size', 'origin', '
462462
'marker_color']
463463

464464
var textattrs = ['text', 'align', 'caption', 'title', 'title_align', 'xtitle', 'ytitle', 'selected', 'capture',
465-
'label', 'append_to_caption', 'append_to_title', 'bind', 'unbind', 'pause', 'GSprint', 'choices']
465+
'label', 'append_to_caption', 'append_to_title', 'bind', 'unbind', 'pause', 'choices']
466466

467467
// patt gets idx and attr code; vpatt gets x,y,z of a vector
468468
var patt = /(\d+)(.)(.*)/
@@ -886,9 +886,7 @@ async function handle_methods(dmeth) {
886886
var val = cmd.val
887887
var obj = glowObjs[idx]
888888

889-
if (method == 'GSprint') {
890-
GSprint(val)
891-
} else if (val == 'None') {
889+
ifif (val == 'None') {
892890
if (method == 'delete') obj['remove']()
893891
else obj[method]()
894892
} else if (method === 'rotate') {

0 commit comments

Comments
 (0)