From b1bf6aac1dcff7fb1f3513949ea8b270c9c29105 Mon Sep 17 00:00:00 2001 From: zheng Date: Thu, 12 Apr 2018 13:41:46 +0800 Subject: [PATCH] disable add button not whole button pan --- .../AreaIndependentChartInterface.java | 4 ---- .../BarIndependentChartInterface.java | 5 ----- .../BubbleIndependentChartInterface.java | 5 ----- .../ColumnIndependentChartInterface.java | 4 ---- .../CustomIndependentChartInterface.java | 4 ---- .../DonutIndependentChartInterface.java | 4 ---- .../FunnelIndependentChartInterface.java | 4 ---- .../GanttIndependentChartInterface.java | 4 ---- .../GisMapIndependentChartInterface.java | 4 ---- .../LineIndependentChartInterface.java | 4 ---- .../MapIndependentChartInterface.java | 4 ---- .../MeterIndependentChartInterface.java | 4 ---- .../PieIndependentChartInterface.java | 4 ---- .../RadarIndependentChartInterface.java | 4 ---- .../RangeIndependentChartInterface.java | 4 ---- .../StockIndependentChartInterface.java | 4 ---- .../XYScatterIndependentChartInterface.java | 4 ---- .../mainframe/chart/gui/ChartTypeButtonPane.java | 16 +++++++++++++--- 18 files changed, 13 insertions(+), 73 deletions(-) diff --git a/designer_chart/src/com/fr/design/chartinterface/AreaIndependentChartInterface.java b/designer_chart/src/com/fr/design/chartinterface/AreaIndependentChartInterface.java index f17d2a57e7..ff8a06ac76 100644 --- a/designer_chart/src/com/fr/design/chartinterface/AreaIndependentChartInterface.java +++ b/designer_chart/src/com/fr/design/chartinterface/AreaIndependentChartInterface.java @@ -21,10 +21,6 @@ import com.fr.design.mainframe.chart.gui.type.AreaPlotPane; * Created by eason on 15/4/21. */ public class AreaIndependentChartInterface extends AbstractIndependentChartUIWithAPILevel { - @Override - public boolean needChartChangePane() { - return false; - } public AbstractChartTypePane getPlotTypePane(){ return new AreaPlotPane(); diff --git a/designer_chart/src/com/fr/design/chartinterface/BarIndependentChartInterface.java b/designer_chart/src/com/fr/design/chartinterface/BarIndependentChartInterface.java index 0fcff5de5b..de1160b102 100644 --- a/designer_chart/src/com/fr/design/chartinterface/BarIndependentChartInterface.java +++ b/designer_chart/src/com/fr/design/chartinterface/BarIndependentChartInterface.java @@ -23,11 +23,6 @@ import com.fr.design.mainframe.chart.gui.type.BarPlotPane; */ public class BarIndependentChartInterface extends AbstractIndependentChartUIWithAPILevel { - @Override - public boolean needChartChangePane() { - return false; - } - public AbstractChartTypePane getPlotTypePane(){ return new BarPlotPane(); } diff --git a/designer_chart/src/com/fr/design/chartinterface/BubbleIndependentChartInterface.java b/designer_chart/src/com/fr/design/chartinterface/BubbleIndependentChartInterface.java index 9cee004846..b9d0b232ce 100644 --- a/designer_chart/src/com/fr/design/chartinterface/BubbleIndependentChartInterface.java +++ b/designer_chart/src/com/fr/design/chartinterface/BubbleIndependentChartInterface.java @@ -20,11 +20,6 @@ import com.fr.design.mainframe.chart.gui.type.BubblePlotPane; */ public class BubbleIndependentChartInterface extends AbstractIndependentChartUIWithAPILevel { - @Override - public boolean needChartChangePane() { - return false; - } - public AbstractChartTypePane getPlotTypePane(){ return new BubblePlotPane(); } diff --git a/designer_chart/src/com/fr/design/chartinterface/ColumnIndependentChartInterface.java b/designer_chart/src/com/fr/design/chartinterface/ColumnIndependentChartInterface.java index a07115530a..8a9249274f 100644 --- a/designer_chart/src/com/fr/design/chartinterface/ColumnIndependentChartInterface.java +++ b/designer_chart/src/com/fr/design/chartinterface/ColumnIndependentChartInterface.java @@ -22,10 +22,6 @@ import com.fr.design.mainframe.chart.gui.type.ColumnPlotPane; * Created by eason on 15/4/21. */ public class ColumnIndependentChartInterface extends AbstractIndependentChartUIWithAPILevel { - @Override - public boolean needChartChangePane() { - return false; - } public AbstractChartTypePane getPlotTypePane(){ return new ColumnPlotPane(); diff --git a/designer_chart/src/com/fr/design/chartinterface/CustomIndependentChartInterface.java b/designer_chart/src/com/fr/design/chartinterface/CustomIndependentChartInterface.java index 6b9698698d..584cdb5e1e 100644 --- a/designer_chart/src/com/fr/design/chartinterface/CustomIndependentChartInterface.java +++ b/designer_chart/src/com/fr/design/chartinterface/CustomIndependentChartInterface.java @@ -20,10 +20,6 @@ import com.fr.design.mainframe.chart.gui.type.CustomPlotPane; */ public class CustomIndependentChartInterface extends AbstractIndependentChartUIWithAPILevel { - @Override - public boolean needChartChangePane() { - return false; - } public AbstractChartTypePane getPlotTypePane(){ return new CustomPlotPane(); diff --git a/designer_chart/src/com/fr/design/chartinterface/DonutIndependentChartInterface.java b/designer_chart/src/com/fr/design/chartinterface/DonutIndependentChartInterface.java index e24510c1f5..8b5894384a 100644 --- a/designer_chart/src/com/fr/design/chartinterface/DonutIndependentChartInterface.java +++ b/designer_chart/src/com/fr/design/chartinterface/DonutIndependentChartInterface.java @@ -22,10 +22,6 @@ import com.fr.design.mainframe.chart.gui.type.DonutPlotPane; */ public class DonutIndependentChartInterface extends AbstractIndependentChartUIWithAPILevel { - @Override - public boolean needChartChangePane() { - return false; - } public AbstractChartTypePane getPlotTypePane(){ return new DonutPlotPane(); diff --git a/designer_chart/src/com/fr/design/chartinterface/FunnelIndependentChartInterface.java b/designer_chart/src/com/fr/design/chartinterface/FunnelIndependentChartInterface.java index a1a93a7936..75ca4e6f82 100644 --- a/designer_chart/src/com/fr/design/chartinterface/FunnelIndependentChartInterface.java +++ b/designer_chart/src/com/fr/design/chartinterface/FunnelIndependentChartInterface.java @@ -20,10 +20,6 @@ import com.fr.design.mainframe.chart.gui.type.FunnelPlotPane; */ public class FunnelIndependentChartInterface extends AbstractIndependentChartUIWithAPILevel { - @Override - public boolean needChartChangePane() { - return false; - } public AbstractChartTypePane getPlotTypePane(){ return new FunnelPlotPane(); diff --git a/designer_chart/src/com/fr/design/chartinterface/GanttIndependentChartInterface.java b/designer_chart/src/com/fr/design/chartinterface/GanttIndependentChartInterface.java index bd1e1d710d..b032b7ca25 100644 --- a/designer_chart/src/com/fr/design/chartinterface/GanttIndependentChartInterface.java +++ b/designer_chart/src/com/fr/design/chartinterface/GanttIndependentChartInterface.java @@ -17,10 +17,6 @@ import com.fr.design.mainframe.chart.gui.type.GanttPlotPane; */ public class GanttIndependentChartInterface extends AbstractIndependentChartUIWithAPILevel { - @Override - public boolean needChartChangePane() { - return false; - } public AbstractChartTypePane getPlotTypePane(){ return new GanttPlotPane(); diff --git a/designer_chart/src/com/fr/design/chartinterface/GisMapIndependentChartInterface.java b/designer_chart/src/com/fr/design/chartinterface/GisMapIndependentChartInterface.java index db137569a5..04cdbd8b29 100644 --- a/designer_chart/src/com/fr/design/chartinterface/GisMapIndependentChartInterface.java +++ b/designer_chart/src/com/fr/design/chartinterface/GisMapIndependentChartInterface.java @@ -13,10 +13,6 @@ import com.fr.design.mainframe.chart.gui.type.GisMapPlotPane; */ public class GisMapIndependentChartInterface extends AbstractIndependentChartUIWithAPILevel { - @Override - public boolean needChartChangePane() { - return false; - } public AbstractChartTypePane getPlotTypePane(){ return new GisMapPlotPane(); diff --git a/designer_chart/src/com/fr/design/chartinterface/LineIndependentChartInterface.java b/designer_chart/src/com/fr/design/chartinterface/LineIndependentChartInterface.java index 80f303e7f5..a133a200ac 100644 --- a/designer_chart/src/com/fr/design/chartinterface/LineIndependentChartInterface.java +++ b/designer_chart/src/com/fr/design/chartinterface/LineIndependentChartInterface.java @@ -21,10 +21,6 @@ import com.fr.design.mainframe.chart.gui.type.LinePlotPane; */ public class LineIndependentChartInterface extends AbstractIndependentChartUIWithAPILevel { - @Override - public boolean needChartChangePane() { - return false; - } public AbstractChartTypePane getPlotTypePane(){ return new LinePlotPane(); diff --git a/designer_chart/src/com/fr/design/chartinterface/MapIndependentChartInterface.java b/designer_chart/src/com/fr/design/chartinterface/MapIndependentChartInterface.java index 81425de939..2fc17e1476 100644 --- a/designer_chart/src/com/fr/design/chartinterface/MapIndependentChartInterface.java +++ b/designer_chart/src/com/fr/design/chartinterface/MapIndependentChartInterface.java @@ -18,10 +18,6 @@ import com.fr.design.mainframe.chart.gui.type.MapPlotPane; */ public class MapIndependentChartInterface extends AbstractIndependentChartUIWithAPILevel { - @Override - public boolean needChartChangePane() { - return false; - } public AbstractChartTypePane getPlotTypePane(){ return new MapPlotPane(); diff --git a/designer_chart/src/com/fr/design/chartinterface/MeterIndependentChartInterface.java b/designer_chart/src/com/fr/design/chartinterface/MeterIndependentChartInterface.java index eac3e79137..ce1f5b07bf 100644 --- a/designer_chart/src/com/fr/design/chartinterface/MeterIndependentChartInterface.java +++ b/designer_chart/src/com/fr/design/chartinterface/MeterIndependentChartInterface.java @@ -18,10 +18,6 @@ import com.fr.design.mainframe.chart.gui.type.MeterPlotPane; */ public class MeterIndependentChartInterface extends AbstractIndependentChartUIWithAPILevel { - @Override - public boolean needChartChangePane() { - return false; - } public AbstractChartTypePane getPlotTypePane(){ return new MeterPlotPane(); diff --git a/designer_chart/src/com/fr/design/chartinterface/PieIndependentChartInterface.java b/designer_chart/src/com/fr/design/chartinterface/PieIndependentChartInterface.java index 0a63505077..0583186ebf 100644 --- a/designer_chart/src/com/fr/design/chartinterface/PieIndependentChartInterface.java +++ b/designer_chart/src/com/fr/design/chartinterface/PieIndependentChartInterface.java @@ -22,10 +22,6 @@ import com.fr.design.mainframe.chart.gui.type.PiePlotPane; */ public class PieIndependentChartInterface extends AbstractIndependentChartUIWithAPILevel { - @Override - public boolean needChartChangePane() { - return false; - } public AbstractChartTypePane getPlotTypePane(){ return new PiePlotPane(); diff --git a/designer_chart/src/com/fr/design/chartinterface/RadarIndependentChartInterface.java b/designer_chart/src/com/fr/design/chartinterface/RadarIndependentChartInterface.java index 487c4705d6..04ca36dcbc 100644 --- a/designer_chart/src/com/fr/design/chartinterface/RadarIndependentChartInterface.java +++ b/designer_chart/src/com/fr/design/chartinterface/RadarIndependentChartInterface.java @@ -20,10 +20,6 @@ import com.fr.design.mainframe.chart.gui.type.RadarPlotPane; */ public class RadarIndependentChartInterface extends AbstractIndependentChartUIWithAPILevel { - @Override - public boolean needChartChangePane() { - return false; - } public AbstractChartTypePane getPlotTypePane(){ return new RadarPlotPane(); diff --git a/designer_chart/src/com/fr/design/chartinterface/RangeIndependentChartInterface.java b/designer_chart/src/com/fr/design/chartinterface/RangeIndependentChartInterface.java index c62b84ea73..85866c339e 100644 --- a/designer_chart/src/com/fr/design/chartinterface/RangeIndependentChartInterface.java +++ b/designer_chart/src/com/fr/design/chartinterface/RangeIndependentChartInterface.java @@ -18,10 +18,6 @@ import com.fr.design.mainframe.chart.gui.type.RangePlotPane; */ public class RangeIndependentChartInterface extends AbstractIndependentChartUIWithAPILevel { - @Override - public boolean needChartChangePane() { - return false; - } public AbstractChartTypePane getPlotTypePane(){ return new RangePlotPane(); diff --git a/designer_chart/src/com/fr/design/chartinterface/StockIndependentChartInterface.java b/designer_chart/src/com/fr/design/chartinterface/StockIndependentChartInterface.java index 456fa86449..7d73d8594f 100644 --- a/designer_chart/src/com/fr/design/chartinterface/StockIndependentChartInterface.java +++ b/designer_chart/src/com/fr/design/chartinterface/StockIndependentChartInterface.java @@ -21,10 +21,6 @@ import com.fr.design.mainframe.chart.gui.type.StockPlotPane; */ public class StockIndependentChartInterface extends AbstractIndependentChartUIWithAPILevel { - @Override - public boolean needChartChangePane() { - return false; - } public AbstractChartTypePane getPlotTypePane(){ return new StockPlotPane(); diff --git a/designer_chart/src/com/fr/design/chartinterface/XYScatterIndependentChartInterface.java b/designer_chart/src/com/fr/design/chartinterface/XYScatterIndependentChartInterface.java index dd1ee6a619..64de95eae1 100644 --- a/designer_chart/src/com/fr/design/chartinterface/XYScatterIndependentChartInterface.java +++ b/designer_chart/src/com/fr/design/chartinterface/XYScatterIndependentChartInterface.java @@ -21,10 +21,6 @@ import com.fr.design.mainframe.chart.gui.type.XYScatterPlotPane; */ public class XYScatterIndependentChartInterface extends AbstractIndependentChartUIWithAPILevel { - @Override - public boolean needChartChangePane() { - return false; - } public AbstractChartTypePane getPlotTypePane(){ return new XYScatterPlotPane(); 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 dfd06f08b1..8913febc13 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 @@ -5,6 +5,7 @@ import com.fr.chart.base.AttrChangeConfig; import com.fr.chart.chartattr.Chart; import com.fr.chart.chartattr.ChartCollection; import com.fr.chart.chartattr.SwitchState; +import com.fr.chart.charttypes.ChartTypeManager; import com.fr.design.beans.BasicBeanPane; import com.fr.design.dialog.DialogActionListener; import com.fr.design.dialog.UIDialog; @@ -21,8 +22,17 @@ import com.fr.general.FRLogger; import com.fr.general.Inter; import com.fr.stable.StringUtils; -import javax.swing.*; -import java.awt.*; +import javax.swing.BorderFactory; +import javax.swing.BoxLayout; +import javax.swing.JPanel; +import javax.swing.SwingUtilities; +import java.awt.BorderLayout; +import java.awt.Dimension; +import java.awt.FlowLayout; +import java.awt.Graphics; +import java.awt.GridLayout; +import java.awt.Image; +import java.awt.Rectangle; import java.awt.event.ActionEvent; import java.awt.event.ActionListener; import java.awt.event.FocusEvent; @@ -302,7 +312,7 @@ public class ChartTypeButtonPane extends BasicBeanPane implemen } private void checkConfigButtonVisible() { - addButton.setVisible(true); + addButton.setVisible(ChartTypeManager.enabledChart(editingCollection.getSelectedChart().getPlot().getPlotID())); //新建一个collection if(editingCollection.getState() == SwitchState.DEFAULT && editingCollection.getSelectedChart() != null){ //Chart 不支持图表切换