Merge branch 'dev' of http://www.finedevelop.com:2015/scm/~yaoh.wu/design_0407 into dev

designer_base/src/com/fr/design/locale/designer.properties

@@ -588,5 +588,11 @@ FR-Designer-Move_Tab_First=move to first
 FR-Designer-Move_Tab_End=move to end
 FR-Designer-Move_Tab_Next=move to next
 FR-Designer-Move_Tab_Prev=move to previous
+
 FR-Designer_Too_Large_To_Paste=too large to paste
 FR-Designer_Too_Small_To_Paste=Too small to paste
+
+FR-Designer_AxisReversed=AxisValue
+FR-Designer_Logarithmic=Logarithmic
+FR-Designer_Chart_Log_Base=Log Base
+FR-Designer_Chart_F_Radar_Axis=Chart_F_Radar_Axis

designer_base/src/com/fr/design/locale/designer_en_US.properties

@@ -588,5 +588,12 @@ FR-Designer-Move_Tab_First=move to first
 FR-Designer-Move_Tab_End=move to end
 FR-Designer-Move_Tab_Next=move to next
 FR-Designer-Move_Tab_Prev=move to previous
+
 FR-Designer_Too_Large_To_Paste=Too large to paste!
 FR-Designer_Too_Small_To_Paste=Too small to paste!
+
+FR-Designer_AxisReversed=Axis in reverse order
+FR-Designer_Logarithmic=Log scale
+FR-Designer_Chart_Log_Base=Log Base
+FR-Designer_Chart_F_Radar_Axis=Value Axis
+

designer_base/src/com/fr/design/locale/designer_ja_JP.properties

@@ -557,3 +557,7 @@ FR-Designer_Too_Large_To_Paste=\u30B3\u30F3\u30DD\u30FC\u30CD\u30F3\u30C8\u306E\
 FR-Designer_Too_Small_To_Paste=\u8A72\u5F53\u51E6\u306B\u8CBC\u308A\u4ED8\u3051\u3067\u304D\u307E\u305B\u3093\u3001\u30B3\u30F3\u30DD\u30FC\u30CD\u30F3\u30C8\u306E\u30B5\u30A4\u30BA\u306F\u9AD8\u3059\u304E\uFF01
 FR-Designer_Mouse_Click_Tips=
 FR-Designer_Plugin_Should_Update_Please_Contact_Developer=
+FR-Designer_AxisReversed=\u8EF8\u9006\u9806
+FR-Designer_Logarithmic=\u5BFE\u6570\u76EE\u76DB\u308A
+FR-Designer_Chart_Log_Base=\u5E95\u6570
+FR-Designer_Chart_F_Radar_Axis=\u5782\u76F4\u8EF8

designer_base/src/com/fr/design/locale/designer_ko_KR.properties

@@ -551,4 +551,8 @@ FR-Designer_Background_Image_Select=
 FR-Designer_Initial_Background_Tips=
 FR-Designer_Mouse_Move_Tips=
 FR-Designer_Mouse_Click_Tips=
-FR-Designer_Plugin_Should_Update_Please_Contact_Developer=
+FR-Designer_Plugin_Should_Update_Please_Contact_Developer=
+FR-Designer_AxisReversed=\uCD95\uC5ED\uC21C
+FR-Designer_Logarithmic=\uB85C\uADF8\uB208\uAE08
+FR-Designer_Chart_Log_Base=\uAE30\uC218
+FR-Designer_Chart_F_Radar_Axis=\uAC12\uCD95

designer_base/src/com/fr/design/locale/designer_zh_CN.properties

@@ -588,5 +588,11 @@ FR-Designer_Background_Image_Select=\u9009\u62E9\u56FE\u7247
 FR-Designer_Initial_Background_Tips=\u6309\u94AE\u7684\u521D\u59CB\u80CC\u666F
 FR-Designer_Mouse_Move_Tips=\u9F20\u6807\u79FB\u52A8\u5230\u6309\u94AE\u4E0A\u7684\u80CC\u666F\uFF0C\u82E5\u65E0\u5219\u4E0D\u6539\u53D8\u80CC\u666F
 FR-Designer_Mouse_Click_Tips=\u9F20\u6807\u70B9\u51FB\u6309\u94AE\u65F6\u80CC\u666F\uFF0C\u82E5\u65E0\u5219\u4E0D\u6539\u53D8\u80CC\u666F
