|
|
@ -136,9 +136,12 @@ public class ExternalImageBackgroundQuickPane extends BackgroundQuickPane { |
|
|
|
protected Void doInBackground() throws Exception { |
|
|
|
protected Void doInBackground() throws Exception { |
|
|
|
Image image = imageFileChooser.isCompressSelected() ? ImageUtils.defaultImageCompress(selectedFile) : BaseUtils.readImage(selectedFile.getPath()); |
|
|
|
Image image = imageFileChooser.isCompressSelected() ? ImageUtils.defaultImageCompress(selectedFile) : BaseUtils.readImage(selectedFile.getPath()); |
|
|
|
CoreGraphHelper.waitForImage(image); |
|
|
|
CoreGraphHelper.waitForImage(image); |
|
|
|
if (cachedId == null) { |
|
|
|
// if (cachedId == null) {
|
|
|
|
|
|
|
|
// cachedId = UUID.randomUUID().toString();
|
|
|
|
|
|
|
|
// }
|
|
|
|
|
|
|
|
// pioneer:POB-197,POB-388 复制的报表块修改外置背景图的时候用的同一个id,导致复制报表块和原始报表块背景被同步修改了。
|
|
|
|
|
|
|
|
// 这里去掉cachedId的null判断,让每次编辑都生成一个新的cachedId避免这个问题
|
|
|
|
cachedId = UUID.randomUUID().toString(); |
|
|
|
cachedId = UUID.randomUUID().toString(); |
|
|
|
} |
|
|
|
|
|
|
|
previewPane.setImage(image); |
|
|
|
previewPane.setImage(image); |
|
|
|
imageStyle = Style.DEFAULT_STYLE.deriveImageLayout(imageLayoutPane.getSelectedItem()); |
|
|
|
imageStyle = Style.DEFAULT_STYLE.deriveImageLayout(imageLayoutPane.getSelectedItem()); |
|
|
|
previewPane.setImageStyle(imageStyle); |
|
|
|
previewPane.setImageStyle(imageStyle); |
|
|
|