Changeset 341:a7cbe51aa3f3
- Timestamp:
- Dec 11, 2013, 1:20:38 PM (11 years ago)
- Branch:
- default
- Phase:
- public
- Location:
- source/class/pf
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
source/class/pf/Application.js
r340 r341 1987 1987 var menubar = this.menubar; 1988 1988 1989 var submenu, btn, q ;1989 var submenu, btn, qc; 1990 1990 1991 1991 submenu = new qx.ui.menu.Menu; 1992 1992 this.doc.add(submenu); 1993 q = new qx.ui.core.Command("Ctrl+O");1994 q .addListener("execute", this.openCB, this);1995 btn = new qx.ui.menu.Button("Open...", "pf/image/open.png", q );1993 qc = new qx.ui.core.Command("Ctrl+O"); 1994 qc.addListener("execute", this.openCB, this); 1995 btn = new qx.ui.menu.Button("Open...", "pf/image/open.png", qc); 1996 1996 submenu.add(btn); 1997 q = new qx.ui.core.Command("Ctrl+S");1998 q .addListener("execute", this.saveConfigCB, this);1999 btn = new qx.ui.menu.Button("Save", "pf/image/save.png", q );1997 qc = new qx.ui.core.Command("Ctrl+S"); 1998 qc.addListener("execute", this.saveConfigCB, this); 1999 btn = new qx.ui.menu.Button("Save", "pf/image/save.png", qc); 2000 2000 submenu.add(btn); 2001 2001 btn = new qx.ui.menu.Button("Save as...", "pf/image/save.png"); … … 2003 2003 submenu.add(btn); 2004 2004 submenu.add(new qx.ui.menu.Separator); 2005 q = new qx.ui.core.Command("Ctrl+P");2006 q .addListener("execute", function(ev) {2005 qc = new qx.ui.core.Command("Ctrl+P"); 2006 qc.addListener("execute", function(ev) { 2007 2007 window.print(); 2008 2008 }); 2009 btn = new qx.ui.menu.Button("Print...", "pf/image/print.png", q );2009 btn = new qx.ui.menu.Button("Print...", "pf/image/print.png", qc); 2010 2010 submenu.add(btn); 2011 2011 submenu.add(new qx.ui.menu.Separator); 2012 q = new qx.ui.core.Command("Ctrl+R");2013 q .addListener("execute", function(ev) {2012 qc = new qx.ui.core.Command("Ctrl+R"); 2013 qc.addListener("execute", function(ev) { 2014 2014 this.restart(false); 2015 2015 }, this); 2016 btn = new qx.ui.menu.Button("Restart", "pf/image/reset.png", q );2016 btn = new qx.ui.menu.Button("Restart", "pf/image/reset.png", qc); 2017 2017 submenu.add(btn); 2018 2018 submenu.add(new qx.ui.menu.Separator); 2019 q = new qx.ui.core.Command("Ctrl+Q");2020 q .addListener("execute", function(ev) {2019 qc = new qx.ui.core.Command("Ctrl+Q"); 2020 qc.addListener("execute", function(ev) { 2021 2021 this.quit(false); 2022 2022 }, this); 2023 btn = new qx.ui.menu.Button("Quit", "pf/image/exit.png", q );2023 btn = new qx.ui.menu.Button("Quit", "pf/image/exit.png", qc); 2024 2024 submenu.add(btn); 2025 2025 … … 2099 2099 2100 2100 submenu.add(new qx.ui.menu.Separator); 2101 q = new qx.ui.core.Command("Ctrl+W");2102 q .addListener("execute", this.loadWikiCB, this);2101 qc = new qx.ui.core.Command("Ctrl+W"); 2102 qc.addListener("execute", this.loadWikiCB, this); 2103 2103 btn = new qx.ui.menu.Button("Load Wikipedia Article", 2104 "pf/image/wikipedia.png", q );2104 "pf/image/wikipedia.png", qc); 2105 2105 submenu.add(btn); 2106 2106 this.loadWikiButton = btn; … … 2110 2110 2111 2111 submenu.add(new qx.ui.menu.Separator); 2112 q = new qx.ui.core.Command("Ctrl+L");2113 q .addListener("execute", this.drawCB, this);2112 qc = new qx.ui.core.Command("Ctrl+L"); 2113 qc.addListener("execute", this.drawCB, this); 2114 2114 btn = new qx.ui.menu.Button("Redraw Plot", 2115 "pf/image/tab-plot.png", q );2115 "pf/image/tab-plot.png", qc); 2116 2116 submenu.add(btn); 2117 2117 this.redrawButton = btn; … … 2131 2131 submenu = new qx.ui.menu.Menu; 2132 2132 this.doc.add(submenu); 2133 q = new qx.ui.core.Command("F1");2134 q .addListener("execute", function(ev) {2133 qc = new qx.ui.core.Command("F1"); 2134 qc.addListener("execute", function(ev) { 2135 2135 var url = "resource/pf/html/ug.html"; 2136 2136 var w = qx.bom.Window.open(url, null, nvOptions); 2137 2137 }, this); 2138 2138 btn = new qx.ui.menu.Button("Help Contents", 2139 "pf/image/help.png", q );2139 "pf/image/help.png", qc); 2140 2140 submenu.add(btn); 2141 2141 btn = new qx.ui.menu.Button("Reference Paper", -
source/class/pf/base/Species.js
r293 r341 26 26 }, 27 27 28 setQ: function( q)29 { 30 this._q = parseInt( q);28 setQ: function(Q) 29 { 30 this._q = parseInt(Q); 31 31 this._update(); 32 32 }, … … 199 199 200 200 201 construct: function(id, m, q, n, t)201 construct: function(id, m, Q, n, t) 202 202 { 203 203 if (m <= 0.0 || n < 0.0 || t <= 0.0) { … … 207 207 this.id = id; 208 208 this._m = m; 209 this._q = q;209 this._q = Q; 210 210 this._n = n; 211 211 this._t = t;
Note: See TracChangeset
for help on using the changeset viewer.