Revision: 20456
http://sourceforge.net/p/jmol/code/20456
Author: hansonr
Date: 2015-04-23 00:18:26 +0000 (Thu, 23 Apr 2015)
Log Message:
-----------
Jmol.___JmolVersion="14.3.13_2015.04.22"
bug fix: loading mmCIF data in-line loses multi-character chain IDs
bug fix: with set picking dragSelected with allowMoveAtoms FALSE and
allowRotateSelected TRUE
rotating the atoms with ALT-left ignores setting of allowMoveAtoms
// see footnotes below for ^, $, #, and *
//
// settings:^ set picking dragSelected set dragSelected
//
// move:# drag alt-shift-drag
// rotate:#* alt-drag alt-drag
// z-shift:# shift-drag (n/a)
//
// double-click:$ (starts measurement) (sets selected if set picking
SELECT)
//
// ^ set picking dragSelected overrules set dragSelected
// # all actions involve whole molecules unless set allowMoveAtoms TRUE
// * rotate requires set allowRotateSelected TRUE
// $ set dragSelected allows quick setting of a new molecule using
double-click
// $ set picking dragSelected allows measurements with double-click, as
usual
Modified Paths:
--------------
trunk/Jmol/src/org/jmol/viewer/ActionManager.java
trunk/Jmol/src/org/jmol/viewer/Viewer.java
Modified: trunk/Jmol/src/org/jmol/viewer/ActionManager.java
===================================================================
--- trunk/Jmol/src/org/jmol/viewer/ActionManager.java 2015-04-23 00:05:33 UTC
(rev 20455)
+++ trunk/Jmol/src/org/jmol/viewer/ActionManager.java 2015-04-23 00:18:26 UTC
(rev 20456)
@@ -97,7 +97,6 @@
}
}
-
/**
*
* Specific to ActionManagerMT -- for processing SparshUI gestures
@@ -111,15 +110,9 @@
*/
public void processMultitouchEvent(int groupID, int eventType, int touchID,
int iData,
P3 pt, long time) {
+ // see subclass
}
- boolean bnd(int mouseAction, int... jmolActions) {
- for (int i = jmolActions.length; --i >= 0;)
- if (b.isBound(mouseAction, jmolActions[i]))
- return true;
- return false;
- }
-
/**
*
* @param desc
@@ -373,6 +366,18 @@
b = newBinding;
}
+ boolean bnd(int mouseAction, int... jmolActions) {
+ for (int i = jmolActions.length; --i >= 0;)
+ if (b.isBound(mouseAction, jmolActions[i]))
+ return true;
+ return false;
+ }
+
+ private boolean isDrawOrLabelAction(int a) {
+ return (drawMode && bnd(a, ACTION_dragDrawObject, ACTION_dragDrawPoint)
+ || labelMode && bnd(a, ACTION_dragLabel));
+ }
+
/**
* picking modes set picking....
*/
@@ -968,9 +973,7 @@
if (Logger.debugging)
Logger.debug(Binding.getMouseActionName(pressAction, false));
- if (drawMode
- && bnd(dragAction, ACTION_dragDrawObject, ACTION_dragDrawPoint)
- || labelMode && bnd(dragAction, ACTION_dragLabel)) {
+ if (isDrawOrLabelAction(dragAction)) {
vwr.checkObjectDragged(Integer.MIN_VALUE, 0, x, y, dragAction);
return;
}
@@ -1143,9 +1146,7 @@
return;
}
- if (drawMode
- && bnd(dragWheelAction, ACTION_dragDrawObject, ACTION_dragDrawPoint)
- || labelMode && bnd(dragWheelAction, ACTION_dragLabel)) {
+ if (isDrawOrLabelAction(dragWheelAction)) {
setMotion(GenericPlatform.CURSOR_MOVE, true);
vwr.checkObjectDragged(dragged.x, dragged.y, x, y, dragWheelAction);
return;
@@ -1278,9 +1279,7 @@
vwr.notifyMouseClicked(x, y, Binding.getMouseAction(pressedCount, 0,
Event.RELEASED), Event.RELEASED);
}
- if (drawMode
- && bnd(dragAction, ACTION_dragDrawObject, ACTION_dragDrawPoint)
- || labelMode && bnd(dragAction, ACTION_dragLabel)) {
+ if (isDrawOrLabelAction(dragAction)) {
vwr.checkObjectDragged(Integer.MAX_VALUE, 0, x, y, dragAction);
return;
}
Modified: trunk/Jmol/src/org/jmol/viewer/Viewer.java
===================================================================
--- trunk/Jmol/src/org/jmol/viewer/Viewer.java 2015-04-23 00:05:33 UTC (rev
20455)
+++ trunk/Jmol/src/org/jmol/viewer/Viewer.java 2015-04-23 00:18:26 UTC (rev
20456)
@@ -1416,8 +1416,8 @@
return (haveDisplay ? acm.getRubberBand() : null);
}
- public boolean isBound(int action, int gesture) {
- return (haveDisplay && acm.bnd(action, gesture));
+ public boolean isBound(int mouseAction, int jmolAction) {
+ return (haveDisplay && acm.bnd(mouseAction, jmolAction));
}
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
------------------------------------------------------------------------------
BPM Camp - Free Virtual Workshop May 6th at 10am PDT/1PM EDT
Develop your own process in accordance with the BPMN 2 standard
Learn Process modeling best practices with Bonita BPM through live exercises
http://www.bonitasoft.com/be-part-of-it/events/bpm-camp-virtual- event?utm_
source=Sourceforge_BPM_Camp_5_6_15&utm_medium=email&utm_campaign=VA_SF
_______________________________________________
Jmol-commits mailing list
Jmol-commits@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/jmol-commits
