diff --git a/designer_chart/src/com/fr/design/mainframe/chart/gui/ChangeConfigPane.java b/designer_chart/src/com/fr/design/mainframe/chart/gui/ChangeConfigPane.java index 89e5e5719..c4cd32a22 100644 --- a/designer_chart/src/com/fr/design/mainframe/chart/gui/ChangeConfigPane.java +++ b/designer_chart/src/com/fr/design/mainframe/chart/gui/ChangeConfigPane.java @@ -5,8 +5,8 @@ package com.fr.design.mainframe.chart.gui; */ import com.fr.chart.chartattr.ChartCollection; -import com.fr.chart.chartattr.change.ChangeConfigAttr; -import com.fr.chart.chartglyph.ChangeType; +import com.fr.chart.base.AttrChangeConfig; +import com.fr.chart.base.AttrChangeType; import com.fr.design.beans.BasicBeanPane; import com.fr.design.gui.ibutton.UIButtonGroup; import com.fr.design.gui.ilable.UILabel; @@ -163,11 +163,11 @@ public class ChangeConfigPane extends BasicBeanPane { if (ob == null){ return; } - ChangeConfigAttr changeConfigAttr = ob.getChangeConfigAttr(); + AttrChangeConfig changeConfigAttr = ob.getChangeConfigAttr(); if (changeConfigAttr == null){ return; } - configStyleButton.setSelectedIndex(changeConfigAttr.getChangeType() == ChangeType.BUTTON ? 0 : 1); + configStyleButton.setSelectedIndex(changeConfigAttr.getChangeType() == AttrChangeType.BUTTON ? 0 : 1); //按钮切换界面 styleAttrPane.populate(changeConfigAttr.getStyleAttr()); @@ -190,12 +190,13 @@ public class ChangeConfigPane extends BasicBeanPane { if (ob == null){ return; } - ChangeConfigAttr changeConfigAttr = ob.getChangeConfigAttr(); + AttrChangeConfig changeConfigAttr = ob.getChangeConfigAttr(); if (changeConfigAttr == null){ return; } - changeConfigAttr.setChangeType(configStyleButton.getSelectedIndex() == 0 ? ChangeType.BUTTON : ChangeType.CAROUSEL); + changeConfigAttr.setEnable(ob.changeEnable()); + changeConfigAttr.setChangeType(configStyleButton.getSelectedIndex() == 0 ? AttrChangeType.BUTTON : AttrChangeType.CAROUSEL); changeConfigAttr.setStyleAttr(styleAttrPane.update()); changeConfigAttr.setButtonColor(colorSelectBox4button.getSelectObject()); changeConfigAttr.setTimeInterval(timeInterval.getValue()); diff --git a/designer_chart/src/com/fr/design/mainframe/chart/gui/ChartTypeButtonPane.java b/designer_chart/src/com/fr/design/mainframe/chart/gui/ChartTypeButtonPane.java index fceb0500f..0a563723c 100644 --- a/designer_chart/src/com/fr/design/mainframe/chart/gui/ChartTypeButtonPane.java +++ b/designer_chart/src/com/fr/design/mainframe/chart/gui/ChartTypeButtonPane.java @@ -4,7 +4,7 @@ import com.fr.base.BaseUtils; import com.fr.chart.chartattr.Chart; import com.fr.chart.chartattr.ChartCollection; import com.fr.chart.chartattr.SwitchState; -import com.fr.chart.chartattr.change.ChangeConfigAttr; +import com.fr.chart.base.AttrChangeConfig; import com.fr.design.beans.BasicBeanPane; import com.fr.design.dialog.DialogActionListener; import com.fr.design.dialog.UIDialog; @@ -115,7 +115,7 @@ public class ChartTypeButtonPane extends BasicBeanPane implemen } private void initConfigCreator() { - configCreator = new UIMenuNameableCreator(Inter.getLocText("Chart-Change_Config_Attributes"), new ChangeConfigAttr(), ChangeConfigPane.class); + configCreator = new UIMenuNameableCreator(Inter.getLocText("Chart-Change_Config_Attributes"), new AttrChangeConfig(), ChangeConfigPane.class); } private void initAddButton() {