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. 16
      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.stable.StringUtils;
import com.fr.van.chart.designer.TableLayout4VanChartHelper;
import com.fr.van.chart.range.component.LegendGradientBar;
import javax.swing.JComponent;
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
public void userEvent(double value) {
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
public void userEvent(double value) {
if(!UIColorPickerPane.this.moveOnColorOrTextPane){

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

@ -14,7 +14,7 @@ import javax.swing.event.ChangeListener;
import java.awt.BorderLayout;
import java.awt.Component;
public class GradualIntervalConfigPane extends JPanel{
public class GradualIntervalConfigPane extends JPanel {
private static final long serialVersionUID = 1614283200308877353L;
//最大最小值面板
@ -26,7 +26,7 @@ public class GradualIntervalConfigPane extends JPanel{
//渐变色编辑器
private LegendGradientBar legendGradientBar;
public GradualIntervalConfigPane(){
public GradualIntervalConfigPane() {
initComponents();
}
@ -42,10 +42,10 @@ public class GradualIntervalConfigPane extends JPanel{
}
});
numberDragPane = new UINumberDragPane(1,6) {
numberDragPane = new UINumberDragPane(1, LegendGradientBar.COLOR_GRADUAL_NUM_MAX) {
@Override
public void userEvent(double value) {
legendGradientBar.refreshColorSelectionBtnNum((int)value);
legendGradientBar.refreshColorSelectionBtnNum((int) value);
}
};
@ -60,9 +60,9 @@ public class GradualIntervalConfigPane extends JPanel{
Component[][] components = getPaneComponents(minMaxValuePane, colorSelectBox, numberDragPane, legendGradientBar);
//控件承载面板
JPanel contentPane = TableLayout4VanChartHelper.createGapTableLayoutPane(components,row,col);
JPanel contentPane = TableLayout4VanChartHelper.createGapTableLayoutPane(components, row, col);
this.setLayout(new BorderLayout());
this.add(contentPane,BorderLayout.CENTER);
this.add(contentPane, BorderLayout.CENTER);
}
protected LegendGradientBar createLegendGradientBar() {
@ -81,7 +81,7 @@ public class GradualIntervalConfigPane extends JPanel{
};
}
public void populate(GradualIntervalConfig intervalConfig){
public void populate(GradualIntervalConfig intervalConfig) {
minMaxValuePane.populate(intervalConfig.getMinAndMaxValue());
colorSelectBox.setSelectObject(intervalConfig.getSubColor());
@ -92,7 +92,7 @@ public class GradualIntervalConfigPane extends JPanel{
legendGradientBar.populate(intervalConfig);
}
public void update(GradualIntervalConfig intervalConfig){
public void update(GradualIntervalConfig intervalConfig) {
minMaxValuePane.update(intervalConfig.getMinAndMaxValue());
intervalConfig.setSubColor(colorSelectBox.getSelectObject());

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 MAX_VERTICAL = 45;
//颜色选择器个数
private int colorSelectionBtnNum;
//主题色
private Color subColor;
private int max = 150;
private static int max = 150;
private int min = 4;
public static final int COLOR_GRADUAL_NUM_MAX = max / 5;
//选中的颜色
private Color color;

Loading…
Cancel
Save