+
 FR-Designer_Too_Large_To_Paste=\u7EC4\u4EF6\u5927\u5C0F\u8D85\u51FA\u8FB9\u754C\uFF0C\u65E0\u6CD5\u7C98\u8D34\uFF01
 FR-Designer_Too_Small_To_Paste=\u6B64\u5904\u65E0\u6CD5\u7C98\u8D34\uFF0C\u5C0F\u4E8E\u7EC4\u4EF6\u6700\u5C0F\u9AD8\u5EA6\uFF01
+
+FR-Designer_AxisReversed=\u8F74\u9006\u5E8F
+FR-Designer_Logarithmic=\u5BF9\u6570\u523B\u5EA6
+FR-Designer_Chart_Log_Base=\u5E95\u6570
+FR-Designer_Chart_F_Radar_Axis=\u503C\u8F74

designer_base/src/com/fr/design/locale/designer_zh_TW.properties

@@ -577,4 +577,8 @@ FR-Designer_Too_Large_To_Paste=\u7D44\u4EF6\u5927\u5C0F\u8D85\u51FA\u908A\u754C\
 FR-Designer_Too_Small_To_Paste=\u6B64\u8655\u7121\u6CD5\u7C98\u8CBC\uFF0C\u5C0F\u65BC\u7D44\u4EF6\u6700\u5C0F\u9AD8\u5EA6\uFF01
 FR-Designer_Initial_Background_Tips=
 FR-Designer_Mouse_Move_Tips=
-FR-Designer_Mouse_Click_Tips=
+FR-Designer_Mouse_Click_Tips=
+FR-Designer_AxisReversed=\u8EF8\u9006\u5E8F
+FR-Designer_Logarithmic=\u5C0D\u6578\u523B\u5EA6
+FR-Designer_Chart_Log_Base=\u5E95\u6578
+FR-Designer_Chart_F_Radar_Axis=\u503C\u8EF8

designer_base/src/com/fr/design/style/color/ColorSelectConfigManager.java

