Entropy
/
design
forked from fanruan/design
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
Browse Source

Merge pull request #1268 in BA/design from ~MANGO/m_design:release/9.0 to release/9.0 

* commit '1b805c0e8bcf03c5bfacf8ab06cec4adc3515a85':
  整理面板，修改监控刷新数据点提示设置面板 修改国际化问题
master
superman 7 years ago
parent
bbcfd29512 1b805c0e8b
commit
72a7a810a3
20 changed files with 104 additions and 54 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. 7
      designer_chart/src/com/fr/design/chart/ChartTypePane.java
  2. 8
      designer_chart/src/com/fr/design/chart/series/SeriesCondition/impl/ChartHyperPoplinkPane.java
  3. 5
      designer_chart/src/com/fr/design/mainframe/MiddleChartPropertyPane.java
  4. 3
      designer_chart/src/com/fr/design/mainframe/chart/gui/data/ChartDataFilterPane.java
  5. 4
      designer_chart/src/com/fr/design/mainframe/chart/gui/data/report/CategoryPlotMoreCateReportDataContentPane.java
  6. 2
      designer_chart/src/com/fr/design/mainframe/chart/gui/data/report/CategoryPlotReportDataContentPane.java
  7. 3
      designer_chart/src/com/fr/design/mainframe/chart/gui/data/table/MeterPlotTableDataContentPane.java
  8. 2
      designer_chart/src/com/fr/plugin/chart/bubble/data/VanChartBubblePlotTableDataContentPane.java
  9. 6
      designer_chart/src/com/fr/plugin/chart/designer/component/VanChartFillStylePane.java
  10. 2
      designer_chart/src/com/fr/plugin/chart/designer/component/VanChartTooltipContentPane.java
  11. 3
      designer_chart/src/com/fr/plugin/chart/designer/component/format/FormatPaneWithOutFont.java
  12. 3
      designer_chart/src/com/fr/plugin/chart/designer/other/AutoRefreshPane.java
  13. 1
      designer_chart/src/com/fr/plugin/chart/designer/style/VanChartRangeLegendPane.java
  14. 6
      designer_chart/src/com/fr/plugin/chart/designer/style/axis/VanChartBaseAxisPane.java
  15. 32
      designer_chart/src/com/fr/plugin/chart/designer/style/tooltip/VanChartPlotRefreshTooltipPane.java
  16. 7
      designer_chart/src/com/fr/plugin/chart/map/designer/VanChartGroupPane.java
  17. 6
      designer_chart/src/com/fr/plugin/chart/map/designer/VanMapAreaPointAndLineGroupPane.java
  18. 31
      designer_chart/src/com/fr/plugin/chart/map/designer/type/VanChartMapSourceChoosePane.java
  19. 17
      designer_chart/src/com/fr/plugin/chart/multilayer/data/MultiPiePlotTableDataContentPane.java
  20. 10
      designer_chart/src/com/fr/plugin/chart/structure/desinger/StructureIndependentVanChartInterface.java

7
designer_chart/src/com/fr/design/chart/ChartTypePane.java
Unescape View File

@ -97,12 +97,15 @@ public class ChartTypePane extends ChartCommonWizardPane {
if (value instanceof ChartIcon) {
this.setIcon((ChartIcon) value);
setHorizontalAlignment(UILabel.CENTER);
ChartIcon chartIcon = (ChartIcon) value;
if (isSelected) {
// 深蓝色.
this.setBackground(new Color(57, 107, 181));
this.setBorder(GUICoreUtils.createTitledBorder(getChartName(chartIcon), Color.WHITE));
} else {
this.setBorder(GUICoreUtils.createTitledBorder(getChartName(chartIcon)));
}
ChartIcon chartIcon = (ChartIcon) value;
this.setBorder(GUICoreUtils.createTitledBorder(getChartName(chartIcon), null));
}
return this;
}

8
designer_chart/src/com/fr/design/chart/series/SeriesCondition/impl/ChartHyperPoplinkPane.java
Unescape View File

