Skip to content

AstroCalc: Fix RTS #3028

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
alex-w merged 8 commits into from
Feb 3, 2023
Merged

AstroCalc: Fix RTS #3028

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
b7b5828
Fix AstroCalc RTS
worachate001 Jan 28, 2023
9c36d2e
RTS for current date
worachate001 Jan 31, 2023
dedbee8
Merge branch 'master' into rts-fix
worachate001 Jan 31, 2023
7c88659
Merge branch 'Stellarium:master' into rts-fix
worachate001 Feb 1, 2023
65ceeac
restore time sync
worachate001 Feb 1, 2023
094f986
fix for stellar objects
worachate001 Feb 1, 2023
42ade0c
also rise/set times of stellar objects
worachate001 Feb 1, 2023
6c1d5f9
getInfoMap update
worachate001 Feb 1, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
37 changes: 29 additions & 8 deletions src/core/StelObject.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -677,43 +677,64 @@ QString StelObject::getCommonInfoString(const StelCore *core, const InfoStringGr

if (flags&RTSTime && getType()!=QStringLiteral("Satellite") && !currentPlanet.contains("observer", Qt::CaseInsensitive) && !(core->getCurrentLocation().name.contains("->")))
{
const double utcShift = core->getUTCOffset(core->getJD()) / 24.; // Fix DST shift...
const double currentJD = core->getJD();
const double utcShift = core->getUTCOffset(currentJD) / 24.; // Fix DST shift...
Vec4d rts = getRTSTime(core);
QString sTransit = qc_("Transit", "celestial event; passage across a meridian");
QString sRise = qc_("Rise", "celestial event");
QString sSet = qc_("Set", "celestial event");
QString diffDate;
QString prvDay = q_("(previous day)");
QString nxtDay = q_("(next day)");
double sunrise = 0.;
double sunset = 24.;
const bool isSun = (getEnglishName()=="Sun");
const bool isSun = (getEnglishName()=="Sun");
double hour(0);
int year, month, day, currentdate;
StelUtils::getDateFromJulianDay(currentJD+utcShift, &year, &month, &currentdate);

if (withTables && !(flags&SiderealTime && currentPlanet==QStringLiteral("Earth")))
res += "<table style='margin:0em 0em 0em -0.125em;border-spacing:0px;border:0px;'>";

if (rts[3]==0.)
{
hour = StelUtils::getHoursFromJulianDay(rts[0]+utcShift);
StelUtils::getDateFromJulianDay(rts[0]+utcShift, &year, &month, &day);
if (day != currentdate)
diffDate = (rts[0]<currentJD) ? prvDay : nxtDay;
else
diffDate = "";
if (withTables)
res += QString("<tr><td>%1:</td><td style='text-align:right;'>%2</td></tr>").arg(sRise, StelUtils::hoursToHmsStr(hour, true));
res += QString("<tr><td>%1:</td><td style='text-align:right;'>%2 %3</td></tr>").arg(sRise, StelUtils::hoursToHmsStr(hour, true)).arg(diffDate);
else
res += QString("%1: %2<br/>").arg(sRise, StelUtils::hoursToHmsStr(hour, true));
res += QString("%1: %2 %3<br/>").arg(sRise, StelUtils::hoursToHmsStr(hour, true)).arg(diffDate);

sunrise = hour;
}

hour = StelUtils::getHoursFromJulianDay(rts[1]+utcShift);
StelUtils::getDateFromJulianDay(rts[1]+utcShift, &year, &month, &day);
if (day != currentdate)
diffDate = (rts[1]<currentJD) ? prvDay : nxtDay;
else
diffDate = "";
if (withTables)
res += QString("<tr><td>%1:</td><td style='text-align:right;'>%2</td></tr>").arg(sTransit, StelUtils::hoursToHmsStr(hour, true));
res += QString("<tr><td>%1:</td><td style='text-align:right;'>%2 %3</td></tr>").arg(sTransit, StelUtils::hoursToHmsStr(hour, true)).arg(diffDate);
else
res += QString("%1: %2<br/>").arg(sTransit, StelUtils::hoursToHmsStr(hour, true));
res += QString("%1: %2 %3<br/>").arg(sTransit, StelUtils::hoursToHmsStr(hour, true)).arg(diffDate);

if (rts[3]==0.)
{
hour = StelUtils::getHoursFromJulianDay(rts[2]+utcShift);
StelUtils::getDateFromJulianDay(rts[2]+utcShift, &year, &month, &day);
if (day != currentdate)
diffDate = (rts[2]<currentJD) ? prvDay : nxtDay;
else
diffDate = "";
if (withTables)
res += QString("<tr><td>%1:</td><td style='text-align:right;'>%2</td></tr>").arg(sSet, StelUtils::hoursToHmsStr(hour, true));
res += QString("<tr><td>%1:</td><td style='text-align:right;'>%2 %3</td></tr>").arg(sSet, StelUtils::hoursToHmsStr(hour, true)).arg(diffDate);
else
res += QString("%1: %2<br/>").arg(sSet, StelUtils::hoursToHmsStr(hour, true));
res += QString("%1: %2 %3<br/>").arg(sSet, StelUtils::hoursToHmsStr(hour, true)).arg(diffDate);

sunset = hour;
}
Expand Down
80 changes: 71 additions & 9 deletions src/gui/AstroCalcDialog.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2127,22 +2127,37 @@ void AstroCalcDialog::generateRTS()
double startJD = StelUtils::qDateTimeToJd(QDateTime(ui->rtsFromDateEdit->date()));
double stopJD = StelUtils::qDateTimeToJd(QDateTime(ui->rtsToDateEdit->date()));
#endif
startJD = startJD - core->getUTCOffset(startJD) / 24.;
stopJD = stopJD - core->getUTCOffset(stopJD) / 24.;

if (stopJD<startJD) // Stop warming atmosphere!..
return;

int elements = static_cast<int>((stopJD - startJD) / currentStep);
double JD, az, alt;
double JD, az, alt, beginJD, endJD;
float magnitude;
QString riseStr, setStr, altStr, magStr, elongSStr = dash, elongLStr = dash;
QString riseStr, setStr, transitStr, altStr, magStr, elongSStr = dash, elongLStr = dash;
for (int i = 0; i <= elements; i++)
{
JD = startJD + i * currentStep + 1;
core->setJD(JD);
JD = startJD + i * currentStep;
beginJD = JD - core->getUTCOffset(JD) / 24.; // JD at start of local date
endJD = JD+1. - core->getUTCOffset(JD+1.) / 24.;; // JD at the end of local date
core->setJD(JD+.5); // start the calculation at noon of local date
core->update(0); // force update to get new coordinates
Vec4d rts = selectedObject->getRTSTime(core);
Vec4d rtsNew;
if (rts[1]<beginJD) // found time before current date
{
core->setJD(rts[1]+1.); // try again for current date
core->update(0); // force update to get new coordinates
rtsNew = selectedObject->getRTSTime(core);
rts[1] = rtsNew[1];
}
if (rts[1]>endJD) // found time after current date
{
core->setJD(rts[1]-1.); // try again for current date
core->update(0); // force update to get new coordinates
rtsNew = selectedObject->getRTSTime(core);
rts[1] = rtsNew[1];
}
JD = rts[1];
core->setJD(JD);
core->update(0); // force update to get new coordinates
Expand All @@ -2163,10 +2178,57 @@ void AstroCalcDialog::generateRTS()
magnitude = selectedObject->getVMagnitudeWithExtinction(core);
magStr = (magnitude > 50.f || selectedObject->getEnglishName().contains("marker", Qt::CaseInsensitive)? dash : QString::number(magnitude, 'f', 2));

if (JD>beginJD && JD<endJD)
{
transitStr = QString("%1 %2").arg(localeMgr->getPrintableDateLocal(JD), localeMgr->getPrintableTimeLocal(JD));
}
else
{
transitStr = dash;
altStr = dash;
magStr = dash;
elongSStr = dash;
elongLStr = dash;
}

if (rts[3]==0.)
{
riseStr = QString("%1 %2").arg(localeMgr->getPrintableDateLocal(rts[0]), localeMgr->getPrintableTimeLocal(rts[0]));
setStr = QString("%1 %2").arg(localeMgr->getPrintableDateLocal(rts[2]), localeMgr->getPrintableTimeLocal(rts[2]));
if (rts[0]<beginJD) // found time before current date
{
core->setJD(rts[0]+1.); // try again for current date
core->update(0); // force update to get new coordinates
rtsNew = selectedObject->getRTSTime(core);
rts[0] = rtsNew[0];
}
if (rts[0]>endJD) // found time after current date
{
core->setJD(rts[0]-1.); // try again for current date
core->update(0); // force update to get new coordinates
rtsNew = selectedObject->getRTSTime(core);
rts[0] = rtsNew[0];
}
if (rts[2]<beginJD) // found time before current date
{
core->setJD(rts[2]+1.); // try again for current date
core->update(0); // force update to get new coordinates
rtsNew = selectedObject->getRTSTime(core);
rts[2] = rtsNew[2];
}
if (rts[2]>endJD) // found time after current date
{
core->setJD(rts[2]-1.); // try again for current date
core->update(0); // force update to get new coordinates
rtsNew = selectedObject->getRTSTime(core);
rts[2] = rtsNew[2];
}
if (rts[0]>beginJD && rts[0]<endJD)
riseStr = QString("%1 %2").arg(localeMgr->getPrintableDateLocal(rts[0]), localeMgr->getPrintableTimeLocal(rts[0]));
else
riseStr = dash;
if (rts[2]>beginJD && rts[2]<endJD)
setStr = QString("%1 %2").arg(localeMgr->getPrintableDateLocal(rts[2]), localeMgr->getPrintableTimeLocal(rts[2]));
else
setStr = dash;
}
else
riseStr = setStr = dash;
Expand All @@ -2177,7 +2239,7 @@ void AstroCalcDialog::generateRTS()
treeItem->setText(RTSRiseDate, riseStr); // local date and time
treeItem->setData(RTSRiseDate, Qt::UserRole, rts[0]);
treeItem->setTextAlignment(RTSRiseDate, Qt::AlignRight);
treeItem->setText(RTSTransitDate, QString("%1 %2").arg(localeMgr->getPrintableDateLocal(JD), localeMgr->getPrintableTimeLocal(JD))); // local date and time
treeItem->setText(RTSTransitDate, transitStr); // local date and time
treeItem->setData(RTSTransitDate, Qt::UserRole, JD);
treeItem->setTextAlignment(RTSTransitDate, Qt::AlignRight);
treeItem->setText(RTSSetDate, setStr); // local date and time
Expand Down