Skip to content

Multiple label options for Skycultures #4179

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.

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

Open
wants to merge 62 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
62 commits
Select commit Hold shift + click to select a range
f30219b
Rename enums, add a few useful entries for a start
gzotti Mar 4, 2025
b6634c5
Move ConstellationMgr::ConstellationDisplayStyle to StelObject::Cultu…
gzotti Mar 6, 2025
b2dc7a0
Update to remove Qt deprecation warnings
gzotti Mar 25, 2025
2aeeb5e
Add new name items to StelObject
gzotti Mar 25, 2025
ba77ca8
Added new GUI elements
gzotti Mar 26, 2025
1aa3a5e
New labeling for Constellations and Asterisms
gzotti Mar 26, 2025
1d25a1d
Scripting can set styles.
gzotti Mar 26, 2025
562ab36
Skyculture aware DSO names
gzotti Mar 28, 2025
c883f59
Planet: add cultural names
gzotti Mar 29, 2025
ca0ec35
Fix name components in several skycultures
gzotti Mar 29, 2025
803e83a
Avoid a crash at end
gzotti Apr 1, 2025
0ac877c
Fix some clang warnings
gzotti Apr 1, 2025
3096b1a
Simplifications, code readability, docfixes
gzotti Apr 1, 2025
af3aa58
Define new variables for the cultural star names
gzotti Apr 1, 2025
947e119
Introduce culturalNames for stars
gzotti Apr 2, 2025
af11fb1
Use right translator
gzotti Apr 3, 2025
cfa8cb9
One common label builder for cultural labels
gzotti Apr 3, 2025
5f58602
Simplify, using common label builder
gzotti Apr 3, 2025
d746be6
Try hashes everywhere
gzotti Apr 3, 2025
90c96dd
Add a default implementation
gzotti Apr 4, 2025
25962cb
More changes around multiple-choice naming
gzotti Apr 4, 2025
21ee6ce
Allow excluding star names from unwanted references.
gzotti Apr 5, 2025
9c09891
Simplifications for CodeFactor
gzotti Apr 5, 2025
a74d11e
Attempt to use HTML markup in labels.
gzotti Apr 5, 2025
0dc8ca0
SUG: minor corrections
gzotti Apr 6, 2025
225f3c3
Extend label combinations
gzotti Apr 6, 2025
8eff6d2
Rename a few internals
gzotti Apr 6, 2025
79bc1a2
More label fixes
gzotti Apr 6, 2025
b189efd
first extensions of search dialog
gzotti Apr 6, 2025
cccb279
Cleanup and docfixes
gzotti Apr 7, 2025
640041b
small optimisations
gzotti Apr 7, 2025
552897c
clearer naming, simplifications
gzotti Apr 7, 2025
6532e0f
Cosmetic fixes
alex-w Apr 8, 2025
33651a8
Fix missing space in front of translated "Added"
gzotti Apr 8, 2025
5bd5dad
Incorporate CommonNames as skyculture names, if so configured.
gzotti Apr 8, 2025
bc62f4c
[AV] Fix Qt5.15 building
alex-w Apr 8, 2025
202aece
Revert a change, and cleanup another.
gzotti Apr 8, 2025
ed30b80
Fix DSO name rendering
gzotti Apr 8, 2025
07dd3b5
simplifications
gzotti Apr 9, 2025
88a5bed
remove non-overriding overrides
gzotti Apr 9, 2025
da1b07f
string literal optimisations
gzotti Apr 9, 2025
aa535bc
Make skyculture value read-accessible
gzotti Apr 9, 2025
0a47ce1
Allow mix of cultural and common star names
gzotti Apr 9, 2025
8b444ce
mixed DSO names
gzotti Apr 9, 2025
cdccb61
Hopefully good cultural DSO screen labels
gzotti Apr 10, 2025
fee174a
Fix searching
gzotti Apr 11, 2025
af7bfe7
Allow offset for constellation and Asterism label placement
gzotti Apr 12, 2025
f4f523c
Redesign name combination selection
gzotti Apr 13, 2025
1ec03d8
avoid duplicate name
gzotti Apr 14, 2025
c542d04
Restore display of designations
gzotti Apr 14, 2025
f20b25e
Cleanup
gzotti Apr 15, 2025
b29050b
Remove some redundancy
gzotti Apr 16, 2025
01a1eba
Fix changes in SolarSystemEditor plugin
gzotti Apr 16, 2025
e453e8a
Fix discovery date/name
gzotti Apr 16, 2025
1ed5868
cleanup
gzotti Apr 17, 2025
aebdaec
Add modern name as fallback
gzotti Apr 17, 2025
2728cad
Support for Dark Constellations
gzotti Apr 19, 2025
3195d04
SUG: SC changes
gzotti Apr 19, 2025
e66b679
fix json
gzotti Apr 19, 2025
68a044b
Added another ex-constellation as asterism
gzotti Apr 21, 2025
a8f33ae
Added context and tooltips for new menu items
alex-w Apr 23, 2025
4dc6132
Fix scripts
alex-w Apr 25, 2025
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
18 changes: 4 additions & 14 deletions .appveyor.yml
Original file line number Diff line number Diff line change
Expand Up @@ -49,20 +49,10 @@ environment:
- BUILD_NAME: Win64 Qt5.15
APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2022
VSPATH: C:\Program Files\Microsoft Visual Studio\2022\Community\SDK\ScopeCppSDK\vc15\VC\bin
QT_VERSION_MAJOR: 5
QT_BASEDIR: C:\Qt\5.15\msvc2019_64
CMAKE_GENERATOR: Visual Studio 17 2022
CMAKE_ARGS: -A x64
exiv2url: https://github.com/Exiv2/exiv2/releases/download/v0.28.0/exiv2-0.28.0-2019msvc64.zip
exiv2baseName: exiv2-0.28.0-2019msvc64
scConverterEnabled: 0
- BUILD_NAME: Arm64 Qt6.5
APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2022
VSPATH: C:\Program Files\Microsoft Visual Studio\2022\Community\SDK\ScopeCppSDK\vc15\VC\bin
QT_VERSION_MAJOR: 6
QT_BASEDIR: C:\Qt\6.5\msvc2019_arm64
CMAKE_GENERATOR: Visual Studio 17 2022
CMAKE_ARGS: -A ARM64 -DSTELLARIUM_BUILD_ARM64=ON -DQT_HOST_PATH=C:\Qt\6.5\msvc2019_64 -DQt6LinguistTools_DIR=C:\Qt\6.5\msvc2019_64\lib\cmake\Qt6LinguistTools -DENABLE_QTWEBENGINE=OFF
qtver: 6.5
qtbin: msvc2019_arm64
msvcname: Visual Studio 17 2022
cmake_args: -A ARM64 -DSTELLARIUM_BUILD_ARM64=ON -DQT_HOST_PATH=C:/Qt/6.5/msvc2019_64 -DQt6LinguistTools_DIR=C:/Qt/6.5/msvc2019_64/lib/cmake/Qt6LinguistTools -DENABLE_QTWEBENGINE=OFF
scConverterEnabled: 0
before_build:
- ps: if($env:QT_BASEDIR.contains('_64')) { $env:BITS=64 } else { $env:BITS=32 }
Expand Down
22 changes: 12 additions & 10 deletions guide/app_star_catalogue.tex
Original file line number Diff line number Diff line change
Expand Up @@ -1830,7 +1830,7 @@ \subsection{Designations}
\section{Cross-Identification Data}
\label{sec:StarCatalogues:CrossIdentificationData}

