Entropy
/
design
forked from fanruan/design
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
Browse Source

Merge pull request #1184 in BA/design from ~MANGO/design:release/8.0 to release/8.0 

* commit 'ff3cd152cb4a5d06d42b917552f58db4d4f88d16':
  修改代码检查错误
  修改代码检查错误
  修改一直触发查询bug
  修改一直触发查询bug
  修改一直触发查询bug，整理chartEditPane加载代码。
master
superman 7 years ago
parent
22e4f0b07c ff3cd152cb
commit
d645a250cd
3 changed files with 59 additions and 40 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 2
      designer_chart/src/com/fr/design/mainframe/ChartPropertyPane.java
  2. 61
      designer_chart/src/com/fr/design/mainframe/MiddleChartPropertyPane.java
  3. 36
      designer_chart/src/com/fr/design/mainframe/chart/ChartEditPane.java

2
designer_chart/src/com/fr/design/mainframe/ChartPropertyPane.java
Unescape View File

@ -30,7 +30,7 @@ public class ChartPropertyPane extends MiddleChartPropertyPane{
return new Dimension(super.getPreferredSize().width, 18); return new Dimension(super.getPreferredSize().width, 18);
} }
}; };
nameLabel.setBorder(BorderFactory.createEmptyBorder(0, 0, 1, 0)); nameLabel.setBorder(BorderFactory.createEmptyBorder(0, 0, 1, 0));
nameLabel.setHorizontalAlignment(SwingConstants.CENTER); nameLabel.setHorizontalAlignment(SwingConstants.CENTER);
} }

61
designer_chart/src/com/fr/design/mainframe/MiddleChartPropertyPane.java
Unescape View File

