Revision: 20527
http://sourceforge.net/p/jmol/code/20527
Author: hansonr
Date: 2015-05-28 03:14:10 +0000 (Thu, 28 May 2015)
Log Message:
-----------
NBO menu additions
Modified Paths:
--------------
branches/nbo/Jmol/src/org/jmol/viewer/JC.java
branches/nbo/Jmol/src/org/jmol/viewer/StateCreator.java
branches/nbo/Jmol/src/org/openscience/jmol/app/jmolpanel/GuiMap.java
branches/nbo/Jmol/src/org/openscience/jmol/app/jmolpanel/JmolPanel.java
branches/nbo/Jmol/src/org/openscience/jmol/app/jmolpanel/Properties/Jmol-resources.properties
branches/nbo/Jmol/src/org/openscience/jmol/app/jmolpanel/StatusListener.java
branches/nbo/Jmol/src/org/openscience/jmol/app/nbo/NBODialog.java
Modified: branches/nbo/Jmol/src/org/jmol/viewer/JC.java
===================================================================
--- branches/nbo/Jmol/src/org/jmol/viewer/JC.java 2015-05-28 00:41:54 UTC
(rev 20526)
+++ branches/nbo/Jmol/src/org/jmol/viewer/JC.java 2015-05-28 03:14:10 UTC
(rev 20527)
@@ -926,15 +926,26 @@
public static final int JSV_SELECT = 14;
public static final int JSV_STRUCTURE = 21;
public static final int JSV_SEND_H1SIMULATE = 28;
+ public static final int NBO_MODEL = 35;
+ public static final int NBO_RUN = 42;
+ public static final int NBO_VIEW = 49;
+ public static final int NBO_SEARCH = 56;
+ public static final int NBO_CONFIG = 63;
- public static int getJSVSyncSignal(String script) {
+ public static int getServiceCommand(String script) {
return (script.length() < 7 ? -1 : ("" +
"JSPECVI" +
"PEAKS: " +
"SELECT:" +
"JSVSTR:" +
- "H1SIMUL")
+ "H1SIMUL" +
+ "NBO:MOD" +
+ "NBO:RUN" +
+ "NBO:VIE" +
+ "NBO:SEA" +
+ "NBO:CON"
+ )
.indexOf(script.substring(0, 7).toUpperCase()));
}
Modified: branches/nbo/Jmol/src/org/jmol/viewer/StateCreator.java
===================================================================
--- branches/nbo/Jmol/src/org/jmol/viewer/StateCreator.java 2015-05-28
00:41:54 UTC (rev 20526)
+++ branches/nbo/Jmol/src/org/jmol/viewer/StateCreator.java 2015-05-28
03:14:10 UTC (rev 20527)
@@ -1782,8 +1782,15 @@
if (disableSend)
sm.setSyncDriver(StatusManager.SYNC_DISABLE);
if (script.indexOf("Mouse: ") != 0) {
- int jsvMode = JC.getJSVSyncSignal(script);
- switch (jsvMode) {
+ int serviceMode = JC.getServiceCommand(script);
+ switch (serviceMode) {
+ case JC.NBO_CONFIG:
+ case JC.NBO_MODEL:
+ case JC.NBO_RUN:
+ case JC.NBO_VIEW:
+ case JC.NBO_SEARCH:
+ sm.syncSend(script, ".", port);
+ return;
case JC.JSV_NOT:
break;
case JC.JSV_SEND_JDXMOL:
@@ -1795,7 +1802,7 @@
case JC.JSV_SETPEAKS:
case JC.JSV_SELECT:
// from JSpecView...
- if ((script = vwr.getJSV().processSync(script, jsvMode)) == null)
+ if ((script = vwr.getJSV().processSync(script, serviceMode)) == null)
return;
}
//System.out.println("Jmol executing script for JSpecView: " + script);
Modified: branches/nbo/Jmol/src/org/openscience/jmol/app/jmolpanel/GuiMap.java
===================================================================
--- branches/nbo/Jmol/src/org/openscience/jmol/app/jmolpanel/GuiMap.java
2015-05-28 00:41:54 UTC (rev 20526)
+++ branches/nbo/Jmol/src/org/openscience/jmol/app/jmolpanel/GuiMap.java
2015-05-28 03:14:10 UTC (rev 20527)
@@ -184,7 +184,12 @@
labels.put("definecenter", GT._("Define &Center"));
labels.put("tools", GT._("&Tools"));
labels.put("gauss", GT._("&Gaussian..."));
- labels.put("nbo", GT._("&NBO..."));
+ labels.put("nboMenu", "&NBO...");
+ labels.put("nboConfigScript", GT._("&Config"));
+ labels.put("nboModelScript", GT._("&Model"));
+ labels.put("nboRunScript", GT._("&Run"));
+ labels.put("nboViewScript", GT._("&View"));
+ labels.put("nboSearchScript", GT._("&Search"));
labels.put("viewMeasurementTable", GT._("&Measurements") + "...");
labels.put("distanceUnitsMenu", GT._("Distance &Units"));
labels.put("distanceNanometersScript", GT._("&Nanometers 1E-9"));
Modified:
branches/nbo/Jmol/src/org/openscience/jmol/app/jmolpanel/JmolPanel.java
===================================================================
--- branches/nbo/Jmol/src/org/openscience/jmol/app/jmolpanel/JmolPanel.java
2015-05-28 00:41:54 UTC (rev 20526)
+++ branches/nbo/Jmol/src/org/openscience/jmol/app/jmolpanel/JmolPanel.java
2015-05-28 03:14:10 UTC (rev 20527)
@@ -1095,7 +1095,7 @@
@Override
public void actionPerformed(ActionEvent e) {
- startNBO();
+ startNBO(null);
}
}
@@ -1118,12 +1118,15 @@
newFrame.setVisible(true);
}
- void startNBO() {
+ void startNBO(String type) {
getNBOService();
if (nboDialog == null)
nboDialog = new NBODialog(frame, vwr, nboService);
else
nboDialog.setVisible(true);
+ if (type != null)
+ nboDialog.openPanel(type.charAt(0));
+
}
class UguideAction extends AbstractAction {
Modified:
branches/nbo/Jmol/src/org/openscience/jmol/app/jmolpanel/Properties/Jmol-resources.properties
===================================================================
---
branches/nbo/Jmol/src/org/openscience/jmol/app/jmolpanel/Properties/Jmol-resources.properties
2015-05-28 00:41:54 UTC (rev 20526)
+++
branches/nbo/Jmol/src/org/openscience/jmol/app/jmolpanel/Properties/Jmol-resources.properties
2015-05-28 03:14:10 UTC (rev 20527)
@@ -166,17 +166,28 @@
#
#tools=viewMeasurementTable animate vibrate graph chemicalShifts crystprop
tools=viewMeasurementTable distanceUnitsMenu animateMenu vibrateMenu
atomsetchooser \
- surfaceTool gauss nbo spectrumMenu
+ surfaceTool gauss nboMenu spectrumMenu
viewMeasurementTableImage=rulerButton.gif
distanceUnitsMenuImage=distanceUnitsButton.png
animateMenuImage=animateButton.png
vibrateMenuImage=vibrateButton.gif
#spectrumMenuImage=spec24.gif
atomsetchooserImage=atomSetChooserButton.png
+
#graphImage=graphButton.gif
#crystpropImage=crystalButton.gif
#
+# NBO Menu
+#
+nboMenu=nboConfigScript nboModelScript nboRunScript nboViewScript
nboSearchScript
+nboConfigScript=sync on; sync . "NBO:Config"
+nboModelScript=sync on; sync . "NBO:Model"
+nboRunScript=sync on; sync . "NBO:Run"
+nboViewScript=sync on; sync . "NBO:View"
+nboSearchScript=sync on; sync . "NBO:Search"
+
+#
# Spectrum Menu
#
Modified:
branches/nbo/Jmol/src/org/openscience/jmol/app/jmolpanel/StatusListener.java
===================================================================
---
branches/nbo/Jmol/src/org/openscience/jmol/app/jmolpanel/StatusListener.java
2015-05-28 00:41:54 UTC (rev 20526)
+++
branches/nbo/Jmol/src/org/openscience/jmol/app/jmolpanel/StatusListener.java
2015-05-28 03:14:10 UTC (rev 20527)
@@ -176,7 +176,7 @@
String service = (String) info.get("service");
if ("nbo".equals(service)) {
if ("showPanel".equals(info.get("action")))
- jmol.startNBO();
+ jmol.startNBO(null);
else
jmol.getNBOService().processRequest(info);
}
@@ -203,6 +203,11 @@
setJSpecView(strInfo.substring(9).trim(), false, false);
return;
}
+ if (strInfo != null && strInfo.toLowerCase().startsWith("nbo:")) {
+ jmol.startNBO(strInfo.substring(4).toLowerCase());
+ return;
+ }
+
jmol.sendNioMessage(((Integer) data[3]).intValue(), strInfo);
return;
case DRAGDROP:
Modified: branches/nbo/Jmol/src/org/openscience/jmol/app/nbo/NBODialog.java
===================================================================
--- branches/nbo/Jmol/src/org/openscience/jmol/app/nbo/NBODialog.java
2015-05-28 00:41:54 UTC (rev 20526)
+++ branches/nbo/Jmol/src/org/openscience/jmol/app/nbo/NBODialog.java
2015-05-28 03:14:10 UTC (rev 20527)
@@ -303,10 +303,10 @@
@Override
public void setVisible(boolean b) {
super.setVisible(b);
- if (haveService)
- nboInput.requestFocus();
- else
- nboPathButton.requestFocus();
+// if (haveService)
+// nboInput.requestFocus();
+// else
+// nboPathButton.requestFocus();
}
@@ -423,7 +423,7 @@
b.addActionListener(new ActionListener(){
@Override
public void actionPerformed(ActionEvent e){
- homeClicked();
+ openHome();
}});
p.add(b,c);
@@ -765,7 +765,7 @@
b.addActionListener(new ActionListener(){
@Override
public void actionPerformed(ActionEvent e){
- modelClicked();
+ openModel();
}});
main.add(b);
main.add(Box.createRigidArea(new Dimension(0, 50)));
@@ -774,7 +774,7 @@
b.addActionListener(new ActionListener(){
@Override
public void actionPerformed(ActionEvent e){
- runClicked();
+ openRun();
}});
b.setFont(new Font("Monospaced", Font.PLAIN, 20));
main.add(b);
@@ -784,7 +784,7 @@
b.addActionListener(new ActionListener(){
@Override
public void actionPerformed(ActionEvent e){
- viewClicked();
+ openView();
}});
b.setFont(new Font("Monospaced", Font.PLAIN, 20));
main.add(b);
@@ -794,7 +794,7 @@
b.addActionListener(new ActionListener(){
@Override
public void actionPerformed(ActionEvent e){
-
+ openSearch();
}});
main.add(b);
p.add(main,BorderLayout.CENTER);
@@ -821,23 +821,49 @@
}
- protected void modelClicked(){
+ public void openPanel(char type) {
+ switch (type) {
+ case 'c':
+ openHome();
+ break;
+ case 'm':
+ openModel();
+ break;
+ case 'r':
+ openRun();
+ break;
+ case 's':
+ openSearch();
+ break;
+ case 'v':
+ openView();
+ break;
+ }
+ }
+
+ private void openSearch() {
+ System.out.println("fix me - openSearch");
+
+ }
+
+
+ protected void openModel(){
cmdFile = new File(nboService.serverPath);
cmdFile = new File(cmdFile.getParent()+"/m_test.txt");
buildModel(this.getContentPane(),1);
}
- protected void homeClicked(){
+ protected void openHome(){
workPathLabel.setText("");
buildMain(this.getContentPane());
}
- protected void runClicked(){
+ protected void openRun(){
cmdFile = new File(nboService.serverPath);
cmdFile = new File(cmdFile.getParent()+"/r_test.txt");
buildModel(this.getContentPane(),2);
}
- protected void viewClicked(){
+ protected void openView(){
cmdFile = new File(vwr.getDefaultDirectory()+"/v_test.txt");
buildModel(this.getContentPane(),3);
}
@@ -853,10 +879,13 @@
cmdWrite.print(s);
cmdWrite.close();
}
+
@Override
public void stateChanged(ChangeEvent e) {
// TODO
+
}
+
}
class SPanel extends JPanel{
public SPanel(){
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
------------------------------------------------------------------------------
_______________________________________________
Jmol-commits mailing list
Jmol-commits@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/jmol-commits
