From 74111f687f2c2a070d67af8c892c35ddc0dc3a55 Mon Sep 17 00:00:00 2001 From: xiaohu Date: Thu, 7 Jul 2016 17:50:58 +0800 Subject: [PATCH 1/2] update --- .../src/com/fr/design/ChartTypeInterfaceManager.java | 3 --- 1 file changed, 3 deletions(-) diff --git a/designer_chart/src/com/fr/design/ChartTypeInterfaceManager.java b/designer_chart/src/com/fr/design/ChartTypeInterfaceManager.java index ae2164de90..9ad8680177 100644 --- a/designer_chart/src/com/fr/design/ChartTypeInterfaceManager.java +++ b/designer_chart/src/com/fr/design/ChartTypeInterfaceManager.java @@ -52,9 +52,6 @@ public class ChartTypeInterfaceManager extends XMLFileManager implements ExtraCh private static ChartTypeInterfaceManager classManager = null; - //判断默认图表是否读取 - private static boolean isReadDefault = false; - private static LinkedHashMap chartTypeInterfaces = new LinkedHashMap(); public synchronized static ChartTypeInterfaceManager getInstance() { From fae3c64892e0276b74035e93a4e1e3577059226b Mon Sep 17 00:00:00 2001 From: xiaohu Date: Thu, 7 Jul 2016 17:53:10 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E8=B6=85=E9=8F=88?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../SeriesCondition/impl/ChartHyperPoplinkPane.java | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/designer_chart/src/com/fr/design/chart/series/SeriesCondition/impl/ChartHyperPoplinkPane.java b/designer_chart/src/com/fr/design/chart/series/SeriesCondition/impl/ChartHyperPoplinkPane.java index 6b9f1b0a84..7e882e37d1 100644 --- a/designer_chart/src/com/fr/design/chart/series/SeriesCondition/impl/ChartHyperPoplinkPane.java +++ b/designer_chart/src/com/fr/design/chart/series/SeriesCondition/impl/ChartHyperPoplinkPane.java @@ -5,6 +5,7 @@ import com.fr.chart.chartattr.Bar2DPlot; import com.fr.chart.chartattr.Chart; import com.fr.chart.chartattr.ChartCollection; import com.fr.chart.chartattr.ChartFactory; +import com.fr.chart.charttypes.ChartTypeManager; import com.fr.chart.web.ChartHyperPoplink; import com.fr.design.beans.BasicBeanPane; import com.fr.design.chart.gui.ChartComponent; @@ -43,7 +44,13 @@ public class ChartHyperPoplinkPane extends BasicBeanPane { this.add(hyperEditPane, BorderLayout.CENTER); ChartCollection cc = new ChartCollection(); - cc.addChart(new Chart(new Bar2DPlot())); + + Chart chart = ChartTypeManager.getFirstChart(); + if (chart != null){ + cc.addChart(chart); + }else { + cc.addChart(new Chart(new Bar2DPlot())); + } chartComponent = new ChartComponent(); chartComponent.setPreferredSize(new Dimension(220, 170));// 在单元格弹出时 需要调整保证属性表的大小.