Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Constrain zoom levels #4809

Merged
merged 5 commits into from
May 30, 2024
Merged

Constrain zoom levels #4809

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
1df4fdd
Remove adjust grid panels as they are unused
kwvanderlinde May 28, 2024
6a48f55
Cap zoom level to 175, or (31,367,596%) scale
kwvanderlinde May 28, 2024
3cd1658
Now also clamp explicitly set scales
kwvanderlinde May 28, 2024
fa56e4c
Separate minimum zoom level
kwvanderlinde May 28, 2024
7ceba4d
Fix the width and alignment of the zoom status bar
kwvanderlinde May 28, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
39 changes: 14 additions & 25 deletions src/main/java/net/rptools/maptool/client/swing/ZoomStatusBar.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,6 @@
*/
package net.rptools.maptool.client.swing;

import java.awt.Dimension;
import java.awt.event.ActionEvent;
import java.awt.event.ActionListener;
import java.text.ParseException;
Expand All @@ -31,10 +30,9 @@
* and changing the zoom level to that amount.
*/
public class ZoomStatusBar extends JTextField implements ActionListener {
private static final Dimension minSize = new Dimension(50, 10);

public ZoomStatusBar() {
super("", RIGHT);
super("", 9);
setHorizontalAlignment(RIGHT);
setToolTipText(I18N.getString("ZoomStatusBar.tooltip"));
addActionListener(this);
}
Expand All @@ -61,26 +59,6 @@ public void actionPerformed(ActionEvent e) {
}
}

/*
* (non-Javadoc)
*
* @see javax.swing.JComponent#getMinimumSize()
*/
@Override
public Dimension getMinimumSize() {
return minSize;
}

/*
* (non-Javadoc)
*
* @see javax.swing.JComponent#getPreferredSize()
*/
@Override
public Dimension getPreferredSize() {
return getMinimumSize();
}

public void clear() {
setText("");
}
Expand All @@ -90,7 +68,18 @@ public void update() {
if (MapTool.getFrame().getCurrentZoneRenderer() != null) {
double scale = MapTool.getFrame().getCurrentZoneRenderer().getZoneScale().getScale();
scale *= 100;
zoom = String.format("%d%%", (int) scale);

if (scale < 10) {
zoom = String.format("%.4f%%", scale);
} else if (scale < 100) {
zoom = String.format("%.3f%%", scale);
} else if (scale < 1000) {
zoom = String.format("%.2f%%", scale);
} else if (scale < 10000) {
zoom = String.format("%.1f%%", scale);
} else {
zoom = String.format("%.0f%%", scale);
}
}
setText(zoom);
}
Expand Down
139 changes: 49 additions & 90 deletions src/main/java/net/rptools/maptool/client/ui/Scale.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,69 +17,50 @@
import java.awt.Point;
import java.beans.PropertyChangeListener;
import java.beans.PropertyChangeSupport;
import java.io.Serial;
import java.io.Serializable;