@ -28,6 +28,7 @@ import java.awt.*;
*/
public class ChartHyperPoplinkPane extends BasicBeanPane<ChartHyperPoplink> {
private static final long serialVersionUID = 2469115951510144738L;
private static final int EDIT_PANE_WIDTH = 248;
private UITextField itemNameTextField;
private ChartHyperEditPane hyperEditPane;
private ChartComponent chartComponent;
@ -41,15 +42,16 @@ public class ChartHyperPoplinkPane extends BasicBeanPane<ChartHyperPoplink> {
}
hyperEditPane = new ChartHyperEditPane(getChartParaType(), getValueEditorPane(), getValueEditorPane());
this.add(hyperEditPane, BorderLayout.CENTER);
hyperEditPane.setPreferredSize(new Dimension(EDIT_PANE_WIDTH, (int)hyperEditPane.getPreferredSize().getHeight()));// 固定属性配置面板大小,灵活调整图表显示面板.
this.add(hyperEditPane, BorderLayout.WEST);
ChartCollection cc = createChartCollection();
chartComponent = new ChartComponent();
chartComponent.setPreferredSize(new Dimension(300, 170));// 在单元格弹出时 需要调整保证属性表的大小.
chartComponent.setPreferredSize(new Dimension((int)this.getPreferredSize().getWidth()-EDIT_PANE_WIDTH, 170));// 在单元格弹出时 需要调整保证属性表的大小.
chartComponent.setSupportEdit(false);
chartComponent.populate(cc);
this.add(chartComponent, BorderLayout.EAST);
this.add(chartComponent, BorderLayout.CENTER);
hyperEditPane.populate(cc);

5
designer_chart/src/com/fr/design/mainframe/MiddleChartPropertyPane.java
Unescape View File

@ -33,10 +33,11 @@ public abstract class MiddleChartPropertyPane extends BaseChartPropertyPane{
protected void initComponenet() {
this.setLayout(new BorderLayout());
this.setBorder(null);
this.setBorder(BorderFactory.createEmptyBorder(10,0,0,0));
createNameLabel();
this.add(createNorthComponent(), BorderLayout.NORTH);
//去掉上方名字，先注释掉
// this.add(createNorthComponent(), BorderLayout.NORTH);
chartEditPane = StableUtils.construct(ChartEditPane.class);
chartEditPane.setSupportCellData(true);
}

3
designer_chart/src/com/fr/design/mainframe/chart/gui/data/ChartDataFilterPane.java
Unescape View File

@ -59,9 +59,10 @@ public class ChartDataFilterPane extends ThirdTabPane<ChartCollection> {
if (nameArray.length > 1) {
pane.add(tabPane);
this.add(pane, BorderLayout.NORTH);
centerPane.setBorder(BorderFactory.createEmptyBorder(10,0,0,0));
}
centerPane.setBorder(null);
}
centerPane.setBorder(BorderFactory.createEmptyBorder(10,0,0,0));
this.add(centerPane, BorderLayout.CENTER);
}

4
designer_chart/src/com/fr/design/mainframe/chart/gui/data/report/CategoryPlotMoreCateReportDataContentPane.java
Unescape View File

@ -67,7 +67,7 @@ public class CategoryPlotMoreCateReportDataContentPane extends CategoryPlotRepor
catePane.add(boxPane, BorderLayout.SOUTH);
catePane.setBorder(BorderFactory.createEmptyBorder(0,24,10,15));
catePane.setBorder(BorderFactory.createEmptyBorder(0,24,10,6));
this.add(catePane, "0,0,2,0");
filterPane = new ChartDataFilterPane(new Bar2DPlot(), parent);
@ -96,7 +96,7 @@ public class CategoryPlotMoreCateReportDataContentPane extends CategoryPlotRepor
private TinyFormulaPane addNewCatePane() {
final TinyFormulaPane pane = initCategoryBox(StringUtils.EMPTY);
pane.setPreferredSize(new Dimension(106, 16));
pane.setPreferredSize(new Dimension(100, 16));
pane.registerChangeListener(uiobListener);

2
designer_chart/src/com/fr/design/mainframe/chart/gui/data/report/CategoryPlotReportDataContentPane.java
Unescape View File

@ -34,7 +34,7 @@ public class CategoryPlotReportDataContentPane extends AbstractReportDataContent
initEveryPane();
categoryName = initCategoryBox(Inter.getLocText("FR-Chart-Category_Name"));
categoryName.setPreferredSize(new Dimension(246,30));
categoryName.setBorder(BorderFactory.createEmptyBorder(0,24,0,15));
categoryName.setBorder(BorderFactory.createEmptyBorder(0,24,0,7));
this.add(categoryName, "0,0,2,0");
filterPane = new ChartDataFilterPane(new Bar2DPlot(), parent);
JPanel panel = TableLayout4VanChartHelper.createExpandablePaneWithTitle(Inter.getLocText("FR-Chart-Data_Filter"),filterPane);

3
designer_chart/src/com/fr/design/mainframe/chart/gui/data/table/MeterPlotTableDataContentPane.java
Unescape View File

@ -47,8 +47,9 @@ public class MeterPlotTableDataContentPane extends AbstractTableDataContentPane
JPanel jPanel = TableLayout4VanChartHelper.createExpandablePaneWithTitle(Inter.getLocText("FR-Chart-Data_Filter"),filterPane);
JPanel panel = TableLayoutHelper.createTableLayoutPane(components,rowSize,columnSize);
filterPane.setBorder(BorderFactory.createEmptyBorder(10,10,0,15));
filterPane.setBorder(BorderFactory.createEmptyBorder(0,10,0,15));
panel.setBorder(BorderFactory.createEmptyBorder(10,24,10,15));
jPanel.setBorder(BorderFactory.createEmptyBorder(0,12,0,5));
this.add(getJSeparator(),BorderLayout.NORTH);
this.add(panel,BorderLayout.CENTER);

2
designer_chart/src/com/fr/plugin/chart/bubble/data/VanChartBubblePlotTableDataContentPane.java
Unescape View File

@ -60,7 +60,7 @@ public class VanChartBubblePlotTableDataContentPane extends AbstractTableDataCon
};
JPanel north = TableLayout4VanChartHelper.createGapTableLayoutPane(components_north,rowSize_north,columnSize_north);
north.setBorder(BorderFactory.createEmptyBorder(6, 24, 10, 15));
north.setBorder(BorderFactory.createEmptyBorder(10, 24, 10, 15));
JPanel filterPane = TableLayout4VanChartHelper.createExpandablePaneWithTitle(Inter.getLocText("FR-Chart-Data_Filter"),dataScreeningPane);
dataScreeningPane.setBorder(BorderFactory.createEmptyBorder(0,5,0,5));
filterPane.setBorder(BorderFactory.createEmptyBorder(0,5,0,5));

6
designer_chart/src/com/fr/plugin/chart/designer/component/VanChartFillStylePane.java
Unescape View File

@ -26,12 +26,14 @@ public class VanChartFillStylePane extends ChartFillStylePane {
new Component[]{null,customPane},
};
return TableLayout4VanChartHelper.createGapTableLayoutPane(components,rowSize,columnSize);
JPanel panel = TableLayout4VanChartHelper.createGapTableLayoutPane(components,rowSize,columnSize);
panel.setBorder(BorderFactory.createEmptyBorder(5,5,0,0));
return panel;
}
@Override
public Dimension getPreferredSize() {
if(styleSelectBox.getSelectedIndex() != styleSelectBox.getItemCount() - 1) {
return new Dimension(styleSelectBox.getPreferredSize().width, 26);
return new Dimension(styleSelectBox.getPreferredSize().width, 30);
}
return super.getPreferredSize();
}

