From b6784ae471719e6cecdc375eb768ac71f5b0768c Mon Sep 17 00:00:00 2001 From: fr_shine Date: Thu, 12 Oct 2017 10:29:56 +0800 Subject: [PATCH 1/9] get default json url --- .../chart/map/designer/type/VanChartMapSourceChoosePane.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/designer_chart/src/com/fr/plugin/chart/map/designer/type/VanChartMapSourceChoosePane.java b/designer_chart/src/com/fr/plugin/chart/map/designer/type/VanChartMapSourceChoosePane.java index 4408e085b5..85df10acc0 100644 --- a/designer_chart/src/com/fr/plugin/chart/map/designer/type/VanChartMapSourceChoosePane.java +++ b/designer_chart/src/com/fr/plugin/chart/map/designer/type/VanChartMapSourceChoosePane.java @@ -564,7 +564,7 @@ public class VanChartMapSourceChoosePane extends JPanel implements UIObserver { mapDataTree.changeRootNode(this.getRootNode()); if(samePlotChange) { - mapPlot.setGeoUrl(GEOJSONHelper.getInstance().getDefaultJSONURL()); + mapPlot.setGeoUrl(GEOJSONHelper.getDefaultJSONURL()); mapDataTree.selectDefaultTreeNode(); selectTreePath = mapDataTree.getSelectionPath(); sourceComboBox.setSelectedItem(selectTreePath); From 7be505160d47982dc97ffc35a38f084dec272606 Mon Sep 17 00:00:00 2001 From: fr_shine Date: Thu, 12 Oct 2017 13:33:30 +0800 Subject: [PATCH 2/9] =?UTF-8?q?phantom=E5=9C=A8chartdemoimage=E5=93=AA?= =?UTF-8?q?=E4=B8=AA=E7=BA=BF=E7=A8=8B=E9=87=8C=E9=9D=A2=E5=90=AF=E5=8A=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/com/fr/design/ChartTypeInterfaceManager.java | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/designer_chart/src/com/fr/design/ChartTypeInterfaceManager.java b/designer_chart/src/com/fr/design/ChartTypeInterfaceManager.java index e53d7849c9..0512a3d82f 100644 --- a/designer_chart/src/com/fr/design/ChartTypeInterfaceManager.java +++ b/designer_chart/src/com/fr/design/ChartTypeInterfaceManager.java @@ -69,6 +69,7 @@ import com.fr.plugin.chart.map.MapIndependentVanChartInterface; import com.fr.plugin.chart.map.VanChartMapPlot; import com.fr.plugin.chart.multilayer.MultiPieIndependentVanChartInterface; import com.fr.plugin.chart.multilayer.VanChartMultiPiePlot; +import com.fr.plugin.chart.phantom.VanChartPhantomService; import com.fr.plugin.chart.pie.PieIndependentVanChartInterface; import com.fr.plugin.chart.radar.RadarIndependentVanChartInterface; import com.fr.plugin.chart.radar.VanChartRadarPlot; @@ -156,7 +157,9 @@ public class ChartTypeInterfaceManager implements ExtraChartDesignClassManagerPr @Override public void run() { - + + VanChartPhantomService.startPhantomService(); + initAllChartsDemoImage(allCharts); } }).start(); From 29399b052210fe832b3688f73235368678086050 Mon Sep 17 00:00:00 2001 From: kerry Date: Thu, 12 Oct 2017 14:35:25 +0800 Subject: [PATCH 3/9] =?UTF-8?q?REPORT-4947=20=E8=A1=A8=E5=8D=95=E7=BB=84?= =?UTF-8?q?=E4=BB=B6=E9=9A=90=E8=97=8F=E5=8A=9F=E8=83=BD=E6=B2=A1=E6=9C=89?= =?UTF-8?q?=E4=BA=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../designer/creator/DedicateLayoutContainer.java | 10 ++++++++++ .../design/mainframe/widget/ui/FormWidgetCardPane.java | 1 + 2 files changed, 11 insertions(+) diff --git a/designer_form/src/com/fr/design/designer/creator/DedicateLayoutContainer.java b/designer_form/src/com/fr/design/designer/creator/DedicateLayoutContainer.java index f223e5d8f2..4247c7a737 100644 --- a/designer_form/src/com/fr/design/designer/creator/DedicateLayoutContainer.java +++ b/designer_form/src/com/fr/design/designer/creator/DedicateLayoutContainer.java @@ -66,6 +66,16 @@ public abstract class DedicateLayoutContainer extends XLayoutContainer { child.toData().setWidgetName(name); } + /** + * 重置组件的可见性 + * @param visible 可见性 + */ + public void resetVisible(boolean visible){ + super.resetVisible(visible); + XCreator child = getXCreator(XWScaleLayout.INDEX); + //实现WTitleLayout的SetWidgetName + child.toData().setVisible(visible); + } /** * 返回对应属性表的组件，scale和title返回其子组件 * diff --git a/designer_form/src/com/fr/design/mainframe/widget/ui/FormWidgetCardPane.java b/designer_form/src/com/fr/design/mainframe/widget/ui/FormWidgetCardPane.java index 14d3eb37a4..636701f025 100644 --- a/designer_form/src/com/fr/design/mainframe/widget/ui/FormWidgetCardPane.java +++ b/designer_form/src/com/fr/design/mainframe/widget/ui/FormWidgetCardPane.java @@ -213,6 +213,7 @@ public class FormWidgetCardPane extends AbstractAttrNoScrollPane { if (ComparatorUtils.equals(getGlobalName(), Inter.getLocText("FR-Designer_Basic")) && widgetPropertyPane != null) { widgetPropertyPane.update(widget); xCreator.resetCreatorName(widget.getWidgetName()); + xCreator.resetVisible(widget.isVisible()); designer.getEditListenerTable().fireCreatorModified(xCreator, DesignerEvent.CREATOR_RENAMED); return; } From 9b8aff0acd5046837b9acb4621373a4cbf917890 Mon Sep 17 00:00:00 2001 From: kerry Date: Thu, 12 Oct 2017 14:36:28 +0800 Subject: [PATCH 4/9] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/fr/design/designer/creator/DedicateLayoutContainer.java | 1 - 1 file changed, 1 deletion(-) diff --git a/designer_form/src/com/fr/design/designer/creator/DedicateLayoutContainer.java b/designer_form/src/com/fr/design/designer/creator/DedicateLayoutContainer.java index 4247c7a737..8c3cd743de 100644 --- a/designer_form/src/com/fr/design/designer/creator/DedicateLayoutContainer.java +++ b/designer_form/src/com/fr/design/designer/creator/DedicateLayoutContainer.java @@ -73,7 +73,6 @@ public abstract class DedicateLayoutContainer extends XLayoutContainer { public void resetVisible(boolean visible){ super.resetVisible(visible); XCreator child = getXCreator(XWScaleLayout.INDEX); - //实现WTitleLayout的SetWidgetName child.toData().setVisible(visible); } /** From b9dd1172202233a9ae42a9d7b0886723e8123b15 Mon Sep 17 00:00:00 2001 From: juhaoyu <2335173323@qq.com> Date: Thu, 12 Oct 2017 15:28:55 +0800 Subject: [PATCH 5/9] =?UTF-8?q?=E5=90=AF=E5=8A=A8=E6=B3=A8=E5=86=8C?= =?UTF-8?q?=E9=83=A8=E5=88=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- designer_base/src/com/fr/start/BaseDesigner.java | 3 +++ 1 file changed, 3 insertions(+) diff --git a/designer_base/src/com/fr/start/BaseDesigner.java b/designer_base/src/com/fr/start/BaseDesigner.java index 2b8aacd626..618b91baa3 100644 --- a/designer_base/src/com/fr/start/BaseDesigner.java +++ b/designer_base/src/com/fr/start/BaseDesigner.java @@ -32,6 +32,7 @@ import com.fr.plugin.PluginCollector; import com.fr.plugin.conversion.PluginConversionModule; import com.fr.plugin.manage.PluginManager; import com.fr.plugin.manage.PluginStartup; +import com.fr.register.Register; import com.fr.stable.ArrayUtils; import com.fr.stable.BuildContext; import com.fr.stable.OperatingSystem; @@ -61,6 +62,8 @@ public abstract class BaseDesigner extends ToolBarMenuDock { public BaseDesigner(String[] args) { RestartHelper.deleteRecordFilesWhenStart(); + //启动core + Register.load(); //初始化插件引擎 PluginStartup.start(); //标记一下是设计器启动 From 8a8deae28bb4fb9eda07f50f68efa714722d2409 Mon Sep 17 00:00:00 2001 From: MoMeak Date: Thu, 12 Oct 2017 15:56:53 +0800 Subject: [PATCH 6/9] =?UTF-8?q?REPORT-4888=20=E8=AE=BE=E8=AE=A1=E5=99=A8?= =?UTF-8?q?=E4=BA=A4=E4=BA=92=E4=BF=AE=E6=94=B9=20=E8=81=9A=E5=90=88?= =?UTF-8?q?=E6=8A=A5=E8=A1=A8=E5=8D=95=E5=85=83=E6=8A=A5=E8=A1=A8=E7=BC=A9?= =?UTF-8?q?=E6=94=BE=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- designer/src/com/fr/poly/PolyDesignUI.java | 27 ++++++++++++---------- 1 file changed, 15 insertions(+), 12 deletions(-) diff --git a/designer/src/com/fr/poly/PolyDesignUI.java b/designer/src/com/fr/poly/PolyDesignUI.java index 8cc3583d85..b915e1ad8e 100644 --- a/designer/src/com/fr/poly/PolyDesignUI.java +++ b/designer/src/com/fr/poly/PolyDesignUI.java @@ -220,18 +220,21 @@ public class PolyDesignUI extends ComponentUI { ArrayList dbcomponents = new ArrayList(); // richer:禁止双缓冲行为,否则会出现两个图像 ComponentUtils.disableBuffer(comp, dbcomponents); - if (comp instanceof ECBlockCreator) { - Graphics clipg = g.create((int) (x * time), (int) (y * time), (int) (width * time), (int) (height * time)); - comp.paint(clipg); - clipg.dispose(); - }else { - BufferedImage img = CoreGraphHelper.createBufferedImage(comp.getWidth(), comp.getHeight(), BufferedImage.TYPE_INT_RGB); - Graphics2D g2d = img.createGraphics(); - g2d.setRenderingHint(RenderingHints.KEY_ANTIALIASING, RenderingHints.VALUE_ANTIALIAS_ON); - comp.printAll(g2d); - g2d.dispose(); - g.drawImage(img, (int) (x * time), (int) (y * time), (int) (width * time), (int) (height * time),null); - } +// if (comp instanceof ECBlockCreator) { +// Graphics clipg = g.create((int) (x * time), (int) (y * time), (int) (width * time), (int) (height * time)); +// comp.paint(clipg); +// clipg.dispose(); +// }else { + BufferedImage img = CoreGraphHelper.createBufferedImage(comp.getWidth(), comp.getHeight(), BufferedImage.TYPE_4BYTE_ABGR); + + Graphics2D g2d = img.createGraphics(); + g2d.setRenderingHint(RenderingHints.KEY_ANTIALIASING, RenderingHints.VALUE_ANTIALIAS_ON); + comp.printAll(g2d); + g.drawImage(img, (int) (x * time), (int) (y * time), (int) (width * time), (int) (height * time),null); + + g2d.dispose(); + +// } ComponentUtils.resetBuffer(dbcomponents); } From e5a54886b5855bd3ca0d7766a6157d27c165d712 Mon Sep 17 00:00:00 2001 From: MoMeak Date: Thu, 12 Oct 2017 16:10:43 +0800 Subject: [PATCH 7/9] =?UTF-8?q?REPORT-4888=20=E8=AE=BE=E8=AE=A1=E5=99=A8?= =?UTF-8?q?=E4=BA=A4=E4=BA=92=E4=BF=AE=E6=94=B9=20=E8=81=9A=E5=90=88?= =?UTF-8?q?=E6=8A=A5=E8=A1=A8=E5=8D=95=E5=85=83=E6=8A=A5=E8=A1=A8=E7=BC=A9?= =?UTF-8?q?=E6=94=BE=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- designer/src/com/fr/poly/creator/BlockCreator.java | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/designer/src/com/fr/poly/creator/BlockCreator.java b/designer/src/com/fr/poly/creator/BlockCreator.java index 052e111a8e..a5e9535c2c 100644 --- a/designer/src/com/fr/poly/creator/BlockCreator.java +++ b/designer/src/com/fr/poly/creator/BlockCreator.java @@ -114,10 +114,12 @@ public abstract class BlockCreator extends JComponent i public Rectangle getEditorBounds() { Rectangle bounds = this.getBounds(); Dimension d = getEditor().getCornerSize(); - bounds.x -= d.width + designer.getHorizontalValue(); - bounds.y -= d.height + designer.getVerticalValue(); - bounds.width += d.width + PolyConstants.OPERATION_SIZE; - bounds.height += d.height + PolyConstants.OPERATION_SIZE; + //ECBlockCreator缩放的时候边框需要重新算下 + double times = this.designer.getResolution() / (double)resolution; + bounds.x -= d.width/times + designer.getHorizontalValue(); + bounds.y -= d.height/times + designer.getVerticalValue(); + bounds.width += Math.ceil(d.width/times + PolyConstants.OPERATION_SIZE/times); + bounds.height += Math.ceil(d.height/times + PolyConstants.OPERATION_SIZE/times); return bounds; } From 0472632a0e585b496589fbc3f5753bb57b5d34a0 Mon Sep 17 00:00:00 2001 From: MoMeak Date: Thu, 12 Oct 2017 16:19:39 +0800 Subject: [PATCH 8/9] =?UTF-8?q?REPORT-4888=20=E8=AE=BE=E8=AE=A1=E5=99=A8?= =?UTF-8?q?=E4=BA=A4=E4=BA=92=E4=BF=AE=E6=94=B9=20=E8=81=9A=E5=90=88?= =?UTF-8?q?=E6=8A=A5=E8=A1=A8=E5=8D=95=E5=85=83=E6=8A=A5=E8=A1=A8=E7=BC=A9?= =?UTF-8?q?=E6=94=BE-=E5=AE=9A=E4=BD=8D=E7=BA=BF=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- designer/src/com/fr/poly/creator/ECBlockCreator.java | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/designer/src/com/fr/poly/creator/ECBlockCreator.java b/designer/src/com/fr/poly/creator/ECBlockCreator.java index 3921bea39a..3f46cee412 100644 --- a/designer/src/com/fr/poly/creator/ECBlockCreator.java +++ b/designer/src/com/fr/poly/creator/ECBlockCreator.java @@ -23,8 +23,6 @@ import com.fr.stable.unit.UnitRectangle; */ public class ECBlockCreator extends BlockCreator { private ECBlockEditor editor; - private static final int CREATOR_WIDTH = 20; - private static final int CREATOR_HEIGHT = 9; public ECBlockCreator() { @@ -69,12 +67,12 @@ public class ECBlockCreator extends BlockCreator { @Override public int getX(float time) { - return Math.round ((this.getX() - CREATOR_WIDTH) * time) + CREATOR_WIDTH; + return Math.round (this.getX() * time); } @Override public int getY(float time) { - return Math.round ((this.getY() - CREATOR_HEIGHT) * time) + CREATOR_HEIGHT; + return Math.round (this.getY() * time); } /** From ab181317f31b8e6d6fa1fceeedf717881d0cfdad Mon Sep 17 00:00:00 2001 From: daniel Date: Thu, 12 Oct 2017 17:17:27 +0800 Subject: [PATCH 9/9] PFC-1053 --- designer_base/src/com/fr/start/BaseDesigner.java | 2 -- 1 file changed, 2 deletions(-) diff --git a/designer_base/src/com/fr/start/BaseDesigner.java b/designer_base/src/com/fr/start/BaseDesigner.java index 618b91baa3..54d5b1c418 100644 --- a/designer_base/src/com/fr/start/BaseDesigner.java +++ b/designer_base/src/com/fr/start/BaseDesigner.java @@ -64,8 +64,6 @@ public abstract class BaseDesigner extends ToolBarMenuDock { RestartHelper.deleteRecordFilesWhenStart(); //启动core Register.load(); - //初始化插件引擎 - PluginStartup.start(); //标记一下是设计器启动 PluginConversionModule.getInstance().markDesignerStart(); SiteCenter.getInstance();