X-Git-Url: https://git.gag.com/?a=blobdiff_plain;f=core%2Fsrc%2Fnet%2Fsf%2Fopenrocket%2Fgui%2Fplot%2FPlotConfiguration.java;fp=core%2Fsrc%2Fnet%2Fsf%2Fopenrocket%2Fgui%2Fplot%2FPlotConfiguration.java;h=4438b2079ef744f4146e3bb20f6a08968fc4f98a;hb=9349577cdfdff682b2aabd6daa24fdc3a7449b58;hp=bd58782f70b9de073c18412ea3bb42ec319ca65f;hpb=30ba0a882f0c061176ba14dbf86d3d6fad096c02;p=debian%2Fopenrocket diff --git a/core/src/net/sf/openrocket/gui/plot/PlotConfiguration.java b/core/src/net/sf/openrocket/gui/plot/PlotConfiguration.java index bd58782f..4438b207 100644 --- a/core/src/net/sf/openrocket/gui/plot/PlotConfiguration.java +++ b/core/src/net/sf/openrocket/gui/plot/PlotConfiguration.java @@ -63,7 +63,7 @@ public class PlotConfiguration implements Cloneable { configs.add(config); //// Stability vs. time - config = new PlotConfiguration("Stability vs. time"); + config = new PlotConfiguration(trans.get("PlotConfiguration.Stability")); config.addPlotDataType(FlightDataType.TYPE_STABILITY, 0); config.addPlotDataType(FlightDataType.TYPE_CP_LOCATION, 1); config.addPlotDataType(FlightDataType.TYPE_CG_LOCATION, 1); @@ -76,7 +76,7 @@ public class PlotConfiguration implements Cloneable { configs.add(config); //// Drag coefficients vs. Mach number - config = new PlotConfiguration("Drag coefficients vs. Mach number", + config = new PlotConfiguration(trans.get("PlotConfiguration.Dragcoef"), FlightDataType.TYPE_MACH_NUMBER); config.addPlotDataType(FlightDataType.TYPE_DRAG_COEFF, 0); config.addPlotDataType(FlightDataType.TYPE_FRICTION_DRAG_COEFF, 0); @@ -85,7 +85,7 @@ public class PlotConfiguration implements Cloneable { configs.add(config); //// Roll characteristics - config = new PlotConfiguration("Roll characteristics"); + config = new PlotConfiguration(trans.get("PlotConfiguration.Rollcharacteristics")); config.addPlotDataType(FlightDataType.TYPE_ROLL_RATE, 0); config.addPlotDataType(FlightDataType.TYPE_ROLL_MOMENT_COEFF, 1); config.addPlotDataType(FlightDataType.TYPE_ROLL_FORCING_COEFF, 1); @@ -100,7 +100,7 @@ public class PlotConfiguration implements Cloneable { configs.add(config); //// Angle of attack and orientation vs. time - config = new PlotConfiguration("Angle of attack and orientation vs. time"); + config = new PlotConfiguration(trans.get("PlotConfiguration.Angleofattack")); config.addPlotDataType(FlightDataType.TYPE_AOA, 0); config.addPlotDataType(FlightDataType.TYPE_ORIENTATION_PHI); config.addPlotDataType(FlightDataType.TYPE_ORIENTATION_THETA); @@ -113,7 +113,7 @@ public class PlotConfiguration implements Cloneable { configs.add(config); //// Simulation time step and computation time - config = new PlotConfiguration("Simulation time step and computation time"); + config = new PlotConfiguration(trans.get("PlotConfiguration.Simulationtime")); config.addPlotDataType(FlightDataType.TYPE_TIME_STEP); config.addPlotDataType(FlightDataType.TYPE_COMPUTATION_TIME); config.setEvent(FlightEvent.Type.IGNITION, true); @@ -358,7 +358,7 @@ public class PlotConfiguration implements Cloneable { */ public PlotConfiguration fillAutoAxes(FlightDataBranch data) { PlotConfiguration config = recursiveFillAutoAxes(data).getU(); - System.out.println("BEST FOUND, fitting"); + //System.out.println("BEST FOUND, fitting"); config.fitAxes(data); return config; } @@ -483,13 +483,13 @@ public class PlotConfiguration implements Cloneable { double scale = Math.max(left.getRangeLength(), right.getRangeLength()) / Math.min(left.getRangeLength(), right.getRangeLength()); - System.out.println("Scale: " + scale); + //System.out.println("Scale: " + scale); scale = roundScale(scale); if (right.getRangeLength() > left.getRangeLength()) { scale = 1 / scale; } - System.out.println("Rounded scale: " + scale); + //System.out.println("Rounded scale: " + scale); // Scale right axis, enlarge axes if necessary and scale back min2 *= scale;