@@ -84,6 +84,9 @@ public class ColorSelectConfigManager extends XMLFileManager implements ColorSel
      * @param color 颜色
      */
     public void addToColorQueue(Color color) {
+        if(color == null){
+            return;
+        }
         // 过滤重复的最近使用颜色
         // 因为有个后进先出的问题，最近使用的颜色需要放到最前面所以没用set
         if (colors.contains(color)) {

designer_chart/src/com/fr/design/chart/axis/MinMaxValuePane.java

@@ -31,41 +31,53 @@ public class MinMaxValuePane extends JPanel {
     protected UITextField secUnitField;
 
 	public MinMaxValuePane() {
-        minCheckBox = new UICheckBox(Inter.getLocText(new String[]{"Custom", "Min_Value"}));
-        minValueField = new UITextField(6);
-        maxCheckBox = new UICheckBox(Inter.getLocText(new String[]{"Custom", "Max_Value"}));
-        maxValueField = new UITextField(6);
-        isCustomMainUnitBox = new UICheckBox(Inter.getLocText("FR-Chart_MainGraduationUnit"));
-        mainUnitField = new UITextField(6);
-        isCustomSecUnitBox = new UICheckBox(Inter.getLocText("FR-Chart_SecondGraduationUnit"));
-        secUnitField = new UITextField(6);
+		minCheckBox = new UICheckBox(Inter.getLocText(new String[]{"Custom", "Min_Value"}));
+		minValueField = new UITextField(6);
+		maxCheckBox = new UICheckBox(Inter.getLocText(new String[]{"Custom", "Max_Value"}));
+		maxValueField = new UITextField(6);
+		isCustomMainUnitBox = new UICheckBox(Inter.getLocText("FR-Chart_MainGraduationUnit"));
+		mainUnitField = new UITextField(6);
+		isCustomSecUnitBox = new UICheckBox(Inter.getLocText("FR-Chart_SecondGraduationUnit"));
+		secUnitField = new UITextField(6);
+
 		double p = TableLayout.PREFERRED;
 		double f = TableLayout.FILL;
-		double[] columnSize = { p, f };
-        double[] rowSize = { p, p, p, p};
+		double[] columnSize = {p, f};
 
-		Component[][] components  = getPanelComponents();
-		JPanel panel = TableLayoutHelper.createTableLayoutPane(components ,rowSize,columnSize);
+		Component[][] components = getPanelComponents();
+		JPanel panel = TableLayoutHelper.createTableLayoutPane(components, getRowSize(p), columnSize);
 		this.setLayout(new BorderLayout());
-		this.add(panel,BorderLayout.CENTER);
+		this.add(panel, BorderLayout.CENTER);
+		addComponentListener(components);
+	}
 
-        for(int i = 0; i < components.length; i++) {
-			((UICheckBox)components[i][0]).addActionListener(new ActionListener() {
+	protected double[] getRowSize(double p) {
+		return new double[]{p, p, p, p};
+	}
 
-				@Override
-				public void actionPerformed(ActionEvent e) {
-					checkBoxUse();
-				}
-			});
-			ChartSwingUtils.addListener((UICheckBox)components[i][0], (UITextField)components[i][1]);
+	protected void addComponentListener(Component[][] components) {
+		for (int i = 0; i < components.length; i++) {
+			addListener((UICheckBox) components[i][0]);
+			ChartSwingUtils.addListener((UICheckBox) components[i][0], (UITextField) components[i][1]);
 		}
 	}
+
+	protected void  addListener(UICheckBox checkBox) {
+		checkBox.addActionListener(new ActionListener() {
+
+			@Override
+			public void actionPerformed(ActionEvent e) {
+				checkBoxUse();
+			}
+		});
+	}
+
 	protected Component[][] getPanelComponents() {
-		return 	new Component[][]{
-                new Component[]{minCheckBox, minValueField},
-                new Component[]{maxCheckBox, maxValueField},
-                new Component[]{isCustomMainUnitBox, mainUnitField},
-                new Component[]{isCustomSecUnitBox, secUnitField},
+		return new Component[][]{
+				new Component[]{minCheckBox, minValueField},
+				new Component[]{maxCheckBox, maxValueField},
+				new Component[]{isCustomMainUnitBox, mainUnitField},
+				new Component[]{isCustomSecUnitBox, secUnitField},
 		};
 	}
 
@@ -100,7 +112,7 @@ public class MinMaxValuePane extends JPanel {
 			if(axis.getMinValue() != null) {
 				minValueField.setText(axis.getMinValue().toString());
 			}
-		} 
+		}
 
 		// 最大值
 		if (axis.isCustomMaxValue()) {
@@ -108,7 +120,7 @@ public class MinMaxValuePane extends JPanel {
 			if(axis.getMaxValue() != null) {
 				maxValueField.setText(axis.getMaxValue().toString());
 			}
-		} 
+		}
 
 		// 主次刻度单位
 		if (axis.isCustomMainUnit()) {
@@ -116,7 +128,7 @@ public class MinMaxValuePane extends JPanel {
 			if(axis.getMainUnit() != null) {
 				mainUnitField.setText(axis.getMainUnit().toString());
 			}
-		} 
+		}
 
 		if(axis.isCustomSecUnit()) {
 			isCustomSecUnitBox.setSelected(true);

designer_chart/src/com/fr/design/mainframe/chart/gui/style/ChartTextAttrPane.java

@@ -77,17 +77,17 @@ public class ChartTextAttrPane extends BasicPane {
     public void populate(FRFont frFont) {
         UIObserverListener listener = fontNameComboBox == null ? null : fontNameComboBox.getUiObserverListener();
         removeAllComboBoxListener();
-        if (frFont == null) {
-            return;
-        }
-        fontNameComboBox.setSelectedItem(frFont.getFamily());
-        bold.setSelected(frFont.isBold());
-        italic.setSelected(frFont.isItalic());
-        if(fontSizeComboBox != null) {
-        	fontSizeComboBox.setSelectedItem(frFont.getSize());
-        }
-        if (fontColor != null) {
-            fontColor.setColor(frFont.getForeground());
+
+        if (frFont != null) {
+            fontNameComboBox.setSelectedItem(frFont.getFamily());
+            bold.setSelected(frFont.isBold());
+            italic.setSelected(frFont.isItalic());
+            if(fontSizeComboBox != null) {
+                fontSizeComboBox.setSelectedItem(frFont.getSize());
+            }
+            if (fontColor != null) {
+                fontColor.setColor(frFont.getForeground());
+            }
         }
 
         //更新结束后，注册监听器