Author: kono
Date: 2012-03-09 16:50:22 -0800 (Fri, 09 Mar 2012)
New Revision: 28480
Added:
core3/api/trunk/layout-api/src/main/java/org/cytoscape/view/layout/LayoutPoint.java
Removed:
core3/api/trunk/layout-api/src/main/java/org/cytoscape/view/layout/Point.java
Modified:
core3/api/trunk/layout-api/src/main/java/org/cytoscape/view/layout/LayoutPartition.java
core3/impl/trunk/layout-cytoscape-impl/src/main/java/csapps/layout/algorithms/bioLayout/BioLayoutFRAlgorithmTask.java
core3/impl/trunk/layout-cytoscape-impl/src/main/java/csapps/layout/algorithms/bioLayout/BioLayoutKKAlgorithmTask.java
core3/impl/trunk/layout-prefuse-impl/src/main/java/org/cytoscape/prefuse/layouts/internal/ForceDirectedLayoutTask.java
Log:
refs #751 Point is renamed to LayoutPoint, which is an generic object
representing a (x, y) pair.
Modified:
core3/api/trunk/layout-api/src/main/java/org/cytoscape/view/layout/LayoutPartition.java
===================================================================
---
core3/api/trunk/layout-api/src/main/java/org/cytoscape/view/layout/LayoutPartition.java
2012-03-10 00:36:07 UTC (rev 28479)
+++
core3/api/trunk/layout-api/src/main/java/org/cytoscape/view/layout/LayoutPartition.java
2012-03-10 00:50:22 UTC (rev 28480)
@@ -454,9 +454,9 @@
*
* @return average location of the nodes as a Dimension
*/
- public Point getAverageLocation() {
+ public LayoutPoint getAverageLocation() {
int nodes = nodeCount() - lockedNodes;
- return new Point(averageX / nodes, averageY / nodes);
+ return new LayoutPoint(averageX / nodes, averageY / nodes);
}
/**
Copied:
core3/api/trunk/layout-api/src/main/java/org/cytoscape/view/layout/LayoutPoint.java
(from rev 28479,
core3/api/trunk/layout-api/src/main/java/org/cytoscape/view/layout/Point.java)
===================================================================
---
core3/api/trunk/layout-api/src/main/java/org/cytoscape/view/layout/LayoutPoint.java
(rev 0)
+++
core3/api/trunk/layout-api/src/main/java/org/cytoscape/view/layout/LayoutPoint.java
2012-03-10 00:50:22 UTC (rev 28480)
@@ -0,0 +1,26 @@
+package org.cytoscape.view.layout;
+
+
+/**
+ * Simple immutable object which represents a point (x, y).
+ *
+ */
+public final class LayoutPoint {
+
+ private final Double x;
+ private final Double y;
+
+ public LayoutPoint(final Double x, final Double y) {
+ this.x = x;
+ this.y = y;
+ }
+
+ public Double getX() {
+ return x;
+ }
+
+ public Double getY() {
+ return y;
+ }
+
+}
Deleted:
core3/api/trunk/layout-api/src/main/java/org/cytoscape/view/layout/Point.java
===================================================================
---
core3/api/trunk/layout-api/src/main/java/org/cytoscape/view/layout/Point.java
2012-03-10 00:36:07 UTC (rev 28479)
+++
core3/api/trunk/layout-api/src/main/java/org/cytoscape/view/layout/Point.java
2012-03-10 00:50:22 UTC (rev 28480)
@@ -1,25 +0,0 @@
-package org.cytoscape.view.layout;
-
-
-/**
- * Simple immutable object which represents a point (x, y).
- *
- */
-public final class Point {
- private final Double x;
- private final Double y;
-
- public Point(final Double x, final Double y) {
- this.x = x;
- this.y = y;
- }
-
- public Double getX() {
- return x;
- }
-
- public Double getY() {
- return y;
- }
-
-}
Modified:
core3/impl/trunk/layout-cytoscape-impl/src/main/java/csapps/layout/algorithms/bioLayout/BioLayoutFRAlgorithmTask.java
===================================================================
---
core3/impl/trunk/layout-cytoscape-impl/src/main/java/csapps/layout/algorithms/bioLayout/BioLayoutFRAlgorithmTask.java
2012-03-10 00:36:07 UTC (rev 28479)
+++
core3/impl/trunk/layout-cytoscape-impl/src/main/java/csapps/layout/algorithms/bioLayout/BioLayoutFRAlgorithmTask.java
2012-03-10 00:50:22 UTC (rev 28480)
@@ -8,7 +8,7 @@
import org.cytoscape.view.layout.LayoutEdge;
import org.cytoscape.view.layout.LayoutNode;
import org.cytoscape.view.layout.LayoutPartition;
-import org.cytoscape.view.layout.Point;
+import org.cytoscape.view.layout.LayoutPoint;
import org.cytoscape.view.model.CyNetworkView;
import org.cytoscape.view.model.View;
@@ -359,7 +359,7 @@
public void layoutPartion(LayoutPartition partition) {
this.partition = partition;
- Point initialLocation = null;
+ LayoutPoint initialLocation = null;
/* Get all of our profiles */
/*
@@ -459,7 +459,7 @@
if (selectedOnly) {
double xDelta = 0.0;
double yDelta = 0.0;
- final Point finalLocation =
partition.getAverageLocation();
+ final LayoutPoint finalLocation =
partition.getAverageLocation();
xDelta = finalLocation.getX() - initialLocation.getX();
yDelta = finalLocation.getY() - initialLocation.getY();
Modified:
core3/impl/trunk/layout-cytoscape-impl/src/main/java/csapps/layout/algorithms/bioLayout/BioLayoutKKAlgorithmTask.java
===================================================================
---
core3/impl/trunk/layout-cytoscape-impl/src/main/java/csapps/layout/algorithms/bioLayout/BioLayoutKKAlgorithmTask.java
2012-03-10 00:36:07 UTC (rev 28479)
+++
core3/impl/trunk/layout-cytoscape-impl/src/main/java/csapps/layout/algorithms/bioLayout/BioLayoutKKAlgorithmTask.java
2012-03-10 00:50:22 UTC (rev 28480)
@@ -12,7 +12,7 @@
import org.cytoscape.view.layout.LayoutEdge;
import org.cytoscape.view.layout.LayoutNode;
import org.cytoscape.view.layout.LayoutPartition;
-import org.cytoscape.view.layout.Point;
+import org.cytoscape.view.layout.LayoutPoint;
import org.cytoscape.view.model.CyNetworkView;
import org.cytoscape.view.model.View;
@@ -279,7 +279,7 @@
* Perform a layout
*/
public void layoutPartion(LayoutPartition partition) {
- Point initialLocation = null;
+ LayoutPoint initialLocation = null;
this.partition = partition;
// Initialize all of our values. This will create
// our internal objects and initialize them
@@ -454,7 +454,7 @@
if (selectedOnly) {
double xDelta = 0.0;
double yDelta = 0.0;
- final Point finalLocation =
partition.getAverageLocation();
+ final LayoutPoint finalLocation =
partition.getAverageLocation();
xDelta = finalLocation.getX() - initialLocation.getX();
yDelta = finalLocation.getY() - initialLocation.getY();
for (LayoutNode v: partition.getNodeList()) {
Modified:
core3/impl/trunk/layout-prefuse-impl/src/main/java/org/cytoscape/prefuse/layouts/internal/ForceDirectedLayoutTask.java
===================================================================
---
core3/impl/trunk/layout-prefuse-impl/src/main/java/org/cytoscape/prefuse/layouts/internal/ForceDirectedLayoutTask.java
2012-03-10 00:36:07 UTC (rev 28479)
+++
core3/impl/trunk/layout-prefuse-impl/src/main/java/org/cytoscape/prefuse/layouts/internal/ForceDirectedLayoutTask.java
2012-03-10 00:50:22 UTC (rev 28480)
@@ -41,7 +41,7 @@
import org.cytoscape.view.layout.LayoutEdge;
import org.cytoscape.view.layout.LayoutNode;
import org.cytoscape.view.layout.LayoutPartition;
-import org.cytoscape.view.layout.Point;
+import org.cytoscape.view.layout.LayoutPoint;
import org.cytoscape.view.model.CyNetworkView;
import org.cytoscape.view.model.View;
@@ -119,7 +119,7 @@
public void layoutPartion(LayoutPartition part) {
- Point initialLocation = null;
+ LayoutPoint initialLocation = null;
// System.out.println("layoutPartion:
"+part.getEdgeList().size()+" edges");
// Calculate our edge weights
part.calculateEdgeWeights();
@@ -185,7 +185,7 @@
if (selectedOnly) {
double xDelta = 0.0;
double yDelta = 0.0;
- final Point finalLocation = part.getAverageLocation();
+ final LayoutPoint finalLocation =
part.getAverageLocation();
xDelta = finalLocation.getX() - initialLocation.getX();
yDelta = finalLocation.getY() - initialLocation.getY();
for (LayoutNode v: part.getNodeList()) {
--
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.
