Browse Source

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

* commit '60214f7d7576bff63d08c78c5ac410441a81e0fb':
  9.0新图表配置界面修改。 修改地图、热力地图等图表配置界面。
  修改format面板
master
superman 7 years ago
parent
commit
ddde51ecf9
  1. 11
      designer_chart/src/com/fr/plugin/chart/designer/component/format/FormatPaneWithNormalType.java
  2. 1
      designer_chart/src/com/fr/plugin/chart/designer/component/format/FormatPaneWithOutFont.java
  3. 2
      designer_chart/src/com/fr/plugin/chart/designer/style/VanChartPlotLegendPane.java
  4. 6
      designer_chart/src/com/fr/plugin/chart/designer/style/VanChartTitlePane.java
  5. 2
      designer_chart/src/com/fr/plugin/chart/designer/style/axis/VanChartBaseAxisPane.java
  6. 5
      designer_chart/src/com/fr/plugin/chart/designer/style/datasheet/VanChartDataSheetPane.java
  7. 9
      designer_chart/src/com/fr/plugin/chart/gauge/VanChartGaugeSeriesPane.java
  8. 19
      designer_chart/src/com/fr/plugin/chart/heatmap/designer/style/VanChartHeatMapSeriesPane.java
  9. 2
      designer_chart/src/com/fr/plugin/chart/map/VanChartMapSeriesPane.java
  10. 8
      designer_chart/src/com/fr/plugin/chart/map/designer/data/component/report/AreaPane.java
  11. 27
      designer_chart/src/com/fr/plugin/chart/map/designer/data/component/report/LineMapAreaPane.java
  12. 24
      designer_chart/src/com/fr/plugin/chart/map/designer/data/component/report/LineMapLongLatAreaPane.java
  13. 12
      designer_chart/src/com/fr/plugin/chart/map/designer/data/component/report/LongLatAreaPane.java
  14. 8
      designer_chart/src/com/fr/plugin/chart/map/designer/data/component/table/AreaPane.java
  15. 28
      designer_chart/src/com/fr/plugin/chart/map/designer/data/component/table/LineMapAreaPane.java
  16. 24
      designer_chart/src/com/fr/plugin/chart/map/designer/data/component/table/LineMapLongLatAreaPane.java
  17. 14
      designer_chart/src/com/fr/plugin/chart/map/designer/data/component/table/LongLatAreaPane.java
  18. 3
      designer_chart/src/com/fr/plugin/chart/map/designer/data/component/table/PointMapAreaPane.java
  19. 3
      designer_chart/src/com/fr/plugin/chart/map/designer/data/contentpane/report/VanPointMapPlotReportDataContentPane.java
  20. 9
      designer_chart/src/com/fr/plugin/chart/map/designer/type/VanChartMapSourceChoosePane.java
  21. 11
      designer_chart/src/com/fr/plugin/chart/range/component/GradualIntervalConfigPane.java

11
designer_chart/src/com/fr/plugin/chart/designer/component/format/DataSheetFormatPane.java → designer_chart/src/com/fr/plugin/chart/designer/component/format/FormatPaneWithNormalType.java

