Browse Source

Merge branch 'release/9.0' of http://www.finedevelop.com:2015/scm/~zheng/design into release/9.0

master
fr_shine 7 years ago
parent
commit
41053d9a9e
  1. 11
      designer_chart/src/com/fr/plugin/chart/bubble/VanChartBubbleInteractivePane.java
  2. 59
      designer_chart/src/com/fr/plugin/chart/designer/component/VanChartUIListControlPane.java
  3. 7
      designer_chart/src/com/fr/plugin/chart/designer/other/VanChartInteractivePane.java
  4. 10
      designer_chart/src/com/fr/plugin/chart/structure/desinger/StructureIndependentVanChartInterface.java
  5. 8
      designer_chart/src/com/fr/plugin/chart/wordcloud/designer/WordCloudIndependentVanChartInterface.java

11
designer_chart/src/com/fr/plugin/chart/bubble/VanChartBubbleInteractivePane.java

@ -1,14 +1,10 @@
package com.fr.plugin.chart.bubble;
import com.fr.chart.chartattr.Plot;
import com.fr.design.gui.ibutton.UIButtonGroup;
import com.fr.general.Inter;
import com.fr.plugin.chart.base.VanChartConstants;
import com.fr.plugin.chart.designer.TableLayout4VanChartHelper;
import com.fr.plugin.chart.designer.other.VanChartInteractivePaneWithOutSort;
import javax.swing.*;
/**
* Created by Mitisky on 16/3/31.
*/
@ -29,11 +25,4 @@ public class VanChartBubbleInteractivePane extends VanChartInteractivePaneWithOu
return super.getValueArray();
}
@Override
protected JPanel getzoomTypePane(UIButtonGroup zoomType) {
if (((VanChartBubblePlot)chart.getPlot()).isForceBubble()) {
return TableLayout4VanChartHelper.createGapTableLayoutPane(Inter.getLocText("Plugin-ChartF_ZoomType"), zoomType);
}
return super.getzoomTypePane(zoomType);
}
}

59
designer_chart/src/com/fr/plugin/chart/designer/component/VanChartUIListControlPane.java

