Merge branch 'release/9.0' of http://www.finedevelop.com:2015/scm/~plough/design into release/9.0

designer/src/com/fr/design/widget/ui/TreeComboBoxEditorDefinePane.java

@@ -55,14 +55,14 @@ public class TreeComboBoxEditorDefinePane extends CustomWritableRepeatEditorPane
 
 	@Override
 	protected void populateSubCustomWritableRepeatEditorBean(TreeEditor e) {
-		treeSettingPane.setValue(e.getDictionary());
+		treeSettingPane.setValue(e.getNodeOrDict());
 		treeRootPane.populate(e.getTreeAttr());
 	}
 
 	@Override
 	protected TreeComboBoxEditor updateSubCustomWritableRepeatEditorBean() {
 		TreeComboBoxEditor editor = new TreeComboBoxEditor();
-		editor.setDictionary((Dictionary)treeSettingPane.getValue());
+		editor.setNodeOrDict(treeSettingPane.getValue());
 		editor.setTreeAttr(treeRootPane.update());
 		return editor;
 	}

designer/src/com/fr/design/widget/ui/TreeEditorDefinePane.java

@@ -30,7 +30,7 @@ public class TreeEditorDefinePane extends FieldEditorDefinePane<TreeEditor> {
 
 	@Override
 	protected void populateSubFieldEditorBean(TreeEditor e) {
-		this.accessibleTreeModelEditor.setValue(e.getDictionary());
+		this.accessibleTreeModelEditor.setValue(e.getNodeOrDict());
 		treeRootPane.populate(e.getTreeAttr());
 		if (this.removeRepeatCheckBox != null) {
 			this.removeRepeatCheckBox.setSelected(e.isRemoveRepeat());
@@ -40,7 +40,7 @@ public class TreeEditorDefinePane extends FieldEditorDefinePane<TreeEditor> {
 	@Override
 	protected TreeEditor updateSubFieldEditorBean() {
 		TreeEditor editor = new TreeEditor();
-		editor.setDictionary((Dictionary) accessibleTreeModelEditor.getValue());
+		editor.setNodeOrDict(accessibleTreeModelEditor.getValue());
 		editor.setTreeAttr(treeRootPane.update());
 		if (this.removeRepeatCheckBox != null) {
 			editor.setRemoveRepeat(this.removeRepeatCheckBox.isSelected());

designer/src/com/fr/grid/GridColumnUI.java

@@ -163,11 +163,11 @@ public class GridColumnUI extends ComponentUI {
         float time = (float)resolution/ScreenResolution.getScreenResolution();
 
         double stringWidth = gridColumn.getFont().getStringBounds(columnContent, fontRenderContext).getWidth() * time;
-//        if (stringWidth > tmpIncreaseWidth) {
-//            paintMoreContent(i, g2d, tmpWidth1, size, tmpIncreaseWidth, isSelectedBounds, gridColumn, elementCase, columnContent, stringWidth, fmAscent);
-//        } else {
+        if (stringWidth > tmpIncreaseWidth) {
+            paintMoreContent(i, g2d, tmpWidth1, size, tmpIncreaseWidth, isSelectedBounds, gridColumn, elementCase, columnContent, stringWidth, fmAscent);
+        } else {
             paintNormalContent(i, g2d, tmpWidth1, tmpIncreaseWidth, isSelectedBounds, gridColumn, elementCase, columnContent, stringWidth, fmAscent);
-//        }
+        }
     }
 
 

designer/src/com/fr/grid/GridRowUI.java

@@ -159,20 +159,21 @@ public class GridRowUI extends ComponentUI {
         float fmAscent = GraphHelper.getFontMetrics(gridRow.getFont()).getAscent() * time;
         double stringWidth = gridRow.getFont().getStringBounds(paintText, fontRenderContext).getWidth() * time;
         double stringHeight = gridRow.getFont().getStringBounds(paintText, fontRenderContext).getHeight() * time;
-        if (isSelectedBounds) {
-            g2d.setColor(gridRow.getSelectedForeground());
-        } else {
-            // p:检查eanbled
-            if (gridRow.isEnabled()) {
-                g2d.setColor(gridRow.getForeground());
+        // 如果高度太小了就不画了
+        if (stringHeight <= tmpIncreaseHeight + 2) {
+            if (isSelectedBounds) {
+                g2d.setColor(gridRow.getSelectedForeground());
             } else {
-                g2d.setPaint(UIManager.getColor("controlShadow"));
+                // p:检查eanbled
+                if (gridRow.isEnabled()) {
+                    g2d.setColor(gridRow.getForeground());
+                } else {
+                    g2d.setPaint(UIManager.getColor("controlShadow"));
+                }
             }
-        }
-
-        GraphHelper.drawString(g2d, paintText, (size.width - stringWidth) / 2, tmpHeight1 + (tmpIncreaseHeight - stringHeight) / 2 + GridHeader.SIZE_ADJUST / 2 + fmAscent
-                - 2);
 
+            GraphHelper.drawString(g2d, paintText, (size.width - stringWidth) / 2, tmpHeight1 + (tmpIncreaseHeight - stringHeight) / 2 + GridHeader.SIZE_ADJUST / 2 + fmAscent - 2);
+        }
     }
 
 }

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

designer_form/src/com/fr/design/widget/ui/designer/FreeButtonDefinePane.java

@@ -45,10 +45,8 @@ public class FreeButtonDefinePane extends ButtonDefinePane<FreeButton> {
     public FreeButton updateSubButtonPane() {
         FreeButton freeButton = (FreeButton) creator.toData();
         backgroundCompPane.update(freeButton);
-        FRFont frFont = freeButton.getFont();
-        if(frFont != null){
-            frFontPane.update(frFont);
-        }
+        FRFont frFont = freeButton.getFont() == null ? FRFont.getInstance() : freeButton.getFont();
+        freeButton.setFont(frFontPane.update(frFont));
         return freeButton;
     }
 }

designer_form/src/com/fr/design/widget/ui/designer/TreeEditorDefinePane.java

@@ -69,7 +69,7 @@ public class TreeEditorDefinePane extends CustomWritableRepeatEditorPane<TreeEdi
 
     @Override
     protected void populateSubCustomWritableRepeatEditorBean(TreeEditor e) {
-        accessibleTreeModelEditor.setValue(e.getDictionary());
+        accessibleTreeModelEditor.setValue(e.getNodeOrDict());
         formWidgetValuePane.populate(e);
         treeRootPane.populate(e.getTreeAttr());
         mutiSelect.setSelected(e.isMultipleSelection());
@@ -88,7 +88,7 @@ public class TreeEditorDefinePane extends CustomWritableRepeatEditorPane<TreeEdi
         editor.setAjax(loadAsync.isSelected());
         editor.setSelectLeafOnly(returnLeaf.isSelected());
         editor.setReturnFullPath(returnPath.isSelected());
-        editor.setDictionary((Dictionary) accessibleTreeModelEditor.getValue());
+        editor.setNodeOrDict(accessibleTreeModelEditor.getValue());
         return editor;
     }