Since version 0.14.0\newFeature{0.14.0} Stellarium supports cross-identification between stars from
Stellarium supports\newFeature{0.14.0} cross-identification between stars from
Hipparcos (HIP)~\citep{2012AstL...38..331A},
Smithsonian Astrophysical Observatory (SAO) Star Catalog J2000.0~\citep{1995yCat.1131....0S}, Henry Draper Catalogue and Extension (HD)~\citep{1993yCat.3135....0C} and
\citetp{1964cbs..book.....H} (BSC5 or HR) % $5^{th}$ Revised Ed. of Bright Star Catalog (Hoffleit+, 1991; HR)
Expand All @@ -1848,16 +1848,16 @@ \subsection{Cross-Identification Catalog File Format}
\subsubsection{File Format}
\label{sec:StarCatalogues:CrossIdentificationData:file}

The file \file{cross-id.cat} contains cross reference data for catalogues HIP, SAO, HD and HR, which stored in the binary format.
The file \file{cross-id.cat} contains cross reference data for catalogues HIP, SAO, HD and HR, which are stored in a binary format.

\begin{table}[htb]
\begin{tabularx}{\textwidth}{l|c|X}\toprule
\emph{Name} & \emph{Type} & \emph{Description}\\\midrule
HIP & uint64\_t & HIP or Gaia identifier for the star. Used for reference to the main star catalogue.\\
Component & unsigned char & Component of the star in the multiple star system.\\
SAO & int & SAO identifier for the star.\\
HD & int & HD identifier for the star.\\
HR & int & HR identifier for the star.\\\bottomrule
\emph{Name} & \emph{Type} & \emph{Description}\\\midrule
HIP & uint64\_t & HIP or Gaia identifier for the star. Used for reference to the main star catalogue.\\
Component & unsigned char & Component of the star in the multiple star system.\\
SAO & int & SAO identifier for the star.\\
HD & int & HD identifier for the star.\\
HR & int & HR identifier for the star.\\\bottomrule
\end{tabularx}
\caption{Format of \file{cross-id.cat}}
\label{tab:StarCatalogues:CrossIdentificationData:file}
Expand All @@ -1867,7 +1867,7 @@ \subsubsection{File Format}
\section{Binary Star System Orbital Parameters}
\label{sec:StarCatalogues:BinaryOrbitalParameters}