@ -2,6 +2,8 @@ package com.fr.plugin.chart.designer.component;
import com.fr.base.chart.BasePlot;
import com.fr.chart.chartattr.Plot;
import com.fr.design.event.UIObserver;
import com.fr.design.event.UIObserverListener;
import com.fr.design.gui.controlpane.UIListControlPane;
import com.fr.design.gui.ibutton.UIButton;
import com.fr.design.gui.ilable.UILabel;
@ -16,6 +18,8 @@ import com.fr.plugin.chart.designer.TableLayout4VanChartHelper;
import com.fr.stable.Nameable;
import javax.swing.*;
import javax.swing.event.ChangeEvent;
import javax.swing.event.ChangeListener;
import java.awt.*;
import java.awt.event.ActionEvent;
import java.awt.event.ActionListener;
@ -24,16 +28,67 @@ import java.awt.event.ActionListener;
* Created by mengao on 2017/9/8.
* 新图表UIListControlPane基础面板
*/
public abstract class VanChartUIListControlPane extends UIListControlPane {
public abstract class VanChartUIListControlPane extends UIListControlPane implements UIObserver {
private UIObserverListener uiObserverListener;
public VanChartUIListControlPane() {
super();
this.setBorder(null);
iniListener();
}
public VanChartUIListControlPane(BasePlot plot) {
super(plot);
this.setBorder(null);
iniListener();
}
/**
* 注册观察者监听事件
* @param listener 观察者监听事件
*/
@Override
public void registerChangeListener(UIObserverListener listener) {
uiObserverListener = listener;
}
@Override
public boolean shouldResponseChangeListener() {
return true;
}
private void iniListener() {
if (shouldResponseChangeListener()) {
this.addChangeListener(new ChangeListener() {
@Override
public void stateChanged(ChangeEvent e) {
if (uiObserverListener == null) {
return;
}
uiObserverListener.doChange();
}
});
}
}
protected void fireChanged() {
Object[] listeners = listenerList.getListenerList();
for (int i = listeners.length - 2; i >= 0; i -= 2) {
if (listeners[i] == ChangeListener.class) {
((ChangeListener) listeners[i + 1]).stateChanged(new ChangeEvent(this));
}
}
}
/**
* 增加监听事件
* @param l 监听的对象
*/
public void addChangeListener(ChangeListener l) {
this.listenerList.add(ChangeListener.class, l);
}
@Override
@ -55,7 +110,7 @@ public abstract class VanChartUIListControlPane extends UIListControlPane {
return;
}
update((Plot) plot);
DesignerContext.getDesignerFrame().getSelectedJTemplate().fireTargetModified();
fireChanged();//图表属性改变,响应事件
}
protected abstract void update(Plot plot);

7
designer_chart/src/com/fr/plugin/chart/designer/other/VanChartInteractivePane.java

@ -142,10 +142,9 @@ public class VanChartInteractivePane extends AbstractVanChartScrollPane<Chart> {
return TableLayout4VanChartHelper.createExpandablePaneWithTitle(Inter.getLocText("Chart-Use_Zoom"), panel);
}
protected JPanel getzoomTypePane(UIButtonGroup zoomType) {
JPanel panel = TableLayout4VanChartHelper.createGapTableLayoutPane(Inter.getLocText("Plugin-ChartF_ZoomType"), zoomType, TableLayout4VanChartHelper.SECOND_EDIT_AREA_WIDTH);
panel.setBorder(BorderFactory.createEmptyBorder(0,12,0,0));
return panel;
return TableLayout4VanChartHelper.createGapTableLayoutPane(Inter.getLocText("Plugin-ChartF_ZoomType"), zoomType);
}
protected JPanel createZoomPaneContent(JPanel zoomWidgetPane, JPanel zoomGesturePane, JPanel changeEnablePane, JPanel zoomTypePane, VanChartPlot plot) {
@ -245,7 +244,7 @@ public class VanChartInteractivePane extends AbstractVanChartScrollPane<Chart> {
private void checkZoomPane() {
boolean zoomWidgetEnabled = zoomWidget.getSelectedIndex() == 0;
changeEnablePane.setVisible(zoomWidgetEnabled);
zoomTypePane.setVisible(!zoomWidgetEnabled);
zoomType.setEnabled(!zoomWidgetEnabled);
}
@Override

10
designer_chart/src/com/fr/plugin/chart/structure/desinger/StructureIndependentVanChartInterface.java

@ -5,7 +5,6 @@ import com.fr.chart.chartattr.Plot;
import com.fr.design.beans.BasicBeanPane;
import com.fr.design.condition.ConditionAttributesPane;
import com.fr.design.gui.frpane.AttributeChangeListener;
import com.fr.design.gui.ibutton.UIButtonGroup;
import com.fr.design.mainframe.chart.AbstractChartAttrPane;
import com.fr.design.mainframe.chart.gui.ChartDataPane;
import com.fr.design.mainframe.chart.gui.ChartStylePane;
@ -14,7 +13,6 @@ import com.fr.design.mainframe.chart.gui.data.table.AbstractTableDataContentPane
import com.fr.design.mainframe.chart.gui.type.AbstractChartTypePane;
import com.fr.general.Inter;
import com.fr.plugin.chart.base.VanChartConstants;
import com.fr.plugin.chart.designer.TableLayout4VanChartHelper;
import com.fr.plugin.chart.designer.other.VanChartInteractivePaneWithOutSort;
import com.fr.plugin.chart.designer.other.VanChartOtherPane;
import com.fr.plugin.chart.designer.style.VanChartStylePane;
@ -25,8 +23,6 @@ import com.fr.plugin.chart.structure.desinger.style.VanChartStructureSeriesPane;
import com.fr.plugin.chart.structure.desinger.type.VanChartStructureTypePane;
import com.fr.plugin.chart.vanchart.AbstractIndependentVanChartUI;
import javax.swing.*;
/**
* Created by shine on 2017/2/15.
*/
@ -64,12 +60,6 @@ public class StructureIndependentVanChartInterface extends AbstractIndependentVa
protected BasicBeanPane<Chart> createInteractivePane() {
return new VanChartInteractivePaneWithOutSort(){
@Override
protected JPanel getzoomTypePane(UIButtonGroup zoomType) {
JPanel panel = TableLayout4VanChartHelper.createGapTableLayoutPane(Inter.getLocText("Plugin-ChartF_ZoomType"), zoomType);
return panel;
}
@Override
protected String[] getNameArray() {
return new String[]{Inter.getLocText("Plugin-ChartF_XYAxis"), Inter.getLocText("Chart-Use_None")};

8
designer_chart/src/com/fr/plugin/chart/wordcloud/designer/WordCloudIndependentVanChartInterface.java

@ -6,7 +6,6 @@ import com.fr.design.beans.BasicBeanPane;
import com.fr.design.condition.ConditionAttributesPane;
import com.fr.design.dialog.BasicPane;
import com.fr.design.gui.frpane.AttributeChangeListener;
import com.fr.design.gui.ibutton.UIButtonGroup;
import com.fr.design.mainframe.chart.AbstractChartAttrPane;
import com.fr.design.mainframe.chart.gui.ChartDataPane;
import com.fr.design.mainframe.chart.gui.ChartStylePane;
@ -15,7 +14,6 @@ import com.fr.design.mainframe.chart.gui.data.table.AbstractTableDataContentPane
import com.fr.design.mainframe.chart.gui.type.AbstractChartTypePane;
import com.fr.general.Inter;
import com.fr.plugin.chart.base.VanChartConstants;
import com.fr.plugin.chart.designer.TableLayout4VanChartHelper;
import com.fr.plugin.chart.designer.other.VanChartInteractivePaneWithOutSort;
import com.fr.plugin.chart.designer.other.VanChartOtherPane;
import com.fr.plugin.chart.designer.style.VanChartStylePane;
@ -26,7 +24,6 @@ import com.fr.plugin.chart.wordcloud.designer.other.VanChartWordCloudConditionPa
import com.fr.plugin.chart.wordcloud.designer.style.VanChartWordCloudSeriesPane;
import com.fr.plugin.chart.wordcloud.designer.type.VanChartWordCloudTypePane;
import javax.swing.*;
import java.util.List;
/**
@ -87,11 +84,6 @@ public class WordCloudIndependentVanChartInterface extends AbstractIndependentVa
@Override
protected BasicBeanPane<Chart> createInteractivePane() {
return new VanChartInteractivePaneWithOutSort(){
@Override
protected JPanel getzoomTypePane(UIButtonGroup zoomType) {
JPanel panel = TableLayout4VanChartHelper.createGapTableLayoutPane(Inter.getLocText("Plugin-ChartF_ZoomType"), zoomType);
return panel;
}
@Override
protected String[] getNameArray() {

Loading…
Cancel
Save