Browse Source

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

* commit '0026fe84e06593738eadc4865688d8f0753f36e6':
  CHART-10759 决策报表设计器绘图不调用公式
feature/big-screen
Bjorn 5 years ago
parent
commit
17493a2ec2
  1. 6
      designer-chart/src/main/java/com/fr/design/chart/gui/ChartComponent.java

6
designer-chart/src/main/java/com/fr/design/chart/gui/ChartComponent.java

@ -13,6 +13,8 @@ import com.fr.log.FineLoggerFactory;
import com.fr.script.Calculator; import com.fr.script.Calculator;
import com.fr.stable.core.PropertyChangeListener; import com.fr.stable.core.PropertyChangeListener;
import java.util.ArrayList;
import java.util.List;
import java.awt.Color; import java.awt.Color;
import java.awt.Dimension; import java.awt.Dimension;
import java.awt.Graphics; import java.awt.Graphics;
@ -22,8 +24,6 @@ import java.awt.RenderingHints;
import java.awt.event.MouseEvent; import java.awt.event.MouseEvent;
import java.awt.event.MouseListener; import java.awt.event.MouseListener;
import java.awt.event.MouseMotionListener; import java.awt.event.MouseMotionListener;
import java.util.ArrayList;
import java.util.List;
/** /**
* @author kunsnat E-mail:kunsnat@gmail.com * @author kunsnat E-mail:kunsnat@gmail.com
@ -236,7 +236,7 @@ public class ChartComponent extends MiddleChartComponent implements MouseListene
private void drawChart(Graphics2D g2d) { private void drawChart(Graphics2D g2d) {
if (chartCollection4Design != null) { if (chartCollection4Design != null) {
BaseChartPainter painter = chartCollection4Design.createResultChartPainter(Calculator.createCalculator(), BaseChartPainter painter = chartCollection4Design.createResultChartPainterWithOutDealFormula(Calculator.createCalculator(),
WebChartIDInfo.createEmptyDesignerInfo(), chartWidth, chartHeight); WebChartIDInfo.createEmptyDesignerInfo(), chartWidth, chartHeight);
int resolution = HistoryTemplateListPane.getInstance().getCurrentEditingTemplate().getJTemplateResolution(); int resolution = HistoryTemplateListPane.getInstance().getCurrentEditingTemplate().getJTemplateResolution();

Loading…
Cancel
Save