Skip to content

Commit

Permalink
change reference numbers
Browse files Browse the repository at this point in the history
  • Loading branch information
@jiywang3
jiywang3 committed Dec 4, 2023
1 parent 0da7dd6 commit 7dc3ae6
Show file tree
Hide file tree
Showing 24 changed files with 1,505 additions and 1,068 deletions.
508 changes: 297 additions & 211 deletions build/icn3d.js
View file

Large diffs are not rendered by default.

12 changes: 7 additions & 5 deletions build/icn3d.min.js
View file

Large diffs are not rendered by default.

508 changes: 297 additions & 211 deletions build/icn3d.module.js
View file

Large diffs are not rendered by default.

Binary file modified dist/icn3d-3.28.4.zip
View file
Binary file not shown.
508 changes: 297 additions & 211 deletions dist/icn3d.js
View file

Large diffs are not rendered by default.

12 changes: 7 additions & 5 deletions dist/icn3d.min.js
View file

Large diffs are not rendered by default.

508 changes: 297 additions & 211 deletions dist/icn3d.module.js
View file

Large diffs are not rendered by default.

12 changes: 7 additions & 5 deletions dist/icn3d_3.28.4.min.js
View file

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions src/html/clickMenu.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -305,7 +305,7 @@ class ClickMenu {
});

me.myEventCls.onIds("#" + me.pre + "mn1_dsn6", "click", function(e) { let ic = me.icn3d; //e.preventDefault();
me.htmlCls.dialogCls.openDlg('dl_dsn6', 'Please input the DSN6 file to display electron density map');
me.htmlCls.dialogCls.openDlg('dl_dsn6', 'Please input the map file to display electron density map');
});


