icn3d 3.23.5 → 3.23.6

package/icn3d.module.js

@@ -7946,6 +7946,12 @@ class ClickMenu {
             thisClass.setLogCmd('color ig strand', true);
         });
 
+        me.myEventCls.onIds("#" + me.pre + "mn4_clrIgproto", "click", function(e) { let ic = me.icn3d; //e.preventDefault();
+            //ic.legendClick = 6;
+            ic.setOptionCls.setOption('color', 'ig protodomain');
+            thisClass.setLogCmd('color ig protodomain', true);
+        });
+
 
         me.myEventCls.onIds("#" + me.pre + "mn4_clrArea", "click", function(e) { me.icn3d; //e.preventDefault();
             me.htmlCls.dialogCls.openDlg('dl_colorbyarea', "Color based on residue's solvent accessibility");
@@ -10262,7 +10268,9 @@ class SetMenu {
                 html += this.getRadio('mn4_clr', 'mn4_clrConfidence', 'AlphaFold<br><span style="padding-left:1.5em;">Confidence</span>', undefined, 1, 1);
             //}
 
-            html += this.getRadio('mn4_clr', 'mn4_clrIgstrand', 'Ig Strand', undefined, undefined, 2);
+            //!!!
+            //html += this.getRadio('mn4_clr', 'mn4_clrIgstrand', 'Ig Strand', undefined, undefined, 2);
+            //html += this.getRadio('mn4_clr', 'mn4_clrIgproto', 'Ig Protodomain', undefined, undefined, 2);
         }
         else {
             //if(!me.cfg.hidelicense) html += this.getRadio('mn4_clr', 'mn1_delphi2', 'DelPhi<br><span style="padding-left:1.5em;">Potential ' + me.htmlCls.licenseStr + '</span>');
@@ -10481,12 +10489,13 @@ class SetMenu {
             html += this.getMenuText('mn6_igrefwrap', 'Ref. Number', undefined, undefined, 1);
 
             html += "<ul>";
-
+//!!!
+/*
             html += this.getLink('mn6_igrefYes', 'Show Ig Ref. Number', undefined, 2);
             html += this.getLink('mn6_igrefNo', 'Hide Ig Ref. Number', undefined, 2);
 
             html += this.getMenuSep();
-
+*/
             html += this.getLink('mn6_customref', 'Custom Ref. Number', undefined, 2);
             html += "</ul>";
             html += "</li>";
@@ -32753,6 +32762,8 @@ class Alternate {
 
         ic.dAtoms = {};
 
+        let bMutation = moleculeArray.length == 2 && moleculeArray[1].replace(moleculeArray[0], '') == '2';
+
         for(let i = 0, il = moleculeArray.length; i < il; ++i) {
             let structure = moleculeArray[i];
             //if(i > ic.ALTERNATE_STRUCTURE || (ic.ALTERNATE_STRUCTURE === il - 1 && i === 0) ) {
@@ -32785,7 +32796,17 @@ class Alternate {
 
                 if(ic.ALTERNATE_STRUCTURE < 0) ic.ALTERNATE_STRUCTURE += il;
 
-                $("#" + ic.pre + "title").html(structure);
+                let label = '';
+                if(bMutation) {
+                    if(i == 0) {
+                        label = "Wild Type ";
+                    }
+                    else if(i == 1) {
+                        label = "Mutant ";
+                    }
+                }
+
+                $("#" + ic.pre + "title").html(label + structure);
 
                 break;
             }
@@ -35311,6 +35332,35 @@ class SetColor {
 
                 break;
 
+            case 'ig protodomain':
+                if(ic.bShowRefnum) {
+                    for(let resid in ic.resid2refnum) {
+                        let refnumLabel = ic.resid2refnum[resid];
+                        let color;
+                        if(!refnumLabel) {
+                            color = me.parasCls.thr(me.htmlCls.GREYB);
+                        }
+                        else {
+                            let refnumStr = refnumLabel.replace(/'/g, '').replace(/\*/g, '').replace(/\^/g, '').substr(1); // C', C''
+                            let currStrand = refnumLabel.replace(new RegExp(refnumStr,'g'), '');
+                            color = ic.showSeqCls.getProtodomainColor(currStrand);
+
+                            if(ic.residIgLoop.hasOwnProperty(resid)) {
+                                color = me.parasCls.thr(me.htmlCls.GREYB);
+                            }
+                        }
+                        
+                        for (let i in ic.residues[resid]) {
+                            let atom = ic.atoms[i];
+                            atom.color = me.parasCls.thr(color);
+        
+                            ic.atomPrevColors[i] = atom.color;
+                        }
+                    }
+                }
+
+                break;
+
             case 'residue custom':
                 for (let i in atoms) {
                     let atom = ic.atoms[i];
@@ -35975,6 +36025,9 @@ class SetOption {
         else if(colorType == 'ig strand') {
             colorLabel = 'Ig Strand';
         }
+        else if(colorType == 'ig protodomain') {
+            colorLabel = 'Ig Protodomain';
+        }
 
         let html = "Color by <b>" + colorLabel + "</b><br><br>";
  
@@ -35998,6 +36051,9 @@ class SetOption {
         else if (colorType == 'ig strand'){
             html += this.getColorLegendForIgstrand(ic.hAtoms);
         }
+        else if (colorType == 'ig protodomain'){
+            html += this.getColorLegendForIgproto(ic.hAtoms);
+        }
         //else if (ic.legendClick == 4){
         else if (colorType == 'normalized hydrophobic' || colorType == 'hydrophobic') {
             let bOriResn = true;
@@ -36229,19 +36285,49 @@ class SetOption {
             "A^ Strand": "FF00FF", 
             "A Strand": "663399",
             "A* Strand": "FFC0CB",
-            "A Strand": "9370db",
+            "A' Strand": "663399", //"9370db",
             "B Strand": "ba55d3",
             "C Strand": "0000FF",
             "C' Strand": "6495ED",
             "C'' Strand": "006400",
             "D Strand": "00FF00",
-            "E Strand": "FFFF00",
+            "E Strand": "F7DC6F", //"F0E68C",
             "F Strand": "FFA500",
             "G Strand": "FF0000",
             "G* Strand": "8B0000",
             "Loop": "CCCCCC"
         };
- 
+
+        html += "<div>";
+        for (let name in name2color) {
+            let color = name2color[name];
+            html += "<span>";
+            html += "<div style='width: 10px; height: 10px; background-color:#" + color + "; border: 0px;display:inline-block;' ></div> ";
+            html += name;
+            html +=  "</span><br>";
+        }
+
+        html += "</div>";
+
+        return html;
+     }
+
+     getColorLegendForIgproto(atomHash) { let ic = this.icn3d; ic.icn3dui;
+        let html = '';
+
+        const name2color = {
+            "A Strand": "0000FF",
+            "B Strand": "006400",
+            "C Strand": "F7DC6F", //"F0E68C",
+            "C' Strand": "FFA500",
+            "C'' Strand": "FF0000",
+            "D Strand": "0000FF",
+            "E Strand": "006400",
+            "F Strand": "F7DC6F", //"F0E68C",
+            "G Strand": "FFA500",
+            "Loop": "CCCCCC"
+        };
+
         html += "<div>";
         for (let name in name2color) {
             let color = name2color[name];
@@ -42380,6 +42466,8 @@ class ShowSeq {
         let html = '', html3 = '';
 
         let chainList = '';
+        if(!ic.chainid2index[chnid]) return {html: html, html3: html3};
+
         for(let i = 0, il = ic.chainid2index[chnid].length; i < il; ++i) {
             chainList += ic.refpdbArray[ic.chainid2index[chnid][i]] + " ";
         }
@@ -42863,7 +42951,7 @@ class ShowSeq {
             return '#FFC0CB'; //'#9900ff'; //'#87CEEB';
         }
         else if(currStrand == "A'") { //medium purple // steel blue
-            return '#9370db'; //'#9900ff'; //'#4682B4';
+            return '#663399'; //'#9370db'; //'#9900ff'; //'#4682B4';
         }
         else if(currStrand == "B") { //medium orchid // cyan
             return '#ba55d3'; //'#0000FF'; //'#4a86e8'; //'#00FFFF';
@@ -42881,7 +42969,7 @@ class ShowSeq {
             return '#00FF00'; //'#fffb00'; //'#A52A2A';
         }
         else if(currStrand == "E") { //yellow // pink
-            return '#F0E68C'; //'#ff9900'; //'#ffd966'; //'#FFC0CB';
+            return "#F7DC6F"; //'#F0E68C'; //'#ff9900'; //'#ffd966'; //'#FFC0CB';
         }
         else if(currStrand == "F") { //orange // magenta
             return '#FFA500'; //'#FF00FF'; //'#ff9900'; //'#FF00FF';
@@ -42897,6 +42985,27 @@ class ShowSeq {
         }
     }
 
+    getProtodomainColor(currStrand) {  let ic = this.icn3d, me = ic.icn3dui;
+        if((currStrand && currStrand.substr(0,1) == "A") || currStrand == "D") {
+            return '#0000FF';
+        }
+        else if(currStrand == "B" || currStrand == "E") {
+            return '#006400';
+        }
+        else if(currStrand == "C" || currStrand == "F") {
+            return "#F7DC6F"; //'#F0E68C'; 
+        }
+        else if(currStrand == "C'" || (currStrand && currStrand.substr(0, 1) == "G")) {
+            return '#FFA500'; 
+        }
+        else if(currStrand == "C''") { //linker
+            return '#FF0000'; 
+        }
+        else {
+            return me.htmlCls.GREYB;
+        }
+    }
+
     insertGap(chnid, seqIndex, text, bNohtml) {  let ic = this.icn3d; ic.icn3dui;
       let html = '';
       //if(me.cfg.blast_rep_id == chnid && ic.targetGapHash!== undefined && ic.targetGapHash.hasOwnProperty(seqIndex)) {
@@ -43959,7 +44068,7 @@ class LineGraph {
             // Node for common interaction: {id : "Q24.A.2AJF|Q24", r : "1_1_2AJF_A_24", s: "a", ...}
             let nodeArray1SplitCommon = [], nodeArray2SplitCommon = [], linkArraySplitCommon = [], nameHashSplitCommon = [];
             let nodeArray1SplitDiff = [], nodeArray2SplitDiff = [], linkArraySplitDiff = [], nameHashSplitDiff = [];
-            let linkedNodeCnt = {};
+            let linkedNodeCnt = {}, linkedNodeInterDiff = {};
 
             for(let i = 0, il = structureArray.length; i < il; ++i) {   
                 nodeArray1Split[i] = [];
@@ -43979,7 +44088,7 @@ class LineGraph {
 
                 struc2index[structureArray[i]] = i;
             }
-
+            
             for(let i = 0, il = linkArray.length; i < il; ++i) {
                 let link = linkArray[i];
                 let nodeA = name2node[link.source];
@@ -44015,9 +44124,11 @@ class LineGraph {
 
                           if(!linkedNodeCnt.hasOwnProperty(mappingid)) {
                             linkedNodeCnt[mappingid] = 1;
+                            linkedNodeInterDiff[mappingid] = link.n;
                           }
                           else {
                             ++linkedNodeCnt[mappingid];
+                            linkedNodeInterDiff[mappingid] -= link.n; // show difference
                           }
                       }
                 } 
@@ -44068,7 +44179,7 @@ class LineGraph {
                           linkDiff.source += separatorDiff + ic.chainsMapping[chainid1][resid1];
                           linkDiff.target += separatorDiff + ic.chainsMapping[chainid2][resid2];
                       
-                          if(linkedNodeCnt[mappingid] == structureArray.length) {
+                          if(linkedNodeCnt[mappingid] == structureArray.length && linkedNodeInterDiff[mappingid] == 0) {
                               linkArraySplitCommon[index].push(linkCommon);
                           }  
                           else {
@@ -44857,7 +44968,10 @@ class GetGraph {
             ic.hBondCls.calculateChemicalHbonds(me.hashUtilsCls.intHash2Atoms(ic.dAtoms, complement, ic.atoms), me.hashUtilsCls.intHash2Atoms(ic.dAtoms, firstSetAtoms, ic.atoms), parseFloat(threshold), bSaltbridge, 'graph', true );
             resid2ResidhashHbond = me.hashUtilsCls.cloneHash(ic.resid2Residhash);
         }
-        let hbondStr = this.getGraphLinks(resid2ResidhashHbond, resid2ResidhashHbond, me.htmlCls.hbondInsideColor, labelType, me.htmlCls.hbondValuehbondInsideValue);
+
+        //let hbondStr = this.getGraphLinks(resid2ResidhashHbond, resid2ResidhashHbond, me.htmlCls.hbondInsideColor, labelType, me.htmlCls.hbondValuehbondInsideValue);
+        let hbondStr = this.getGraphLinks(resid2ResidhashHbond, resid2ResidhashHbond, me.htmlCls.hbondInsideColor, labelType, me.htmlCls.hbondInsideValue);
+
         return hbondStr;
     }
     getIonicLinksForSet(atoms, labelType) { let ic = this.icn3d, me = ic.icn3dui;
@@ -44957,9 +45071,10 @@ class GetGraph {
     getGraphLinks(hash1, hash2, color, labelType, value, bCartoon2d) {var ic = this.icn3d, me = ic.icn3dui;
         let hbondStr = '';
         value =(value === undefined) ? 1 : value;
-        let prevLinkStr = '';
-        let sourceTargetHash = {};
+        //let prevLinkStr = '';
+        //let sourceTargetHash = {};
 
+        let linkstr2cnt = {};
         for(let resid1 in hash1) {
             //ASN $1KQ2.A:6@ND2
             //or ASN $1KQ2.A:6
@@ -44990,7 +45105,7 @@ class GetGraph {
                     resName1 = ic.resi2resirange[resName1];
                     resName2 = ic.resi2resirange[resName2];
                 }
-
+/*
                 if(!sourceTargetHash.hasOwnProperty(resName1 + '_' + resName2) && resName1 !== undefined && resName2 !== undefined ) {
                     let linkStr = ', {"source": "' + resName1 + '", "target": "' + resName2 + '", "v": ' + value + ', "c": "' + color + '"}';
                     if(linkStr != prevLinkStr) hbondStr += linkStr;
@@ -44999,8 +45114,29 @@ class GetGraph {
                     sourceTargetHash[resName1 + '_' + resName2] = 1;
                     sourceTargetHash[resName2 + '_' + resName1] = 1;
                 }
+*/
+
+                if(resName1 !== undefined && resName2 !== undefined ) {
+                    let linkStr = '"source": "' + resName1 + '", "target": "' + resName2 + '", "v": ' + value + ', "c": "' + color + '"';
+
+                    //prevLinkStr = linkStr;
+
+                    if(!linkstr2cnt.hasOwnProperty(linkStr)) {
+                        linkstr2cnt[linkStr] = 1;
+                        linkstr2cnt[linkStr] = 1;
+                    }
+                    else {
+                        linkstr2cnt[linkStr] += 1;
+                        linkstr2cnt[linkStr] += 1;
+                    }
+                }
             }
         }
+
+        for(let linkStr in linkstr2cnt) {
+            hbondStr += ', {' + linkStr + ', "n": ' + linkstr2cnt[linkStr] + '}';
+        }
+
         return hbondStr;
     }
     convertLabel2Resid(residLabel) {var ic = this.icn3d; ic.icn3dui;
@@ -45436,12 +45572,14 @@ class ViewInterPairs {
        let bondCnt;
 
        // reset
-       ic.hbondpnts = [];
-       ic.saltbridgepnts = [];
-       ic.contactpnts = [];
-       ic.halogenpnts = [];
-       ic.picationpnts = [];
-       ic.pistackingpnts = [];
+       if(!bHbondCalc) {
+            ic.hbondpnts = [];
+            ic.saltbridgepnts = [];
+            ic.contactpnts = [];
+            ic.halogenpnts = [];
+            ic.picationpnts = [];
+            ic.pistackingpnts = [];
+       }
 
        // type: view, save, forcegraph
        ic.bRender = false;
@@ -48603,7 +48741,7 @@ class MmcifParser {
     }
 
     async downloadMmcifSymmetry(mmcifid, type) { let ic = this.icn3d, me = ic.icn3dui;
-        // https://files.rcsb.org/header/ i snot accessible in Node.js 
+        // https://files.rcsb.org/header/ is not accessible in Node.js 
         let url = (me.bNode) ? "https://files.rcsb.org/view/" + mmcifid + ".cif" : "https://files.rcsb.org/header/" + mmcifid + ".cif";
 
         //ic.bCid = undefined;
@@ -49902,7 +50040,8 @@ class PdbParser {
         }
         else {
             url = "https://files.rcsb.org/view/" + pdbid + ".pdb";
-            ic.ParserUtilsCls.setYourNote(pdbid.toUpperCase() + '(PDB) in iCn3D');
+            pdbid = pdbid.toUpperCase();
+            ic.ParserUtilsCls.setYourNote(pdbid + '(PDB) in iCn3D');
         }
 
         //ic.bCid = undefined;
@@ -55211,6 +55350,7 @@ class LoadPDB {
         //let chainMissingResidueArray = {}
 
         let id = (pdbid) ? pdbid : ic.defaultPdbId;
+
         let structure = id;
 
         let prevMissingChain = '';

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "icn3d",
-  "version": "3.23.5",
+  "version": "3.23.6",
   "main": "./icn3d.js",
   "exports": {
     ".": {