From 418c676bd1cd7c2724c8bd7e554c479a930271f2 Mon Sep 17 00:00:00 2001 From: fr_shine Date: Fri, 18 Aug 2017 15:14:49 +0800 Subject: [PATCH] =?UTF-8?q?=E6=89=93=E5=8C=85=E7=B1=BB=E9=87=8D=E5=A4=8D?= =?UTF-8?q?=20=E9=87=8D=E5=91=BD=E5=90=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../plugin/chart/custom/CustomPlotDesignerPaneFactory.java | 5 ++--- .../com/fr/plugin/chart/custom/VanChartCustomPlotPane.java | 3 +-- .../chart/custom/component/ChartImageCheckOutPane.java | 6 +++--- .../custom/component/VanChartCustomPlotSelectPane.java | 4 ++-- .../other/VanChartCustomPlotConditionAttrTabPane.java | 3 ++- .../custom/other/VanChartCustomPlotHyperlinkTabPane.java | 3 ++- .../chart/custom/style/VanChartCustomAxisAreaPane.java | 2 +- .../chart/custom/style/VanChartCustomAxisTabPane.java | 3 ++- .../chart/custom/style/VanChartCustomPlotLabelTabPane.java | 5 +++-- .../chart/custom/style/VanChartCustomPlotSeriesTabPane.java | 3 ++- .../custom/style/VanChartCustomPlotTooltipTabPane.java | 3 ++- 11 files changed, 22 insertions(+), 18 deletions(-) diff --git a/designer_chart/src/com/fr/plugin/chart/custom/CustomPlotDesignerPaneFactory.java b/designer_chart/src/com/fr/plugin/chart/custom/CustomPlotDesignerPaneFactory.java index b4f4138a4c..341149b4e4 100644 --- a/designer_chart/src/com/fr/plugin/chart/custom/CustomPlotDesignerPaneFactory.java +++ b/designer_chart/src/com/fr/plugin/chart/custom/CustomPlotDesignerPaneFactory.java @@ -10,17 +10,16 @@ import com.fr.plugin.chart.PiePlot4VanChart; import com.fr.plugin.chart.attr.plot.VanChartAxisPlot; import com.fr.plugin.chart.attr.plot.VanChartPlot; import com.fr.plugin.chart.bubble.VanChartBubblePlot; -import com.fr.plugin.chart.custom.CustomPlotFactory; +import com.fr.plugin.chart.bubble.data.VanChartBubblePlotTableDataContentPane; import com.fr.plugin.chart.custom.component.CustomPlotLocationPane; import com.fr.plugin.chart.custom.type.CustomPlotType; -import com.fr.plugin.chart.bubble.data.VanChartBubblePlotTableDataContentPane; -import com.fr.plugin.chart.scatter.data.VanChartScatterPlotTableDataContentPane; import com.fr.plugin.chart.designer.style.VanChartStylePane; import com.fr.plugin.chart.designer.style.axis.VanChartAxisPane; import com.fr.plugin.chart.designer.style.axis.gauge.VanChartGaugeAxisPane; import com.fr.plugin.chart.gauge.VanChartGaugePlot; import com.fr.plugin.chart.radar.VanChartRadarPlot; import com.fr.plugin.chart.scatter.VanChartScatterPlot; +import com.fr.plugin.chart.scatter.data.VanChartScatterPlotTableDataContentPane; import java.lang.reflect.Constructor; import java.util.HashMap; diff --git a/designer_chart/src/com/fr/plugin/chart/custom/VanChartCustomPlotPane.java b/designer_chart/src/com/fr/plugin/chart/custom/VanChartCustomPlotPane.java index 94be28fd21..7391640a60 100644 --- a/designer_chart/src/com/fr/plugin/chart/custom/VanChartCustomPlotPane.java +++ b/designer_chart/src/com/fr/plugin/chart/custom/VanChartCustomPlotPane.java @@ -11,12 +11,11 @@ import com.fr.design.layout.TableLayoutHelper; import com.fr.design.mainframe.chart.gui.type.ChartImagePane; import com.fr.general.FRLogger; import com.fr.general.Inter; -import com.fr.plugin.chart.base.VanChartTools; import com.fr.plugin.chart.base.VanChartAttrLine; +import com.fr.plugin.chart.base.VanChartTools; import com.fr.plugin.chart.custom.component.VanChartCustomPlotSelectPane; import com.fr.plugin.chart.custom.type.CustomPlotType; import com.fr.plugin.chart.custom.type.CustomStyle; -import com.fr.plugin.chart.custom.CustomPlotFactory; import com.fr.plugin.chart.designer.type.AbstractVanChartTypePane; import com.fr.plugin.chart.vanchart.VanChart; diff --git a/designer_chart/src/com/fr/plugin/chart/custom/component/ChartImageCheckOutPane.java b/designer_chart/src/com/fr/plugin/chart/custom/component/ChartImageCheckOutPane.java index fc36decc9d..d9515ac688 100644 --- a/designer_chart/src/com/fr/plugin/chart/custom/component/ChartImageCheckOutPane.java +++ b/designer_chart/src/com/fr/plugin/chart/custom/component/ChartImageCheckOutPane.java @@ -4,7 +4,7 @@ import com.fr.design.constants.UIConstants; import com.fr.design.dialog.BasicPane; import com.fr.design.event.UIObserver; import com.fr.design.event.UIObserverListener; -import com.fr.plugin.chart.custom.CustomPlotFactory; +import com.fr.plugin.chart.custom.CustomPlotGlyphFactory; import com.fr.plugin.chart.custom.type.CustomPlotType; import javax.swing.*; @@ -42,7 +42,7 @@ public class ChartImageCheckOutPane extends BasicPane implements UIObserver { this.checkBox = new JCheckBox(); this.checkBox.setSelected(isSelected); //设置提示 - this.checkBox.setToolTipText(CustomPlotFactory.getTooltipText(this.customPlotType)); + this.checkBox.setToolTipText(CustomPlotGlyphFactory.getTooltipText(this.customPlotType)); //背景 checkBox.setIcon(new ImageIcon(getClass().getResource(getIconPath(customPlotType,isSelected)))); @@ -50,7 +50,7 @@ public class ChartImageCheckOutPane extends BasicPane implements UIObserver { } private String getIconPath(CustomPlotType customPlotType, boolean isSelected) { - return isSelected ? CustomPlotFactory.getTypeIconPath(customPlotType)[0] : CustomPlotFactory.getTypeIconPath(customPlotType)[1]; + return isSelected ? CustomPlotGlyphFactory.getTypeIconPath(customPlotType)[0] : CustomPlotGlyphFactory.getTypeIconPath(customPlotType)[1]; } diff --git a/designer_chart/src/com/fr/plugin/chart/custom/component/VanChartCustomPlotSelectPane.java b/designer_chart/src/com/fr/plugin/chart/custom/component/VanChartCustomPlotSelectPane.java index 02761a1952..30024e2cdb 100644 --- a/designer_chart/src/com/fr/plugin/chart/custom/component/VanChartCustomPlotSelectPane.java +++ b/designer_chart/src/com/fr/plugin/chart/custom/component/VanChartCustomPlotSelectPane.java @@ -8,11 +8,11 @@ import com.fr.general.FRLogger; import com.fr.general.Inter; import com.fr.plugin.chart.attr.plot.VanChartPlot; import com.fr.plugin.chart.attr.plot.VanChartRectanglePlot; +import com.fr.plugin.chart.custom.CustomPlotDesignerPaneFactory; +import com.fr.plugin.chart.custom.CustomPlotFactory; import com.fr.plugin.chart.custom.VanChartCustomPlot; import com.fr.plugin.chart.custom.type.CustomPlotType; import com.fr.plugin.chart.custom.type.CustomStyle; -import com.fr.plugin.chart.custom.CustomPlotDesignerPaneFactory; -import com.fr.plugin.chart.custom.CustomPlotFactory; import javax.swing.*; import java.awt.*; diff --git a/designer_chart/src/com/fr/plugin/chart/custom/other/VanChartCustomPlotConditionAttrTabPane.java b/designer_chart/src/com/fr/plugin/chart/custom/other/VanChartCustomPlotConditionAttrTabPane.java index 18285dfd16..2e6e2c945c 100644 --- a/designer_chart/src/com/fr/plugin/chart/custom/other/VanChartCustomPlotConditionAttrTabPane.java +++ b/designer_chart/src/com/fr/plugin/chart/custom/other/VanChartCustomPlotConditionAttrTabPane.java @@ -3,6 +3,7 @@ package com.fr.plugin.chart.custom.other; import com.fr.design.dialog.BasicPane; import com.fr.plugin.chart.attr.plot.VanChartPlot; import com.fr.plugin.chart.custom.CustomPlotFactory; +import com.fr.plugin.chart.custom.CustomPlotGlyphFactory; import com.fr.plugin.chart.custom.VanChartCustomPlot; import com.fr.plugin.chart.custom.component.VanChartCustomPlotTabPane; import com.fr.plugin.chart.custom.type.CustomPlotType; @@ -31,7 +32,7 @@ public class VanChartCustomPlotConditionAttrTabPane extends VanChartCustomPlotTa VanChartPlot vanChartPlot = customPlotList.get(j); CustomPlotType plotType = CustomPlotFactory.getCustomType(vanChartPlot); - NameArray[i] = CustomPlotFactory.getTitle(plotType); + NameArray[i] = CustomPlotGlyphFactory.getTitle(plotType); centerPane.add(pane, NameArray[i]); }else { //如果不支持，则i不动 diff --git a/designer_chart/src/com/fr/plugin/chart/custom/other/VanChartCustomPlotHyperlinkTabPane.java b/designer_chart/src/com/fr/plugin/chart/custom/other/VanChartCustomPlotHyperlinkTabPane.java index 073a845207..1a86793b0b 100644 --- a/designer_chart/src/com/fr/plugin/chart/custom/other/VanChartCustomPlotHyperlinkTabPane.java +++ b/designer_chart/src/com/fr/plugin/chart/custom/other/VanChartCustomPlotHyperlinkTabPane.java @@ -3,6 +3,7 @@ package com.fr.plugin.chart.custom.other; import com.fr.design.dialog.BasicPane; import com.fr.plugin.chart.attr.plot.VanChartPlot; import com.fr.plugin.chart.custom.CustomPlotFactory; +import com.fr.plugin.chart.custom.CustomPlotGlyphFactory; import com.fr.plugin.chart.custom.VanChartCustomPlot; import com.fr.plugin.chart.custom.component.VanChartCustomPlotTabPane; import com.fr.plugin.chart.custom.component.VanChartHyperLinkPane; @@ -29,7 +30,7 @@ public class VanChartCustomPlotHyperlinkTabPane extends VanChartCustomPlotTabPan //获取点的tooltip作为标题 VanChartPlot vanChartPlot = customPlotList.get(i); CustomPlotType plotType = CustomPlotFactory.getCustomType(vanChartPlot); - String name = CustomPlotFactory.getTitle(plotType); + String name = CustomPlotGlyphFactory.getTitle(plotType); NameArray[i] = name.length() > 3 ? name.substring(0, 3) : name; centerPane.add(pane, NameArray[i]); } diff --git a/designer_chart/src/com/fr/plugin/chart/custom/style/VanChartCustomAxisAreaPane.java b/designer_chart/src/com/fr/plugin/chart/custom/style/VanChartCustomAxisAreaPane.java index 64554aa539..916452aabe 100644 --- a/designer_chart/src/com/fr/plugin/chart/custom/style/VanChartCustomAxisAreaPane.java +++ b/designer_chart/src/com/fr/plugin/chart/custom/style/VanChartCustomAxisAreaPane.java @@ -2,9 +2,9 @@ package com.fr.plugin.chart.custom.style; import com.fr.chart.chartattr.Plot; import com.fr.plugin.chart.attr.plot.VanChartPlot; -import com.fr.plugin.chart.custom.VanChartCustomPlot; import com.fr.plugin.chart.custom.CustomPlotDesignerPaneFactory; import com.fr.plugin.chart.custom.CustomPlotFactory; +import com.fr.plugin.chart.custom.VanChartCustomPlot; import com.fr.plugin.chart.designer.style.background.VanChartAxisAreaPane; import java.util.List; diff --git a/designer_chart/src/com/fr/plugin/chart/custom/style/VanChartCustomAxisTabPane.java b/designer_chart/src/com/fr/plugin/chart/custom/style/VanChartCustomAxisTabPane.java index 8fc7a774c1..dc205b5394 100644 --- a/designer_chart/src/com/fr/plugin/chart/custom/style/VanChartCustomAxisTabPane.java +++ b/designer_chart/src/com/fr/plugin/chart/custom/style/VanChartCustomAxisTabPane.java @@ -6,6 +6,7 @@ import com.fr.plugin.chart.attr.plot.VanChartAxisPlot; import com.fr.plugin.chart.attr.plot.VanChartPlot; import com.fr.plugin.chart.custom.CustomPlotDesignerPaneFactory; import com.fr.plugin.chart.custom.CustomPlotFactory; +import com.fr.plugin.chart.custom.CustomPlotGlyphFactory; import com.fr.plugin.chart.custom.VanChartCustomPlot; import com.fr.plugin.chart.custom.component.VanChartCustomPlotAxisPane; import com.fr.plugin.chart.custom.component.VanChartCustomPlotTabPane; @@ -72,7 +73,7 @@ public class VanChartCustomAxisTabPane extends VanChartCustomPlotTabPane