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

Merge pull request #1195 in BA/design from ~MANGO/m_design:release/9.0 to release/9.0 

* commit '01f94cea09f42dc3ca228a75ec3f2a1d0277fefa':
  修复间隔背景bug
  条件显示，超链等弹出面板整理
  去掉新图表超链中名字输入框
  去掉新图表超链中名字输入框
  修改组合图问题
  修改条件属性类名称
  修改换行符
  修改9.0问题
master
superman 7 years ago
parent
9d4f8dbb97 01f94cea09
commit
94f783b546
24 changed files with 472 additions and 336 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 28
      designer_chart/src/com/fr/design/chart/javascript/ChartEmailPane.java
  2. 2
      designer_chart/src/com/fr/design/chart/series/PlotSeries/MapGroupExtensionPane.java
  3. 2
      designer_chart/src/com/fr/design/chart/series/SeriesCondition/impl/ChartHyperPopAttrPane.java
  4. 2
      designer_chart/src/com/fr/design/chart/series/SeriesCondition/impl/ChartHyperPoplinkPane.java
  5. 10
      designer_chart/src/com/fr/design/mainframe/chart/gui/UIEditLabel.java
  6. 31
      designer_chart/src/com/fr/design/mainframe/chart/gui/other/ChartInteractivePane.java
  7. 16
      designer_chart/src/com/fr/design/mainframe/chart/gui/style/ChartDatapointLabelPane.java
  8. 5
      designer_chart/src/com/fr/plugin/chart/area/VanChartAreaSeriesPane.java
  9. 111
      designer_chart/src/com/fr/plugin/chart/custom/component/VanChartHyperLinkPane.java
  10. 5
      designer_chart/src/com/fr/plugin/chart/custom/style/VanChartCustomSeriesPane.java
  11. 1
      designer_chart/src/com/fr/plugin/chart/designer/AbstractVanChartScrollPane.java
  12. 133
      designer_chart/src/com/fr/plugin/chart/designer/component/VanChartUIListControlPane.java
  13. 2
      designer_chart/src/com/fr/plugin/chart/designer/component/format/VanChartFormatPaneWithCheckBox.java
  14. 22
      designer_chart/src/com/fr/plugin/chart/designer/other/AutoRefreshPane.java
  15. 7
      designer_chart/src/com/fr/plugin/chart/designer/other/AutoRefreshPaneWithoutTooltip.java
  16. 339
      designer_chart/src/com/fr/plugin/chart/designer/other/HyperlinkMapFactory.java
  17. 2
      designer_chart/src/com/fr/plugin/chart/designer/other/VanChartConditionAttrContentPane.java
  18. 20
      designer_chart/src/com/fr/plugin/chart/designer/other/VanChartConditionListControlPane.java
  19. 17
      designer_chart/src/com/fr/plugin/chart/designer/style/background/AlertLineListControlPane.java
  20. 22
      designer_chart/src/com/fr/plugin/chart/designer/style/background/BackgroundListControlPane.java
  21. 6
      designer_chart/src/com/fr/plugin/chart/designer/style/background/VanChartAxisAreaPane.java
  22. 1
      designer_chart/src/com/fr/plugin/chart/designer/style/background/VanChartCustomIntervalBackgroundPane.java
  23. 20
      designer_chart/src/com/fr/plugin/chart/designer/style/series/VanChartAbstractPlotSeriesPane.java
  24. 4
      designer_chart/src/com/fr/plugin/chart/funnel/designer/style/VanChartFunnelSeriesPane.java

28
designer_chart/src/com/fr/design/chart/javascript/ChartEmailPane.java
Unescape View File

@ -1,9 +1,5 @@
package com.fr.design.chart.javascript;
import javax.swing.JComponent;
import javax.swing.JScrollPane;
import javax.swing.SwingConstants;
import com.fr.design.gui.icheckbox.UICheckBox;
import com.fr.design.gui.ilable.UILabel;
import com.fr.design.gui.itextfield.UITextField;
@ -14,6 +10,9 @@ import com.fr.design.mainframe.JTemplate;
import com.fr.general.Inter;
import com.fr.js.EmailJavaScript;
import javax.swing.*;
import java.awt.*;
/**
*
* @author jim
@ -30,11 +29,11 @@ public class ChartEmailPane extends EmailPane{
JTemplate jTemplate = DesignerContext.getDesignerFrame().getSelectedJTemplate();
// 是否支持导出控制图表的超链邮件是否显示showTplContent
boolean supportExport = jTemplate.isJWorkBook();
JPanel contentPane;
if (supportExport) {
double[] rSizes = { preferred, preferred, preferred, preferred, preferred, preferred, fill, preferred, preferred};
double[] rSizes = { preferred, preferred, preferred, preferred, preferred, fill, preferred, preferred};
showTplContent = new UICheckBox(Inter.getLocText("Email-Can_Preview_Report_Content"));
centerPane = TableLayoutHelper.createCommonTableLayoutPane(new JComponent[][]{
{new UILabel(Inter.getLocText("Name") + ":", SwingConstants.RIGHT), itemNameTextField},
contentPane = TableLayoutHelper.createCommonTableLayoutPane(new JComponent[][]{
{new UILabel(), tipsPane1},
createLinePane(Inter.getLocText("HJS-Mail_to"), maitoEditor = new UITextField()),
createLinePane(Inter.getLocText("HJS-CC_to"), ccEditor = new UITextField()),
@ -44,8 +43,8 @@ public class ChartEmailPane extends EmailPane{
{new UILabel(), showTplContent},
{new UILabel(), tipsPane2}},rSizes, columnSize, 6);
} else {
double[] rSizes = { preferred, preferred, preferred, preferred, preferred, preferred, fill, preferred};
centerPane = TableLayoutHelper.createCommonTableLayoutPane(new JComponent[][]{
double[] rSizes = { preferred, preferred, preferred, preferred, preferred, fill, preferred};
contentPane = TableLayoutHelper.createCommonTableLayoutPane(new JComponent[][]{
{new UILabel(Inter.getLocText("Name") + ":", SwingConstants.RIGHT), itemNameTextField},
{new UILabel(), tipsPane1},
createLinePane(Inter.getLocText("HJS-Mail_to"), maitoEditor = new UITextField()),
@ -55,6 +54,17 @@ public class ChartEmailPane extends EmailPane{
{mainTextLabel, scrollPane},
{new UILabel(), tipsPane2}},rSizes, columnSize, 8);
}
centerPane = new JPanel(new BorderLayout());
if (needRenamePane()) {
JPanel namePane = TableLayoutHelper.createCommonTableLayoutPane(new JComponent[][]{{new UILabel(Inter.getLocText("Name") + ":", SwingConstants.RIGHT), itemNameTextField},},
new double[] {preferred}, columnSize, 6);
centerPane.add(namePane, BorderLayout.NORTH);
}
centerPane.add(contentPane, BorderLayout.CENTER);
}
protected boolean needRenamePane() {
return true;
}
protected void checkEmailConfig(boolean valid) {

2
designer_chart/src/com/fr/design/chart/series/PlotSeries/MapGroupExtensionPane.java
Unescape View File

@ -56,7 +56,7 @@ public class MapGroupExtensionPane extends BasicPane implements UIObserver {
private static final int STATE = 2;
private static final int USER = 3;
private static final int OFFSET_X = 800;
private static final int OFFSET_Y = 280;
private static final int OFFSET_Y = 250;
private UIGroupExtensionPane groupExtensionPane;
private UIButton addButton;

2
designer_chart/src/com/fr/design/chart/series/SeriesCondition/impl/ChartHyperPopAttrPane.java
Unescape View File

@ -147,7 +147,7 @@ public class ChartHyperPopAttrPane extends AbstractChartAttrPane {
* @return 标题
*/
public String title4PopupWindow() {
return Inter.getLocText("FR-Hyperlink_ChartHyperlink");
return Inter.getLocText("Plugin-ChartF_Hyperlink");
}
}

2
designer_chart/src/com/fr/design/chart/series/SeriesCondition/impl/ChartHyperPoplinkPane.java
Unescape View File

