diff --git a/designer/src/com/fr/design/mainframe/JWorkBook.java b/designer/src/com/fr/design/mainframe/JWorkBook.java index 159886966..de214fb6d 100644 --- a/designer/src/com/fr/design/mainframe/JWorkBook.java +++ b/designer/src/com/fr/design/mainframe/JWorkBook.java @@ -371,8 +371,6 @@ public class JWorkBook extends JTemplate { HistoryTemplateListPane.getInstance().getCurrentEditingTemplate().setJTemplateResolution(resolution); polyDezi.updateUI(); } -// reportComposite.centerCardPane.editingComponet.elementCasePane.getGrid().setVerticalValue(10); - HistoryTemplateListPane.getInstance().getCurrentEditingTemplate().fireTargetModified(); } @Override diff --git a/designer/src/com/fr/design/mainframe/ReportComponentComposite.java b/designer/src/com/fr/design/mainframe/ReportComponentComposite.java index 6019d1c0d..431a2ae5d 100644 --- a/designer/src/com/fr/design/mainframe/ReportComponentComposite.java +++ b/designer/src/com/fr/design/mainframe/ReportComponentComposite.java @@ -79,7 +79,7 @@ public class ReportComponentComposite extends JComponent { } @Override public void keyPressed(KeyEvent e) { - if( e.getKeyText(e.getKeyCode()).toLowerCase().equals("ctrl")){ + if( e.isControlDown()){ isCtrl = true ; } } diff --git a/designer/src/com/fr/design/mainframe/form/FormReportComponentComposite.java b/designer/src/com/fr/design/mainframe/form/FormReportComponentComposite.java index 9f4aebccc..b6173c6d8 100644 --- a/designer/src/com/fr/design/mainframe/form/FormReportComponentComposite.java +++ b/designer/src/com/fr/design/mainframe/form/FormReportComponentComposite.java @@ -62,7 +62,7 @@ public class FormReportComponentComposite extends JComponent implements TargetMo } @Override public void keyPressed(KeyEvent e) { - if( e.getKeyText(e.getKeyCode()).toLowerCase().equals("ctrl")){ + if( e.isControlDown()){ isCtrl = true ; } } diff --git a/designer/src/com/fr/poly/PolyDesignUI.java b/designer/src/com/fr/poly/PolyDesignUI.java index bc5fb7af8..0eaf7c139 100644 --- a/designer/src/com/fr/poly/PolyDesignUI.java +++ b/designer/src/com/fr/poly/PolyDesignUI.java @@ -47,8 +47,6 @@ public class PolyDesignUI extends ComponentUI { private static final double SCROLL_POINT = 50; private static final int SCROLL_DISTANCE = 15; - private static final int CREATORWIDTH = 30; - private static final int CREATORGEIGHT = 19; private static final int TEN = 10; private static final int HHUNDRED = 100; private PolyDesigner designer; diff --git a/designer/src/com/fr/poly/creator/ECBlockCreator.java b/designer/src/com/fr/poly/creator/ECBlockCreator.java index 860b65d72..92313115e 100644 --- a/designer/src/com/fr/poly/creator/ECBlockCreator.java +++ b/designer/src/com/fr/poly/creator/ECBlockCreator.java @@ -23,8 +23,8 @@ import com.fr.stable.unit.UnitRectangle; */ public class ECBlockCreator extends BlockCreator { private ECBlockEditor editor; - private static final int CREATORWIDTH = 30; - private static final int CREATORGEIGHT = 19; + private static final int CREATOR_WIDTH = 30; + private static final int CREATOR_HEIGHT = 19; public ECBlockCreator() { @@ -69,12 +69,12 @@ public class ECBlockCreator extends BlockCreator { @Override public int getX(float time) { - return (int) ((this.getX() - CREATORWIDTH) * time) + CREATORWIDTH; + return (int) ((this.getX() - CREATOR_WIDTH) * time) + CREATOR_WIDTH; } @Override public int getY(float time) { - return (int) ((this.getY() - CREATORGEIGHT) * time) + CREATORGEIGHT; + return (int) ((this.getY() - CREATOR_HEIGHT) * time) + CREATOR_HEIGHT; } /** diff --git a/designer_base/src/com/fr/design/mainframe/JTemplate.java b/designer_base/src/com/fr/design/mainframe/JTemplate.java index 2d8f42aad..8f64ce971 100644 --- a/designer_base/src/com/fr/design/mainframe/JTemplate.java +++ b/designer_base/src/com/fr/design/mainframe/JTemplate.java @@ -143,11 +143,13 @@ public abstract class JTemplate> ex return undoState; } + /** + * set/get 模板屏幕分辨率 + */ public abstract void setJTemplateResolution(int resolution); public abstract int getJTemplateResolution(); - ; /** * 初始化权限细粒度撤销状态 @@ -218,10 +220,16 @@ public abstract class JTemplate> ex */ public abstract void removeParameterPaneSelection(); + /** + * 缩放参数 + */ public abstract void setScale(int resolution); public abstract int getScale(); + /** + * 缩放参数自适应 + */ public abstract int selfAdaptUpdate(); protected abstract DesignModelAdapter createDesignModel(); diff --git a/designer_form/src/com/fr/design/mainframe/FormArea.java b/designer_form/src/com/fr/design/mainframe/FormArea.java index abab2469e..6c59130df 100644 --- a/designer_form/src/com/fr/design/mainframe/FormArea.java +++ b/designer_form/src/com/fr/design/mainframe/FormArea.java @@ -114,7 +114,7 @@ public class FormArea extends JComponent implements ScrollRulerComponent { } @Override public void keyPressed(KeyEvent e) { - if( e.getKeyText(e.getKeyCode()).toLowerCase().equals("ctrl")){ + if( e.isControlDown()){ isCtrl = true ; } } diff --git a/designer_form/src/com/fr/design/mainframe/JForm.java b/designer_form/src/com/fr/design/mainframe/JForm.java index 7ded93c6e..7a3ca7ac4 100644 --- a/designer_form/src/com/fr/design/mainframe/JForm.java +++ b/designer_form/src/com/fr/design/mainframe/JForm.java @@ -260,25 +260,6 @@ public class JForm extends JTemplate implements BaseJForm { @Override public void setScale(int resolution) { -// this.resolution = resolution; -// ElementCasePane elementCasePane = ((FormReportComponentComposite)reportComposite).elementCaseDesigner.getEditingElementCasePane(); -// elementCasePane.setResolution(resolution); -// elementCasePane.getGrid().getGridMouseAdapter().setResolution(resolution); -// elementCasePane.getGrid().setResolution(resolution); -// //更新Grid -// Grid grid = elementCasePane.getGrid(); -// DynamicUnitList rowHeightList = ReportHelper.getRowHeightList(elementCasePane.getEditingElementCase()); -// DynamicUnitList columnWidthList = ReportHelper.getColumnWidthList(elementCasePane.getEditingElementCase()); -// grid.setVerticalExtent(GridUtils.getExtentValue(0, rowHeightList, grid.getHeight(), resolution)); -// grid.setHorizontalExtent(GridUtils.getExtentValue(0, columnWidthList, grid.getWidth(), resolution)); -// elementCasePane.getGrid().updateUI(); -// //更新Column和Row -// ((DynamicScrollBar)elementCasePane.getVerticalScrollBar()).setDpi(resolution); -// ((DynamicScrollBar)elementCasePane.getHorizontalScrollBar()).setDpi(resolution); -// elementCasePane.getGridColumn().setResolution(resolution); -// elementCasePane.getGridColumn().updateUI(); -// elementCasePane.getGridRow().setResolution(resolution); -// elementCasePane.getGridRow().updateUI(); } @Override