|
|
|
@ -1,11 +1,11 @@
|
|
|
|
|
package com.fr.van.chart.designer.style.axis; |
|
|
|
|
|
|
|
|
|
import com.fr.chart.chartattr.Axis; |
|
|
|
|
import com.fr.design.i18n.Toolkit; |
|
|
|
|
import com.fr.design.beans.FurtherBasicBeanPane; |
|
|
|
|
import com.fr.design.gui.frpane.UIComboBoxPane; |
|
|
|
|
import com.fr.design.mainframe.chart.PaneTitleConstants; |
|
|
|
|
import com.fr.general.ComparatorUtils; |
|
|
|
|
|
|
|
|
|
import com.fr.plugin.chart.attr.axis.VanChartAxis; |
|
|
|
|
import com.fr.plugin.chart.attr.axis.VanChartTimeAxis; |
|
|
|
|
import com.fr.plugin.chart.attr.axis.VanChartValueAxis; |
|
|
|
@ -57,7 +57,7 @@ public class VanChartAxisScrollPaneWithTypeSelect extends AbstractVanChartScroll
|
|
|
|
|
|
|
|
|
|
protected void initLayout() { |
|
|
|
|
this.setLayout(new BorderLayout(0,6)); |
|
|
|
|
JPanel northPane = TableLayout4VanChartHelper.createGapTableLayoutPane(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Type"),jcb); |
|
|
|
|
JPanel northPane = TableLayout4VanChartHelper.createGapTableLayoutPane(Toolkit.i18nText("Fine-Design_Chart_Type"), jcb); |
|
|
|
|
northPane.setBorder(BorderFactory.createEmptyBorder(0,5,0,0)); |
|
|
|
|
this.add(northPane, BorderLayout.NORTH); |
|
|
|
|
this.add(cardPane, BorderLayout.CENTER); |
|
|
|
@ -102,21 +102,21 @@ public class VanChartAxisScrollPaneWithTypeSelect extends AbstractVanChartScroll
|
|
|
|
|
if(ComparatorUtils.equals(axis.getAxisType(), AxisType.AXIS_CATEGORY)){ |
|
|
|
|
textAxisPane.updateBean(axis); |
|
|
|
|
} else { |
|
|
|
|
axis = new VanChartAxis(axis.getAxisName(), axis.getPosition()); |
|
|
|
|
axis = new VanChartAxis(axis.getAxisName(), axis.getPosition(), axis.getGridLineType()); |
|
|
|
|
textAxisPane.updateBean(axis); |
|
|
|
|
} |
|
|
|
|
} else if(ComparatorUtils.equals(index, AxisType.AXIS_TIME.ordinal())){ |
|
|
|
|
if(ComparatorUtils.equals(axis.getAxisType(), AxisType.AXIS_TIME)){ |
|
|
|
|
timeAxisPane.updateBean(axis); |
|
|
|
|
} else { |
|
|
|
|
axis = new VanChartTimeAxis(axis.getAxisName(), axis.getPosition()); |
|
|
|
|
axis = new VanChartTimeAxis(axis.getAxisName(), axis.getPosition(), axis.getGridLineType()); |
|
|
|
|
timeAxisPane.updateBean(axis); |
|
|
|
|
} |
|
|
|
|
} else if(ComparatorUtils.equals(index, AxisType.AXIS_VALUE.ordinal())){ |
|
|
|
|
if(ComparatorUtils.equals(axis.getAxisType(), AxisType.AXIS_VALUE)){ |
|
|
|
|
valueAxisPane.updateBean(axis); |
|
|
|
|
} else { |
|
|
|
|
axis = new VanChartValueAxis(axis.getAxisName(), axis.getPosition()); |
|
|
|
|
axis = new VanChartValueAxis(axis.getAxisName(), axis.getPosition(), axis.getGridLineType()); |
|
|
|
|
valueAxisPane.updateBean(axis); |
|
|
|
|
} |
|
|
|
|
} |
|
|
|
|