StelUtils.hpp   StelUtils.hpp 
skipping to change at line 135 skipping to change at line 135
void decDegToDms(double angle, bool& sign, unsigned int& d, unsigned int& m, double& s); void decDegToDms(double angle, bool& sign, unsigned int& d, unsigned int& m, double& s);
//! Convert an angle in decimal degrees to a dms formatted string. //! Convert an angle in decimal degrees to a dms formatted string.
//! @param angle input angle in decimal degrees //! @param angle input angle in decimal degrees
QString decDegToDmsStr(const double angle); QString decDegToDmsStr(const double angle);
//! Convert a dms formatted string to an angle in radian //! Convert a dms formatted string to an angle in radian
//! @param s The input string //! @param s The input string
double dmsStrToRad(const QString& s); double dmsStrToRad(const QString& s);
//TODO these Vector-String converters should be removed, and missing
functionality added to
//the VecMath classes and QVariant-based conversion
//! Reads a Vec2f from a string list
Vec2f strToVec2f(const QStringList& s);
//! Reads a Vec2f from a string, separated by commas. Example: 1.0,2
.0
Vec2f strToVec2f(const QString& s);
//! Obtains a Vec3f from a string. //! Obtains a Vec3f from a string.
//! @param s the string describing the Vector with the form "x,y,z" //! @param s the string describing the Vector with the form "x,y,z"
//! @return The corresponding vector //! @return The corresponding vector
//! @deprecated Use the >> operator from Vec3f class //! @deprecated Use the >> operator from Vec3f class
Vec3f strToVec3f(const QStringList& s); Vec3f strToVec3f(const QStringList& s);
//! Reads a Vec3f from a string, separated by commas. Example: 1.0,2 .0,3.0 //! Reads a Vec3f from a string, separated by commas. Example: 1.0,2 .0,3.0
Vec3f strToVec3f(const QString& s); Vec3f strToVec3f(const QString& s);
//! Like StelUtils::strToVec3f, but with 4 components and with doubl e precision //! Like StelUtils::strToVec3f, but with 4 components and with doubl e precision
Vec4d strToVec4d(const QStringList& s); Vec4d strToVec4d(const QStringList& s);
//! Like StelUtils::strToVec3f, but with 4 components and with doubl e precision //! Like StelUtils::strToVec3f, but with 4 components and with doubl e precision
Vec4d strToVec4d(const QString& s); Vec4d strToVec4d(const QString& s);
// Converts a Vec2f to a string in the same format that can be read
by strToVec2f
QString vec2fToStr(const Vec2f& v);
//! Converts a Vec3f to a string in the same format that can be read by strToVec3f //! Converts a Vec3f to a string in the same format that can be read by strToVec3f
QString vec3fToStr(const Vec3f& v); QString vec3fToStr(const Vec3f& v);
//! Converts a Vec4d to a string in the same format that can be read by strToVec4d //! Converts a Vec4d to a string in the same format that can be read by strToVec4d
QString vec4dToStr(const Vec4d& v); QString vec4dToStr(const Vec4d& v);
//! Converts a Vec3f to HTML color notation. //! Converts a Vec3f to HTML color notation.
//! @param v The vector //! @param v The vector
//! @return The string in HTML color notation "#rrggbb". //! @return The string in HTML color notation "#rrggbb".
QString vec3fToHtmlColor(const Vec3f& v); QString vec3fToHtmlColor(const Vec3f& v);
skipping to change at line 237 skipping to change at line 246
//! Integer modulo where the result is always positive. //! Integer modulo where the result is always positive.
int imod(const int a, const int b); int imod(const int a, const int b);
/////////////////////////////////////////////////// ///////////////////////////////////////////////////
// New Qt based General Calendar Functions. // New Qt based General Calendar Functions.
//! Make from julianDay a year, month, day for the Julian Date julia nDay represents. //! Make from julianDay a year, month, day for the Julian Date julia nDay represents.
void getDateFromJulianDay(const double julianDay, int *year, int *mo nth, int *day); void getDateFromJulianDay(const double julianDay, int *year, int *mo nth, int *day);
//! Make from julianDay an hour, minute, second. //! Make from julianDay an hour, minute, second.
void getTimeFromJulianDay(const double julianDay, int *hour, int *mi nute, int *second, int *millis=NULL); void getTimeFromJulianDay(const double julianDay, int *hour, int *mi nute, int *second, int *millis=Q_NULLPTR);
//! Parse an ISO8601 date string. //! Parse an ISO8601 date string.
//! Also handles negative and distant years. //! Also handles negative and distant years.
bool getDateTimeFromISO8601String(const QString& iso8601Date, int* y , int* m, int* d, int* h, int* min, float* s); bool getDateTimeFromISO8601String(const QString& iso8601Date, int* y , int* m, int* d, int* h, int* min, float* s);
//! Format the given Julian Day in (UTC) ISO8601 date string. //! Format the given Julian Day in (UTC) ISO8601 date string.
//! Also handles negative and distant years. //! Also handles negative and distant years.
QString julianDayToISO8601String(const double jd, bool addMS = false ); QString julianDayToISO8601String(const double jd, bool addMS = false );
//! Return the Julian Date matching the ISO8601 date string. //! Return the Julian Date matching the ISO8601 date string.
skipping to change at line 266 skipping to change at line 275
//! Format the date and day-of-week per the @b system locale's //! Format the date and day-of-week per the @b system locale's
//! QLocale::ShortFormat. //! QLocale::ShortFormat.
//! @return QString representing the formatted date //! @return QString representing the formatted date
QString localeDateString(const int year, const int month, const int day, const int dayOfWeek); QString localeDateString(const int year, const int month, const int day, const int dayOfWeek);
//! Get the current Julian Date from system time. //! Get the current Julian Date from system time.
//! @return the current Julian Date //! @return the current Julian Date
double getJDFromSystem(); double getJDFromSystem();
//! Get the Julian Day Number (JD) from Besselian epoch.
//! @param epoch Besselian epoch, expressed as year
//! @return Julian Day number (JD) for B<Year>
double getJDFromBesselianEpoch(const float epoch);
//! Convert a time of day to the fraction of a Julian Day. //! Convert a time of day to the fraction of a Julian Day.
//! Note that a Julian Day starts at 12:00, not 0:00, and //! Note that a Julian Day starts at 12:00, not 0:00, and
//! so 12:00 == 0.0 and 0:00 == 0.5 //! so 12:00 == 0.0 and 0:00 == 0.5
double qTimeToJDFraction(const QTime& time); double qTimeToJDFraction(const QTime& time);
//! Convert a fraction of a Julian Day to a QTime //! Convert a fraction of a Julian Day to a QTime
QTime jdFractionToQTime(const double jd); QTime jdFractionToQTime(const double jd);
//! Convert a QT QDateTime class to julian day. //! Convert a QT QDateTime class to julian day.
//! @param dateTime the UTC QDateTime to convert //! @param dateTime the UTC QDateTime to convert
 End of changes. 4 change blocks. 
1 lines changed or deleted 18 lines changed or added

This html diff was produced by rfcdiff 1.41. The latest version is available from http://tools.ietf.org/tools/rfcdiff/