Skip to content
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

Jump to bottom

Refactoring the support of the on-screen stars names #2005

Merged
merged 15 commits into from
Nov 11, 2021
Merged

Refactoring the support of the on-screen stars names #2005

Show file tree
Hide file tree
Changes from 10 commits
Commits
Show all changes
15 commits
Select commit Hold shift + click to select a range
195cbcf
Split scientific names on 2 parts
alex-w Nov 2, 2021
13a3c07
Refactoring the drawing a screen names of stars
alex-w Nov 2, 2021
7be8127
Added GUI options to manage on-screen designations
alex-w Nov 2, 2021
e02f0b1
Added comments to the code
alex-w Nov 2, 2021
82e842f
Update Stellarium User Guide
alex-w Nov 2, 2021
13b6fd7
SUG: English and typofixes
gzotti Nov 7, 2021
9f21f70
Some changes in the code
alex-w Nov 7, 2021
4b0be6e
Update SUG: update list of double star designations
alex-w Nov 7, 2021
969b041
Updated SUG
alex-w Nov 7, 2021
e5c3755
language fixes, SUG fixes
gzotti Nov 7, 2021
453cb81
simplified a bit
gzotti Nov 10, 2021
63bf2fb
[SUG] Updated list of extra designation of double stars
alex-w Nov 11, 2021
3819e01
[SUG] Updated designations and active periods for double stars
alex-w Nov 11, 2021
7092a44
Shorten config options
alex-w Nov 11, 2021
06d5af8
SUG: small stilistic updates.
gzotti Nov 11, 2021
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
16 changes: 11 additions & 5 deletions guide/app_config_ini.tex
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,17 +40,23 @@ \subsection{\big[astro\big]}
Possible values: \emph{Mallama2018}, \emph{ExpSup2013}, \emph{ExpSup1992}, \emph{AstrAlm1984}, \emph{Mueller1893} and \emph{Generic}.\\%\midrule
nebula\_magnitude\_limit & float & 8.5 & Value of limiting magnitude for the deep-sky objects.\\%\midrule
star\_magnitude\_limit & float & 6.5 & Value of limiting magnitude for the stars. Sometimes you don't want to display more stars when zooming in. \\%\midrule
planet\_magnitude\_limit & float & 6.5 & Value of limiting magnitude for the planets. Sometimes you don't want to display more planets when zooming in. \\%\midrule
planet\_magnitude\_limit & float & 6.5 & Value of limiting magnitude for the planets. Sometimes you don't want to display more planets when zooming in. \\%\midrule
planets\_orbits\_color\_style & string & one\_color & Set the style of orbits color. Possible values: \emph{one\_color}, \emph{groups} and \emph{max}.\\%\midrule
flag\_nebula\_magnitude\_limit & bool & false & Set to \emph{true} to activate limit for showing deep-sky objects.\\%\midrule
flag\_star\_magnitude\_limit & bool & false & Set to \emph{true} to activate limit for showing stars\\%\midrule
flag\_planet\_magnitude\_limit & bool & false & Set to \emph{true} to activate limit for showing planets.\\\midrule
extinction\_mode\_below\_horizon & string & zero & Set extinction mode for atmosphere below horizon. Possible values: \emph{zero}, \emph{mirror} and \emph{major\_planets}.\\
extinction\_mode\_below\_horizon & string & zero & Set extinction mode for atmosphere below horizon. Possible values: \emph{zero}, \emph{mirror} and \emph{max}.\\
twilight\_altitude & float & -6.0 & Solar altitude for going to previous/next twilight.\\\midrule
%
flag\_stars & bool & true & Set to \emph{false} to hide the stars on start-up\\%\midrule
flag\_star\_name & bool & true & Set to \emph{false} to hide the star labels on start-up\\%\midrule
flag\_star\_additional\_names & bool & true & Set \emph{true} to use additional names (also known as) for stars.\\%\midrule
flag\_stars & bool & true & Set to \emph{false} to hide the stars on start-up\\
flag\_star\_name & bool & true & Set to \emph{false} to hide the star labels on start-up\\
flag\_star\_additional\_names & bool & true & Set \emph{true} to use all available proper names for stars.\\\midrule
%
flag\_star\_designation\_usage & bool & false & If \emph{true}, use designations of stars on the sky (on-screen labels) instead of their common names.\\
flag\_star\_designation\_dbl\_stars & bool & false & If \emph{true}, and star doesn't have common name and Bayer or Flamsteed designations then use first of traditional designations of double stars to the on-screen labels.\\
flag\_star\_designation\_var\_stars & bool & false & If \emph{true}, and star doesn't have common name or Bayer, Flamsteed or double star designation then use designation of variable stars as the on-screen label.\\
flag\_star\_designation\_hip & bool & false & If \emph{true}, use HIP designations of stars for the on-screen labels if common name or traditional designations do not exist for star.\\\midrule
%
flag\_planets & bool & true & Set to \emph{false} to hide the planet labels on start-up\\%\midrule
flag\_planets\_hints & bool & true & Set to \emph{false} to hide the planet hints on startup (names and circular highlights)\\%\midrule
flag\_planets\_orbits & bool & false & Set to \emph{true} to show the planet orbits on startup\\%\midrule
Expand Down
212 changes: 148 additions & 64 deletions guide/app_star_catalogue.tex
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1218,73 +1218,157 @@ \subsection{Designations}