@ -2,7 +2,6 @@ package com.fr.plugin.chart.designer.component.format;
import com.fr.design.gui.icombobox.UIComboBox; import com.fr.design.gui.icombobox.UIComboBox;
import com.fr.design.gui.ilable.UILabel; import com.fr.design.gui.ilable.UILabel;
import com.fr.design.gui.style.FormatPane;
import com.fr.design.layout.TableLayout; import com.fr.design.layout.TableLayout;
import com.fr.general.Inter; import com.fr.general.Inter;
import com.fr.plugin.chart.designer.TableLayout4VanChartHelper; import com.fr.plugin.chart.designer.TableLayout4VanChartHelper;
@ -12,8 +11,16 @@ import java.awt.*;
/** /**
* Created by mengao on 2017/8/14. * Created by mengao on 2017/8/14.
* 没有字体设置
* 类型下拉框中只有常规数字百分比货币科学计数选项没有时间型日期型文本型选项
*/ */
public class DataSheetFormatPane extends FormatPane { public class FormatPaneWithNormalType extends FormatPaneWithOutFont {
public FormatPaneWithNormalType() {
super();
setForDataSheet();
}
protected Component[][] getComponent(JPanel fontPane, JPanel centerPane, JPanel typePane) { protected Component[][] getComponent(JPanel fontPane, JPanel centerPane, JPanel typePane) {
return new Component[][]{ return new Component[][]{
new Component[]{null, centerPane}, new Component[]{null, centerPane},

1
designer_chart/src/com/fr/plugin/chart/designer/component/format/FormatPaneWithOutFont.java

@ -9,6 +9,7 @@ import java.awt.*;
/** /**
* Created by mengao on 2017/8/28. * Created by mengao on 2017/8/28.
* 只有文本格式设置没有字体设置
*/ */
public class FormatPaneWithOutFont extends FormatPane { public class FormatPaneWithOutFont extends FormatPane {
private static final int HEIGHT = 30; private static final int HEIGHT = 30;

2
designer_chart/src/com/fr/plugin/chart/designer/style/VanChartPlotLegendPane.java

@ -116,7 +116,7 @@ public class VanChartPlotLegendPane extends BasicPane {
new Component[]{createTitleStylePane(),null} , new Component[]{createTitleStylePane(),null} ,
new Component[]{TableLayout4VanChartHelper.createExpandablePaneWithTitle(Inter.getLocText("Plugin-ChartF_Border"),borderPane),null}, new Component[]{TableLayout4VanChartHelper.createExpandablePaneWithTitle(Inter.getLocText("Plugin-ChartF_Border"),borderPane),null},
new Component[]{TableLayout4VanChartHelper.createExpandablePaneWithTitle(Inter.getLocText("Plugin-ChartF_Background"), backgroundPane),null}, new Component[]{TableLayout4VanChartHelper.createExpandablePaneWithTitle(Inter.getLocText("Plugin-ChartF_Background"), backgroundPane),null},
new Component[]{TableLayout4VanChartHelper.createTableLayoutPaneWithTitle(Inter.getLocText("Plugin-ChartF_DisplayStrategy"), createDisplayStrategy()),null} new Component[]{TableLayout4VanChartHelper.createExpandablePaneWithTitle(Inter.getLocText("Plugin-ChartF_DisplayStrategy"), createDisplayStrategy()),null}
}; };
return TableLayoutHelper.createTableLayoutPane(components, rowSize, columnSize); return TableLayoutHelper.createTableLayoutPane(components, rowSize, columnSize);
} }

6
designer_chart/src/com/fr/plugin/chart/designer/style/VanChartTitlePane.java

@ -106,9 +106,9 @@ public class VanChartTitlePane extends AbstractVanChartScrollPane<VanChart> {
double p = TableLayout.PREFERRED; double p = TableLayout.PREFERRED;
double f = TableLayout.FILL; double f = TableLayout.FILL;
double e = TableLayout4VanChartHelper.EDIT_AREA_WIDTH; double e = TableLayout4VanChartHelper.EDIT_AREA_WIDTH;
double[] columnSize = {p, f}; double[] columnSize = {p, f};
double[] column = {f,e}; double[] column = {f, e};
double[] rowSize = {p,p,p,p,p,p,p,p}; double[] rowSize = {p,p,p,p,p,p,p,p};
Component[][] components = new Component[][]{ Component[][] components = new Component[][]{
new Component[]{createTitleContentPane(new double[]{p,p,p},column),null}, new Component[]{createTitleContentPane(new double[]{p,p,p},column),null},

2
designer_chart/src/com/fr/plugin/chart/designer/style/axis/VanChartBaseAxisPane.java

@ -249,7 +249,7 @@ public class VanChartBaseAxisPane extends FurtherBasicBeanPane<VanChartAxis> {
protected JPanel createDisplayStrategy(double[] row, double[] col){ protected JPanel createDisplayStrategy(double[] row, double[] col){
maxProportion = new UISpinner(0,100,1,30); maxProportion = new UISpinner(0,100,1,30);
axisLimitSize = new UIButtonGroup<Integer>(new String[]{Inter.getLocText("Plugin-ChartF_LimitAreaSize"),Inter.getLocText("Plugin-ChartF_NotLimitAreaSize")}); axisLimitSize = new UIButtonGroup<Integer>(new String[]{Inter.getLocText("Plugin-ChartF_Limit"),Inter.getLocText("Plugin-ChartF_NotLimit")});
JPanel limitSizePane = TableLayout4VanChartHelper.createGapTableLayoutPane(Inter.getLocText("Plugin-ChartF_AreaSize"),axisLimitSize); JPanel limitSizePane = TableLayout4VanChartHelper.createGapTableLayoutPane(Inter.getLocText("Plugin-ChartF_AreaSize"),axisLimitSize);
maxProportionPane = TableLayout4VanChartHelper.createGapTableLayoutPane(Inter.getLocText("Plugin-ChartF_MaxProportion"),maxProportion); maxProportionPane = TableLayout4VanChartHelper.createGapTableLayoutPane(Inter.getLocText("Plugin-ChartF_MaxProportion"),maxProportion);

5
designer_chart/src/com/fr/plugin/chart/designer/style/datasheet/VanChartDataSheetPane.java

@ -20,7 +20,7 @@ import com.fr.plugin.chart.base.VanChartConstants;
import com.fr.plugin.chart.designer.AbstractVanChartScrollPane; import com.fr.plugin.chart.designer.AbstractVanChartScrollPane;
import com.fr.plugin.chart.designer.TableLayout4VanChartHelper; import com.fr.plugin.chart.designer.TableLayout4VanChartHelper;
import com.fr.plugin.chart.designer.component.border.VanChartBorderPane; import com.fr.plugin.chart.designer.component.border.VanChartBorderPane;
import com.fr.plugin.chart.designer.component.format.DataSheetFormatPane; import com.fr.plugin.chart.designer.component.format.FormatPaneWithNormalType;
import com.fr.plugin.chart.type.AxisType; import com.fr.plugin.chart.type.AxisType;
import javax.swing.*; import javax.swing.*;
@ -85,8 +85,7 @@ public class VanChartDataSheetPane extends AbstractVanChartScrollPane<Chart> {
private JPanel createDataSheetPane(){ private JPanel createDataSheetPane(){
textAttrPane = new ChartTextAttrPane(); textAttrPane = new ChartTextAttrPane();
formatPane = new DataSheetFormatPane(); formatPane = new FormatPaneWithNormalType();
formatPane.setForDataSheet();
borderPane = new VanChartBorderPane(); borderPane = new VanChartBorderPane();
double p = TableLayout.PREFERRED; double p = TableLayout.PREFERRED;

9
designer_chart/src/com/fr/plugin/chart/gauge/VanChartGaugeSeriesPane.java

@ -53,12 +53,13 @@ public class VanChartGaugeSeriesPane extends VanChartAbstractPlotSeriesPane {
protected JPanel getContentInPlotType() { protected JPanel getContentInPlotType() {
double p = TableLayout.PREFERRED; double p = TableLayout.PREFERRED;
double f = TableLayout.FILL; double f = TableLayout.FILL;
double e = TableLayout4VanChartHelper.EDIT_AREA_WIDTH;
double[] columnSize = {f}; double[] columnSize = {f};
double[] rowSize = {p,p,p,p,p,p}; double[] rowSize = {p,p,p,p,p,p};
Component[][] components = new Component[][]{ Component[][] components = new Component[][]{
new Component[]{getColorPane()}, new Component[]{getColorPane()},
new Component[]{createGaugeLayoutPane()}, new Component[]{createGaugeLayoutPane()},
new Component[]{createGaugeStylePane(rowSize, new double[]{p,f})}, new Component[]{createGaugeStylePane(rowSize, new double[]{f,e})},
new Component[]{createGaugeBandsPane()} new Component[]{createGaugeBandsPane()}
}; };
@ -109,7 +110,8 @@ public class VanChartGaugeSeriesPane extends VanChartAbstractPlotSeriesPane {
JPanel centerPanel = TableLayoutHelper.createTableLayoutPane(getDiffComponentsWithGaugeStyle(), row, col); JPanel centerPanel = TableLayoutHelper.createTableLayoutPane(getDiffComponentsWithGaugeStyle(), row, col);
panel.add(centerPanel, BorderLayout.CENTER); panel.add(centerPanel, BorderLayout.CENTER);
if(rotate != null){ if(rotate != null){
panel.add(rotate, BorderLayout.NORTH); JPanel panel1 = TableLayout4VanChartHelper.createGapTableLayoutPane(Inter.getLocText("Plugin-ChartF_Rotation_Direction"), rotate);
panel.add(panel1, BorderLayout.NORTH);
} }
return TableLayout4VanChartHelper.createExpandablePaneWithTitle(Inter.getLocText("FR-Designer-Widget_Style"), panel); return TableLayout4VanChartHelper.createExpandablePaneWithTitle(Inter.getLocText("FR-Designer-Widget_Style"), panel);
} }
@ -192,8 +194,7 @@ public class VanChartGaugeSeriesPane extends VanChartAbstractPlotSeriesPane {
private JPanel createGaugeBandsPane() { private JPanel createGaugeBandsPane() {
colorPickerPane = new ColorPickerPaneWithFormula("meterString"); colorPickerPane = new ColorPickerPaneWithFormula("meterString");
JPanel panel = TableLayout4VanChartHelper.createGapTableLayoutPane("",colorPickerPane); return TableLayout4VanChartHelper.createExpandablePaneWithTitle(Inter.getLocText("Plugin-ChartF_Range"), colorPickerPane);
return TableLayout4VanChartHelper.createExpandablePaneWithTitle(Inter.getLocText("Plugin-ChartF_Range"), panel);
} }

19
designer_chart/src/com/fr/plugin/chart/heatmap/designer/style/VanChartHeatMapSeriesPane.java

@ -43,6 +43,12 @@ public class VanChartHeatMapSeriesPane extends VanChartMapSeriesPane{
return null; return null;
} }
//设置色彩面板内容
protected void setColorPaneContent (JPanel panel) {
panel.add(createNullValueColorPane(), BorderLayout.NORTH);
panel.add(createAlphaPane(), BorderLayout.CENTER);
}
/** /**
* 在每个不同类型Plot, 得到不同类型的属性. 比如: 柱形的风格, 折线的线型曲线. * 在每个不同类型Plot, 得到不同类型的属性. 比如: 柱形的风格, 折线的线型曲线.
*/ */
@ -97,10 +103,12 @@ public class VanChartHeatMapSeriesPane extends VanChartMapSeriesPane{
double p = TableLayout.PREFERRED; double p = TableLayout.PREFERRED;
double f = TableLayout.FILL; double f = TableLayout.FILL;
double[] row = {p, p}; double d = TableLayout4VanChartHelper.DESCRIPTION_AREA_WIDTH;
double[] col = {p, f, p}; double[] row = {p, p, p};
double[] col = {d, f, p};
Component[][] components = new Component[][]{ Component[][] components = new Component[][]{
new Component[]{null, null, null},
new Component[]{new UILabel(Inter.getLocText("Plugin-ChartF_Heat_Map_Radius")), radius, null}, new Component[]{new UILabel(Inter.getLocText("Plugin-ChartF_Heat_Map_Radius")), radius, null},
new Component[]{new UILabel(Inter.getLocText("Plugin-ChartF_Heat_Map_Blur")), blur, new UILabel("%")} new Component[]{new UILabel(Inter.getLocText("Plugin-ChartF_Heat_Map_Blur")), blur, new UILabel("%")}
}; };
@ -117,10 +125,13 @@ public class VanChartHeatMapSeriesPane extends VanChartMapSeriesPane{
double p = TableLayout.PREFERRED; double p = TableLayout.PREFERRED;
double f = TableLayout.FILL; double f = TableLayout.FILL;
double[] row = {p, p}; double e = TableLayout4VanChartHelper.EDIT_AREA_WIDTH;
double[] col = {p, f};
double[] row = {p, p, p};
double[] col = {f, e};
Component[][] components = new Component[][]{ Component[][] components = new Component[][]{
new Component[]{null, null},
new Component[]{new UILabel(Inter.getLocText("Plugin-ChartF_Min")), minOpacity}, new Component[]{new UILabel(Inter.getLocText("Plugin-ChartF_Min")), minOpacity},
new Component[]{new UILabel(Inter.getLocText("Plugin-ChartF_Max")), maxOpacity} new Component[]{new UILabel(Inter.getLocText("Plugin-ChartF_Max")), maxOpacity}
}; };

2
designer_chart/src/com/fr/plugin/chart/map/VanChartMapSeriesPane.java

@ -185,7 +185,7 @@ public class VanChartMapSeriesPane extends VanChartAbstractPlotSeriesPane {
return TableLayoutHelper.createTableLayoutPane(components, row, col); return TableLayoutHelper.createTableLayoutPane(components, row, col);
} }
private JPanel createNullValueColorPane() { protected JPanel createNullValueColorPane() {
nullValueColorBox = new ColorSelectBox(80); nullValueColorBox = new ColorSelectBox(80);
return TableLayout4VanChartHelper.createGapTableLayoutPane(Inter.getLocText("Plugin-ChartF_NULL_Value_Color"), nullValueColorBox); return TableLayout4VanChartHelper.createGapTableLayoutPane(Inter.getLocText("Plugin-ChartF_NULL_Value_Color"), nullValueColorBox);

8
designer_chart/src/com/fr/plugin/chart/map/designer/data/component/report/AreaPane.java

@ -30,10 +30,14 @@ public class AreaPane extends AbstractReportDataContentPane {
double f = TableLayout.FILL; double f = TableLayout.FILL;
double[] columnSize = {p, f}; double[] columnSize = {p, f};
double[] rowSize = {p}; double[] rowSize = {p};
Component[][] components = new Component[][]{ Component[][] components = getComponent ();
return TableLayoutHelper.createTableLayoutPane(components,rowSize,columnSize);
}
protected Component[][] getComponent () {
return new Component[][]{
new Component[]{new BoldFontTextLabel(Inter.getLocText("FR-Chart-Area_Name")), areaName} new Component[]{new BoldFontTextLabel(Inter.getLocText("FR-Chart-Area_Name")), areaName}
}; };
return TableLayoutHelper.createTableLayoutPane(components,rowSize,columnSize);
} }
@Override @Override

27
designer_chart/src/com/fr/plugin/chart/map/designer/data/component/report/LineMapAreaPane.java

@ -1,7 +1,7 @@
package com.fr.plugin.chart.map.designer.data.component.report; package com.fr.plugin.chart.map.designer.data.component.report;
import com.fr.design.gui.ilable.BoldFontTextLabel;
import com.fr.general.Inter; import com.fr.general.Inter;
import com.fr.plugin.chart.designer.TableLayout4VanChartHelper;
import com.fr.plugin.chart.map.data.VanMapReportDefinition; import com.fr.plugin.chart.map.data.VanMapReportDefinition;
import com.fr.plugin.chart.map.designer.data.component.LongitudeLatitudeAndArea; import com.fr.plugin.chart.map.designer.data.component.LongitudeLatitudeAndArea;
@ -12,24 +12,37 @@ import java.awt.*;
* Created by hufan on 2016/12/22. * Created by hufan on 2016/12/22.
*/ */
public class LineMapAreaPane extends PointMapAreaPane { public class LineMapAreaPane extends PointMapAreaPane {
private static final int LEFT_GAP = 15;
private static final int V_GAP = 10; private static final int V_GAP = 10;
protected AreaPane endAreaPane; protected AreaPane endAreaPane;
protected JPanel createContentPane() { protected JPanel createContentPane() {
initAreaPane(); initAreaPane();
initEndAreaPane(); initEndAreaPane();
JPanel panel1 = TableLayout4VanChartHelper.createTitlePane(Inter.getLocText("Plugin-ChartF_Start_Point"), areaPane, LEFT_GAP);
JPanel panel2 = TableLayout4VanChartHelper.createTitlePane(Inter.getLocText("Plugin-ChartF_End_Point"), endAreaPane, LEFT_GAP);
JPanel content = new JPanel(new BorderLayout(0, V_GAP)); JPanel content = new JPanel(new BorderLayout(0, V_GAP));
content.add(panel1, BorderLayout.NORTH); content.add(areaPane, BorderLayout.NORTH);
content.add(panel2, BorderLayout.CENTER); content.add(endAreaPane, BorderLayout.CENTER);
return content; return content;
} }
protected void initEndAreaPane() { protected void initEndAreaPane() {
endAreaPane = new AreaPane(); endAreaPane = new AreaPane(){
protected Component[][] getComponent () {
return new Component[][]{
new Component[]{new BoldFontTextLabel(Inter.getLocText(new String[]{"Plugin-ChartF_End", "FR-Chart-Area_Name"})), areaName}
};
}
};
}
@Override
protected void initAreaPane() {
areaPane =new AreaPane(){
protected Component[][] getComponent () {
return new Component[][]{
new Component[]{new BoldFontTextLabel(Inter.getLocText(new String[]{"Plugin-ChartF_Start", "FR-Chart-Area_Name"})), areaName}
};
}
};
} }
@Override @Override

24
designer_chart/src/com/fr/plugin/chart/map/designer/data/component/report/LineMapLongLatAreaPane.java

@ -1,6 +1,10 @@
package com.fr.plugin.chart.map.designer.data.component.report; package com.fr.plugin.chart.map.designer.data.component.report;
import com.fr.design.gui.ilable.BoldFontTextLabel;
import com.fr.general.Inter;
import java.awt.*;
/** /**
* Created by hufan on 2016/12/22. * Created by hufan on 2016/12/22.
@ -8,10 +12,26 @@ package com.fr.plugin.chart.map.designer.data.component.report;
public class LineMapLongLatAreaPane extends LineMapAreaPane { public class LineMapLongLatAreaPane extends LineMapAreaPane {
protected void initEndAreaPane() { protected void initEndAreaPane() {
endAreaPane = new LongLatAreaPane(); endAreaPane = new LongLatAreaPane(){
protected Component[][] getComponent () {
return new Component[][]{
new Component[]{new BoldFontTextLabel(Inter.getLocText(new String[]{"Plugin-ChartF_End", "Plugin-ChartF_Longitude"})), longitude},
new Component[]{new BoldFontTextLabel(Inter.getLocText(new String[]{"Plugin-ChartF_End", "Plugin-ChartF_Latitude"})), latitude},
new Component[]{new BoldFontTextLabel(Inter.getLocText(new String[]{"Plugin-ChartF_End", "FR-Chart-Area_Name"})), areaName}
};
}
};
} }
protected void initAreaPane() { protected void initAreaPane() {
areaPane = new LongLatAreaPane(); areaPane = new LongLatAreaPane(){
protected Component[][] getComponent () {
return new Component[][]{
new Component[]{new BoldFontTextLabel(Inter.getLocText(new String[]{"Plugin-ChartF_Start", "Plugin-ChartF_Longitude"})), longitude},
new Component[]{new BoldFontTextLabel(Inter.getLocText(new String[]{"Plugin-ChartF_Start", "Plugin-ChartF_Latitude"})), latitude},
new Component[]{new BoldFontTextLabel(Inter.getLocText(new String[]{"Plugin-ChartF_Start", "FR-Chart-Area_Name"})), areaName}
};
}
};
} }
} }

12
designer_chart/src/com/fr/plugin/chart/map/designer/data/component/report/LongLatAreaPane.java

@ -15,8 +15,8 @@ import java.awt.*;
* Created by hufan on 2016/12/21. * Created by hufan on 2016/12/21.
*/ */
public class LongLatAreaPane extends AreaPane { public class LongLatAreaPane extends AreaPane {
private TinyFormulaPane longitude; protected TinyFormulaPane longitude;
private TinyFormulaPane latitude; protected TinyFormulaPane latitude;
public LongLatAreaPane() { public LongLatAreaPane() {
JPanel panel = createContentPane(); JPanel panel = createContentPane();
@ -33,12 +33,16 @@ public class LongLatAreaPane extends AreaPane {
double f = TableLayout.FILL; double f = TableLayout.FILL;
double[] columnSize = {p, f}; double[] columnSize = {p, f};
double[] rowSize = {p, p, p}; double[] rowSize = {p, p, p};
Component[][] components = new Component[][]{ Component[][] components = getComponent();
return TableLayoutHelper.createGapTableLayoutPane(components,rowSize,columnSize,50,6);
}
protected Component[][] getComponent () {
return new Component[][]{
new Component[]{new BoldFontTextLabel(Inter.getLocText("Plugin-ChartF_Longitude")), longitude}, new Component[]{new BoldFontTextLabel(Inter.getLocText("Plugin-ChartF_Longitude")), longitude},
new Component[]{new BoldFontTextLabel(Inter.getLocText("Plugin-ChartF_Latitude")), latitude}, new Component[]{new BoldFontTextLabel(Inter.getLocText("Plugin-ChartF_Latitude")), latitude},
new Component[]{new BoldFontTextLabel(Inter.getLocText("FR-Chart-Area_Name")), areaName} new Component[]{new BoldFontTextLabel(Inter.getLocText("FR-Chart-Area_Name")), areaName}
}; };
return TableLayoutHelper.createGapTableLayoutPane(components,rowSize,columnSize,50,6);
} }
@Override @Override

8
designer_chart/src/com/fr/plugin/chart/map/designer/data/component/table/AreaPane.java

@ -45,10 +45,14 @@ public class AreaPane extends AbstractTableDataContentPane {
double f = TableLayout.FILL; double f = TableLayout.FILL;
double[] columnSize = {p, f}; double[] columnSize = {p, f};
double[] rowSize = {p}; double[] rowSize = {p};
Component[][] components = new Component[][]{ Component[][] components = getComponent();
return TableLayoutHelper.createGapTableLayoutPane(components,rowSize,columnSize,50,6);
}
protected Component[][] getComponent () {
return new Component[][]{
new Component[]{new BoldFontTextLabel(Inter.getLocText("FR-Chart-Area_Name")), areaNameCom} new Component[]{new BoldFontTextLabel(Inter.getLocText("FR-Chart-Area_Name")), areaNameCom}
}; };
return TableLayoutHelper.createGapTableLayoutPane(components,rowSize,columnSize,50,6);
} }
protected void initAreaNameCom() { protected void initAreaNameCom() {

28
designer_chart/src/com/fr/plugin/chart/map/designer/data/component/table/LineMapAreaPane.java

@ -1,7 +1,7 @@
package com.fr.plugin.chart.map.designer.data.component.table; package com.fr.plugin.chart.map.designer.data.component.table;
import com.fr.design.gui.ilable.BoldFontTextLabel;
import com.fr.general.Inter; import com.fr.general.Inter;
import com.fr.plugin.chart.designer.TableLayout4VanChartHelper;
import com.fr.plugin.chart.map.data.VanMapTableDefinitionProvider; import com.fr.plugin.chart.map.data.VanMapTableDefinitionProvider;
import com.fr.plugin.chart.map.designer.data.component.LongitudeLatitudeAndArea; import com.fr.plugin.chart.map.designer.data.component.LongitudeLatitudeAndArea;
import com.fr.plugin.chart.map.designer.data.contentpane.table.VanPointMapPlotTableDataContentPane; import com.fr.plugin.chart.map.designer.data.contentpane.table.VanPointMapPlotTableDataContentPane;
@ -14,7 +14,6 @@ import java.util.List;
* Created by hufan on 2016/12/21. * Created by hufan on 2016/12/21.
*/ */
public class LineMapAreaPane extends PointMapAreaPane { public class LineMapAreaPane extends PointMapAreaPane {
private static final int LEFT_GAP = 15;
private static final int V_GAP = 10; private static final int V_GAP = 10;
protected AreaPane endAreaPane; protected AreaPane endAreaPane;
public LineMapAreaPane(VanPointMapPlotTableDataContentPane.LongLatAreaTableComboPane parentPane) { public LineMapAreaPane(VanPointMapPlotTableDataContentPane.LongLatAreaTableComboPane parentPane) {
@ -25,17 +24,30 @@ public class LineMapAreaPane extends PointMapAreaPane {
initAreaPane(parentPane); initAreaPane(parentPane);
initEndAreaPane(parentPane); initEndAreaPane(parentPane);
JPanel startPane = TableLayout4VanChartHelper.createTitlePane(Inter.getLocText("Plugin-ChartF_Start_Point"), areaPane, LEFT_GAP);
JPanel endPane = TableLayout4VanChartHelper.createTitlePane(Inter.getLocText("Plugin-ChartF_End_Point"), endAreaPane, LEFT_GAP);
JPanel content = new JPanel(new BorderLayout(0, V_GAP)); JPanel content = new JPanel(new BorderLayout(0, V_GAP));
content.add(startPane, BorderLayout.NORTH); content.add(areaPane, BorderLayout.NORTH);
content.add(endPane, BorderLayout.CENTER); content.add(endAreaPane, BorderLayout.CENTER);
return content; return content;
} }
protected void initAreaPane(VanPointMapPlotTableDataContentPane.LongLatAreaTableComboPane parentPane) {
areaPane = new AreaPane(parentPane){
protected Component[][] getComponent () {
return new Component[][]{
new Component[]{new BoldFontTextLabel(Inter.getLocText(new String[]{"Plugin-ChartF_Start", "FR-Chart-Area_Name"})), areaNameCom}
};
}
};
}
protected void initEndAreaPane(VanPointMapPlotTableDataContentPane.LongLatAreaTableComboPane parentPane) { protected void initEndAreaPane(VanPointMapPlotTableDataContentPane.LongLatAreaTableComboPane parentPane) {
endAreaPane = new AreaPane(parentPane); endAreaPane = new AreaPane(parentPane){
protected Component[][] getComponent () {
return new Component[][]{
new Component[]{new BoldFontTextLabel(Inter.getLocText(new String[]{"Plugin-ChartF_End", "FR-Chart-Area_Name"})), areaNameCom}
};
}
};
} }
@Override @Override

24
designer_chart/src/com/fr/plugin/chart/map/designer/data/component/table/LineMapLongLatAreaPane.java

@ -1,8 +1,12 @@
package com.fr.plugin.chart.map.designer.data.component.table; package com.fr.plugin.chart.map.designer.data.component.table;
import com.fr.design.gui.ilable.BoldFontTextLabel;
import com.fr.general.Inter;
import com.fr.plugin.chart.map.designer.data.contentpane.table.VanPointMapPlotTableDataContentPane; import com.fr.plugin.chart.map.designer.data.contentpane.table.VanPointMapPlotTableDataContentPane;
import java.awt.*;
/** /**
* Created by hufan on 2016/12/21. * Created by hufan on 2016/12/21.
*/ */
@ -13,10 +17,26 @@ public class LineMapLongLatAreaPane extends LineMapAreaPane {
} }
protected void initEndAreaPane(VanPointMapPlotTableDataContentPane.LongLatAreaTableComboPane parentPane) { protected void initEndAreaPane(VanPointMapPlotTableDataContentPane.LongLatAreaTableComboPane parentPane) {
endAreaPane = new LongLatAreaPane(parentPane); endAreaPane = new LongLatAreaPane(parentPane){
protected Component[][] getComponent () {
return new Component[][]{
new Component[]{new BoldFontTextLabel(Inter.getLocText(new String[]{"Plugin-ChartF_End", "Plugin-ChartF_Longitude"})), longitudeCom},
new Component[]{new BoldFontTextLabel(Inter.getLocText(new String[]{"Plugin-ChartF_End", "Plugin-ChartF_Latitude"})), latitudeCom},
new Component[]{new BoldFontTextLabel(Inter.getLocText(new String[]{"Plugin-ChartF_End", "FR-Chart-Area_Name"})), areaNameCom}
};
}
};
} }
protected void initAreaPane(VanPointMapPlotTableDataContentPane.LongLatAreaTableComboPane parentPane) { protected void initAreaPane(VanPointMapPlotTableDataContentPane.LongLatAreaTableComboPane parentPane) {
areaPane = new LongLatAreaPane(parentPane); areaPane = new LongLatAreaPane(parentPane){
protected Component[][] getComponent () {
return new Component[][]{
new Component[]{new BoldFontTextLabel(Inter.getLocText(new String[]{"Plugin-ChartF_Start", "Plugin-ChartF_Longitude"})), longitudeCom},
new Component[]{new BoldFontTextLabel(Inter.getLocText(new String[]{"Plugin-ChartF_Start", "Plugin-ChartF_Latitude"})), latitudeCom},
new Component[]{new BoldFontTextLabel(Inter.getLocText(new String[]{"Plugin-ChartF_Start", "FR-Chart-Area_Name"})), areaNameCom}
};
}
};
} }
} }

14
designer_chart/src/com/fr/plugin/chart/map/designer/data/component/table/LongLatAreaPane.java

@ -18,8 +18,8 @@ import java.util.List;
* Created by hufan on 2016/12/21. * Created by hufan on 2016/12/21.
*/ */
public class LongLatAreaPane extends AreaPane { public class LongLatAreaPane extends AreaPane {
private UIComboBox longitudeCom; protected UIComboBox longitudeCom;
private UIComboBox latitudeCom; protected UIComboBox latitudeCom;
public LongLatAreaPane(VanPointMapPlotTableDataContentPane.LongLatAreaTableComboPane parentPane) { public LongLatAreaPane(VanPointMapPlotTableDataContentPane.LongLatAreaTableComboPane parentPane) {
super(parentPane); super(parentPane);
@ -35,13 +35,17 @@ public class LongLatAreaPane extends AreaPane {
double f = TableLayout.FILL; double f = TableLayout.FILL;
double[] columnSize = {p, f}; double[] columnSize = {p, f};
double[] rowSize = {p, p, p}; double[] rowSize = {p, p, p};
Component[][] components = new Component[][]{ Component[][] components = getComponent();
return TableLayoutHelper.createGapTableLayoutPane(components,rowSize,columnSize,50,6);
}
protected Component[][] getComponent () {
return new Component[][]{
new Component[]{new BoldFontTextLabel(Inter.getLocText("Plugin-ChartF_Longitude")), longitudeCom}, new Component[]{new BoldFontTextLabel(Inter.getLocText("Plugin-ChartF_Longitude")), longitudeCom},
new Component[]{new BoldFontTextLabel(Inter.getLocText("Plugin-ChartF_Latitude")), latitudeCom}, new Component[]{new BoldFontTextLabel(Inter.getLocText("Plugin-ChartF_Latitude")), latitudeCom},
new Component[]{new BoldFontTextLabel(Inter.getLocText("FR-Chart-Area_Name")), areaNameCom} new Component[]{new BoldFontTextLabel(Inter.getLocText("FR-Chart-Area_Name")), areaNameCom}
}; };
return TableLayoutHelper.createGapTableLayoutPane(components,rowSize,columnSize,50,6);
} }
public void refreshBoxListWithSelectTableData(List list) { public void refreshBoxListWithSelectTableData(List list) {

3
designer_chart/src/com/fr/plugin/chart/map/designer/data/component/table/PointMapAreaPane.java

@ -1,6 +1,7 @@
package com.fr.plugin.chart.map.designer.data.component.table; package com.fr.plugin.chart.map.designer.data.component.table;
import com.fr.plugin.chart.map.designer.data.component.LongitudeLatitudeAndArea;
import com.fr.plugin.chart.map.data.VanMapTableDefinitionProvider; import com.fr.plugin.chart.map.data.VanMapTableDefinitionProvider;
import com.fr.plugin.chart.map.designer.data.component.LongitudeLatitudeAndArea;
import com.fr.plugin.chart.map.designer.data.contentpane.table.VanPointMapPlotTableDataContentPane; import com.fr.plugin.chart.map.designer.data.contentpane.table.VanPointMapPlotTableDataContentPane;
import javax.swing.*; import javax.swing.*;

3
designer_chart/src/com/fr/plugin/chart/map/designer/data/contentpane/report/VanPointMapPlotReportDataContentPane.java

@ -76,7 +76,6 @@ public class VanPointMapPlotReportDataContentPane extends VanAreaMapPlotReportDa
locationType = new UIButtonGroup<Integer>(new String[]{Inter.getLocText("Plugin-ChartF_Location_With_AreaName"), locationType = new UIButtonGroup<Integer>(new String[]{Inter.getLocText("Plugin-ChartF_Location_With_AreaName"),
Inter.getLocText("Plugin-ChartF_Location_With_LongAndLat")}); Inter.getLocText("Plugin-ChartF_Location_With_LongAndLat")});
locationType.addChangeListener(new ChangeListener() { locationType.addChangeListener(new ChangeListener() {
@Override @Override
public void stateChanged(ChangeEvent e) { public void stateChanged(ChangeEvent e) {
@ -99,7 +98,7 @@ public class VanPointMapPlotReportDataContentPane extends VanAreaMapPlotReportDa
new Component[]{new UILabel(Inter.getLocText("Plugin-Chart_Geographic")),locationType}, new Component[]{new UILabel(Inter.getLocText("Plugin-Chart_Geographic")),locationType},
}; };
JPanel panel = TableLayoutHelper.createGapTableLayoutPane(components,rowSize,columnSize,30,6); JPanel panel = TableLayoutHelper.createGapTableLayoutPane(components,rowSize,columnSize,12,6);
this.add(panel, BorderLayout.NORTH); this.add(panel, BorderLayout.NORTH);

9
designer_chart/src/com/fr/plugin/chart/map/designer/type/VanChartMapSourceChoosePane.java

@ -131,10 +131,10 @@ public class VanChartMapSourceChoosePane extends JPanel implements UIObserver {
public VanChartMapSourceChoosePane() { public VanChartMapSourceChoosePane() {
this.setLayout(new BorderLayout()); this.setLayout(new BorderLayout());
this.setBorder(BorderFactory.createEmptyBorder(10,0,0,0)); this.setBorder(BorderFactory.createEmptyBorder(10,5,0,0));
double p = TableLayout.PREFERRED; double p = TableLayout.PREFERRED;
double[] columnSize = {246}; double[] columnSize = {230};
double[] rowSize = {p,p,p,p,p,p,p,p}; double[] rowSize = {p,p,p,p,p,p,p,p};
JPanel panel = new JPanel(new BorderLayout()); JPanel panel = new JPanel(new BorderLayout());
@ -214,8 +214,9 @@ public class VanChartMapSourceChoosePane extends JPanel implements UIObserver {
double p = TableLayout.PREFERRED; double p = TableLayout.PREFERRED;
double f = TableLayout.FILL; double f = TableLayout.FILL;
double[] columnSize = {p, f}; double e = TableLayout4VanChartHelper.EDIT_AREA_WIDTH;
double[] rowSize = {p,p}; double[] columnSize = {f, e};
double[] rowSize = {p, p};
Component[][] components = new Component[][]{ Component[][] components = new Component[][]{
new Component[]{null,null}, new Component[]{null,null},
new Component[]{sourceTitleLabel,sourceComboBox}, new Component[]{sourceTitleLabel,sourceComboBox},

11
designer_chart/src/com/fr/plugin/chart/range/component/GradualIntervalConfigPane.java

@ -3,9 +3,9 @@ package com.fr.plugin.chart.range.component;
import com.fr.design.gui.frpane.UINumberDragPane; import com.fr.design.gui.frpane.UINumberDragPane;
import com.fr.design.gui.ilable.BoldFontTextLabel; import com.fr.design.gui.ilable.BoldFontTextLabel;
import com.fr.design.layout.TableLayout; import com.fr.design.layout.TableLayout;
import com.fr.design.layout.TableLayoutHelper;
import com.fr.design.mainframe.chart.gui.ColorSelectBoxWithOutTransparent; import com.fr.design.mainframe.chart.gui.ColorSelectBoxWithOutTransparent;
import com.fr.general.Inter; import com.fr.general.Inter;
import com.fr.plugin.chart.designer.TableLayout4VanChartHelper;
import com.fr.plugin.chart.designer.style.axis.component.MinMaxValuePaneWithOutTick; import com.fr.plugin.chart.designer.style.axis.component.MinMaxValuePaneWithOutTick;
import com.fr.plugin.chart.range.GradualIntervalConfig; import com.fr.plugin.chart.range.GradualIntervalConfig;
@ -53,13 +53,14 @@ public class GradualIntervalConfigPane extends JPanel{
double p = TableLayout.PREFERRED; double p = TableLayout.PREFERRED;
double f = TableLayout.FILL; double f = TableLayout.FILL;
double[] col = new double[]{p,f}; double e = TableLayout4VanChartHelper.EDIT_AREA_WIDTH;
double[] row = new double[]{p,p,p,p}; double[] col = new double[]{f, e};
double[] row = new double[]{p, p, p, p};
Component[][] components = getPaneComponents(); Component[][] components = getPaneComponents();
//控件承载面板 //控件承载面板
JPanel contentPane = TableLayoutHelper.createTableLayoutPane(components,row,col); JPanel contentPane = TableLayout4VanChartHelper.createGapTableLayoutPane(components,row,col);
this.setLayout(new BorderLayout()); this.setLayout(new BorderLayout());
this.add(contentPane,BorderLayout.CENTER); this.add(contentPane,BorderLayout.CENTER);
} }
@ -77,7 +78,7 @@ public class GradualIntervalConfigPane extends JPanel{
return new Component[][]{ return new Component[][]{
new Component[]{minMaxValuePane, null}, new Component[]{minMaxValuePane, null},
new Component[]{new BoldFontTextLabel(Inter.getLocText("FR-Chart-Value_Divided_stage")), numberDragPane}, new Component[]{new BoldFontTextLabel(Inter.getLocText("FR-Chart-Value_Divided_stage")), numberDragPane},
new Component[]{legendGradientBar, null}, new Component[]{null, legendGradientBar},
}; };
} }

Loading…
Cancel
Save