Skip to content

Commit

Permalink
Pull request #675: Collections update - fixed gz and zip functionalit…
Browse files Browse the repository at this point in the history
…y and collections parsing.

Merge in STRUC/icn3d from release3401 to master

* commit 'ae3356bbdcfe8350156dbfdeca26aa49b187726a':
  Collections update - fixed gz and zip functionality and collections parsing.
  Collections update - fix gz and zip functionality and collections parsing.
  Collections update - append structures, clear commands, and example folder fix
  Collections update - multi format zip, export, gz
  Collections update - multi format zip, export, gz
  Collections update - multi format zip, export, gz
  • Loading branch information
jiywang3 committed Jan 8, 2025
2 parents 6fafba0 + ae3356b commit d486fed
Show file tree
Hide file tree
Showing 29 changed files with 1,551 additions and 416 deletions.
6 changes: 5 additions & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,7 +1,11 @@
## Change Log
[icn3d-3.40.2](https://www.ncbi.nlm.nih.gov/Structure/icn3d/icn3d-3.40.2.zip) was release on January 8, 2024. Collections update - fixed gz and zip functionality and collections parsing.

[icn3d-3.40.1](https://www.ncbi.nlm.nih.gov/Structure/icn3d/icn3d-3.40.1.zip) was release on December 20, 2024. Collections update - added strucure append and clear commands, fix collections example directory.

[icn3d-3.40.0](https://www.ncbi.nlm.nih.gov/Structure/icn3d/icn3d-3.40.0.zip) was release on December 11, 2024. Added the feature to show 2D Depiction/Diagram for chemical view with cid or smiles as input via the menu "Analysis > 2D Depiction"; fixed the positions of point lights relative to the camera.

[icn3d-3.39.0](https://www.ncbi.nlm.nih.gov/Structure/icn3d/icn3d-3.39.0.zip) was release on December 2, 2024. Collections update - added multi file format support for zip, command history and JSON export, gz&ent file support.
[icn3d-3.39.0](https://www.ncbi.nlm.nih.gov/Structure/icn3d/icn3d-3.39.0.zip) was release on November 25, 2024. Collections update - added multi file format support for zip, command history and JSON export, gz&ent file support.

[icn3d-3.38.1](https://www.ncbi.nlm.nih.gov/Structure/icn3d/icn3d-3.38.1.zip) was release on November 14, 2024. Improved the conversion of chemical SMILES to 3D structure by showing double bonds.

Expand Down
188 changes: 111 additions & 77 deletions build/icn3d.js

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions build/icn3d.min.js

Large diffs are not rendered by default.

188 changes: 111 additions & 77 deletions build/icn3d.module.js

Large diffs are not rendered by default.

6 changes: 5 additions & 1 deletion dist/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,7 +1,11 @@
## Change Log
[icn3d-3.40.2](https://www.ncbi.nlm.nih.gov/Structure/icn3d/icn3d-3.40.2.zip) was release on January 8, 2024. Collections update - fixed gz and zip functionality and collections parsing; .

[icn3d-3.40.1](https://www.ncbi.nlm.nih.gov/Structure/icn3d/icn3d-3.40.1.zip) was release on December 20, 2024. Collections update - added strucure append and clear commands, fix collections example directory.

[icn3d-3.40.0](https://www.ncbi.nlm.nih.gov/Structure/icn3d/icn3d-3.40.0.zip) was release on December 11, 2024. Added the feature to show 2D Depiction/Diagram for chemical view with cid or smiles as input via the menu "Analysis > 2D Depiction"; fixed the positions of point lights relative to the camera.

[icn3d-3.39.0](https://www.ncbi.nlm.nih.gov/Structure/icn3d/icn3d-3.39.0.zip) was release on December 2, 2024. Collections update - added multi file format support for zip, command history and JSON export, gz&ent file support.
[icn3d-3.39.0](https://www.ncbi.nlm.nih.gov/Structure/icn3d/icn3d-3.39.0.zip) was release on November 25, 2024. Collections update - added multi file format support for zip, command history and JSON export, gz&ent file support.

[icn3d-3.38.1](https://www.ncbi.nlm.nih.gov/Structure/icn3d/icn3d-3.38.1.zip) was release on November 14, 2024. Improved the conversion of chemical SMILES to 3D structure by showing double bonds.

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.40.0.css">
<link rel="stylesheet" href="icn3d_3.40.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.40.0.min.js"></script>
<script src="icn3d_3.40.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.40.0.min.js', function() {
//$.getScript('icn3d_3.40.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.40.0.css">
<link rel="stylesheet" href="icn3d_3.40.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.40.0.min.js"></script>
<script src="icn3d_3.40.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.40.0.min.js', function() {
//$.getScript('icn3d_3.40.2.min.js', function() {
var version = 3;
await launchIcn3d(version);
//});
Expand Down
6 changes: 3 additions & 3 deletions dist/full2_3.40.0.html → dist/full2_3.40.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.40.0.css">
<link rel="stylesheet" href="icn3d_3.40.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.40.0.min.js"></script>
<script src="icn3d_3.40.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.40.0.min.js', function() {
//$.getScript('icn3d_3.40.2.min.js', function() {
var version = 3;
await launchIcn3d(version);
//});
Expand Down
6 changes: 3 additions & 3 deletions dist/full_3.40.0.html → dist/full_3.40.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.40.0.css">
<link rel="stylesheet" href="icn3d_3.40.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.40.0.min.js"></script>
<script src="icn3d_3.40.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.40.0.min.js', function() {
//$.getScript('icn3d_3.40.2.min.js', function() {
var version = 3;
await launchIcn3d(version); //await
//});
Expand Down
Binary file renamed dist/icn3d-3.40.0.zip → dist/icn3d-3.40.2.zip
Binary file not shown.
Loading

0 comments on commit d486fed

Please sign in to comment.