#12299: Advance Jmol Interactive Features in Flask Notebook
-------------------------------------------------------+--------------------
Reporter: gutow | Owner: jason,
mpatel, was
Type: enhancement | Status:
needs_work
Priority: major | Milestone:
sage-5.2
Component: notebook | Resolution:
Keywords: Jmol, 3D, notebook | Work issues: applet
ID when cells re-evaluated,decide default display quality, doctests,switch to
generic error
Report Upstream: Reported upstream. No feedback yet. | Reviewers:
Karl-Dieter Crisman, Steven Trogdon
Authors: Jonathan Gutow | Merged in:
Dependencies: #11080,#11078,#11503 | Stopgaps:
-------------------------------------------------------+--------------------
Comment (by kini):
I've transferred the sagenb-related patches to
[https://github.com/sagemath/sagenb/pull/64 a github pull request]. Feel
free to write more patches, and I'll put them there too, if you like.
(Please don't overwrite old patches, that makes it more complicated.) Or I
can put any other branch you like onto the pull request - just ask.
Please CC me in the future if you want me to transfer patches to github.
If you're interested, here's what I did:
{{{
$ cd ~/src/sagenb # go to my sagenb repo
$ git checkout master # get on master
$ git pull # my master is set up to track sagemath/master, i.e. the latest
upstream
$ git checkout -b trac_12299 # create a new branch called trac_12299
$ # download the patches to the current directory
$ git am --whitespace=fix trac_12299_adv_jmol_nb.patch
Applying: Trac 12299: add interactive Jmol controls in notebook
/home/fs-boone/src/sagenb/.git/rebase-apply/patch:15: trailing whitespace.
for particular browser/OS combinations. Problem systems FF/MacOS
(intermittent),
/home/fs-boone/src/sagenb/.git/rebase-apply/patch:18: trailing whitespace.
/home/fs-boone/src/sagenb/.git/rebase-apply/patch:30: trailing whitespace.
Jmol.js
/home/fs-boone/src/sagenb/.git/rebase-apply/patch:37: trailing whitespace.
the evaluate_cell() call and others that delete cell output must
be modified
/home/fs-boone/src/sagenb/.git/rebase-apply/patch:41: trailing whitespace.
where a
warning: squelched 37 whitespace errors
warning: 42 lines applied after fixing whitespace errors.
$ git am --whitespace=fix trac_12299_old_wksht.patch
Applying: trac 12299: fix jmol in old worksheets
/home/fs-boone/src/sagenb/.git/rebase-apply/patch:41: trailing whitespace.
/home/fs-boone/src/sagenb/.git/rebase-apply/patch:44: trailing whitespace.
# Note: this is problematic in the notebook as it uses tools
from Sage to
/home/fs-boone/src/sagenb/.git/rebase-apply/patch:51: trailing whitespace.
f.write('set defaultdirectory "%s"\n' %path)
/home/fs-boone/src/sagenb/.git/rebase-apply/patch:68: trailing whitespace.
#print script
/home/fs-boone/src/sagenb/.git/rebase-apply/patch:72: trailing whitespace.
warning: 5 lines applied after fixing whitespace errors.
$ git log -2 --stat
commit 32be06d65240aac183b391ef24e8149b52eabaea (HEAD,
refs/remotes/origin/trac_12299, refs/heads/trac_12299)
Author: Jonathan Gutow <[email protected]>
Date: Mon Jun 11 20:44:10 2012 -0500
trac 12299: fix jmol in old worksheets
sagenb/notebook/cell.py | 46
+++++++++++++++++++++++++++++++++++++++++++---
1 file changed, 43 insertions(+), 3 deletions(-)
commit 1971a68138c14e7057e468802a598b05760bb733
Author: Jonathan Gutow <[email protected]>
Date: Sun May 27 08:48:59 2012 -0500
Trac 12299: add interactive Jmol controls in notebook
sagenb/data/sage/js/jmol_lib.js | 1233
++++++++++++++++++++++++++++++++++-
sagenb/data/sage/js/notebook_lib.js | 7 +
sagenb/notebook/cell.py | 7 +-
3 files changed, 1223 insertions(+), 24 deletions(-)
}}}
The last command was just for me to check that the author/date/etc. looked
correct, as well as the number of lines added/removed and number of files
changed. There was a minor discrepancy in the larger patch, but it looks
like it was just an instance of trailing whitespace being added which
disappeared when git fixed the whitespace changes.
--
Ticket URL: <http://trac.sagemath.org/sage_trac/ticket/12299#comment:67>
Sage <http://www.sagemath.org>
Sage: Creating a Viable Open Source Alternative to Magma, Maple, Mathematica,
and MATLAB
--
You received this message because you are subscribed to the Google Groups
"sage-trac" group.
To post to this group, send email to [email protected].
To unsubscribe from this group, send email to
[email protected].
For more options, visit this group at
http://groups.google.com/group/sage-trac?hl=en.
