Browse Source

Merge pull request #11237 in DESIGN/design from final/11.0 to release/11.0

* commit '1d961749cd6b0c4f5066ea1a5db784db16257428':
  REPORT-87781 图表渐变支持到30阶
release/11.0
superman 2 years ago
parent
commit
8209c1a3f7
  1. 5
      designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/style/series/UIColorPickerPane.java
  2. 2
      designer-chart/src/main/java/com/fr/van/chart/range/component/GradualIntervalConfigPane.java
  3. 4
      designer-chart/src/main/java/com/fr/van/chart/range/component/LegendGradientBar.java

5
designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/style/series/UIColorPickerPane.java

@ -21,6 +21,7 @@ import com.fr.design.style.color.ColorSelectBox;
import com.fr.design.utils.gui.GUICoreUtils; import com.fr.design.utils.gui.GUICoreUtils;
import com.fr.stable.StringUtils; import com.fr.stable.StringUtils;
import com.fr.van.chart.designer.TableLayout4VanChartHelper; import com.fr.van.chart.designer.TableLayout4VanChartHelper;
import com.fr.van.chart.range.component.LegendGradientBar;
import javax.swing.JComponent; import javax.swing.JComponent;
import javax.swing.JFrame; import javax.swing.JFrame;
@ -102,7 +103,7 @@ public class UIColorPickerPane extends BasicPane implements UIObserver {
} }
}); });
regionNumPane = new UINumberDragPane(1, 6) { regionNumPane = new UINumberDragPane(1, LegendGradientBar.COLOR_GRADUAL_NUM_MAX) {
@Override @Override
public void userEvent(double value) { public void userEvent(double value) {
if(!UIColorPickerPane.this.moveOnColorOrTextPane){ if(!UIColorPickerPane.this.moveOnColorOrTextPane){
@ -191,7 +192,7 @@ public class UIColorPickerPane extends BasicPane implements UIObserver {
} }
}); });
regionNumPane = new UINumberDragPane(1, 6) { regionNumPane = new UINumberDragPane(1, LegendGradientBar.COLOR_GRADUAL_NUM_MAX) {
@Override @Override
public void userEvent(double value) { public void userEvent(double value) {
if(!UIColorPickerPane.this.moveOnColorOrTextPane){ if(!UIColorPickerPane.this.moveOnColorOrTextPane){

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

@ -42,7 +42,7 @@ public class GradualIntervalConfigPane extends JPanel{
} }
}); });
numberDragPane = new UINumberDragPane(1,6) { numberDragPane = new UINumberDragPane(1, LegendGradientBar.COLOR_GRADUAL_NUM_MAX) {
@Override @Override
public void userEvent(double value) { public void userEvent(double value) {
legendGradientBar.refreshColorSelectionBtnNum((int) value); legendGradientBar.refreshColorSelectionBtnNum((int) value);

4
designer-chart/src/main/java/com/fr/van/chart/range/component/LegendGradientBar.java

@ -44,14 +44,16 @@ public class LegendGradientBar extends JComponent implements ColorSelectable, UI
private static final int REC_HEIGHT = 30; private static final int REC_HEIGHT = 30;
private static final int MAX_VERTICAL = 45; private static final int MAX_VERTICAL = 45;
//颜色选择器个数 //颜色选择器个数
private int colorSelectionBtnNum; private int colorSelectionBtnNum;
//主题色 //主题色
private Color subColor; private Color subColor;
private int max = 150; private static int max = 150;
private int min = 4; private int min = 4;
public static final int COLOR_GRADUAL_NUM_MAX = max / 5;
//选中的颜色 //选中的颜色
private Color color; private Color color;

Loading…
Cancel
Save