Revision: 21398
http://sourceforge.net/p/jmol/code/21398
Author: hansonr
Date: 2017-02-06 04:48:33 +0000 (Mon, 06 Feb 2017)
Log Message:
-----------
Modified Paths:
--------------
trunk/Jmol/src/org/gennbo/NBODialogSearch.java
Modified: trunk/Jmol/src/org/gennbo/NBODialogSearch.java
===================================================================
--- trunk/Jmol/src/org/gennbo/NBODialogSearch.java 2017-02-06 04:20:10 UTC
(rev 21397)
+++ trunk/Jmol/src/org/gennbo/NBODialogSearch.java 2017-02-06 04:48:33 UTC
(rev 21398)
@@ -933,11 +933,15 @@
switch (searchKeywordNumber) {
case KEYWD_NPA:
orb1 = comboSearchOrb2;
- atom1 = comboAtom1;
unit1 = comboUnit1;
- if (op > 10) {
- isLabel = true;
- op = 12;
+ if (op < 6 || op > 10) {
+ orb1 = null;
+ if (op > 10) {
+ isLabel = true;
+ op = 12;
+ } else if (op <= 3){
+ atom1 = comboAtom1;
+ }
}
break;
case KEYWD_NBO:
@@ -999,9 +1003,9 @@
if (orb2 != null)
postAddGlobalI(sb, labelOrb2, offset2, orb1);
if (atom1 != null)
- postAddGlobalI(sb, labelAtom1, 1, atom1);
+ postAddGlobalI(sb, labelAtom1, 0, atom1);
if (atom2 != null)
- postAddGlobalI(sb, labelAtom2, 1, atom2);
+ postAddGlobalI(sb, labelAtom2, 0, atom2);
if (unit1 != null)
postAddGlobalI(sb, labelUnit1, 1, unit1);
postAddGlobalI(sb, "OPT_" + keyProp, op, null);
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
------------------------------------------------------------------------------
Check out the vibrant tech community on one of the world's most
engaging tech sites, SlashDot.org! http://sdm.link/slashdot
_______________________________________________
Jmol-commits mailing list
Jmol-commits@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/jmol-commits