In version 0.21.1 we updated cross-identification data according to \emph{The Washington Double Star Catalog} data~\citep{2001AJ....122.3466M}.

\begin{longtable}{l|l|l|p{35mm}}\toprule
\emph{Obsolete ID} & \emph{Modern ID} & \emph{Observer} & \emph{Active period}\\\midrule
H I to VI, H N & H 1 to 6, H N & W. Herschel & 1777---1821 \\
$\Sigma$ & STF & F. Wilhelm von Struve & 1814---1843 \\
$\Sigma$ I, $\Sigma$ II & STFA, STFB & \emph{(Supplemental catalogs)} & 1814---1843 \\
h & HJ & J. Herschel & 1820---1837 \\
Sh & SHJ & J. South and J. Herschel & 1821---1840 \\
S & S & J. South & 1822---1825 \\
Rmk & RMK & C. Rumker & 1825---1837 \\
$\Delta$ & DUN & J. Dunlop & 1825---1846 \\
Lal & LAL & J.-J. de Lalande & 1825---1877 \\
O$\Sigma$ & STT & O. von Struve & 1832---1878 \\
O$\Sigma\Sigma$ & STTA & \emph{(Supplemental catalogs)} & 1832---1878 \\
BrsO & BSO & \emph{Brisbane Observatory} & 1834---1851 \\
Jc & JC & W.S. Jacob & 1836---1879 \\
Dawes & DA & W. Dawes & 1841---1858 \\
Gli & GLI & J.M. Gilliss & 1850---1852 \\
Knott & KNT & G. Knott & c. 1865 \\
Hd, HdO & HDO & \emph{Harvard Observatory} & 1866---1911 \\
Stone & STN & O. Stone & 1867---1882 \\
R & R & H.C. Russell & 1870---1882 \\
$\beta$ & BU & S. Burnham & 1870---1911 \\
$\beta$ pm & BUP & \emph{(Proper motion pairs)} & 1870---1911 \\
Ho & HO & G.W. Hough & 1873---1897 \\
MlbO & MLO & \emph{Melbourne Observatory} & 1873---1898 \\
Howe & HWE & H.A. Howe & 1875---1879 \\
CapO & CPO & \emph{Cape Observatory} & 1880---1910 \\
Es & ES & Rev. T.E. Espin & 1882---1931 \\
CorO & COO & \emph{Cordoba Observatory} & 1883---1920 \\
J & J & R. Jonckheere & 1885---1945 \\
Slr & SLR & R.P. Sellors & 1890---1896 \\
--- & A & R. Aitken & 1891---1926 \\
--- & I & R.T.A. Innes & 1891---1927 \\
$\lambda$ & SEE & T.J.J. See & 1892---1897 \\
Hu & HU & W.J. Hussey & 1892---1914 \\
$\delta$ & DAW & B.H. Dawson & 1904---1924 \\
--- & B & W. van den Bos & 1903---1935 \\
Rst & RST & R.A. Rossiter & 1920---1946 \\
$\phi$ & FIN & W.S. Finsen & 1920---1961 \\
Cou & COU & P. Couteau & 1957---1991 \\
Mlr & MLR & P. Muller & 1966---1989 \\
--- & HDS & \emph{Hipparcos Catalog} & c. 1991 \\
AC & AC & A. Clark & \\
AG & AG & \emph{Astronomishe Gesellshaft Katalog} & \\
AGC & AGC & A.G. Clark & \\
Arg & ARG & F.W.A. Argelander & \\
Dju & DJU & P. Djurkovic & \\
Don & DON & H.F. Donner & \\
Doo & DOO & E. Doolittle & \\
Erk & FRK & W.S. Franks & \\
Gale & GLE & W.F. Gale & \\
Hld & HLD & E.S. Holden & \\
Hrg & HRG & L. Hargrave & \\
Ku & KU & F. Kustner & \\
Kui & KUI & Gerard P. Kuiper & \\
Pz & PZ & G. Piazzi & \\
Roe & ROE & E.D. Roe & \\
Se & SE & A. Secchi & \\
Sei & SEI & J. Scheiner & \\
Smyth & SMY & W.H. Smyth & \\
Vou & VOU & J.G.E.G. Voute & \\
Webb & WEB & T.W. Webb & \\
Wnc & WNC & F.A. Winnecke & \\
WNO & WNO & \emph{US Naval Observatory} & \\\bottomrule
\begin{longtable}{l|l|c|p{80mm}}\toprule
\emph{Traditional ID} & \emph{``Modern'' ID\footnote{Latinized and capitalized version of traditional ID}} & \emph{Note} & \emph{Observer}\\\midrule
H I to VI, H N & H 1 to 6, H N & ** & W. Herschel \\
$\Sigma$ & STF & * & F. Wilhelm von Struve \\
$\Sigma$ I, $\Sigma$ II & STFA, STFB & * & \emph{(Supplemental catalogs)} \\
h & HJ & ** & J. Herschel \\
Sh & SHJ & * & J. South and J. Herschel \\
S & S & * & J. South \\
Rmk & RMK & ** & C. Rumker \\
$\Delta$ & DUN & * & J. Dunlop \\
Lal & LAL & ** & J.-J. de Lalande \\
O$\Sigma$ & STT & * & O. von Struve \\
O$\Sigma\Sigma$ & STTA & * & \emph{(Supplemental catalogs)} \\
BrsO & BSO & ** & \emph{Brisbane Observatory} \\
Jc & JC & * & W.S. Jacob \\
Dawes & DA & ** & W. Dawes \\
Gli & GLI & ** & J.M. Gilliss \\
Knott & KNT & ** & G. Knott \\
Hd, HdO & HDO & ** & \emph{Harvard Observatory} \\
Stone & STN & * & O. Stone \\
R & R & * & H.C. Russell \\
$\beta$ & BU & * & S. Burnham \\
$\beta$ pm & BUP & * & \emph{(Proper motion pairs)} \\
Ho & HO & ** & G.W. Hough \\
MlbO & MLO & ** & \emph{Melbourne Observatory} \\
Howe & HWE & ** & H.A. Howe \\
CapO & CPO & ** & \emph{Cape Observatory} \\
Es & ES & ** & Rev. T.E. Espin \\
CorO & COO & ** & \emph{Cordoba Observatory} \\
J & J & * & R. Jonckheere \\
Slr & SLR & ** & R.P. Sellors \\
--- & A & ** & R. Aitken \\
--- & I & ** & R.T.A. Innes \\
$\lambda$ & SEE & * & T.J.J. See \\
Hu & HU & ** & W.J. Hussey \\
$\delta$ & DAW & * & B.H. Dawson \\
--- & B & ** & W. van den Bos \\
--- & D & ** & H. Dembowski \\
Rst & RST & ** & R.A. Rossiter \\
$\phi$ & FIN & ** & W.S. Finsen \\
Cou & COU & ** & P. Couteau \\
Mlr & MLR & ** & P. Muller \\
--- & HDS & ** & \emph{Hipparcos Catalog} \\
AC & AC & ** & A. Clark \\
AG & AG & ** & \emph{Astronomische Gesellschaft Katalog} \\
AGC & AGC & ** & A.G. Clark \\
Arg & ARG & ** & F.W.A. Argelander \\
All & ALL & ** & R.M. Aller \\
Dju & DJU & ** & P. Djurkovic \\
Don & DON & ** & H.F. Donner \\
Doo & DOO & ** & E. Doolittle \\
Erk & FRK & ** & W.S. Franks \\
alex-w marked this conversation as resolved.
Show resolved Hide resolved
Gale & GLE & ** & W.F. Gale \\
Hld & HLD & ** & E.S. Holden \\
Hrg & HRG & ** & L. Hargrave \\
Ku & KU & ** & F. Kustner \\
Kui & KUI & ** & Gerard P. Kuiper \\
Pz & PZ & ** & G. Piazzi \\
Roe & ROE & ** & E.D. Roe \\
Se & SE & ** & A. Secchi \\
Sei & SEI & ** & J. Scheiner \\
Smyth & SMY & ** & W.H. Smyth \\
Vou & VOU & ** & J.G.E.G. Voute \\
Webb & WEB & ** & T.W. Webb \\
Wnc & WNC & ** & F.A. Winnecke \\
--- & UC & ** & \emph{USNO CCD Astrographic Catalog } \\
Skf & SKF & ** & B.A. Skiff \\
--- & TDS, TDT & ** & \emph{Tycho Double Star} \\
Tod & TOI & ** & Stassun et al. \\
alex-w marked this conversation as resolved.
Show resolved Hide resolved
Tok & TOK & ** & A.A. Tokovinin \\
Kpp & KPP & ** & W. Knapp \\
Bag & BAG & ** & Yu.Yu. Balega \\
Bau & BAU & ** & C. Bauer \\
Bgh & BGH & ** & S. van den Bergh \\
--- & LSC & ** & \emph{Lowell-Southern Connecticut Collaboration} \\
--- & YSC & ** & \emph{Yale-Southern Connecticut Collaboration} \\
DRs & DRS & ** & R.J. De Rosa \\
Hsw & HSW & ** & R. Harshaw \\
Shy & SHY & ** & E.J. Shaya and R. Olling \\
Rbr & RBR & ** & L.C. Roberts, Jr. \\
--- & CHR & ** & \emph{Center for High Ang. Res. Astronomy} \\
Cru & CRU & ** & L. Cruls \\
Crz & CRZ & ** & K.L. Cruz \\
MzA & MZA & ** & J. Maiz-Apellaniz \\
--- & LDS & ** & \emph{Luyten p.m. catalog} \\
Oso & OSO & ** & M.R. Zapatero Osorio \\
FyM & FYM & ** & M. Fay \\
Fox & FOX & ** & P. Fox \\
Pop & POP & ** & G.M. Popovic \\
Lep & LEP & ** & S. Lepine \\
Trn & TRN & ** & N.H. Turner \\
Sti & STI & ** & J. Stein \\
Eng & ENG & ** & R. Engelmann \\
Laf & LAF & ** & D. Lafreniere \\
Rss & RSS & ** & J.M. Rousseau \\
Jnn & JNN & ** & M. Janson \\
Fab & FAB & ** & C. Fabricius \\
Fal & FAL & ** & J.L. Falin and F. Mignard \\
Gic & GIC & ** & H. Giclas \\
Pws & PWS & ** & T. Pauwels and P. Lampens \\
--- & WIS & ** & \emph{Wide-field Infrared Survey Explorer} \\
Loc & LOC & ** & G. Locatelli \\
Dam & DAM & ** & F. Damm \\
Ary & ARY & ** & R.W. Argyle \\
Wal & WAL & ** & A. Wallenquist \\
Wor & WOR & ** & C.E. Worley \\
Nls & NLS & ** & E.L. Nielsen \\
Hei & HEI & ** & W.D. Heintz \\
Cvn & CVN & ** & G. Chauvin \\
Lmp & LMP & ** & P. Lampens \\
--- & GWP & ** & \emph{Garraf Wide Pairs} \\
Tnn & TNN & ** & A.M. Tanner \\
Grb & GRB & ** & S. Groombridge \\
--- & KR & ** & A. Kruger \\
--- & YR & ** & \emph{Yale-Rochester Collaboration} \\
Soz & SOZ & ** & R.-D. Scholz \\
Bko & BKO & ** & E. Berko \\
--- & BPM & ** & \emph{Bordeaux PM2000 catalogue} \\
Mil & MIL & ** & J.A. Miller \\
Tob & TOB & ** & T. Tobal \\
Scj & SCJ & ** & H. Schjellerup \\
Dea & DEA & ** & N.R. Deacon \\
Bvd & BVD & ** & R. Benavides \\
--- & RAO & ** & \emph{Robo AO project} \\
Lv & LV & ** & F.P. Leavenworth \\
alex-w marked this conversation as resolved.
Show resolved Hide resolved
Smr & SMR & ** & J. Schlimmer \\
McA & MCA & ** & H.A. McAlister \\
Mcy & MCY & ** & D.W. McCarthy \\
Mri & MRI & ** & E.R. Masa Martin \\
Vys & VYS & ** & A.N. Vyssotsky \\
Pou & POU & ** & M.A. Pourteau \\
Whi & WHI & ** & G.L. White \\
WRH & WRH & ** & R.H. Wilson \\
Plq & PLQ & ** & E. Paloque \\
Llo & LLO & ** & J.P. Lloyd \\
Joh & JOH & ** & E.L. Johnson \\
Mrn & MRN & ** & L. Marion \\
AbH & ABH & ** & H.A. Abt \\
Ada & ADA & ** & C. Adam \\
Nsn & NSN & ** & J. Nanson \\
Jsp & JSP & ** & M.K. Jessup \\
PeS & PES & ** & S. Peretti \\
GMc & GMC & ** & G. Micello \\
Dal & DAL & ** & J.A. Daley \\
--- & OCC & ** & \emph{Occult. Doubles Cat.} \\
NOI & NOI & ** & \emph{Navy Prototype/Precision Optical Interferometer} \\
WNO & WNO & ** & \emph{Washington Naval Observatory} \\\bottomrule
\caption{Additional designations for double stars}
\label{tab:StarCatalogues:DoubleStars:Designations}
\end{longtable}
\textbf{Notes}: * --- Stellarium uses a traditional designation of double star; ** --- Stellarium uses a ``modern'' designation of double star.

