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/7] =?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 977e7ce3a4..8f73e2d5f1 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 6b15607c6e..3314b180ad 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/7] =?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 782fc1b795..b13c21352f 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/7] =?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 649e030da4..b76dd98e87 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 02075c8c50..eae979c829 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 e722402be8..054b05f7b1 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; From 3ea73837dcb9e5a1464a006d0e18233f2b8f112b Mon Sep 17 00:00:00 2001 From: MoMeak Date: Mon, 4 Sep 2017 15:15:17 +0800 Subject: [PATCH 4/7] =?UTF-8?q?REPORT-3959=20[9.0=E4=B8=80=E8=BD=AE?= =?UTF-8?q?=E5=9B=9E=E5=BD=92]=E8=A1=8C=EF=BC=88=E5=88=97=EF=BC=89?= =?UTF-8?q?=E9=9A=90=E8=97=8F=E6=97=B6=E8=A1=8C=EF=BC=88=E5=88=97=EF=BC=89?= =?UTF-8?q?=E5=8F=B7=E4=BE=9D=E7=84=B6=E6=98=BE=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- designer/src/com/fr/grid/GridColumnUI.java | 8 ++++---- designer/src/com/fr/grid/GridRowUI.java | 23 +++++++++++----------- 2 files changed, 16 insertions(+), 15 deletions(-) diff --git a/designer/src/com/fr/grid/GridColumnUI.java b/designer/src/com/fr/grid/GridColumnUI.java index 9712821682..ab32e6ce86 100644 --- a/designer/src/com/fr/grid/GridColumnUI.java +++ b/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); -// } + } } diff --git a/designer/src/com/fr/grid/GridRowUI.java b/designer/src/com/fr/grid/GridRowUI.java index 016cfe6378..2f97914bbc 100644 --- a/designer/src/com/fr/grid/GridRowUI.java +++ b/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); + } } } \ No newline at end of file From 59cb498c5be0a6b14ddf66b6309ee139a9962a8c Mon Sep 17 00:00:00 2001 From: kerry Date: Mon, 4 Sep 2017 15:22:02 +0800 Subject: [PATCH 5/7] =?UTF-8?q?REPORT-4220=20[9.0=E4=B8=80=E8=BD=AE?= =?UTF-8?q?=E5=9B=9E=E5=BD=92]=E8=A7=86=E5=9B=BE=E6=A0=91=E3=80=81?= =?UTF-8?q?=E4=B8=8B=E6=8B=89=E6=A0=91=E6=8E=A7=E4=BB=B6=E6=9E=84=E5=BB=BA?= =?UTF-8?q?=E6=A0=91=E7=A1=AE=E5=AE=9A=E6=8C=89=E9=92=AE=E4=B8=8D=E5=8F=AF?= =?UTF-8?q?=E7=94=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/fr/design/widget/ui/TreeComboBoxEditorDefinePane.java | 4 ++-- .../src/com/fr/design/widget/ui/TreeEditorDefinePane.java | 4 ++-- .../fr/design/widget/ui/designer/TreeEditorDefinePane.java | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/designer/src/com/fr/design/widget/ui/TreeComboBoxEditorDefinePane.java b/designer/src/com/fr/design/widget/ui/TreeComboBoxEditorDefinePane.java index 2a63a5b862..1bebaf90c8 100644 --- a/designer/src/com/fr/design/widget/ui/TreeComboBoxEditorDefinePane.java +++ b/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; } diff --git a/designer/src/com/fr/design/widget/ui/TreeEditorDefinePane.java b/designer/src/com/fr/design/widget/ui/TreeEditorDefinePane.java index 96d83b7b62..f98eea391a 100644 --- a/designer/src/com/fr/design/widget/ui/TreeEditorDefinePane.java +++ b/designer/src/com/fr/design/widget/ui/TreeEditorDefinePane.java @@ -30,7 +30,7 @@ public class TreeEditorDefinePane extends FieldEditorDefinePane { @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 { @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()); diff --git a/designer_form/src/com/fr/design/widget/ui/designer/TreeEditorDefinePane.java b/designer_form/src/com/fr/design/widget/ui/designer/TreeEditorDefinePane.java index 100fb2800e..bb48d586a8 100644 --- a/designer_form/src/com/fr/design/widget/ui/designer/TreeEditorDefinePane.java +++ b/designer_form/src/com/fr/design/widget/ui/designer/TreeEditorDefinePane.java @@ -69,7 +69,7 @@ public class TreeEditorDefinePane extends CustomWritableRepeatEditorPane Date: Mon, 4 Sep 2017 16:30:26 +0800 Subject: [PATCH 6/7] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../fr/design/widget/ui/designer/FreeButtonDefinePane.java | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/designer_form/src/com/fr/design/widget/ui/designer/FreeButtonDefinePane.java b/designer_form/src/com/fr/design/widget/ui/designer/FreeButtonDefinePane.java index 1c4ef03a03..6dd4e4f2c3 100644 --- a/designer_form/src/com/fr/design/widget/ui/designer/FreeButtonDefinePane.java +++ b/designer_form/src/com/fr/design/widget/ui/designer/FreeButtonDefinePane.java @@ -46,9 +46,7 @@ public class FreeButtonDefinePane extends ButtonDefinePane { FreeButton freeButton = (FreeButton) creator.toData(); backgroundCompPane.update(freeButton); FRFont frFont = freeButton.getFont(); - if(frFont != null){ - frFontPane.update(frFont); - } + freeButton.setFont(frFontPane.update(frFont)); return freeButton; } } From cf232827fbbe306d0e1e3aef66bf152c2611b005 Mon Sep 17 00:00:00 2001 From: kerry Date: Mon, 4 Sep 2017 16:32:18 +0800 Subject: [PATCH 7/7] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/fr/design/widget/ui/designer/FreeButtonDefinePane.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/designer_form/src/com/fr/design/widget/ui/designer/FreeButtonDefinePane.java b/designer_form/src/com/fr/design/widget/ui/designer/FreeButtonDefinePane.java index 6dd4e4f2c3..db66354533 100644 --- a/designer_form/src/com/fr/design/widget/ui/designer/FreeButtonDefinePane.java +++ b/designer_form/src/com/fr/design/widget/ui/designer/FreeButtonDefinePane.java @@ -45,7 +45,7 @@ public class FreeButtonDefinePane extends ButtonDefinePane { public FreeButton updateSubButtonPane() { FreeButton freeButton = (FreeButton) creator.toData(); backgroundCompPane.update(freeButton); - FRFont frFont = freeButton.getFont(); + FRFont frFont = freeButton.getFont() == null ? FRFont.getInstance() : freeButton.getFont(); freeButton.setFont(frFontPane.update(frFont)); return freeButton; }