@ -45,7 +45,7 @@ public class ChartHyperPoplinkPane extends BasicBeanPane<ChartHyperPoplink> {
ChartCollection cc = createChartCollection();
chartComponent = new ChartComponent();
chartComponent.setPreferredSize(new Dimension(200, 170));// 在单元格弹出时 需要调整保证属性表的大小.
chartComponent.setPreferredSize(new Dimension(300, 170));// 在单元格弹出时 需要调整保证属性表的大小.
chartComponent.setSupportEdit(false);
chartComponent.populate(cc);

10
designer_chart/src/com/fr/design/mainframe/chart/gui/UIEditLabel.java
Unescape View File

@ -16,7 +16,11 @@ import javax.swing.*;
import javax.swing.event.DocumentEvent;
import javax.swing.event.DocumentListener;
import java.awt.*;
import java.awt.event.*;
import java.awt.event.AWTEventListener;
import java.awt.event.KeyAdapter;
import java.awt.event.KeyEvent;
import java.awt.event.MouseAdapter;
import java.awt.event.MouseEvent;
/**
* Created by IntelliJ IDEA.
@ -126,7 +130,7 @@ public class UIEditLabel extends JPanel implements UIObserver{
*/
public void mouseExited(MouseEvent e) {
showLabel.setToolTipText(getTooltip());
UIEditLabel.this.setBackground(UIConstants.NORMAL_BACKGROUND);
UIEditLabel.this.setBackground(UIConstants.SELECT_TAB);
}
});
@ -149,7 +153,7 @@ public class UIEditLabel extends JPanel implements UIObserver{
* 设置成正常的背景
*/
public void resetNomalrBackground(){
UIEditLabel.this.setBackground(UIConstants.NORMAL_BACKGROUND);
UIEditLabel.this.setBackground(UIConstants.SELECT_TAB);
}
private String getTooltip(){

31
designer_chart/src/com/fr/design/mainframe/chart/gui/other/ChartInteractivePane.java
Unescape View File

@ -6,7 +6,16 @@ import com.fr.base.chart.chartdata.TopDefinitionProvider;
import com.fr.chart.base.AttrContents;
import com.fr.chart.base.ChartConstants;
import com.fr.chart.base.TimeSwitchAttr;
import com.fr.chart.chartattr.*;
import com.fr.chart.chartattr.BubblePlot;
import com.fr.chart.chartattr.Chart;
import com.fr.chart.chartattr.GanttPlot;
import com.fr.chart.chartattr.GisMapPlot;
import com.fr.chart.chartattr.MapPlot;
import com.fr.chart.chartattr.MeterPlot;
import com.fr.chart.chartattr.PiePlot;
import com.fr.chart.chartattr.Plot;
import com.fr.chart.chartattr.StockPlot;
import com.fr.chart.chartattr.XYScatterPlot;
import com.fr.chart.chartdata.GisMapReportDefinition;
import com.fr.chart.chartdata.GisMapTableDefinition;
import com.fr.chart.web.ChartHyperPoplink;
@ -39,7 +48,16 @@ import com.fr.design.layout.TableLayoutHelper;
import com.fr.design.mainframe.chart.gui.ChartOtherPane;
import com.fr.design.utils.gui.GUICoreUtils;
import com.fr.general.Inter;
import com.fr.js.*;
import com.fr.js.EmailJavaScript;
import com.fr.js.FormHyperlinkProvider;
import com.fr.js.JavaScript;
import com.fr.js.JavaScriptImpl;
import com.fr.js.NameJavaScript;
import com.fr.js.NameJavaScriptGroup;
import com.fr.js.ParameterJavaScript;
import com.fr.js.ReportletHyperlink;
import com.fr.js.WebHyperlink;
import com.fr.plugin.chart.designer.component.format.FormatPaneWithOutFont;
import com.fr.stable.Constants;
import com.fr.stable.StringUtils;
import com.fr.stable.bridge.StableFactory;
@ -48,7 +66,12 @@ import com.fr.third.org.hsqldb.lib.Iterator;
import javax.swing.*;
import java.awt.*;
import java.awt.event.*;
import java.awt.event.ActionEvent;
import java.awt.event.ActionListener;
import java.awt.event.ItemEvent;
import java.awt.event.ItemListener;
import java.awt.event.MouseAdapter;
import java.awt.event.MouseEvent;
import java.text.DecimalFormat;
import java.text.Format;
import java.util.ArrayList;
@ -215,7 +238,7 @@ public class ChartInteractivePane extends BasicScrollPane<Chart> implements UIOb
@Override
public void mouseClicked(MouseEvent e) {
if (percentFormatPane == null) {
percentFormatPane = new FormatPane();
percentFormatPane = new FormatPaneWithOutFont();
}
DecimalFormat defaultFormat = new CoreDecimalFormat(new DecimalFormat(), "#.##%");

16
designer_chart/src/com/fr/design/mainframe/chart/gui/style/ChartDatapointLabelPane.java
Unescape View File

@ -9,6 +9,7 @@ import com.fr.chart.base.ChartConstants;
import com.fr.chart.base.DataSeriesCondition;
import com.fr.chart.chartattr.Plot;
import com.fr.design.constants.LayoutConstants;
import com.fr.design.dialog.BasicPane;
import com.fr.design.gui.frpane.UIBubbleFloatPane;
import com.fr.design.gui.ibutton.UIButton;
import com.fr.design.gui.icheckbox.UICheckBox;
@ -18,15 +19,20 @@ import com.fr.design.gui.style.FormatPane;
import com.fr.design.layout.TableLayout;
import com.fr.design.layout.TableLayoutHelper;
import com.fr.design.mainframe.chart.gui.ChartStylePane;
import com.fr.design.dialog.BasicPane;
import com.fr.general.FRFont;
import com.fr.general.Inter;
import com.fr.plugin.chart.designer.component.format.FormatPaneWithOutFont;
import com.fr.stable.Constants;
import com.fr.stable.StringUtils;
import javax.swing.*;
import java.awt.*;
import java.awt.event.*;
import java.awt.event.ActionEvent;
import java.awt.event.ActionListener;
import java.awt.event.ItemEvent;
import java.awt.event.ItemListener;
import java.awt.event.MouseAdapter;
import java.awt.event.MouseEvent;
import java.text.DecimalFormat;
import java.text.Format;
import java.util.HashMap;
@ -226,7 +232,7 @@ public class ChartDatapointLabelPane extends BasicPane{
}
if(valueFormatPane == null) {
valueFormatPane = new FormatPane();
valueFormatPane = new FormatPaneWithOutFont();
}
Point comPoint = valueFormatButton.getLocationOnScreen();
Point arrowPoint = new Point(comPoint.x + valueFormatButton.getWidth(), comPoint.y + valueFormatButton.getHeight());
@ -255,7 +261,7 @@ public class ChartDatapointLabelPane extends BasicPane{
}
if(percentFormatPane == null) {
percentFormatPane = new FormatPane();
percentFormatPane = new FormatPaneWithOutFont();
}
Point comPoint = valuePercentFormatButton.getLocationOnScreen();
Point arrowPoint = new Point(comPoint.x + valuePercentFormatButton.getWidth(), comPoint.y + valuePercentFormatButton.getHeight());
@ -429,7 +435,7 @@ public class ChartDatapointLabelPane extends BasicPane{
protected void updatePercentFormatpane(){
if(isValuePercent!= null && isValuePercent.isSelected()){
if(this.percentFormatPane == null){
this.percentFormatPane = new FormatPane();
this.percentFormatPane = new FormatPaneWithOutFont();
}
if(this.percentFormat == null){
DecimalFormat defaultFormat = new CoreDecimalFormat(new DecimalFormat("#.##%"), "#.##%");

5
designer_chart/src/com/fr/plugin/chart/area/VanChartAreaSeriesPane.java
Unescape View File

@ -40,11 +40,6 @@ public class VanChartAreaSeriesPane extends VanChartLineSeriesPane{
return contentPane;
}
//设置色彩面板内容
protected void setColorPaneContent (JPanel panel) {
panel.add(createStylePane(), BorderLayout.CENTER);
}
protected Class<? extends BasicBeanPane> getStackAndAxisPaneClass() {
return VanChartCustomStackAndAxisConditionPane.class;
}

111
designer_chart/src/com/fr/plugin/chart/custom/component/VanChartHyperLinkPane.java
Unescape View File

@ -6,18 +6,12 @@ import com.fr.chart.web.ChartHyperRelateCellLink;
import com.fr.chart.web.ChartHyperRelateFloatLink;
import com.fr.design.ExtraDesignClassManager;
import com.fr.design.beans.BasicBeanPane;
import com.fr.design.chart.javascript.ChartEmailPane;
import com.fr.design.designer.TargetComponent;
import com.fr.design.fun.HyperlinkProvider;
import com.fr.design.gui.controlpane.NameObjectCreator;
import com.fr.design.gui.controlpane.NameableCreator;
import com.fr.design.gui.controlpane.UIListControlPane;
import com.fr.design.gui.ibutton.UIButton;
import com.fr.design.gui.imenutable.UIMenuNameableCreator;
import com.fr.design.layout.FRGUIPaneFactory;
import com.fr.design.mainframe.DesignerContext;
import com.fr.design.module.DesignModuleFactory;
import com.fr.design.utils.gui.GUICoreUtils;
import com.fr.general.Inter;
import com.fr.general.NameObject;
import com.fr.js.EmailJavaScript;
@ -29,16 +23,12 @@ import com.fr.js.NameJavaScriptGroup;
import com.fr.js.ParameterJavaScript;
import com.fr.js.ReportletHyperlink;
import com.fr.js.WebHyperlink;
import com.fr.plugin.chart.attr.plot.VanChartPlot;
import com.fr.plugin.chart.designer.component.VanChartUIListControlPane;
import com.fr.plugin.chart.designer.other.HyperlinkMapFactory;
import com.fr.stable.ListMap;
import com.fr.stable.Nameable;
import com.fr.stable.bridge.StableFactory;
import javax.swing.*;
import java.awt.*;
import java.awt.event.ActionEvent;
import java.awt.event.ActionListener;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.Map;
@ -47,7 +37,7 @@ import java.util.Set;
/**
* Created by Fangjie on 2016/4/28.
*/
public class VanChartHyperLinkPane extends UIListControlPane {
public class VanChartHyperLinkPane extends VanChartUIListControlPane {
public VanChartHyperLinkPane() {
super();
@ -115,19 +105,7 @@ public class VanChartHyperLinkPane extends UIListControlPane {
return new NameJavaScriptGroup(res_array);
}
@Override
public void saveSettings() {
if (isPopulating) {
return;
}
update((VanChartPlot) plot);
}
public void populate(Plot plot) {
//特殊处理，使用instanceof判断，处理连续弹窗问题
if (SwingUtilities.getWindowAncestor(this) instanceof JDialog) {
popupEditDialog = new HyperDialog(cardPane);
}
this.plot = plot;
HashMap paneMap = getHyperlinkMap(plot);
@ -207,7 +185,7 @@ public class VanChartHyperLinkPane extends UIListControlPane {
list.add(new UIMenuNameableCreator(Inter.getLocText("Chart-Link_Reportlet"),
new ReportletHyperlink(), getUseMap(map, ReportletHyperlink.class)));
list.add(new UIMenuNameableCreator(Inter.getLocText("Chart-Link_Mail"), new EmailJavaScript(), ChartEmailPane.class));
list.add(new UIMenuNameableCreator(Inter.getLocText("Chart-Link_Mail"), new EmailJavaScript(), HyperlinkMapFactory.VanChartEmailPane.class));
list.add(new UIMenuNameableCreator(Inter.getLocText("Chart-Link_Web"),
new WebHyperlink(), getUseMap(map, WebHyperlink.class)));
list.add(new UIMenuNameableCreator(Inter.getLocText("Chart-Link_Dynamic_Parameters"),
@ -240,87 +218,4 @@ public class VanChartHyperLinkPane extends UIListControlPane {
}
return null;
}
protected void popupEditDialog(Point mousePos) {
//特殊处理，处理连续弹窗情况
if (SwingUtilities.getWindowAncestor(this) instanceof JDialog) {
GUICoreUtils.centerWindow(popupEditDialog);
popupEditDialog.setVisible(true);
return;
}
super.popupEditDialog(mousePos);
}
// 点击"编辑"按钮，弹出面板
protected class HyperDialog extends JDialog {
private JComponent editPane;
private static final int WIDTH = 570;
private static final int HEIGHT = 490;
private UIButton okButton, cancelButton;
HyperDialog(JComponent pane) {
super(DesignerContext.getDesignerFrame(), true);
pane.setBorder(BorderFactory.createEmptyBorder(20, 10, 10, 10));
this.editPane = pane;
JPanel editPaneWrapper = new JPanel(new BorderLayout());
editPaneWrapper.add(editPane, BorderLayout.CENTER);
this.getContentPane().add(editPaneWrapper, BorderLayout.CENTER);
this.getContentPane().add(createControlButtonPane(), BorderLayout.SOUTH);
setSize(WIDTH, HEIGHT);
this.setVisible(false);
}
private JPanel createControlButtonPane() {
JPanel controlPane = FRGUIPaneFactory.createBorderLayout_S_Pane();
JPanel buttonsPane = new JPanel(new FlowLayout(FlowLayout.LEFT, 10, 0));
controlPane.add(buttonsPane, BorderLayout.EAST);
//确定
addOkButton(buttonsPane);
//取消
addCancelButton(buttonsPane);
controlPane.setBorder(BorderFactory.createEmptyBorder(10,0,10,0));
return controlPane;
}
private void addCancelButton(JPanel buttonsPane) {
cancelButton = new UIButton(Inter.getLocText("Cancel"));
buttonsPane.add(cancelButton);
cancelButton.addActionListener(new ActionListener() {
public void actionPerformed(ActionEvent evt) {
doCancel();
}
});
}
private void addOkButton(JPanel buttonsPane) {
okButton = new UIButton(Inter.getLocText("OK"));
buttonsPane.add(okButton);
okButton.addActionListener(new ActionListener() {
public void actionPerformed(ActionEvent evt) {
doOK();
}
});
}
public void doOK() {
saveSettings();
setVisible(false);
}
public void doCancel() {
setVisible(false);
}
}
}

5
designer_chart/src/com/fr/plugin/chart/custom/style/VanChartCustomSeriesPane.java
Unescape View File

@ -6,10 +6,8 @@ import com.fr.design.layout.TableLayoutHelper;
import com.fr.design.mainframe.chart.gui.ChartStylePane;
import com.fr.design.mainframe.chart.gui.style.ChartFillStylePane;
import com.fr.design.mainframe.chart.gui.style.series.ChartSeriesPane;
import com.fr.general.Inter;
import com.fr.plugin.chart.attr.plot.VanChartPlot;
import com.fr.plugin.chart.custom.VanChartCustomPlot;
import com.fr.plugin.chart.designer.TableLayout4VanChartHelper;
import com.fr.plugin.chart.designer.component.VanChartBeautyPane;
import com.fr.plugin.chart.designer.component.VanChartFillStylePane;
@ -81,9 +79,8 @@ public class VanChartCustomSeriesPane extends ChartSeriesPane {
};
JPanel panel = TableLayoutHelper.createTableLayoutPane(components, row, col);
JPanel colorPane = TableLayout4VanChartHelper.createExpandablePaneWithTitle(Inter.getLocText("Plugin-ChartF_Color"),panel);
panel.setBorder(BorderFactory.createEmptyBorder(10,10,0,15));
return colorPane;
return panel;
}
/**

1
designer_chart/src/com/fr/plugin/chart/designer/AbstractVanChartScrollPane.java
Unescape View File

@ -27,6 +27,7 @@ public abstract class AbstractVanChartScrollPane<T> extends BasicScrollPane<T> {
} else {
leftcontentPane.setBounds(0, 0, width, height);
leftcontentPane.setBorder(BorderFactory.createMatteBorder(0, 5, 0, 10, original));
}
}
public void reloaPane(JPanel pane){

133
designer_chart/src/com/fr/plugin/chart/designer/component/VanChartUIListControlPane.java
Unescape View File

@ -0,0 +1,133 @@
package com.fr.plugin.chart.designer.component;
import com.fr.base.chart.BasePlot;
import com.fr.chart.chartattr.Plot;
import com.fr.design.gui.controlpane.UIListControlPane;
import com.fr.design.gui.ibutton.UIButton;
import com.fr.design.layout.FRGUIPaneFactory;
import com.fr.design.mainframe.DesignerContext;
import com.fr.design.utils.gui.GUICoreUtils;
import com.fr.general.Inter;
import com.fr.stable.Nameable;
import javax.swing.*;
import java.awt.*;
import java.awt.event.ActionEvent;
import java.awt.event.ActionListener;
/**
* Created by mengao on 2017/9/8.
* 新图表UIListControlPane，基础面板。
*/
public abstract class VanChartUIListControlPane extends UIListControlPane {
public VanChartUIListControlPane() {
super();
}
public VanChartUIListControlPane(BasePlot plot) {
super(plot);
}
@Override
public void saveSettings() {
if (isPopulating) {
return;
}
update((Plot) plot);
DesignerContext.getDesignerFrame().getSelectedJTemplate().fireTargetModified();
}
protected abstract void update(Plot plot);
//-------------------连续弹窗问题 start-------------------//
public void populate (Nameable[] nameableArray) {
//特殊处理，使用instanceof判断，弹出不同的面板
if (SwingUtilities.getWindowAncestor(this) instanceof JDialog) {
popupEditDialog = new HyperDialog(cardPane);
}
super.populate(nameableArray);
}
protected void popupEditDialog(Point mousePos) {
//特殊处理，处理连续弹窗情况，弹出面板定为方式不同
if (SwingUtilities.getWindowAncestor(this) instanceof JDialog) {
GUICoreUtils.centerWindow(popupEditDialog);
popupEditDialog.setVisible(true);
return;
}
super.popupEditDialog(mousePos);
}
// 点击"编辑"按钮，弹出面板（这个面板是弹窗里面的弹窗）
protected class HyperDialog extends JDialog {
private JComponent editPane;
private static final int WIDTH = 570;
private static final int HEIGHT = 490;
private UIButton okButton, cancelButton;
HyperDialog(JComponent pane) {
super(DesignerContext.getDesignerFrame(), true);
pane.setBorder(BorderFactory.createEmptyBorder(20, 10, 10, 10));
this.editPane = pane;
JPanel editPaneWrapper = new JPanel(new BorderLayout());
editPaneWrapper.add(editPane, BorderLayout.CENTER);
this.getContentPane().add(editPaneWrapper, BorderLayout.CENTER);
this.getContentPane().add(createControlButtonPane(), BorderLayout.SOUTH);
setSize(WIDTH, HEIGHT);
this.setVisible(false);
}
private JPanel createControlButtonPane() {
JPanel controlPane = FRGUIPaneFactory.createBorderLayout_S_Pane();
JPanel buttonsPane = new JPanel(new FlowLayout(FlowLayout.LEFT, 10, 0));
controlPane.add(buttonsPane, BorderLayout.EAST);
//确定
addOkButton(buttonsPane);
//取消
addCancelButton(buttonsPane);
controlPane.setBorder(BorderFactory.createEmptyBorder(10,0,10,0));
return controlPane;
}
private void addCancelButton(JPanel buttonsPane) {
cancelButton = new UIButton(Inter.getLocText("Cancel"));
buttonsPane.add(cancelButton);
cancelButton.addActionListener(new ActionListener() {
public void actionPerformed(ActionEvent evt) {
doCancel();
}
});
}
private void addOkButton(JPanel buttonsPane) {
okButton = new UIButton(Inter.getLocText("OK"));
buttonsPane.add(okButton);
okButton.addActionListener(new ActionListener() {
public void actionPerformed(ActionEvent evt) {
doOK();
}
});
}
public void doOK() {
saveSettings();
setVisible(false);
}
public void doCancel() {
setVisible(false);
}
}
}

2
designer_chart/src/com/fr/plugin/chart/designer/component/format/VanChartFormatPaneWithCheckBox.java
Unescape View File

@ -92,7 +92,7 @@ public abstract class VanChartFormatPaneWithCheckBox extends JPanel{
formatPane = createFormatPane();
}
Point comPoint = formatButton.getLocationOnScreen();
Point arrowPoint = new Point(comPoint.x + formatButton.getWidth(), comPoint.y + formatButton.getHeight());
Point arrowPoint = new Point(comPoint.x, comPoint.y + formatButton.getHeight());
UIBubbleFloatPane<Style> pane = new UIBubbleFloatPane(Constants.LEFT, arrowPoint, formatPane, 258, 209) {
@Override

22
designer_chart/src/com/fr/plugin/chart/designer/other/AutoRefreshPane.java
Unescape View File

@ -10,7 +10,6 @@ import com.fr.design.gui.icheckbox.UICheckBox;
import com.fr.design.gui.ilable.UILabel;
import com.fr.design.gui.ispinner.UISpinner;
import com.fr.design.layout.TableLayout;
import com.fr.design.layout.TableLayoutHelper;
import com.fr.general.Inter;
import com.fr.plugin.chart.attr.plot.VanChartPlot;
import com.fr.plugin.chart.base.RefreshMoreLabel;
@ -86,11 +85,19 @@ public class AutoRefreshPane extends BasicBeanPane<RefreshMoreLabel> {
double p = TableLayout.PREFERRED;
double f = TableLayout.FILL;
double[] columnSize = {p, f, 20};
double[] rowSize = {p, p};
double[] column = {f, 20};
double[] rowSize = {p};
Component[][] components = initComponent(jPanel);
contentPane = TableLayoutHelper.createTableLayoutPane(components, rowSize, columnSize);
contentPane.setBorder(BorderFactory.createEmptyBorder(0,12,0,0));
JPanel panel1 = TableLayout4VanChartHelper.createGapTableLayoutPane(components, rowSize, columnSize);
contentPane = new JPanel(new BorderLayout());
contentPane.add(panel1, BorderLayout.CENTER);
Component[][] AutoTooltipComponent = initAutoTooltipComponent();
JPanel panel2 = TableLayout4VanChartHelper.createGapTableLayoutPane(AutoTooltipComponent, rowSize, column);
panel2.setBorder(BorderFactory.createEmptyBorder(10, 0,0,0));
contentPane.add(panel2, BorderLayout.SOUTH);
contentPane.setBorder(BorderFactory.createEmptyBorder(0, 72,0,0));
content.add(moreLabelPane, BorderLayout.NORTH);
content.add(contentPane, BorderLayout.CENTER);
return content;
@ -105,6 +112,13 @@ public class AutoRefreshPane extends BasicBeanPane<RefreshMoreLabel> {
}
protected Component[][] initAutoTooltipComponent () {
return new Component[][]{
new Component[]{autoTooltip, tooltipSet},
};
}
private void initTooltipSet() {
tooltipSet = new UIButton(BaseUtils.readIcon("/com/fr/design/images/buttonicon/config.png"));
tooltipSet.setPreferredSize(new Dimension(20, 20));

7
designer_chart/src/com/fr/plugin/chart/designer/other/AutoRefreshPaneWithoutTooltip.java
Unescape View File

@ -1,11 +1,8 @@
package com.fr.plugin.chart.designer.other;
import com.fr.design.gui.ilable.UILabel;
import com.fr.general.Inter;
import com.fr.plugin.chart.base.RefreshMoreLabel;
import com.fr.plugin.chart.vanchart.VanChart;
import javax.swing.*;
import java.awt.*;
/**
@ -17,9 +14,9 @@ public class AutoRefreshPaneWithoutTooltip extends AutoRefreshPane {
super(chart, isLargeModel);
}
protected Component[][] initComponent(JPanel autoTooltipPane){
protected Component[][] initAutoTooltipComponent () {
return new Component[][]{
new Component[]{new UILabel(Inter.getLocText("Plugin-ChartF_Time_Interval")), getAutoRefreshTime(),new UILabel(Inter.getLocText("Chart-Time_Seconds"))}
new Component[]{null, null},
};
}

339
designer_chart/src/com/fr/plugin/chart/designer/other/HyperlinkMapFactory.java
Unescape View File

@ -116,28 +116,28 @@ public class HyperlinkMapFactory {
public static HashMap getHyperlinkMap(Plot plot) {
String plotType = plotTypeMap.get(plot.getClass().getName() + plot.getDetailType());
if(plotType == null){
if (plotType == null) {
plotType = plotTypeMap.get(plot.getClass().getName());
if(plotType == null) {
if (plotType == null) {
plotType = NORMAL;
}
}
return getHyperlinkMapWithType(plotType);
}
public static HashMap getDrillUpLinkMap(){
public static HashMap getDrillUpLinkMap() {
return getHyperlinkMapWithType(DIRLLMAPCATALOG);
}
public static HashMap getLineMapHyperLinkMap(){
public static HashMap getLineMapHyperLinkMap() {
return getHyperlinkMapWithType(LINEMAP);
}
private static HashMap getHyperlinkMapWithType(String plotType){
private static HashMap getHyperlinkMapWithType(String plotType) {
HashMap<Class, Class> map = new HashMap<Class, Class>();
map.put(ReportletHyperlink.class, getClassWithPrefix(HyperlinkMapFactory.Report.class, plotType));
map.put(EmailJavaScript.class, ChartEmailPane.class);
map.put(EmailJavaScript.class, VanChartEmailPane.class);
map.put(WebHyperlink.class, getClassWithPrefix(HyperlinkMapFactory.Web.class, plotType));
map.put(ParameterJavaScript.class, getClassWithPrefix(HyperlinkMapFactory.Para.class, plotType));
@ -150,9 +150,9 @@ public class HyperlinkMapFactory {
return map;
}
private static Class getClassWithPrefix(Class superClass, String plotType){
private static Class getClassWithPrefix(Class superClass, String plotType) {
String wholeClassString = superClass.getName() + plotType;
try{
try {
return Class.forName(wholeClassString);
} catch (Exception e) {
return superClass;
@ -386,78 +386,90 @@ public class HyperlinkMapFactory {
return ValueEditorPaneFactory.createValueEditorPane(addBasicEditors(list));
}
//网络报表
public static class Report{
public static class VAN_CHART extends ReportletHyperlinkPane.CHART{
public static class Report {
public static class VAN_CHART extends ReportletHyperlinkPane.CHART {
@Override
protected boolean needRenamePane() {
return false;
}
}
public static class VAN_CHART_MULTICATEGORY extends ReportletHyperlinkPane.CHART{
public static class VAN_CHART_MULTICATEGORY extends Report.VAN_CHART {
@Override
protected ValueEditorPane getValueEditorPane() {
return getMultiCategoryEditorPane();
}
}
public static class VAN_CHART_SCATTER extends ReportletHyperlinkPane.CHART{
public static class VAN_CHART_SCATTER extends Report.VAN_CHART {
@Override
protected ValueEditorPane getValueEditorPane() {
return getScatterValueEditorPane();
return getScatterValueEditorPane();
}
}
public static class VAN_CHART_GANNT extends ReportletHyperlinkPane.CHART{
public static class VAN_CHART_GANNT extends Report.VAN_CHART {
@Override
protected ValueEditorPane getValueEditorPane(){
protected ValueEditorPane getValueEditorPane() {
return getGanntValueEditorPane();
}
}
public static class VAN_CHART_MULTIPIE extends ReportletHyperlinkPane.CHART{
public static class VAN_CHART_MULTIPIE extends Report.VAN_CHART {
@Override
protected ValueEditorPane getValueEditorPane() {
return getMultiPieValueEditorPane();
}
}
public static class VAN_CHART_GAUGE extends ReportletHyperlinkPane.CHART_METER{
public static class VAN_CHART_GAUGE extends ReportletHyperlinkPane.CHART_METER {
@Override
protected boolean needRenamePane() {
return false;
}
}
public static class VAN_CHART_MAP extends ReportletHyperlinkPane.CHART{
public static class VAN_CHART_MAP extends Report.VAN_CHART {
@Override
protected ValueEditorPane getValueEditorPane() {
return getMapValueEditorPane();
}
}
public static class VAN_CHART_LINE_MAP extends ReportletHyperlinkPane.CHART{
public static class VAN_CHART_LINE_MAP extends Report.VAN_CHART {
@Override
protected ValueEditorPane getValueEditorPane() {
return getLineMapValueEditorPane();
}
}
public static class VAN_CHART_DRILLMAPCATALOG extends ReportletHyperlinkPane.CHART{
public static class VAN_CHART_DRILLMAPCATALOG extends Report.VAN_CHART {
@Override
protected ValueEditorPane getValueEditorPane() {
return getDrillMapCatalogValueEditorPane();
}
}
public static class VAN_CHART_FUNNEL extends ReportletHyperlinkPane.CHART{
public static class VAN_CHART_FUNNEL extends Report.VAN_CHART {
@Override
protected ValueEditorPane getValueEditorPane() {
return getFunnelValueEditorPane();
}
}
public static class VAN_CHART_WORDCLOUD extends ReportletHyperlinkPane.CHART{
public static class VAN_CHART_WORDCLOUD extends Report.VAN_CHART {
@Override
protected ValueEditorPane getValueEditorPane() {
return getWordCloudValueEditorPane();
}
}
public static class VAN_CHART_STRUCTURE extends ReportletHyperlinkPane.CHART{
public static class VAN_CHART_STRUCTURE extends Report.VAN_CHART {
@Override
protected ValueEditorPane getValueEditorPane() {
return getStructureValueEditorPane();
@ -465,42 +477,61 @@ public class HyperlinkMapFactory {
}
}
//邮箱
public static class VanChartEmailPane extends ChartEmailPane {
@Override
protected boolean needRenamePane() {
return false;
}
}
//网页链接
public static class Web{
public static class VAN_CHART extends WebHyperlinkPane.CHART{
public static class Web {
public static class VAN_CHART extends WebHyperlinkPane.CHART {
@Override
protected boolean needRenamePane() {
return false;
}
}
public static class VAN_CHART_MULTICATEGORY extends WebHyperlinkPane.CHART{
public static class VAN_CHART_MULTICATEGORY extends Web.VAN_CHART {
@Override
protected ValueEditorPane getValueEditorPane() {
return getMultiCategoryEditorPane();
}
}
public static class VAN_CHART_SCATTER extends WebHyperlinkPane.CHART{
public static class VAN_CHART_SCATTER extends Web.VAN_CHART {
@Override
protected ValueEditorPane getValueEditorPane() {
return getScatterValueEditorPane();
}
}
public static class VAN_CHART_GANNT extends WebHyperlinkPane.CHART{
public static class VAN_CHART_GANNT extends Web.VAN_CHART {
@Override
protected ValueEditorPane getValueEditorPane(){
protected ValueEditorPane getValueEditorPane() {
return getGanntValueEditorPane();
}
}
public static class VAN_CHART_GAUGE extends WebHyperlinkPane.CHART_METER{
public static class VAN_CHART_GAUGE extends WebHyperlinkPane.CHART_METER {
@Override
protected boolean needRenamePane() {
return false;
}
}
public static class VAN_CHART_MAP extends WebHyperlinkPane.CHART{
public static class VAN_CHART_MAP extends Web.VAN_CHART {
@Override
protected ValueEditorPane getValueEditorPane() {
return getMapValueEditorPane();
}
}
public static class VAN_CHART_LINE_MAP extends WebHyperlinkPane.CHART{
public static class VAN_CHART_LINE_MAP extends Web.VAN_CHART {
@Override
protected ValueEditorPane getValueEditorPane() {
return getLineMapValueEditorPane();
@ -508,34 +539,34 @@ public class HyperlinkMapFactory {
}
public static class VAN_CHART_DRILLMAPCATALOG extends WebHyperlinkPane.CHART{
public static class VAN_CHART_DRILLMAPCATALOG extends Web.VAN_CHART {
@Override
protected ValueEditorPane getValueEditorPane(){
protected ValueEditorPane getValueEditorPane() {
return getDrillMapCatalogValueEditorPane();
}
}
public static class VAN_CHART_MULTIPIE extends WebHyperlinkPane.CHART{
public static class VAN_CHART_MULTIPIE extends Web.VAN_CHART {
protected ValueEditorPane getValueEditorPane() {
return getMultiPieValueEditorPane();
}
}
public static class VAN_CHART_FUNNEL extends WebHyperlinkPane.CHART{
public static class VAN_CHART_FUNNEL extends Web.VAN_CHART {
@Override
protected ValueEditorPane getValueEditorPane() {
return getFunnelValueEditorPane();
}
}
public static class VAN_CHART_WORDCLOUD extends WebHyperlinkPane.CHART{
public static class VAN_CHART_WORDCLOUD extends Web.VAN_CHART {
@Override
protected ValueEditorPane getValueEditorPane() {
return getWordCloudValueEditorPane();
}
}
public static class VAN_CHART_STRUCTURE extends WebHyperlinkPane.CHART{
public static class VAN_CHART_STRUCTURE extends Web.VAN_CHART {
@Override
protected ValueEditorPane getValueEditorPane() {
return getStructureValueEditorPane();
@ -544,42 +575,52 @@ public class HyperlinkMapFactory {
}
//动态参数
public static class Para{
public static class VAN_CHART extends ParameterJavaScriptPane.CHART{
public static class Para {
public static class VAN_CHART extends ParameterJavaScriptPane.CHART {
@Override
protected boolean needRenamePane() {
return false;
}
}
public static class VAN_CHART_MULTICATEGORY extends ParameterJavaScriptPane.CHART{
public static class VAN_CHART_MULTICATEGORY extends Para.VAN_CHART {
@Override
protected ValueEditorPane getValueEditorPane() {
return getMultiCategoryEditorPane();
}
}
public static class VAN_CHART_SCATTER extends ParameterJavaScriptPane.CHART{
public static class VAN_CHART_SCATTER extends Para.VAN_CHART {
@Override
protected ValueEditorPane getValueEditorPane() {
return getScatterValueEditorPane();
}
}
public static class VAN_CHART_GANNT extends ParameterJavaScriptPane.CHART{
public static class VAN_CHART_GANNT extends Para.VAN_CHART {
@Override
protected ValueEditorPane getValueEditorPane(){
protected ValueEditorPane getValueEditorPane() {
return getGanntValueEditorPane();
}
}
public static class VAN_CHART_GAUGE extends ParameterJavaScriptPane.CHART_METER{
public static class VAN_CHART_GAUGE extends ParameterJavaScriptPane.CHART_METER {
@Override
protected boolean needRenamePane() {
return false;
}
}
public static class VAN_CHART_MAP extends ParameterJavaScriptPane.CHART{
public static class VAN_CHART_MAP extends Para.VAN_CHART {
@Override
protected ValueEditorPane getValueEditorPane() {
return getMapValueEditorPane();
}
}
public static class VAN_CHART_LINE_MAP extends ParameterJavaScriptPane.CHART{
public static class VAN_CHART_LINE_MAP extends Para.VAN_CHART {
@Override
protected ValueEditorPane getValueEditorPane() {
return getLineMapValueEditorPane();
@ -587,34 +628,34 @@ public class HyperlinkMapFactory {
}
public static class VAN_CHART_DRILLMAPCATALOG extends ParameterJavaScriptPane.CHART{
public static class VAN_CHART_DRILLMAPCATALOG extends Para.VAN_CHART {
@Override
protected ValueEditorPane getValueEditorPane(){
protected ValueEditorPane getValueEditorPane() {
return getDrillMapCatalogValueEditorPane();
}
}
public static class VAN_CHART_MULTIPIE extends ParameterJavaScriptPane.CHART{
public static class VAN_CHART_MULTIPIE extends Para.VAN_CHART {
protected ValueEditorPane getValueEditorPane() {
return getMultiPieValueEditorPane();
}
}
public static class VAN_CHART_FUNNEL extends ParameterJavaScriptPane.CHART{
public static class VAN_CHART_FUNNEL extends Para.VAN_CHART {
@Override
protected ValueEditorPane getValueEditorPane() {
return getFunnelValueEditorPane();
}
}
public static class VAN_CHART_WORDCLOUD extends ParameterJavaScriptPane.CHART{
public static class VAN_CHART_WORDCLOUD extends Para.VAN_CHART {
@Override
protected ValueEditorPane getValueEditorPane() {
return getWordCloudValueEditorPane();
}
}
public static class VAN_CHART_STRUCTURE extends ParameterJavaScriptPane.CHART{
public static class VAN_CHART_STRUCTURE extends Para.VAN_CHART {
@Override
protected ValueEditorPane getValueEditorPane() {
return getStructureValueEditorPane();
@ -623,76 +664,86 @@ public class HyperlinkMapFactory {
}
//js超链
public static class Js{
public static class VAN_CHART extends JavaScriptImplPane.CHART{
public static class Js {
public static class VAN_CHART extends JavaScriptImplPane.CHART {
@Override
protected boolean needRenamePane() {
return false;
}
}
public static class VAN_CHART_MULTICATEGORY extends JavaScriptImplPane.CHART{
public static class VAN_CHART_MULTICATEGORY extends Js.VAN_CHART {
@Override
protected ValueEditorPane getValueEditorPane() {
return getMultiCategoryEditorPane();
}
}
public static class VAN_CHART_SCATTER extends JavaScriptImplPane.CHART{
public static class VAN_CHART_SCATTER extends Js.VAN_CHART {
@Override
protected ValueEditorPane getValueEditorPane() {
return getScatterValueEditorPane();
}
}
public static class VAN_CHART_GANNT extends JavaScriptImplPane.CHART{
public static class VAN_CHART_GANNT extends Js.VAN_CHART {
@Override
protected ValueEditorPane getValueEditorPane(){
protected ValueEditorPane getValueEditorPane() {
return getGanntValueEditorPane();
}
}
public static class VAN_CHART_GAUGE extends JavaScriptImplPane.CHART_METER{
public static class VAN_CHART_GAUGE extends Js.VAN_CHART {
@Override
protected boolean needRenamePane() {
return false;
}
}
public static class VAN_CHART_MAP extends JavaScriptImplPane.CHART{
public static class VAN_CHART_MAP extends Js.VAN_CHART {
@Override
protected ValueEditorPane getValueEditorPane() {
return getMapValueEditorPane();
}
}
public static class VAN_CHART_LINE_MAP extends JavaScriptImplPane.CHART{
public static class VAN_CHART_LINE_MAP extends Js.VAN_CHART {
@Override
protected ValueEditorPane getValueEditorPane() {
return getLineMapValueEditorPane();
}
}
public static class VAN_CHART_DRILLMAPCATALOG extends JavaScriptImplPane.CHART{
public static class VAN_CHART_DRILLMAPCATALOG extends Js.VAN_CHART {
@Override
protected ValueEditorPane getValueEditorPane(){
protected ValueEditorPane getValueEditorPane() {
return getDrillMapCatalogValueEditorPane();
}
}
public static class VAN_CHART_MULTIPIE extends JavaScriptImplPane.CHART{
public static class VAN_CHART_MULTIPIE extends Js.VAN_CHART {
protected ValueEditorPane getValueEditorPane() {
return getMultiPieValueEditorPane();
}
}
public static class VAN_CHART_FUNNEL extends JavaScriptImplPane.CHART{
public static class VAN_CHART_FUNNEL extends Js.VAN_CHART {
@Override
protected ValueEditorPane getValueEditorPane() {
return getFunnelValueEditorPane();
}
}
public static class VAN_CHART_WORDCLOUD extends JavaScriptImplPane.CHART{
public static class VAN_CHART_WORDCLOUD extends Js.VAN_CHART {
@Override
protected ValueEditorPane getValueEditorPane() {
return getWordCloudValueEditorPane();
}
}
public static class VAN_CHART_STRUCTURE extends JavaScriptImplPane.CHART{
public static class VAN_CHART_STRUCTURE extends Js.VAN_CHART {
@Override
protected ValueEditorPane getValueEditorPane() {
return getStructureValueEditorPane();
@ -701,76 +752,84 @@ public class HyperlinkMapFactory {
}
//图表超链-悬浮窗图表
public static class Chart_Chart{
public static class VAN_CHART extends ChartHyperPoplinkPane{
public static class Chart_Chart {
public static class VAN_CHART extends ChartHyperPoplinkPane {
@Override
protected boolean needRenamePane() {
return false;
}
}
public static class VAN_CHART_MULTICATEGORY extends ChartHyperPoplinkPane{
public static class VAN_CHART_MULTICATEGORY extends Chart_Chart.VAN_CHART {
@Override
protected ValueEditorPane getValueEditorPane() {
return getMultiCategoryEditorPane();
}
}
public static class VAN_CHART_SCATTER extends ChartHyperPoplinkPane{
public static class VAN_CHART_SCATTER extends Chart_Chart.VAN_CHART {
@Override
protected ValueEditorPane getValueEditorPane() {
return getScatterValueEditorPane();
}
}
public static class VAN_CHART_GANNT extends ChartHyperPoplinkPane{
public static class VAN_CHART_GANNT extends Chart_Chart.VAN_CHART {
@Override
protected ValueEditorPane getValueEditorPane(){
protected ValueEditorPane getValueEditorPane() {
return getGanntValueEditorPane();
}
}
public static class VAN_CHART_GAUGE extends ChartHyperPoplinkPane.CHART_METER{
public static class VAN_CHART_GAUGE extends ChartHyperPoplinkPane.CHART_METER {
@Override
protected boolean needRenamePane() {
return false;
}
}
public static class VAN_CHART_MAP extends ChartHyperPoplinkPane{
public static class VAN_CHART_MAP extends Chart_Chart.VAN_CHART {
@Override
protected ValueEditorPane getValueEditorPane() {
return getMapValueEditorPane();
}
}
public static class VAN_CHART_LINE_MAP extends ChartHyperPoplinkPane{
public static class VAN_CHART_LINE_MAP extends Chart_Chart.VAN_CHART {
@Override
protected ValueEditorPane getValueEditorPane() {
return getLineMapValueEditorPane();
}
}
public static class VAN_CHART_DRILLMAPCATALOG extends ChartHyperPoplinkPane{
public static class VAN_CHART_DRILLMAPCATALOG extends Chart_Chart.VAN_CHART {
@Override
protected ValueEditorPane getValueEditorPane(){
protected ValueEditorPane getValueEditorPane() {
return getDrillMapCatalogValueEditorPane();
}
}
public static class VAN_CHART_MULTIPIE extends ChartHyperPoplinkPane{
public static class VAN_CHART_MULTIPIE extends Chart_Chart.VAN_CHART {
protected ValueEditorPane getValueEditorPane() {
return getMultiPieValueEditorPane();
}
}
public static class VAN_CHART_FUNNEL extends ChartHyperPoplinkPane{
public static class VAN_CHART_FUNNEL extends Chart_Chart.VAN_CHART {
@Override
protected ValueEditorPane getValueEditorPane() {
return getFunnelValueEditorPane();
}
}
public static class VAN_CHART_WORDCLOUD extends ChartHyperPoplinkPane{
public static class VAN_CHART_WORDCLOUD extends Chart_Chart.VAN_CHART {
@Override
protected ValueEditorPane getValueEditorPane() {
return getWordCloudValueEditorPane();
}
}
public static class VAN_CHART_STRUCTURE extends ChartHyperPoplinkPane{
public static class VAN_CHART_STRUCTURE extends Chart_Chart.VAN_CHART {
@Override
protected ValueEditorPane getValueEditorPane() {
return getStructureValueEditorPane();
@ -779,76 +838,84 @@ public class HyperlinkMapFactory {
}
//图表超链-联动单元格
public static class Chart_Cell{
public static class VAN_CHART extends ChartHyperRelateCellLinkPane{
public static class Chart_Cell {
public static class VAN_CHART extends ChartHyperRelateCellLinkPane {
@Override
protected boolean needRenamePane() {
return false;
}
}
public static class VAN_CHART_MULTICATEGORY extends ChartHyperRelateCellLinkPane{
public static class VAN_CHART_MULTICATEGORY extends Chart_Cell.VAN_CHART {
@Override
protected ValueEditorPane getValueEditorPane() {
return getMultiCategoryEditorPane();
}
}
public static class VAN_CHART_SCATTER extends ChartHyperRelateCellLinkPane{
public static class VAN_CHART_SCATTER extends Chart_Cell.VAN_CHART {
@Override
protected ValueEditorPane getValueEditorPane() {
return getScatterValueEditorPane();
}
}
public static class VAN_CHART_GANNT extends ChartHyperRelateCellLinkPane{
public static class VAN_CHART_GANNT extends Chart_Cell.VAN_CHART {
@Override
protected ValueEditorPane getValueEditorPane(){
protected ValueEditorPane getValueEditorPane() {
return getGanntValueEditorPane();
}
}
public static class VAN_CHART_GAUGE extends ChartHyperRelateCellLinkPane.CHART_METER{
public static class VAN_CHART_GAUGE extends ChartHyperRelateCellLinkPane.CHART_METER {
@Override
protected boolean needRenamePane() {
return false;
}
}
public static class VAN_CHART_MAP extends ChartHyperRelateCellLinkPane{
public static class VAN_CHART_MAP extends Chart_Cell.VAN_CHART {
@Override
protected ValueEditorPane getValueEditorPane() {
return getMapValueEditorPane();
}
}
public static class VAN_CHART_LINE_MAP extends ChartHyperRelateCellLinkPane{
public static class VAN_CHART_LINE_MAP extends Chart_Cell.VAN_CHART {
@Override
protected ValueEditorPane getValueEditorPane() {
return getLineMapValueEditorPane();
}
}
public static class VAN_CHART_DRILLMAPCATALOG extends ChartHyperRelateCellLinkPane{
public static class VAN_CHART_DRILLMAPCATALOG extends Chart_Cell.VAN_CHART {
@Override
protected ValueEditorPane getValueEditorPane(){
protected ValueEditorPane getValueEditorPane() {
return getDrillMapCatalogValueEditorPane();
}
}
public static class VAN_CHART_MULTIPIE extends ChartHyperRelateCellLinkPane{
public static class VAN_CHART_MULTIPIE extends Chart_Cell.VAN_CHART {
protected ValueEditorPane getValueEditorPane() {
return getMultiPieValueEditorPane();
}
}
public static class VAN_CHART_FUNNEL extends ChartHyperRelateCellLinkPane{
public static class VAN_CHART_FUNNEL extends Chart_Cell.VAN_CHART {
@Override
protected ValueEditorPane getValueEditorPane() {
return getFunnelValueEditorPane();
}
}
public static class VAN_CHART_WORDCLOUD extends ChartHyperRelateCellLinkPane{
public static class VAN_CHART_WORDCLOUD extends Chart_Cell.VAN_CHART {
@Override
protected ValueEditorPane getValueEditorPane() {
return getWordCloudValueEditorPane();
}
}
public static class VAN_CHART_STRUCTURE extends ChartHyperRelateCellLinkPane{
public static class VAN_CHART_STRUCTURE extends Chart_Cell.VAN_CHART {
@Override
protected ValueEditorPane getValueEditorPane() {
return getStructureValueEditorPane();
@ -857,76 +924,84 @@ public class HyperlinkMapFactory {
}
//图表超链-悬浮元素
public static class Chart_Float{
public static class VAN_CHART extends ChartHyperRelateFloatLinkPane{
public static class Chart_Float {
public static class VAN_CHART extends ChartHyperRelateFloatLinkPane {
@Override
protected boolean needRenamePane() {
return false;
}
}
public static class VAN_CHART_MULTICATEGORY extends ChartHyperRelateFloatLinkPane{
public static class VAN_CHART_MULTICATEGORY extends Chart_Float.VAN_CHART {
@Override
protected ValueEditorPane getValueEditorPane() {
return getMultiCategoryEditorPane();
}
}
public static class VAN_CHART_SCATTER extends ChartHyperRelateFloatLinkPane{
public static class VAN_CHART_SCATTER extends Chart_Float.VAN_CHART {
@Override
protected ValueEditorPane getValueEditorPane() {
return getScatterValueEditorPane();
}
}
public static class VAN_CHART_GANNT extends ChartHyperRelateFloatLinkPane{
public static class VAN_CHART_GANNT extends Chart_Float.VAN_CHART {
@Override
protected ValueEditorPane getValueEditorPane(){
protected ValueEditorPane getValueEditorPane() {
return getGanntValueEditorPane();
}
}
public static class VAN_CHART_GAUGE extends ChartHyperRelateFloatLinkPane.CHART_METER{
public static class VAN_CHART_GAUGE extends ChartHyperRelateFloatLinkPane.CHART_METER {
@Override
protected boolean needRenamePane() {
return false;
}
}
public static class VAN_CHART_MAP extends ChartHyperRelateFloatLinkPane{
public static class VAN_CHART_MAP extends Chart_Float.VAN_CHART {
@Override
protected ValueEditorPane getValueEditorPane() {
return getMapValueEditorPane();
}
}
public static class VAN_CHART_LINE_MAP extends ChartHyperRelateFloatLinkPane{
public static class VAN_CHART_LINE_MAP extends Chart_Float.VAN_CHART {
@Override
protected ValueEditorPane getValueEditorPane() {
return getLineMapValueEditorPane();
}
}
public static class VAN_CHART_DRILLMAPCATALOG extends ChartHyperRelateFloatLinkPane{
public static class VAN_CHART_DRILLMAPCATALOG extends Chart_Float.VAN_CHART {
@Override
protected ValueEditorPane getValueEditorPane(){
protected ValueEditorPane getValueEditorPane() {
return getDrillMapCatalogValueEditorPane();
}
}
public static class VAN_CHART_MULTIPIE extends ChartHyperRelateFloatLinkPane{
public static class VAN_CHART_MULTIPIE extends Chart_Float.VAN_CHART {
protected ValueEditorPane getValueEditorPane() {
return getMultiPieValueEditorPane();
}
}
public static class VAN_CHART_FUNNEL extends ChartHyperRelateFloatLinkPane{
public static class VAN_CHART_FUNNEL extends Chart_Float.VAN_CHART {
@Override
protected ValueEditorPane getValueEditorPane() {
return getFunnelValueEditorPane();
}
}
public static class VAN_CHART_WORDCLOUD extends ChartHyperRelateFloatLinkPane{
public static class VAN_CHART_WORDCLOUD extends Chart_Float.VAN_CHART {
@Override
protected ValueEditorPane getValueEditorPane() {
return getWordCloudValueEditorPane();
}
}
public static class VAN_CHART_STRUCTURE extends ChartHyperRelateFloatLinkPane{
public static class VAN_CHART_STRUCTURE extends Chart_Float.VAN_CHART {
@Override
protected ValueEditorPane getValueEditorPane() {
return getStructureValueEditorPane();
@ -935,42 +1010,50 @@ public class HyperlinkMapFactory {
}
//当前表单对象
public static class Form{
public static class VAN_CHART extends FormHyperlinkPane.CHART{
public static class Form {
public static class VAN_CHART extends FormHyperlinkPane.CHART {
@Override
protected boolean needRenamePane() {
return false;
}
}
public static class VAN_CHART_MULTICATEGORY extends FormHyperlinkPane.CHART{
public static class VAN_CHART_MULTICATEGORY extends Form.VAN_CHART {
@Override
protected ValueEditorPane getValueEditorPane() {
return getMultiCategoryEditorPane();
}
}
public static class VAN_CHART_SCATTER extends FormHyperlinkPane.CHART{
public static class VAN_CHART_SCATTER extends Form.VAN_CHART {
@Override
protected ValueEditorPane getValueEditorPane() {
return getScatterValueEditorPane();
}
}
public static class VAN_CHART_GANNT extends FormHyperlinkPane.CHART{
public static class VAN_CHART_GANNT extends Form.VAN_CHART {
@Override
protected ValueEditorPane getValueEditorPane(){
protected ValueEditorPane getValueEditorPane() {
return getGanntValueEditorPane();
}
}
public static class VAN_CHART_GAUGE extends FormHyperlinkPane.CHART_METER{
public static class VAN_CHART_GAUGE extends FormHyperlinkPane.CHART_METER {
@Override
protected boolean needRenamePane() {
return false;
}
}
public static class VAN_CHART_MAP extends FormHyperlinkPane.CHART{
public static class VAN_CHART_MAP extends Form.VAN_CHART {
@Override
protected ValueEditorPane getValueEditorPane() {
return getMapValueEditorPane();
}
}
public static class VAN_CHART_LINE_MAP extends FormHyperlinkPane.CHART{
public static class VAN_CHART_LINE_MAP extends Form.VAN_CHART {
@Override
protected ValueEditorPane getValueEditorPane() {
return getLineMapValueEditorPane();
@ -978,34 +1061,34 @@ public class HyperlinkMapFactory {
}
public static class VAN_CHART_DRILLMAPCATALOG extends FormHyperlinkPane.CHART{
public static class VAN_CHART_DRILLMAPCATALOG extends Form.VAN_CHART {
@Override
protected ValueEditorPane getValueEditorPane(){
protected ValueEditorPane getValueEditorPane() {
return getDrillMapCatalogValueEditorPane();
}
}
public static class VAN_CHART_MULTIPIE extends FormHyperlinkPane.CHART{
public static class VAN_CHART_MULTIPIE extends Form.VAN_CHART {
protected ValueEditorPane getValueEditorPane() {
return getMultiPieValueEditorPane();
}
}
public static class VAN_CHART_FUNNEL extends FormHyperlinkPane.CHART{
public static class VAN_CHART_FUNNEL extends Form.VAN_CHART {
@Override
protected ValueEditorPane getValueEditorPane() {
return getFunnelValueEditorPane();
}
}
public static class VAN_CHART_WORDCLOUD extends FormHyperlinkPane.CHART{
public static class VAN_CHART_WORDCLOUD extends Form.VAN_CHART {
@Override
protected ValueEditorPane getValueEditorPane() {
return getWordCloudValueEditorPane();
}
}
public static class VAN_CHART_STRUCTURE extends FormHyperlinkPane.CHART{
public static class VAN_CHART_STRUCTURE extends Form.VAN_CHART {
@Override
protected ValueEditorPane getValueEditorPane() {
return getStructureValueEditorPane();

2
designer_chart/src/com/fr/plugin/chart/designer/other/VanChartConditionAttrContentPane.java
Unescape View File

@ -30,7 +30,7 @@ public class VanChartConditionAttrContentPane extends AbstractConditionAttrConte
public void populateBean(Plot plot, ConditionCollection collection, Class<? extends ConditionAttributesPane> showPane){
if (conditionPane == null) {
conditionPane = new VanChartListControlPane(plot);
conditionPane = new VanChartConditionListControlPane(plot);
}
this.setLayout(new BorderLayout());

20
designer_chart/src/com/fr/plugin/chart/designer/other/VanChartListControlPane.java → designer_chart/src/com/fr/plugin/chart/designer/other/VanChartConditionListControlPane.java
Unescape View File

@ -8,11 +8,9 @@ import com.fr.design.ChartTypeInterfaceManager;
import com.fr.design.beans.BasicBeanPane;
import com.fr.design.gui.controlpane.NameObjectCreator;
import com.fr.design.gui.controlpane.NameableCreator;
import com.fr.design.gui.controlpane.UIListControlPane;
import com.fr.design.mainframe.DesignerContext;
import com.fr.general.Inter;
import com.fr.general.NameObject;
import com.fr.plugin.chart.attr.plot.VanChartPlot;
import com.fr.plugin.chart.designer.component.VanChartUIListControlPane;
import com.fr.stable.Nameable;
import java.lang.reflect.Constructor;
@ -20,10 +18,11 @@ import java.lang.reflect.InvocationTargetException;
/**
* Created by mengao on 2017/8/18.
* 条件属性ListControlPane，弹出条件属性设置面板
*/
public class VanChartListControlPane extends UIListControlPane {
public class VanChartConditionListControlPane extends VanChartUIListControlPane {
public VanChartListControlPane(BasePlot plot) {
public VanChartConditionListControlPane(BasePlot plot) {
super(plot);
}
@ -57,14 +56,6 @@ public class VanChartListControlPane extends UIListControlPane {
return null;
}
@Override
public void saveSettings() {
if (isPopulating) {
return;
}
updateConditionCollection(((VanChartPlot) plot).getConditionCollection());
DesignerContext.getDesignerFrame().getSelectedJTemplate().fireTargetModified();
}
@Override
public String getAddItemText() {
@ -80,7 +71,8 @@ public class VanChartListControlPane extends UIListControlPane {
/**
* Update.
*/
public void updateConditionCollection(ConditionCollection cc) {
protected void update(Plot plot) {
ConditionCollection cc = plot.getConditionCollection();
Nameable[] nameables = this.update();
cc.clearConditionAttr();

17
designer_chart/src/com/fr/plugin/chart/designer/style/background/AlertLineListControlPane.java
Unescape View File

@ -3,16 +3,14 @@ package com.fr.plugin.chart.designer.style.background;
import com.fr.chart.chartattr.Plot;
import com.fr.design.gui.controlpane.NameableCreator;
import com.fr.design.gui.controlpane.ShortCut4JControlPane;
import com.fr.design.gui.controlpane.UIListControlPane;
import com.fr.design.mainframe.DesignerContext;
import com.fr.general.ComparatorUtils;
import com.fr.general.Inter;
import com.fr.general.NameObject;
import com.fr.plugin.chart.attr.DefaultAxisHelper;
import com.fr.plugin.chart.attr.axis.VanChartAlertValue;
import com.fr.plugin.chart.attr.axis.VanChartAxis;
import com.fr.plugin.chart.attr.plot.VanChartPlot;
import com.fr.plugin.chart.attr.plot.VanChartRectanglePlot;
import com.fr.plugin.chart.designer.component.VanChartUIListControlPane;
import com.fr.stable.Nameable;
import java.util.ArrayList;
@ -20,18 +18,9 @@ import java.util.List;
/**
* Created by mengao on 2017/8/22.
* 自定义警戒线列表面板
*/
public class AlertLineListControlPane extends UIListControlPane {
@Override
public void saveSettings() {
if (isPopulating) {
return;
}
update((VanChartPlot) plot);
DesignerContext.getDesignerFrame().getSelectedJTemplate().fireTargetModified();
}
public class AlertLineListControlPane extends VanChartUIListControlPane {
@Override
public NameableCreator[] createNameableCreators() {

22
designer_chart/src/com/fr/plugin/chart/designer/style/background/BackgroundListControlPane.java
Unescape View File

@ -3,8 +3,6 @@ package com.fr.plugin.chart.designer.style.background;
import com.fr.chart.chartattr.Plot;
import com.fr.design.gui.controlpane.NameableCreator;
import com.fr.design.gui.controlpane.ShortCut4JControlPane;
import com.fr.design.gui.controlpane.UIListControlPane;
import com.fr.design.mainframe.DesignerContext;
import com.fr.general.ComparatorUtils;
import com.fr.general.Inter;
import com.fr.general.NameObject;
@ -12,8 +10,8 @@ import com.fr.plugin.chart.attr.DefaultAxisHelper;
import com.fr.plugin.chart.attr.axis.VanChartAlertValue;
import com.fr.plugin.chart.attr.axis.VanChartAxis;
import com.fr.plugin.chart.attr.axis.VanChartCustomIntervalBackground;
import com.fr.plugin.chart.attr.plot.VanChartPlot;
import com.fr.plugin.chart.attr.plot.VanChartRectanglePlot;
import com.fr.plugin.chart.designer.component.VanChartUIListControlPane;
import com.fr.stable.Nameable;
import java.util.ArrayList;
@ -21,17 +19,9 @@ import java.util.List;
/**
* Created by mengao on 2017/8/22.
* 自定义间隔背景列表面板
*/
public class BackgroundListControlPane extends UIListControlPane {
@Override
public void saveSettings() {
if (isPopulating) {
return;
}
update((VanChartPlot) plot, false);
DesignerContext.getDesignerFrame().getSelectedJTemplate().fireTargetModified();
}
public class BackgroundListControlPane extends VanChartUIListControlPane {
@Override
public NameableCreator[] createNameableCreators() {
@ -92,6 +82,12 @@ public class BackgroundListControlPane extends UIListControlPane {
doLayout();
}
@Override
protected void update(Plot plot) {
update(plot, false);
}
public void update(Plot plot, boolean isDefaultIntervalBackground) {
Nameable[] nameables = this.update();

6
designer_chart/src/com/fr/plugin/chart/designer/style/background/VanChartAxisAreaPane.java
Unescape View File

@ -81,7 +81,7 @@ public class VanChartAxisAreaPane extends BasicBeanPane<Plot> {
}
protected JPanel createIntervalPane(double[] row, double[] col) {
isDefaultIntervalBackground = new UIButtonGroup(new String[]{Inter.getLocText("Plugin-ChartF_IntervalBackground"), Inter.getLocText("Plugin-ChartF_CustomIntervalBackground")});
isDefaultIntervalBackground = new UIButtonGroup(new String[]{Inter.getLocText("Plugin-ChartF_Default_Interval"), Inter.getLocText("Plugin-ChartF_CustomIntervalBackground")});
horizontalColorBackground = new ColorSelectBox(100);
verticalColorBackground = new ColorSelectBox(100);
Component[][] components = getIntervalPaneComponents();
@ -90,7 +90,7 @@ public class VanChartAxisAreaPane extends BasicBeanPane<Plot> {
cardLayout = new CardLayout();
centerPane = new JPanel(cardLayout);
centerPane.add(defaultPane, Inter.getLocText("Plugin-ChartF_IntervalBackground"));
centerPane.add(defaultPane, Inter.getLocText("Plugin-ChartF_Default_Interval"));
centerPane.add(customIntervalBackground, Inter.getLocText("Plugin-ChartF_CustomIntervalBackground"));
isDefaultIntervalBackground.addActionListener(new ActionListener() {
@Override
@ -117,7 +117,7 @@ public class VanChartAxisAreaPane extends BasicBeanPane<Plot> {
private void checkCardPane() {
if (isDefaultIntervalBackground.getSelectedIndex() == 0) {
cardLayout.show(centerPane, Inter.getLocText("Plugin-ChartF_IntervalBackground"));
cardLayout.show(centerPane, Inter.getLocText("Plugin-ChartF_Default_Interval"));
} else {
cardLayout.show(centerPane, Inter.getLocText("Plugin-ChartF_CustomIntervalBackground"));
}

1
designer_chart/src/com/fr/plugin/chart/designer/style/background/VanChartCustomIntervalBackgroundPane.java
Unescape View File

@ -38,6 +38,7 @@ public class VanChartCustomIntervalBackgroundPane extends BasicBeanPane<VanChart
this.setLayout(new BoxLayout(this, BoxLayout.Y_AXIS));
//
JPanel top = FRGUIPaneFactory.createBorderLayout_L_Pane();
this.removeAll();
this.add(top);
top.setBorder(GUICoreUtils.createTitledBorder(Inter.getLocText("Plugin-ChartF_CustomIntervalBackground") + ":", null));
top.add(createContentPane());

20
designer_chart/src/com/fr/plugin/chart/designer/style/series/VanChartAbstractPlotSeriesPane.java
Unescape View File

@ -29,7 +29,6 @@ import com.fr.plugin.chart.custom.style.VanChartCustomStylePane;
import com.fr.plugin.chart.designer.TableLayout4VanChartHelper;
import com.fr.plugin.chart.designer.component.VanChartAreaSeriesFillColorPane;
import com.fr.plugin.chart.designer.component.VanChartBeautyPane;
import com.fr.plugin.chart.designer.component.VanChartFillStylePane;
import com.fr.plugin.chart.designer.component.VanChartLineTypePane;
import com.fr.plugin.chart.designer.component.VanChartMarkerPane;
import com.fr.plugin.chart.designer.component.VanChartTrendLinePane;
@ -96,31 +95,30 @@ public abstract class VanChartAbstractPlotSeriesPane extends AbstractPlotSeriesP
* 返回 填充界面.
*/
protected ChartFillStylePane getFillStylePane() {
return new VanChartFillStylePane();
//如果是自定義組合圖，則不創建填充界面
return parentPane instanceof VanChartCustomStylePane ? null : new ChartFillStylePane();
}
//风格
protected VanChartBeautyPane createStylePane() {
stylePane = new VanChartBeautyPane();
return stylePane;
return parentPane instanceof VanChartCustomStylePane ? null : new VanChartBeautyPane();
}
//获取色彩面板
//获取颜色面板
protected JPanel getColorPane () {
//如果是自定義組合圖，則不創建色彩界面
if (parentPane instanceof VanChartCustomStylePane) {
return null;
}
JPanel panel = new JPanel(new BorderLayout());
stylePane = createStylePane();
setColorPaneContent(panel);
JPanel colorPane = TableLayout4VanChartHelper.createExpandablePaneWithTitle(Inter.getLocText("Plugin-ChartF_Color"), panel);
panel.setBorder(BorderFactory.createEmptyBorder(10,5,0,0));
return colorPane;
return panel.getComponentCount() == 0 ? null : colorPane;
}
//设置色彩面板内容
protected void setColorPaneContent (JPanel panel) {
panel.add(createStylePane(), BorderLayout.CENTER);
if (stylePane != null) {
panel.add(stylePane, BorderLayout.CENTER);
}
}
//趋势线

4
designer_chart/src/com/fr/plugin/chart/funnel/designer/style/VanChartFunnelSeriesPane.java
Unescape View File

@ -42,7 +42,9 @@ public class VanChartFunnelSeriesPane extends VanChartAbstractPlotSeriesPane {
//设置色彩面板内容
protected void setColorPaneContent (JPanel panel) {
panel.add(createStylePane(), BorderLayout.CENTER);
if (stylePane != null) {
panel.add(createStylePane(), BorderLayout.CENTER);
}
panel.add(createAlphaPane(), BorderLayout.SOUTH);
}

Write Preview
Loading…
Cancel
Save