Menu
▾
▴
[Jtreemap-svn] SF.net SVN: jtreemap: [51] trunk/JTreeMap/src/main/java
|
From: <be...@us...> - 2006-10-23 21:15:12
|
Revision: 51
http://svn.sourceforge.net/jtreemap/?rev=51&view=rev
Author: benoitx
Date: 2006-10-23 14:14:44 -0700 (Mon, 23 Oct 2006)
Log Message:
-----------
Moved remotely
Added Paths:
-----------
trunk/JTreeMap/src/main/java/net/sf/jtreemap/swing/SplitSquarified.java
Removed Paths:
-------------
trunk/JTreeMap/src/main/java/org/jense/swing/jtreemap/SplitSquarified.java
Copied: trunk/JTreeMap/src/main/java/net/sf/jtreemap/swing/SplitSquarified.java (from rev 50, trunk/JTreeMap/src/main/java/org/jense/swing/jtreemap/SplitSquarified.java)
===================================================================
--- trunk/JTreeMap/src/main/java/net/sf/jtreemap/swing/SplitSquarified.java (rev 0)
+++ trunk/JTreeMap/src/main/java/net/sf/jtreemap/swing/SplitSquarified.java 2006-10-23 21:14:44 UTC (rev 51)
@@ -0,0 +1,174 @@
+/*
+ * Created on 3 nov. 2005
+ */
+package org.jense.swing.jtreemap;
+
+import java.util.Vector;
+
+/**
+ * The Squarified split strategy
+ *
+ * @author Laurent DUTHEIL
+ */
+public class SplitSquarified extends SplitStrategy {
+ private int w1, h1;
+ private int x, y, w, h;
+ private int x2, y2, w2, h2;
+
+ @Override
+ public void splitElements(Vector<TreeMapNode> v, Vector<TreeMapNode> v1, Vector<TreeMapNode> v2) {
+ int mid = 0;
+ double weight0 = sumWeight(v);
+ double a = v.get(mid).getWeight() / weight0;
+ double b = a;
+
+ if (this.w < this.h) {
+ // height/width
+ while (mid < v.size()) {
+ double aspect = normAspect(this.h, this.w, a, b);
+ double q = v.get(mid).getWeight() / weight0;
+ if (normAspect(this.h, this.w, a, b + q) > aspect) {
+ break;
+ }
+ mid++;
+ b += q;
+ }
+ int i = 0;
+ for (; i <= mid && i < v.size(); i++) {
+ v1.add(v.get(i));
+ }
+ for (; i < v.size(); i++) {
+ v2.add(v.get(i));
+ }
+ this.h1 = (int) Math.round(this.h * b);
+ this.w1 = this.w;
+ this.x2 = this.x;
+ this.y2 = (int) Math.round(this.y + this.h * b);
+ this.w2 = this.w;
+ this.h2 = this.h - this.h1;
+ } else {
+ // width/height
+ while (mid < v.size()) {
+ double aspect = normAspect(this.w, this.h, a, b);
+ double q = v.get(mid).getWeight() / weight0;
+ if (normAspect(this.w, this.h, a, b + q) > aspect) {
+ break;
+ }
+ mid++;
+ b += q;
+ }
+ int i = 0;
+ for (; i <= mid && i < v.size(); i++) {
+ v1.add(v.get(i));
+ }
+ for (; i < v.size(); i++) {
+ v2.add(v.get(i));
+ }
+ this.h1 = this.h;
+ this.w1 = (int) Math.round(this.w * b);
+ this.x2 = (int) Math.round(this.x + this.w * b);
+ this.y2 = this.y;
+ this.w2 = this.w - this.w1;
+ this.h2 = this.h;
+ }
+ }
+
+ /*
+ * (non-Javadoc)
+ *
+ * @see org.jense.swing.jtreemap.SplitStrategy#calculatePositionsRec(int, int,
+ * int, int, double, java.util.Vector)
+ */
+ @Override
+ protected void calculatePositionsRec(int x0, int y0, int w0, int h0,
+ double weight0, Vector<TreeMapNode> v) {
+ Vector<TreeMapNode> vClone = new Vector<TreeMapNode>(v);
+
+ sortVector(vClone);
+
+ if (vClone.size() <= 2) {
+ SplitBySlice.splitInSlice(x0, y0, w0, h0, vClone, sumWeight(vClone));
+ calculateChildren(vClone);
+ } else {
+ Vector<TreeMapNode> v1 = new Vector<TreeMapNode>();
+ Vector<TreeMapNode> v2 = new Vector<TreeMapNode>();
+ this.x = x0;
+ this.y = y0;
+ this.w = w0;
+ this.h = h0;
+ splitElements(vClone, v1, v2);
+ //before the recurence, we have to "save" the values for the 2nd Vector
+ int x2 = this.x2;
+ int y2 = this.y2;
+ int w2 = this.w2;
+ int h2 = this.h2;
+ SplitBySlice.splitInSlice(x0, y0, this.w1, this.h1, v1, sumWeight(v1));
+ calculateChildren(v1);
+ calculatePositionsRec(x2, y2, w2, h2, sumWeight(v2), v2);
+ }
+
+ }
+
+ private double aspect(double big, double small, double a, double b) {
+ return (big * b) / (small * a / b);
+ }
+
+ /**
+ * Execute the recurence for the children of the elements of the vector.<BR>
+ * Add also the borders if necessary
+ *
+ * @param v Vector with the elements to calculate
+ */
+ private void calculateChildren(Vector<TreeMapNode> v) {
+ for (TreeMapNode node : v) {
+ if (node.isLeaf()) {
+ node.setX(node.getX() + TreeMapNode.getBorder());
+ node.setY(node.getY() + TreeMapNode.getBorder());
+ int w = node.getWidth() - TreeMapNode.getBorder();
+ if (w < 0) {
+ w = 0;
+ }
+ int h = node.getHeight() - TreeMapNode.getBorder();
+ if (h < 0) {
+ h = 0;
+ }
+ node.setHeight(h);
+ node.setWidth(w);
+ } else {
+ //if this is not a leaf, calculation for the children
+ int bSub;
+ if (TreeMapNode.getBorder() > 1) {
+ bSub = 2;
+ } else if (TreeMapNode.getBorder() == 1) {
+ bSub = 1;
+ } else {
+ bSub = 0;
+ }
+
+ int w = node.getWidth() - bSub;
+ if (w < 0) {
+ w = 0;
+ }
+ int h = node.getHeight() - bSub;
+ if (h < 0) {
+ h = 0;
+ }
+
+ TreeMapNode.setBorder(TreeMapNode.getBorder() - bSub);
+ calculatePositionsRec(node.getX() + bSub, node.getY() + bSub, w, h, node.getWeight(), node
+ .getChildren());
+ TreeMapNode.setBorder(TreeMapNode.getBorder() + bSub);
+ }
+
+ }
+ }
+
+ private double normAspect(double big, double small, double a, double b) {
+ double x = aspect(big, small, a, b);
+ if (x < 1) {
+ return 1 / x;
+ }
+ return x;
+ }
+
+}
Deleted: trunk/JTreeMap/src/main/java/org/jense/swing/jtreemap/SplitSquarified.java
===================================================================
--- trunk/JTreeMap/src/main/java/org/jense/swing/jtreemap/SplitSquarified.java 2006-10-23 21:13:05 UTC (rev 50)
+++ trunk/JTreeMap/src/main/java/org/jense/swing/jtreemap/SplitSquarified.java 2006-10-23 21:14:44 UTC (rev 51)
@@ -1,174 +0,0 @@
-/*
- * Created on 3 nov. 2005
- */
-package org.jense.swing.jtreemap;
-
-import java.util.Vector;
-
-/**
- * The Squarified split strategy
- *
- * @author Laurent DUTHEIL
- */
-public class SplitSquarified extends SplitStrategy {
- private int w1, h1;
- private int x, y, w, h;
- private int x2, y2, w2, h2;
-
- @Override
- public void splitElements(Vector<TreeMapNode> v, Vector<TreeMapNode> v1, Vector<TreeMapNode> v2) {
- int mid = 0;
- double weight0 = sumWeight(v);
- double a = v.get(mid).getWeight() / weight0;
- double b = a;
-
- if (this.w < this.h) {
- // height/width
- while (mid < v.size()) {
- double aspect = normAspect(this.h, this.w, a, b);
- double q = v.get(mid).getWeight() / weight0;
- if (normAspect(this.h, this.w, a, b + q) > aspect) {
- break;
- }
- mid++;
- b += q;
- }
- int i = 0;
- for (; i <= mid && i < v.size(); i++) {
- v1.add(v.get(i));
- }
- for (; i < v.size(); i++) {
- v2.add(v.get(i));
- }
- this.h1 = (int) Math.round(this.h * b);
- this.w1 = this.w;
- this.x2 = this.x;
- this.y2 = (int) Math.round(this.y + this.h * b);
- this.w2 = this.w;
- this.h2 = this.h - this.h1;
- } else {
- // width/height
- while (mid < v.size()) {
- double aspect = normAspect(this.w, this.h, a, b);
- double q = v.get(mid).getWeight() / weight0;
- if (normAspect(this.w, this.h, a, b + q) > aspect) {
- break;
- }
- mid++;
- b += q;
- }
- int i = 0;
- for (; i <= mid && i < v.size(); i++) {
- v1.add(v.get(i));
- }
- for (; i < v.size(); i++) {
- v2.add(v.get(i));
- }
- this.h1 = this.h;
- this.w1 = (int) Math.round(this.w * b);
- this.x2 = (int) Math.round(this.x + this.w * b);
- this.y2 = this.y;
- this.w2 = this.w - this.w1;
- this.h2 = this.h;
- }
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.jense.swing.jtreemap.SplitStrategy#calculatePositionsRec(int, int,
- * int, int, double, java.util.Vector)
- */
- @Override
- protected void calculatePositionsRec(int x0, int y0, int w0, int h0,
- double weight0, Vector<TreeMapNode> v) {
- Vector<TreeMapNode> vClone = new Vector<TreeMapNode>(v);
-
- sortVector(vClone);
-
- if (vClone.size() <= 2) {
- SplitBySlice.splitInSlice(x0, y0, w0, h0, vClone, sumWeight(vClone));
- calculateChildren(vClone);
- } else {
- Vector<TreeMapNode> v1 = new Vector<TreeMapNode>();
- Vector<TreeMapNode> v2 = new Vector<TreeMapNode>();
- this.x = x0;
- this.y = y0;
- this.w = w0;
- this.h = h0;
- splitElements(vClone, v1, v2);
- //before the recurence, we have to "save" the values for the 2nd Vector
- int x2 = this.x2;
- int y2 = this.y2;
- int w2 = this.w2;
- int h2 = this.h2;
- SplitBySlice.splitInSlice(x0, y0, this.w1, this.h1, v1, sumWeight(v1));
- calculateChildren(v1);
- calculatePositionsRec(x2, y2, w2, h2, sumWeight(v2), v2);
- }
-
- }
-
- private double aspect(double big, double small, double a, double b) {
- return (big * b) / (small * a / b);
- }
-
- /**
- * Execute the recurence for the children of the elements of the vector.<BR>
- * Add also the borders if necessary
- *
- * @param v Vector with the elements to calculate
- */
- private void calculateChildren(Vector<TreeMapNode> v) {
- for (TreeMapNode node : v) {
- if (node.isLeaf()) {
- node.setX(node.getX() + TreeMapNode.getBorder());
- node.setY(node.getY() + TreeMapNode.getBorder());
- int w = node.getWidth() - TreeMapNode.getBorder();
- if (w < 0) {
- w = 0;
- }
- int h = node.getHeight() - TreeMapNode.getBorder();
- if (h < 0) {
- h = 0;
- }
- node.setHeight(h);
- node.setWidth(w);
- } else {
- //if this is not a leaf, calculation for the children
- int bSub;
- if (TreeMapNode.getBorder() > 1) {
- bSub = 2;
- } else if (TreeMapNode.getBorder() == 1) {
- bSub = 1;
- } else {
- bSub = 0;
- }
-
- int w = node.getWidth() - bSub;
- if (w < 0) {
- w = 0;
- }
- int h = node.getHeight() - bSub;
- if (h < 0) {
- h = 0;
- }
-
- TreeMapNode.setBorder(TreeMapNode.getBorder() - bSub);
- calculatePositionsRec(node.getX() + bSub, node.getY() + bSub, w, h, node.getWeight(), node
- .getChildren());
- TreeMapNode.setBorder(TreeMapNode.getBorder() + bSub);
- }
-
- }
- }
-
- private double normAspect(double big, double small, double a, double b) {
- double x = aspect(big, small, a, b);
- if (x < 1) {
- return 1 / x;
- }
- return x;
- }
-
-}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
