fanruan
/
design
6
1
Fork 2
Code Issues 2 Pull Requests Releases Wiki Activity
Browse Source

Pull request #2801: CHART-16595 视觉优化，地图部分自动的背景色，不允许设置不透明度 

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

* commit 'd7ef3e180f631595a8bcb8e4ee4c9c08327506fb':
  CHART-16595	视觉优化，地图部分自动的背景色，不允许设置不透明度
feature/big-screen
Bjorn 4 years ago
parent
dccdc05b9c d7ef3e180f
commit
129dd012ee
6 changed files with 75 additions and 63 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 60
      designer-chart/src/main/java/com/fr/van/chart/designer/component/background/VanChartBackgroundPane.java
  2. 13
      designer-chart/src/main/java/com/fr/van/chart/designer/component/background/VanChartBackgroundPaneWithOutImageAndShadow.java
  3. 34
      designer-chart/src/main/java/com/fr/van/chart/designer/component/background/VanChartBackgroundWithOutImagePane.java
  4. 20
      designer-chart/src/main/java/com/fr/van/chart/designer/component/background/VanChartBackgroundWithOutShadowWithRadiusPane.java
  5. 2
      designer-chart/src/main/java/com/fr/van/chart/designer/style/label/VanChartPlotLabelDetailPane.java
  6. 9
      designer-chart/src/main/java/com/fr/van/chart/drillmap/designer/other/VanChartDrillMapInteractivePane.java

60
designer-chart/src/main/java/com/fr/van/chart/designer/component/background/VanChartBackgroundPane.java
Unescape View File

