icn3d 3.45.4 → 3.45.6

package/icn3d.module.js

@@ -55057,7 +55057,7 @@ class HashUtilsCls {
     //Get the union of two hashes "atoms1" and "atoms2". The returned hash has atom index as key and 1 as value.
     unionHash(atoms1, atoms2) { let me = this.icn3dui;
         // much slower
-        //return me.hashUtilsCls.unionHashNotInPlace(atoms1, atoms2);
+        // return me.hashUtilsCls.unionHashNotInPlace(atoms1, atoms2);
 
         // much faster
         return me.hashUtilsCls.unionHashInPlace(atoms1, atoms2);
@@ -58900,7 +58900,7 @@ class ClickMenu {
            let sigmafofc = parseFloat($("#" + me.pre + "sigmafofc" ).val());
            let type = 'fofc';
            //await ic.dsn6ParserCls.dsn6Parser(ic.inputid, type, sigmafofc);
-           await ic.densityCifParserCls.densityCifParser(ic.inputid, type, sigma2fofc);
+           await ic.densityCifParserCls.densityCifParser(ic.inputid, type, sigmafofc);
            //ic.setOptionCls.setOption('map', 'fofc');
            thisClass.setLogCmd('set map fofc sigma ' + sigmafofc, true);
         });
@@ -59316,11 +59316,13 @@ class ClickMenu {
         });
 
         me.myEventCls.onIds("#" + me.pre + "mn6_cameraPers", "click", function(e) { let ic = me.icn3d; //e.preventDefault();
+           ic.bChangeCamera = true;
            ic.setOptionCls.setOption('camera', 'perspective');
            thisClass.setLogCmd('set camera perspective', true);
         });
 
         me.myEventCls.onIds("#" + me.pre + "mn6_cameraOrth", "click", function(e) { let ic = me.icn3d; //e.preventDefault();
+           ic.bChangeCamera = true;
            ic.setOptionCls.setOption('camera', 'orthographic');
            thisClass.setLogCmd('set camera orthographic', true);
         });