2
designer_chart/src/com/fr/plugin/chart/designer/component/VanChartTooltipContentPane.java
Unescape View File

@ -61,7 +61,7 @@ public class VanChartTooltipContentPane extends BasicBeanPane<AttrTooltipContent
double p = TableLayout.PREFERRED;
double f = TableLayout.FILL;
double e = TableLayout4VanChartHelper.EDIT_AREA_WIDTH;
double[] columnSize = {f, e};
double[] columnSize = {f, p};
double[] rowSize = getRowSize(p);
final JPanel commonPanel = TableLayoutHelper.createTableLayoutPane(getPaneComponents(), rowSize, columnSize);

3
designer_chart/src/com/fr/plugin/chart/designer/component/format/FormatPaneWithOutFont.java
Unescape View File

@ -15,7 +15,6 @@ import java.awt.*;
*/
public class FormatPaneWithOutFont extends FormatPane {
private static final int HEIGHT = 30;
private static final int FONT_HEIGHT = 20;
protected JPanel createContentPane(Component[][] components) {
double f = TableLayout.FILL;
@ -40,6 +39,6 @@ public class FormatPaneWithOutFont extends FormatPane {
if (getTypeComboBox().getSelectedIndex() == 0) {
return new Dimension((int)getTypeComboBox().getPreferredSize().getWidth(), HEIGHT);
}
return new Dimension((int)super.getPreferredSize().getWidth(), (int)super.getPreferredSize().getHeight()-FONT_HEIGHT);
return new Dimension((int)super.getPreferredSize().getWidth(), (int)super.getPreferredSize().getHeight());
}
}

3
designer_chart/src/com/fr/plugin/chart/designer/other/AutoRefreshPane.java
Unescape View File

@ -30,8 +30,6 @@ import java.awt.event.ActionListener;
*/
public class AutoRefreshPane extends BasicBeanPane<RefreshMoreLabel> {
private static final int P_W = 320;
private static final int P_H = 460;
private VanChart chart;
private UIButtonGroup moreLabel;
@ -140,7 +138,6 @@ public class AutoRefreshPane extends BasicBeanPane<RefreshMoreLabel> {
}
});
dialog.setSize(P_W, P_H);
dialog.setVisible(true);
}
});

