From 5ba7c941fe6c4247f7cf8a26bd3567bdea9fdf11 Mon Sep 17 00:00:00 2001 From: mengao <283296419@qq.com> Date: Wed, 29 Nov 2017 11:59:16 +0800 Subject: [PATCH] =?UTF-8?q?=E7=A9=BA=E6=95=B0=E6=8D=AE=E6=8F=90=E7=A4=BA?= =?UTF-8?q?=E8=87=AA=E5=AE=9A=E4=B9=89=EF=BC=8C=E5=89=8D=E5=8F=B0=E4=BC=A0?= =?UTF-8?q?=E9=80=92=E5=8F=82=E6=95=B0=E4=BF=AE=E6=94=B9=EF=BC=8C=E9=9D=A2?= =?UTF-8?q?=E6=9D=BF=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/fr/design/images/emptydataimage.png | Bin 0 -> 13785 bytes .../module/ChartEmptyDataStylePane.java | 34 ++++++++++-------- 2 files changed, 19 insertions(+), 15 deletions(-) create mode 100644 designer_chart/src/com/fr/design/images/emptydataimage.png diff --git a/designer_chart/src/com/fr/design/images/emptydataimage.png b/designer_chart/src/com/fr/design/images/emptydataimage.png new file mode 100644 index 0000000000000000000000000000000000000000..d3ab9923e459922234f509ddb95d9a98ea9ab1bd GIT binary patch literal 13785 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 literal 0 HcmV?d00001 diff --git a/designer_chart/src/com/fr/design/module/ChartEmptyDataStylePane.java b/designer_chart/src/com/fr/design/module/ChartEmptyDataStylePane.java index 0c8f239277..3eb6ebddcd 100644 --- a/designer_chart/src/com/fr/design/module/ChartEmptyDataStylePane.java +++ b/designer_chart/src/com/fr/design/module/ChartEmptyDataStylePane.java @@ -15,6 +15,7 @@ import com.fr.design.style.background.image.ImageFileChooser; import com.fr.design.style.background.image.ImagePreviewPane; import com.fr.design.utils.gui.GUICoreUtils; import com.fr.general.FRLogger; +import com.fr.general.IOUtils; import com.fr.general.Inter; import com.fr.stable.CoreGraphHelper; import com.fr.stable.StringUtils; @@ -29,11 +30,12 @@ import java.io.File; * Created by mengao on 2017/11/23. */ public class ChartEmptyDataStylePane extends AbstractAttrNoScrollPane { - private static final int WIDTH =150; - private static final int HEIGHT =20; - private static final int FIVE =5; - private static final int TEN =10; - private static final int THIRTY =30; + private static final int WIDTH = 150; + private static final int HEIGHT = 20; + private static final int FIVE = 5; + private static final int TEN = 10; + private static final int THIRTY = 30; + private static final Image DEFAULT_EMPTY_DATA_IMAGE = IOUtils.readImage("com/fr/design/images/emptydataimage.png"); private UIButtonGroup emptyData; @@ -44,7 +46,7 @@ public class ChartEmptyDataStylePane extends AbstractAttrNoScrollPane { private ImagePreviewPane previewPane; private ImageFileChooser imageFileChooser; - private Image emptyDataImage = null; + private Image emptyDataImage = DEFAULT_EMPTY_DATA_IMAGE; @Override @@ -63,6 +65,7 @@ public class ChartEmptyDataStylePane extends AbstractAttrNoScrollPane { @Override public void actionPerformed(ActionEvent e) { checkEmptyDataStyle(); + repaintPreviewPane(); } }); @@ -127,12 +130,9 @@ public class ChartEmptyDataStylePane extends AbstractAttrNoScrollPane { return new ActionListener() { public void actionPerformed(ActionEvent evt) { + emptyDataImage = null; checkCustomImage(); - changeEmptyDataStyle(); - } - - private void changeEmptyDataStyle() { - previewPane.repaint(); + repaintPreviewPane(); } }; } @@ -151,9 +151,8 @@ public class ChartEmptyDataStylePane extends AbstractAttrNoScrollPane { if (selectedFile != null && selectedFile.isFile()) { emptyDataImage = BaseUtils.readImage(selectedFile.getPath()); CoreGraphHelper.waitForImage(emptyDataImage); + repaintPreviewPane(); - previewPane.setImage(emptyDataImage); - previewPane.repaint(); } else { previewPane.setImage(null); } @@ -174,6 +173,12 @@ public class ChartEmptyDataStylePane extends AbstractAttrNoScrollPane { selectPictureButton.setVisible(customRadioButton.isSelected()); } + private void repaintPreviewPane() { + emptyDataImage = customRadioButton.isSelected() ? emptyDataImage : DEFAULT_EMPTY_DATA_IMAGE; + previewPane.setImage(emptyData.getSelectedIndex() == 0 ? emptyDataImage : null); + previewPane.repaint(); + } + @Override public String getIconPath() { return StringUtils.EMPTY; @@ -192,8 +197,7 @@ public class ChartEmptyDataStylePane extends AbstractAttrNoScrollPane { checkEmptyDataStyle(); checkCustomImage(); - previewPane.setImage(emptyDataImage); - previewPane.repaint(); + repaintPreviewPane(); } public void updateBean() {