Browse Source

CHART-11709

feature/big-screen
白岳 5 years ago
parent
commit
011f0098d8
  1. 6
      designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/style/ChartColorAdjustPane.java
  2. 2
      designer-chart/src/main/java/com/fr/van/chart/designer/component/VanChartFillStylePane.java

6
designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/style/ChartColorAdjustPane.java

@ -34,7 +34,7 @@ import java.awt.image.BufferedImage;
*/ */
public class ChartColorAdjustPane extends JPanel implements UIObserver { public class ChartColorAdjustPane extends JPanel implements UIObserver {
public static final Color[] defaultColors = { public static final Color[] DEFAULT_COLORS = {
new Color(99, 178, 238), new Color(99, 178, 238),
new Color(118, 218, 145), new Color(118, 218, 145),
new Color(248, 203, 127), new Color(248, 203, 127),
@ -61,7 +61,7 @@ public class ChartColorAdjustPane extends JPanel implements UIObserver {
public ChartColorAdjustPane() { public ChartColorAdjustPane() {
this(defaultColors); this(DEFAULT_COLORS);
} }
public ChartColorAdjustPane(Color[] colors) { public ChartColorAdjustPane(Color[] colors) {
@ -71,7 +71,7 @@ public class ChartColorAdjustPane extends JPanel implements UIObserver {
} }
public void updateColor() { public void updateColor() {
updateColor(defaultColors); updateColor(DEFAULT_COLORS);
} }
public void updateColor(Color[] colors) { public void updateColor(Color[] colors) {

2
designer-chart/src/main/java/com/fr/van/chart/designer/component/VanChartFillStylePane.java

@ -58,7 +58,7 @@ public class VanChartFillStylePane extends BasicBeanPane<AttrFillStyle> {
changeColorSetPane.add(colorGradient = new FixedGradientBar(4, 130), "gradient"); changeColorSetPane.add(colorGradient = new FixedGradientBar(4, 130), "gradient");
gradientColors = new Color[]{Color.WHITE, FixedGradientBar.NEW_CHARACTER}; gradientColors = new Color[]{Color.WHITE, FixedGradientBar.NEW_CHARACTER};
changeColorSetPane.add(colorAdjustPane = new ChartColorAdjustPane(), "acc"); changeColorSetPane.add(colorAdjustPane = new ChartColorAdjustPane(), "acc");
accColors = ChartColorAdjustPane.defaultColors; accColors = ChartColorAdjustPane.DEFAULT_COLORS;
cardLayout.show(changeColorSetPane, "acc"); cardLayout.show(changeColorSetPane, "acc");
customPane.add(changeColorSetPane, BorderLayout.CENTER); customPane.add(changeColorSetPane, BorderLayout.CENTER);
initListener(); initListener();

Loading…
Cancel
Save