Browse Source

plot 传入条件属性

master
Fangjie Hu 8 years ago
parent
commit
c9502311f9
  1. 8
      designer_base/src/com/fr/design/beans/BasicBeanPane.java
  2. 15
      designer_base/src/com/fr/design/gui/imenutable/UIMenuNameableCreator.java
  3. 14
      designer_chart/src/com/fr/design/chart/series/SeriesCondition/DataSeriesConditionPane.java

8
designer_base/src/com/fr/design/beans/BasicBeanPane.java

@ -23,6 +23,14 @@ public abstract class BasicBeanPane<T> extends BasicPane {
} }
/**
* 设置plot
* @param plot
*/
public void setPlot(Object plot) {
}
/** /**
* 更新权限工具栏面板 * 更新权限工具栏面板
*/ */

15
designer_base/src/com/fr/design/gui/imenutable/UIMenuNameableCreator.java

@ -9,13 +9,20 @@ public class UIMenuNameableCreator implements Nameable{
protected String name; protected String name;
protected Object obj; protected Object obj;
protected Class<? extends BasicBeanPane> paneClazz; protected Class<? extends BasicBeanPane> paneClazz;
protected Object edit;
public UIMenuNameableCreator(String name, Object obj, Class<? extends BasicBeanPane> paneClazz) { public UIMenuNameableCreator(Object edit, String name, Object obj, Class<? extends BasicBeanPane> paneClazz) {
this.edit = edit;
this.name = name; this.name = name;
this.obj = obj; this.obj = obj;
this.paneClazz = paneClazz; this.paneClazz = paneClazz;
} }
public UIMenuNameableCreator(String name, Object obj, Class<? extends BasicBeanPane> paneClazz) {
this(null, name, obj, paneClazz);
}
@Override @Override
public String getName() { public String getName() {
return name; return name;
@ -46,13 +53,15 @@ public class UIMenuNameableCreator implements Nameable{
} catch (IllegalAccessException e) { } catch (IllegalAccessException e) {
FRLogger.getLogger().error("UIMenuNameableCreator IllegalAccessException"); FRLogger.getLogger().error("UIMenuNameableCreator IllegalAccessException");
} }
return new UIMenuNameableCreator(name, cloneObj, this.paneClazz); return new UIMenuNameableCreator(edit, name, cloneObj, this.paneClazz);
} }
public BasicBeanPane getPane() { public BasicBeanPane getPane() {
try { try {
return this.paneClazz.newInstance(); BasicBeanPane pane = this.paneClazz.newInstance();
pane.setPlot(edit);
return pane;
} catch (InstantiationException e) { } catch (InstantiationException e) {
} catch (IllegalAccessException e) { } catch (IllegalAccessException e) {

14
designer_chart/src/com/fr/design/chart/series/SeriesCondition/DataSeriesConditionPane.java

@ -27,13 +27,23 @@ import java.util.Iterator;
* Time : 上午9:16 * Time : 上午9:16
*/ */
public class DataSeriesConditionPane extends ConditionAttributesPane<ConditionAttr> { public class DataSeriesConditionPane extends ConditionAttributesPane<ConditionAttr> {
protected Plot plot;
public DataSeriesConditionPane(Plot plot) {
public DataSeriesConditionPane() { this.plot = plot;
initAvailableActionList(); initAvailableActionList();
initComponents(); initComponents();
} }
@Override
public void setPlot(Object plot) {
this.plot = (Plot) plot;
}
public DataSeriesConditionPane() {
this(null);
}
private void initAvailableActionList() { private void initAvailableActionList() {
addBasicAction(); addBasicAction();
addAxisPositionAction(); addAxisPositionAction();

Loading…
Cancel
Save