@ -7,6 +7,7 @@ import com.fr.design.gui.frpane.UINumberDragPane;
import com.fr.design.gui.ibutton.UIButtonGroup;
import com.fr.design.gui.icombobox.UIComboBox;
import com.fr.design.gui.ilable.UILabel;
import com.fr.design.i18n.Toolkit;
import com.fr.design.layout.TableLayout;
import com.fr.design.mainframe.backgroundpane.BackgroundQuickPane;
import com.fr.design.mainframe.backgroundpane.ColorBackgroundQuickPane;
@ -39,6 +40,7 @@ public class VanChartBackgroundPane extends BasicPane {
protected List<BackgroundQuickPane> paneList;
protected UIComboBox typeComboBox;
private UILabel transparentLabel;
protected UINumberDragPane transparent;
protected UIButtonGroup<Boolean> shadow;
@ -46,6 +48,8 @@ public class VanChartBackgroundPane extends BasicPane {
private boolean hasAuto;
private static final int AUTO = 0;
public VanChartBackgroundPane() {
this(false);
}
@ -58,6 +62,9 @@ public class VanChartBackgroundPane extends BasicPane {
this.add(panel, BorderLayout.CENTER);
}
public UILabel getTransparentLabel() {
return transparentLabel;
}
public boolean isHasAuto() {
return hasAuto;
@ -78,6 +85,7 @@ public class VanChartBackgroundPane extends BasicPane {
final CardLayout cardlayout = new CardLayout();
paneList = new ArrayList<>();
initAutoPane();
initList();
centerPane = new JPanel(cardlayout) {
@ -100,24 +108,43 @@ public class VanChartBackgroundPane extends BasicPane {
public void itemStateChanged(ItemEvent e) {
cardlayout.show(centerPane, (String) typeComboBox.getSelectedItem());
fireStateChanged();
checkTransparent();
}
});
transparentLabel = new UILabel(Toolkit.i18nText("Fine-Design_Report_Alpha"));
transparent = new UINumberDragPane(0, 100);
}
protected Component[][] getPaneComponents() {
shadow = new UIButtonGroup<Boolean>(new String[]{com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_On"), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Off")}, new Boolean[]{true, false});
shadow = new UIButtonGroup<Boolean>(new String[]{Toolkit.i18nText("Fine-Design_Chart_On"), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Off")}, new Boolean[]{true, false});
return new Component[][]{
new Component[]{null, null},
new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Fill")), typeComboBox},
new Component[]{new UILabel(Toolkit.i18nText("Fine-Design_Report_Fill")), typeComboBox},
new Component[]{null, centerPane},
new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Alpha")), transparent},
new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Shadow")), shadow},
new Component[]{transparentLabel, transparent},
new Component[]{new UILabel(Toolkit.i18nText("Fine-Design_Chart_Shadow")), shadow},
};
}
protected void initAutoPane() {
if (isHasAuto()) {
paneList.add(new NullBackgroundQuickPane() {
public String title4PopupWindow() {
return Toolkit.i18nText("Fine-Design_Chart_Automatic");
}
});
}
}
private void checkTransparent() {
if (isHasAuto()) {
boolean enable = typeComboBox.getSelectedIndex() != AUTO;
transparentLabel.setEnabled(enable);
transparent.setEnabled(enable);
}
}
protected void initList() {
paneList.add(new NullBackgroundQuickPane());
paneList.add(new ColorBackgroundQuickPane());
@ -158,7 +185,17 @@ public class VanChartBackgroundPane extends BasicPane {
if (shadow != null) {
shadow.setSelectedIndex(attr.isShadow() == true ? 0 : 1);
}
populateBackground(attr, 0);
if (isHasAuto()) {
if (attr.isAutoBackground()) {
typeComboBox.setSelectedIndex(AUTO);
checkTransparent();
return;
}
populateBackground(attr, 1);
} else {
populateBackground(attr, 0);
}
}
public void populateBackground(GeneralInfo attr, int begin) {
@ -168,20 +205,29 @@ public class VanChartBackgroundPane extends BasicPane {
if (pane.accept(background)) {
pane.populateBean(background);
typeComboBox.setSelectedIndex(i);
checkTransparent();
return;
}
}
checkTransparent();
}
public void update(GeneralInfo attr) {
if (attr == null) {
attr = new GeneralInfo();
}
updateBackground(attr);
attr.setAlpha((float) (transparent.updateBean() / ALPHA_V));
if (shadow != null) {
attr.setShadow(shadow.getSelectedIndex() == 0);
}
if (isHasAuto()) {
if (typeComboBox.getSelectedIndex() == AUTO) {
attr.setAutoBackground(true);
return;
}
attr.setAutoBackground(false);
}
updateBackground(attr);
}
public void updateBackground(GeneralInfo attr) {

13
designer-chart/src/main/java/com/fr/van/chart/designer/component/background/VanChartBackgroundPaneWithOutImageAndShadow.java
Unescape View File

@ -1,12 +1,10 @@
package com.fr.van.chart.designer.component.background;
import com.fr.design.gui.ilable.UILabel;
import com.fr.design.layout.TableLayout;
import com.fr.design.layout.TableLayoutHelper;
import com.fr.design.mainframe.backgroundpane.ColorBackgroundQuickPane;
import com.fr.design.mainframe.backgroundpane.NullBackgroundQuickPane;
import javax.swing.JPanel;
import java.awt.Component;
@ -16,6 +14,15 @@ import java.awt.Component;
*/
public class VanChartBackgroundPaneWithOutImageAndShadow extends VanChartBackgroundPane {
public VanChartBackgroundPaneWithOutImageAndShadow() {
this(false);
}
public VanChartBackgroundPaneWithOutImageAndShadow(boolean hasAuto) {
super(hasAuto);
}
@Override
protected JPanel initContentPanel() {
double p = TableLayout.PREFERRED;
@ -49,7 +56,7 @@ public class VanChartBackgroundPaneWithOutImageAndShadow extends VanChartBackgro
return new Component[][]{
new Component[]{typeComboBox, null},
new Component[]{centerPane, null},
new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Alpha")), transparent},
new Component[]{getTransparentLabel(), transparent},
};
}

34
designer-chart/src/main/java/com/fr/van/chart/designer/component/background/VanChartBackgroundWithOutImagePane.java
Unescape View File

@ -1,7 +1,5 @@
package com.fr.van.chart.designer.component.background;
import com.fr.chart.chartglyph.GeneralInfo;
import com.fr.design.i18n.Toolkit;
import com.fr.design.mainframe.backgroundpane.ColorBackgroundQuickPane;
import com.fr.design.mainframe.backgroundpane.NullBackgroundQuickPane;
import com.fr.design.mainframe.backgroundpane.VanChartGradientPane;
@ -13,8 +11,6 @@ import com.fr.design.mainframe.backgroundpane.VanChartGradientPane;
public class VanChartBackgroundWithOutImagePane extends VanChartBackgroundPane {
private static final long serialVersionUID = 1322979785605013853L;
private static final int AUTO = 0;
public VanChartBackgroundWithOutImagePane() {
this(false);
}
@ -24,38 +20,8 @@ public class VanChartBackgroundWithOutImagePane extends VanChartBackgroundPane {
}
protected void initList() {
if (isHasAuto()) {
paneList.add(new NullBackgroundQuickPane() {
public String title4PopupWindow() {
return Toolkit.i18nText("Fine-Design_Chart_Automatic");
}
});
}
paneList.add(new NullBackgroundQuickPane());
paneList.add(new ColorBackgroundQuickPane());
paneList.add(new VanChartGradientPane());
}
public void populateBackground(GeneralInfo attr, int begin) {
if (isHasAuto()) {
if (attr.isAutoBackground()) {
typeComboBox.setSelectedIndex(AUTO);
return;
}
super.populateBackground(attr, begin + 1);
} else {
super.populateBackground(attr, begin);
}
}
public void updateBackground(GeneralInfo attr) {
if (isHasAuto()) {
if (typeComboBox.getSelectedIndex() == AUTO) {
attr.setAutoBackground(true);
return;
}
attr.setAutoBackground(false);
}
super.updateBackground(attr);
}
}

20
designer-chart/src/main/java/com/fr/van/chart/designer/component/background/VanChartBackgroundWithOutShadowWithRadiusPane.java
Unescape View File

@ -3,7 +3,7 @@ package com.fr.van.chart.designer.component.background;
import com.fr.chart.chartglyph.GeneralInfo;
import com.fr.design.gui.ilable.UILabel;
import com.fr.design.gui.ispinner.UISpinner;
import com.fr.design.i18n.Toolkit;
import java.awt.Component;
@ -15,27 +15,27 @@ public class VanChartBackgroundWithOutShadowWithRadiusPane extends VanChartBackg
private UISpinner radius;
public VanChartBackgroundWithOutShadowWithRadiusPane(){
public VanChartBackgroundWithOutShadowWithRadiusPane() {
super();
}
public VanChartBackgroundWithOutShadowWithRadiusPane(boolean hasAuto){
public VanChartBackgroundWithOutShadowWithRadiusPane(boolean hasAuto) {
super(hasAuto);
}
protected Component[][] getPaneComponents() {
radius = new UISpinner(0,1000,1,0);
return new Component[][]{
radius = new UISpinner(0, 1000, 1, 0);
return new Component[][]{
new Component[]{null, null},
new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Fill")), typeComboBox},
new Component[]{new UILabel(Toolkit.i18nText("Fine-Design_Report_Fill")), typeComboBox},
new Component[]{null, centerPane},
new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Alpha")), transparent},
new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Radius")),radius}
new Component[]{getTransparentLabel(), transparent},
new Component[]{new UILabel(Toolkit.i18nText("Fine-Design_Report_Radius")), radius}
};
}
public void populate(GeneralInfo attr) {
if(attr == null) {
if (attr == null) {
return;
}
super.populate(attr);
@ -48,7 +48,7 @@ public class VanChartBackgroundWithOutShadowWithRadiusPane extends VanChartBackg
if (attr == null) {
attr = new GeneralInfo();
}
attr.setRoundRadius((int)radius.getValue());
attr.setRoundRadius((int) radius.getValue());
}
}

2
designer-chart/src/main/java/com/fr/van/chart/designer/style/label/VanChartPlotLabelDetailPane.java
Unescape View File

@ -153,7 +153,7 @@ public class VanChartPlotLabelDetailPane extends BasicPane {
new Component[]{null, null},
new Component[]{new UILabel(Toolkit.i18nText("Fine-Design_Report_Fill")), typeComboBox},
new Component[]{null, centerPane},
new Component[]{new UILabel(Toolkit.i18nText("Fine-Design_Report_Alpha")), transparent},
new Component[]{getTransparentLabel(), transparent},
};
}
};

9
designer-chart/src/main/java/com/fr/van/chart/drillmap/designer/other/VanChartDrillMapInteractivePane.java
Unescape View File

@ -7,7 +7,6 @@ import com.fr.design.i18n.Toolkit;
import com.fr.design.layout.TableLayout;
import com.fr.design.layout.TableLayoutHelper;
import com.fr.design.mainframe.backgroundpane.ColorBackgroundQuickPane;
import com.fr.design.mainframe.backgroundpane.NullBackgroundQuickPane;
import com.fr.design.mainframe.chart.gui.style.ChartTextAttrPane;
import com.fr.plugin.chart.attr.plot.VanChartPlot;
import com.fr.plugin.chart.drillmap.VanChartDrillMapPlot;
@ -77,15 +76,9 @@ public class VanChartDrillMapInteractivePane extends VanChartInteractivePaneWith
}
};
backgroundPane = new VanChartBackgroundPaneWithOutImageAndShadow() {
backgroundPane = new VanChartBackgroundPaneWithOutImageAndShadow(true) {
@Override
protected void initList() {
paneList.add(new NullBackgroundQuickPane() {
@Override
public String title4PopupWindow() {
return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Automatic");
}
});
paneList.add(new ColorBackgroundQuickPane());
}
};

Write Preview
Loading…
Cancel
Save