public class Scale implements Serializable {
public static final String PROPERTY_SCALE = "scale";
public static final String PROPERTY_OFFSET = "offset";
private static final int MIN_ZOOM_LEVEL = -175;
private static final int MAX_ZOOM_LEVEL = 175;

private final double oneToOneScale = 1; // Let this be configurable at some point
private double scale = oneToOneScale;
private final double scaleIncrement = .075;

private int zoomLevel = 0;

public static final String PROPERTY_SCALE = "scale";
public static final String PROPERTY_OFFSET = "offset";

private transient PropertyChangeSupport propertyChangeSupport;

private int offsetX;
private int offsetY;

private final int width;
private final int height;

private boolean initialized;

// LEGACY for 1.3b31 and earlier
private transient int scaleIndex; // 'transient' prevents serialization; prep for 1.4
private transient PropertyChangeSupport propertyChangeSupport;

public Scale() {
this(0, 0);
}

public Scale(int width, int height) {
this.width = width;
this.height = height;
this.offsetX = 0;
this.offsetY = 0;
}

public Scale(Scale copy) {
this.width = copy.width;
this.height = copy.height;
this.offsetX = copy.offsetX;
this.offsetY = copy.offsetY;
this.zoomLevel = copy.zoomLevel;
this.initialized = copy.initialized;
this.scale = copy.scale;
// this.oneToOneScale = copy.oneToOneScale;
// this.scaleIncrement = copy.scaleIncrement;
setScale(copy.scale);
}

public void addPropertyChangeListener(PropertyChangeListener listener) {
getPropertyChangeSupport().addPropertyChangeListener(listener);
@Serial
private Object readResolve() {
// Make sure the zoom level is correct.
setScale(this.scale);
return this;
}

public void addPropertyChangeListener(String property, PropertyChangeListener listener) {
getPropertyChangeSupport().addPropertyChangeListener(property, listener);
public void addPropertyChangeListener(PropertyChangeListener listener) {
getPropertyChangeSupport().addPropertyChangeListener(listener);
}

public void removePropertyChangeListener(PropertyChangeListener listener) {
getPropertyChangeSupport().removePropertyChangeListener(listener);
}

public void removePropertyChangeListener(String property, PropertyChangeListener listener) {
getPropertyChangeSupport().removePropertyChangeListener(property, listener);
}

public int getOffsetX() {
return offsetX;
}
Expand Down Expand Up @@ -110,14 +91,28 @@ public void setScale(double scale) {
}

// Determine zoomLevel appropriate for given scale
zoomLevel = (int) Math.round(Math.log(scale / oneToOneScale) / Math.log(1 + scaleIncrement));

setScaleNoZoomLevel(scale);
var zoomLevel =
(int) Math.round(Math.log(scale / oneToOneScale) / Math.log(1 + scaleIncrement));
// Check that we haven't gone out of bounds with our zooming.
if (zoomLevel < MIN_ZOOM_LEVEL) {
setZoomLevel(MIN_ZOOM_LEVEL);
} else if (zoomLevel > MAX_ZOOM_LEVEL) {
setZoomLevel(MAX_ZOOM_LEVEL);
} else {
// Acceptable scale. Use it.
var oldScale = this.scale;
this.scale = scale;
this.zoomLevel = zoomLevel;
getPropertyChangeSupport().firePropertyChange(PROPERTY_SCALE, oldScale, this.scale);
}
}

private void setScaleNoZoomLevel(double scale) {
private void setScaleFromZoomLevel() {
double oldScale = this.scale;
this.scale = scale;

// Check for zero just to avoid any possible imprecision.
this.scale =
zoomLevel == 0 ? oneToOneScale : oneToOneScale * Math.pow(1 + scaleIncrement, zoomLevel);

getPropertyChangeSupport().firePropertyChange(PROPERTY_SCALE, oldScale, scale);
}
Expand All @@ -126,29 +121,28 @@ public double getOneToOneScale() {
return oneToOneScale;
}

public double reset() {
double oldScale = this.scale;
scale = oneToOneScale;
zoomLevel = 0;
public void reset() {
setZoomLevel(0);
}

getPropertyChangeSupport().firePropertyChange(PROPERTY_SCALE, oldScale, scale);
return oldScale;
private void setZoomLevel(int zoomLevel) {
this.zoomLevel = Math.clamp(zoomLevel, MIN_ZOOM_LEVEL, MAX_ZOOM_LEVEL);
System.out.println(this.zoomLevel);
setScaleFromZoomLevel();
}

public double scaleUp() {
zoomLevel++;
setScaleNoZoomLevel(oneToOneScale * Math.pow(1 + scaleIncrement, zoomLevel));
return scale;
private void scaleUp() {
setZoomLevel(zoomLevel + 1);
}

public double scaleDown() {
zoomLevel--;
setScaleNoZoomLevel(oneToOneScale * Math.pow(1 + scaleIncrement, zoomLevel));
return scale;
private void scaleDown() {
setZoomLevel(zoomLevel - 1);
}

public void zoomReset(int x, int y) {
zoomTo(x, y, reset());
var oldScale = scale;
reset();
zoomTo(x, y, oldScale);
}

public void zoomIn(int x, int y) {
Expand All @@ -169,48 +163,13 @@ public void zoomScale(int x, int y, double scale) {
zoomTo(x, y, oldScale);
}

public boolean isInitialized() {
return initialized;
}

private PropertyChangeSupport getPropertyChangeSupport() {
if (propertyChangeSupport == null) {
propertyChangeSupport = new PropertyChangeSupport(this);
}
return propertyChangeSupport;
}

/**
* Fit the image into the given space by finding the zoom level that allows the image to fit. Then
* center the image.
*
* @param width width of the image
* @param height height of the image
* @return true if this call did something, false if the init has already been called
*/
public boolean initialize(int width, int height) {

if (initialized) {
return false;
}

centerIn(width, height);

initialized = true;
return true;
}

public void centerIn(int width, int height) {

int currWidth = (int) (this.width * getScale());
int currHeight = (int) (this.height * getScale());

int x = (width - currWidth) / 2;
int y = (height - currHeight) / 2;

setOffset(x, y);
}

private void zoomTo(int x, int y, double oldScale) {

// Keep the current pixel centered
Expand Down
Loading
Loading