Skip to content

Commit

Permalink
Pull request #624: Simplified code to make icn3dnode calls simpler.
Browse files Browse the repository at this point in the history
Merge in STRUC/icn3d from release3292 to master

* commit 'bd19df94385cfaf7d055af365c6797a24d576ef4':
  Simplified code to make icn3dnode calls simpler.
  • Loading branch information
jiywang3 committed Jan 8, 2024
2 parents e87daa9 + bd19df9 commit 0144e2d
Show file tree
Hide file tree
Showing 35 changed files with 1,475 additions and 927 deletions.
2 changes: 2 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,4 +1,6 @@
## Change Log
[icn3d-3.29.2](https://www.ncbi.nlm.nih.gov/Structure/icn3d/icn3d-3.29.2.zip) was release on January 8, 2024. Simplified code to make icn3dnode calls simpler.

[icn3d-3.29.1](https://www.ncbi.nlm.nih.gov/Structure/icn3d/icn3d-3.29.1.zip) was release on December 14, 2023. Allowed users to load a collection of structures via the menu "File > Open File > Collection File". The example collection file is at https://github.com/ncbi/icn3d/blob/master/example/collection.json.

[icn3d-3.29.0](https://www.ncbi.nlm.nih.gov/Structure/icn3d/icn3d-3.29.0.zip) was release on December 13, 2023. Added the feature to load electron density maps from ccp4 or MTZ files either locally or via URLs.
Expand Down
464 changes: 287 additions & 177 deletions build/icn3d.js

Large diffs are not rendered by default.

12 changes: 5 additions & 7 deletions build/icn3d.min.js

Large diffs are not rendered by default.

464 changes: 287 additions & 177 deletions build/icn3d.module.js

Large diffs are not rendered by default.

2 changes: 2 additions & 0 deletions dist/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,4 +1,6 @@
## Change Log
[icn3d-3.29.2](https://www.ncbi.nlm.nih.gov/Structure/icn3d/icn3d-3.29.2.zip) was release on January 8, 2024. Simplified code to make icn3dnode calls simpler.

[icn3d-3.29.1](https://www.ncbi.nlm.nih.gov/Structure/icn3d/icn3d-3.29.1.zip) was release on December 14, 2023. Allowed users to load a collection of structures via the menu "File > Open File > Collection File". The example collection file is at https://github.com/ncbi/icn3d/blob/master/example/collection.json.

[icn3d-3.29.0](https://www.ncbi.nlm.nih.gov/Structure/icn3d/icn3d-3.29.0.zip) was release on December 13, 2023. Added the feature to load electron density maps from ccp4 or MTZ files either locally or via URLs.
Expand Down
6 changes: 3 additions & 3 deletions dist/full.html
Original file line number Diff line number Diff line change
Expand Up @@ -19,11 +19,11 @@
<div id="div0"></div>

<link rel="stylesheet" href="lib/jquery-ui-1.13.2.min.css">
<link rel="stylesheet" href="icn3d_3.29.1.css">
<link rel="stylesheet" href="icn3d_3.29.2.css">
<script src="lib/jquery-3.5.0.min.js"></script>
<script src="lib/jquery-ui-1.13.2.min.js"></script>
<script src="lib/three_0.151.0.min.js"></script>
<script src="icn3d_3.29.1.min.js"></script>
<script src="icn3d_3.29.2.min.js"></script>

<script type="text/javascript">

Expand All @@ -41,7 +41,7 @@
alert("IE does NOT work with the current iCn3D version 3. The old iCn3D version 2 is used instead.");
}
else {
//$.getScript('icn3d_3.29.1.min.js', function() {
//$.getScript('icn3d_3.29.2.min.js', function() {
var version = 3;
await launchIcn3d(version); //await
//});
Expand Down
6 changes: 3 additions & 3 deletions dist/full2.html
Original file line number Diff line number Diff line change
Expand Up @@ -20,11 +20,11 @@
<div id="div1" style="float:left;"></div>

<link rel="stylesheet" href="lib/jquery-ui-1.13.2.min.css">
<link rel="stylesheet" href="icn3d_3.29.1.css">
<link rel="stylesheet" href="icn3d_3.29.2.css">
<script src="lib/jquery-3.5.0.min.js"></script>
<script src="lib/jquery-ui-1.13.2.min.js"></script>
<script src="lib/three_0.151.0.min.js"></script>
<script src="icn3d_3.29.1.min.js"></script>
<script src="icn3d_3.29.2.min.js"></script>

<script type="text/javascript">
$( document ).ready(async function() {
Expand All @@ -41,7 +41,7 @@
alert("IE does NOT work with the current iCn3D version 3. The old iCn3D version 2 is used instead.");
}
else {
//$.getScript('icn3d_3.29.1.min.js', function() {
//$.getScript('icn3d_3.29.2.min.js', function() {
var version = 3;
await launchIcn3d(version);
//});
Expand Down
6 changes: 3 additions & 3 deletions dist/full2_3.29.1.html → dist/full2_3.29.2.html
Original file line number Diff line number Diff line change
Expand Up @@ -20,11 +20,11 @@
<div id="div1" style="float:left;"></div>

<link rel="stylesheet" href="lib/jquery-ui-1.13.2.min.css">
<link rel="stylesheet" href="icn3d_3.29.1.css">
<link rel="stylesheet" href="icn3d_3.29.2.css">
<script src="lib/jquery-3.5.0.min.js"></script>
<script src="lib/jquery-ui-1.13.2.min.js"></script>
<script src="lib/three_0.151.0.min.js"></script>
<script src="icn3d_3.29.1.min.js"></script>
<script src="icn3d_3.29.2.min.js"></script>

<script type="text/javascript">
$( document ).ready(async function() {
Expand All @@ -41,7 +41,7 @@
alert("IE does NOT work with the current iCn3D version 3. The old iCn3D version 2 is used instead.");
}
else {
//$.getScript('icn3d_3.29.1.min.js', function() {
//$.getScript('icn3d_3.29.2.min.js', function() {
var version = 3;
await launchIcn3d(version);
//});
Expand Down
6 changes: 3 additions & 3 deletions dist/full_3.29.1.html → dist/full_3.29.2.html
Original file line number Diff line number Diff line change
Expand Up @@ -19,11 +19,11 @@
<div id="div0"></div>

<link rel="stylesheet" href="lib/jquery-ui-1.13.2.min.css">
<link rel="stylesheet" href="icn3d_3.29.1.css">
<link rel="stylesheet" href="icn3d_3.29.2.css">
<script src="lib/jquery-3.5.0.min.js"></script>
<script src="lib/jquery-ui-1.13.2.min.js"></script>
<script src="lib/three_0.151.0.min.js"></script>
<script src="icn3d_3.29.1.min.js"></script>
<script src="icn3d_3.29.2.min.js"></script>

<script type="text/javascript">

Expand All @@ -41,7 +41,7 @@
alert("IE does NOT work with the current iCn3D version 3. The old iCn3D version 2 is used instead.");
}
else {
//$.getScript('icn3d_3.29.1.min.js', function() {
//$.getScript('icn3d_3.29.2.min.js', function() {
var version = 3;
await launchIcn3d(version); //await
//});
Expand Down
Binary file renamed dist/icn3d-3.29.1.zip → dist/icn3d-3.29.2.zip
Binary file not shown.
Loading

0 comments on commit 0144e2d

Please sign in to comment.