@@ -60270,7 +60272,7 @@ class SetMenu {
         html += this.getLink('mn1_mmcifid', 'RCSB mmCIF ID ' + me.htmlCls.wifiStr, undefined, 2);
         //html += this.getLink('mn1_gi', 'NCBI gi ' + me.htmlCls.wifiStr, undefined, 2);
 
-        html += this.getLink('mn1_cid', 'PubChem CID/Name/InchI ' + me.htmlCls.wifiStr, 1, 2);
+        html += this.getLink('mn1_cid', 'PubChem CID/Name/InChI ' + me.htmlCls.wifiStr, 1, 2);
         html += this.getLink('mn1_smiles', 'Chemical SMILES ', undefined, 2);
         
         html += "</ul>";
@@ -60638,9 +60640,9 @@ class SetMenu {
 
         html += this.getMenuText('mn2_rotate90', 'Rotate 90&deg;', undefined, undefined, 2);
         html += "<ul>";
-        html += this.getRadio('mn6_rotate90', 'mn6_rotatex', 'rotate x', undefined, undefined, 2);
-        html += this.getRadio('mn6_rotate90', 'mn6_rotatey', 'rotate y', undefined, undefined, 2);
-        html += this.getRadio('mn6_rotate90', 'mn6_rotatez', 'rotate z', undefined, undefined, 2);
+        html += this.getRadio('mn6_rotate90', 'mn6_rotatex', 'rotate x', undefined, undefined, 3);
+        html += this.getRadio('mn6_rotate90', 'mn6_rotatey', 'rotate y', undefined, undefined, 3);
+        html += this.getRadio('mn6_rotate90', 'mn6_rotatez', 'rotate z', undefined, undefined, 3);
         html += "</ul>";
         html += "</li>";
         html += this.getMenuText('mn2_rotateauto', 'Auto Rotation', undefined, 1, 2);
@@ -62724,7 +62726,7 @@ class SetDialog {
 
         html += me.htmlCls.divStr + "dl_mmdbafid' class='" + dialogClass + "' style='max-width:600px'>";
         html += this.addNotebookTitle('dl_mmdbafid', 'Please input a list of PDB/AlphaFold IDs');
-        html += "List of PDB, MMDB, or AlphaFold UniProt structures: " + me.htmlCls.inputTextStr + "id='" + me.pre + "mmdbafid' placeholder='e.g., 1HHO,4N7N,P69905,P01942' size=30> <br><br>";
+        html += "List of PDB, MMDB, or AlphaFold UniProt structures: " + me.htmlCls.inputTextStr + "id='" + me.pre + "mmdbafid' placeholder='e.g., 1HHO,pdb_00004n7n,P69905,P01942' size=30> <br><br>";
         html += "<div style='display:inline-block; width:20px'></div>" + me.htmlCls.buttonStr + "reload_mmdbaf' style='width:150px'>Load Biological Unit</button>" + me.htmlCls.buttonStr + "reload_mmdbaf_asym' style='margin-left:30px; width:250px'>Load Asymmetric Unit (All Chains)</button>" + "<br/><br/>";
         html += "<div style='display:inline-block; width:20px'>or</div>" + me.htmlCls.buttonStr + "reload_mmdbaf_append' style='width:150px'>Append Biological Unit</button>" + me.htmlCls.buttonStr + "reload_mmdbaf_asym_append' style='margin-left:30px; width:250px'>Append Asymmetric Unit (All Chains)</button>" + "<br/><br/>";
 
@@ -62771,7 +62773,7 @@ class SetDialog {
 
         html += me.htmlCls.divStr + "dl_cid' class='" + dialogClass + "'>";
         html += this.addNotebookTitle('dl_cid', 'Please input a PubChem Compound');
-        html += "PubChem CID/Name/InchI: " + me.htmlCls.inputTextStr + "id='" + me.pre + "cid' value='2244' size=8> ";
+        html += "PubChem CID/Name/InChI: " + me.htmlCls.inputTextStr + "id='" + me.pre + "cid' value='2244' size=8> ";
         html += me.htmlCls.buttonStr + "reload_cid'>Load</button>";
         html += "</div>";
 
@@ -62801,7 +62803,6 @@ class SetDialog {
 
         html += me.htmlCls.divStr + "dl_video' class='" + dialogClass + "'>";
         html += this.addNotebookTitle('dl_video', 'Save canvas changes in a video');
-        html += "State file: " + me.htmlCls.inputFileStr + "id='" + me.pre + "state'><br/>";
         html += me.htmlCls.buttonStr + "video_start' style='margin-top: 6px;'>Video Start</button>";
         html += me.htmlCls.buttonStr + "video_end' style='margin: 6px 0px 0px 30px;'>Video End</button>";
         html += "</div>";
@@ -64335,7 +64336,7 @@ class Events {
             ic.cam.quaternion.setFromUnitVectors(new Vector3$1(0, 0, -1), new Vector3$1(directionArray[0], directionArray[1], directionArray[2]));
             ic.cam.up.set(upvectorArray[0], upvectorArray[1], upvectorArray[2]);
             ic.cam.fov = fov;
-            //ic.container.whratio = aspect;
+            // ic.container.whratio = aspect;
 
             ic.drawCls.applyTransformation(ic._zoomFactor, ic.mouseChange, ic.quaternion);
             ic.drawCls.render();
@@ -64681,7 +64682,7 @@ class Events {
         me.myEventCls.onIds(["#" + me.pre + "show_2ddgm", "#" + me.pre + "mn2_2ddgm"], "click", async function(e) { let ic = me.icn3d;
              me.htmlCls.dialogCls.openDlg('dl_2ddgm', '2D Diagram');
              await ic.viewInterPairsCls.retrieveInteractionData();
-             thisClass.setLogCmd("view interactions", true);
+             thisClass.setLogCmd("view 2d diagram", true);
         });
 
         me.myEventCls.onIds("#" + me.pre + "mn2_2ddepiction", "click", async function(e) { let ic = me.icn3d;
@@ -64919,7 +64920,7 @@ class Events {
            e.preventDefault();
            if(!me.cfg.notebook) dialog.dialog( "close" );
 
-           let alignment = $("#" + me.pre + "chainalignids").val();
+           let alignment = $("#" + me.pre + "chainalignids").val().replace(/\s/g, '');
            let alignment_final = thisClass.convertUniProtInChains(alignment);
 
            thisClass.setLogCmd("load chains " + alignment_final + " on asymmetric unit | residues | resdef ", false);
@@ -64931,7 +64932,7 @@ class Events {
             e.preventDefault();
             if(!me.cfg.notebook) dialog.dialog( "close" );
  
-            let alignment = $("#" + me.pre + "chainalignids2").val();
+            let alignment = $("#" + me.pre + "chainalignids2").val().replace(/\s/g, '');
             let alignment_final = thisClass.convertUniProtInChains(alignment);
             let resalign = $("#" + me.pre + "resalignids").val();
  
@@ -64944,7 +64945,7 @@ class Events {
             e.preventDefault();
             if(!me.cfg.notebook) dialog.dialog( "close" );
  
-            let alignment = $("#" + me.pre + "chainalignids3").val();
+            let alignment = $("#" + me.pre + "chainalignids3").val().replace(/\s/g, '');
             let alignment_final = thisClass.convertUniProtInChains(alignment);
 
             let predefinedres = $("#" + me.pre + "predefinedres").val().trim().replace(/\n/g, ': ');
@@ -64962,7 +64963,7 @@ class Events {
             e.preventDefault();
             if(!me.cfg.notebook) dialog.dialog( "close" );
  
-            let alignment = $("#" + me.pre + "chainalignids4").val();
+            let alignment = $("#" + me.pre + "chainalignids4").val().replace(/\s/g, '');
             let alignment_final = thisClass.convertUniProtInChains(alignment);
 
             let predefinedres = $("#" + me.pre + "predefinedres2").val().trim().replace(/\n/g, ': ');
@@ -64971,7 +64972,8 @@ class Events {
                 return;
             }
 
-            me.cfg.resdef = predefinedres.replace(/:/gi, ';');
+            // me.cfg.resdef = predefinedres.replace(/:/gi, ';');
+            me.cfg.resdef = predefinedres;
 
             let bRealign = true, bPredefined = true;
             let chainidArray = alignment_final.split(',');
@@ -66251,7 +66253,6 @@ class Events {
         });
         me.myEventCls.onIds("#" + me.pre + "applypick_aroundsphere", "click", function(e) { let ic = me.icn3d;
             //e.preventDefault();
-            
             let radius = parseFloat($("#" + me.pre + "radius_aroundsphere").val());
             let nameArray = $("#" + me.pre + "atomsCustomSphere").val();
             let nameArray2 = $("#" + me.pre + "atomsCustomSphere2").val();
@@ -75055,8 +75056,13 @@ class Scene {
 
         ic.fogCls.setFog();
 
-        if(ic.bSetCamera) { // load a URL with trackball transformation, or no info after "|||"
+        if(!ic.cam || ic.bChangeCamera) {
             ic.cameraCls.setCamera();
+            // set the ratio for view point, which was set in ic.transformCls.resetOrientation_base
+            if(!ic.container.whratio) {
+                ic.container.whratio = me.htmlCls.WIDTH / me.htmlCls.HEIGHT; 
+                ic.cam.aspect = ic.container.whratio;
+            }
         }
 
         if(ic.opts['slab'] === 'yes') ic.cameraCls.setSlab();
@@ -79512,8 +79518,8 @@ class Tube {
                                 }
                             }
 
-                            // add one more residue if only one residue is available
-                            if(pnts.length == 1 && ic.residues.hasOwnProperty(nextoneResid)) {
+                            // add one more residue if only one residue is available and it's not part of helix/sheet
+                            if(pnts.length == 1 && ic.residues.hasOwnProperty(nextoneResid) && atom.ss == 'coil') {
                                 let nextAtom = ic.firstAtomObjCls.getAtomFromResi(nextoneResid, atomName);
 
                                 if(nextAtom) {
@@ -84293,8 +84299,10 @@ class ApplyCenter {
 
         //ic.container.widthInv  = 1 / (ic.scaleFactor*width);
         //ic.container.heightInv = 1 / (ic.scaleFactor*height);
-
-        ic.container.whratio = width / height;
+        if(ic.cam) {
+            ic.container.whratio = width / height;
+            ic.cam.aspect = ic.container.whratio;
+        }
     }
 }
 
@@ -87258,7 +87266,7 @@ class Alternate {
             }
             
             ic.bShowHighlight = false;
-//            ic.opts['rotationcenter'] = 'highlight center';
+            ic.opts['rotationcenter'] = 'highlight center';
         }
 
         // also alternating the surfaces
@@ -87366,7 +87374,6 @@ class Alternate {
           this.applyTransformation(ic._zoomFactor, ic.mouseChange, ic.quaternion);
           this.render(bVrAr);
         }
-
         //ic.impostorCls.clearImpostors();
 
         // show membranes
@@ -93629,7 +93636,8 @@ class AnnoSnpClinVar {
 
           let snpResn = snpStr.substr(posSymbol - 1, 1);
           let atom = ic.firstAtomObjCls.getFirstAtomObj(ic.residues[chnid + '_' + realResi]);
-          let oneLetterRes = (atom) ? me.utilsCls.residueName2Abbr(atom.resn.substr(0, 3)) : '';
+        //   let oneLetterRes = (atom) ? me.utilsCls.residueName2Abbr(atom.resn.substr(0, 3)) : ''; // !!!
+          let oneLetterRes = (atom) ? me.utilsCls.residueName2Abbr(atom.resn) : '';
           if(!bFromClinVarDb && ic.chainsSeq[chnid][resi - 1]) {
             oneLetterRes = ic.chainsSeq[chnid][resi - 1].name;
           }
@@ -97759,7 +97767,8 @@ class Annotation {
             
             let atom = ic.firstAtomObjCls.getFirstCalphaAtomObj(ic.chains[chainid]);
             if(atom && atom.resn !== undefined) {
-                let oneLetterRes = me.utilsCls.residueName2Abbr(atom.resn.substr(0, 3));
+                // let oneLetterRes = me.utilsCls.residueName2Abbr(atom.resn.substr(0, 3));
+                let oneLetterRes = me.utilsCls.residueName2Abbr(atom.resn);
                 $("#" + ic.pre + "anno_" + oneLetterRes).show();
             }
         }
@@ -101963,23 +101972,27 @@ class ShowInter {
             ic.hAtoms[i] = 1;
           }
         }
+
         // do not change the set of displaying atoms
         //ic.dAtoms = me.hashUtilsCls.cloneHash(ic.atoms);
         let commandname, commanddesc, commandname2;
         let firstAtom = ic.firstAtomObjCls.getFirstAtomObj(atomlistTarget);
 
         if(firstAtom !== undefined) {
-            commandname = "sphere." + firstAtom.chain + ":" + me.utilsCls.residueName2Abbr(firstAtom.resn.substr(0, 3)).trim() + firstAtom.resi + "-" + radius + "A";
+            // commandname = "sphere." + firstAtom.chain + ":" + me.utilsCls.residueName2Abbr(firstAtom.resn.substr(0, 3)).trim() + firstAtom.resi + "-" + radius + "A";
+            commandname = "sphere." + firstAtom.chain + ":" + me.utilsCls.residueName2Abbr(firstAtom.resn).trim() + firstAtom.resi + "-" + radius + "A";
             //sometimes firstAtom.resi changed, thus we add a general name
             commandname2 = "sphere-" + radius + "A";
             if(bInteraction) {
-                commandname = "interactions." + firstAtom.chain + ":" + me.utilsCls.residueName2Abbr(firstAtom.resn.substr(0, 3)).trim() + firstAtom.resi + "-" + $("#" + ic.pre + "contactthreshold").val() + "A";
+                // commandname = "interactions." + firstAtom.chain + ":" + me.utilsCls.residueName2Abbr(firstAtom.resn.substr(0, 3)).trim() + firstAtom.resi + "-" + $("#" + ic.pre + "contactthreshold").val() + "A";
+                commandname = "interactions." + firstAtom.chain + ":" + me.utilsCls.residueName2Abbr(firstAtom.resn).trim() + firstAtom.resi + "-" + $("#" + ic.pre + "contactthreshold").val() + "A";
                 commandname2 = "interactions-" + $("#" + ic.pre + "contactthreshold").val() + "A";
             }
             commanddesc = commandname;
             ic.selectionCls.addCustomSelection(residueArray, commandname, commanddesc, select, true);
             ic.selectionCls.addCustomSelection(residueArray, commandname2, commanddesc, select, true);
         }
+
         ic.selectionCls.saveSelectionIfSelected();
         ic.drawCls.draw();
     }
@@ -102229,8 +102242,10 @@ class ViewInterPairs {
                     let commandname, commanddesc;
                     let firstAtom = ic.firstAtomObjCls.getFirstAtomObj(residues);
                     if(firstAtom !== undefined) {
-                        commandname = "sphere." + firstAtom.chain + ":" + me.utilsCls.residueName2Abbr(firstAtom.resn.substr(0, 3)).trim() + firstAtom.resi + "-" + radius + "A";
-                        if(bInteraction) commandname = "interactions." + firstAtom.chain + ":" + me.utilsCls.residueName2Abbr(firstAtom.resn.substr(0, 3)).trim() + firstAtom.resi + "-" + $("#" + ic.pre + "contactthreshold").val() + "A";
+                        // commandname = "sphere." + firstAtom.chain + ":" + me.utilsCls.residueName2Abbr(firstAtom.resn.substr(0, 3)).trim() + firstAtom.resi + "-" + radius + "A";
+                        commandname = "sphere." + firstAtom.chain + ":" + me.utilsCls.residueName2Abbr(firstAtom.resn).trim() + firstAtom.resi + "-" + radius + "A";
+                        // if(bInteraction) commandname = "interactions." + firstAtom.chain + ":" + me.utilsCls.residueName2Abbr(firstAtom.resn.substr(0, 3)).trim() + firstAtom.resi + "-" + $("#" + ic.pre + "contactthreshold").val() + "A";
+                        if(bInteraction) commandname = "interactions." + firstAtom.chain + ":" + me.utilsCls.residueName2Abbr(firstAtom.resn).trim() + firstAtom.resi + "-" + $("#" + ic.pre + "contactthreshold").val() + "A";
                         commanddesc = commandname;
                         ic.selectionCls.addCustomSelection(residueArray, commandname, commanddesc, select, true);
                     }
@@ -102241,6 +102256,7 @@ class ViewInterPairs {
                 tableHtml += this.exportSpherePairs(true, type, labelType);
            } // same set
        }
+
        ic.hAtoms = me.hashUtilsCls.cloneHash(hAtoms);
        ic.bRender = true;
        //ic.hlUpdateCls.updateHlAll();
@@ -104205,7 +104221,6 @@ class ChainalignParser {
         for(let i = 0, il = dataArray.length; i < il; ++i) {
             let mmdbid_q = struArray[i];
             let index = indexArray[i];
-
             this.transformStructure(mmdbid_q, index, 'query');
         }
 
@@ -104436,7 +104451,8 @@ class ChainalignParser {
 
     transformStructure(mmdbid, index, alignType, bForce) { let ic = this.icn3d, me = ic.icn3dui;
         let chainidArray = ic.structures[mmdbid];
-        
+        if(!chainidArray) return;
+
         for(let i = 0, il = chainidArray.length; i < il; ++i) {
             for(let serial in ic.chains[chainidArray[i]]) {
                 let atm = ic.atoms[serial];
@@ -104571,6 +104587,8 @@ class ChainalignParser {
     addPostfixForStructureids(structArray) { let ic = this.icn3d; ic.icn3dui;
         let struct2cnt = {};
         for(let i = 0, il = structArray.length; i < il; ++i) {
+            if(structArray[i].toLowerCase().toLowerCase().substr(0,8) == 'pdb_0000') structArray[i] = structArray[i].substr(8); // temperary support long PDB ID such as pdb_00001tup
+
             let struct = structArray[i].toUpperCase(); 
 
             if(!struct2cnt.hasOwnProperty(struct)) {
@@ -104955,6 +104973,8 @@ class ChainalignParser {
         }
         else {
             for(let i = 0, il = structArrayTmp.length; i < il; ++i) {
+                if(structArrayTmp[i].toLowerCase().substr(0,8) == 'pdb_0000') structArrayTmp[i] = structArrayTmp[i].substr(8); // temperary support long PDB ID such as pdb_00001tup
+
                 let id = structArrayTmp[i].toUpperCase();
                 if(!ic.structures.hasOwnProperty(id)) structArray.push(structArrayTmp[i]);
             }
@@ -105048,7 +105068,7 @@ class ChainalignParser {
                 targetOrQuery = 'query';
                 bAppend = true; 
             }
-
+console.log("### i " + i + " structArray[i] " + structArray[i]);
             //if(structArray[i].length > 4) {
             if(isNaN(structArray[i]) && structArray[i].length > 5) {  // PDB ID plus postfix could be 5 
                 //let bNoDssp = true;
@@ -105066,8 +105086,8 @@ class ChainalignParser {
             // hAtoms = me.hashUtilsCls.unionHash(hAtoms, hAtomsTmp);
         }
 
-        let structArrayAll = Object.keys(ic.structures);
-
+        let structArrayAll = structArray; //Object.keys(ic.structures);
+console.log("### ic.chains: " + JSON.stringify(ic.chains) + " ic.structures " + JSON.stringify(ic.structures));
         ic.opts['color'] = (structArrayAll.length > 1) ? 'structure' : ((structArrayAll[0].length > 5) ? 'confidence' : 'chain');
 
         // add color for all structures
@@ -106823,7 +106843,6 @@ class MmdbParser {
 
             hAtoms = ic.loadAtomDataCls.loadAtomDataIn(data, pdbid, 'mmdbid', undefined, type, chainid, chainIndex, bLastQuery, bNoTransformNoSeqalign);
         }
-
         // show ligand-protein interaction
         if(me.cfg.ligand) { // sid123059722
             for(let chainid in ic.chainid2sid) {
@@ -106895,7 +106914,6 @@ class MmdbParser {
                 }
             } // for each domainArray
         } // for each molid
-
         // "asuAtomCount" is defined when: 1) atom count is over the threshold 2) bu=1 3) asu atom count is smaller than biological unit atom count
         ic.bAssemblyUseAsu =(data.asuAtomCount !== undefined) ? true : false;
         if(type !== undefined) {
@@ -107029,7 +107047,6 @@ class MmdbParser {
         //ic.molid2color = molid2color;
         //ic.chain2molid = chain2molid;
         ic.molid2chain = molid2chain;
-
         // small structure with all atoms
         // show surface options
         $("#" + ic.pre + "accordion5").show();
@@ -109267,7 +109284,8 @@ class RealignParser {
                     ic.realignResid[chainid] = [];
                 }
 
-                ic.realignResid[chainid].push({'resid': chainid + '_' + atom.resi, 'resn': me.utilsCls.residueName2Abbr(atom.resn.substr(0, 3)).substr(0, 1)});
+                // ic.realignResid[chainid].push({'resid': chainid + '_' + atom.resi, 'resn': me.utilsCls.residueName2Abbr(atom.resn.substr(0, 3)).substr(0, 1)});
+                 ic.realignResid[chainid].push({'resid': chainid + '_' + atom.resi, 'resn': me.utilsCls.residueName2Abbr(atom.resn).substr(0, 1)});
 
                 struct2chain[atom.structure] = atom.structure + '_' + atom.chain;
 
@@ -109691,7 +109709,9 @@ let resRangeArray = (me.cfg.resrange) ? decodeURIComponent(me.cfg.resrange).spli
                             let alignAjax;
                             if(me.cfg.aligntool != 'tmalign') {
                                 let jsonStr_q = ic.domain3dCls.getDomainJsonForAlign(struct2domain[struct2][chainid2]);
-            
+console.log("@@@ realign " + struct1 + " " + chainid1 + " and " + struct2 + " " + chainid2);
+console.log("@@@ jsonStr_q " + jsonStr_q);
+console.log("@@@ jsonStr_t " + jsonStr_t);            
                                 let dataObj = {'domains1': jsonStr_q, 'domains2': jsonStr_t};
                                 alignAjax = me.getAjaxPostPromise(urlalign, dataObj);
                             }
@@ -109825,8 +109845,9 @@ let resRangeArray = (me.cfg.resrange) ? decodeURIComponent(me.cfg.resrange).spli
         let predefinedResArray, predefinedResPair;
 
         if(bPredefined) {
-            // predefinedResArray = decodeURIComponent(me.cfg.resdef).trim().replace(/\+/gi, ' ').split(': ');
-            predefinedResArray = decodeURIComponent(me.cfg.resdef).trim().replace(/\+/gi, ' ').split('; ');
+            me.cfg.resdef.replace(/; /gi, ': ');
+            predefinedResArray = decodeURIComponent(me.cfg.resdef).trim().replace(/\+/gi, ' ').split(': ');
+            // predefinedResArray = decodeURIComponent(me.cfg.resdef).trim().replace(/\+/gi, ' ').split('; ');
             
             if(predefinedResArray.length != chainidArray.length - 1) {
                var aaa = 1; //alert("Please make sure the number of chains and the lines of predefined residues are the same...");
@@ -112271,7 +112292,8 @@ class LoadAtomData {
                 atm.coord = new Vector3$1(atm.coord.x, atm.coord.y, atm.coord.z);
             }
 
-            let oneLetterRes = me.utilsCls.residueName2Abbr(atm.resn.substr(0, 3));
+            // let oneLetterRes = me.utilsCls.residueName2Abbr(atm.resn.substr(0, 3));
+            let oneLetterRes = me.utilsCls.residueName2Abbr(atm.resn);
 
             if((type === 'mmdbid' || type === 'align') && ic.bFullUi ) {
                 // set ic.mmdbMolidResid2mmdbChainResi
@@ -112398,7 +112420,6 @@ class LoadAtomData {
             let residueid = chainid + '_' + atm.resi;
             if(ic.residues[residueid] === undefined) ic.residues[residueid] = {};
             ic.residues[residueid][serial] = 1;
-
             residueNum = chainNum + '_' + atm.resi;
 
             // different residue
@@ -112567,7 +112588,6 @@ class LoadAtomData {
         }
         // remove the reference
         data.atoms = {};
-
         //ic.cnt =(alignType === undefined || alignType === 'target') ? serial : serial - ic.lastTargetSerial;
         ic.cnt = serial;
 
@@ -113244,7 +113264,7 @@ class SetSeqAlign {
                       }
                   }
               }
-            
+
               for(let j = 0; j <= end1 - start1; ++j) {
                   ///if(ic.chainsSeq[chainid1] === undefined || ic.chainsSeq[chainid2] === undefined) break;
 
@@ -113357,11 +113377,15 @@ class SetSeqAlign {
             for(let i = 0, il = ic.qt_start_end[chainIndex].length; i < il; ++i) {
                 let start1, end1;
                 
-                // start1 = parseInt(ic.qt_start_end[chainIndex][i].t_start) - 1;
-                // end1 = parseInt(ic.qt_start_end[chainIndex][i].t_end) - 1;
-
-                start1 = ic.ParserUtilsCls.getResiNCBI(chainid1, ic.qt_start_end[chainIndex][i].t_start) - 1;
-                end1 = ic.ParserUtilsCls.getResiNCBI(chainid1, ic.qt_start_end[chainIndex][i].t_end) - 1;
+                //ic.qt_start_end is zero-based
+                if(!bRealign && me.cfg.aligntool != 'tmalign') { // vast alignment
+                    start1 = parseInt(ic.qt_start_end[chainIndex][i].t_start) - 1;
+                    end1 = parseInt(ic.qt_start_end[chainIndex][i].t_end) - 1;
+                }
+                else {
+                    start1 = ic.ParserUtilsCls.getResiNCBI(chainid1, ic.qt_start_end[chainIndex][i].t_start) - 1;
+                    end1 = ic.ParserUtilsCls.getResiNCBI(chainid1, ic.qt_start_end[chainIndex][i].t_end) - 1;
+                }
 
                 for(let j = start1; j <= end1; ++j) {
                     let resi, resid;
@@ -113454,7 +113478,6 @@ class SetSeqAlign {
             resObject.color2 = (resid2range_t[resid]) ? '#FF0000' : me.htmlCls.GREYC; // color by conservation
             // resObject.class = (resid2range_t[resid]) ? 'icn3d-align' : 'icn3d-nalign';
             resObject.class = (resid2range_t[resid]) ? 'icn3d-cons' : 'icn3d-nalign';
-    
             ic.alnChainsSeq[chainid1].push(resObject);
 
             if(resid2range_t[resid]) {
@@ -113613,6 +113636,7 @@ class SetSeqAlign {
         for(let j = 0, jl = alignedChainIndice.length - 1; j < jl; ++j) {
             let chainidTmp = chainidArray[alignedChainIndice[j]];
             let gapResObject = this.getResObject(chainidTmp, true);
+            
             //for(let k = 0, kl = len - nGap; k < kl; ++k) {
             for(let k = 0, kl = len; k < kl; ++k) {
                 ic.alnChainsSeq[chainidTmp].splice(pos_t, 0, gapResObject);
@@ -113622,12 +113646,12 @@ class SetSeqAlign {
         //return len - nGap;
     }
 
-    insertNotAlignRes(chainid, start, len, bRealign) { let ic = this.icn3d; ic.icn3dui;
+    insertNotAlignRes(chainid, start, len, bRealign) { let ic = this.icn3d, me = ic.icn3dui;
         // insert non-aligned residues in query seq
         for(let j = 0, jl = len; j < jl; ++j) {
             // let resi2 = ic.ParserUtilsCls.getResi(chainid, start + j);
             // let resn2 = this.getResn(chainid, start + j);
-            let resi2 = start + j;
+            let resi2 = (bRealign && me.cfg.aligntool == 'tmalign') ? start + j : ic.ParserUtilsCls.getResi(chainid, start + j);
             let resn2 = this.getResnFromResi(chainid, resi2);
             let resn1 = '-';
             let bAlign = false;
@@ -113636,16 +113660,21 @@ class SetSeqAlign {
         }
     }
 
-    getTemplatePosFromOriResi(chainid1, start, end, bRealign) { let ic = this.icn3d; ic.icn3dui;
+    getTemplatePosFromOriResi(chainid1, start, end, bRealign) { let ic = this.icn3d, me = ic.icn3dui;
         // let startResi = ic.ParserUtilsCls.getResi(chainid1, start);
         // let endResi = ic.ParserUtilsCls.getResi(chainid1, end);
-        let startResi = start;
-        let endResi = end;
+        if(bRealign && me.cfg.aligntool == 'tmalign') { // vast alignment
+            let startResi = start;
+            let endResi = end;
 
-        let result1 = this.getResiPosInTemplate(chainid1, startResi);
-        let result2 = this.getResiPosInTemplate(chainid1, endResi);
- 
-        return {"pos1": result1.pos, "pos2": result2.pos};
+            let result1 = this.getResiPosInTemplate(chainid1, startResi);
+            let result2 = this.getResiPosInTemplate(chainid1, endResi);
+    
+            return {"pos1": result1.pos, "pos2": result2.pos};
+        }
+        else {
+            return {"pos1": start, "pos2": end};
+        }
     }
 
     mergeTwoSeqForAll(chainidArray, index, alignedChainIndice, resid2range_t, start_t, end_t, bRealign) { let ic = this.icn3d, me = ic.icn3dui;
@@ -113708,6 +113737,9 @@ class SetSeqAlign {
 
         let result;
 
+        let nGapInTemplate = 0; // number of gaps inserted into the template sequence
+        let startPosInTemplate = 0; // position in the template sequence to start the mapping
+
         for(let i = 0, il = ic.qt_start_end[chainIndex].length; i < il; ++i) {
             let start1, start2, end1, end2, resiStart1, start1Pos;
             
@@ -113741,6 +113773,8 @@ class SetSeqAlign {
 
             // if the mapping does not start from start_t, add gaps to the query seq
             if(i == 0) {
+                startPosInTemplate = start1Pos;
+
                 //result = this.getTemplatePosFromOriResi(chainid1, start_t, start1, bRealign);
                 result = this.getTemplatePosFromOriResi(chainid1, start_t, start1Pos, bRealign);
                 pos1 = result.pos1;
@@ -113763,7 +113797,6 @@ class SetSeqAlign {
 
                 // insert non-aligned residues in query seq
                 this.insertNotAlignRes(chainid2, prevIndex2+1, notAlnLen2, bRealign);
-
                 if(notAlnLen1 >= notAlnLen2) {
                     // add gaps before the query sequence
                     for(let j = 0, jl = notAlnLen1 - notAlnLen2; j < jl; ++j) {
@@ -113773,6 +113806,7 @@ class SetSeqAlign {
                 else {
                     // check the number of gaps before resiStart1 (n), and insert 'notAlnLen2 - notAlnLen1 - n' gaps
                     this.addGapAllAlnChains(chainidArray, alignedChainIndice, chainid1, resiStart1, notAlnLen2 - notAlnLen1);
+                    nGapInTemplate += (notAlnLen2 - notAlnLen1);
                 }                           
             }
 
@@ -113781,18 +113815,19 @@ class SetSeqAlign {
             //result = this.getTemplatePosFromOriResi(chainid1, start1Pos, end1Pos, bRealign);
             pos1 = result.pos1;
             pos2 = result.pos2;
-            
+
             let k = 0;    
             if(!ic.chainsMapping[chainid1]) ic.chainsMapping[chainid1] = {};
             if(!ic.chainsMapping[chainid2]) ic.chainsMapping[chainid2] = {};
+            let resiAdjust = (bRealign && me.cfg.aligntool == 'tmalign') ? 0 : - startPosInTemplate + nGapInTemplate; 
             for(let j = pos1; j <= pos2; ++j) {
                 // inherit the gaps from the template
-                if(ic.alnChainsSeq[chainid1][j].resn == '-') {
+                if(ic.alnChainsSeq[chainid1][j + resiAdjust].resn == '-') {
                     ic.alnChainsSeq[chainid2].push(gapResObject2);
                 }
                 else {                   
-                    let resi1 = (bRealign) ? start1 + k : ic.ParserUtilsCls.getResi(chainid1, start1 + k);
-                    let resi2 = (bRealign) ? start2 + k : ic.ParserUtilsCls.getResi(chainid2, start2 + k);
+                    let resi1 = (bRealign && me.cfg.aligntool == 'tmalign') ? start1 + k : ic.ParserUtilsCls.getResi(chainid1, start1 + k);
+                    let resi2 = (bRealign && me.cfg.aligntool == 'tmalign') ? start2 + k : ic.ParserUtilsCls.getResi(chainid2, start2 + k);
                     let resn1 = this.getResnFromResi(chainid1, resi1); //this.getResn(chainid1, start1 + k);
                     let resn2 = this.getResnFromResi(chainid2, resi2); //this.getResn(chainid2, start2 + k);
 
@@ -113800,7 +113835,7 @@ class SetSeqAlign {
                     let resObject = this.getResObject(chainid2, false, bAlign, resi2, resn2, resn1);
                     ic.alnChainsSeq[chainid2].push(resObject);
                     // update color in the template
-                    ic.alnChainsSeq[chainid1][j].color = resObject.color;
+                    ic.alnChainsSeq[chainid1][j + resiAdjust].color = resObject.color;
 
                     ic.chainsMapping[chainid1][chainid1 + '_' + resi1] = resn1 + resi1;
                     ic.chainsMapping[chainid2][chainid2 + '_' + resi2] = resn1 + resi1;  
@@ -115140,7 +115175,8 @@ class LoadPDB {
                   || (ic.nucleotides.hasOwnProperty(serialArray[i]) && (atom.name == "O3'" || atom.name == "O3*")) ) {
                     if(atom.resi == lastResi) continue; // e.g., Alt A and B
 
-                    let resn = (atom.resn.trim().length > 3) ? atom.resn.trim().substr(0, 3) : atom.resn.trim();
+                    // let resn = (atom.resn.trim().length > 3) ? atom.resn.trim().substr(0, 3) : atom.resn.trim();
+                    let resn = atom.resn.trim();
                     if(!me.parasCls.chargeColors.hasOwnProperty(resn)) {
                         continue; // regular residues
                     }
@@ -116916,7 +116952,7 @@ class ApplyCommand {
          ic.selectionCls.selectAll();
          //ic.hlObjectsCls.addHlObjects();
       }
-      else if(command == 'show all') {
+      else if(command == 'show all' || command == 'view all') {
          ic.selectionCls.showAll();
       }
       else if(command == 'select complement') {
@@ -117296,7 +117332,7 @@ class ApplyCommand {
         ic.applyCenterCls.centerSelection();
         ic.drawCls.draw();
       }
-      else if(command == 'show selection') {
+      else if(command == 'show selection' || command == 'view selection') {
         ic.selectionCls.showSelection();
       }
       else if(command == 'hide selection') {
@@ -117339,12 +117375,12 @@ class ApplyCommand {
       else if(command == 'delete selected sets') {
          ic.definedSetsCls.deleteSelectedSets();
       }
-      else if(command == 'view interactions') {
+      else if(command == 'view interactions' || command == 'view 2d diagram') {
          if(me.cfg.mmdbid !== undefined || me.cfg.gi !== undefined) {
              ic.ParserUtilsCls.set2DDiagrams(ic.inputid);
          }
       }
-      else if(command == 'show annotations all chains') {
+      else if(command == 'show annotations all chains' || command == 'view annotations all chains') {
          ic.annotationCls.showAnnoAllChains();
       }
 
@@ -117406,7 +117442,7 @@ class ApplyCommand {
       else if(command == 'clear symd symmetry') {
          ic.symdArray = [];
       }
-      else if(command == 'show axis') {
+      else if(command == 'show axis' || command == 'view axis') {
          ic.bAxisOnly = true;
       }
 
@@ -117854,7 +117890,7 @@ class ApplyCommand {
         }
       }
       else if(commandOri.indexOf('display interaction 3d') == 0
-          || commandOri.indexOf('view interaction pairs') == 0
+          || commandOri.indexOf('view interaction pairs') == 0 || commandOri.indexOf('show interaction pairs') == 0
           || commandOri.indexOf('save1 interaction pairs') == 0
           || commandOri.indexOf('save2 interaction pairs') == 0
           || commandOri.indexOf('line graph interaction pairs') == 0
@@ -117862,20 +117898,23 @@ class ApplyCommand {
           || commandOri.indexOf('ligplot interaction pairs') == 0
           ) {
         let paraArray = commandOri.split(' | ');
-        if(paraArray.length >= 3) {
+        if(paraArray.length >= 2) {
             let setNameArray = paraArray[1].split(' ');
 
             if(setNameArray.length == 2) {
                 let nameArray2 = setNameArray[0].split(',');
                 let nameArray = setNameArray[1].split(',');
 
-                let bHbond = paraArray[2].indexOf('hbonds') !== -1;
-                let bSaltbridge = paraArray[2].indexOf('salt bridge') !== -1;
-                let bInteraction = paraArray[2].indexOf('interactions') !== -1;
+                let bHbond = 1, bSaltbridge = 1, bInteraction = 1, bHalogen = 1, bPication = 1, bPistacking = 1;
+                if(paraArray.length >= 3) {
+                    bHbond = paraArray[2].indexOf('hbonds') !== -1;
+                    bSaltbridge = paraArray[2].indexOf('salt bridge') !== -1;
+                    bInteraction = paraArray[2].indexOf('interactions') !== -1;
 
-                let bHalogen = paraArray[2].indexOf('halogen') !== -1;
-                let bPication = paraArray[2].indexOf('pi-cation') !== -1;
-                let bPistacking = paraArray[2].indexOf('pi-stacking') !== -1;
+                    bHalogen = paraArray[2].indexOf('halogen') !== -1;
+                    bPication = paraArray[2].indexOf('pi-cation') !== -1;
+                    bPistacking = paraArray[2].indexOf('pi-stacking') !== -1;
+                }
 
                 let bHbondCalc;
                 if(paraArray.length >= 4) {
@@ -117902,7 +117941,7 @@ class ApplyCommand {
                 if(commandOri.indexOf('display interaction 3d') == 0) {
                     type = '3d';
                 }
-                else if(commandOri.indexOf('view interaction pairs') == 0) {
+                else if(commandOri.indexOf('view interaction pairs') == 0 || commandOri.indexOf('show interaction pairs') == 0) {
                     type = 'view';
                 }
                 else if(commandOri.indexOf('save1 interaction pairs') == 0) {
@@ -118262,7 +118301,7 @@ class ApplyCommand {
         let dataStr = paraArray[1].replace(/\\n/g, '\n');
         await ic.refnumCls.parseCustomRefFile(dataStr);
       }
-      else if(command.indexOf('show ref number') == 0) {
+      else if(command.indexOf('show ref number') == 0 || command.indexOf('view ref number') == 0) {
         ic.bShownRefnum = true;
       }
       else if(command.indexOf('hide ref number') == 0) {
@@ -118518,7 +118557,7 @@ class ApplyCommand {
         else if(cmd.indexOf('set annotation clinvar') == 0) return seqAnnoStr + ': "ClinVar" checkbox';
         else if(cmd.indexOf('set annotation snp') == 0) return seqAnnoStr + ': "SNP" checkbox';
         else if(cmd.indexOf('set annotation 3ddomain') == 0) return seqAnnoStr + ': "3D Domains" checkbox';
-        else if(cmd.indexOf('view interactions') == 0) return 'Windows > View 2D Diagram';
+        else if(cmd.indexOf('view interactions') == 0 || cmd.indexOf('view 2d diagram') == 0) return 'Windows > View 2D Diagram';
         else if(cmd.indexOf('symmetry') == 0) return 'Analysis > Symmetry';
         else if(cmd.indexOf('realign on seq align') == 0) return 'File > Realign Selection > on Sequence Alignment';
         else if(cmd.indexOf('realign') == 0) return 'File > Realign Selection > Residue by Residue';
@@ -118610,7 +118649,7 @@ class ApplyCommand {
         else if(cmd == 'clear all') return 'Select > Clear Selection';
         else if(cmd == 'defined sets') return 'Windows > Defined Sets';
         else if(cmd == 'delete selected sets') return 'Windows > Defined Sets: "Delete Selected Sets" button';
-        else if(cmd == 'view interactions') return 'Windows > View Interactions';
+        else if(cmd == 'view interactions' || cmd == 'view 2d diagram') return 'Windows > View Interactions';
         else if(cmd == 'show annotations all chains') return seqAnnoStr + ': "Show All Chains" button';
         else if(cmd == 'save color') return 'Color > Save Color';
         else if(cmd == 'apply saved color') return 'Color > Apply Saved Color';
@@ -118800,12 +118839,10 @@ class DefinedSets {
     //Set the menu of defined sets with an array of defined names "commandnameArray".
     setAtomMenu(commandnameArray) { let ic = this.icn3d; ic.icn3dui;
       let html = "";
-
       let nameArray1 =(ic.defNames2Residues !== undefined) ? Object.keys(ic.defNames2Residues) : [];
       let nameArray2 =(ic.defNames2Atoms !== undefined) ? Object.keys(ic.defNames2Atoms) : [];
 
       let nameArrayTmp = nameArray1.concat(nameArray2).sort();
-
       let nameArray = [];
         //  $.each(nameArrayTmp, function(i, el){
         //       if($.inArray(el, nameArray) === -1) nameArray.push(el);
@@ -118823,7 +118860,6 @@ class DefinedSets {
         //         }
         //     });
         // });
-
       //for(let i in ic.defNames2Atoms) {
       for(let i = 0, il = nameArray.length; i < il; ++i) {
           let name = nameArray[i];
@@ -118854,7 +118890,6 @@ class DefinedSets {
             html += "<option value='" + name + "' style='color:#" + color + "'>" + name + "</option>";
           }
       }
-
       return html;
     }
 
@@ -118879,17 +118914,18 @@ class DefinedSets {
             }
             else { // chemicals, etc
               let resid = atom.structure + '_' + atom.chain + '_' + atom.resi;
-              let resn = atom.resn.substr(0, 3);
+            //   let resn = atom.resn.substr(0, 3);
+              let resn = atom.resn;
 
               if(!nonProtNuclResHash[resn]) {
-                nonProtNuclResHash[resn] = ic.residues[resid];
+                nonProtNuclResHash[resn] = me.hashUtilsCls.cloneHash(ic.residues[resid]);
               }
               else {
                 nonProtNuclResHash[resn] = me.hashUtilsCls.unionHash(nonProtNuclResHash[atom.resn], ic.residues[resid]);
               }
             }
         }
-
+        
         // chemicals etc
         for(let resn in nonProtNuclResHash) {
             ic.defNames2Residues[resn] = Object.keys(ic.firstAtomObjCls.getResiduesFromAtoms(nonProtNuclResHash[resn]));
@@ -118897,7 +118933,7 @@ class DefinedSets {
 
             ic.defNames2Command[resn] = 'select :3' + resn;
         }
-
+        
         // select whole structure
         if(ic.structures && Object.keys(ic.structures) == 1) {
           let structure = Object.keys(ic.structures)[0];
@@ -118990,10 +119026,8 @@ class DefinedSets {
 
         if(ic.bSetChainsAdvancedMenu === undefined || !ic.bSetChainsAdvancedMenu || ic.bResetSets) {
            this.setPredefinedInMenu();
-
            ic.bSetChainsAdvancedMenu = true;
         }
-
         ic.hAtoms = me.hashUtilsCls.cloneHash(prevHAtoms);
         ic.dAtoms = me.hashUtilsCls.cloneHash(prevDAtoms);
 
@@ -119886,7 +119920,7 @@ class LoadScript {
 
             await ic.annotationCls.setAnnoTabAll();
           }
-          else if(command.indexOf('view interactions') == 0 && me.cfg.align !== undefined) { // the command may have "|||{"factor"...
+          else if((command.indexOf('view interactions') == 0 || command.indexOf('view 2d diagram') == 0) && me.cfg.align !== undefined) { // the command may have "|||{"factor"...
               await thisClass.applyCommandViewinteraction(strArray[0].trim());
           }
           else if(command.indexOf('view 2d depiction') == 0) { // the command may have "|||{"factor"...
@@ -120097,7 +120131,7 @@ class LoadScript {
                         thisClass.applyCommand3ddomain(lastCommand);
                         await ic.annotationCls.setAnnoTabAll();
                     }
-                    else if(lastCommand.indexOf('view interactions') == 0 && me.cfg.align !== undefined) {
+                    else if((lastCommand.indexOf('view interactions') == 0 || lastCommand.indexOf('view 2d diagram') == 0) && me.cfg.align !== undefined) {
                         await thisClass.applyCommandViewinteraction(lastCommand);
                     }
                     else if(lastCommand.indexOf('view 2d depiction') == 0) {
@@ -120558,7 +120592,7 @@ class LoadScript {
 
         if(commandTransformation.length == 2 && commandTransformation[1].substr(0,1) == '{') ic.bTransformation = true;
 
-        ic.transformCls.resetOrientation_base(commandTransformation);
+        // ic.transformCls.resetOrientation_base(commandTransformation);
 
         ic.selectionCls.oneStructurePerWindow();
 
@@ -120624,8 +120658,12 @@ class LoadScript {
           $("#ncbi_logo").hide();
         }
 
+        ic.transformCls.resetOrientation_base(commandTransformation);
+
         // an extra render to remove artifacts in transparent surface
-        if(ic.bTransparentSurface && ic.bRender) ic.drawCls.render();
+        // if(ic.bTransparentSurface && ic.bRender) ic.drawCls.render();
+        ic.drawCls.applyTransformation(ic._zoomFactor, ic.mouseChange, ic.quaternion);
+        ic.drawCls.render();
 
         if(me.cfg.imageonly) ic.saveFileCls.saveFile(undefined, 'png', undefined, true);
 
@@ -122646,14 +122684,22 @@ class Delphi {
           let paraArray = command.split(" | ");
 
           let typeArray = paraArray[0].split(" ");
-          let contourArray = paraArray[1].split(" ");
-          let gsizeArray = paraArray[2].split(" ");
-          let saltArray = paraArray[3].split(" ");
-
           let type = typeArray[2];
-          let contour = contourArray[1]; //parseFloat(contourArray[1]);
-          let gsize = gsizeArray[1]; //parseInt(gsizeArray[1]);
-          let salt = saltArray[1]; //parseFloat(saltArray[1]);
+
+          let contour = 2, gsize = 65, salt = 0.15; // default values for contour, gsize, salt 
+          ic.phisurftype = 22; // default value for surface type
+          ic.phisurfop = 1.0; // default value for surface opacity
+          ic.phisurfwf = "no"; // default value for surface wireframe
+
+          if(paraArray.length == 7) {
+            let contourArray = paraArray[1].split(" ");
+            let gsizeArray = paraArray[2].split(" ");
+            let saltArray = paraArray[3].split(" ");
+
+            contour = contourArray[1]; //parseFloat(contourArray[1]);
+            gsize = gsizeArray[1]; //parseInt(gsizeArray[1]);
+            salt = saltArray[1]; //parseFloat(saltArray[1]);
+          }
 
           // The values should be string
           $("#" + ic.pre + "delphi1gsize").val(gsize);
@@ -122670,12 +122716,12 @@ class Delphi {
               ic.phisurftype = surfaceArray[1];
               ic.phisurfop = opacityArray[1]; //parseFloat(opacityArray[1]);
               ic.phisurfwf = wireframeArray[1];
-
-              $("#" + ic.pre + "delphi" + "surftype").val(ic.phisurftype);
-              $("#" + ic.pre + "delphi" + "surfop").val(ic.phisurfop);
-              $("#" + ic.pre + "delphi" + "surfwf").val(ic.phisurfwf);
           }
 
+            $("#" + ic.pre + "delphi" + "surftype").val(ic.phisurftype);
+            $("#" + ic.pre + "delphi" + "surfop").val(ic.phisurfop);
+            $("#" + ic.pre + "delphi" + "surfwf").val(ic.phisurfwf);
+
           let bSurface =(type == 'surface') ? true : false;
 
           await thisClass.CalcPhi(gsize, salt, contour, bSurface);
@@ -124213,7 +124259,8 @@ class Dssp {
                 let atom = ic.firstAtomObjCls.getFirstAtomObj(ic.residues[resid]);
                 if(!atom) continue;
 
-                let resn = me.utilsCls.residueName2Abbr(atom.resn.substr(0, 3));
+                // let resn = me.utilsCls.residueName2Abbr(atom.resn.substr(0, 3));
+                let resn = me.utilsCls.residueName2Abbr(atom.resn);
 
                 let domainid = ic.resid2domainid[resid];
                 let refnumLabel = ic.resid2refnum[resid];
@@ -124290,7 +124337,8 @@ class Dssp {
 
                 let atom = ic.firstAtomObjCls.getFirstAtomObj(ic.residues[resid]);
                 if(!atom) continue;
-                let resn = me.utilsCls.residueName2Abbr(atom.resn.substr(0, 3));
+                // let resn = me.utilsCls.residueName2Abbr(atom.resn.substr(0, 3));
+                let resn = me.utilsCls.residueName2Abbr(atom.resn);
 
                 if(refnumLabel) {
                     let refnumStr_ori = ic.refnumCls.rmStrandFromRefnumlabel(refnumLabel);
@@ -124313,7 +124361,8 @@ class Dssp {
 
                 let atom = ic.firstAtomObjCls.getFirstAtomObj(ic.residues[resid]);
                 if(!atom) continue;
-                let resn = me.utilsCls.residueName2Abbr(atom.resn.substr(0, 3));
+                // let resn = me.utilsCls.residueName2Abbr(atom.resn.substr(0, 3));
+                let resn = me.utilsCls.residueName2Abbr(atom.resn);
 
                 if(refnumLabel) {
                     let refnumStr_ori = ic.refnumCls.rmStrandFromRefnumlabel(refnumLabel);
@@ -128583,7 +128632,8 @@ class Ligplot {
             }
         }
 
-        let oneLetterRes = me.utilsCls.residueName2Abbr(atom2.resn.substr(0, 3));
+        // let oneLetterRes = me.utilsCls.residueName2Abbr(atom2.resn.substr(0, 3));
+        let oneLetterRes = me.utilsCls.residueName2Abbr(atom2.resn);
         let resName2 = oneLetterRes + atom2.resi;
         let textColor2 = (atom2.color) ? atom2.color.getHexString() : '000';
         let lineColor = ic.lineGraphCls.getStrokecolor(undefined, interactionType);
@@ -128961,11 +129011,12 @@ class Transform {
         this.icn3d = icn3d;
     }
 
-    resetOrientation_base(commandTransformation) { let ic = this.icn3d; ic.icn3dui;
+    resetOrientation_base(commandTransformation) { let ic = this.icn3d, me = ic.icn3dui;
         if(commandTransformation.length == 2 && commandTransformation[1].length > 0) {
+            if(commandTransformation[1].substr(0, 4) == 'pos:') ic.bSetCamera = false;
+
             if(ic.bSetCamera) { // |||{"factor"...}
                 let transformation = JSON.parse(commandTransformation[1]);
-
                 ic._zoomFactor = transformation.factor;
 
                 ic.mouseChange.x = transformation.mouseChange.x;
@@ -128996,6 +129047,12 @@ class Transform {
                         }
                     }
                 });
+
+                // set the aspect ratio
+                if(!ic.container.whratio) {
+                    ic.container.whratio = me.htmlCls.WIDTH / me.htmlCls.HEIGHT; 
+                    ic.cam.aspect = ic.container.whratio;
+                }
             }
         }
         else {
@@ -133105,7 +133162,7 @@ class iCn3D {
 
     this.transparentRenderOrder = false; // false: regular transparency; true: expensive renderOrder for each face
 
-    this.AFUniprotVersion = 'v4';
+    this.AFUniprotVersion = 'v6';
     this.defaultPdbId = 'stru';
 
     if(!this.icn3dui.bNode) {
@@ -133694,7 +133751,7 @@ class iCn3DUI {
     //even when multiple iCn3D viewers are shown together.
     this.pre = this.cfg.divid + "_";
 
-    this.REVISION = '3.45.2';
+    this.REVISION = '3.45.4';
 
     // In nodejs, iCn3D defines "window = {navigator: {}}", and added window = {navigator: {}, "__THREE__":"177"}
     this.bNode = (Object.keys(window).length < 3) ? true : false;
@@ -133945,18 +134002,21 @@ iCn3DUI.prototype.show3DStructure = async function(pdbStr) { let me = this;
         await ic.pdbParserCls.downloadUrl(url, type, me.cfg.command);
     }
     else if(me.cfg.mmtfid !== undefined) {
+        if(me.cfg.mmtfid.toLowerCase().substr(0,8) == 'pdb_0000') me.cfg.mmtfid = me.cfg.mmtfid.substr(8); // temperary support long PDB ID such as pdb_00001tup
        ic.inputid = me.cfg.mmtfid;
        ic.loadCmd = 'load mmtf ' + me.cfg.mmtfid;
        me.htmlCls.clickMenuCls.setLogCmd(ic.loadCmd, true);
        await ic.bcifParserCls.downloadBcif(me.cfg.mmtfid);
     }
     else if(me.cfg.bcifid !== undefined) {
+        if(me.cfg.bcifid.toLowerCase().substr(0,8) == 'pdb_0000') me.cfg.bcifid = me.cfg.bcifid.substr(8); // temperary support long PDB ID such as pdb_00001tup
         ic.inputid = me.cfg.bcifid;
         ic.loadCmd = 'load bcif ' + me.cfg.bcifid;
         me.htmlCls.clickMenuCls.setLogCmd(ic.loadCmd, true);
         await ic.bcifParserCls.downloadBcif(me.cfg.bcifid);
      }
     else if(me.cfg.pdbid !== undefined) {
+        if(me.cfg.pdbid.toLowerCase().substr(0,8) == 'pdb_0000') me.cfg.pdbid = me.cfg.pdbid.substr(8); // temperary support long PDB ID such as pdb_00001tup
        ic.inputid = me.cfg.pdbid;
        ic.loadCmd = 'load pdb ' + me.cfg.pdbid;
        me.htmlCls.clickMenuCls.setLogCmd(ic.loadCmd, true);
@@ -133979,6 +134039,7 @@ iCn3DUI.prototype.show3DStructure = async function(pdbStr) { let me = this;
        await ic.opmParserCls.downloadOpm(me.cfg.opmid);
     }
     else if(me.cfg.mmdbid !== undefined) {
+        if(me.cfg.mmdbid.toLowerCase().substr(0,8) == 'pdb_0000') me.cfg.mmdbid = me.cfg.mmdbid.substr(8); // temperary support long PDB ID such as pdb_00001tup
        ic.inputid = me.cfg.mmdbid;
        // ic.bNCBI = true;
        ic.loadCmd = 'load mmdb ' + me.cfg.mmdbid + ' | parameters ' + me.cfg.inpara;
@@ -134117,6 +134178,7 @@ iCn3DUI.prototype.show3DStructure = async function(pdbStr) { let me = this;
         await ic.sdfParserCls.downloadSmiles(me.cfg.smiles);
     }
     else if(me.cfg.mmcifid !== undefined) {
+        // long PDB ID was supported with mmcifid
         ic.inputid = me.cfg.mmcifid;
         ic.loadCmd = 'load mmcif ' + me.cfg.mmcifid;
         me.htmlCls.clickMenuCls.setLogCmd(ic.loadCmd, true);