Browse Source

Merge pull request #1474 in DESIGN/design from ~BJORN/design:release/10.0 to release/10.0

* commit '5a5d8881b19967cba5a215884a15d80b080ee8ab':
  CHART-11090 去掉了手动的监听
feature/big-screen
eason 5 years ago
parent
commit
04ddec223a
  1. 1
      designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/ChartDataPane.java
  2. 1
      designer-chart/src/main/java/com/fr/van/chart/map/designer/data/contentpane/table/VanAreaMapPlotTableDataContentPane.java
  3. 11
      designer-chart/src/main/java/com/fr/van/chart/map/designer/data/contentpane/table/VanMapTableDataContentPane.java

1
designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/ChartDataPane.java

@ -27,7 +27,6 @@ public class ChartDataPane extends AbstractChartAttrPane {
public ChartDataPane(AttributeChangeListener listener) { public ChartDataPane(AttributeChangeListener listener) {
super(); super();
this.listener = listener; this.listener = listener;
this.addAttributeChangeListener(listener);
} }
@Override @Override

1
designer-chart/src/main/java/com/fr/van/chart/map/designer/data/contentpane/table/VanAreaMapPlotTableDataContentPane.java

@ -31,7 +31,6 @@ public class VanAreaMapPlotTableDataContentPane extends VanMapTableDataContentPa
protected SeriesTypeUseComboxPaneWithOutFilter seriesTypeUseComboxPane; protected SeriesTypeUseComboxPaneWithOutFilter seriesTypeUseComboxPane;
public VanAreaMapPlotTableDataContentPane(ChartDataPane parent) { public VanAreaMapPlotTableDataContentPane(ChartDataPane parent) {
super(parent);
this.setLayout(new BorderLayout(0, 4)); this.setLayout(new BorderLayout(0, 4));
initAreaNameCom(); initAreaNameCom();

11
designer-chart/src/main/java/com/fr/van/chart/map/designer/data/contentpane/table/VanMapTableDataContentPane.java

@ -8,10 +8,9 @@ import com.fr.design.dialog.BasicDialog;
import com.fr.design.dialog.DialogActionListener; import com.fr.design.dialog.DialogActionListener;
import com.fr.design.gui.ibutton.UIButton; import com.fr.design.gui.ibutton.UIButton;
import com.fr.design.gui.icombobox.UIComboBox; import com.fr.design.gui.icombobox.UIComboBox;
import com.fr.design.mainframe.chart.gui.ChartDataPane;
import com.fr.design.mainframe.chart.gui.data.table.AbstractTableDataContentPane; import com.fr.design.mainframe.chart.gui.data.table.AbstractTableDataContentPane;
import com.fr.plugin.chart.map.data.MapMatchResult;
import com.fr.plugin.chart.map.VanChartMapPlot; import com.fr.plugin.chart.map.VanChartMapPlot;
import com.fr.plugin.chart.map.data.MapMatchResult;
import com.fr.plugin.chart.map.server.ChartGEOJSONHelper; import com.fr.plugin.chart.map.server.ChartGEOJSONHelper;
import javax.swing.JFrame; import javax.swing.JFrame;
@ -30,8 +29,6 @@ import java.awt.event.ActionListener;
*/ */
public abstract class VanMapTableDataContentPane extends AbstractTableDataContentPane { public abstract class VanMapTableDataContentPane extends AbstractTableDataContentPane {
private ChartDataPane parent;
private VanChartMapPlot plot; private VanChartMapPlot plot;
//钻取地图有层级,默认-1代表无层级关系 //钻取地图有层级,默认-1代表无层级关系
@ -39,11 +36,6 @@ public abstract class VanMapTableDataContentPane extends AbstractTableDataConten
private MapMatchResult matchResult = new MapMatchResult(); private MapMatchResult matchResult = new MapMatchResult();
public VanMapTableDataContentPane(ChartDataPane parent){
this.parent = parent;
}
public void setLevel(int level) { public void setLevel(int level) {
this.level = level; this.level = level;
} }
@ -83,7 +75,6 @@ public abstract class VanMapTableDataContentPane extends AbstractTableDataConten
@Override @Override
public void doOk() { public void doOk() {
pane.updateBean(matchResult); pane.updateBean(matchResult);
parent.attributeChanged();
} }
@Override @Override

Loading…
Cancel
Save