Browse Source

update

master
xiaohu 9 years ago
parent
commit
2cf21f8842
  1. 8
      designer_chart/src/com/fr/design/mainframe/chart/gui/data/table/BubblePlotTableDataContentPane.java
  2. 3
      designer_chart/src/com/fr/design/mainframe/chart/gui/style/series/BubbleSeriesPane.java
  3. 3
      designer_chart/src/com/fr/design/mainframe/chart/gui/style/series/CombinedBubbleSeriesPane.java

8
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));

3
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());
}

3
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());
}
}
Loading…
Cancel
Save