From 2dc7a50e2f55e9eba816c0be5d08699ce1451f7f Mon Sep 17 00:00:00 2001 From: bancika Date: Wed, 12 Jan 2011 23:57:47 +0000 Subject: [PATCH] zoom level doesn't reflect in the rulers --- .../DIYLC/lib/bancika-gui-framework.jar | Bin 86502 -> 86500 bytes .../DIYLC/library/main.jar | Bin 515378 -> 514048 bytes .../DIYLC/src/org/diylc/DIYLCStarter.java | 2 ++ .../src/org/diylc/common/IPlugInPort.java | 8 ++++-- .../diylc/plugins/file/ProjectPreview.java | 1 - .../src/org/diylc/presenter/Presenter.java | 26 +++++++----------- 6 files changed, 18 insertions(+), 19 deletions(-) diff --git a/ diy-layout-creator --username bancika@gmail.com/DIYLC/lib/bancika-gui-framework.jar b/ diy-layout-creator --username bancika@gmail.com/DIYLC/lib/bancika-gui-framework.jar index ca6747e9a7a36a6289ac1892bd7db07c5aba34f4..8a9069c2435e06d3017837e4cf841df1afae90c8 100644 GIT binary patch delta 4902 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

Us}G)`vSg0`m&$ZQDQ#Of7m{rY;430> z+ZIUS^?NasIn)Fe#cPMMr}{9KV#l&hXi(_#UM~e!dpmpF^ zAh+y+3MBiP8NCg}if+Tf%jV(7qHot*<3-8%huR0#1m1;TKv=IhQu%1|cxnhnWu0g^}|8A!mI{@jZ=oYIn-<~cE`$}+GV;dTOiQ2*zW z#Np(Y=;OFCJ$hw|L21VVUbzN6zJJhjQClK?#D__jD*?__XY`saabg|0-J9G1bM#=0 zm*a3MOXfTiSTctI*Cg$XuE|sUPXzIF29hxQf0r?ued!T<5dPBBQ9ZP3XIgPd{T1S; zu=eQBrTza!yV?5@#e4-EQ3f0F`5J AlK=n! diff --git a/ diy-layout-creator --username bancika@gmail.com/DIYLC/library/main.jar b/ diy-layout-creator --username bancika@gmail.com/DIYLC/library/main.jar index 7397db7d537f5a9abe7b713a8908f15efb1f1755..473a0b164a915c0f18115a25e8098b159a9605c9 100644 GIT binary patch delta 5348 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 H2jl+$qsHF; delta 6670 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 properties) throws Exception; - // void setCursorIcon(Icon icon); - /** * Sets the new component slot. Specified component type will be used to * instantiate new component. @@ -305,7 +303,13 @@ public interface IPlugInPort { */ void setMetric(boolean isMetric); + /** + * Groups all selected components. + */ void groupSelectedComponents(); + /** + * Ungroups all selected components. + */ void ungroupSelectedComponents(); } diff --git a/ diy-layout-creator --username bancika@gmail.com/DIYLC/src/org/diylc/plugins/file/ProjectPreview.java b/ diy-layout-creator --username bancika@gmail.com/DIYLC/src/org/diylc/plugins/file/ProjectPreview.java index 156be51f..8d6fe1d1 100644 --- a/ diy-layout-creator --username bancika@gmail.com/DIYLC/src/org/diylc/plugins/file/ProjectPreview.java +++ b/ diy-layout-creator --username bancika@gmail.com/DIYLC/src/org/diylc/plugins/file/ProjectPreview.java @@ -131,7 +131,6 @@ public class ProjectPreview extends JPanel implements PropertyChangeListener, IF } else { zoomRatio = rect.getHeight() / d.getHeight(); } - System.out.println(zoomRatio); // d.setSize(d.getWidth() * zoomRatio, d.getHeight() * zoomRatio); int x = (int) (rect.getWidth() - d.getWidth() * zoomRatio) / 2; int y = (int) (rect.getHeight() - d.getHeight() * zoomRatio) / 2; diff --git a/ diy-layout-creator --username bancika@gmail.com/DIYLC/src/org/diylc/presenter/Presenter.java b/ diy-layout-creator --username bancika@gmail.com/DIYLC/src/org/diylc/presenter/Presenter.java index 0e4e47b9..db27e4ac 100644 --- a/ diy-layout-creator --username bancika@gmail.com/DIYLC/src/org/diylc/presenter/Presenter.java +++ b/ diy-layout-creator --username bancika@gmail.com/DIYLC/src/org/diylc/presenter/Presenter.java @@ -235,9 +235,6 @@ public class Presenter implements IPlugInPort { if (drawOptions.contains(DrawOption.GRID)) { double zoomStep = Constants.GRID * zoomLevel; - // Point2D p = new Point2D.Double(step, 0); - // g2d.getTransform().transform(p, p); - // System.out.println(p); g2dWrapper.setColor(Constants.GRID_COLOR); for (double i = zoomStep; i < d.width; i += zoomStep) { @@ -272,17 +269,8 @@ public class Presenter implements IPlugInPort { state = ComponentState.SELECTED; } } - // If the component is being dragged, draw it in a separate - // composite. - // if (state == ComponentState.DRAGGING) { - // g2dWrapper.setComposite(alphaComposite); - // } // Draw the component through the g2dWrapper. component.draw(g2dWrapper, state, currentProject); - // Restore the composite if needed. - // if (state == ComponentState.DRAGGING) { - // g2dWrapper.setComposite(mainComposite); - // } componentAreaMap.put(component, g2dWrapper.finishedDrawingComponent()); } // Draw control points. @@ -292,11 +280,11 @@ public class Presenter implements IPlugInPort { Point controlPoint = component.getControlPoint(i); try { if (shouldShowControlPointsFor(component)) { - g2d.setColor(Constants.CONTROL_POINT_COLOR); - g2d.setStroke(new BasicStroke(2)); + g2dWrapper.setColor(Constants.CONTROL_POINT_COLOR); + g2dWrapper.setStroke(new BasicStroke(2)); // g2d.drawOval(controlPoint.x - 2, // controlPoint.y - 2, 4, 4); - g2d.fillOval(controlPoint.x - CONTROL_POINT_SIZE / 2, + g2dWrapper.fillOval(controlPoint.x - CONTROL_POINT_SIZE / 2, controlPoint.y - CONTROL_POINT_SIZE / 2, CONTROL_POINT_SIZE, CONTROL_POINT_SIZE); } @@ -309,6 +297,8 @@ public class Presenter implements IPlugInPort { } } + // Go back to the original transformation and zoom in to draw the + // selection rectangle and other similar elements. g2d.setTransform(initialTx); if ((drawOptions.contains(DrawOption.ZOOM)) && (Math.abs(1.0 - zoomLevel) > 1e-4)) { g2d.scale(zoomLevel, zoomLevel); @@ -323,7 +313,7 @@ public class Presenter implements IPlugInPort { g2d.draw(selectionRect); } - // // Draw component area for test + // Draw component area for test if (DEBUG_COMPONENT_AREAS) { g2d.setStroke(new BasicStroke()); g2d.setColor(Color.red); @@ -335,11 +325,14 @@ public class Presenter implements IPlugInPort { @Override public void injectGUIComponent(JComponent component, int position) throws BadPositionException { + LOG.info(String.format("injectGUIComponent(%s, %s)", component.toString(), position)); view.addComponent(component, position); } @Override public void injectMenuAction(Action action, String menuName) { + LOG.info(String.format("injectMenuAction(%s, %s)", action == null ? "Separator" : action + .getValue(Action.NAME), menuName)); view.addMenuAction(action, menuName); } @@ -458,6 +451,7 @@ public class Presenter implements IPlugInPort { @Override public void selectAll() { + LOG.info("selectAll()"); this.selectedComponents = new ComponentSelection(currentProject.getComponents()); messageDispatcher.dispatchMessage(EventType.SELECTION_CHANGED, selectedComponents); messageDispatcher.dispatchMessage(EventType.SELECTION_SIZE_CHANGED,