Author: ruschein
Date: 2010-11-17 15:15:24 -0800 (Wed, 17 Nov 2010)
New Revision: 22884
Modified:
core3/ding-presentation-impl/trunk/src/main/java/org/cytoscape/ding/impl/DEdgeDetails.java
core3/ding-presentation-impl/trunk/src/main/java/org/cytoscape/ding/impl/DGraphView.java
core3/ding-presentation-impl/trunk/src/main/java/org/cytoscape/ding/impl/DNodeDetails.java
core3/ding-presentation-impl/trunk/src/main/java/org/cytoscape/ding/impl/InnerCanvas.java
Log:
Removed node/edge index complementing.
Modified:
core3/ding-presentation-impl/trunk/src/main/java/org/cytoscape/ding/impl/DEdgeDetails.java
===================================================================
---
core3/ding-presentation-impl/trunk/src/main/java/org/cytoscape/ding/impl/DEdgeDetails.java
2010-11-17 23:10:03 UTC (rev 22883)
+++
core3/ding-presentation-impl/trunk/src/main/java/org/cytoscape/ding/impl/DEdgeDetails.java
2010-11-17 23:15:24 UTC (rev 22884)
@@ -239,7 +239,7 @@
* @return DOCUMENT ME!
*/
public EdgeAnchors anchors(int edge) {
- final EdgeAnchors returnThis = (EdgeAnchors)
(m_view.getEdgeView(~edge));
+ final EdgeAnchors returnThis = (EdgeAnchors)
(m_view.getEdgeView(edge));
if (returnThis.numAnchors() > 0)
return returnThis;
@@ -319,14 +319,14 @@
break;
// So we don't count the other edge twice?
- int i = (((EdgeAnchors)
m_view.getEdgeView(~otherEdge)).numAnchors() == 0) ? 1 : 0;
+ int i = (((EdgeAnchors)
m_view.getEdgeView(otherEdge)).numAnchors() == 0) ? 1 : 0;
// Count the number of other edges.
while (true) {
if (edge == (otherEdge = otherEdges.nextInt()))
break;
- if (((EdgeAnchors)
m_view.getEdgeView(~otherEdge)).numAnchors() == 0)
+ if (((EdgeAnchors)
m_view.getEdgeView(otherEdge)).numAnchors() == 0)
i++;
}
@@ -407,8 +407,8 @@
* @return DOCUMENT ME!
*/
public float anchorSize(int edge, int anchorInx) {
- if (m_view.getEdgeView(~edge).isSelected()
- && (((DEdgeView) m_view.getEdgeView(~edge)).numAnchors() >
0))
+ if (m_view.getEdgeView(edge).isSelected()
+ && (((DEdgeView) m_view.getEdgeView(edge)).numAnchors() >
0))
return m_view.getAnchorSize();
else
@@ -424,7 +424,7 @@
* @return DOCUMENT ME!
*/
public Paint anchorPaint(int edge, int anchorInx) {
- if (((DEdgeView) (m_view.getEdgeView(~edge))).m_lineType ==
DEdgeView.STRAIGHT_LINES)
+ if (((DEdgeView) (m_view.getEdgeView(edge))).m_lineType ==
DEdgeView.STRAIGHT_LINES)
anchorInx = anchorInx / 2;
if (m_view.m_selectedAnchors.count((edge << 6) | anchorInx) > 0)
Modified:
core3/ding-presentation-impl/trunk/src/main/java/org/cytoscape/ding/impl/DGraphView.java
===================================================================
---
core3/ding-presentation-impl/trunk/src/main/java/org/cytoscape/ding/impl/DGraphView.java
2010-11-17 23:10:03 UTC (rev 22883)
+++
core3/ding-presentation-impl/trunk/src/main/java/org/cytoscape/ding/impl/DGraphView.java
2010-11-17 23:15:24 UTC (rev 22884)
@@ -2140,7 +2140,7 @@
if (treatNodeShapesAsRectangle) {
for (int i = 0; i < totalHits; i++)
- returnVal.push(~under.nextInt());
+ returnVal.push(under.nextInt());
} else {
final double x = xMin;
final double y = yMin;
@@ -2164,17 +2164,14 @@
m_path);
if ((w > 0) && (h > 0)) {
- if
(m_path.intersects(x, y, w, h)) {
-
returnVal.push(~node);
- }
+ if
(m_path.intersects(x, y, w, h))
+
returnVal.push(node);
} else {
- if (m_path.contains(x,
y)) {
-
returnVal.push(~node);
- }
+ if (m_path.contains(x,
y))
+
returnVal.push(node);
}
- } else {
- returnVal.push(~node);
- }
+ } else
+ returnVal.push(node);
}
}
}
Modified:
core3/ding-presentation-impl/trunk/src/main/java/org/cytoscape/ding/impl/DNodeDetails.java
===================================================================
---
core3/ding-presentation-impl/trunk/src/main/java/org/cytoscape/ding/impl/DNodeDetails.java
2010-11-17 23:10:03 UTC (rev 22883)
+++
core3/ding-presentation-impl/trunk/src/main/java/org/cytoscape/ding/impl/DNodeDetails.java
2010-11-17 23:15:24 UTC (rev 22884)
@@ -505,7 +505,7 @@
@Override
public TexturePaint getNestedNetworkTexturePaint(final int node) {
- final DNodeView dNodeView = (DNodeView)
m_view.getNodeView(~node);
+ final DNodeView dNodeView = (DNodeView)
m_view.getNodeView(node);
return dNodeView.getNestedNetworkTexturePaint();
}
Modified:
core3/ding-presentation-impl/trunk/src/main/java/org/cytoscape/ding/impl/InnerCanvas.java
===================================================================
---
core3/ding-presentation-impl/trunk/src/main/java/org/cytoscape/ding/impl/InnerCanvas.java
2010-11-17 23:10:03 UTC (rev 22883)
+++
core3/ding-presentation-impl/trunk/src/main/java/org/cytoscape/ding/impl/InnerCanvas.java
2010-11-17 23:15:24 UTC (rev 22884)
@@ -1,14 +1,6 @@
-
/*
- Copyright (c) 2006, 2007, The Cytoscape Consortium (www.cytoscape.org)
+ Copyright (c) 2006, 2007, 2010, The Cytoscape Consortium (www.cytoscape.org)
- The Cytoscape Consortium is:
- - Institute for Systems Biology
- - University of California San Diego
- - Memorial Sloan-Kettering Cancer Center
- - Institut Pasteur
- - Agilent Technologies
-
This library is free software; you can redistribute it and/or modify it
under the terms of the GNU Lesser General Public License as published
by the Free Software Foundation; either version 2.1 of the License, or
@@ -33,9 +25,9 @@
along with this library; if not, write to the Free Software Foundation,
Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
*/
-
package org.cytoscape.ding.impl;
+
import java.awt.Color;
import java.awt.FontMetrics;
import java.awt.Graphics;
@@ -86,7 +78,7 @@
import phoebe.PhoebeCanvasDropListener;
import phoebe.PhoebeCanvasDroppable;
-// AJK: 04/26/06 END
+
/**
*
*/
@@ -1166,7 +1158,7 @@
m_line.setLine(nodeX, nodeY,
otherNodeX, otherNodeY);
if (m_line.intersects(xMin,
yMin, xMax - xMin, yMax - yMin))
- stack.push(~edge);
+ stack.push(edge);
}
}
@@ -1247,7 +1239,7 @@
if (m_path2.intersects(xMin -
segThicknessDiv2, yMin - segThicknessDiv2,
(xMax -
xMin) + (segThicknessDiv2 * 2),
(yMax -
yMin) + (segThicknessDiv2 * 2)))
- stack.push(~edge);
+ stack.push(edge);
}
}
--
You received this message because you are subscribed to the Google Groups
"cytoscape-cvs" group.
To post to this group, send email to [email protected].
To unsubscribe from this group, send email to
[email protected].
For more options, visit this group at
http://groups.google.com/group/cytoscape-cvs?hl=en.
