hongshaorou/openrocket
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #685 from teyrana/fix/scaling-exception

Browse Source 
[cleanup][debug] removed excess debug statement in `AbstractScaleFigure.scaleTo`
This commit is contained in:
Daniel Williams 2020-06-21 15:06:17 -04:00 committed by GitHub
commit 37dac70a50
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 21 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

44
swing/src/net/sf/openrocket/gui/scalefigure/AbstractScaleFigure.java
View File

@ -85,30 +85,28 @@ public abstract class AbstractScaleFigure extends JPanel {
return originLocation_px; return originLocation_px;
} }
/** /**
* Set the scale level of the figure. A scale value of 1.0 is equivalent to 100 % scale. * Set the scale level of the figure. A scale value of 1.0 is equivalent to 100 % scale.
* Smaller scales display the subject smaller. * Smaller scales display the subject smaller.
* *
* If the figure would be smaller than the 'visibleBounds', then the figure is grown to match, * If the figure would be smaller than the 'visibleBounds', then the figure is grown to match,
* and the figures internal contents are centered according to the figure's origin. * and the figures internal contents are centered according to the figure's origin.
* *
* @param newScaleRequest the scale level * @param newScaleRequest the scale level
* @param visibleBounds the visible bounds upon the Figure * @param visibleBounds the visible bounds upon the Figure
*/ */
public void scaleTo(final double newScaleRequest, final Dimension visibleBounds) { public void scaleTo(final double newScaleRequest, final Dimension visibleBounds) {
if (MathUtil.equals(this.userScale, newScaleRequest, 0.01)){ if (MathUtil.equals(this.userScale, newScaleRequest, 0.01)){
return;} return;}
if (Double.isInfinite(newScaleRequest) || Double.isNaN(newScaleRequest)) { if (Double.isInfinite(newScaleRequest) || Double.isNaN(newScaleRequest)) {
return;} return;}
log.warn(String.format("scaling Request from %g => %g @%s\n", this.userScale, newScaleRequest, this.getClass().getSimpleName()), new Throwable()); this.userScale = MathUtil.clamp( newScaleRequest, MINIMUM_ZOOM, MAXIMUM_ZOOM);
this.scale = baseScale * userScale;
this.userScale = MathUtil.clamp( newScaleRequest, MINIMUM_ZOOM, MAXIMUM_ZOOM);
this.scale = baseScale * userScale; this.visibleBounds_px = visibleBounds;
this.visibleBounds_px = visibleBounds; this.fireChangeEvent();
this.fireChangeEvent();
} }
/** /**