From 96bc00ca79d3274e7eb4cc00b45666ab8d8d7986 Mon Sep 17 00:00:00 2001 From: Qin Xiaofu Date: Mon, 28 Aug 2017 11:00:47 +0800 Subject: [PATCH 1/2] =?UTF-8?q?CHART-1212=20=E6=B7=BB=E5=8A=A0=E5=8E=BB?= =?UTF-8?q?=E6=8E=89=E8=BD=AE=E6=92=AD=E7=AE=AD=E5=A4=B4=E7=9A=84=E8=AE=BE?= =?UTF-8?q?=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/com/fr/design/mainframe/chart/gui/ChangeConfigPane.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 32976eedd..23135b076 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 @@ -178,7 +178,7 @@ public class ChangeConfigPane extends BasicBeanPane { //轮播切换界面 timeInterval.setValue(changeConfigAttr.getTimeInterval()); colorSelectBox4carousel.setSelectObject(changeConfigAttr.getCarouselColor()); - arrowCheckbox.setSelected(changeConfigAttr.getShowArrow()); + arrowCheckbox.setSelected(changeConfigAttr.isShowArrow()); checkCardPane(); From 63e60c68f1e07416101336960af1b98b183dc691 Mon Sep 17 00:00:00 2001 From: fr_shine Date: Mon, 28 Aug 2017 13:59:39 +0800 Subject: [PATCH 2/2] attr class path --- .../com/fr/design/mainframe/chart/gui/ChangeConfigPane.java | 6 +++--- .../style/background/BackgroundListControlPane.java | 2 +- .../style/background/BackgroundNameObjectCreator.java | 2 +- .../background/VanChartCustomIntervalBackgroundPane.java | 2 +- .../style/background/radar/VanChartRadarAxisAreaPane.java | 2 +- 5 files changed, 7 insertions(+), 7 deletions(-) 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 32976eedd..02d78c0f3 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 @@ -9,9 +9,9 @@ import com.fr.chart.base.AttrChangeType; import com.fr.chart.chartattr.ChartCollection; import com.fr.design.beans.BasicBeanPane; import com.fr.design.gui.ibutton.UIButtonGroup; +import com.fr.design.gui.icheckbox.UICheckBox; import com.fr.design.gui.ilable.UILabel; import com.fr.design.gui.ispinner.UISpinner; -import com.fr.design.gui.icheckbox.UICheckBox; import com.fr.design.layout.TableLayout; import com.fr.design.layout.TableLayoutHelper; import com.fr.design.mainframe.chart.gui.style.ChartTextAttrPane; @@ -178,7 +178,7 @@ public class ChangeConfigPane extends BasicBeanPane { //轮播切换界面 timeInterval.setValue(changeConfigAttr.getTimeInterval()); colorSelectBox4carousel.setSelectObject(changeConfigAttr.getCarouselColor()); - arrowCheckbox.setSelected(changeConfigAttr.getShowArrow()); + // arrowCheckbox.setSelected(changeConfigAttr.getShowArrow()); checkCardPane(); @@ -202,7 +202,7 @@ public class ChangeConfigPane extends BasicBeanPane { changeConfigAttr.setButtonColor(colorSelectBox4button.getSelectObject()); changeConfigAttr.setTimeInterval((int) timeInterval.getValue()); changeConfigAttr.setCarouselColor(colorSelectBox4carousel.getSelectObject()); - changeConfigAttr.setShowArrow(arrowCheckbox.isSelected()); + // changeConfigAttr.setShowArrow(arrowCheckbox.isSelected()); } @Override diff --git a/designer_chart/src/com/fr/plugin/chart/designer/style/background/BackgroundListControlPane.java b/designer_chart/src/com/fr/plugin/chart/designer/style/background/BackgroundListControlPane.java index 5d502e08b..7e19f97be 100644 --- a/designer_chart/src/com/fr/plugin/chart/designer/style/background/BackgroundListControlPane.java +++ b/designer_chart/src/com/fr/plugin/chart/designer/style/background/BackgroundListControlPane.java @@ -10,9 +10,9 @@ import com.fr.general.NameObject; import com.fr.plugin.chart.attr.DefaultAxisHelper; import com.fr.plugin.chart.attr.axis.VanChartAlertValue; import com.fr.plugin.chart.attr.axis.VanChartAxis; +import com.fr.plugin.chart.attr.axis.VanChartCustomIntervalBackground; import com.fr.plugin.chart.attr.plot.VanChartPlot; import com.fr.plugin.chart.attr.plot.VanChartRectanglePlot; -import com.fr.plugin.chart.base.VanChartCustomIntervalBackground; import com.fr.stable.Nameable; import java.util.ArrayList; diff --git a/designer_chart/src/com/fr/plugin/chart/designer/style/background/BackgroundNameObjectCreator.java b/designer_chart/src/com/fr/plugin/chart/designer/style/background/BackgroundNameObjectCreator.java index bf5c6cf66..781cfe35c 100644 --- a/designer_chart/src/com/fr/plugin/chart/designer/style/background/BackgroundNameObjectCreator.java +++ b/designer_chart/src/com/fr/plugin/chart/designer/style/background/BackgroundNameObjectCreator.java @@ -4,7 +4,7 @@ import com.fr.design.beans.BasicBeanPane; import com.fr.design.gui.controlpane.UnrepeatedNameHelper; import com.fr.general.FRLogger; import com.fr.general.NameObject; -import com.fr.plugin.chart.base.VanChartCustomIntervalBackground; +import com.fr.plugin.chart.attr.axis.VanChartCustomIntervalBackground; import com.fr.stable.Nameable; import java.lang.reflect.Constructor; diff --git a/designer_chart/src/com/fr/plugin/chart/designer/style/background/VanChartCustomIntervalBackgroundPane.java b/designer_chart/src/com/fr/plugin/chart/designer/style/background/VanChartCustomIntervalBackgroundPane.java index bf6bb4695..5c9ab759c 100644 --- a/designer_chart/src/com/fr/plugin/chart/designer/style/background/VanChartCustomIntervalBackgroundPane.java +++ b/designer_chart/src/com/fr/plugin/chart/designer/style/background/VanChartCustomIntervalBackgroundPane.java @@ -14,7 +14,7 @@ import com.fr.design.style.color.ColorSelectBox; import com.fr.design.utils.gui.GUICoreUtils; import com.fr.general.Inter; import com.fr.plugin.chart.VanChartAttrHelper; -import com.fr.plugin.chart.base.VanChartCustomIntervalBackground; +import com.fr.plugin.chart.attr.axis.VanChartCustomIntervalBackground; import com.fr.plugin.chart.designer.TableLayout4VanChartHelper; import javax.swing.*; diff --git a/designer_chart/src/com/fr/plugin/chart/designer/style/background/radar/VanChartRadarAxisAreaPane.java b/designer_chart/src/com/fr/plugin/chart/designer/style/background/radar/VanChartRadarAxisAreaPane.java index d9b13ff51..c99443624 100644 --- a/designer_chart/src/com/fr/plugin/chart/designer/style/background/radar/VanChartRadarAxisAreaPane.java +++ b/designer_chart/src/com/fr/plugin/chart/designer/style/background/radar/VanChartRadarAxisAreaPane.java @@ -4,7 +4,7 @@ import com.fr.design.beans.BasicBeanPane; import com.fr.design.gui.ilable.UILabel; import com.fr.general.Inter; import com.fr.plugin.chart.attr.axis.VanChartAlertValue; -import com.fr.plugin.chart.base.VanChartCustomIntervalBackground; +import com.fr.plugin.chart.attr.axis.VanChartCustomIntervalBackground; import com.fr.plugin.chart.designer.style.background.VanChartAxisAreaPane; import java.awt.*;