Browse Source

CHART-21570 fix:fvs.cpt.chart 默认自动

final/11.0
shine 3 years ago
parent
commit
9e8e2ea32b
  1. 6
      designer-chart/src/main/java/com/fr/van/chart/designer/type/AbstractVanChartTypePane.java
  2. 18
      designer-chart/src/main/java/com/fr/van/chart/map/designer/type/GisLayerPane.java

6
designer-chart/src/main/java/com/fr/van/chart/designer/type/AbstractVanChartTypePane.java

@ -153,9 +153,9 @@ public abstract class AbstractVanChartTypePane extends AbstractChartTypePane<Van
//切换类型埋点
ChartInfoCollector.getInstance().updateChartTypeTime(chart, oldPlot.getPlotID());
}
if (!ChartEditContext.supportTheme()) {
chart.setAutoThemeCustom();
}
// if (!ChartEditContext.supportTheme()) {
// chart.setAutoThemeCustom();
// }
if (!acceptDefinition(chart.getChartDataDefinition(), newPlot)) {
chart.setChartDataDefinition(null);
}

18
designer-chart/src/main/java/com/fr/van/chart/map/designer/type/GisLayerPane.java

@ -238,18 +238,18 @@ public class GisLayerPane extends JPanel implements UIObserver {
public void resetGisLayer(VanChartMapPlot mapPlot) {
if (ChartEditContext.supportTheme()) {
// if (ChartEditContext.supportTheme()) {
GisLayer defaultGisLayer = mapPlot.getDefaultGisLayer();
mapPlot.setGisLayer(defaultGisLayer);
populate(defaultGisLayer);
} else {
GaoDeGisType gaoDeGisType = mapPlot.getDefaultGisLayerType();
mapPlot.getGisLayer().setGisLayerType(GISLayerType.GAO_DE_API);
mapPlot.getGisLayer().setLayerName(gaoDeGisType.getTypeName());
mapPlot.getGisLayer().setGaoDeGisType(gaoDeGisType);
populate(mapPlot.getGisLayer());
}
// } else {
// GaoDeGisType gaoDeGisType = mapPlot.getDefaultGisLayerType();
//
// mapPlot.getGisLayer().setGisLayerType(GISLayerType.GAO_DE_API);
// mapPlot.getGisLayer().setLayerName(gaoDeGisType.getTypeName());
// mapPlot.getGisLayer().setGaoDeGisType(gaoDeGisType);
// populate(mapPlot.getGisLayer());
// }
}
public void populate(GisLayer layer) {

Loading…
Cancel
Save