icn3d 3.44.1 → 3.44.2

package/icn3d.module.js

@@ -57387,6 +57387,10 @@ class ClickMenu {
            me.htmlCls.dialogCls.openDlg('dl_state', 'Please input the state file');
         });
 
+        me.myEventCls.onIds("#" + me.pre + "mn1_bcfviewpoint", "click", function(e) { me.icn3d; //e.preventDefault();
+           me.htmlCls.dialogCls.openDlg('dl_bcfviewpoint', 'Please input the BCF viewpoint file');
+        });
+
         me.myEventCls.onIds("#" + me.pre + "mn1_selection", "click", function(e) { me.icn3d; //e.preventDefault();
            me.htmlCls.dialogCls.openDlg('dl_selection', 'Please input the selection file');
         });
@@ -60300,6 +60304,7 @@ class SetMenu {
         html += this.getLink('mn1_fixedversion', 'Share Link in Archived Ver. ' + me.htmlCls.wifiStr, undefined, 2);
         html += this.getLink('mn1_selection', 'Selection File', undefined, 2);
         html += this.getLink("mn1_collection", "Collection File", undefined, 2);
+        html += this.getLink('mn1_bcfviewpoint', 'BCF Viewpoint File', undefined, 2);
 
         html += this.getMenuSep();
 
@@ -62788,6 +62793,12 @@ class SetDialog {
         html += me.htmlCls.buttonStr + "reload_state' style='margin-top: 6px;'>Load</button>";
         html += "</div>";
 
+        html += me.htmlCls.divStr + "dl_bcfviewpoint' class='" + dialogClass + "'>";
+        html += this.addNotebookTitle('dl_bcfviewpoint', 'Please input a BCF viewpoint file');
+        html += "BCF viewpoint file: " + me.htmlCls.inputFileStr + "id='" + me.pre + "bcfviewpoint'><br/>";
+        html += me.htmlCls.buttonStr + "reload_bcfviewpoint' style='margin-top: 6px;'>Load</button>";
+        html += "</div>";
+
         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/>";
@@ -64282,6 +64293,67 @@ class Events {
         }
     }
 
+    async openBcf(file) {  let me = this.icn3dui, ic = me.icn3d;
+        let url = './script/jszip.min.js';
+        await me.getAjaxPromise(url, 'script');
+
+        let jszip = new JSZip();
+
+        me.htmlCls.setHtmlCls.fileSupport();
+
+        jszip.loadAsync(file).then(function(zip) {
+            zip.forEach(function (relativePath, zipEntry) {
+                if (zipEntry.dir) {
+                    // Handle directory creation
+                    let folder = jszip.folder(relativePath);
+                    folder.forEach(function (filename, zipEntry2) {
+                        if(filename.substr(0, 9) == 'viewpoint') {
+                            zipEntry2.async('string') // or 'blob', 'arraybuffer'
+                                .then(function(fileData) {
+            let parser = new DOMParser();
+            let xmlDoc = parser.parseFromString(fileData, "text/xml");
+
+            // Accessing elements
+            //const author = xmlDoc.getElementsByTagName("author")[0].textContent;
+            //const author = xmlDoc.querySelector("author").textContent;
+            let viewpoint = xmlDoc.querySelector("CameraViewPoint");
+            let direction = xmlDoc.querySelector("CameraDirection");
+            let upvector = xmlDoc.querySelector("CameraUpVector");
+            let fov = xmlDoc.querySelector("FieldOfView").textContent;
+            xmlDoc.querySelector("AspectRatio").textContent;
+
+            let childNodes, viewpointArray = [], directionArray = [], upvectorArray = [];
+            
+            childNodes = viewpoint.children;
+            viewpointArray = [childNodes[0].textContent, childNodes[1].textContent, childNodes[2].textContent];
+            childNodes = direction.children;
+            directionArray = [childNodes[0].textContent, childNodes[1].textContent, childNodes[2].textContent];
+            childNodes = upvector.children;
+            upvectorArray = [childNodes[0].textContent, childNodes[1].textContent, childNodes[2].textContent];
+
+            ic.cam.position.set(viewpointArray[0], viewpointArray[1], viewpointArray[2]);
+            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.drawCls.applyTransformation(ic._zoomFactor, ic.mouseChange, ic.quaternion);
+            ic.drawCls.render();
+                                });
+                        }
+                    });
+                } 
+                // else {
+                //     // Handle file extraction
+                //     zipEntry.async("string").then(function (content) {
+                //     });
+                // }
+            });
+        }, function (e) {
+            console.error("Error loading BCF viewpoint file:", e);
+        });
+    }
+
     //Hold all functions related to click events.
     allEventFunctions() { let me = this.icn3dui, ic = me.icn3d;
         let thisClass = this;
@@ -64708,7 +64780,7 @@ class Events {
             let v2Y = $("#" + me.pre + "v2Y").val();
             let v2Z = $("#" + me.pre + "v2Z").val();
 
-            let angleRad = new THREE.Vector3(parseFloat(v1X), parseFloat(v1Y), parseFloat(v1Z)).angleTo(new THREE.Vector3(parseFloat(v2X), parseFloat(v2Y), parseFloat(v2Z)));
+            let angleRad = new Vector3$1(parseFloat(v1X), parseFloat(v1Y), parseFloat(v1Z)).angleTo(new Vector3$1(parseFloat(v2X), parseFloat(v2Y), parseFloat(v2Z)));
             let angle = angleRad / 3.1416 * 180;
             angle = Math.abs(angle).toFixed(0);
             if(angle > 180) angle -= 180;
@@ -65374,6 +65446,19 @@ class Events {
            }
         });
 
+        me.myEventCls.onIds("#" + me.pre + "reload_bcfviewpoint", "click", async function(e) { me.icn3d;
+           e.preventDefault();
+           if(!me.cfg.notebook) dialog.dialog( "close" );
+
+           let file = $("#" + me.pre + "bcfviewpoint")[0].files[0];
+           if(!file) {
+             var aaa = 1; //alert("Please select a file before clicking 'Load'");
+           }
+           else {
+             await thisClass.openBcf(file);
+           }
+        });
+
         me.myEventCls.onIds("#" + me.pre + "reload_selectionfile", "click", function(e) { let ic = me.icn3d;
            e.preventDefault();
            if(!me.cfg.notebook) dialog.dialog( "close" );
@@ -66809,8 +66894,8 @@ class Events {
             let posArray1 = ic.contactCls.getExtent(atomSet1);
             let posArray2 = ic.contactCls.getExtent(atomSet2);
 
-            let pos1 = new THREE.Vector3(posArray1[2][0], posArray1[2][1], posArray1[2][2]);
-            let pos2 = new THREE.Vector3(posArray2[2][0], posArray2[2][1], posArray2[2][2]);
+            let pos1 = new Vector3$1(posArray1[2][0], posArray1[2][1], posArray1[2][2]);
+            let pos2 = new Vector3$1(posArray2[2][0], posArray2[2][1], posArray2[2][2]);
 
             let radius = $("#" + me.pre + "linebtwsets_radius").val(); 
             let color = $("#" + me.pre + "linebtwsets_customcolor").val(); 
@@ -66834,7 +66919,7 @@ class Events {
             let nameArray = $("#" + me.pre + "cartoonshape").val();
             let atomSet1 = ic.definedSetsCls.getAtomsFromNameArray(nameArray);
             let posArray1 = ic.contactCls.getExtent(atomSet1);
-            let pos1 = new THREE.Vector3(posArray1[2][0], posArray1[2][1], posArray1[2][2]);
+            let pos1 = new Vector3$1(posArray1[2][0], posArray1[2][1], posArray1[2][2]);
 
             let shape = $("#" + me.pre + "cartoonshape_shape").val(); // Sphere or Cube
             let radius = $("#" + me.pre + "cartoonshape_radius").val(); 
@@ -67295,6 +67380,32 @@ class Events {
            thisClass.setLogCmd("set theme black", true);
         });
 
+        // dragover and drop
+        me.myEventCls.onIds("#" + me.pre + "viewer", "dragover", function(e) { me.icn3d;
+           e.preventDefault();
+           $("#" + me.pre + "viewer")[0].style.border = "5px solid blue";
+        });
+        me.myEventCls.onIds("#" + me.pre + "viewer", "drop", async function(e) { me.icn3d;
+           e.preventDefault();
+
+           let files = e.dataTransfer.files;
+
+           for(let i = 0, il = e.dataTransfer.files.length; i < il; ++i) {
+              let file = e.dataTransfer.files[i];
+              let fileName = file.name;
+
+              let fileType = fileName.substr(fileName.lastIndexOf('.') + 1).toLowerCase();
+              if(fileType == 'pdb' || fileType == 'mmcif' || fileType == 'png') {
+                await me.htmlCls.eventsCls.readFile(true, files, i, '', (fileType == 'mmcif'), (fileType == 'png'));
+              }
+              else if(fileType == 'bcf') {
+                await thisClass.openBcf(file);
+              }
+           }
+
+           $("#" + me.pre + "viewer")[0].style.border = "0px solid black";
+        });
+
         $(document).on("click", "." + me.pre + "snpin3d", async function(e) { let ic = me.icn3d;
             e.stopImmediatePropagation();
 
@@ -133461,7 +133572,7 @@ class iCn3DUI {
     //even when multiple iCn3D viewers are shown together.
     this.pre = this.cfg.divid + "_";
 
-    this.REVISION = '3.44.1';
+    this.REVISION = '3.44.2';
 
     // In nodejs, iCn3D defines "window = {navigator: {}}"
     this.bNode = (Object.keys(window).length < 2) ? true : false;

package/package.json

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