\section{Cross-Identification Data}
\label{sec:StarCatalogues:CrossIdentificationData}
Expand Down
12 changes: 10 additions & 2 deletions guide/ch_interface.tex
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -497,8 +497,16 @@ \subsection{The Sky Tab}
labels displayed for stars. The further to the
right the sliders are set, the more labels you will see. Note that
more labels will also appear as you zoom in.
\item[Use designations for screen labels] --- when this option is enabled you will see
in the sky only scientific designations of the stars instead of their common names.
\item[Use designations for screen labels] --- when this option is
enabled you will see in the sky (on-screen labels) only scientific
designations (catalog numbers) of the stars instead of their common
names. To customize\newFeature{0.21.3} the on-screen labels we
added 3 additional options\footnote{These options are only used if the
star does not have Bayer/Flamsted designations.}
--- \textbf{Dbl. stars}, \textbf{Var. stars} and \textbf{HIP} --- which will show,
in this sequence of preference, the first available occurrence of
the traditional designations of double stars,
variable stars or HIP numbers, respectively.
\end{description}

\subsubsection{The Projections field}
Expand Down
Binary file modified guide/pictures/view_dialog_sky_tab.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
38 changes: 23 additions & 15 deletions src/core/modules/Star.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,16 +32,13 @@ QString Star1::getNameI18n(void) const
{
if (getHip())
{
const QString commonNameI18 = StarMgr::getCommonName(getHip());
if (!commonNameI18.isEmpty()) return commonNameI18;
if (StarMgr::getFlagSciNames())
{
const QStringList sciNames = StarMgr::getSciName(getHip()).split(" - ");
if (sciNames.count()>0) return sciNames.first();
const QString varSciName = StarMgr::getGcvsName(getHip());
if (!varSciName.isEmpty()) return varSciName;
return QString("HIP %1").arg(getHip());
}
QStringList starNames;
starNames << StarMgr::getCommonName(getHip()) << getDesignation();
starNames.removeAll(QString(""));
if (starNames.count()>0)
return starNames.first();
else
return QString();
}
return QString();
}
Expand All @@ -50,11 +47,22 @@ QString Star1::getDesignation() const
{
if (getHip())
{
const QStringList sciNames = StarMgr::getSciName(getHip()).split(" - ");
if (sciNames.count()>0) return sciNames.first();
const QString varSciName = StarMgr::getGcvsName(getHip());
if (!varSciName.isEmpty()) return varSciName;
return QString("HIP %1").arg(getHip());
QStringList starNames;
if (StarMgr::getFlagSciNames()) // The scientific designations can be used for western sky cultures only
{
starNames << StarMgr::getSciName(getHip()).split(" - ");
if (StarMgr::getFlagDblStarsDesignation()) // append the traditional designations of double stars
starNames << StarMgr::getSciExtraName(getHip()).split(" - ");
if (StarMgr::getFlagVarStarsDesignation()) // append the designations of variable stars (from GCVS)
starNames << StarMgr::getGcvsName(getHip());
if (StarMgr::getFlagHIPDesignation()) // append the HIP numbers of stars
starNames << QString("HIP %1").arg(getHip());
}
starNames.removeAll(QString(""));
if (starNames.count()>0)
return starNames.first();
else
return QString();
}
return QString();
}
Expand Down
Loading