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

Add some log statements

Browse Source
This commit is contained in:
SiboVG 2023-04-01 20:28:19 +02:00
parent 518511bbd8
commit e7d9505ea9
1 changed files with 21 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
core/src/net/sf/openrocket/file/rasaero/RASAeroCommonConstants.java
View File

@ -17,6 +17,8 @@ import java.util.List;
import java.util.Map; import java.util.Map;
import net.sf.openrocket.file.rasaero.export.RASAeroSaver.RASAeroExportException; import net.sf.openrocket.file.rasaero.export.RASAeroSaver.RASAeroExportException;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
/** /**
* List of constants used in RASAero files + helper functions to read parameters from it. * List of constants used in RASAero files + helper functions to read parameters from it.
@ -228,6 +230,8 @@ public class RASAeroCommonConstants {
RASAeroNoseConeShapeMap.put(SHAPE_ELLIPTICAL, Transition.Shape.ELLIPSOID); RASAeroNoseConeShapeMap.put(SHAPE_ELLIPTICAL, Transition.Shape.ELLIPSOID);
} }
private static final Logger log = LoggerFactory.getLogger(RASAeroCommonConstants.class);
/** /**
* Returns the OpenRocket nose cone shape from the RASAero shape string. * Returns the OpenRocket nose cone shape from the RASAero shape string.
* @param shape The RASAero shape string. * @param shape The RASAero shape string.
@ -311,7 +315,9 @@ public class RASAeroCommonConstants {
} else if (CROSS_SECTION_SUBSONIC_NACA.equals(crossSection)) { } else if (CROSS_SECTION_SUBSONIC_NACA.equals(crossSection)) {
return FinSet.CrossSection.AIRFOIL; return FinSet.CrossSection.AIRFOIL;
} else { } else {
warnings.add("Unknown fin cross section: " + crossSection + ", defaulting to Airfoil."); String msg = "Unknown fin cross section: " + crossSection + ", defaulting to Airfoil.";
warnings.add(msg);
log.debug(msg);
return FinSet.CrossSection.AIRFOIL; return FinSet.CrossSection.AIRFOIL;
} }
} }
@ -324,7 +330,9 @@ public class RASAeroCommonConstants {
} else if (FinSet.CrossSection.AIRFOIL.equals(crossSection)) { } else if (FinSet.CrossSection.AIRFOIL.equals(crossSection)) {
return CROSS_SECTION_SUBSONIC_NACA; return CROSS_SECTION_SUBSONIC_NACA;
} else { } else {
warnings.add("Unknown fin cross section: " + crossSection + "."); String msg = "Unknown fin cross section: " + crossSection + ".";
warnings.add(msg);
log.warn(msg);
return null; return null;
} }
} }
@ -349,7 +357,9 @@ public class RASAeroCommonConstants {
} else if (FINISH_CAST_IRON.equals(surfaceFinish)) { } else if (FINISH_CAST_IRON.equals(surfaceFinish)) {
return ExternalComponent.Finish.ROUGHUNFINISHED; return ExternalComponent.Finish.ROUGHUNFINISHED;
} else { } else {
warnings.add("Unknown surface finish: " + surfaceFinish + ", defaulting to Regular Paint."); String msg = "Unknown surface finish: " + surfaceFinish + ", defaulting to Regular Paint.";
warnings.add(msg);
log.debug(msg);
return ExternalComponent.Finish.NORMAL; return ExternalComponent.Finish.NORMAL;
} }
} }
@ -370,7 +380,9 @@ public class RASAeroCommonConstants {
} else if (finish.equals(ExternalComponent.Finish.ROUGHUNFINISHED)) { } else if (finish.equals(ExternalComponent.Finish.ROUGHUNFINISHED)) {
return FINISH_CAST_IRON; return FINISH_CAST_IRON;
} else { } else {
warnings.add("Unknown surface finish: " + finish + ", defaulting to Smooth."); String msg = "Unknown surface finish: " + finish + ", defaulting to Smooth.";
warnings.add(msg);
log.debug(msg);
return FINISH_SMOOTH; return FINISH_SMOOTH;
} }
} }
@ -385,6 +397,7 @@ public class RASAeroCommonConstants {
public static String OPENROCKET_TO_RASAERO_MOTOR(List<ThrustCurveMotor> motors, Motor ORMotor, MotorConfiguration motorConfig, public static String OPENROCKET_TO_RASAERO_MOTOR(List<ThrustCurveMotor> motors, Motor ORMotor, MotorConfiguration motorConfig,
WarningSet warnings) { WarningSet warnings) {
if (!(ORMotor instanceof ThrustCurveMotor) || motorConfig == null) { if (!(ORMotor instanceof ThrustCurveMotor) || motorConfig == null) {
log.debug("RASAero motor not found: not a thrust curve motor");
return null; return null;
} }
@ -395,11 +408,14 @@ public class RASAeroCommonConstants {
if (motorConfig.getEjectionDelay() == 0) { if (motorConfig.getEjectionDelay() == 0) {
motorName += "-0"; motorName += "-0";
} }
log.debug(String.format("RASAero motor found: %s", motorName));
return motorName + " (" + OPENROCKET_TO_RASAERO_MANUFACTURER(motor.getManufacturer()) + ")"; return motorName + " (" + OPENROCKET_TO_RASAERO_MANUFACTURER(motor.getManufacturer()) + ")";
} }
} }
warnings.add(String.format("Could not find RASAero motor for '%s'", ORMotor.getDesignation())); String msg = String.format("Could not find RASAero motor for '%s'", ORMotor.getDesignation());
warnings.add(msg);
log.debug(msg);
return null; return null;
} }