Expand All @@ -332,7 +332,7 @@ class ClickMenu {


me.myEventCls.onIds("#" + me.pre + "mn1_dsn6url", "click", function(e) { let ic = me.icn3d; //e.preventDefault();
me.htmlCls.dialogCls.openDlg('dl_dsn6url', 'Please input the DSN6 file to display electron density map');
me.htmlCls.dialogCls.openDlg('dl_dsn6url', 'Please input the map file to display electron density map');
});

me.myEventCls.onIds("#" + me.pre + "mn1_exportState", "click", function(e) { let ic = me.icn3d; //e.preventDefault();
Expand Down
11 changes: 11 additions & 0 deletions src/html/events.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1271,6 +1271,17 @@ class Events {
ic.dsn6ParserCls.loadDsn6File('fofc');
});

me.myEventCls.onIds("#" + me.pre + "reload_ccp4file2fofc", "click", function(e) { let ic = me.icn3d;
e.preventDefault();
if(!me.cfg.notebook) dialog.dialog( "close" );
ic.dsn6ParserCls.loadDsn6File('2fofc', true);
});
me.myEventCls.onIds("#" + me.pre + "reload_ccp4filefofc", "click", function(e) { let ic = me.icn3d;
e.preventDefault();
if(!me.cfg.notebook) dialog.dialog( "close" );
ic.dsn6ParserCls.loadDsn6File('fofc', true);
});

me.myEventCls.onIds("#" + me.pre + "reload_delphifile", "click", async function(e) { let ic = me.icn3d;
e.preventDefault();
if(!me.cfg.notebook) dialog.dialog( "close" );
Expand Down
12 changes: 7 additions & 5 deletions src/html/setDialog.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -484,31 +484,33 @@ class SetDialog {
html += "</div>";

html += me.htmlCls.divStr + "dl_dsn6' class='" + dialogClass + "'>";
html += this.addNotebookTitle('dl_dsn6', 'Load a DSN6 file');
html += "<b>Note</b>: Always load a PDB file before loading DSN6 files. <br/><br/><br/>";
html += this.addNotebookTitle('dl_dsn6', 'Load a map file');
html += "<b>Note</b>: Always load a PDB file before loading map files. <br/><br/><br/>";

html += "<span style='white-space:nowrap;font-weight:bold;'>2fofc contour at: <select id='" + me.pre + "dsn6sigma2fofc'>";

let optArray1 = ['0', '0.5', '1', '1.5', '2', '3', '4', '5', '6', '7', '8', '9', '10'];
html += me.htmlCls.setHtmlCls.getOptionHtml(optArray1, 3);

html += "</select> &sigma;</span><br/>";
html += me.htmlCls.inputFileStr + "id='" + me.pre + "dsn6file2fofc'> " + me.htmlCls.buttonStr + "reload_dsn6file2fofc' style='margin-top: 6px;'>Load</button><br><br><br/>";
html += me.htmlCls.inputFileStr + "id='" + me.pre + "dsn6file2fofc'> " + me.htmlCls.buttonStr + "reload_dsn6file2fofc' style='margin: 6px 20px 0 0;'>Load DSN6</button><br><br><br/>";
//html += me.htmlCls.inputFileStr + "id='" + me.pre + "dsn6file2fofc'> " + me.htmlCls.buttonStr + "reload_dsn6file2fofc' style='margin: 6px 20px 0 0;'>Load DSN6</button>" + me.htmlCls.buttonStr + "reload_ccp4file2fofc' style='margin-top: 6px;'>Load CCP4</button><br><br><br/>";

html += "<span style='white-space:nowrap;font-weight:bold;'>fofc contour at: <select id='" + me.pre + "dsn6sigmafofc'>";

html += me.htmlCls.setHtmlCls.getOptionHtml(optArray1, 5);

html += "</select> &sigma;</span><br/>";
html += me.htmlCls.inputFileStr + "id='" + me.pre + "dsn6filefofc'> " + me.htmlCls.buttonStr + "reload_dsn6filefofc' style='margin-top: 6px;'>Load</button><br><br><br>";
html += me.htmlCls.inputFileStr + "id='" + me.pre + "dsn6filefofc'> " + me.htmlCls.buttonStr + "reload_dsn6filefofc' style='margin: 6px 20px 0 0;'>Load DSN6</button><br><br><br>";
//html += me.htmlCls.inputFileStr + "id='" + me.pre + "dsn6filefofc'> " + me.htmlCls.buttonStr + "reload_dsn6filefofc' style='margin: 6px 20px 0 0;'>Load DSN6</button>" + me.htmlCls.buttonStr + "reload_ccp4filefofc' style='margin-top: 6px;'>Load CCP4</button><br><br><br>";

html += me.htmlCls.buttonStr + "elecmapNo4'>Remove Map</button><br>";

html += "</div>";

html += me.htmlCls.divStr + "dl_dsn6url' class='" + dialogClass + "'>";
html += this.addNotebookTitle('dl_dsn6url', 'Load a selection file via a URL');
html += "<b>Note</b>: Always load a PDB file before loading DSN6 files. <br/><br/><br/>";
html += "<b>Note</b>: Always load a PDB file before loading map files. <br/><br/><br/>";

html += "<span style='white-space:nowrap;font-weight:bold;'>2fofc contour at: <select id='" + me.pre + "dsn6sigmaurl2fofc'>";

Expand Down
16 changes: 8 additions & 8 deletions src/html/setMenu.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -566,7 +566,7 @@ class SetMenu {

html += this.getMenuSep();

html += this.getMenuText('mn1_dsn6wrap', 'Electron Density(DSN6)', undefined, undefined, 2);
html += this.getMenuText('mn1_dsn6wrap', 'Electron Density', undefined, undefined, 2);
html += "<ul>";
html += this.getLink('mn1_dsn6', 'Local File', undefined, 3);
html += this.getLink('mn1_dsn6url', 'URL(CORS) ' + me.htmlCls.wifiStr, undefined, 3);
Expand Down Expand Up @@ -677,14 +677,14 @@ class SetMenu {
}

//!!!
/*

html += this.getMenuText('m1_exportrefnum', 'Reference Numbers', undefined, undefined, 2);
html += "<ul>";
html += this.getLink('mn1_exportIgstrand', 'Ig Strand', undefined, 3);
html += this.getLink('mn1_exportKabat', 'Kabat', undefined, 3);
html += this.getLink('mn1_exportImgt', 'IMGT', undefined, 3);
html += "</ul>";
*/


html += "<li><br/></li>";

Expand Down Expand Up @@ -1527,8 +1527,8 @@ class SetMenu {
//}

//!!!
//html += this.getRadio('mn4_clr', 'mn4_clrIgstrand', 'Ig Strand', undefined, undefined, 2);
//html += this.getRadio('mn4_clr', 'mn4_clrIgproto', 'Ig Protodomain', 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>');
Expand Down Expand Up @@ -1659,7 +1659,7 @@ class SetMenu {
html += this.getRadio('mn6_addlabel', 'mn6_addlabelResidues', 'per Residue', undefined, 1, 2);
html += this.getRadio('mn6_addlabel', 'mn6_addlabelResnum', 'per Residue & Number', undefined, 1, 2);
//!!!
//html += this.getRadio('mn6_addlabel', 'mn6_addlabelRefnum', 'per Reference Number', undefined, 1, 2);
html += this.getRadio('mn6_addlabel', 'mn6_addlabelRefnum', 'per Reference Number', undefined, 1, 2);
html += this.getRadio('mn6_addlabel', 'mn6_addlabelChains', 'per Chain', undefined, undefined, 2);
html += this.getRadio('mn6_addlabel', 'mn6_addlabelTermini', 'N- & C-Termini', undefined, 1, 2);
}
Expand Down Expand Up @@ -1751,11 +1751,11 @@ class SetMenu {

html += "<ul>";
//!!!
/*

html += this.getLink('mn6_igrefYes', 'Show Ig Ref. Number', undefined, 2);
html += this.getLink('mn6_igrefTpl', 'Ig w/ Specified Template', 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);
Expand Down
Loading

0 comments on commit 7dc3ae6

Please sign in to comment.