From e9d994e6ed3c6b23c3052f1739ee3135fa59251d Mon Sep 17 00:00:00 2001 From: brycecr Date: Wed, 1 Aug 2012 21:33:07 -0700 Subject: [PATCH 01/10] Update src/prefuse/action/layout/AxisLabelLayout.java --- src/prefuse/action/layout/AxisLabelLayout.java | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/prefuse/action/layout/AxisLabelLayout.java b/src/prefuse/action/layout/AxisLabelLayout.java index 397eaab..68e736b 100644 --- a/src/prefuse/action/layout/AxisLabelLayout.java +++ b/src/prefuse/action/layout/AxisLabelLayout.java @@ -594,4 +594,8 @@ protected VisualTable getTable() { } } + protected int getAxis() { + return m_axis; + } + } // end of class AxisLabels From f5fcc27c619af90567f7d984d20d00eb384da46f Mon Sep 17 00:00:00 2001 From: brycecr Date: Wed, 1 Aug 2012 21:35:06 -0700 Subject: [PATCH 02/10] Update src/prefuse/action/layout/AxisLabelLayout.java --- src/prefuse/action/layout/AxisLabelLayout.java | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/prefuse/action/layout/AxisLabelLayout.java b/src/prefuse/action/layout/AxisLabelLayout.java index 68e736b..a0fe258 100644 --- a/src/prefuse/action/layout/AxisLabelLayout.java +++ b/src/prefuse/action/layout/AxisLabelLayout.java @@ -594,6 +594,10 @@ protected VisualTable getTable() { } } + /** + * Returns whether this AxisLabelLayout + * manages an X or Y axis + * / protected int getAxis() { return m_axis; } From 501af973b9686cbf0824edae5f2eac4bd128043f Mon Sep 17 00:00:00 2001 From: brycecr Date: Thu, 2 Aug 2012 12:08:25 -0700 Subject: [PATCH 03/10] fixing setTransform; should be transform to properly apply transform to Graphics2D object --- src/prefuse/render/AxisRenderer.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/prefuse/render/AxisRenderer.java b/src/prefuse/render/AxisRenderer.java index 7fe2e89..d6d477d 100644 --- a/src/prefuse/render/AxisRenderer.java +++ b/src/prefuse/render/AxisRenderer.java @@ -151,7 +151,7 @@ public void render(Graphics2D g, VisualItem item) { String str = item.getString(VisualItem.LABEL); AffineTransform origTransform = g.getTransform(); AffineTransform transform = this.getTransform(item); - if ( transform != null ) g.setTransform(transform); + if ( transform != null ) g.transform(transform); g.setFont(item.getFont()); g.setColor(ColorLib.getColor(item.getTextColor())); From aaf9643626ea1caf286daae2574d61020fbe9a11 Mon Sep 17 00:00:00 2001 From: brycecr Date: Tue, 7 Aug 2012 10:52:09 -0700 Subject: [PATCH 04/10] DataColorAction palette now can be publically set. --- src/prefuse/action/assignment/DataColorAction.java | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/src/prefuse/action/assignment/DataColorAction.java b/src/prefuse/action/assignment/DataColorAction.java index d731aa9..8473dcd 100644 --- a/src/prefuse/action/assignment/DataColorAction.java +++ b/src/prefuse/action/assignment/DataColorAction.java @@ -151,6 +151,15 @@ public void setDataType(int type) { public int getScale() { return m_scale; } + + /** + * Set the palette this DataColorAction uses to assign colors. + * @param array of RGB values + */ + public void setPalette(int[] palette) { + m_palette = palette; + setup(); + } /** * Set the scale (linear, square root, or log) to use for encoding color From e8f7f77af620c12ff8ddafeb6f26d2dea5a9ad2b Mon Sep 17 00:00:00 2001 From: brycecr Date: Tue, 7 Aug 2012 10:52:09 -0700 Subject: [PATCH 05/10] DataColorAction palette now can be set publicly. --- src/prefuse/action/assignment/DataColorAction.java | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/src/prefuse/action/assignment/DataColorAction.java b/src/prefuse/action/assignment/DataColorAction.java index d731aa9..8473dcd 100644 --- a/src/prefuse/action/assignment/DataColorAction.java +++ b/src/prefuse/action/assignment/DataColorAction.java @@ -151,6 +151,15 @@ public void setDataType(int type) { public int getScale() { return m_scale; } + + /** + * Set the palette this DataColorAction uses to assign colors. + * @param array of RGB values + */ + public void setPalette(int[] palette) { + m_palette = palette; + setup(); + } /** * Set the scale (linear, square root, or log) to use for encoding color From c5e58399fb4833510abd15af60f29f47aaf2e6ca Mon Sep 17 00:00:00 2001 From: brycecr Date: Wed, 29 Aug 2012 18:11:39 -0700 Subject: [PATCH 06/10] fix for cascaded table and fix for fix for AxisLabelLayout --- src/prefuse/action/layout/AxisLabelLayout.java | 2 +- src/prefuse/data/CascadedTable.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/prefuse/action/layout/AxisLabelLayout.java b/src/prefuse/action/layout/AxisLabelLayout.java index a0fe258..636e91e 100644 --- a/src/prefuse/action/layout/AxisLabelLayout.java +++ b/src/prefuse/action/layout/AxisLabelLayout.java @@ -597,7 +597,7 @@ protected VisualTable getTable() { /** * Returns whether this AxisLabelLayout * manages an X or Y axis - * / + */ protected int getAxis() { return m_axis; } diff --git a/src/prefuse/data/CascadedTable.java b/src/prefuse/data/CascadedTable.java index 8daf01b..c851934 100644 --- a/src/prefuse/data/CascadedTable.java +++ b/src/prefuse/data/CascadedTable.java @@ -157,7 +157,7 @@ protected CascadedTable(Class tupleType) { protected void filterColumns() { if ( m_parent == null ) return; - for ( int i=0; i Date: Wed, 29 Aug 2012 18:13:30 -0700 Subject: [PATCH 07/10] fixed patches up --- src/prefuse/data/CascadedTable.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/prefuse/data/CascadedTable.java b/src/prefuse/data/CascadedTable.java index c851934..03c55f1 100644 --- a/src/prefuse/data/CascadedTable.java +++ b/src/prefuse/data/CascadedTable.java @@ -157,7 +157,7 @@ protected CascadedTable(Class tupleType) { protected void filterColumns() { if ( m_parent == null ) return; - for ( int i=0; i Date: Wed, 29 Aug 2012 18:22:48 -0700 Subject: [PATCH 08/10] revert --- build.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/build.xml b/build.xml index b8fe200..fc937be 100644 --- a/build.xml +++ b/build.xml @@ -14,7 +14,7 @@ - + @@ -308,4 +308,4 @@ - \ No newline at end of file + From accee53f21b21fe98c7d66539af5b4960445f51c Mon Sep 17 00:00:00 2001 From: brycecr Date: Wed, 29 Aug 2012 18:24:11 -0700 Subject: [PATCH 09/10] committing fixes --- src/prefuse/data/CascadedTable.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/prefuse/data/CascadedTable.java b/src/prefuse/data/CascadedTable.java index 03c55f1..5ae663c 100644 --- a/src/prefuse/data/CascadedTable.java +++ b/src/prefuse/data/CascadedTable.java @@ -157,7 +157,7 @@ protected CascadedTable(Class tupleType) { protected void filterColumns() { if ( m_parent == null ) return; - for ( int i=0; i Date: Wed, 29 Aug 2012 18:31:39 -0700 Subject: [PATCH 10/10] still fixing...done now --- build.xml | 4 ++-- src/prefuse/data/CascadedTable.java | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/build.xml b/build.xml index fc937be..3adc6ca 100644 --- a/build.xml +++ b/build.xml @@ -14,7 +14,7 @@ - + @@ -124,7 +124,7 @@ diff --git a/src/prefuse/data/CascadedTable.java b/src/prefuse/data/CascadedTable.java index 5ae663c..8daf01b 100644 --- a/src/prefuse/data/CascadedTable.java +++ b/src/prefuse/data/CascadedTable.java @@ -157,7 +157,7 @@ protected CascadedTable(Class tupleType) { protected void filterColumns() { if ( m_parent == null ) return; - for ( int i=0; i