BDC/diy-layout-creator
2
0
Fork 0
mirror of https://github.com/bancika/diy-layout-creator synced 2026-11-11 01:32:08 +10:00
Code Issues Packages Projects Releases Wiki Activity

zoom level doesn't reflect in the rulers

Browse Source
This commit is contained in:
bancika
2011-01-12 23:57:47 +00:00
parent aac45e8978
commit 2dc7a50e2f
6 changed files with 18 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files
diy-layout-creator --username bancika@gmail.com/DIYLC/lib/bancika-gui-framework.jar
BIN
View File
Binary file not shown.
diy-layout-creator --username bancika@gmail.com/DIYLC/library/main.jar
BIN
View File
Binary file not shown.
diy-layout-creator --username bancika@gmail.com/DIYLC/src/org/diylc/DIYLCStarter.java
+2
View File
@@ -38,6 +38,8 @@ public class DIYLCStarter {
LOG.error("Could not initialize log4j configuration", e);
}
LOG.info("Starting DIYLC with working directory " + System.getProperty("user.dir"));
url = DIYLCStarter.class.getResource("/config.properties");
properties = new Properties();
try {
diy-layout-creator --username bancika@gmail.com/DIYLC/src/org/diylc/common/IPlugInPort.java
+6 -2
View File
@@ -290,8 +290,6 @@ public interface IPlugInPort {
*/
void applyPropertiesToSelection(List<PropertyWrapper> 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();
}
diy-layout-creator --username bancika@gmail.com/DIYLC/src/org/diylc/plugins/file/ProjectPreview.java
-1
View File
@@ -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;
diy-layout-creator --username bancika@gmail.com/DIYLC/src/org/diylc/presenter/Presenter.java
+10 -16
View File
@@ -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,