1
designer_chart/src/com/fr/plugin/chart/designer/style/VanChartRangeLegendPane.java
Unescape View File

@ -102,6 +102,7 @@ public class VanChartRangeLegendPane extends VanChartPlotLegendPane {
initLegendTypeButtonListener();
JPanel legendTypeButtonWithTilePane = createTableLayoutPaneWithTitle(Inter.getLocText("Plugin-ChartF_Legend_Form"),legendTypeButton);
legendTypeButtonWithTilePane.setBorder(BorderFactory.createEmptyBorder(0,5,0,0));
rangeLegendPane = createRangeLegendPane();

6
designer_chart/src/com/fr/plugin/chart/designer/style/axis/VanChartBaseAxisPane.java
Unescape View File

@ -134,7 +134,7 @@ public class VanChartBaseAxisPane extends FurtherBasicBeanPane<VanChartAxis> {
new Component[]{new UILabel(Inter.getLocText("Plugin-ChartF_TextRotation")),titleTextRotation},
};
JPanel panel = TableLayoutHelper.createTableLayoutPane(components, row, col);
JPanel panel = TableLayout4VanChartHelper.createGapTableLayoutPane(components, row, col);
return TableLayout4VanChartHelper.createExpandablePaneWithTitle(PaneTitleConstants.CHART_STYLE_TITLE_TITLE, panel);
}
@ -222,7 +222,7 @@ public class VanChartBaseAxisPane extends FurtherBasicBeanPane<VanChartAxis> {
mainTick = new UIButtonGroup<AxisTickLineType>(strings, values);
secondTick = new UIButtonGroup<AxisTickLineType>(strings, values);
JPanel panel = TableLayoutHelper.createTableLayoutPane(getLineStylePaneComponents(), row, col);
JPanel panel = TableLayout4VanChartHelper.createGapTableLayoutPane(getLineStylePaneComponents(), row, col);
return TableLayout4VanChartHelper.createExpandablePaneWithTitle(Inter.getLocText("Plugin-ChartF_AxisLineStyle"), panel);
}
@ -249,7 +249,7 @@ public class VanChartBaseAxisPane extends FurtherBasicBeanPane<VanChartAxis> {
new Component[]{new UILabel(Inter.getLocText("FR-Designer_AxisReversed")),reversed},
} ;
JPanel panel = TableLayoutHelper.createTableLayoutPane(components, row, col);
JPanel panel = TableLayout4VanChartHelper.createGapTableLayoutPane(components, row, col);
return TableLayout4VanChartHelper.createExpandablePaneWithTitle(Inter.getLocText("Chart-Layout_Position"), panel);
}

32
designer_chart/src/com/fr/plugin/chart/designer/style/tooltip/VanChartPlotRefreshTooltipPane.java
Unescape View File