Since version 25.1\newFeature{25.1} Stellarium supports modelling orbital motion of a handful of binary stars. This includes
Since version 25.1\newFeature{25.1} Stellarium supports modelling orbital motion of a handful of binary stars. These include

\begin{itemize}
\item $\alpha$ Centauri A \& B
Expand Down Expand Up @@ -1895,7 +1895,8 @@ \subsection{Binary Star System Orbital Parameters Catalog File Format}
\subsubsection{File Format}
\label{sec:StarCatalogues:BinaryOrbitalParameters:file}

The file \file{binary\_orbitparam.dat} contains binary system orbital parameter data, which are stored in plain text format.
The file \file{binary\_orbitparam.dat} contains binary system orbital parameter data, which are stored in
plain text format (\ref{tab:StarCatalogues:BinaryOrbitalParameters:file}).

\begin{table}[htb]
\begin{tabularx}{\textwidth}{l|c|X}\toprule
Expand All @@ -1917,6 +1918,7 @@ \subsubsection{File Format}
bary pmra $\dot{\alpha}$ & double & Barycenter RA proper motion [mas/yr] \\%\midrule
bary pmdec $\dot{\delta}$ & double & Barycenter DEC proper motion [mas/yr] \\\bottomrule
\end{tabularx}
\caption{Format of \file{binary\_orbitparam.dat}}
\label{tab:StarCatalogues:BinaryOrbitalParameters:file}
\end{table}

Expand Down
28 changes: 19 additions & 9 deletions guide/ch_interface.tex
Original file line number Diff line number Diff line change
Expand Up @@ -888,10 +888,10 @@ \subsection{The Sky Culture Tab}
\end{figure}

\noindent If you want to explore humankind's cultural history, you could also
switch to the viewpoint of other ancient or contemporary
people. Constellations are defined as patterns in the sky serving to
set calendar marks and to navigate while travelling on Earth. Which
patterns are seen depends on the natural environment and the cultural
switch to the viewpoint of ancient or other contemporary peoples.
Constellations are defined as patterns in the sky shaped from fixed celestial objects,
often serving to set calendar marks and to navigate while travelling on Earth.
Which patterns are seen depends on the natural environment and the cultural
habits of the people, i.e., the Inuit in the arctic area might have
seen an Elk where the Chinese have seen a huge spoon or dipper. There
cannot be any astrological influence from these patterns as they had
Expand All @@ -901,7 +901,7 @@ \subsection{The Sky Culture Tab}

\noindent%
\colorbox{light-gray}{\fbox{\parbox[t]{0.975\linewidth}{
\paragraph{Caution} Some of our native peoples' constellations are contributed for noncommercial use only.
\paragraph{Caution} Some of our native peoples' constellations have been contributed for noncommercial use only.
Please respect their heritage holders and check-out the CC licence
version in the description before you use sky cultures for
broadcasting! See section~\ref{sec:skycultures:licenses} for details.}}}
Expand All @@ -916,16 +916,13 @@ \subsection{The Sky Culture Tab}
The Sky Culture tab of the View window (Fig.~\ref{fig:gui:view:skyculture})
controls which culture's constellations and bright star names will be
used in the main display. Some cultures have constellation art (e.g.,
Western and Inuit), and the rest do not. Configurable options include
Modern or Inuit), and the rest do not. Configurable options include
\begin{description}
\item[Use this sky culture as default] Activate this option to load
this sky culture when Stellarium starts.
\item[Constellations name style] You can
select whether you want to display abbreviated, original or
translated names.
\item[Use native names for planets] If provided, show the planet names
as used in this sky culture (also shows modern planet name for
reference). %% TODO THIS FEATURE NEEDS SOME REWORK!
\item[Constellation labels] Activate display of constellation labels, like
\guibutton{0.6}{bt_constellation_name.png} or \keys{V}.
\item[Constellation lines] Activate display of stick
Expand All @@ -946,6 +943,19 @@ \subsection{The Sky Culture Tab}
\item[Select single constellation/Isolated] See section~\ref{sec:skyculture:singleConstellations} for details.
\end{description}

The new skyculture system\newFeature{25.2} has introduced a plethora of new name elements,
the complete set of which is not required to exist. There are name components that may come
in the skyculture's original (\emph{native}) language. If such culture uses non-Latin glyphs in their writing,
non-native users need a \emph{transliteration} that also helps pronunciation, which even depends on user language.
Then there are \emph{scientific transliteration} systems for some cases.
Finally, a pronunciation aid can be given using the International Phonetic Alphabet (\emph{IPA}).
And, for reference, you may want to add the commonly used \emph{modern} name to an object.

There are two sets of settings, for the screen label and for the label used in the information area in the top-left.
The currently configured settings are immediately stored per-skyculture, so that you can adapt the system to
your knowledge of languages and character systems. See \ref{SC:settings} for more.


\subsubsection{Select single constellations}
\label{sec:skyculture:singleConstellations}

Expand Down
Loading
Loading