From 6c5cee26c16680ded9cbfb37f710f6eade6efae8 Mon Sep 17 00:00:00 2001 From: mengao <283296419@qq.com> Date: Mon, 18 Sep 2017 19:48:53 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E4=BF=AE=E6=94=B99.0bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/com/fr/design/mainframe/chart/ChartEditPane.java | 4 +++- .../chart/designer/component/VanChartFillStylePane.java | 3 +-- .../plugin/chart/designer/other/HyperlinkMapFactory.java | 3 --- .../style/axis/VanChartAxisScrollPaneWithTypeSelect.java | 2 +- .../style/axis/component/VanChartAxisButtonPane.java | 8 ++++++-- .../style/series/VanChartAbstractPlotSeriesPane.java | 3 ++- .../chart/designer/type/AbstractVanChartTypePane.java | 3 ++- 7 files changed, 15 insertions(+), 11 deletions(-) diff --git a/designer_chart/src/com/fr/design/mainframe/chart/ChartEditPane.java b/designer_chart/src/com/fr/design/mainframe/chart/ChartEditPane.java index 22b9db8e37..3bebe95eb8 100644 --- a/designer_chart/src/com/fr/design/mainframe/chart/ChartEditPane.java +++ b/designer_chart/src/com/fr/design/mainframe/chart/ChartEditPane.java @@ -341,7 +341,9 @@ public class ChartEditPane extends BasicPane implements AttributeChange,Prepare4 DesignTableDataManager.addDsChangeListener(new ChangeListener() { public void stateChanged(ChangeEvent e) { AbstractChartAttrPane attrPane = paneList.get(tabsHeaderIconPane.getSelectedIndex()); - attrPane.refreshChartDataPane(collection); + if (attrPane.isShowing()) { + attrPane.refreshChartDataPane(collection); + } } }); } diff --git a/designer_chart/src/com/fr/plugin/chart/designer/component/VanChartFillStylePane.java b/designer_chart/src/com/fr/plugin/chart/designer/component/VanChartFillStylePane.java index bae3cd5c35..1cfc178311 100644 --- a/designer_chart/src/com/fr/plugin/chart/designer/component/VanChartFillStylePane.java +++ b/designer_chart/src/com/fr/plugin/chart/designer/component/VanChartFillStylePane.java @@ -27,12 +27,11 @@ public class VanChartFillStylePane extends ChartFillStylePane { }; return TableLayout4VanChartHelper.createGapTableLayoutPane(components,rowSize,columnSize); - } @Override public Dimension getPreferredSize() { if(styleSelectBox.getSelectedIndex() != styleSelectBox.getItemCount() - 1) { - return new Dimension(styleSelectBox.getPreferredSize().width, 30); + return new Dimension(styleSelectBox.getPreferredSize().width, 26); } return super.getPreferredSize(); } diff --git a/designer_chart/src/com/fr/plugin/chart/designer/other/HyperlinkMapFactory.java b/designer_chart/src/com/fr/plugin/chart/designer/other/HyperlinkMapFactory.java index d8fd27b1e3..2ca0e2504f 100644 --- a/designer_chart/src/com/fr/plugin/chart/designer/other/HyperlinkMapFactory.java +++ b/designer_chart/src/com/fr/plugin/chart/designer/other/HyperlinkMapFactory.java @@ -236,8 +236,6 @@ public class HyperlinkMapFactory { startTime.setEnabled(false); ConstantsEditor endTime = new ConstantsEditor(Inter.getLocText("Plugin-ChartF_End_Time"), new Formula("END_TIME")); endTime.setEnabled(false); - ConstantsEditor duration = new ConstantsEditor(Inter.getLocText("Plugin-ChartF_Duration_Time"), new Formula("DURATION")); - duration.setEnabled(false); ConstantsEditor progress = new ConstantsEditor(Inter.getLocText("Plugin-ChartF_Process"), new Formula("PROGRESS")); progress.setEnabled(false); @@ -246,7 +244,6 @@ public class HyperlinkMapFactory { lists.add(series); lists.add(startTime); lists.add(endTime); - lists.add(duration); lists.add(progress); return lists; diff --git a/designer_chart/src/com/fr/plugin/chart/designer/style/axis/VanChartAxisScrollPaneWithTypeSelect.java b/designer_chart/src/com/fr/plugin/chart/designer/style/axis/VanChartAxisScrollPaneWithTypeSelect.java index fcde1ac9db..ea3831b39a 100644 --- a/designer_chart/src/com/fr/plugin/chart/designer/style/axis/VanChartAxisScrollPaneWithTypeSelect.java +++ b/designer_chart/src/com/fr/plugin/chart/designer/style/axis/VanChartAxisScrollPaneWithTypeSelect.java @@ -57,7 +57,7 @@ public class VanChartAxisScrollPaneWithTypeSelect extends AbstractVanChartScroll protected void initLayout() { this.setLayout(new BorderLayout(0,6)); JPanel northPane = TableLayout4VanChartHelper.createGapTableLayoutPane(Inter.getLocText("Plugin-ChartF_type"),jcb); - northPane.setBorder(BorderFactory.createEmptyBorder(0,10,10,10)); + northPane.setBorder(BorderFactory.createEmptyBorder(0,5,0,0)); this.add(northPane, BorderLayout.NORTH); this.add(cardPane, BorderLayout.CENTER); diff --git a/designer_chart/src/com/fr/plugin/chart/designer/style/axis/component/VanChartAxisButtonPane.java b/designer_chart/src/com/fr/plugin/chart/designer/style/axis/component/VanChartAxisButtonPane.java index 8cb5793b17..13f4dc46ae 100644 --- a/designer_chart/src/com/fr/plugin/chart/designer/style/axis/component/VanChartAxisButtonPane.java +++ b/designer_chart/src/com/fr/plugin/chart/designer/style/axis/component/VanChartAxisButtonPane.java @@ -16,7 +16,11 @@ import com.fr.plugin.chart.designer.style.axis.VanChartAxisPane; import javax.swing.*; import java.awt.*; -import java.awt.event.*; +import java.awt.event.ActionEvent; +import java.awt.event.ActionListener; +import java.awt.event.MouseAdapter; +import java.awt.event.MouseEvent; +import java.awt.event.MouseListener; import java.awt.geom.Rectangle2D; import java.awt.image.BufferedImage; import java.util.ArrayList; @@ -53,7 +57,7 @@ public class VanChartAxisButtonPane extends BasicBeanPane { this.add(eastPane, BorderLayout.EAST); buttonPane = new JPanel(); - buttonPane.setBorder(BorderFactory.createEmptyBorder(0, 10, 10, 0)); + buttonPane.setBorder(BorderFactory.createEmptyBorder(0, 5, 10, 0)); this.add(buttonPane, BorderLayout.CENTER); addButton.addActionListener(addListener); diff --git a/designer_chart/src/com/fr/plugin/chart/designer/style/series/VanChartAbstractPlotSeriesPane.java b/designer_chart/src/com/fr/plugin/chart/designer/style/series/VanChartAbstractPlotSeriesPane.java index 88ee117639..6e6683ccce 100644 --- a/designer_chart/src/com/fr/plugin/chart/designer/style/series/VanChartAbstractPlotSeriesPane.java +++ b/designer_chart/src/com/fr/plugin/chart/designer/style/series/VanChartAbstractPlotSeriesPane.java @@ -29,6 +29,7 @@ import com.fr.plugin.chart.custom.style.VanChartCustomStylePane; import com.fr.plugin.chart.designer.TableLayout4VanChartHelper; import com.fr.plugin.chart.designer.component.VanChartAreaSeriesFillColorPane; import com.fr.plugin.chart.designer.component.VanChartBeautyPane; +import com.fr.plugin.chart.designer.component.VanChartFillStylePane; import com.fr.plugin.chart.designer.component.VanChartLineTypePane; import com.fr.plugin.chart.designer.component.VanChartMarkerPane; import com.fr.plugin.chart.designer.component.VanChartTrendLinePane; @@ -98,7 +99,7 @@ public abstract class VanChartAbstractPlotSeriesPane extends AbstractPlotSeriesP */ protected ChartFillStylePane getFillStylePane() { //如果是自定義組合圖，則不創建填充界面 - return parentPane instanceof VanChartCustomStylePane ? null : new ChartFillStylePane(); + return parentPane instanceof VanChartCustomStylePane ? null : new VanChartFillStylePane(); } //风格 diff --git a/designer_chart/src/com/fr/plugin/chart/designer/type/AbstractVanChartTypePane.java b/designer_chart/src/com/fr/plugin/chart/designer/type/AbstractVanChartTypePane.java index db36ee4daf..c9d6fa15da 100644 --- a/designer_chart/src/com/fr/plugin/chart/designer/type/AbstractVanChartTypePane.java +++ b/designer_chart/src/com/fr/plugin/chart/designer/type/AbstractVanChartTypePane.java @@ -14,9 +14,9 @@ import com.fr.general.Background; import com.fr.general.FRLogger; import com.fr.general.Inter; import com.fr.js.NameJavaScriptGroup; +import com.fr.plugin.chart.attr.plot.VanChartPlot; import com.fr.plugin.chart.base.VanChartTools; import com.fr.plugin.chart.base.VanChartZoom; -import com.fr.plugin.chart.attr.plot.VanChartPlot; import com.fr.plugin.chart.vanchart.VanChart; import javax.swing.*; @@ -56,6 +56,7 @@ public abstract class AbstractVanChartTypePane extends AbstractChartTypePane{ //适用一种图表只有一种类型的 public void populateBean(Chart chart) { typeDemo.get(0).isPressing = true; + lastTypeIndex = 0; checkDemosBackground(); } From 6a0367454452b8104186f0b022a79a98165426f6 Mon Sep 17 00:00:00 2001 From: mengao <283296419@qq.com> Date: Tue, 19 Sep 2017 11:52:57 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E5=8E=BB=E6=8E=89lastTypeIndex=EF=BC=8C?= =?UTF-8?q?=E6=95=B4=E7=90=86=E7=9B=B8=E5=85=B3=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../chart/gui/type/AbstractBarPane.java | 7 ----- .../chart/gui/type/AbstractChartTypePane.java | 11 ++++---- .../chart/gui/type/AreaPlotPane.java | 4 --- .../chart/gui/type/DonutPlotPane.java | 2 -- .../mainframe/chart/gui/type/MapPlotPane.java | 3 +-- .../mainframe/chart/gui/type/PiePlotPane.java | 2 -- .../chart/area/VanChartAreaPlotPane.java | 26 +++++-------------- .../plugin/chart/bar/VanChartBarPlotPane.java | 15 ----------- .../chart/bubble/VanChartBubblePlotPane.java | 21 --------------- .../chart/column/VanChartColumnPlotPane.java | 15 ----------- .../chart/custom/VanChartCustomPlotPane.java | 7 +++-- .../type/AbstractVanChartTypePane.java | 23 +++++++++------- .../chart/gauge/VanChartGaugePlotPane.java | 16 ------------ .../type/VanChartHeatMapTypePane.java | 1 - .../chart/line/VanChartLinePlotPane.java | 25 ------------------ .../designer/type/VanChartMapPlotPane.java | 3 +-- .../plugin/chart/pie/VanChartPiePlotPane.java | 17 ------------ .../chart/radar/VanChartRadarPlotPane.java | 17 ------------ .../type/VanChartStructureTypePane.java | 19 +------------- 19 files changed, 31 insertions(+), 203 deletions(-) diff --git a/designer_chart/src/com/fr/design/mainframe/chart/gui/type/AbstractBarPane.java b/designer_chart/src/com/fr/design/mainframe/chart/gui/type/AbstractBarPane.java index 7312dd11fa..c402b97038 100644 --- a/designer_chart/src/com/fr/design/mainframe/chart/gui/type/AbstractBarPane.java +++ b/designer_chart/src/com/fr/design/mainframe/chart/gui/type/AbstractBarPane.java @@ -27,32 +27,25 @@ public abstract class AbstractBarPane extends AbstractChartTypePane { if(barPlot.getyAxis().isPercentage()) { if(barPlot instanceof Bar3DPlot){ typeDemo.get(THREE_D_PERCENT_STACK_COLOMN_CHART).isPressing = true; - lastTypeIndex = THREE_D_PERCENT_STACK_COLOMN_CHART; } else { typeDemo.get(PERCENT_STACK_COLOMN_CHART).isPressing = true; - lastTypeIndex = PERCENT_STACK_COLOMN_CHART; } } else { if(barPlot instanceof Bar3DPlot){ typeDemo.get(THREE_D_STACK_COLOMN_CHART).isPressing = true; - lastTypeIndex = THREE_D_STACK_COLOMN_CHART; } else { typeDemo.get(STACK_COLOMN_CHART).isPressing = true; - lastTypeIndex = STACK_COLOMN_CHART; } } } else { if(barPlot instanceof Bar3DPlot) { if(((Bar3DPlot) barPlot).isHorizontalDrawBar()) { typeDemo.get(THREE_D_COLOMN_HORIZON_DRAW_CHART).isPressing = true; - lastTypeIndex = THREE_D_COLOMN_HORIZON_DRAW_CHART; } else { typeDemo.get(THREE_D_COLOMN_CHART).isPressing = true; - lastTypeIndex = THREE_D_COLOMN_CHART; } } else { typeDemo.get(COLOMN_CHART).isPressing = true; - lastTypeIndex = COLOMN_CHART; } } diff --git a/designer_chart/src/com/fr/design/mainframe/chart/gui/type/AbstractChartTypePane.java b/designer_chart/src/com/fr/design/mainframe/chart/gui/type/AbstractChartTypePane.java index 9aef3032f8..a8d359085a 100644 --- a/designer_chart/src/com/fr/design/mainframe/chart/gui/type/AbstractChartTypePane.java +++ b/designer_chart/src/com/fr/design/mainframe/chart/gui/type/AbstractChartTypePane.java @@ -59,7 +59,6 @@ public abstract class AbstractChartTypePane extends FurtherBasicBeanPane{ protected abstract String[] getTypeLayoutPath(); protected abstract String[] getTypeLayoutTipName(); protected int lastStyleIndex = -1; - protected int lastTypeIndex = -1; protected boolean typeChanged = false;//图表类型是否发生变化 protected String[] getNormalLayoutTipName() { @@ -148,12 +147,11 @@ public abstract class AbstractChartTypePane extends FurtherBasicBeanPane{ return null; } - protected void checkTypeChange(){ + protected void checkTypeChange(Plot oldPlot){ if(styleList != null && !styleList.isEmpty()){ for(int i = 0; i < typeDemo.size(); i++){ - if(typeDemo.get(i).isPressing && i != lastTypeIndex){ + if(typeDemo.get(i).isPressing && i != oldPlot.getDetailType()){ typeChanged = true; - lastTypeIndex = i; break; } typeChanged = false; @@ -250,8 +248,9 @@ public abstract class AbstractChartTypePane extends FurtherBasicBeanPane{ * 保存风格,对选中的风格做设置 */ public void updateBean(Chart chart) { - checkTypeChange();//判断图表的类型是否发生变化 - Plot newPlot = this.setSelectedClonedPlotWithCondition(chart.getPlot()); + Plot oldPlot = chart.getPlot(); + Plot newPlot = this.setSelectedClonedPlotWithCondition(oldPlot); + checkTypeChange(oldPlot);//判断图表的类型是否发生变化 if(styleList != null && !styleList.isEmpty()){ if(styleList.get(STYLE_SHADE).isPressing && lastStyleIndex != STYLE_SHADE){ lastStyleIndex = STYLE_SHADE; diff --git a/designer_chart/src/com/fr/design/mainframe/chart/gui/type/AreaPlotPane.java b/designer_chart/src/com/fr/design/mainframe/chart/gui/type/AreaPlotPane.java index 91f031fb74..350fb6e212 100644 --- a/designer_chart/src/com/fr/design/mainframe/chart/gui/type/AreaPlotPane.java +++ b/designer_chart/src/com/fr/design/mainframe/chart/gui/type/AreaPlotPane.java @@ -74,10 +74,8 @@ public class AreaPlotPane extends AbstractChartTypePane{ if(area.isStacked()) { if(area.getyAxis().isPercentage()) { typeDemo.get(PERCENT_AREA_LINE_CHART).isPressing = true; - lastTypeIndex = PERCENT_AREA_LINE_CHART; } else { typeDemo.get(STACK_AREA_CHART).isPressing = true; - lastTypeIndex = STACK_AREA_CHART; } } } else if(plot instanceof Area3DPlot) { @@ -85,10 +83,8 @@ public class AreaPlotPane extends AbstractChartTypePane{ if(threeDPlot.isStacked()) { if(threeDPlot.getyAxis().isPercentage()) { typeDemo.get(PERCENT_3D_AREA_LINE_CHART).isPressing = true; - lastTypeIndex = PERCENT_3D_AREA_LINE_CHART; } else { typeDemo.get(STACK_3D_AREA_CHART).isPressing = true; - lastTypeIndex = STACK_3D_AREA_CHART; } } } diff --git a/designer_chart/src/com/fr/design/mainframe/chart/gui/type/DonutPlotPane.java b/designer_chart/src/com/fr/design/mainframe/chart/gui/type/DonutPlotPane.java index cba82aff70..4434ae85d9 100644 --- a/designer_chart/src/com/fr/design/mainframe/chart/gui/type/DonutPlotPane.java +++ b/designer_chart/src/com/fr/design/mainframe/chart/gui/type/DonutPlotPane.java @@ -67,10 +67,8 @@ public class DonutPlotPane extends AbstractChartTypePane{ Plot plot = chart.getPlot(); if(plot instanceof Donut3DPlot) { typeDemo.get(THREE_D_DONUT_CHART).isPressing = true; - lastTypeIndex = THREE_D_DONUT_CHART; } else { typeDemo.get(DONUT_CHART).isPressing = true; - lastTypeIndex = DONUT_CHART; } checkDemosBackground(); diff --git a/designer_chart/src/com/fr/design/mainframe/chart/gui/type/MapPlotPane.java b/designer_chart/src/com/fr/design/mainframe/chart/gui/type/MapPlotPane.java index 69d3dd4e4c..467b4184f8 100644 --- a/designer_chart/src/com/fr/design/mainframe/chart/gui/type/MapPlotPane.java +++ b/designer_chart/src/com/fr/design/mainframe/chart/gui/type/MapPlotPane.java @@ -137,8 +137,7 @@ public class MapPlotPane extends AbstractChartTypePane { for(ChartImagePane imagePane : typeDemo) { imagePane.isPressing = false; } - typeDemo.get(mapPlot.getMapType().ordinal()).isPressing = true; - lastTypeIndex = mapPlot.getMapType().ordinal();//todo 这个属性是不是可以删了，eason + typeDemo.get(mapPlot.getDetailType()).isPressing = true; } checkDemosBackground(); diff --git a/designer_chart/src/com/fr/design/mainframe/chart/gui/type/PiePlotPane.java b/designer_chart/src/com/fr/design/mainframe/chart/gui/type/PiePlotPane.java index 94876f7532..f63c11d97e 100644 --- a/designer_chart/src/com/fr/design/mainframe/chart/gui/type/PiePlotPane.java +++ b/designer_chart/src/com/fr/design/mainframe/chart/gui/type/PiePlotPane.java @@ -93,10 +93,8 @@ public class PiePlotPane extends AbstractChartTypePane{ Plot plot = chart.getPlot(); if(plot instanceof Pie3DPlot) { typeDemo.get(THREE_D_PIE_CHART).isPressing = true; - lastTypeIndex = THREE_D_PIE_CHART; } else { typeDemo.get(PIE_CHART).isPressing = true; - lastTypeIndex = PIE_CHART; } checkDemosBackground(); diff --git a/designer_chart/src/com/fr/plugin/chart/area/VanChartAreaPlotPane.java b/designer_chart/src/com/fr/plugin/chart/area/VanChartAreaPlotPane.java index 2e31b4c93f..26f20ffb07 100644 --- a/designer_chart/src/com/fr/plugin/chart/area/VanChartAreaPlotPane.java +++ b/designer_chart/src/com/fr/plugin/chart/area/VanChartAreaPlotPane.java @@ -2,7 +2,6 @@ package com.fr.plugin.chart.area; import com.fr.chart.chartattr.Chart; import com.fr.chart.chartattr.Plot; -import com.fr.design.mainframe.chart.gui.type.ChartImagePane; import com.fr.general.FRLogger; import com.fr.general.Inter; import com.fr.plugin.chart.designer.type.AbstractVanChartTypePane; @@ -39,26 +38,13 @@ public class VanChartAreaPlotPane extends AbstractVanChartTypePane { /** * 返回界面标题 + * * @return 界面标题 */ public String title4PopupWindow() { return Inter.getLocText("Plugin-ChartF_NewArea"); } - /** - * 更新界面内容 - */ - public void populateBean(Chart chart) { - for(ChartImagePane imagePane : typeDemo) { - imagePane.isPressing = false; - } - Plot plot = chart.getPlot(); - if(plot instanceof VanChartAreaPlot) { - lastTypeIndex = ((VanChartAreaPlot) plot).getVanChartPlotType().ordinal(); - typeDemo.get(lastTypeIndex).isPressing = true; - } - checkDemosBackground(); - } /** @@ -71,17 +57,17 @@ public class VanChartAreaPlotPane extends AbstractVanChartTypePane { return VanChartAreaPlot.VAN_CHART_AREA_PLOT_ID; } - protected Plot getSelectedClonedPlot(){ + protected Plot getSelectedClonedPlot() { VanChartAreaPlot newPlot = null; Chart[] areaChart = AreaIndependentVanChart.AreaVanChartTypes; - for(int i = 0, len = areaChart.length; i < len; i++){ - if(typeDemo.get(i).isPressing){ - newPlot = (VanChartAreaPlot)areaChart[i].getPlot(); + for (int i = 0, len = areaChart.length; i < len; i++) { + if (typeDemo.get(i).isPressing) { + newPlot = (VanChartAreaPlot) areaChart[i].getPlot(); } } Plot cloned = null; try { - cloned = (Plot)newPlot.clone(); + cloned = (Plot) newPlot.clone(); } catch (CloneNotSupportedException e) { FRLogger.getLogger().error("Error In AreaChart"); } diff --git a/designer_chart/src/com/fr/plugin/chart/bar/VanChartBarPlotPane.java b/designer_chart/src/com/fr/plugin/chart/bar/VanChartBarPlotPane.java index 3156380fa6..7d27a2736d 100644 --- a/designer_chart/src/com/fr/plugin/chart/bar/VanChartBarPlotPane.java +++ b/designer_chart/src/com/fr/plugin/chart/bar/VanChartBarPlotPane.java @@ -2,7 +2,6 @@ package com.fr.plugin.chart.bar; import com.fr.chart.chartattr.Chart; import com.fr.chart.chartattr.Plot; -import com.fr.design.mainframe.chart.gui.type.ChartImagePane; import com.fr.general.FRLogger; import com.fr.general.Inter; import com.fr.plugin.chart.column.VanChartColumnPlot; @@ -46,20 +45,6 @@ public class VanChartBarPlotPane extends AbstractVanChartTypePane { return Inter.getLocText("Plugin-ChartF_NewBar"); } - /** - * 更新界面内容 - */ - public void populateBean(Chart chart) { - for(ChartImagePane imagePane : typeDemo) { - imagePane.isPressing = false; - } - Plot plot = chart.getPlot(); - if(plot instanceof VanChartColumnPlot) { - lastTypeIndex = ((VanChartColumnPlot)plot).getVanChartPlotType().ordinal(); - typeDemo.get(lastTypeIndex).isPressing = true; - } - checkDemosBackground(); - } /** * 获取各图表类型界面ID, 本质是plotID diff --git a/designer_chart/src/com/fr/plugin/chart/bubble/VanChartBubblePlotPane.java b/designer_chart/src/com/fr/plugin/chart/bubble/VanChartBubblePlotPane.java index 8987a6f9ac..4b28af6606 100644 --- a/designer_chart/src/com/fr/plugin/chart/bubble/VanChartBubblePlotPane.java +++ b/designer_chart/src/com/fr/plugin/chart/bubble/VanChartBubblePlotPane.java @@ -6,7 +6,6 @@ import com.fr.chart.chartattr.Chart; import com.fr.chart.chartattr.Plot; import com.fr.chart.chartglyph.ConditionAttr; import com.fr.chart.chartglyph.ConditionCollection; -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; @@ -50,26 +49,6 @@ public class VanChartBubblePlotPane extends AbstractVanChartTypePane { return Inter.getLocText("Plugin-ChartF_NewBubble"); } - /** - * 更新界面内容 - */ - public void populateBean(Chart chart) { - for(ChartImagePane imagePane : typeDemo) { - imagePane.isPressing = false; - } - - - Plot plot = chart.getPlot(); - if(plot instanceof VanChartBubblePlot && ((VanChartBubblePlot)plot).isForceBubble()){ - lastTypeIndex = BubblePlotType.FORCE.ordinal(); - } else { - lastTypeIndex = BubblePlotType.NORMAL.ordinal(); - } - - typeDemo.get(lastTypeIndex).isPressing = true; - - checkDemosBackground(); - } private void removeDefaultAttr(ConditionAttr conditionAttr, Class targetClass) { DataSeriesCondition attr = conditionAttr.getExisted(targetClass); diff --git a/designer_chart/src/com/fr/plugin/chart/column/VanChartColumnPlotPane.java b/designer_chart/src/com/fr/plugin/chart/column/VanChartColumnPlotPane.java index 978823b573..8568d67a55 100644 --- a/designer_chart/src/com/fr/plugin/chart/column/VanChartColumnPlotPane.java +++ b/designer_chart/src/com/fr/plugin/chart/column/VanChartColumnPlotPane.java @@ -2,7 +2,6 @@ package com.fr.plugin.chart.column; import com.fr.chart.chartattr.Chart; import com.fr.chart.chartattr.Plot; -import com.fr.design.mainframe.chart.gui.type.ChartImagePane; import com.fr.general.FRLogger; import com.fr.general.Inter; import com.fr.plugin.chart.designer.type.AbstractVanChartTypePane; @@ -46,20 +45,6 @@ public class VanChartColumnPlotPane extends AbstractVanChartTypePane { return Inter.getLocText("Plugin-ChartF_NewColumn"); } - /** - * 更新界面内容 - */ - public void populateBean(Chart chart) { - for(ChartImagePane imagePane : typeDemo) { - imagePane.isPressing = false; - } - Plot plot = chart.getPlot(); - if(plot instanceof VanChartColumnPlot) { - lastTypeIndex = ((VanChartColumnPlot)plot).getVanChartPlotType().ordinal(); - typeDemo.get(lastTypeIndex).isPressing = true; - } - checkDemosBackground(); - } /** * 获取各图表类型界面ID, 本质是plotID 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 843bbfc166..7b3ede54e5 100644 --- a/designer_chart/src/com/fr/plugin/chart/custom/VanChartCustomPlotPane.java +++ b/designer_chart/src/com/fr/plugin/chart/custom/VanChartCustomPlotPane.java @@ -131,12 +131,12 @@ public class VanChartCustomPlotPane extends AbstractVanChartTypePane { public void updateBean(Chart chart) { //保存上次选中的值，其会在super中更新 - int lastState = lastTypeIndex; + int lastState = chart.getPlot().getDetailType(); super.updateBean(chart); //如果上次的状态和这次的装填不在同一个页面，说明同一个图表內切换了，需要情況数据配置 - if (lastState != lastTypeIndex) { + if (lastState != chart.getPlot().getDetailType()) { chart.setFilterDefinition(null); } @@ -219,8 +219,7 @@ public class VanChartCustomPlotPane extends AbstractVanChartTypePane { //获取上次选中的图标 VanChartCustomPlot customPlot = (VanChartCustomPlot) chart.getPlot(); - lastTypeIndex = customPlot.getCustomStyle().ordinal(); - typeDemo.get(lastTypeIndex).isPressing = true; + typeDemo.get(customPlot.getDetailType()).isPressing = true; isCustom = customPlot.getCustomStyle() == CustomStyle.CUSTOM; diff --git a/designer_chart/src/com/fr/plugin/chart/designer/type/AbstractVanChartTypePane.java b/designer_chart/src/com/fr/plugin/chart/designer/type/AbstractVanChartTypePane.java index c9d6fa15da..dab6ae28d8 100644 --- a/designer_chart/src/com/fr/plugin/chart/designer/type/AbstractVanChartTypePane.java +++ b/designer_chart/src/com/fr/plugin/chart/designer/type/AbstractVanChartTypePane.java @@ -10,6 +10,7 @@ import com.fr.chart.chartglyph.DataSheet; import com.fr.design.gui.icheckbox.UICheckBox; import com.fr.design.gui.ilable.MultilineLabel; import com.fr.design.mainframe.chart.gui.type.AbstractChartTypePane; +import com.fr.design.mainframe.chart.gui.type.ChartImagePane; import com.fr.general.Background; import com.fr.general.FRLogger; import com.fr.general.Inter; @@ -53,10 +54,15 @@ public abstract class AbstractVanChartTypePane extends AbstractChartTypePane{ }; } - //适用一种图表只有一种类型的 + /** + * 更新界面内容 + */ public void populateBean(Chart chart) { - typeDemo.get(0).isPressing = true; - lastTypeIndex = 0; + for(ChartImagePane imagePane : typeDemo) { + imagePane.isPressing = false; + } + Plot plot = chart.getPlot(); + typeDemo.get(plot.getDetailType()).isPressing = true; checkDemosBackground(); } @@ -64,9 +70,9 @@ public abstract class AbstractVanChartTypePane extends AbstractChartTypePane{ * 保存界面属性 */ public void updateBean(Chart chart) { - checkTypeChange(); - VanChartPlot oldPlot = (VanChartPlot)chart.getPlot(); - VanChartPlot newPlot = (VanChartPlot)getSelectedClonedPlot(); + VanChartPlot oldPlot = chart.getPlot(); + VanChartPlot newPlot = getSelectedClonedPlot(); + checkTypeChange(oldPlot); samePlot = accept(chart); if(typeChanged && samePlot){ //同一中图表切换不同类型 @@ -116,11 +122,10 @@ public abstract class AbstractVanChartTypePane extends AbstractChartTypePane{ return new VanChartTools(); } - protected void checkTypeChange(){ + protected void checkTypeChange(Plot oldPlot){ for(int i = 0; i < typeDemo.size(); i++){ - if(typeDemo.get(i).isPressing && i != lastTypeIndex){ + if(typeDemo.get(i).isPressing && i != oldPlot.getDetailType()){ typeChanged = true; - lastTypeIndex = i; break; } typeChanged = false; diff --git a/designer_chart/src/com/fr/plugin/chart/gauge/VanChartGaugePlotPane.java b/designer_chart/src/com/fr/plugin/chart/gauge/VanChartGaugePlotPane.java index f7f138c65b..ae59c0dbc1 100644 --- a/designer_chart/src/com/fr/plugin/chart/gauge/VanChartGaugePlotPane.java +++ b/designer_chart/src/com/fr/plugin/chart/gauge/VanChartGaugePlotPane.java @@ -2,7 +2,6 @@ package com.fr.plugin.chart.gauge; import com.fr.chart.chartattr.Chart; import com.fr.chart.chartattr.Plot; -import com.fr.design.mainframe.chart.gui.type.ChartImagePane; import com.fr.general.FRLogger; import com.fr.general.Inter; import com.fr.plugin.chart.designer.type.AbstractVanChartTypePane; @@ -43,21 +42,6 @@ public class VanChartGaugePlotPane extends AbstractVanChartTypePane { return Inter.getLocText("Plugin-ChartF_NewGauge"); } - /** - * 更新界面内容 - */ - public void populateBean(Chart chart) { - for(ChartImagePane imagePane : typeDemo) { - imagePane.isPressing = false; - } - Plot plot = chart.getPlot(); - if(plot instanceof VanChartGaugePlot) { - lastTypeIndex = ((VanChartGaugePlot)plot).getGaugeStyle().ordinal(); - typeDemo.get(lastTypeIndex).isPressing = true; - } - checkDemosBackground(); - } - protected Plot getSelectedClonedPlot(){ VanChartGaugePlot newPlot = null; Chart[] GaugeChart = GaugeIndependentVanChart.GaugeVanChartTypes; diff --git a/designer_chart/src/com/fr/plugin/chart/heatmap/designer/type/VanChartHeatMapTypePane.java b/designer_chart/src/com/fr/plugin/chart/heatmap/designer/type/VanChartHeatMapTypePane.java index c28fb143c5..b373f2828a 100644 --- a/designer_chart/src/com/fr/plugin/chart/heatmap/designer/type/VanChartHeatMapTypePane.java +++ b/designer_chart/src/com/fr/plugin/chart/heatmap/designer/type/VanChartHeatMapTypePane.java @@ -59,7 +59,6 @@ public class VanChartHeatMapTypePane extends VanChartMapPlotPane { //适用一种图表只有一种类型的 public void populateBean(Chart chart) { typeDemo.get(0).isPressing = true; - lastTypeIndex = 0; VanChartHeatMapPlot plot = (VanChartHeatMapPlot)chart.getPlot(); populateSourcePane(plot); diff --git a/designer_chart/src/com/fr/plugin/chart/line/VanChartLinePlotPane.java b/designer_chart/src/com/fr/plugin/chart/line/VanChartLinePlotPane.java index a0d1a326cf..c7a04abe90 100644 --- a/designer_chart/src/com/fr/plugin/chart/line/VanChartLinePlotPane.java +++ b/designer_chart/src/com/fr/plugin/chart/line/VanChartLinePlotPane.java @@ -2,10 +2,8 @@ package com.fr.plugin.chart.line; import com.fr.chart.chartattr.Chart; import com.fr.chart.chartattr.Plot; -import com.fr.design.mainframe.chart.gui.type.ChartImagePane; import com.fr.general.FRLogger; import com.fr.general.Inter; -import com.fr.plugin.chart.type.VanChartPlotType; import com.fr.plugin.chart.designer.type.AbstractVanChartTypePane; /** @@ -39,29 +37,6 @@ public class VanChartLinePlotPane extends AbstractVanChartTypePane { public String title4PopupWindow() { return Inter.getLocText("Plugin-ChartF_NewLine"); } - /** - * 更新界面内容 - */ - public void populateBean(Chart chart) { - for(ChartImagePane imagePane : typeDemo) { - imagePane.isPressing = false; - } - Plot plot = chart.getPlot(); - if(plot instanceof VanChartLinePlot) { - VanChartPlotType plotType = ((VanChartLinePlot)plot).getVanChartPlotType(); - switch (plotType){ - case CUSTOM: - lastTypeIndex = 2; - break; - default: - lastTypeIndex = plotType.ordinal(); - break; - } - typeDemo.get(lastTypeIndex).isPressing = true; - } - checkDemosBackground(); - - } /** * 获取各图表类型界面ID, 本质是plotID diff --git a/designer_chart/src/com/fr/plugin/chart/map/designer/type/VanChartMapPlotPane.java b/designer_chart/src/com/fr/plugin/chart/map/designer/type/VanChartMapPlotPane.java index 79abfb0066..ab70a847a8 100644 --- a/designer_chart/src/com/fr/plugin/chart/map/designer/type/VanChartMapPlotPane.java +++ b/designer_chart/src/com/fr/plugin/chart/map/designer/type/VanChartMapPlotPane.java @@ -88,8 +88,7 @@ public class VanChartMapPlotPane extends AbstractVanChartTypePane { } VanChartMapPlot plot = (VanChartMapPlot)chart.getPlot(); - lastTypeIndex = plot.getMapTypeIndex(); - typeDemo.get(lastTypeIndex).isPressing = true; + typeDemo.get(plot.getDetailType()).isPressing = true; populateSourcePane(plot); boolean enabled = !CompatibleGEOJSONHelper.isDeprecated(plot.getGeoUrl()); diff --git a/designer_chart/src/com/fr/plugin/chart/pie/VanChartPiePlotPane.java b/designer_chart/src/com/fr/plugin/chart/pie/VanChartPiePlotPane.java index 61a403766e..81726c7e52 100644 --- a/designer_chart/src/com/fr/plugin/chart/pie/VanChartPiePlotPane.java +++ b/designer_chart/src/com/fr/plugin/chart/pie/VanChartPiePlotPane.java @@ -3,7 +3,6 @@ package com.fr.plugin.chart.pie; import com.fr.chart.chartattr.Chart; import com.fr.chart.chartattr.Plot; -import com.fr.design.mainframe.chart.gui.type.ChartImagePane; import com.fr.general.FRLogger; import com.fr.general.Inter; import com.fr.plugin.chart.PiePlot4VanChart; @@ -42,22 +41,6 @@ public class VanChartPiePlotPane extends AbstractVanChartTypePane { return Inter.getLocText("Plugin-ChartF_NewPie"); } - - /** - * 更新界面内容 - */ - public void populateBean(Chart chart) { - for(ChartImagePane imagePane : typeDemo) { - imagePane.isPressing = false; - } - Plot plot = chart.getPlot(); - if(plot instanceof PiePlot4VanChart) { - lastTypeIndex = ((PiePlot4VanChart)plot).getRoseType().ordinal(); - typeDemo.get(lastTypeIndex).isPressing = true; - } - checkDemosBackground(); - } - /** * 获取各图表类型界面ID, 本质是plotID * diff --git a/designer_chart/src/com/fr/plugin/chart/radar/VanChartRadarPlotPane.java b/designer_chart/src/com/fr/plugin/chart/radar/VanChartRadarPlotPane.java index 5dc2da2ced..11662e6216 100644 --- a/designer_chart/src/com/fr/plugin/chart/radar/VanChartRadarPlotPane.java +++ b/designer_chart/src/com/fr/plugin/chart/radar/VanChartRadarPlotPane.java @@ -2,7 +2,6 @@ package com.fr.plugin.chart.radar; import com.fr.chart.chartattr.Chart; import com.fr.chart.chartattr.Plot; -import com.fr.design.mainframe.chart.gui.type.ChartImagePane; import com.fr.general.FRLogger; import com.fr.general.Inter; import com.fr.plugin.chart.designer.type.AbstractVanChartTypePane; @@ -38,22 +37,6 @@ public class VanChartRadarPlotPane extends AbstractVanChartTypePane { return Inter.getLocText("Plugin-ChartF_NewRadar"); } - - /** - * 更新界面内容 - */ - public void populateBean(Chart chart) { - for(ChartImagePane imagePane : typeDemo) { - imagePane.isPressing = false; - } - Plot plot = chart.getPlot(); - if(plot instanceof VanChartRadarPlot) { - lastTypeIndex = ((VanChartRadarPlot)plot).getVanChartPlotType().ordinal(); - typeDemo.get(lastTypeIndex).isPressing = true; - } - checkDemosBackground(); - } - /** * 获取各图表类型界面ID, 本质是plotID * diff --git a/designer_chart/src/com/fr/plugin/chart/structure/desinger/type/VanChartStructureTypePane.java b/designer_chart/src/com/fr/plugin/chart/structure/desinger/type/VanChartStructureTypePane.java index 31ee519053..694762474a 100644 --- a/designer_chart/src/com/fr/plugin/chart/structure/desinger/type/VanChartStructureTypePane.java +++ b/designer_chart/src/com/fr/plugin/chart/structure/desinger/type/VanChartStructureTypePane.java @@ -2,7 +2,6 @@ package com.fr.plugin.chart.structure.desinger.type; import com.fr.chart.chartattr.Chart; import com.fr.chart.chartattr.Plot; -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; @@ -47,23 +46,7 @@ public class VanChartStructureTypePane extends AbstractVanChartTypePane{ public String title4PopupWindow() { return Inter.getLocText("Plugin-ChartF_NewStructure"); } - - /** - * 更新界面内容 - */ - public void populateBean(Chart chart) { - for(ChartImagePane imagePane : typeDemo) { - imagePane.isPressing = false; - } - Plot plot = chart.getPlot(); - if(plot instanceof VanChartStructurePlot) { - lastTypeIndex = ((VanChartStructurePlot)plot).getStructureType().ordinal(); - typeDemo.get(lastTypeIndex).isPressing = true; - } - checkDemosBackground(); - } - - + protected Plot getSelectedClonedPlot(){ VanChartStructurePlot newPlot = null; Chart[] charts = StructureIndependentVanChart.StructureVanCharts;