Merge pull request #1171 in BA/design from ~MANGO/m_design:release/9.0 to release/9.0

* commit '15128aa8fd73918cb889a85bbef1701fc502f956':
  雷达图 轴线样式
  修改范围图例显示不全
  处理地图类型选择面板中，中心点设置bug

designer_chart/src/com/fr/plugin/chart/designer/style/axis/VanChartBaseAxisPane.java

@@ -197,7 +197,7 @@ public class VanChartBaseAxisPane extends FurtherBasicBeanPane<VanChartAxis> {
     }
 
     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<VanChartAxis> {
         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} ,

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);
+    }
 }

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;

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);
             }
         }

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) {

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() {