Browse Source

Pull request #4338: CHART-19306 无穷值显示增加等于号 & 默认渐变色修改

Merge in DESIGN/design from ~BJORN/design:feature/10.0 to feature/10.0

* commit 'cd40cde35e57e3f277dc213e211153f22d98ea98':
  颜色修改
  CHART-19306  默认渐变色修改
  CHART-19306 公式增加等于号
feature/10.0
Bjorn 4 years ago
parent
commit
d22df0ae3e
  1. 4
      designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/style/series/ColorPickerPaneWithMaxMin.java
  2. 2
      designer-chart/src/main/java/com/fr/van/chart/gauge/VanChartGaugeBeautyPane.java

4
designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/style/series/ColorPickerPaneWithMaxMin.java

@ -93,9 +93,9 @@ public class ColorPickerPaneWithMaxMin extends ColorPickerPaneWithFormula {
private void setTextState(TinyFormulaPane tinyFormulaPane, int index, int maxIndex, String value) {
boolean enable = false;
if (index == 0) {
value = "∞";
value = "=∞";
} else if (index == maxIndex) {
value = "-∞";
value = "=-∞";
} else {
enable = true;
}

2
designer-chart/src/main/java/com/fr/van/chart/gauge/VanChartGaugeBeautyPane.java

@ -1,5 +1,6 @@
package com.fr.van.chart.gauge;
import com.fr.chart.base.ChartConstants;
import com.fr.chart.base.GradientStyle;
import com.fr.design.i18n.Toolkit;
import com.fr.design.layout.TableLayout;
@ -46,6 +47,7 @@ public class VanChartGaugeBeautyPane extends VanChartBeautyPane {
};
gradientBarPane = TableLayout4VanChartHelper.createGapTableLayoutPane(components, rowSize, columnSize);
colorGradient.updateColor(ChartConstants.GRADIENT_END, ChartConstants.GRADIENT_START);
return gradientBarPane;
}

Loading…
Cancel
Save