@ -1,6 +1,7 @@
package com.fr.plugin.chart.designer.style.tooltip;
import com.fr.chart.chartattr.Plot;
import com.fr.design.dialog.BasicScrollPane;
import com.fr.design.gui.ilable.UILabel;
import com.fr.design.gui.ispinner.UISpinner;
import com.fr.design.layout.TableLayout;
@ -29,7 +30,7 @@ public class VanChartPlotRefreshTooltipPane extends VanChartPlotTooltipNoCheckPa
public VanChartPlotRefreshTooltipPane(Plot plot) {
super(plot, null);
this.setSize(270,400);
this.setPreferredSize(new Dimension(320, 400));
}
protected JPanel createTooltipPane(Plot plot) {
@ -45,13 +46,25 @@ public class VanChartPlotRefreshTooltipPane extends VanChartPlotTooltipNoCheckPa
Component[][] components = createComponents(plot);
JPanel panel = TableLayoutHelper.createTableLayoutPane(components,rowSize,columnSize);
JScrollPane jScrollPane = new JScrollPane(panel);
jScrollPane.setPreferredSize(new Dimension(P_W, P_H));
jScrollPane.setVerticalScrollBarPolicy (JScrollPane.VERTICAL_SCROLLBAR_AS_NEEDED);
JPanel jPanel = new JPanel();
jPanel.add(jScrollPane);
return jPanel;
BasicScrollPane scrollPane = new BasicScrollPane() {
@Override
protected String title4PopupWindow() {
return null;
}
@Override
protected JPanel createContentPane() {
return panel;
}
@Override
public void populateBean(Object ob) {
return;
}
};
scrollPane.setPreferredSize(new Dimension(P_W, P_H));
return scrollPane;
}
protected Component[][] createComponents(Plot plot) {
@ -78,9 +91,10 @@ public class VanChartPlotRefreshTooltipPane extends VanChartPlotTooltipNoCheckPa
double f = TableLayout.FILL;
double e = TableLayout4VanChartHelper.EDIT_AREA_WIDTH;
double[] columnSize = {f, e};
double[] rowSize = {p};
double[] rowSize = {p, p};
Component[][] components = new Component[][]{
new Component[]{null, null},
new Component[]{new UILabel(Inter.getLocText("Plugin-ChartF_Duration_Time")), duration},
};

7
designer_chart/src/com/fr/plugin/chart/map/designer/VanChartGroupPane.java
Unescape View File

@ -3,6 +3,7 @@ package com.fr.plugin.chart.map.designer;
import com.fr.design.gui.ibutton.UIButtonGroup;
import javax.swing.*;
import javax.swing.border.Border;
import javax.swing.event.ChangeEvent;
import javax.swing.event.ChangeListener;
import java.awt.*;
@ -34,9 +35,13 @@ public abstract class VanChartGroupPane extends JPanel{
cardLayout.show(centerPane, nameList[buttonGroup.getSelectedIndex()]);
}
});
buttonGroup.setBorder(getButtonGroupBorder());
this.setLayout(new BorderLayout(0, 4));
this.add(buttonGroup, BorderLayout.NORTH);
this.add(centerPane, BorderLayout.CENTER);
}
protected Border getButtonGroupBorder () {
return null;
}
}

6
designer_chart/src/com/fr/plugin/chart/map/designer/VanMapAreaPointAndLineGroupPane.java
Unescape View File

