From 670e8f66abc473f42c45d18a6f8cf2c33db3d460 Mon Sep 17 00:00:00 2001 From: mengao <283296419@qq.com> Date: Mon, 4 Sep 2017 14:03:52 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E5=A4=84=E7=90=86=E5=9C=B0=E5=9B=BE?= =?UTF-8?q?=E7=B1=BB=E5=9E=8B=E9=80=89=E6=8B=A9=E9=9D=A2=E6=9D=BF=E4=B8=AD?= =?UTF-8?q?=EF=BC=8C=E4=B8=AD=E5=BF=83=E7=82=B9=E8=AE=BE=E7=BD=AEbug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../plugin/chart/map/designer/type/VanChartMapPlotPane.java | 3 +-- .../chart/map/designer/type/VanChartMapSourceChoosePane.java | 5 ++++- 2 files changed, 5 insertions(+), 3 deletions(-) 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 977e7ce3a..8f73e2d5f 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 @@ -7,7 +7,6 @@ import com.fr.design.mainframe.chart.gui.type.ChartImagePane; import com.fr.design.utils.gui.GUICoreUtils; import com.fr.general.FRLogger; import com.fr.general.Inter; -import com.fr.plugin.chart.attr.plot.VanChartPlot; import com.fr.plugin.chart.base.VanChartTools; import com.fr.plugin.chart.designer.type.AbstractVanChartTypePane; import com.fr.plugin.chart.map.MapIndependentVanChart; @@ -116,7 +115,7 @@ public class VanChartMapPlotPane extends AbstractVanChartTypePane { Plot plot = chart.getPlot(); if(plot instanceof VanChartMapPlot) { sourceChoosePane.updateBean((VanChartMapPlot) plot); - if(typeChanged && samePlot){ + if(!samePlot || (typeChanged && samePlot)){ resetAttr(plot); } } diff --git a/designer_chart/src/com/fr/plugin/chart/map/designer/type/VanChartMapSourceChoosePane.java b/designer_chart/src/com/fr/plugin/chart/map/designer/type/VanChartMapSourceChoosePane.java index 6b15607c6..3314b180a 100644 --- a/designer_chart/src/com/fr/plugin/chart/map/designer/type/VanChartMapSourceChoosePane.java +++ b/designer_chart/src/com/fr/plugin/chart/map/designer/type/VanChartMapSourceChoosePane.java @@ -567,8 +567,11 @@ public class VanChartMapSourceChoosePane extends JPanel implements UIObserver { } private void resetViewCenter(VanChartMapPlot mapPlot) { - mapPlot.getViewCenter().setAuto(true); + mapPlot.setViewCenter(new ViewCenter()); viewCenterCom.setSelectedIndex(0); + longitude.setValue(0); + latitude.setValue(0); + longAndLatPane.setVisible(false); } private void resetZoomLevel(VanChartMapPlot mapPlot) { From f789fc0a8f93910ca1bad3e33b5e3c5bec985757 Mon Sep 17 00:00:00 2001 From: mengao <283296419@qq.com> Date: Mon, 4 Sep 2017 14:37:44 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=8C=83=E5=9B=B4?= =?UTF-8?q?=E5=9B=BE=E4=BE=8B=E6=98=BE=E7=A4=BA=E4=B8=8D=E5=85=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../fr/plugin/chart/range/component/LegendGradientBar.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/designer_chart/src/com/fr/plugin/chart/range/component/LegendGradientBar.java b/designer_chart/src/com/fr/plugin/chart/range/component/LegendGradientBar.java index 782fc1b79..b13c21352 100644 --- a/designer_chart/src/com/fr/plugin/chart/range/component/LegendGradientBar.java +++ b/designer_chart/src/com/fr/plugin/chart/range/component/LegendGradientBar.java @@ -39,7 +39,7 @@ public class LegendGradientBar extends JComponent implements ColorSelectable, UI //主题色 private Color subColor; - private int max = 154; + private int max = 150; private int min = 4; //选中的颜色 @@ -77,7 +77,7 @@ public class LegendGradientBar extends JComponent implements ColorSelectable, UI iniListener(); - this.setPreferredSize(new Dimension(10 + max, MAX_VERTICAL)); + this.setPreferredSize(new Dimension(5 + max, MAX_VERTICAL)); } private void initColorsAndDist() { From 15128aa8fd73918cb889a85bbef1701fc502f956 Mon Sep 17 00:00:00 2001 From: mengao <283296419@qq.com> Date: Mon, 4 Sep 2017 15:14:53 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E9=9B=B7=E8=BE=BE=E5=9B=BE=20=E8=BD=B4?= =?UTF-8?q?=E7=BA=BF=E6=A0=B7=E5=BC=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../chart/designer/style/axis/VanChartBaseAxisPane.java | 6 +++++- .../designer/style/axis/radar/VanChartRadarXAxisPane.java | 6 ++++++ .../designer/style/axis/radar/VanChartRadarYAxisPane.java | 6 ++++++ 3 files changed, 17 insertions(+), 1 deletion(-) diff --git a/designer_chart/src/com/fr/plugin/chart/designer/style/axis/VanChartBaseAxisPane.java b/designer_chart/src/com/fr/plugin/chart/designer/style/axis/VanChartBaseAxisPane.java index 649e030da..b76dd98e8 100644 --- a/designer_chart/src/com/fr/plugin/chart/designer/style/axis/VanChartBaseAxisPane.java +++ b/designer_chart/src/com/fr/plugin/chart/designer/style/axis/VanChartBaseAxisPane.java @@ -197,7 +197,7 @@ public class VanChartBaseAxisPane extends FurtherBasicBeanPane { } protected JPanel createLineStylePane(double[] row, double[] col){ - axisLineStyle = new LineComboBox(CoreConstants.LINE_STYLE_ARRAY_4_AXIS); + axisLineStyle = createLineComboBox(); axisLineColor = new ColorSelectBox(100); String[] strings = new String[]{Inter.getLocText("Plugin-ChartF_Open"),Inter.getLocText("Plugin-ChartF_Close")}; AxisTickLineType[] values = new AxisTickLineType[]{AxisTickLineType.TICK_LINE_OUTSIDE, AxisTickLineType.TICK_LINE_NONE}; @@ -208,6 +208,10 @@ public class VanChartBaseAxisPane extends FurtherBasicBeanPane { return TableLayout4VanChartHelper.createExpandablePaneWithTitle(Inter.getLocText("Plugin-ChartF_AxisLineStyle"), panel); } + protected LineComboBox createLineComboBox() { + return new LineComboBox(CoreConstants.LINE_STYLE_ARRAY_4_AXIS); + } + protected Component[][] getLineStylePaneComponents() { return new Component[][]{ new Component[]{null,null} , diff --git a/designer_chart/src/com/fr/plugin/chart/designer/style/axis/radar/VanChartRadarXAxisPane.java b/designer_chart/src/com/fr/plugin/chart/designer/style/axis/radar/VanChartRadarXAxisPane.java index 02075c8c5..eae979c82 100644 --- a/designer_chart/src/com/fr/plugin/chart/designer/style/axis/radar/VanChartRadarXAxisPane.java +++ b/designer_chart/src/com/fr/plugin/chart/designer/style/axis/radar/VanChartRadarXAxisPane.java @@ -1,11 +1,13 @@ package com.fr.plugin.chart.designer.style.axis.radar; +import com.fr.design.gui.icombobox.LineComboBox; import com.fr.design.gui.ilable.UILabel; import com.fr.design.layout.TableLayout; import com.fr.design.layout.TableLayoutHelper; import com.fr.general.Inter; import com.fr.plugin.chart.designer.TableLayout4VanChartHelper; import com.fr.plugin.chart.designer.style.axis.VanChartBaseAxisPane; +import com.fr.stable.CoreConstants; import javax.swing.*; import java.awt.*; @@ -40,4 +42,8 @@ public class VanChartRadarXAxisPane extends VanChartBaseAxisPane { new Component[]{new UILabel(Inter.getLocText("FR-Chart-Color_Color")),axisLineColor}, }; } + + protected LineComboBox createLineComboBox() { + return new LineComboBox(CoreConstants.STRIKE_LINE_STYLE_ARRAY_4_CHART); + } } \ No newline at end of file diff --git a/designer_chart/src/com/fr/plugin/chart/designer/style/axis/radar/VanChartRadarYAxisPane.java b/designer_chart/src/com/fr/plugin/chart/designer/style/axis/radar/VanChartRadarYAxisPane.java index e722402be..054b05f7b 100644 --- a/designer_chart/src/com/fr/plugin/chart/designer/style/axis/radar/VanChartRadarYAxisPane.java +++ b/designer_chart/src/com/fr/plugin/chart/designer/style/axis/radar/VanChartRadarYAxisPane.java @@ -1,6 +1,7 @@ package com.fr.plugin.chart.designer.style.axis.radar; import com.fr.design.gui.ibutton.UIButtonGroup; +import com.fr.design.gui.icombobox.LineComboBox; import com.fr.design.gui.ilable.UILabel; import com.fr.design.layout.TableLayout; import com.fr.design.layout.TableLayoutHelper; @@ -10,6 +11,7 @@ import com.fr.plugin.chart.attr.axis.VanChartValueAxis; import com.fr.plugin.chart.designer.TableLayout4VanChartHelper; import com.fr.plugin.chart.designer.style.axis.VanChartValueAxisPane; import com.fr.plugin.chart.designer.style.axis.component.MinMaxValuePaneWithOutSecTick; +import com.fr.stable.CoreConstants; import javax.swing.*; import java.awt.*; @@ -43,6 +45,10 @@ public class VanChartRadarYAxisPane extends VanChartValueAxisPane { return TableLayoutHelper.createTableLayoutPane(components, rowSize, columnSize); } + protected LineComboBox createLineComboBox() { + return new LineComboBox(CoreConstants.STRIKE_LINE_STYLE_ARRAY_4_CHART); + } + protected JPanel createMinMaxValuePane(double[] row, double[] col) { double p = TableLayout.PREFERRED; double f = TableLayout.FILL;