@ -16,6 +16,7 @@ import com.fr.design.gui.itabpane.TitleChangeListener;
import com.fr.design.mainframe.chart.ChartEditPane; import com.fr.design.mainframe.chart.ChartEditPane;
import com.fr.general.Inter; import com.fr.general.Inter;
import com.fr.stable.StableUtils; import com.fr.stable.StableUtils;
import com.fr.stable.StringUtils;
import javax.swing.*; import javax.swing.*;
import java.awt.*; import java.awt.*;
@ -30,11 +31,11 @@ public abstract class MiddleChartPropertyPane extends BaseChartPropertyPane{
public MiddleChartPropertyPane() { public MiddleChartPropertyPane() {
initComponenet(); initComponenet();
} }
protected void initComponenet() { protected void initComponenet() {
this.setLayout(new BorderLayout()); this.setLayout(new BorderLayout());
this.setBorder(null); this.setBorder(null);
createNameLabel(); createNameLabel();
this.add(createNorthComponent(), BorderLayout.NORTH); this.add(createNorthComponent(), BorderLayout.NORTH);
chartEditPane = StableUtils.construct(ChartEditPane.class); chartEditPane = StableUtils.construct(ChartEditPane.class);
@ -47,11 +48,11 @@ public abstract class MiddleChartPropertyPane extends BaseChartPropertyPane{
this.createMainPane(); this.createMainPane();
setSureProperty(); setSureProperty();
} }
protected abstract void createNameLabel(); protected abstract void createNameLabel();
protected abstract JComponent createNorthComponent(); protected abstract JComponent createNorthComponent();
protected abstract void createMainPane(); protected abstract void createMainPane();
@ -64,10 +65,10 @@ public abstract class MiddleChartPropertyPane extends BaseChartPropertyPane{
chartEditPane.setContainer(container); chartEditPane.setContainer(container);
chartEditPane.addTitleChangeListener(titleListener); chartEditPane.addTitleChangeListener(titleListener);
String tabname = chartEditPane.getSelectedTabName(); String tabname = chartEditPane.getSelectedTabName();
nameLabel.setText(Inter.getLocText("Chart-Property_Table") + (tabname != null ? ('-' + chartEditPane.getSelectedTabName()) : "")); nameLabel.setText(Inter.getLocText("Chart-Property_Table") + (tabname != null ? ('-' + chartEditPane.getSelectedTabName()) : StringUtils.EMPTY));
resetChartEditPane(); resetChartEditPane();
} }
protected void resetChartEditPane() { protected void resetChartEditPane() {
remove(chartEditPane); remove(chartEditPane);
add(chartEditPane, BorderLayout.CENTER); add(chartEditPane, BorderLayout.CENTER);
@ -75,20 +76,20 @@ public abstract class MiddleChartPropertyPane extends BaseChartPropertyPane{
repaint(); repaint();
revalidate(); revalidate();
} }
protected TitleChangeListener titleListener = new TitleChangeListener() { protected TitleChangeListener titleListener = new TitleChangeListener() {
@Override @Override
public void fireTitleChange(String addName) { public void fireTitleChange(String addName) {
nameLabel.setText(Inter.getLocText("Chart-Property_Table") + '-' + addName); nameLabel.setText(Inter.getLocText("Chart-Property_Table") + '-' + addName);
} }
}; };
/** /**
* 感觉ChartCollection加载图表属性界面. * 感觉ChartCollection加载图表属性界面.
* @param collection 收集图表 * @param collection 收集图表
* @param ePane 面板 * @param ePane 面板
*/ */
public void populateChartPropertyPane(ChartCollection collection, TargetComponent<?> ePane) { public void populateChartPropertyPane(ChartCollection collection, TargetComponent<?> ePane) {
addChartEditPane(collection.getSelectedChart().getPlot().getPlotID()); addChartEditPane(collection.getSelectedChart().getPlot().getPlotID());
setSupportCellData(true); setSupportCellData(true);
@ -96,11 +97,11 @@ public abstract class MiddleChartPropertyPane extends BaseChartPropertyPane{
chartEditPane.populate(collection); chartEditPane.populate(collection);
} }
/** /**
* 感觉ChartCollection加载图表属性界面. * 感觉ChartCollection加载图表属性界面.
* @param collection 收集图表 * @param collection 收集图表
* @param ePane 面板 * @param ePane 面板
*/ */
public void populateChartPropertyPane(BaseChartCollection collection, TargetComponent<?> ePane) { public void populateChartPropertyPane(BaseChartCollection collection, TargetComponent<?> ePane) {
if (collection instanceof ChartCollection) { if (collection instanceof ChartCollection) {
populateChartPropertyPane((ChartCollection)collection, ePane); populateChartPropertyPane((ChartCollection)collection, ePane);
@ -127,18 +128,18 @@ public abstract class MiddleChartPropertyPane extends BaseChartPropertyPane{
return BaseUtils.readIcon("/com/fr/design/images/m_report/qb.png"); return BaseUtils.readIcon("/com/fr/design/images/m_report/qb.png");
} }
/** /**
* 预定义定位 * 预定义定位
* @return 定位 * @return 定位
*/ */
public Location preferredLocation() { public Location preferredLocation() {
return Location.WEST_BELOW; return Location.WEST_BELOW;
} }
/** /**
* 创建标题Panel * 创建标题Panel
* @return 标题panel * @return 标题panel
*/ */
public UITitlePanel createTitlePanel() { public UITitlePanel createTitlePanel() {
return new UITitlePanel(this); return new UITitlePanel(this);
} }
@ -148,14 +149,14 @@ public abstract class MiddleChartPropertyPane extends BaseChartPropertyPane{
*/ */
public void refreshDockingView() { public void refreshDockingView() {
// TODO Auto-generated method stub // TODO Auto-generated method stub
} }
/** /**
* 设置是否支持单元格数据. * 设置是否支持单元格数据.
*/ */
public void setSupportCellData(boolean supportCellData) { public void setSupportCellData(boolean supportCellData) {
if(chartEditPane != null) { if (chartEditPane != null) {
chartEditPane.setSupportCellData(supportCellData); chartEditPane.setSupportCellData(supportCellData);
} }
} }

36
designer_chart/src/com/fr/design/mainframe/chart/ChartEditPane.java
Unescape View File

@ -6,6 +6,8 @@ import com.fr.chart.chartattr.Chart;
import com.fr.chart.chartattr.ChartCollection; import com.fr.chart.chartattr.ChartCollection;
import com.fr.design.ChartTypeInterfaceManager; import com.fr.design.ChartTypeInterfaceManager;
import com.fr.design.beans.FurtherBasicBeanPane; import com.fr.design.beans.FurtherBasicBeanPane;
import com.fr.design.data.DesignTableDataManager;
import com.fr.design.data.tabledata.Prepare4DataSourceChange;
import com.fr.design.dialog.BasicPane; import com.fr.design.dialog.BasicPane;
import com.fr.design.gui.chart.ChartEditPaneProvider; import com.fr.design.gui.chart.ChartEditPaneProvider;
import com.fr.design.gui.frpane.AttributeChangeListener; import com.fr.design.gui.frpane.AttributeChangeListener;
@ -20,14 +22,17 @@ import com.fr.design.mainframe.chart.gui.ChartTypePane;
import com.fr.general.ComparatorUtils; import com.fr.general.ComparatorUtils;
import com.fr.general.FRLogger; import com.fr.general.FRLogger;
import com.fr.general.Inter; import com.fr.general.Inter;
import com.fr.stable.StringUtils;
import javax.swing.*; import javax.swing.*;
import javax.swing.event.ChangeEvent;
import javax.swing.event.ChangeListener;
import java.awt.*; import java.awt.*;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Calendar; import java.util.Calendar;
import java.util.List; import java.util.List;
public class ChartEditPane extends BasicPane implements AttributeChange, ChartEditPaneProvider { public class ChartEditPane extends BasicPane implements AttributeChange, Prepare4DataSourceChange, ChartEditPaneProvider {
private final static int CHANGE_MIN_TIME = 80; private final static int CHANGE_MIN_TIME = 80;
@ -65,9 +70,7 @@ public class ChartEditPane extends BasicPane implements AttributeChange, ChartEd
paneList.add(otherPane); paneList.add(otherPane);
createTabsPane(); createTabsPane();
registerDSChangeListener();
//TableDataComboBox 中有注册DSChangeListener，这里没有必要再次注册。
//registerDSChangeListener();
} }
//构建主面板 //构建主面板
@ -140,7 +143,7 @@ public class ChartEditPane extends BasicPane implements AttributeChange, ChartEd
addTypePane(); addTypePane();
boolean isDefault = true; boolean isDefault = true;
String plotID = ""; String plotID = StringUtils.EMPTY;
if (currentChart.getPlot() != null) { if (currentChart.getPlot() != null) {
plotID = currentChart.getPlot().getPlotID(); plotID = currentChart.getPlot().getPlotID();
isDefault = ChartTypeInterfaceManager.getInstance().isUseDefaultPane(plotID); isDefault = ChartTypeInterfaceManager.getInstance().isUseDefaultPane(plotID);
@ -177,6 +180,7 @@ public class ChartEditPane extends BasicPane implements AttributeChange, ChartEd
} }
protected void setSelectedTab() { protected void setSelectedTab() {
//doNothing
} }
/** /**
@ -222,7 +226,7 @@ public class ChartEditPane extends BasicPane implements AttributeChange, ChartEd
return; return;
} }
if (checkNeedsReLayout(collection.getSelectedChart())) { if (isNeedsReLayout(collection.getSelectedChart())) {
reLayout(collection.getSelectedChart()); reLayout(collection.getSelectedChart());
} }
@ -263,7 +267,7 @@ public class ChartEditPane extends BasicPane implements AttributeChange, ChartEd
} }
//populate的时候看看要不要重构面板 //populate的时候看看要不要重构面板
private boolean checkNeedsReLayout(Chart chart) { private boolean isNeedsReLayout(Chart chart) {
if (chart != null) { if (chart != null) {
int lastIndex = typePane.getSelectedIndex(); int lastIndex = typePane.getSelectedIndex();
int currentIndex = getSelectedChartIndex(chart); int currentIndex = getSelectedChartIndex(chart);
@ -315,7 +319,7 @@ public class ChartEditPane extends BasicPane implements AttributeChange, ChartEd
} }
protected void dealWithStyleChange() { protected void dealWithStyleChange() {
//doNothing
} }
/** /**
@ -324,7 +328,7 @@ public class ChartEditPane extends BasicPane implements AttributeChange, ChartEd
* @param isFromToolBar 是否来自工具栏 * @param isFromToolBar 是否来自工具栏
*/ */
public void styleChange(boolean isFromToolBar) { public void styleChange(boolean isFromToolBar) {
//doNothing
} }
/** /**
@ -336,4 +340,18 @@ public class ChartEditPane extends BasicPane implements AttributeChange, ChartEd
paneList.get(index).addAttributeChangeListener(listener); paneList.get(index).addAttributeChangeListener(listener);
} }
/**
* 数据集改变的事件监听
*/
public void registerDSChangeListener() {
DesignTableDataManager.addDsChangeListener(new ChangeListener() {
public void stateChanged(ChangeEvent e) {
AbstractChartAttrPane attrPane = paneList.get(tabsHeaderIconPane.getSelectedIndex());
//不显示，没有处于编辑状态，没必要更新。
if (attrPane.isShowing()) {
attrPane.refreshChartDataPane(collection);
}
}
});
}
} }
Write Preview
Loading…
Cancel
Save