@ -3,6 +3,7 @@ package com.fr.plugin.chart.map.designer;
import com.fr.general.Inter;
import javax.swing.*;
import javax.swing.border.Border;
/**
* Created by Mitisky on 16/5/20.
@ -17,4 +18,9 @@ public class VanMapAreaPointAndLineGroupPane extends VanChartGroupPane {
public VanMapAreaPointAndLineGroupPane(final JPanel areaPane, final JPanel pointPane, final JPanel linePane){
super(new String[]{AREA_MAP_STRING, POINT_MAP_STRING, LINE_MAP_STRING}, new JPanel[]{areaPane, pointPane, linePane});
}
@Override
protected Border getButtonGroupBorder () {
return BorderFactory.createEmptyBorder(0,8,0,18);
}
}

31
designer_chart/src/com/fr/plugin/chart/map/designer/type/VanChartMapSourceChoosePane.java
Unescape View File

@ -213,9 +213,9 @@ public class VanChartMapSourceChoosePane extends JPanel implements UIObserver {
sourceTitleLabel = createSourceTitleLabel();
double p = TableLayout.PREFERRED;
double f = TableLayout.FILL;
double d = TableLayout4VanChartHelper.DESCRIPTION_AREA_WIDTH;
double e = TableLayout4VanChartHelper.EDIT_AREA_WIDTH;
double[] columnSize = {f, e};
double[] columnSize = {d, e};
double[] rowSize = {p, p};
Component[][] components = new Component[][]{
new Component[]{null,null},
@ -288,39 +288,45 @@ public class VanChartMapSourceChoosePane extends JPanel implements UIObserver {
layerCardPane.add(pane, itemName);
}
panel.add(gisLayer, BorderLayout.CENTER);
JPanel panel1 = TableLayout4VanChartHelper.createGapTableLayoutPane(Inter.getLocText("Plugin-ChartF_Gis_Layer"), gisLayer);
panel.add(panel1, BorderLayout.CENTER);
panel.add(layerCardPane, BorderLayout.SOUTH);
return TableLayout4VanChartHelper.createGapTableLayoutPane(Inter.getLocText("Plugin-ChartF_Gis_Layer"), panel);
return panel;
}
private JPanel createCustomTileLayer() {
double p = TableLayout.PREFERRED;
double[] rowSize = {p, p};
double[] COLUMN_SIZE = {p, TableLayout.FILL};
double[] COLUMN_SIZE = {TableLayout4VanChartHelper.DESCRIPTION_AREA_WIDTH, TableLayout4VanChartHelper.SECOND_EDIT_AREA_WIDTH-3};
customTileLayer = new UITextArea();
attribution = new UITextArea();
Component[][] comps = new Component[][]{
new Component[]{new UILabel("url", SwingConstants.RIGHT), customTileLayer},
new Component[]{new UILabel("url"), customTileLayer},
new Component[]{new UILabel("Attribution"), attribution}
};
return TableLayoutHelper.createTableLayoutPane(comps, rowSize, COLUMN_SIZE);
JPanel panel = TableLayout4VanChartHelper.createGapTableLayoutPane(comps, rowSize, COLUMN_SIZE);
panel.setBorder(TableLayout4VanChartHelper.SECOND_EDIT_AREA_BORDER);
return panel;
}
private JPanel createWMSPanel() {
final double p = TableLayout.PREFERRED;
double[] rowSize = {p};
double[] COLUMN_SIZE = {TableLayout4VanChartHelper.DESCRIPTION_AREA_WIDTH, 84,44};
wmsUrl = new UITextArea();
connectButton = new UIButton(Inter.getLocText("Plugin-ChartF_Connect_WMP"));
Component[][] comps = new Component[][]{
new Component[]{new UILabel("url", SwingConstants.RIGHT), wmsUrl, connectButton}
new Component[]{new UILabel("url"), wmsUrl, connectButton}
};
JPanel northPane = TableLayoutHelper.createTableLayoutPane(comps,rowSize, COLUMN_SIZE);
JPanel northPane = TableLayout4VanChartHelper.createGapTableLayoutPane(comps, rowSize, COLUMN_SIZE);
northPane.setBorder(TableLayout4VanChartHelper.SECOND_EDIT_AREA_BORDER);
JPanel wmsPanel = new JPanel(new BorderLayout(0, 4));
wmsLayerPane = new JPanel(new BorderLayout());
resetWMSLayerPane(new ArrayList<WMSLayer>());
@ -429,11 +435,12 @@ public class VanChartMapSourceChoosePane extends JPanel implements UIObserver {
double p = TableLayout.PREFERRED;
double f = TableLayout.FILL;
double d = TableLayout4VanChartHelper.DESCRIPTION_AREA_WIDTH;
double e = TableLayout4VanChartHelper.EDIT_AREA_WIDTH;
double s = TableLayout4VanChartHelper.SECOND_EDIT_AREA_WIDTH;
double[] rowSize = {p,p,p};
double[] columnSize = {f, e};
double[] column = {f, s};
double[] columnSize = {d, e};
double[] column = {d, s};
Component[][] comps = new Component[][]{
new Component[]{null, null},

17
designer_chart/src/com/fr/plugin/chart/multilayer/data/MultiPiePlotTableDataContentPane.java
Unescape View File

@ -33,6 +33,7 @@ import java.util.List;
public class MultiPiePlotTableDataContentPane extends AbstractTableDataContentPane implements UIObserver {
private static final int HT = 20;
private static final int WD = 100;
private static final int LABEL_WIDTH = 72;
private UISpinner levelNumEdit;
private UITextField nameField;
@ -84,7 +85,7 @@ public class MultiPiePlotTableDataContentPane extends AbstractTableDataContentPa
private JPanel createCenterPane() {
double p = TableLayout.PREFERRED;
double f = TableLayout.FILL;
double[] columnSize_center = {f, COMPONENT_WIDTH};
double[] columnSize_center = {LABEL_WIDTH, COMPONENT_WIDTH};
double[] rowSize_center = new double[levelNum + 3];
initLevelNameList();
@ -113,8 +114,9 @@ public class MultiPiePlotTableDataContentPane extends AbstractTableDataContentPa
registerListener4Center();
return TableLayout4VanChartHelper.createGapTableLayoutPane(components_center,rowSize_center,columnSize_center);
JPanel panel = TableLayout4VanChartHelper.createGapTableLayoutPane(components_center,rowSize_center,columnSize_center);
panel.setBorder(BorderFactory.createEmptyBorder(0,10,0,0));
return panel;
}
@ -147,8 +149,7 @@ public class MultiPiePlotTableDataContentPane extends AbstractTableDataContentPa
private JPanel createNorthPane() {
double p = TableLayout.PREFERRED;
double f = TableLayout.FILL;
double[] columnSize_north = {f, COMPONENT_WIDTH};
double[] columnSize_north = {LABEL_WIDTH, COMPONENT_WIDTH};
double[] rowSize_north = {p, p, p};
levelNumEdit = new UISpinner(1, 15, 1, levelNum){
@ -169,10 +170,8 @@ public class MultiPiePlotTableDataContentPane extends AbstractTableDataContentPa
super.setTextFieldValue(value);
}
};
levelNumEdit.setPreferredSize(new Dimension(WD, HT));
nameField = new UITextField();
nameField.setPreferredSize(new Dimension(WD, HT));
Component[][] components_north = new Component[][]{
new Component[]{new UILabel(Inter.getLocText("Plugin-ChartF_MultiPie_Series_Name")), nameField},
@ -180,7 +179,9 @@ public class MultiPiePlotTableDataContentPane extends AbstractTableDataContentPa
new Component[]{new UILabel(Inter.getLocText("Plugin-ChartF_Level_Number")), levelNumEdit},
};
return TableLayout4VanChartHelper.createGapTableLayoutPane(components_north, rowSize_north, columnSize_north);
JPanel panel = TableLayout4VanChartHelper.createGapTableLayoutPane(components_north, rowSize_north, columnSize_north);
panel.setBorder(BorderFactory.createEmptyBorder(0,10,0,0));
return panel;
}
private void refreshCenterPane(){

10
designer_chart/src/com/fr/plugin/chart/structure/desinger/StructureIndependentVanChartInterface.java
Unescape View File

@ -5,6 +5,7 @@ import com.fr.chart.chartattr.Plot;
import com.fr.design.beans.BasicBeanPane;
import com.fr.design.condition.ConditionAttributesPane;
import com.fr.design.gui.frpane.AttributeChangeListener;
import com.fr.design.gui.ibutton.UIButtonGroup;
import com.fr.design.mainframe.chart.AbstractChartAttrPane;
import com.fr.design.mainframe.chart.gui.ChartDataPane;
import com.fr.design.mainframe.chart.gui.ChartStylePane;
@ -13,6 +14,7 @@ import com.fr.design.mainframe.chart.gui.data.table.AbstractTableDataContentPane
import com.fr.design.mainframe.chart.gui.type.AbstractChartTypePane;
import com.fr.general.Inter;
import com.fr.plugin.chart.base.VanChartConstants;
import com.fr.plugin.chart.designer.TableLayout4VanChartHelper;
import com.fr.plugin.chart.designer.other.VanChartInteractivePaneWithOutSort;
import com.fr.plugin.chart.designer.other.VanChartOtherPane;
import com.fr.plugin.chart.designer.style.VanChartStylePane;
@ -23,6 +25,8 @@ import com.fr.plugin.chart.structure.desinger.style.VanChartStructureSeriesPane;
import com.fr.plugin.chart.structure.desinger.type.VanChartStructureTypePane;
import com.fr.plugin.chart.vanchart.AbstractIndependentVanChartUI;
import javax.swing.*;
/**
* Created by shine on 2017/2/15.
*/
@ -60,6 +64,12 @@ public class StructureIndependentVanChartInterface extends AbstractIndependentVa
protected BasicBeanPane<Chart> createInteractivePane() {
return new VanChartInteractivePaneWithOutSort(){
@Override
protected JPanel getzoomTypePane(UIButtonGroup zoomType) {
JPanel panel = TableLayout4VanChartHelper.createGapTableLayoutPane(Inter.getLocText("Plugin-ChartF_ZoomType"), zoomType);
return panel;
}
@Override
protected String[] getNameArray() {
return new String[]{Inter.getLocText("Plugin-ChartF_XYAxis"), Inter.getLocText("Chart-Use_None")};

Write Preview
Loading…
Cancel
Save