[sagenb] 01/01: Update jsmol-disabled notice to mention threejs

Ximin Luo infinity0 at debian.org
Thu Jun 15 13:59:10 UTC 2017


This is an automated email from the git hooks/post-receive script.

infinity0 pushed a commit to branch master
in repository sagenb.

commit 6556992cf0f371da586907a2e84b14c983b1767a
Author: Ximin Luo <infinity0 at debian.org>
Date:   Thu Jun 15 15:58:57 2017 +0200

    Update jsmol-disabled notice to mention threejs
---
 debian/patches/debian-jmol-paths.patch | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/debian/patches/debian-jmol-paths.patch b/debian/patches/debian-jmol-paths.patch
index 3e373c0..4271f44 100644
--- a/debian/patches/debian-jmol-paths.patch
+++ b/debian/patches/debian-jmol-paths.patch
@@ -55,13 +55,17 @@ Forwarded: not-needed
      </div>
 --- a/sagenb/notebook/cell.py
 +++ b/sagenb/notebook/cell.py
-@@ -2393,6 +2393,9 @@
+@@ -2393,6 +2393,13 @@
          script_name = os.path.join(self.url_to_self(), F)
          return textwrap.dedent("""
          <div id="sage_jmol_{id}" class="3DPlotDiv">
-+            <div>Interactive 3D plots using the default viewer do not work in SageNB because JSmol cannot currently be packaged for Debian. See the README.source of the jmol package for more details on this situation.</div>
-+            <div> </div>
-+            <div>You can view an interactive plot with reduced functionality by giving the option <code>viewer='canvas3d'</code>, or a non-interactive plot by giving the option <code>viewer='tachyon'</code>. Also, interactive plots with Jmol do work from the SageMath command-line interface.</div>
++            <div>Interactive 3D plots using the default viewer do not work in SageNB, because JSmol cannot currently be packaged for Debian. See the README.source of the jmol package for more details on this situation. You have the following alternative options:</div>
++            <ul class="debian-jsmol">
++            <li>View an interactive WebGL-based plot by giving the option <code>viewer='threejs'</code>. This should work out-of-the box on Firefox, but may require you to adjust some settings in Chromium - see <code>chrome://flags</code> for options and <code>chrome://gpu</code> for status. In both cases, the functionality also depends on your graphics hardware and drivers, but support should exist in most cases.</li>
++            <li>View a less sophisticated interactive plot that does not require WebGL, by giving the option <code>viewer='canvas3d'</code>.</li>
++            <li>View a non-interactive plot by giving the option <code>viewer='tachyon'</code>.</li>
++            <li>Use the default viewer (Jmol) from the SageMath command-line interface, instead of the notebook.</li>
++            </ul>
              <div id="loadJmol" style="display:none;">{id}</div>
              <div id="sage_jmol_size_{id}" style="display:none;">{size}</div>
              <div id="sage_jmol_img_{id}" style="display:none;">{image_name}.png?{timestamp}</div>

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/sagenb.git



More information about the debian-science-commits mailing list