Merge pull request #23 in CHART/design from ~XIAOFU.QIN/chart-design:release/9.0 to release/9.0

* commit 'fc806f3f1cc23697b4085e139964594d56c66f73':
  CHART-1212 设计器轮播面板添加设置轮播箭头隐藏的选项
  CHART-1255 设计器面板添加0.5~17.5的层级option

designer_chart/src/com/fr/design/mainframe/chart/gui/ChangeConfigPane.java

@@ -11,6 +11,7 @@ import com.fr.design.beans.BasicBeanPane;
 import com.fr.design.gui.ibutton.UIButtonGroup;
 import com.fr.design.gui.ilable.UILabel;
 import com.fr.design.gui.ispinner.UISpinner;
+import com.fr.design.gui.icheckbox.UICheckBox;
 import com.fr.design.layout.TableLayout;
 import com.fr.design.layout.TableLayoutHelper;
 import com.fr.design.mainframe.chart.gui.style.ChartTextAttrPane;
@@ -42,6 +43,7 @@ public class ChangeConfigPane extends BasicBeanPane<ChartCollection> {
     //轮播切换方式配置接界面
     private JPanel carouselConfigPane;
     protected UISpinner timeInterval;
+    protected UICheckBox arrowCheckbox;
     private ColorSelectBoxWithOutTransparent colorSelectBox4carousel;
 
     public ChangeConfigPane(){
@@ -95,9 +97,11 @@ public class ChangeConfigPane extends BasicBeanPane<ChartCollection> {
         double[] rowSize = {p,p,p};
         timeInterval = new UISpinner(MIN_TIME, MAX_TIME, 1, 0);
         colorSelectBox4carousel = new ColorSelectBoxWithOutTransparent(WIDTH);
+        arrowCheckbox = new UICheckBox(Inter.getLocText("FR-Base_TurnOn"));
         Component[][] components = new Component[][]{
                 new Component[]{new UILabel(Inter.getLocText("Plugin-ChartF_Time_Interval")), timeInterval},
                 new Component[]{new UILabel(Inter.getLocText("Background")),colorSelectBox4carousel},
+                new Component[] {new UILabel(Inter.getLocText("Plugin-ChartF_Arrow_Style")), arrowCheckbox}
         };
 
         return TableLayout4VanChartHelper.createGapTableLayoutPane(components,rowSize,columnSize);
@@ -174,6 +178,7 @@ public class ChangeConfigPane extends BasicBeanPane<ChartCollection> {
         //轮播切换界面
         timeInterval.setValue(changeConfigAttr.getTimeInterval());
         colorSelectBox4carousel.setSelectObject(changeConfigAttr.getCarouselColor());
+        arrowCheckbox.setSelected(changeConfigAttr.getShowArrow());
 
         checkCardPane();
 
@@ -197,6 +202,7 @@ public class ChangeConfigPane extends BasicBeanPane<ChartCollection> {
         changeConfigAttr.setButtonColor(colorSelectBox4button.getSelectObject());
         changeConfigAttr.setTimeInterval((int) timeInterval.getValue());
         changeConfigAttr.setCarouselColor(colorSelectBox4carousel.getSelectObject());
+        changeConfigAttr.setShowArrow(arrowCheckbox.isSelected());
     }
 
     @Override

designer_chart/src/com/fr/plugin/chart/map/designer/type/VanChartMapSourceChoosePane.java

@@ -57,10 +57,28 @@ import java.util.ArrayList;
 public class VanChartMapSourceChoosePane extends JPanel implements UIObserver {
     private static final double[] COLUMN_SIZE = {48, TableLayout.FILL, TableLayout.PREFERRED};
 
-    public static final ZoomLevel[] ZOOM_LEVELS = new ZoomLevel[]{ZoomLevel.AUTO, ZoomLevel.ZERO, ZoomLevel.ONE,
-            ZoomLevel.TWO, ZoomLevel.THREE, ZoomLevel.FOUR, ZoomLevel.FIVE, ZoomLevel.SIX, ZoomLevel.SEVEN,
-            ZoomLevel.EIGHT, ZoomLevel.NINE, ZoomLevel.TEN, ZoomLevel.ELEVEN, ZoomLevel.TWELVE, ZoomLevel.THIRTEEN,
-            ZoomLevel.FOURTEEN, ZoomLevel.FIFTEEN, ZoomLevel.SIXTEEN, ZoomLevel.SEVENTEEN, ZoomLevel.EIGHTEEN};
+    public static final ZoomLevel[] ZOOM_LEVELS = new ZoomLevel[]{
+            ZoomLevel.AUTO,
+            ZoomLevel.ZERO, ZoomLevel.ZEROPOINTFIVE,
+            ZoomLevel.ONE, ZoomLevel.ONEPOINTFIVE,
+            ZoomLevel.TWO, ZoomLevel.TWOPOINTFIVE,
+            ZoomLevel.THREE, ZoomLevel.THREEPOINTFIVE,
+            ZoomLevel.FOUR, ZoomLevel.FOURPOINTFIVE,
+            ZoomLevel.FIVE, ZoomLevel.FIVEPOINTFIVE,
+            ZoomLevel.SIX, ZoomLevel.SIXPOINTFIVE,
+            ZoomLevel.SEVEN, ZoomLevel.SEVENPOINTFIVE,
+            ZoomLevel.EIGHT, ZoomLevel.EIGHTPOINTFIVE,
+            ZoomLevel.NINE, ZoomLevel.NINEPOINTFIVE,
+            ZoomLevel.TEN, ZoomLevel.TENPOINTFIVE,
+            ZoomLevel.ELEVEN, ZoomLevel.ELEVENTPOINTFIVE,
+            ZoomLevel.TWELVE, ZoomLevel.TWELVEPOINTFIVE,
+            ZoomLevel.THIRTEEN, ZoomLevel.THIRTEENPOINTFIVE,
+            ZoomLevel.FOURTEEN, ZoomLevel.FOURTEENPOINTFIVE,
+            ZoomLevel.FIFTEEN, ZoomLevel.FIFTEENPOINTFIVE,
+            ZoomLevel.SIXTEEN, ZoomLevel.SIXTEENPOINTFIVE,
+            ZoomLevel.SEVENTEEN, ZoomLevel.SEVENTEENPOINTFIVE,
+            ZoomLevel.EIGHTEEN
+    };
     private static final String AUTO_CENTER_STRING = Inter.getLocText("Plugin-ChartF_Automatic");
     private static final String CUSTOM_CENTER_STRING = Inter.getLocText("Plugin-ChartF_Custom");