Browse Source

修改9.0bug

master
mengao 7 years ago
parent
commit
4bf128919f
  1. 2
      designer_chart/src/com/fr/design/mainframe/chart/gui/type/ChartTabPane.java
  2. 4
      designer_chart/src/com/fr/plugin/chart/designer/AbstractVanChartScrollPane.java
  3. 16
      designer_chart/src/com/fr/plugin/chart/designer/component/VanChartTrendLinePane.java

2
designer_chart/src/com/fr/design/mainframe/chart/gui/type/ChartTabPane.java

@ -21,7 +21,7 @@ public abstract class ChartTabPane extends MultiTabPane<Chart> {
@Override
protected void initLayout() {
JPanel tabPanel = new JPanel(new BorderLayout());
tabPanel.setBorder(BorderFactory.createMatteBorder(0, 0, 0, 10, getBackground()));
tabPanel.setBorder(BorderFactory.createMatteBorder(0, 5, 0, 10, getBackground()));
tabPanel.add(tabPane, BorderLayout.CENTER);
this.setLayout(new BorderLayout(0, 4));
this.add(tabPanel, BorderLayout.NORTH);

4
designer_chart/src/com/fr/plugin/chart/designer/AbstractVanChartScrollPane.java

@ -13,7 +13,7 @@ public abstract class AbstractVanChartScrollPane<T> extends BasicScrollPane<T> {
protected void layoutContentPane() {
leftcontentPane = createContentPane();
leftcontentPane.setBorder(BorderFactory.createMatteBorder(0, 5, 0, 5, original));
leftcontentPane.setBorder(BorderFactory.createMatteBorder(0, 5, 0, 10, original));
this.add(leftcontentPane);
}
@ -27,7 +27,7 @@ public abstract class AbstractVanChartScrollPane<T> extends BasicScrollPane<T> {
} else {
leftcontentPane.setBounds(0, 0, width, height);
leftcontentPane.setBorder(BorderFactory.createMatteBorder(0, 5, 0, 5, original));
leftcontentPane.setBorder(BorderFactory.createMatteBorder(0, 5, 0, 10, original));
}
}
public void reloaPane(JPanel pane){

16
designer_chart/src/com/fr/plugin/chart/designer/component/VanChartTrendLinePane.java

@ -47,16 +47,18 @@ public class VanChartTrendLinePane extends BasicPane{
trendLineStyle = new LineComboBox(VanChartConstants.ALERT_LINE_STYLE);
trendLineType = new UIComboBox(TYPES);
prePeriod = new UISpinner(0,Integer.MAX_VALUE,1,0);
afterPeriod = new UISpinner(0,Integer.MAX_VALUE,1,0);
double[] r = {p,p};
double[] c = {p,f,p};
prePeriod = new UISpinner(0, Integer.MAX_VALUE, 1, 0);
afterPeriod = new UISpinner(0, Integer.MAX_VALUE, 1, 0);
double[] r = {p, p};
double[] c = {f, p, f, p};
Component[][] periodComps = new Component[][]{
new Component[]{new UILabel(Inter.getLocText("Chart_TrendLine_Forward")), prePeriod, new UILabel(Inter.getLocText("Plugin-ChartF_Cycle"))},
new Component[]{new UILabel(Inter.getLocText("Plugin-ChartF_After_Period")), afterPeriod, new UILabel(Inter.getLocText("Plugin-ChartF_Cycle"))},
new Component[]{prePeriod, new UILabel(Inter.getLocText("Plugin-ChartF_Cycle")), afterPeriod, new UILabel(Inter.getLocText("Plugin-ChartF_Cycle"))},
new Component[]{new UILabel(Inter.getLocText("Chart_TrendLine_Forward")), null, new UILabel(Inter.getLocText("Plugin-ChartF_After_Period")), null},
};
JPanel periodPane = TableLayoutHelper.createTableLayoutPane(periodComps, r, c);
UILabel label = new UILabel(Inter.getLocText("Plugin-ChartF_Period"));
label.setVerticalAlignment(SwingConstants.TOP);
Component[][] components = new Component[][]{
new Component[]{null, null},
@ -64,7 +66,7 @@ public class VanChartTrendLinePane extends BasicPane{
new Component[]{new UILabel(Inter.getLocText("Plugin-ChartF_LineStyle")), trendLineStyle},
new Component[]{new UILabel(Inter.getLocText("FR-Chart-Color_Color")), trendLineColor},
new Component[]{new UILabel(Inter.getLocText("Plugin-ChartF_type")), trendLineType},
new Component[]{new UILabel(Inter.getLocText("Plugin-ChartF_Period")), periodPane}
new Component[]{label, periodPane}
};
JPanel panel = TableLayout4VanChartHelper.createGapTableLayoutPane(components, row, col);

Loading…
Cancel
Save