Revision: 20489
http://sourceforge.net/p/jmol/code/20489
Author: hansonr
Date: 2015-05-07 21:58:53 +0000 (Thu, 07 May 2015)
Log Message:
-----------
Jmol.___JmolVersion="14.3.13_2015.05.07b"
bug fix: BIND can cause fault
bug fix: write "?" can cause fault when [x] box is pushed on window
bug fix: set picking dragMolecule, set picking dragMinimizeMolecule, set
picking dragLigand broken
Modified Paths:
--------------
trunk/Jmol/src/org/jmol/modelset/ModelSet.java
trunk/Jmol/src/org/jmol/viewer/ActionManager.java
trunk/Jmol/src/org/jmol/viewer/Jmol.properties
Modified: trunk/Jmol/src/org/jmol/modelset/ModelSet.java
===================================================================
--- trunk/Jmol/src/org/jmol/modelset/ModelSet.java 2015-05-07 20:27:28 UTC
(rev 20488)
+++ trunk/Jmol/src/org/jmol/modelset/ModelSet.java 2015-05-07 21:58:53 UTC
(rev 20489)
@@ -2028,14 +2028,6 @@
bs.andNot(uc.notInCentroid(this, am[i].bsAtoms, minmax));
}
return bs;
- // case T.sidechain: -- can't reach this code -- sidechain is
hardwired
- // int ia = ((BS) specInfo).nextSetBit(0);
- // if (ia < 0)
- // return new BS();
- // if (at[ia].group.isStandardProtein)
- // return at[ia].group.getBSSideChain();
- // // treat as molecule if not PDB protein;
- // //$FALL-THROUGH$
case T.molecule:
return getMoleculeBitSet((BS) specInfo);
case T.spec_seqcode_range:
Modified: trunk/Jmol/src/org/jmol/viewer/ActionManager.java
===================================================================
--- trunk/Jmol/src/org/jmol/viewer/ActionManager.java 2015-05-07 20:27:28 UTC
(rev 20488)
+++ trunk/Jmol/src/org/jmol/viewer/ActionManager.java 2015-05-07 21:58:53 UTC
(rev 20489)
@@ -1035,8 +1035,8 @@
int deltaX, int deltaY, long time, int
mode) {
int buttonmods = Binding.getButtonMods(dragWheelAction);
if (buttonmods != 0) {
- int newAction = vwr.notifyMouseClicked(x, y, Binding.getMouseAction(
- pressedCount, buttonmods, mode), mode); // why was this
"-pressedCount"? passing to user?
+ int newAction = vwr.notifyMouseClicked(x, y,
+ Binding.getMouseAction(pressedCount, buttonmods, mode), mode); //
why was this "-pressedCount"? passing to user?
if (newAction == 0)
return;
if (newAction > 0)
@@ -1054,8 +1054,8 @@
if (vwr.getRotateBondIndex() >= 0) {
if (bnd(dragWheelAction, ACTION_rotateBranch)) {
- vwr.moveSelected(deltaX, deltaY, Integer.MIN_VALUE, x, y, null,
- false, false);
+ vwr.moveSelected(deltaX, deltaY, Integer.MIN_VALUE, x, y, null, false,
+ false);
return;
}
if (!bnd(dragWheelAction, ACTION_rotate))
@@ -1070,7 +1070,7 @@
case PICKING_DRAG_LIGAND:
case PICKING_DRAG_MOLECULE:
case PICKING_DRAG_MINIMIZE_MOLECULE:
- bs = vwr.ms.getAtoms(T.sidechain, BSUtil.newAndSetBit(dragAtomIndex));
+ bs = vwr.ms.getAtoms(T.molecule, BSUtil.newAndSetBit(dragAtomIndex));
if (apm == PICKING_DRAG_LIGAND)
bs.and(vwr.getAtomBitSet("ligand"));
//$FALL-THROUGH$
@@ -1081,8 +1081,8 @@
true);
setMotion(GenericPlatform.CURSOR_MOVE, true);
if (bnd(dragWheelAction, ACTION_rotateSelected)) {
- vwr.rotateSelected(getDegrees(deltaX, true), getDegrees(deltaY,
false),
- bs);
+ vwr.rotateSelected(getDegrees(deltaX, true),
+ getDegrees(deltaY, false), bs);
} else {
switch (apm) {
case PICKING_DRAG_LIGAND:
@@ -1091,10 +1091,12 @@
vwr.select(bs, false, 0, true);
break;
}
- vwr
- .moveAtomWithHydrogens(dragAtomIndex, deltaX, deltaY,
- (bnd(dragWheelAction, ACTION_dragZ) ? -deltaY
- : Integer.MIN_VALUE), bs);
+ vwr.moveAtomWithHydrogens(
+ dragAtomIndex,
+ deltaX,
+ deltaY,
+ (bnd(dragWheelAction, ACTION_dragZ) ? -deltaY :
Integer.MIN_VALUE),
+ bs);
}
// NAH! if (atomPickingMode == PICKING_DRAG_MINIMIZE_MOLECULE &&
(dragGesture.getPointCount() % 5 == 0))
// minimize(false);
@@ -1102,8 +1104,8 @@
}
}
- if (dragAtomIndex >= 0 && mode == Event.DRAGGED && bnd(clickAction,
ACTION_assignNew)
- && apm == PICKING_ASSIGN_ATOM) {
+ if (dragAtomIndex >= 0 && mode == Event.DRAGGED
+ && bnd(clickAction, ACTION_assignNew) && apm == PICKING_ASSIGN_ATOM) {
int nearestAtomIndex = vwr.findNearestAtomIndexMovable(x, y, false);
if (nearestAtomIndex >= 0) {
if (mp != null) {
@@ -1129,8 +1131,7 @@
vwr.translateXYBy(deltaX, deltaY);
return;
}
- if (dragSelectedMode
- && haveSelection
+ if (dragSelectedMode && haveSelection
&& bnd(dragWheelAction, ACTION_dragSelected, ACTION_rotateSelected)) {
// we will drag atoms and either rotate or translate them
// possibly just the atoms or possibly their molecule (decided in Viewer)
@@ -1159,10 +1160,10 @@
return;
}
if (bnd(dragWheelAction, ACTION_rotate)) {
-// if (vwr.g.useArcBall)
-// vwr.rotateArcBall(x, y, mouseDragFactor);
-// else
- vwr.rotateXYBy(getDegrees(deltaX, true), getDegrees(deltaY, false));
+ // if (vwr.g.useArcBall)
+ // vwr.rotateArcBall(x, y, mouseDragFactor);
+ // else
+ vwr.rotateXYBy(getDegrees(deltaX, true), getDegrees(deltaY, false));
return;
}
if (bnd(dragWheelAction, ACTION_rotateZorZoom)) {
Modified: trunk/Jmol/src/org/jmol/viewer/Jmol.properties
===================================================================
--- trunk/Jmol/src/org/jmol/viewer/Jmol.properties 2015-05-07 20:27:28 UTC
(rev 20488)
+++ trunk/Jmol/src/org/jmol/viewer/Jmol.properties 2015-05-07 21:58:53 UTC
(rev 20489)
@@ -18,7 +18,9 @@
bug fix: BIND can cause fault
bug fix: write "?" can cause fault when [x] box is pushed on window
+bug fix: set picking dragMolecule, set picking dragMinimizeMolecule, set
picking dragLigand broken
+
JmolVersion="14.3.13_2015.05.07"
bug fix: x = plane(@1 @2 @3) fails
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
------------------------------------------------------------------------------
One dashboard for servers and applications across Physical-Virtual-Cloud
Widest out-of-the-box monitoring support with 50+ applications
Performance metrics, stats and reports that give you Actionable Insights
Deep dive visibility with transaction tracing using APM Insight.
http://ad.doubleclick.net/ddm/clk/290420510;117567292;y
_______________________________________________
Jmol-commits mailing list
Jmol-commits@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/jmol-commits
