From 40e05c554075b2cf5f0ed739c0191ed6b7671892 Mon Sep 17 00:00:00 2001
From: mengao <283296419@qq.com>
Date: Thu, 14 Sep 2017 09:51:20 +0800
Subject: [PATCH] =?UTF-8?q?=E8=A7=A3=E5=86=B39.0bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../chart/gui/data/table/MeterPlotTableDataContentPane.java  | 5 +----
 .../mainframe/chart/gui/other/ChartInteractivePane.java      | 2 +-
 .../plugin/chart/designer/other/VanChartInteractivePane.java | 2 +-
 .../chart/designer/style/tooltip/VanChartTooltipPane.java    | 4 ++--
 .../desinger/data/StructurePlotTableDataContentPane.java     | 2 +-
 5 files changed, 6 insertions(+), 9 deletions(-)

diff --git a/designer_chart/src/com/fr/design/mainframe/chart/gui/data/table/MeterPlotTableDataContentPane.java b/designer_chart/src/com/fr/design/mainframe/chart/gui/data/table/MeterPlotTableDataContentPane.java
index 4bf7e3168b..b8cb14bed5 100644
--- a/designer_chart/src/com/fr/design/mainframe/chart/gui/data/table/MeterPlotTableDataContentPane.java
+++ b/designer_chart/src/com/fr/design/mainframe/chart/gui/data/table/MeterPlotTableDataContentPane.java
@@ -37,12 +37,9 @@ public class MeterPlotTableDataContentPane extends AbstractTableDataContentPane
 		valueBox = new UIComboBox();
 		filterPane = new ChartDataFilterPane(new MeterPlot(), parent);
 
-		nameBox.setPreferredSize(new Dimension(100, 20));
-		valueBox.setPreferredSize(new Dimension(100, 20));
-
 		double p = TableLayout.PREFERRED;
 		double f = TableLayout.FILL;
-		double[] columnSize = { p,f};
+		double[] columnSize = {f, COMPONENT_WIDTH};
 		double[] rowSize = {p, p};
 
         Component[][] components = createComponents();
diff --git a/designer_chart/src/com/fr/design/mainframe/chart/gui/other/ChartInteractivePane.java b/designer_chart/src/com/fr/design/mainframe/chart/gui/other/ChartInteractivePane.java
index a56468c739..e7ffd5c3cc 100644
--- a/designer_chart/src/com/fr/design/mainframe/chart/gui/other/ChartInteractivePane.java
+++ b/designer_chart/src/com/fr/design/mainframe/chart/gui/other/ChartInteractivePane.java
@@ -216,7 +216,7 @@ public class ChartInteractivePane extends BasicScrollPane<Chart> implements UIOb
             @Override
             public void mouseClicked(MouseEvent e) {
                 if (valueFormatPane == null) {
-                    valueFormatPane = new FormatPane();
+                    valueFormatPane = new FormatPaneWithOutFont();
                 }
                 Point comPoint = dataPointValueFormat.getLocationOnScreen();
                 Point arrowPoint = new Point(comPoint.x - DET, comPoint.y + dataPointValueFormat.getHeight());
diff --git a/designer_chart/src/com/fr/plugin/chart/designer/other/VanChartInteractivePane.java b/designer_chart/src/com/fr/plugin/chart/designer/other/VanChartInteractivePane.java
index 5fb6d29c0f..41cd7aa025 100644
--- a/designer_chart/src/com/fr/plugin/chart/designer/other/VanChartInteractivePane.java
+++ b/designer_chart/src/com/fr/plugin/chart/designer/other/VanChartInteractivePane.java
@@ -111,7 +111,7 @@ public class VanChartInteractivePane extends AbstractVanChartScrollPane<Chart> {
             return null;
         }
         zoomWidget = new UIButtonGroup(new String[]{Inter.getLocText("Plugin-ChartF_Open"), Inter.getLocText("Plugin-ChartF_Close")});
-        zoomResize = new UIButtonGroup(new String[]{Inter.getLocText("Plugin-ChartF_Open"), Inter.getLocText("Plugin-ChartF_Close")});
+        zoomResize = new UIButtonGroup(new String[]{Inter.getLocText("Plugin-ChartF_Change"), Inter.getLocText("Plugin-ChartF_Non_Adjustment")});
         from = new TinyFormulaPane();
         to = new TinyFormulaPane();
         zoomType = new UIButtonGroup(getNameArray(), getValueArray());
diff --git a/designer_chart/src/com/fr/plugin/chart/designer/style/tooltip/VanChartTooltipPane.java b/designer_chart/src/com/fr/plugin/chart/designer/style/tooltip/VanChartTooltipPane.java
index f332efbb47..b92377f8a7 100644
--- a/designer_chart/src/com/fr/plugin/chart/designer/style/tooltip/VanChartTooltipPane.java
+++ b/designer_chart/src/com/fr/plugin/chart/designer/style/tooltip/VanChartTooltipPane.java
@@ -58,12 +58,12 @@ public class VanChartTooltipPane extends AbstractVanChartScrollPane<Chart> {
         if(chart == null) {
             return;
         }
-        ConditionAttr attrList = chart.getPlot().getConditionCollection().getDefaultAttr();
+        AttrTooltip attrTooltip = tooltipPane.update();
         DataSeriesCondition attr = ((VanChartPlot)chart.getPlot()).getAttrTooltipFromConditionCollection();
+        ConditionAttr attrList = chart.getPlot().getConditionCollection().getDefaultAttr();
         if(attr != null) {
             attrList.remove(attr);
         }
-        AttrTooltip attrTooltip = tooltipPane.update();
         if (attrTooltip != null) {
             attrList.addDataSeriesCondition(attrTooltip);
         }
diff --git a/designer_chart/src/com/fr/plugin/chart/structure/desinger/data/StructurePlotTableDataContentPane.java b/designer_chart/src/com/fr/plugin/chart/structure/desinger/data/StructurePlotTableDataContentPane.java
index 26ad1dbae0..5611f72844 100644
--- a/designer_chart/src/com/fr/plugin/chart/structure/desinger/data/StructurePlotTableDataContentPane.java
+++ b/designer_chart/src/com/fr/plugin/chart/structure/desinger/data/StructurePlotTableDataContentPane.java
@@ -31,7 +31,7 @@ public class StructurePlotTableDataContentPane extends AbstractTableDataContentP
     public StructurePlotTableDataContentPane() {
         double p = TableLayout.PREFERRED;
         double f = TableLayout.FILL;
-        double[] columnSize = {p, f};
+        double[] columnSize = {f, COMPONENT_WIDTH};
         double[] rowSize = {p, p, p, p, p, p};
 
         nodeName = new UIComboBox();