From 3745f71f6476b72fc6650dc0f53ea02bb8b5c843 Mon Sep 17 00:00:00 2001 From: xiaohu Date: Wed, 27 Apr 2016 18:08:46 +0800 Subject: [PATCH] update --- .../gui/data/table/BubblePlotTableDataContentPane.java | 8 ++++---- .../chart/gui/style/series/BubbleSeriesPane.java | 3 ++- .../chart/gui/style/series/CombinedBubbleSeriesPane.java | 3 ++- 3 files changed, 8 insertions(+), 6 deletions(-) diff --git a/designer_chart/src/com/fr/design/mainframe/chart/gui/data/table/BubblePlotTableDataContentPane.java b/designer_chart/src/com/fr/design/mainframe/chart/gui/data/table/BubblePlotTableDataContentPane.java index 8e39c8398..73c5f1b18 100644 --- a/designer_chart/src/com/fr/design/mainframe/chart/gui/data/table/BubblePlotTableDataContentPane.java +++ b/designer_chart/src/com/fr/design/mainframe/chart/gui/data/table/BubblePlotTableDataContentPane.java @@ -52,10 +52,10 @@ public class BubblePlotTableDataContentPane extends AbstractTableDataContentPane double[] columnSize_north = {p, f}; double[] rowSize_north = {p, p, p, p}; Component[][] components_north = new Component[][]{ - new Component[]{new UILabel(" "+Inter.getLocText("Chart-Series_Name")+":"), seriesName}, - new Component[]{new UILabel(" " +"x :"), xCombox}, - new Component[]{new UILabel(" " +"y :"), yCombox}, - new Component[]{new UILabel(" "+Inter.getLocText("FR-Chart_Bubble_Size")+":"), bubbleSize}, + new Component[]{new UILabel(Inter.getLocText("Chart-Series_Name")+":", SwingConstants.RIGHT), seriesName}, + new Component[]{new UILabel("x :",SwingConstants.RIGHT), xCombox}, + new Component[]{new UILabel("y :",SwingConstants.RIGHT), yCombox}, + new Component[]{new UILabel(Inter.getLocText("FR-Chart_Bubble_Size")+":", SwingConstants.RIGHT), bubbleSize} }; JPanel north = TableLayoutHelper.createTableLayoutPane(components_north,rowSize_north,columnSize_north); north.setBorder(BorderFactory.createEmptyBorder(0, 0, 0, 1)); diff --git a/designer_chart/src/com/fr/design/mainframe/chart/gui/style/series/BubbleSeriesPane.java b/designer_chart/src/com/fr/design/mainframe/chart/gui/style/series/BubbleSeriesPane.java index 86f0cb280..cbd052974 100644 --- a/designer_chart/src/com/fr/design/mainframe/chart/gui/style/series/BubbleSeriesPane.java +++ b/designer_chart/src/com/fr/design/mainframe/chart/gui/style/series/BubbleSeriesPane.java @@ -45,7 +45,8 @@ public class BubbleSeriesPane extends AbstractPlotSeriesPane{ super.updateBean(plot); BubblePlot bubblePlot = (BubblePlot) plot; bubblePlot.setSeriesEqualsBubbleInWidthOrArea(bubbleMean.getSelectedItem()); - bubblePlot.setMaxBubblePixel(Utils.string2Number(zoomTime.getText()).doubleValue()); + Number result = Utils.string2Number(zoomTime.getText()); + bubblePlot.setMaxBubblePixel(result == null ? 0 : result.doubleValue()); bubblePlot.setShowNegativeBubble(isMinus.isSelected()); } diff --git a/designer_chart/src/com/fr/design/mainframe/chart/gui/style/series/CombinedBubbleSeriesPane.java b/designer_chart/src/com/fr/design/mainframe/chart/gui/style/series/CombinedBubbleSeriesPane.java index 2aec32a2e..222572325 100644 --- a/designer_chart/src/com/fr/design/mainframe/chart/gui/style/series/CombinedBubbleSeriesPane.java +++ b/designer_chart/src/com/fr/design/mainframe/chart/gui/style/series/CombinedBubbleSeriesPane.java @@ -56,7 +56,8 @@ public class CombinedBubbleSeriesPane extends BubbleSeriesPane{ public void updateBean(Plot plot) { super.updateBean(plot); - plot.setCombinedSize(Utils.string2Number(zoomTime.getText()).doubleValue()); + Number result = Utils.string2Number(zoomTime.getText()); + plot.setCombinedSize(result == null ? 0 : result.doubleValue()); plot.setPlotFillStyle(fillColorPane.updateBean()); } } \ No newline at end of file