icn3d 3.48.0 → 3.48.1

package/icn3d.module.js

@@ -80411,7 +80411,7 @@ class Strand {
         let bShowArray = [];
         let calphaIdArray = []; // used to store one of the final positions drawn in 3D
         let colors = [];
-        let currentChain, currentCA = null, currentO = null, currentColor = null, prevCoorCA = null, prevCoorO = null, prevColor = null;
+        let currentChain, currentStyle, currentCA = null, currentO = null, currentColor = null, prevCoorCA = null, prevCoorO = null, prevColor = null;
         let prevCO = null, ss = null, ssend = false, atomid = null, prevAtomid = null, prevResi = null, calphaid = null, prevCalphaid = null;
         let strandWidth, bSheetSegment = false, bHelixSegment = false;
         let atom, tubeAtoms = {};
@@ -80464,15 +80464,15 @@ class Strand {
                 }
                 // smoothen each coil, helix and sheet separately. The joint residue has to be included both in the previous and next segment
                 let bSameChain = true;
-//                    if (currentChain !== atom.chain || currentResi + 1 !== atom.resi) {
+
                 if (currentChain !== atom.chain) {
                     bSameChain = false;
                 }
 
-                if(atom.ssend && atom.ss === 'sheet') {
+                if((atom.ssend || currentStyle != atom.style)&& atom.ss === 'sheet') {
                     bSheetSegment = true;
                 }
-                else if(atom.ssend && atom.ss === 'helix') {
+                else if((atom.ssend || currentStyle != atom.style) && atom.ss === 'helix') {
                     bHelixSegment = true;
                 }
 
@@ -80565,7 +80565,7 @@ class Strand {
                 //     bHelixSegment = true;
                 // }
 
-                if ((atom.ssbegin || atom.ssend || (drawnResidueCount === totalResidueCount - 1) || bBrokenSs) && pnts[0].length > 0 && bSameChain) {
+                if ((atom.ssbegin || atom.ssend || (drawnResidueCount === totalResidueCount - 1) || bBrokenSs || currentStyle != atom.style) && pnts[0].length > 0 && bSameChain) {
                     let atomName = 'CA';
 
                     let prevone = [], nexttwo = [];
@@ -80708,9 +80708,7 @@ class Strand {
                 } // end if (atom.ssbegin || atom.ssend)
 
                 // end of a chain
-//                    if ((currentChain !== atom.chain || currentResi + 1 !== atom.resi) && pnts[0].length > 0) {
-                if ((currentChain !== atom.chain) && pnts[0].length > 0) {
-
+                if ((currentChain !== atom.chain || currentStyle != atom.style) && pnts[0].length > 0) {
                     let atomName = 'CA';
 
                     let prevone = [], nexttwo = [];
@@ -80762,7 +80760,7 @@ class Strand {
                 }
 
                 currentChain = atom.chain;
-                atom.resi;
+                currentStyle = atom.style;
                 ss = atom.ss;
                 ssend = atom.ssend;
                 prevAtomid = atom.serial;
@@ -89729,6 +89727,9 @@ class SetStyle {
     setBackground(color) {var ic = this.icn3d, me = ic.icn3dui;
       
        ic.setOptionCls.setOption('background', color);
+       let exdays = 3650;
+       me.htmlCls.setHtmlCls.setCookie('bkgdcolor', color, exdays);
+
        me.htmlCls.clickMenuCls.setLogCmd('set background ' + color, true);
        //let titleColor =(color == 'black' || color == 'transparent') ? me.htmlCls.GREYD : 'black';
        let titleColor = (color == 'black') ? me.htmlCls.GREYD : 'black';
@@ -119176,16 +119177,18 @@ class ApplyCommand {
       }
       else if(command.indexOf('set background') == 0) {
         let value = command.substr(command.lastIndexOf(' ') + 1);
-        ic.opts['background'] = value;
+        ic.setStyleCls.setBackground(value);
 
-        if(value == 'black') {
-          $("#" + ic.pre + "title").css("color", me.htmlCls.GREYD);
-          $("#" + ic.pre + "titlelink").css("color", me.htmlCls.GREYD);
-        }
-        else {
-          $("#" + ic.pre + "title").css("color", "black");
-          $("#" + ic.pre + "titlelink").css("color", "black");
-        }
+        // ic.opts['background'] = value;
+
+        // if(value == 'black') {
+        //   $("#" + ic.pre + "title").css("color", me.htmlCls.GREYD);
+        //   $("#" + ic.pre + "titlelink").css("color", me.htmlCls.GREYD);
+        // }
+        // else {
+        //   $("#" + ic.pre + "title").css("color", "black");
+        //   $("#" + ic.pre + "titlelink").css("color", "black");
+        // }
       }
       else if(command.indexOf('set label color') == 0) {
         ic.labelcolor = command.substr(command.lastIndexOf(' ') + 1);
@@ -135425,7 +135428,7 @@ class iCn3DUI {
     //even when multiple iCn3D viewers are shown together.
     this.pre = this.cfg.divid + "_";
 
-    this.REVISION = '3.48.0';
+    this.REVISION = '3.48.1';
 
     // In nodejs, iCn3D defines "window = {navigator: {}}", and added window = {navigator: {}, "__THREE__":"177"}
     this.bNode = (Object.keys(window).length < 3) ? true : false;

package/package.json

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