Skip to content

Commit

Permalink
Pull request #646: Allowed to load multiple mmCIF text files, which c…
Browse files Browse the repository at this point in the history
…ould contain multiple structures separated by "ENDMDL\n".

Merge in STRUC/icn3d from release3320 to master

* commit '85b1f69f4c3028bc30ca93a0369d7cec1e366b50':
  Allowed to load multiple mmCIF text files, which could contain multiple structures separated by "ENDMDL\n".
  Allowed to load multiple mmCIF text files, which could contain multiple structures separated by "ENDMDL\n".
  • Loading branch information
jiywang3 committed May 28, 2024
2 parents c900cb0 + 85b1f69 commit b3d6bf8
Show file tree
Hide file tree
Showing 47 changed files with 5,460 additions and 4,144 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.32.0](https://www.ncbi.nlm.nih.gov/Structure/icn3d/icn3d-3.32.0.zip) was release on May 28, 2024. Allowed to load multiple mmCIF text files, which could contain multiple structures separated by "ENDMDL\n".

[icn3d-3.31.4](https://www.ncbi.nlm.nih.gov/Structure/icn3d/icn3d-3.31.4.zip) was release on May 11, 2024. Release Ig templates for assigning reference numbers.

[icn3d-3.31.3](https://www.ncbi.nlm.nih.gov/Structure/icn3d/icn3d-3.31.3.zip) was release on April 15, 2024. Jack Lin fixed some issues in loading a collection file.
Expand Down
1,897 changes: 1,079 additions & 818 deletions build/icn3d.js

Large diffs are not rendered by default.

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

Large diffs are not rendered by default.

1,897 changes: 1,079 additions & 818 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.32.0](https://www.ncbi.nlm.nih.gov/Structure/icn3d/icn3d-3.32.0.zip) was release on May 28, 2024. Allowed to load multiple mmCIF text files, which could contain multiple structures separated by "ENDMDL\n".

[icn3d-3.31.4](https://www.ncbi.nlm.nih.gov/Structure/icn3d/icn3d-3.31.4.zip) was release on May 11, 2024. Release Ig templates for assigning reference numbers.

[icn3d-3.31.3](https://www.ncbi.nlm.nih.gov/Structure/icn3d/icn3d-3.31.3.zip) was release on April 15, 2024. Jack Lin fixed some issues in loading a collection file.
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.31.4.css">
<link rel="stylesheet" href="icn3d_3.32.0.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.31.4.min.js"></script>
<script src="icn3d_3.32.0.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.31.4.min.js', function() {
//$.getScript('icn3d_3.32.0.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.31.4.css">
<link rel="stylesheet" href="icn3d_3.32.0.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.31.4.min.js"></script>
<script src="icn3d_3.32.0.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.31.4.min.js', function() {
//$.getScript('icn3d_3.32.0.min.js', function() {
var version = 3;
await launchIcn3d(version);
//});
Expand Down
6 changes: 3 additions & 3 deletions dist/full2_3.31.4.html → dist/full2_3.32.0.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.31.4.css">
<link rel="stylesheet" href="icn3d_3.32.0.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.31.4.min.js"></script>
<script src="icn3d_3.32.0.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.31.4.min.js', function() {
//$.getScript('icn3d_3.32.0.min.js', function() {
var version = 3;
await launchIcn3d(version);
//});
Expand Down
6 changes: 3 additions & 3 deletions dist/full_3.31.4.html → dist/full_3.32.0.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.31.4.css">
<link rel="stylesheet" href="icn3d_3.32.0.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.31.4.min.js"></script>
<script src="icn3d_3.32.0.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.31.4.min.js', function() {
//$.getScript('icn3d_3.32.0.min.js', function() {
var version = 3;
await launchIcn3d(version); //await
//});
Expand Down
Binary file renamed dist/icn3d-3.31.4.zip → dist/icn3d-3.32.0.zip
Binary file not shown.
Loading

0 comments on commit b3d6bf8

Please sign in to comment.