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

Remove a bunch of commented out code.

Browse Source
This commit is contained in:
kruland2607 2013-02-04 14:37:18 -06:00
parent cec784d77e
commit d9c0f68e64
1 changed files with 34 additions and 83 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

51
core/src/net/sf/openrocket/gui/plot/PlotConfiguration.java
View File

@ -1,6 +1,5 @@
package net.sf.openrocket.gui.plot;
import java.util.Collections;
import java.util.EnumSet;
import java.util.List;
import java.util.Set;
@ -474,7 +473,7 @@ public class PlotConfiguration implements Cloneable {
// Calculate and round scaling factor
double scale = Math.max(left.getRangeLength(), right.getRangeLength()) /
Math.min(left.getRangeLength(), right.getRangeLength());
Math.min(left.getRangeLength(), right.getRangeLength());
//System.out.println("Scale: " + scale);
@ -494,54 +493,6 @@ public class PlotConfiguration implements Cloneable {
min2 /= scale;
max2 /= scale;
// Scale to unit length
// double scale1 = left.getRangeLength();
// double scale2 = right.getRangeLength();
//
// double min1 = left.getMinValue() / scale1;
// double max1 = left.getMaxValue() / scale1;
// double min2 = right.getMinValue() / scale2;
// double max2 = right.getMaxValue() / scale2;
//
// // Combine unit ranges
// min1 = MathUtil.min(min1, min2);
// min2 = min1;
// max1 = MathUtil.max(max1, max2);
// max2 = max1;
//
// // Scale up
// min1 *= scale1;
// max1 *= scale1;
// min2 *= scale2;
// max2 *= scale2;
//
// // Compute common scale
// double range1 = max1-min1;
// double range2 = max2-min2;
//
// double scale = MathUtil.max(range1, range2) / MathUtil.min(range1, range2);
// double roundScale = roundScale(scale);
//
// if (range2 < range1) {
// if (roundScale < scale) {
// min2 = min1 / roundScale;
// max2 = max1 / roundScale;
// } else {
// min1 = min2 * roundScale;
// max1 = max2 * roundScale;
// }
// } else {
// if (roundScale > scale) {
// min2 = min1 * roundScale;
// max2 = max1 * roundScale;
// } else {
// min1 = min2 / roundScale;
// max1 = max2 / roundScale;
// }
// }
// Apply scale
left.addBound(min1);
left.addBound(max1);