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

Images can randomly disappear when zooming in and scrolling

Browse Source
This commit is contained in:
Bane Stojkovic
2026-08-20 14:53:36 +02:00
parent b766c55263
commit 8d506b21c4
5 changed files with 374 additions and 46 deletions
Download Patch File Download Diff File Expand all files Collapse all files
diylc/diylc-library/src/main/java/org/diylc/components/misc/Image.java
+43 -30
View File
@@ -21,6 +21,7 @@ import java.awt.AlphaComposite;
import java.awt.Composite;
import java.awt.Graphics2D;
import java.awt.Shape;
import java.awt.geom.AffineTransform;
import java.awt.geom.Point2D;
import java.awt.geom.Rectangle2D;
import java.awt.image.BufferedImage;
@@ -105,56 +106,56 @@ public class Image extends AbstractTransparentComponent<Void> {
@Override
public void draw(Graphics2D g2d, ComponentState componentState, boolean outlineMode, Project project,
IDrawingObserver drawingObserver) {
ImageIcon imageIcon = getImage();
if (imageIcon == null || imageIcon.getImage() == null || imageIcon.getIconWidth() <= 0
|| imageIcon.getIconHeight() <= 0) {
return;
}
if (!getImageRectangle().intersects(g2d.getClipBounds())) {
Shape clip = g2d.getClip();
if (clip != null && !clip.intersects(getImageRectangle())) {
return;
}
double scaleX;
double scaleY;
ImageIcon imageIcon = getImage();
if (getSizingMode() == ImageSizingMode.Scale) {
scaleX = scaleY = 1d * getScale().getValue() / 100d;
} else {
Point2D secondPoint = getControlPoint(1);
scaleX = 1d * Math.abs(point.getX() - secondPoint.getX()) / imageIcon.getIconWidth();
scaleY = 1d * Math.abs(point.getY() - secondPoint.getY()) / imageIcon.getIconHeight();
}
Shape clip = g2d.getClip().getBounds();
if (!clip.intersects(new Rectangle2D.Double(point.getX(), point.getY(), imageIcon.getIconWidth() * scaleX, imageIcon
.getIconHeight() * scaleY))) {
return;
}
Composite oldComposite = applyAlpha(g2d, componentState);
double x;
double y;
if (getSizingMode() == ImageSizingMode.Scale)
{
if (getSizingMode() == ImageSizingMode.Scale) {
scaleX = scaleY = 1d * getScale().getValue() / 100d;
x = point.getX();
y = point.getY();
} else {
Point2D secondPoint = getControlPoint(1);
scaleX = 1d * Math.abs(point.getX() - secondPoint.getX()) / imageIcon.getIconWidth();
scaleY = 1d * Math.abs(point.getY() - secondPoint.getY()) / imageIcon.getIconHeight();
x = Math.min(point.getX(), secondPoint.getX());
y = Math.min(point.getY(), secondPoint.getY());
}
Composite oldComposite = applyAlpha(g2d, componentState);
AffineTransform oldTx = g2d.getTransform();
if (getOrientation() != Orientation.DEFAULT) {
double theta = getOrientation().toRadians();
g2d.rotate(theta, x, y);
}
g2d.scale(scaleX, scaleY);
g2d.drawImage(imageIcon.getImage(), (int) (x / scaleX), (int) (y / scaleY), null);
g2d.drawImage(imageIcon.getImage(), (int) Math.round(x / scaleX), (int) Math.round(y / scaleY), null);
if (componentState == ComponentState.SELECTED) {
g2d.setComposite(oldComposite);
g2d.scale(1 / scaleX, 1 / scaleY);
g2d.setColor(SELECTION_COLOR);
g2d.setStroke(ObjectCache.getInstance().fetchBasicStroke(1f));
g2d.drawRect((int)x, (int)y, (int) (imageIcon.getIconWidth() * scaleX), (int) (imageIcon.getIconHeight() * scaleY));
g2d.drawRect((int) Math.round(x), (int) Math.round(y),
(int) Math.round(imageIcon.getIconWidth() * scaleX),
(int) Math.round(imageIcon.getIconHeight() * scaleY));
}
g2d.setTransform(oldTx);
g2d.setComposite(oldComposite);
}
@Override
@@ -296,22 +297,34 @@ public class Image extends AbstractTransparentComponent<Void> {
protected Point2D getFinalSecondPoint() {
Point2D finalSecondPoint;
if (getSizingMode() == ImageSizingMode.TwoPoints) {
finalSecondPoint = secondPoint;
finalSecondPoint = getControlPoint(1);
} else {
double scale = 1d * getScale().getValue() / 100d;
ImageIcon iconImage = getImage();
finalSecondPoint = new Point2D.Double(point.getX() + iconImage.getIconWidth() * scale,
point.getY() + iconImage.getIconHeight() * scale);
double w = (iconImage != null && iconImage.getIconWidth() > 0) ? iconImage.getIconWidth() * scale : 0;
double h = (iconImage != null && iconImage.getIconHeight() > 0) ? iconImage.getIconHeight() * scale : 0;
finalSecondPoint = new Point2D.Double(point.getX() + w, point.getY() + h);
}
return finalSecondPoint;
}
protected Rectangle2D getImageRectangle() {
Point2D finalSecondPoint = getFinalSecondPoint();
return new Rectangle2D.Double(Math.min(point.getX(), finalSecondPoint.getX()),
Math.min(point.getY(), finalSecondPoint.getY()),
Math.abs(point.getX() - finalSecondPoint.getX()),
Math.abs(point.getY() - finalSecondPoint.getY()));
double x = Math.min(point.getX(), finalSecondPoint.getX());
double y = Math.min(point.getY(), finalSecondPoint.getY());
double w = Math.abs(point.getX() - finalSecondPoint.getX());
double h = Math.abs(point.getY() - finalSecondPoint.getY());
Rectangle2D rect = new Rectangle2D.Double(x, y, w, h);
if (getOrientation() != null && getOrientation() != Orientation.DEFAULT) {
AffineTransform tx = AffineTransform.getRotateInstance(getOrientation().toRadians(), x, y);
return tx.createTransformedShape(rect).getBounds2D();
}
return rect;
}
@Override
public Rectangle2D getCachingBounds() {
return getImageRectangle();
}
public static enum ImageSizingMode {
diylc/diylc-library/src/main/java/org/diylc/components/misc/SVGImage.java
+54 -16
View File
@@ -22,6 +22,7 @@ import java.awt.Color;
import java.awt.Composite;
import java.awt.Graphics2D;
import java.awt.Shape;
import java.awt.geom.AffineTransform;
import java.awt.geom.Point2D;
import java.awt.geom.Rectangle2D;
import java.io.ByteArrayInputStream;
@@ -89,35 +90,35 @@ public class SVGImage extends AbstractTransparentComponent<Void> {
@Override
public void draw(Graphics2D g2d, ComponentState componentState, boolean outlineMode,
Project project, IDrawingObserver drawingObserver) {
double scaleX;
double scaleY;
SVGDiagram svgDiagram = getSvgDiagram();
if (getSizingMode() == ImageSizingMode.Scale) {
scaleX = scaleY = 1d * getScale().getValue() / 100d;
} else {
Point2D secondPoint = getControlPoint(1);
scaleX = 1d * Math.abs(point.getX() - secondPoint.getX()) / svgDiagram.getWidth();
scaleY = 1d * Math.abs(point.getY() - secondPoint.getY()) / svgDiagram.getHeight();
}
Shape clip = g2d.getClip().getBounds();
if (!clip.intersects(new Rectangle2D.Double(point.getX(), point.getY(),
svgDiagram.getWidth() * scaleX, svgDiagram.getHeight() * scaleY))) {
if (svgDiagram == null || svgDiagram.getWidth() <= 0 || svgDiagram.getHeight() <= 0) {
return;
}
Composite oldComposite = applyAlpha(g2d, componentState);
Shape clip = g2d.getClip();
if (clip != null && !clip.intersects(getImageRectangle())) {
return;
}
double scaleX;
double scaleY;
double x;
double y;
if (getSizingMode() == ImageSizingMode.Scale) {
scaleX = scaleY = 1d * getScale().getValue() / 100d;
x = point.getX();
y = point.getY();
} else {
Point2D secondPoint = getControlPoint(1);
scaleX = 1d * Math.abs(point.getX() - secondPoint.getX()) / svgDiagram.getWidth();
scaleY = 1d * Math.abs(point.getY() - secondPoint.getY()) / svgDiagram.getHeight();
x = Math.min(point.getX(), secondPoint.getX());
y = Math.min(point.getY(), secondPoint.getY());
}
Composite oldComposite = applyAlpha(g2d, componentState);
AffineTransform oldTx = g2d.getTransform();
if (getOrientation() != Orientation.DEFAULT) {
double theta = getOrientation().toRadians();
g2d.rotate(theta, x, y);
@@ -139,9 +140,13 @@ public class SVGImage extends AbstractTransparentComponent<Void> {
g2d.scale(1 / scaleX, 1 / scaleY);
g2d.setColor(SELECTION_COLOR);
g2d.setStroke(ObjectCache.getInstance().fetchBasicStroke(1f));
g2d.drawRect((int) x, (int) y, (int) (svgDiagram.getWidth() * scaleX),
(int) (svgDiagram.getHeight() * scaleY));
g2d.drawRect((int) Math.round(x), (int) Math.round(y),
(int) Math.round(svgDiagram.getWidth() * scaleX),
(int) Math.round(svgDiagram.getHeight() * scaleY));
}
g2d.setTransform(oldTx);
g2d.setComposite(oldComposite);
}
@Override
@@ -280,6 +285,39 @@ public class SVGImage extends AbstractTransparentComponent<Void> {
this.orientation = orientation;
}
protected Point2D getFinalSecondPoint() {
Point2D finalSecondPoint;
if (getSizingMode() == ImageSizingMode.TwoPoints) {
finalSecondPoint = getControlPoint(1);
} else {
double scale = 1d * getScale().getValue() / 100d;
SVGDiagram diagram = getSvgDiagram();
double w = (diagram != null && diagram.getWidth() > 0) ? diagram.getWidth() * scale : 0;
double h = (diagram != null && diagram.getHeight() > 0) ? diagram.getHeight() * scale : 0;
finalSecondPoint = new Point2D.Double(point.getX() + w, point.getY() + h);
}
return finalSecondPoint;
}
protected Rectangle2D getImageRectangle() {
Point2D finalSecondPoint = getFinalSecondPoint();
double x = Math.min(point.getX(), finalSecondPoint.getX());
double y = Math.min(point.getY(), finalSecondPoint.getY());
double w = Math.abs(point.getX() - finalSecondPoint.getX());
double h = Math.abs(point.getY() - finalSecondPoint.getY());
Rectangle2D rect = new Rectangle2D.Double(x, y, w, h);
if (getOrientation() != null && getOrientation() != Orientation.DEFAULT) {
AffineTransform tx = AffineTransform.getRotateInstance(getOrientation().toRadians(), x, y);
return tx.createTransformedShape(rect).getBounds2D();
}
return rect;
}
@Override
public Rectangle2D getCachingBounds() {
return getImageRectangle();
}
public static enum ImageSizingMode {
TwoPoints("Opposing Points"), Scale("Scale");