Documentatoin tweak

3dmol · Jul 31, 2024 · 0c9a671 · 0c9a671
1 parent 2891c86
commit 0c9a671
Show file tree

Hide file tree

Showing 5 changed files with 14 additions and 6 deletions.
diff --git a/jsdoc.conf.json b/jsdoc.conf.json
@@ -16,7 +16,7 @@
         "cleverLinks": true,
         "monospaceLinks": false,
         "footer": "",
-        "copyright":"3Dmol.js © 2019-2023",
+        "copyright":"3Dmol.js © 2019-2024",
         "linenums"              : true,
         "collapseSymbols"       : false,
         "inverseNav"            : true,
@@ -38,7 +38,7 @@
             "includeFilesListInHomepage": true,
             "homepageTitle": "3Dmol.js",
             "displayModuleHeader": true,
-            "footer":"3Dmol.js © 2019-2023 | <a href='https://pitt.edu/' target='_blank'>University of Pittsburgh</a> | <a href='https://github.com/3dmol/3Dmol.js/blob/master/LICENSE' target='_blank'>License</a>",
+            "footer":"3Dmol.js © 2019-2024 | <a href='https://pitt.edu/' target='_blank'>University of Pittsburgh</a> | <a href='https://github.com/3dmol/3Dmol.js/blob/master/LICENSE' target='_blank'>License</a>",
             "title": "3Dmol.js",
             "create_style": "article ul li { list-style: disc}",
             "menu": [

diff --git a/py3Dmol/py3Dmol/__init__.py b/py3Dmol/py3Dmol/__init__.py
@@ -54,7 +54,7 @@ class view(object):
        the exception that the functions all return None.
        http://3dmol.org/doc/GLViewer.html
     '''
-    def __init__(self,query='',width=640,height=480,viewergrid=None,data=None,style=None,linked=True,options=dict(),format=None,js='https://cdnjs.cloudflare.com/ajax/libs/3Dmol/2.2.1-post1/3Dmol-min.js'):
+    def __init__(self,query='',width=640,height=480,viewergrid=None,data=None,style=None,linked=True,options=dict(),format=None,js='https://cdnjs.cloudflare.com/ajax/libs/3Dmol/2.3.0/3Dmol-min.js'):
         '''Create a 3Dmol.js view.
             width -- width in pixels of container
             height -- height in pixels of container

diff --git a/py3Dmol/setup.py b/py3Dmol/setup.py
@@ -24,7 +24,7 @@
     # the version across setup.py and the project code, see
     # https://packaging.python.org/en/latest/single_source_version.html
     # Keep version in synce with 3Dmol.js version.  Use "postX" suffix if needed
-    version='2.2.1',
+    version='2.3.0',
 
     description='An IPython interface for embedding 3Dmol.js views in Jupyter notebooks',
     long_description=long_description,

diff --git a/src/GLViewer.ts b/src/GLViewer.ts
@@ -5011,9 +5011,17 @@ export interface AmbientOcclusionStyle {
 /**
  * View style configuration
  */
-export interface ViewStyle extends OutlineStyle, AmbientOcclusionStyle {
+export interface ViewStyle  {
     /** How to style viewer: outline|ambientOcclusion|none */
     style?: string;
+    /** Ambient occlusion strength (darkness) of shading (default 1.0) */
+    strength?: number;
+    /** Ambient occlusion radius (in Angstroms) used to detect occlusions (default 5.0). */
+    radius?: number;
+    /** Width of the outline */
+    width?: number;
+    /** Color of the outline */
+    color?: ColorSpec;    
 }
 /**
  * GLViewer input specification

diff --git a/src/utilities.ts b/src/utilities.ts
@@ -526,7 +526,7 @@ export function download(query, viewer, options, callback?) {
 };
 
 
-/* Return proper color for atom given style
+/**  Return proper color for atom given style
  * @param {AtomSpec} atom
  * @param {AtomStyle} style
  * @return {Color}