Skip to content

Commit

Permalink
Pull request #664: Added a menu "Style > Clashed Residues > Hide" to …
Browse files Browse the repository at this point in the history
…hide clashed residues.

Merge in STRUC/icn3d from release3370 to master

* commit '861823b8571fc1355264afbdb64ef0f1825a992d':
  Added a menu "Style > Clashed Residues > Hide" to hide clashed residues.
  • Loading branch information
jiywang3 committed Oct 16, 2024
2 parents 072246f + 861823b commit 7344305
Show file tree
Hide file tree
Showing 32 changed files with 2,694 additions and 1,712 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.37.0](https://www.ncbi.nlm.nih.gov/Structure/icn3d/icn3d-3.37.0.zip) was release on October 16, 2024. Added a menu "View > Clashed Residues > Hide" to hide clashed residues.

[icn3d-3.36.1](https://www.ncbi.nlm.nih.gov/Structure/icn3d/icn3d-3.36.1.zip) was release on October 7, 2024. Fixed an issue related to previous chain IDs such as "A_1" (changed to "A1") in previous sharable links.

[icn3d-3.36.0](https://www.ncbi.nlm.nih.gov/Structure/icn3d/icn3d-3.36.0.zip) was release on October 3, 2024. Allowed to load multiple iCn3D PNG images.
Expand Down
853 changes: 524 additions & 329 deletions build/icn3d.js

Large diffs are not rendered by default.

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

Large diffs are not rendered by default.

853 changes: 524 additions & 329 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.37.0](https://www.ncbi.nlm.nih.gov/Structure/icn3d/icn3d-3.37.0.zip) was release on October 16, 2024. Added a menu "View > Clashed Residues > Hide" to hide clashed residues.

[icn3d-3.36.1](https://www.ncbi.nlm.nih.gov/Structure/icn3d/icn3d-3.36.1.zip) was release on October 7, 2024. Fixed an issue related to previous chain IDs such as "A_1" (changed to "A1") in previous sharable links.

[icn3d-3.36.0](https://www.ncbi.nlm.nih.gov/Structure/icn3d/icn3d-3.36.0.zip) was release on October 3, 2024. Allowed to load multiple iCn3D PNG images.
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.36.1.css">
<link rel="stylesheet" href="icn3d_3.37.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.36.1.min.js"></script>
<script src="icn3d_3.37.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.36.1.min.js', function() {
//$.getScript('icn3d_3.37.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.36.1.css">
<link rel="stylesheet" href="icn3d_3.37.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.36.1.min.js"></script>
<script src="icn3d_3.37.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.36.1.min.js', function() {
//$.getScript('icn3d_3.37.0.min.js', function() {
var version = 3;
await launchIcn3d(version);
//});
Expand Down
6 changes: 3 additions & 3 deletions dist/full2_3.36.1.html → dist/full2_3.37.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.36.1.css">
<link rel="stylesheet" href="icn3d_3.37.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.36.1.min.js"></script>
<script src="icn3d_3.37.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.36.1.min.js', function() {
//$.getScript('icn3d_3.37.0.min.js', function() {
var version = 3;
await launchIcn3d(version);
//});
Expand Down
6 changes: 3 additions & 3 deletions dist/full_3.36.1.html → dist/full_3.37.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.36.1.css">
<link rel="stylesheet" href="icn3d_3.37.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.36.1.min.js"></script>
<script src="icn3d_3.37.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.36.1.min.js', function() {
//$.getScript('icn3d_3.37.0.min.js', function() {
var version = 3;
await launchIcn3d(version); //await
//});
Expand Down
Binary file renamed dist/icn3d-3.36.1.zip → dist/icn3d-3.37.0.zip
Binary file not shown.
8 changes: 6 additions & 2 deletions dist/icn3d.html
Original file line number Diff line number Diff line change
Expand Up @@ -494,7 +494,7 @@ <h3>iCn3D gallery with live examples<span style="font-size:0.7em"> ("iCn3D PNG I

<div class="gallery">
<a href="https://structure.ncbi.nlm.nih.gov/icn3d/share.html?sVtm2898Ev8j5T9J7" target="_blank">
<img style="height:300px" src ="https://www.ncbi.nlm.nih.gov/Structure/icn3d/gallery/lig-protein.png"><br>ligand-protein interaction<br>(PDB 3GVU)
<img style="height:300px" src ="https://www.ncbi.nlm.nih.gov/Structure/icn3d/gallery/lig-protein.png"><br>ligand-protein interaction (PDB 3GVU)
</a>
</div>

Expand Down Expand Up @@ -728,7 +728,6 @@ <h3>Videos & Tutorials<img src="https://www.ncbi.nlm.nih.gov/Structure/IMG/space
<li><a href="https://youtu.be/XvjiK5bOtd0">Virtual Reality (VR) views in iCn3D (2023)</a></li><br>

<li><a href="https://www.youtube.com/watch?v=LTq5hYKv7uk&list=PL7dF9e2qSW0Yqd3ZvvjLha5p1C_f7mnq6&index=24">NCBI Protein and Structure Part 6 of 8: Viewing a Structure with iCn3D</a></li><br>
<li><a href="https://bio.libretexts.org/Bookshelves/Biochemistry/Fundamentals_of_Biochemistry_(Jakubowski_and_Flatt)/Fundamentals_of_Biochemistry_Vol._V_-_Problems/iCn3D_Molecular_Modeling_Tutorials">iCn3D Tutorials by Henry Jakubowski</a></li><br>


<!--
Expand All @@ -746,6 +745,11 @@ <h3>Videos & Tutorials<img src="https://www.ncbi.nlm.nih.gov/Structure/IMG/space
<li><a href="https://www.youtube.com/watch?v=Mj77EFgAAQM&list=PLSAXB_etwzD824Q8TMqWPHOUv5z8gIcs5&index=8">iCn3D Tutorials by Digital World Biology (2021-)</a></li><br>
<li><a href="https://www.youtube.com/watch?v=7GGw4S9tE9E">iCn3D Tutorial by BioMolViz Group (2021)</a></li>
-->

<li style="font-size:1.5em"><a href="https://bio.libretexts.org/Bookshelves/Biochemistry/Fundamentals_of_Biochemistry_(Jakubowski_and_Flatt)/Fundamentals_of_Biochemistry_Vol._V_-_Problems/iCn3D_Molecular_Modeling_Tutorials">iCn3D Tutorials at bio.libretexts.org by Henry Jakubowski: </a> <button onclick="document.getElementById('henry_tutorial').src = document.getElementById('henry_tutorial').src">Refresh Tutorial</button><br><br>
<iframe id='henry_tutorial' allowFullScreen='true' src='https://bio.libretexts.org/Bookshelves/Biochemistry/Fundamentals_of_Biochemistry_(Jakubowski_and_Flatt)/Fundamentals_of_Biochemistry_Vol._V_-_Problems/iCn3D_Molecular_Modeling_Tutorials' width='100%' height='100%' style='min-height: 1000px' style='border:none'></iframe>
</li><br>

</ul>

<span class="anchor" id="faq"></span>
Expand Down
Loading

0 comments on commit 7344305

Please sign in to comment.